From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Sun, 26 Mar 2006 13:53:45 +0000 (+0000)
Subject: Applied fixes
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=276650eae5da9b54f28f59419c5e19278a47a9ef;p=gosa.git

Applied fixes


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

diff --git a/TODO b/TODO
index b69e04ea0..4fff769d7 100644
--- a/TODO
+++ b/TODO
@@ -4,16 +4,15 @@ Target for 2.4.1:
 * Speed up workstation loading
 
 * Create a status-bar/-display for FAI installations 
-	(Use notes from 0.5.12.2005)
+  (Use notes from 0.5.12.2005)
 
 * Add online help (english/german)
 
 * Check virenschleuder/Winstations in Admin->Systems 
-	LDAP-Fehler: Cannot modify object class (structural object class modification from 'person' to 'inetOrgPerson' not allowed)
+  LDAP-Error: Cannot modify object class (structural object class modification from 'person' to 'inetOrgPerson' not allowed)
 
 * Test DNS plugin. Add some more checks 
-
-* Check application moving with release management (!)
+  Fix slang! Woha - what are "free hand entries"?
 
 * Phone account is not removable if the mysql database is not reachable.
   This is no real problem, but I'd like to see the hint message for it.
diff --git a/gen_locale.sh b/gen_locale.sh
index 8b70dc40a..ed89fdcf8 100755
--- a/gen_locale.sh
+++ b/gen_locale.sh
@@ -84,7 +84,7 @@ if [ $error -eq 0 ]; then
   read -p "Do you want to erase the message.po.orig files? (y/n)" -n1 ans
 
   if [ "$ans" == "y" -o "$ans" == "Y" ]; then
-    find $ORIG -type f -name 'messages.po.orig' -exec rm -f {} \;
+    find $ORIG/ -type f -name 'messages.po.orig' -exec rm -f {} \;
   fi
 
 else
diff --git a/html/images/dfs.png b/html/images/dfs.png
new file mode 100644
index 000000000..accbd8d63
Binary files /dev/null and b/html/images/dfs.png differ
diff --git a/html/images/list_reload.png b/html/images/list_reload.png
new file mode 100644
index 000000000..5c6a26dd3
Binary files /dev/null and b/html/images/list_reload.png differ
diff --git a/html/images/logview.png b/html/images/logview.png
index accbd8d63..122f64231 100644
Binary files a/html/images/logview.png and b/html/images/logview.png differ
diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index 3809d8543..96ff38e20 100644
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -402,29 +402,25 @@ class LDAP{
     error_reporting(E_ALL);
     
     if($is_first){
-      echo "<font style='font-size:11px;'><h4>".
-              sprintf(_("Creating copy of %s"),"<i>".$sourcedn."</i>")."</h4>";
+      echo "<h2>".sprintf(_("Creating copy of %s"),"<i>".$sourcedn."</i>")."</h2>";
     }else{
       if(preg_match("/^ou=/",$sourcedn)){
-        echo "<br><h3>"._("Processing")." <i>$destinationdn</i></h3>";
+        echo "<h3>"._("Processing")." <i>$destinationdn</i></h3>";
       }else{
         $tmp = split(",",$sourcedn);
         
-        echo "&nbsp;<b>"._("Object").": ";
-        for($i = 0; $i < ($depth -1 ) ; $i ++) {
-          echo preg_replace("/^.*=/","",$tmp[$i])." ";
-        }
-        echo "</b>";
-        echo ": <br>";
+        echo "&nbsp;<b>"._("Object").":</b> ";
 
         $deststr = $destinationdn;
         if(strlen($deststr) > 96){
           $deststr = substr($deststr,0,96)."...";
         }
 
-        echo $deststr."</br>";
+        echo $deststr."<br>";
       }
     }
+
+    flush();
     
     if($this->hascon){
       if ($this->reconnect) $this->connect();
@@ -556,7 +552,7 @@ class LDAP{
       }
     }
     if($is_first){
-      echo "<br><b>"._("Successfully finished")."</b></font><br><br><br>";
+      echo "<p class='seperator'>&nbsp;</p>";
     }
 
   }
diff --git a/locale/de/LC_MESSAGES/messages.mo b/locale/de/LC_MESSAGES/messages.mo
index 241ed617f..e9f3e1113 100644
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 d72072eea..fab52fb31 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -12,12 +12,13 @@ msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: Alfred Schroeder <schroeder@gonicus.de>\n"
 "POT-Creation-Date: 2003-09-19 13:41+0200\n"
-"PO-Revision-Date: 2006-03-23 19:25+0100\n"
+"PO-Revision-Date: 2006-03-26 13:14+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
-"Language-Team: German <de@li.org>\n"
+"Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.2\n"
 
 #: contrib/gosa.conf:4
 msgid "My account"
@@ -40,21 +41,19 @@ msgstr "Zus
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
-#: plugins/gofax/faxaccount/generic.tpl:6
+#: plugins/gofax/faxaccount/generic.tpl:6 plugins/admin/fai/faiVariable.tpl:4
 #: plugins/admin/fai/faiPartitionTable.tpl:4
-#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiScriptEntry.tpl:5
-#: plugins/admin/fai/faiPackage.tpl:4 plugins/admin/fai/faiProfile.tpl:4
-#: plugins/admin/fai/faiProfile.tpl:32
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
+#: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiPackage.tpl:4
+#: plugins/admin/fai/faiProfile.tpl:4 plugins/admin/fai/faiProfile.tpl:32
 #: plugins/admin/fai/faiScript.tpl:4 plugins/admin/fai/faiVariableEntry.tpl:5
 #: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3 plugins/admin/fai/faiHook.tpl:4
-#: plugins/admin/groups/mail.tpl:7
+#: plugins/admin/groups/mail.tpl:7 plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/glpiPrinter.tpl:6
+#: plugins/admin/systems/servdnseditzone.tpl:1
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
-#: plugins/admin/systems/glpi.tpl:6
-#: plugins/admin/systems/servdnseditzone.tpl:1
-#: plugins/admin/systems/glpiPrinter.tpl:6
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr "Allgemein"
@@ -65,25 +64,25 @@ msgstr "Unix"
 
 #: contrib/gosa.conf:76 contrib/gosa.conf:88
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:514
-#: plugins/admin/users/class_userManagement.inc:858
+#: plugins/admin/groups/class_groupManagement.inc:515
+#: plugins/admin/users/class_userManagement.inc:859
 msgid "Environment"
 msgstr "Umgebung"
 
 #: contrib/gosa.conf:77 contrib/gosa.conf:90
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_groupManagement.inc:502
-#: plugins/admin/users/class_userManagement.inc:860
+#: plugins/admin/groups/class_groupManagement.inc:503
+#: plugins/admin/users/class_userManagement.inc:861
 #: plugins/admin/ogroups/tabs_ogroups.inc:72
 #: plugins/admin/ogroups/tabs_ogroups.inc:160
-#: plugins/admin/ogroups/class_ogroupManagement.inc:483
+#: plugins/admin/ogroups/class_ogroupManagement.inc:484
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Mail"
 
 #: contrib/gosa.conf:78 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:505
-#: plugins/admin/users/class_userManagement.inc:866
+#: plugins/admin/groups/class_groupManagement.inc:506
+#: plugins/admin/users/class_userManagement.inc:867
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -98,7 +97,7 @@ msgstr "Konnektivit
 #: plugins/personal/generic/generic.tpl:398
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:864
+#: plugins/admin/users/class_userManagement.inc:865
 #: plugins/admin/departments/generic.tpl:63
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
@@ -108,17 +107,17 @@ msgstr "Fax"
 #: contrib/gosa.conf:81 plugins/personal/generic/generic.tpl:250
 #: plugins/personal/generic/generic.tpl:388
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/address_info.tpl:37
-#: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
-#: plugins/admin/groups/class_groupManagement.inc:511
-#: plugins/admin/users/class_userManagement.inc:862
+#: plugins/addons/addressbook/address_info.tpl:37
+#: plugins/addons/addressbook/address_info.tpl:85
+#: plugins/admin/groups/class_groupManagement.inc:512
+#: plugins/admin/users/class_userManagement.inc:863
 #: plugins/admin/departments/generic.tpl:59
+#: plugins/admin/systems/class_systemManagement.inc:921
 #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/systems/class_systemManagement.inc:920
 #: plugins/admin/ogroups/class_ogroupManagement.inc:61
-#: plugins/admin/ogroups/class_ogroupManagement.inc:587
+#: plugins/admin/ogroups/class_ogroupManagement.inc:588
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
@@ -147,8 +146,8 @@ msgid "ACL"
 msgstr "Zugriffsregeln"
 
 #: contrib/gosa.conf:97 plugins/admin/applications/generic.tpl:66
-#: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/systems/class_servRepository.inc:244
+#: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/ogroups/phonequeue.tpl:31
 #: plugins/gofon/conference/generic.tpl:87
 msgid "Options"
@@ -170,9 +169,9 @@ msgstr "Ger
 
 #: contrib/gosa.conf:116 contrib/gosa.conf:141
 #: plugins/personal/environment/environment.tpl:172
-#: plugins/admin/systems/class_systemManagement.inc:926
+#: plugins/admin/systems/class_systemManagement.inc:927
 #: plugins/admin/ogroups/class_ogroupManagement.inc:62
-#: plugins/admin/ogroups/class_ogroupManagement.inc:590
+#: plugins/admin/ogroups/class_ogroupManagement.inc:591
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Drucker"
@@ -181,18 +180,19 @@ msgstr "Drucker"
 #: plugins/gofax/blocklists/generic.tpl:70
 #: plugins/gofax/blocklists/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
+#: plugins/addons/godfs/contents.tpl:22
 #: plugins/admin/fai/faiProfileEntry.tpl:21
 #: plugins/admin/fai/faiPackageEntry.tpl:22 plugins/admin/fai/headpage.tpl:20
 #: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
 #: plugins/admin/applications/headpage.tpl:20
 #: plugins/admin/departments/headpage.tpl:20
-#: plugins/admin/systems/headpage.tpl:20
+#: plugins/admin/systems/glpiPrinter.tpl:104
+#: plugins/admin/systems/glpiDeviceManagement.tpl:20
 #: plugins/admin/systems/servRepository.tpl:24
 #: plugins/admin/systems/glpiSelectUser.tpl:20
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:20
+#: plugins/admin/systems/headpage.tpl:20
 #: plugins/admin/systems/glpiAttachmentPool.tpl:20
-#: plugins/admin/systems/glpiDeviceManagement.tpl:20
-#: plugins/admin/systems/glpiPrinter.tpl:104
 #: plugins/admin/ogroups/headpage.tpl:20 plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
@@ -255,18 +255,18 @@ msgstr "Partitionen"
 msgid "Script"
 msgstr "Skript"
 
-#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:759
-#: plugins/admin/fai/class_faiManagement.inc:760
+#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:767
+#: plugins/admin/fai/class_faiManagement.inc:768
 msgid "Hooks"
 msgstr "Hooks"
 
-#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:752
-#: plugins/admin/fai/class_faiManagement.inc:753
+#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:760
+#: plugins/admin/fai/class_faiManagement.inc:761
 msgid "Variables"
 msgstr "Variablen"
 
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiManagement.inc:773
-#: plugins/admin/fai/class_faiManagement.inc:774
+#: contrib/gosa.conf:218 plugins/admin/fai/class_faiManagement.inc:781
+#: plugins/admin/fai/class_faiManagement.inc:782
 msgid "Templates"
 msgstr "Vorlagen"
 
@@ -310,88 +310,82 @@ msgstr "Englisch"
 msgid "Italian"
 msgstr "Italienisch"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:19
-#: plugins/personal/mail/class_mailAccount.inc:23
-#: plugins/personal/password/class_password.inc:6
-#: plugins/personal/posix/class_posixAccount.inc:17
-#: plugins/personal/samba/class_sambaAccount.inc:25
-#: plugins/personal/environment/class_environment.inc:13
-#: plugins/personal/generic/class_user.inc:17
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_proxyAccount.inc:6
-#: plugins/personal/connectivity/class_pptpAccount.inc:27
-#: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_phpgwAccount.inc:6
-#: plugins/personal/connectivity/class_kolabAccount.inc:6
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
-#: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/personal/connectivity/class_opengwAccount.inc:7
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
-#: plugins/gofax/faxreports/class_faxreport.inc:7
-#: plugins/addons/addressbook/class_addressbook.inc:7
-#: plugins/addons/mailqueue/class_mailqueue.inc:7
-#: plugins/addons/ldapmanager/class_csvimport.inc:7
-#: plugins/addons/ldapmanager/class_exportxls.inc:8
-#: plugins/addons/ldapmanager/class_import.inc:7
-#: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:7
-#: plugins/addons/logview/class_logview.inc:7
-#: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:26
-#: plugins/admin/applications/class_applicationManagement.inc:26
-#: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/systems/class_systemManagement.inc:33
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-#: plugins/gofon/fonreports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Dies tut etwas"
+#: plugins/personal/nagios/nagios.tpl:4
+msgid "Nagios Account"
+msgstr "Nagios-Konto"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:92
-msgid "This account has no nagios extensions."
-msgstr "Dieses Konto besitzt keine Nagios-Erweiterungen."
+#: plugins/personal/nagios/nagios.tpl:7
+msgid "Alias"
+msgstr "Alias"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:101
-msgid "Remove nagios account"
-msgstr "Nagios-Konto entfernen"
+#: plugins/personal/nagios/nagios.tpl:12
+#: plugins/admin/systems/servdnseditzone.tpl:47 html/getxls.php:174
+msgid "Mail address"
+msgstr "Mail-Adresse"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:102
-msgid ""
-"This account has nagios features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Dieses Konto besitzt aktivierte Nagios-Erweiterungen. Sie können diese "
-"deaktivieren, indem Sie auf die Schaltfläche unten klicken."
+#: plugins/personal/nagios/nagios.tpl:17
+msgid "Host notification period"
+msgstr "Frequenz der Host-Meldungen"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:104
-msgid "Create nagios account"
-msgstr "Neues Nagios-Konto erzeugen"
+#: plugins/personal/nagios/nagios.tpl:25
+msgid "Service notification period"
+msgstr "Frequenz der Dienst-Meldungen"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:104
-msgid ""
-"This account has nagios features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Dieses Konto besitzt keine aktivierten Nagios-Erweiterungen. Sie können "
-"diese aktivieren, indem Sie auf die Schaltfläche unten klicken."
+#: plugins/personal/nagios/nagios.tpl:32
+msgid "Service notification options"
+msgstr "Optionen der Dienst-Meldungen"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:165
-msgid "The required field 'NagiosAlias' is not set."
-msgstr "Das benötigte Feld 'NagiosAlias' ist nicht gesetzt."
+#: plugins/personal/nagios/nagios.tpl:41
+msgid "Host notification options"
+msgstr "Optionen der Host-Meldungen"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:168
-msgid "The required field 'NagiosMail' is not set."
-msgstr "Das benötigte Feld 'NagiosMail' ist nicht gesetzt."
+#: plugins/personal/nagios/nagios.tpl:48
+#: plugins/personal/generic/generic.tpl:261
+#: plugins/addons/addressbook/address_edit.tpl:217
+#: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Pager"
+msgstr "Pager"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:172
-#: plugins/personal/nagios/class_nagiosAccount.inc:176
-msgid "Please enter a valid email address in 'NagiosMail' field."
-msgstr ""
-"Bitte geben Sie eine gültige E-Mail-Adresse in das Feld 'NagiosMail' ein."
+#: plugins/personal/nagios/nagios.tpl:53
+msgid "Service notification commands"
+msgstr "Befehle für Dienst-Meldungen"
+
+#: plugins/personal/nagios/nagios.tpl:57
+msgid "Host notification commands"
+msgstr "Befehle für Host-Meldungen"
+
+#: plugins/personal/nagios/nagios.tpl:66
+msgid "Nagios authentification"
+msgstr "Nagios Authentifikation"
+
+#: plugins/personal/nagios/nagios.tpl:69
+msgid "view system informations"
+msgstr "System-Informationen anzeigen"
+
+#: plugins/personal/nagios/nagios.tpl:72
+msgid "view configuration information"
+msgstr "Konfiguration anzeigen"
+
+#: plugins/personal/nagios/nagios.tpl:75
+msgid "trigger system commands"
+msgstr "Alle System-Befehle ausführen"
+
+#: plugins/personal/nagios/nagios.tpl:78
+msgid "view all services"
+msgstr "Alle Dienste anzeigen"
+
+#: plugins/personal/nagios/nagios.tpl:81
+msgid "view all hosts"
+msgstr "Alle Systeme anzeigen"
+
+#: plugins/personal/nagios/nagios.tpl:83
+msgid "trigger all service commands"
+msgstr "Alle Dienst-Befehle ausführen"
+
+#: plugins/personal/nagios/nagios.tpl:86
+msgid "trigger all host commands"
+msgstr "Alle Host-Befehle ausführen"
 
 #: plugins/personal/nagios/main.inc:104 plugins/personal/mail/main.inc:104
 #: plugins/personal/posix/main.inc:110 plugins/personal/samba/main.inc:104
@@ -401,11 +395,12 @@ msgstr ""
 #: plugins/personal/connectivity/main.inc:118
 #: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/fai/class_faiManagement.inc:599
+#: plugins/addons/godfs/class_dfsManagment.inc:217
+#: plugins/admin/fai/class_faiManagement.inc:605
 #: plugins/admin/groups/class_groupManagement.inc:412
 #: plugins/admin/users/class_userManagement.inc:720
-#: plugins/admin/applications/class_applicationManagement.inc:428
-#: plugins/admin/departments/class_departmentManagement.inc:366
+#: plugins/admin/applications/class_applicationManagement.inc:430
+#: plugins/admin/departments/class_departmentManagement.inc:367
 #: plugins/admin/systems/class_systemManagement.inc:720
 #: plugins/admin/ogroups/class_ogroupManagement.inc:400
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:300
@@ -417,16 +412,15 @@ msgstr "Speichern"
 
 #: plugins/personal/nagios/main.inc:106 plugins/personal/mail/main.inc:106
 #: plugins/personal/mail/mail_locals.tpl:43
-#: plugins/personal/posix/posix_groups.tpl:67
 #: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112
+#: plugins/personal/posix/posix_groups.tpl:67
+#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
 #: plugins/personal/samba/samba3_workstations.tpl:41
-#: plugins/personal/samba/main.inc:106
+#: plugins/personal/environment/main.inc:106
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
 #: plugins/personal/environment/hotplugDialogNew.tpl:39
-#: plugins/personal/environment/main.inc:106
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
 #: plugins/personal/generic/generic_certs.tpl:78
@@ -437,54 +431,55 @@ msgstr "Speichern"
 #: plugins/gofax/faxaccount/locals.tpl:62
 #: plugins/gofax/faxaccount/lists.tpl:33 plugins/gofax/faxaccount/main.inc:91
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
-#: plugins/admin/fai/class_faiManagement.inc:601
-#: plugins/admin/fai/class_faiManagement.inc:606
-#: plugins/admin/fai/faiProfileEntry.tpl:71
+#: plugins/addons/addressbook/remove.tpl:16
+#: plugins/addons/godfs/class_dfsManagment.inc:219
+#: plugins/admin/fai/class_faiManagement.inc:607
+#: plugins/admin/fai/class_faiManagement.inc:612
 #: plugins/admin/fai/faiPackageConfiguration.tpl:7
-#: plugins/admin/fai/faiScriptEntry.tpl:69
+#: plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
+#: plugins/admin/fai/faiScriptEntry.tpl:69 plugins/admin/fai/remove.tpl:17
 #: plugins/admin/fai/faiPackageNew.tpl:45
+#: plugins/admin/fai/faiNewBranch.tpl:20
 #: plugins/admin/fai/faiVariableEntry.tpl:49
-#: plugins/admin/fai/faiPackageEntry.tpl:57 plugins/admin/fai/remove.tpl:17
+#: plugins/admin/fai/faiPackageEntry.tpl:57
 #: plugins/admin/fai/faiHookEntry.tpl:71
-#: plugins/admin/fai/faiTemplateEntry.tpl:131
-#: plugins/admin/fai/faiNewBranch.tpl:20
 #: plugins/admin/fai/remove_branch.tpl:16
+#: plugins/admin/fai/faiTemplateEntry.tpl:131
 #: plugins/admin/groups/class_groupManagement.inc:414
 #: plugins/admin/groups/remove.tpl:16
+#: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/template.tpl:46
 #: plugins/admin/users/class_userManagement.inc:722
-#: plugins/admin/users/remove.tpl:16 plugins/admin/users/template.tpl:46
-#: plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:430
+#: plugins/admin/users/remove.tpl:16 plugins/admin/applications/remove.tpl:15
+#: plugins/admin/applications/class_applicationManagement.inc:432
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:368
-#: plugins/admin/systems/chooser.tpl:18
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
-#: plugins/admin/systems/printerPPDDialog.tpl:23
-#: plugins/admin/systems/class_systemManagement.inc:722
-#: plugins/admin/systems/servnfs.tpl:76 plugins/admin/systems/remove.tpl:16
-#: plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/servRepositorySetup.tpl:43
+#: plugins/admin/departments/class_departmentManagement.inc:369
 #: plugins/admin/systems/glpi_edit_type.tpl:29
-#: plugins/admin/systems/remove_glpi.tpl:16
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:30
+#: plugins/admin/systems/glpiDeviceManagement.tpl:52
+#: plugins/admin/systems/servnfs.tpl:76
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
+#: plugins/admin/systems/servdnseditzone.tpl:118
 #: plugins/admin/systems/glpiSelectUser.tpl:51
+#: plugins/admin/systems/glpi_devices.tpl:761
+#: plugins/admin/systems/servRepositorySetup.tpl:43
 #: plugins/admin/systems/glpi_edit_os.tpl:29
+#: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:52
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
+#: plugins/admin/systems/remove_glpi.tpl:16
+#: plugins/admin/systems/class_systemManagement.inc:722
+#: plugins/admin/systems/remove.tpl:16
 #: plugins/admin/systems/glpiAttachmentPool.tpl:52
-#: plugins/admin/systems/servdnseditzone.tpl:118
-#: plugins/admin/systems/glpiDeviceManagement.tpl:52
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:30
-#: plugins/admin/systems/glpi_devices.tpl:761
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
+#: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/SelectDeviceType.tpl:45
-#: plugins/admin/systems/class_baseSelectDialog.inc:40
+#: plugins/admin/systems/class_baseSelectDialog.inc:41
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:13
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:402
@@ -495,6 +490,7 @@ msgstr "Speichern"
 #: plugins/gofon/conference/remove.tpl:16
 #: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
 #: ihtml/themes/default/copyPasteDialog.tpl:13
+#: ihtml/themes/lhs/islocked.tpl:15
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -512,26 +508,27 @@ msgstr ""
 
 #: plugins/personal/nagios/main.inc:115 plugins/personal/mail/main.inc:115
 #: plugins/personal/posix/main.inc:122 plugins/personal/samba/main.inc:115
-#: plugins/personal/environment/environment.tpl:139
 #: plugins/personal/environment/main.inc:115
+#: plugins/personal/environment/environment.tpl:139
 #: plugins/personal/generic/main.inc:172
 #: plugins/personal/connectivity/main.inc:129
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
+#: plugins/admin/fai/faiVariable.tpl:45
 #: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/admin/fai/faiVariable.tpl:45 plugins/admin/fai/faiScript.tpl:45
-#: plugins/admin/fai/faiTemplate.tpl:42 plugins/admin/fai/faiHook.tpl:45
-#: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/printer.tpl:47 plugins/admin/systems/servdns.tpl:7
-#: plugins/admin/systems/glpiManufacturer.tpl:7
-#: plugins/admin/systems/glpi.tpl:48 plugins/admin/systems/glpi.tpl:56
-#: plugins/admin/systems/glpi.tpl:85
-#: plugins/admin/systems/servdnseditzone.tpl:27
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:191
+#: plugins/admin/fai/faiScript.tpl:45 plugins/admin/fai/faiTemplate.tpl:42
+#: plugins/admin/fai/faiHook.tpl:45 plugins/admin/systems/glpi.tpl:48
+#: plugins/admin/systems/glpi.tpl:56 plugins/admin/systems/glpi.tpl:85
 #: plugins/admin/systems/glpiPrinter.tpl:73
 #: plugins/admin/systems/glpiPrinter.tpl:82
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:167
+#: plugins/admin/systems/servdns.tpl:7
+#: plugins/admin/systems/glpiManufacturer.tpl:7
+#: plugins/admin/systems/servdnseditzone.tpl:27
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:191
+#: plugins/admin/systems/servservice.tpl:21
+#: plugins/admin/systems/printer.tpl:47
 #: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -540,82 +537,209 @@ msgstr "Bearbeiten"
 msgid "Nagios settings"
 msgstr "Nagios-Einstellungen"
 
-#: plugins/personal/nagios/nagios.tpl:4
-msgid "Nagios Account"
-msgstr "Nagios-Konto"
-
-#: plugins/personal/nagios/nagios.tpl:7
-msgid "Alias"
-msgstr "Alias"
-
-#: plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:47 html/getxls.php:174
-msgid "Mail address"
-msgstr "Mail-Adresse"
-
-#: plugins/personal/nagios/nagios.tpl:17
-msgid "Host notification period"
-msgstr "Frequenz der Host-Meldungen"
-
-#: plugins/personal/nagios/nagios.tpl:25
-msgid "Service notification period"
-msgstr "Frequenz der Dienst-Meldungen"
-
-#: plugins/personal/nagios/nagios.tpl:32
-msgid "Service notification options"
-msgstr "Optionen der Dienst-Meldungen"
-
-#: plugins/personal/nagios/nagios.tpl:41
-msgid "Host notification options"
-msgstr "Optionen der Host-Meldungen"
-
-#: plugins/personal/nagios/nagios.tpl:48
-#: plugins/personal/generic/generic.tpl:261
-#: plugins/addons/addressbook/address_info.tpl:91
-#: plugins/addons/addressbook/address_edit.tpl:217 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Pager"
-msgstr "Pager"
+#: plugins/personal/nagios/class_nagiosAccount.inc:19
+#: plugins/personal/mail/class_mailAccount.inc:23
+#: plugins/personal/password/class_password.inc:6
+#: plugins/personal/posix/class_posixAccount.inc:17
+#: plugins/personal/samba/class_sambaAccount.inc:25
+#: plugins/personal/environment/class_environment.inc:13
+#: plugins/personal/generic/class_user.inc:17
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_intranetAccount.inc:16
+#: plugins/personal/connectivity/class_pptpAccount.inc:27
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
+#: plugins/personal/connectivity/class_phpgwAccount.inc:6
+#: plugins/personal/connectivity/class_kolabAccount.inc:6
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
+#: plugins/personal/connectivity/class_opengwAccount.inc:7
+#: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
+#: plugins/gofax/faxreports/class_faxreport.inc:7
+#: plugins/addons/addressbook/class_addressbook.inc:7
+#: plugins/addons/mailqueue/class_mailqueue.inc:7
+#: plugins/addons/ldapmanager/class_csvimport.inc:7
+#: plugins/addons/ldapmanager/class_exportxls.inc:8
+#: plugins/addons/ldapmanager/class_import.inc:7
+#: plugins/addons/ldapmanager/class_ldif.inc:8
+#: plugins/addons/ldapmanager/class_export.inc:7
+#: plugins/addons/logview/class_logview.inc:7
+#: plugins/addons/godfs/class_dfsManagment.inc:17
+#: plugins/admin/groups/class_groupManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:26
+#: plugins/admin/applications/class_applicationManagement.inc:26
+#: plugins/admin/departments/class_departmentManagement.inc:26
+#: plugins/admin/systems/class_systemManagement.inc:33
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/gofon/fonreports/class_fonreport.inc:7
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
+msgid "This does something"
+msgstr "Dies tut etwas"
 
-#: plugins/personal/nagios/nagios.tpl:53
-msgid "Service notification commands"
-msgstr "Befehle für Dienst-Meldungen"
+#: plugins/personal/nagios/class_nagiosAccount.inc:92
+msgid "This account has no nagios extensions."
+msgstr "Dieses Konto besitzt keine Nagios-Erweiterungen."
 
-#: plugins/personal/nagios/nagios.tpl:57
-msgid "Host notification commands"
-msgstr "Befehle für Host-Meldungen"
+#: plugins/personal/nagios/class_nagiosAccount.inc:101
+msgid "Remove nagios account"
+msgstr "Nagios-Konto entfernen"
 
-#: plugins/personal/nagios/nagios.tpl:66
-msgid "Nagios authentification"
-msgstr "Nagios Authentifikation"
+#: plugins/personal/nagios/class_nagiosAccount.inc:102
+msgid ""
+"This account has nagios features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Dieses Konto besitzt aktivierte Nagios-Erweiterungen. Sie können diese "
+"deaktivieren, indem Sie auf die Schaltfläche unten klicken."
 
-#: plugins/personal/nagios/nagios.tpl:69
-msgid "view system informations"
-msgstr "System-Informationen anzeigen"
+#: plugins/personal/nagios/class_nagiosAccount.inc:104
+msgid "Create nagios account"
+msgstr "Neues Nagios-Konto erzeugen"
 
-#: plugins/personal/nagios/nagios.tpl:72
-msgid "view configuration information"
-msgstr "Konfiguration anzeigen"
+#: plugins/personal/nagios/class_nagiosAccount.inc:104
+msgid ""
+"This account has nagios features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Dieses Konto besitzt keine aktivierten Nagios-Erweiterungen. Sie können "
+"diese aktivieren, indem Sie auf die Schaltfläche unten klicken."
 
-#: plugins/personal/nagios/nagios.tpl:75
-msgid "trigger system commands"
-msgstr "Alle System-Befehle ausführen"
+#: plugins/personal/nagios/class_nagiosAccount.inc:165
+msgid "The required field 'NagiosAlias' is not set."
+msgstr "Das benötigte Feld 'NagiosAlias' ist nicht gesetzt."
 
-#: plugins/personal/nagios/nagios.tpl:78
-msgid "view all services"
-msgstr "Alle Dienste anzeigen"
+#: plugins/personal/nagios/class_nagiosAccount.inc:168
+msgid "The required field 'NagiosMail' is not set."
+msgstr "Das benötigte Feld 'NagiosMail' ist nicht gesetzt."
 
-#: plugins/personal/nagios/nagios.tpl:81
-msgid "view all hosts"
-msgstr "Alle Systeme anzeigen"
+#: plugins/personal/nagios/class_nagiosAccount.inc:172
+#: plugins/personal/nagios/class_nagiosAccount.inc:176
+msgid "Please enter a valid email address in 'NagiosMail' field."
+msgstr "Bitte geben Sie eine gültige E-Mail-Adresse in das Feld 'NagiosMail' ein."
 
-#: plugins/personal/nagios/nagios.tpl:83
-msgid "trigger all service commands"
-msgstr "Alle Dienst-Befehle ausführen"
+#: plugins/personal/mail/class_mailAccount.inc:79
+#: plugins/admin/groups/class_groupMail.inc:75
+#, php-format
+msgid "There is no mail method '%s' specified in your gosa.conf available."
+msgstr ""
+"Die in ihrer gosa.conf angegebene Zustellungs-Methode '%s' ist nicht "
+"verfügbar."
 
-#: plugins/personal/nagios/nagios.tpl:86
-msgid "trigger all host commands"
-msgstr "Alle Host-Befehle ausführen"
+#: plugins/personal/mail/class_mailAccount.inc:176
+msgid "No DESC tag in vacation file:"
+msgstr "Kein DESC-Tag in der Abwesenheits-Datei:"
+
+#: plugins/personal/mail/class_mailAccount.inc:216
+msgid "This account has no mail extensions."
+msgstr "Dieses Konto hat keine Mail-Erweiterungen."
+
+#: plugins/personal/mail/class_mailAccount.inc:225
+#: plugins/admin/groups/class_groupMail.inc:314
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid "Remove mail account"
+msgstr "Mail-Konto entfernen"
+
+#: plugins/personal/mail/class_mailAccount.inc:226
+#: plugins/admin/groups/class_groupMail.inc:315
+msgid ""
+"This account has mail features enabled. You can disable them by clicking "
+"below."
+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:228
+#: plugins/admin/groups/class_groupMail.inc:317
+#: plugins/admin/ogroups/class_mailogroup.inc:43
+msgid "Create mail account"
+msgstr "Neues Mail-Konto erzeugen"
+
+#: plugins/personal/mail/class_mailAccount.inc:228
+#: plugins/admin/groups/class_groupMail.inc:318
+msgid ""
+"This account has mail features disabled. You can enable them by clicking "
+"below."
+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:276
+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:282
+#: plugins/admin/groups/class_groupMail.inc:377
+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:317
+#: plugins/personal/mail/class_mailAccount.inc:322
+#: plugins/admin/groups/class_groupMail.inc:405
+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:332
+#: plugins/admin/groups/class_groupMail.inc:410
+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:714
+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:719
+#: plugins/admin/groups/class_groupMail.inc:798
+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:723
+#: plugins/personal/mail/class_mailAccount.inc:727
+#: plugins/addons/addressbook/class_addressbook.inc:588
+#: plugins/admin/ogroups/class_mailogroup.inc:70
+msgid "Please enter a valid email address in 'Primary address' field."
+msgstr ""
+"Bitte geben Sie eine gültige E-Mail-Adresse in das Feld 'Primäre Adresse' "
+"ein."
+
+#: plugins/personal/mail/class_mailAccount.inc:733
+#: plugins/admin/groups/class_groupMail.inc:807
+#: plugins/admin/ogroups/class_mailogroup.inc:77
+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:739
+#: plugins/admin/groups/class_groupMail.inc:813
+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:748
+#: plugins/admin/groups/class_groupMail.inc:822
+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:758
+#: plugins/admin/groups/class_groupMail.inc:830
+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:762
+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/generic.tpl:7 plugins/personal/mail/copypaste.tpl:7
 #: plugins/admin/groups/mail.tpl:10 plugins/admin/groups/paste_mail.tpl:8
@@ -625,9 +749,9 @@ msgstr "Prim
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:921
+#: plugins/admin/systems/class_systemManagement.inc:922
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:586
+#: plugins/admin/ogroups/class_ogroupManagement.inc:587
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
 msgstr "Server"
@@ -641,7 +765,7 @@ msgid "Quota usage"
 msgstr "Kontingent-Nutzung"
 
 #: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
-#: plugins/admin/systems/class_terminalInfo.inc:169
+#: plugins/admin/systems/class_terminalInfo.inc:170
 #: plugins/admin/systems/class_printGeneric.inc:424
 msgid "not defined"
 msgstr "nicht definiert"
@@ -666,8 +790,8 @@ msgstr "Liste alternativer Mail-Adressen"
 #: plugins/personal/mail/mail_locals.tpl:41
 #: plugins/personal/mail/copypaste.tpl:21
 #: plugins/personal/mail/copypaste.tpl:44
-#: plugins/personal/posix/posix_groups.tpl:65
 #: plugins/personal/posix/trust_machines.tpl:39
+#: plugins/personal/posix/posix_groups.tpl:65
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
 #: plugins/personal/samba/samba3.tpl:330
@@ -683,43 +807,42 @@ msgstr "Liste alternativer Mail-Adressen"
 #: plugins/gofax/blocklists/generic.tpl:63
 #: plugins/gofax/faxaccount/generic.tpl:76
 #: plugins/gofax/faxaccount/locals.tpl:60
-#: plugins/gofax/faxaccount/lists.tpl:13
+#: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiPackage.tpl:71
-#: plugins/admin/fai/faiProfile.tpl:38 plugins/admin/fai/faiScript.tpl:48
-#: plugins/admin/fai/faiTemplate.tpl:41 plugins/admin/fai/faiHook.tpl:48
-#: plugins/admin/groups/mail.tpl:51 plugins/admin/groups/mail.tpl:95
+#: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
+#: plugins/admin/fai/faiScript.tpl:48 plugins/admin/fai/faiTemplate.tpl:41
+#: plugins/admin/fai/faiHook.tpl:48 plugins/admin/groups/mail.tpl:51
+#: plugins/admin/groups/mail.tpl:95
 #: plugins/admin/groups/class_groupMail.inc:533
 #: plugins/admin/groups/application.tpl:15
 #: plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/generic.tpl:104
 #: plugins/admin/groups/mail_locals.tpl:66
 #: plugins/admin/groups/paste_mail.tpl:30
-#: plugins/admin/groups/paste_mail.tpl:41
-#: plugins/admin/systems/servservice.tpl:20
-#: plugins/admin/systems/servservice.tpl:47
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
+#: plugins/admin/groups/paste_mail.tpl:41 plugins/admin/systems/glpi.tpl:100
+#: plugins/admin/systems/glpiPrinter.tpl:93
+#: plugins/admin/systems/glpiPrinter.tpl:121
+#: plugins/admin/systems/glpi_edit_type.tpl:8
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:7
 #: plugins/admin/systems/workstationStartup.tpl:61
 #: plugins/admin/systems/workstationStartup.tpl:81
 #: plugins/admin/systems/workstationStartup.tpl:100
 #: plugins/admin/systems/servdns.tpl:6
-#: plugins/admin/systems/phonesettings.tpl:176
-#: plugins/admin/systems/phonesettings.tpl:191
 #: plugins/admin/systems/terminalStartup.tpl:61
 #: plugins/admin/systems/terminalStartup.tpl:80
-#: plugins/admin/systems/servRepositorySetup.tpl:36
-#: plugins/admin/systems/glpi_edit_type.tpl:8
 #: plugins/admin/systems/glpiManufacturer.tpl:6
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
-#: plugins/admin/systems/glpi_edit_os.tpl:8
 #: plugins/admin/systems/class_termDNS.inc:461
 #: plugins/admin/systems/class_termDNS.inc:482
-#: plugins/admin/systems/glpi.tpl:100
 #: plugins/admin/systems/servdnseditzone.tpl:102
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/glpiPrinter.tpl:93
-#: plugins/admin/systems/glpiPrinter.tpl:121
+#: plugins/admin/systems/servRepositorySetup.tpl:36
+#: plugins/admin/systems/servservice.tpl:20
+#: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/glpi_edit_os.tpl:8
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
 #: plugins/admin/systems/class_servDNSeditZone.inc:478
+#: plugins/admin/systems/phonesettings.tpl:176
+#: plugins/admin/systems/phonesettings.tpl:191
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:270
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/generic.tpl:39
@@ -744,38 +867,37 @@ msgstr "Hinzuf
 #: plugins/gofax/faxaccount/generic.tpl:78
 #: plugins/gofax/faxaccount/lists.tpl:14
 #: plugins/addons/addressbook/remove.tpl:14
-#: plugins/admin/fai/faiPartitionTable.tpl:45
-#: plugins/admin/fai/faiVariable.tpl:46 plugins/admin/fai/faiScript.tpl:46
-#: plugins/admin/fai/faiTemplate.tpl:43 plugins/admin/fai/remove.tpl:15
-#: plugins/admin/fai/faiHook.tpl:46 plugins/admin/fai/remove_branch.tpl:14
+#: plugins/admin/fai/faiVariable.tpl:46
+#: plugins/admin/fai/faiPartitionTable.tpl:45 plugins/admin/fai/remove.tpl:15
+#: plugins/admin/fai/faiScript.tpl:46 plugins/admin/fai/faiTemplate.tpl:43
+#: plugins/admin/fai/remove_branch.tpl:14 plugins/admin/fai/faiHook.tpl:46
 #: plugins/admin/groups/mail.tpl:52 plugins/admin/groups/mail.tpl:97
 #: plugins/admin/groups/remove.tpl:14 plugins/admin/groups/generic.tpl:106
 #: plugins/admin/groups/paste_mail.tpl:31
 #: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/users/remove.tpl:14
 #: plugins/admin/applications/remove.tpl:13
 #: plugins/admin/departments/remove.tpl:14
-#: plugins/admin/systems/servservice.tpl:22
-#: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/glpi_edit_type.tpl:10
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/workstationStartup.tpl:62
 #: plugins/admin/systems/workstationStartup.tpl:82
-#: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
-#: plugins/admin/systems/phonesettings.tpl:177
-#: plugins/admin/systems/phonesettings.tpl:192
-#: plugins/admin/systems/remove.tpl:14
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
 #: plugins/admin/systems/terminalStartup.tpl:62
-#: plugins/admin/systems/glpi_edit_type.tpl:10
-#: plugins/admin/systems/remove_glpi.tpl:14
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
-#: plugins/admin/systems/glpi_edit_os.tpl:10
 #: plugins/admin/systems/class_termDNS.inc:476
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:192
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
+#: plugins/admin/systems/servservice.tpl:22
+#: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/glpi_edit_os.tpl:10
+#: plugins/admin/systems/remove_glpi.tpl:14
+#: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
 #: plugins/admin/systems/class_servDNSeditZone.inc:279
 #: plugins/admin/systems/class_servDNSeditZone.inc:472
-#: plugins/admin/ogroups/generic.tpl:40 plugins/admin/ogroups/remove.tpl:14
-#: plugins/admin/ogroups/phonequeue.tpl:25 plugins/gofon/macro/remove.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:15
+#: plugins/admin/systems/phonesettings.tpl:177
+#: plugins/admin/systems/phonesettings.tpl:192
+#: plugins/admin/systems/remove.tpl:14 plugins/admin/ogroups/generic.tpl:40
+#: plugins/admin/ogroups/remove.tpl:14 plugins/admin/ogroups/phonequeue.tpl:25
+#: plugins/gofon/macro/remove.tpl:13 plugins/gofon/phoneaccount/generic.tpl:15
 #: plugins/gofon/phoneaccount/paste_generic.tpl:15
 #: plugins/gofon/conference/remove.tpl:14
 msgid "Delete"
@@ -796,8 +918,7 @@ msgid "No delivery to own mailbox"
 msgstr "Keine Zustellung in eigenes Postfach"
 
 #: plugins/personal/mail/generic.tpl:75
-msgid ""
-"Select to automatically response with the vacation message defined below"
+msgid "Select to automatically response with the vacation message defined below"
 msgstr ""
 "Wählen Sie dies, um automatisch eine Urlaubsmeldung mit dem unten angebenen "
 "Text zu versenden."
@@ -816,8 +937,7 @@ msgstr "Verschiebe Mails mit einem SPAM-Level gr
 
 #: plugins/personal/mail/generic.tpl:84
 msgid "Choose spam level - smaller values are more sensitive"
-msgstr ""
-"Wählen sie den 'SPAM'-Level - kleinere Werte reagieren empfindlicher auf SPAM"
+msgstr "Wählen sie den 'SPAM'-Level - kleinere Werte reagieren empfindlicher auf SPAM"
 
 #: plugins/personal/mail/generic.tpl:87
 msgid "to folder"
@@ -890,6 +1010,7 @@ msgstr "W
 #: plugins/gofax/blocklists/headpage.tpl:29
 #: plugins/gofax/faxaccount/locals.tpl:19
 #: plugins/addons/addressbook/contents.tpl:58
+#: plugins/addons/godfs/contents.tpl:31
 #: plugins/admin/fai/faiProfileEntry.tpl:31
 #: plugins/admin/fai/faiPackageEntry.tpl:32 plugins/admin/fai/headpage.tpl:64
 #: plugins/admin/groups/headpage.tpl:30
@@ -897,14 +1018,14 @@ msgstr "W
 #: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
 #: plugins/admin/applications/headpage.tpl:47
 #: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
-#: plugins/admin/systems/headpage.tpl:29
+#: plugins/admin/systems/glpiDeviceManagement.tpl:27
 #: plugins/admin/systems/servRepository.tpl:36
 #: plugins/admin/systems/glpiSelectUser.tpl:27
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:27
+#: plugins/admin/systems/headpage.tpl:29
 #: plugins/admin/systems/glpiAttachmentPool.tpl:27
-#: plugins/admin/systems/glpiDeviceManagement.tpl:27
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/admin/ogroups/headpage.tpl:29 plugins/gofon/macro/headpage.tpl:29
 #: plugins/gofon/conference/headpage.tpl:29
@@ -914,8 +1035,8 @@ msgid "Filters"
 msgstr "Filter"
 
 #: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:32
 #: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:32
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/personal/environment/selectPrinterDialog.tpl:34
 #: plugins/gofax/faxaccount/locals.tpl:29
@@ -944,150 +1065,27 @@ msgstr "Zeige Adressen des Benutzers"
 msgid "User name of which addresses are shown"
 msgstr "Benutzername, dessen Adressen angezeigt werden"
 
-#: plugins/personal/mail/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:75
-#, php-format
-msgid "There is no mail method '%s' specified in your gosa.conf available."
-msgstr ""
-"Die in ihrer gosa.conf angegebene Zustellungs-Methode '%s' ist nicht "
-"verfügbar."
-
-#: plugins/personal/mail/class_mailAccount.inc:176
-msgid "No DESC tag in vacation file:"
-msgstr "Kein DESC-Tag in der Abwesenheits-Datei:"
-
-#: plugins/personal/mail/class_mailAccount.inc:216
-msgid "This account has no mail extensions."
-msgstr "Dieses Konto hat keine Mail-Erweiterungen."
-
-#: plugins/personal/mail/class_mailAccount.inc:225
-#: plugins/admin/groups/class_groupMail.inc:314
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid "Remove mail account"
-msgstr "Mail-Konto entfernen"
-
-#: plugins/personal/mail/class_mailAccount.inc:226
-#: plugins/admin/groups/class_groupMail.inc:315
-msgid ""
-"This account has mail features enabled. You can disable them by clicking "
-"below."
-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:228
-#: plugins/admin/groups/class_groupMail.inc:317
-#: plugins/admin/ogroups/class_mailogroup.inc:43
-msgid "Create mail account"
-msgstr "Neues Mail-Konto erzeugen"
-
-#: plugins/personal/mail/class_mailAccount.inc:228
-#: plugins/admin/groups/class_groupMail.inc:318
-msgid ""
-"This account has mail features disabled. You can enable them by clicking "
-"below."
-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:276
-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:282
-#: plugins/admin/groups/class_groupMail.inc:377
-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:317
-#: plugins/personal/mail/class_mailAccount.inc:322
-#: plugins/admin/groups/class_groupMail.inc:405
-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:332
-#: plugins/admin/groups/class_groupMail.inc:410
-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:714
-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:719
-#: plugins/admin/groups/class_groupMail.inc:798
-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:723
-#: plugins/personal/mail/class_mailAccount.inc:727
-#: plugins/addons/addressbook/class_addressbook.inc:588
-#: plugins/admin/ogroups/class_mailogroup.inc:70
-msgid "Please enter a valid email address in 'Primary address' field."
-msgstr ""
-"Bitte geben Sie eine gültige E-Mail-Adresse in das Feld 'Primäre Adresse' "
-"ein."
-
-#: plugins/personal/mail/class_mailAccount.inc:733
-#: plugins/admin/groups/class_groupMail.inc:807
-#: plugins/admin/ogroups/class_mailogroup.inc:77
-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:739
-#: plugins/admin/groups/class_groupMail.inc:813
-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:748
-#: plugins/admin/groups/class_groupMail.inc:822
-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:758
-#: plugins/admin/groups/class_groupMail.inc:830
-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:762
-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/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
 msgid "Mail settings"
 msgstr "Mail-Einstellungen"
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:871
+#: plugins/admin/systems/class_systemManagement.inc:872
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
-#: ihtml/themes/altlinux/setup_useradmin.tpl:30
 #: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/default/setup_useradmin.tpl:30
+#: ihtml/themes/altlinux/setup_useradmin.tpl:30
 #: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
+#: ihtml/themes/default/setup_useradmin.tpl:30 ihtml/themes/lhs/login.tpl:37
+#: ihtml/themes/lhs/login.tpl:41 ihtml/themes/lhs/setup_useradmin.tpl:30
 msgid "Password"
 msgstr "Passwort"
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:801
-#: plugins/admin/users/class_userManagement.inc:808
+#: plugins/admin/users/class_userManagement.inc:802
+#: plugins/admin/users/class_userManagement.inc:809
 msgid "Change password"
 msgstr "Passwort ändern"
 
@@ -1151,9 +1149,8 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
 #: plugins/addons/ldapmanager/contentexport.tpl:66
-#: plugins/admin/fai/class_faiManagement.inc:441
-#: plugins/admin/fai/faiNewBranch.tpl:52
-#: plugins/admin/departments/recursive_moce.tpl:10 include/functions.inc:1382
+#: plugins/admin/fai/faiNewBranch.tpl:50
+#: plugins/admin/departments/recursive_move.tpl:18 include/functions.inc:1382
 #: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_step3.tpl:17
@@ -1164,6 +1161,9 @@ msgstr ""
 #: ihtml/themes/default/setup_step3.tpl:17
 #: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_finish.tpl:30
+#: ihtml/themes/lhs/setup_useradmin.tpl:40 ihtml/themes/lhs/setup_step2.tpl:12
+#: ihtml/themes/lhs/setup_step3.tpl:17 ihtml/themes/lhs/setup_step4.tpl:114
+#: ihtml/themes/lhs/setup_finish.tpl:30
 msgid "Back"
 msgstr "Zurück"
 
@@ -1191,8 +1191,7 @@ msgstr ""
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
 #: plugins/admin/users/class_userManagement.inc:356
 msgid "The password you've entered as 'New password' is empty."
-msgstr ""
-"Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben ist leer."
+msgstr "Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben ist leer."
 
 #: plugins/personal/password/main.inc:59
 msgid "The password used as new and current are too similar."
@@ -1200,8 +1199,7 @@ msgstr "Das alte und neue Passwort sind sich zu 
 
 #: plugins/personal/password/main.inc:64
 msgid "The password used as new is to short."
-msgstr ""
-"Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben, ist zu kurz."
+msgstr "Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben, ist zu kurz."
 
 #: plugins/personal/password/main.inc:71
 msgid "You have no permissions to change your password."
@@ -1211,6 +1209,19 @@ msgstr "Sie haben keine Berechtigung ihr Passwort zu 
 msgid "External password changer reported a problem: "
 msgstr "Das externe Passwort-Änderungsprogramm hat einen Fehler gemeldet:"
 
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Wählen Sie die hinzuzufügenden Systeme"
+
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr "Zeige die Systeme der Abteilung"
+
+#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/systems/headpage.tpl:50
+msgid "Display systems matching"
+msgstr "Zeige die Systeme, auf die das Folgende passt"
+
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
 msgstr "Wählen Sie die hinzuzufügenden Gruppen"
@@ -1248,19 +1259,6 @@ msgstr "Der Benutzer muss beim ersten Anmelden sein Passwort 
 msgid "Password expires on"
 msgstr "Passwort läuft ab am"
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
-msgstr "Wählen Sie die hinzuzufügenden Systeme"
-
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
-msgstr "Zeige die Systeme der Abteilung"
-
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:50
-msgid "Display systems matching"
-msgstr "Zeige die Systeme, auf die das Folgende passt"
-
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
@@ -1319,6 +1317,10 @@ msgstr "System-Vertrauen"
 msgid "Trust mode"
 msgstr "Vertrauens-Modus"
 
+#: plugins/personal/posix/main.inc:131
+msgid "Unix settings"
+msgstr "UNIX-Einstellungen"
+
 #: plugins/personal/posix/class_posixAccount.inc:16
 #: plugins/generic/references/class_reference.inc:22
 msgid "UNIX"
@@ -1334,9 +1336,9 @@ msgid "unconfigured"
 msgstr "unkonfiguriert"
 
 #: plugins/personal/posix/class_posixAccount.inc:195
-#: plugins/admin/systems/class_terminalService.inc:141
 #: plugins/admin/systems/class_workstationService.inc:134
 #: plugins/admin/systems/class_workstationStartup.inc:623
+#: plugins/admin/systems/class_terminalService.inc:141
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:211
 msgid "automatic"
 msgstr "automatisch"
@@ -1381,8 +1383,7 @@ msgstr ""
 #: plugins/personal/posix/class_posixAccount.inc:455
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
-msgstr ""
-"Passwort kann bis zu %s Tage nach der letzten Änderung nicht geändert werden"
+msgstr "Passwort kann bis zu %s Tage nach der letzten Änderung nicht geändert werden"
 
 #: plugins/personal/posix/class_posixAccount.inc:457
 #, php-format
@@ -1535,7 +1536,7 @@ msgstr "Dezember"
 #: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/admin/systems/class_terminalGeneric.inc:60
 #: ihtml/themes/altlinux/setup_step4.tpl:91
-#: ihtml/themes/default/setup_step4.tpl:91
+#: ihtml/themes/default/setup_step4.tpl:91 ihtml/themes/lhs/setup_step4.tpl:91
 msgid "disabled"
 msgstr "deaktiviert"
 
@@ -1557,8 +1558,7 @@ msgstr "Das ben
 
 #: plugins/personal/posix/class_posixAccount.inc:910
 msgid "Please enter a valid path in 'Home directory' field."
-msgstr ""
-"Bitte geben Sie einen gültigen Pfad in das Feld 'Basisverzeichnis' ein."
+msgstr "Bitte geben Sie einen gültigen Pfad in das Feld 'Basisverzeichnis' ein."
 
 #: plugins/personal/posix/class_posixAccount.inc:918
 msgid "Value specified as 'UID' is not valid."
@@ -1596,13 +1596,11 @@ msgstr "'shadowWarning' in ohne die Angabe von 'shadowMax' ergibt keinen Sinn."
 
 #: plugins/personal/posix/class_posixAccount.inc:952
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
-msgstr ""
-"Der angegebene Wert 'shadowWarning' sollte kleiner als 'shadowMax' sein."
+msgstr "Der angegebene Wert 'shadowWarning' sollte kleiner als 'shadowMax' sein."
 
 #: plugins/personal/posix/class_posixAccount.inc:955
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
-msgstr ""
-"Der angegebene Wert 'shadowWarning' sollte größer als 'shadowMin' sein."
+msgstr "Der angegebene Wert 'shadowWarning' sollte größer als 'shadowMin' sein."
 
 #: plugins/personal/posix/class_posixAccount.inc:960
 msgid "Value specified as 'shadowInactive' is not valid."
@@ -1610,8 +1608,7 @@ msgstr "Der von ihnen angegebene Wert 'shadowInactive' ist nicht g
 
 #: plugins/personal/posix/class_posixAccount.inc:963
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
-msgstr ""
-"'shadowInactive' in ohne die Angabe von 'shadowMax' ergibt keinen Sinn."
+msgstr "'shadowInactive' in ohne die Angabe von 'shadowMax' ergibt keinen Sinn."
 
 #: plugins/personal/posix/class_posixAccount.inc:968
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
@@ -1624,10 +1621,6 @@ msgstr ""
 "Es sind zu viele Benutzer in der Datenbank. Es kann keine freie ID "
 "reserviert werden!"
 
-#: plugins/personal/posix/main.inc:131
-msgid "Unix settings"
-msgstr "UNIX-Einstellungen"
-
 #: plugins/personal/posix/paste_generic.tpl:4
 msgid "Posix settings"
 msgstr "UNIX-Einstellungen"
@@ -1758,6 +1751,10 @@ msgstr "Konto l
 msgid "Allow connection from these workstations only"
 msgstr "Erlaube Verbindungen nur von diesen Arbeitsstationen"
 
+#: plugins/personal/samba/main.inc:123
+msgid "Samba settings"
+msgstr "Samba-Einstellungen"
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "Wählen Sie die hinzuzufügenden Arbeitsstationen"
@@ -1766,10 +1763,6 @@ msgstr "W
 msgid "Display workstations of department"
 msgstr "Zeige die Arbeitsstationen der Abteilung"
 
-#: plugins/personal/samba/main.inc:123
-msgid "Samba settings"
-msgstr "Samba-Einstellungen"
-
 #: plugins/personal/samba/class_sambaAccount.inc:196
 msgid "This account has no samba extensions."
 msgstr "Dieses Konto besitzt keine Samba-Erweiterungen."
@@ -1847,8 +1840,7 @@ msgstr "Der als '%s' angegebene Wert enh
 
 #: plugins/personal/samba/class_sambaAccount.inc:653
 #, php-format
-msgid ""
-"The timeout property '%s' is checked and contains invalid or no characters!"
+msgid "The timeout property '%s' is checked and contains invalid or no characters!"
 msgstr ""
 "Die Zeitlimitoption '%s' ist ausgewählt, das entsprechende Feld enthält "
 "ungültige oder keine Zeichen!"
@@ -1877,6 +1869,10 @@ msgstr ""
 "Warnung: Die primäre Benutzergruppe kann nicht identifiziert werden, daher "
 "kann keine Umwandlung in eine Samba-Gruppe vorgenommen werden!"
 
+#: plugins/personal/environment/main.inc:124
+msgid "User environment settings"
+msgstr "Einstellungen der Benutzer-Umgebung"
+
 #: plugins/personal/environment/class_hotplugDialog.inc:111
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr "Bitte geben Sie einen gültigen Namen ein (0-9 und a-z sind erlaubt)."
@@ -1899,11 +1895,6 @@ msgstr "Ein Eintrag mit diesem Namen existiert bereits."
 msgid "Please select an entry or press cancel."
 msgstr "Bitte wählen Sie einen Eintrag oder 'Abbrechen'."
 
-#: plugins/personal/environment/class_selectPrinterDialog.inc:67
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:99
-msgid "Please select a printer or press cancel."
-msgstr "Bitte wählen Sie einen Drucker oder 'Abbrechen'."
-
 #: plugins/personal/environment/hotplugDialog.tpl:1
 msgid "Add hotplug devices"
 msgstr "Hotplug-Geräte hinzufügen"
@@ -1932,6 +1923,11 @@ msgstr "Zeige die Benutzer, auf die Folgendes passt"
 msgid "Regular expression for        matching hotplugs"
 msgstr "Regulärer Ausdruck zum Erkennen von Hotplug-Geräten"
 
+#: plugins/personal/environment/class_selectPrinterDialog.inc:67
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:99
+msgid "Please select a printer or press cancel."
+msgstr "Bitte wählen Sie einen Drucker oder 'Abbrechen'."
+
 #: plugins/personal/environment/class_environment.inc:253
 #: plugins/personal/environment/class_environment.inc:290
 msgid "Remove environment extension"
@@ -1979,8 +1975,8 @@ msgstr "keine"
 
 #: plugins/personal/environment/class_environment.inc:510
 #: plugins/personal/environment/class_environment.inc:521
-#: plugins/admin/systems/class_terminalStartup.inc:134
 #: plugins/admin/systems/class_workstationStartup.inc:503
+#: plugins/admin/systems/class_terminalStartup.inc:134
 msgid "You must specify a valid mount point."
 msgstr "Bitte geben Sie einen gültigen Mount-Pfad an!"
 
@@ -2089,9 +2085,9 @@ msgid "Resolution"
 msgstr "Auflösung"
 
 #: plugins/personal/environment/environment.tpl:105
-#: plugins/admin/systems/servservice.tpl:11
 #: plugins/admin/systems/workstationStartup.tpl:86
 #: plugins/admin/systems/terminalStartup.tpl:66
+#: plugins/admin/systems/servservice.tpl:11
 msgid "Shares"
 msgstr "Freigaben"
 
@@ -2105,13 +2101,14 @@ msgstr "Freigaben"
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:266
 #: plugins/admin/groups/class_groupMail.inc:537
 #: plugins/admin/applications/class_applicationParameters.inc:100
+#: plugins/admin/systems/glpiPrinter.tpl:122
 #: plugins/admin/systems/workstationStartup.tpl:101
-#: plugins/admin/systems/printer.tpl:48 plugins/admin/systems/servdns.tpl:8
+#: plugins/admin/systems/servdns.tpl:8
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/glpiManufacturer.tpl:8
-#: plugins/admin/systems/glpiPrinter.tpl:122
+#: plugins/admin/systems/printer.tpl:48
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:274
-#: ihtml/themes/altlinux/islocked.tpl:13
+#: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/lhs/islocked.tpl:13
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -2134,9 +2131,9 @@ msgid "Hotplug device settings"
 msgstr "Einstellungen der Hotplug-Geräte"
 
 #: plugins/personal/environment/environment.tpl:164
-#: plugins/admin/groups/class_groupManagement.inc:455
+#: plugins/admin/groups/class_groupManagement.inc:456
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:273
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
 msgid "New"
 msgstr "Neu"
 
@@ -2152,14 +2149,6 @@ msgstr "Drucker-Einstellungen"
 msgid "Admin Toggle"
 msgstr "Administrator an/aus"
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:96
-msgid "Specified name is invalid."
-msgstr "Der angegebene Name ist ungültig."
-
-#: plugins/personal/environment/class_logonManagementDialog.inc:100
-msgid "Specified description contains invalid characters."
-msgstr "Das Feld 'Beschreibung' enthält ungültige Zeichen!"
-
 #: plugins/personal/environment/logonManagement.tpl:8
 msgid "Logon script settings"
 msgstr "Einstellungen für Anmelde-Skripte"
@@ -2170,22 +2159,21 @@ msgstr "Skriptname"
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:41
+#: plugins/gofax/blocklists/generic.tpl:41 plugins/addons/godfs/generic.tpl:12
+#: plugins/addons/godfs/generic.tpl:38 plugins/admin/fai/faiVariable.tpl:19
 #: plugins/admin/fai/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiVariable.tpl:19
-#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
-#: plugins/admin/fai/faiProfile.tpl:19
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:11
-#: plugins/admin/fai/faiScript.tpl:19
+#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
+#: plugins/admin/fai/faiProfile.tpl:19 plugins/admin/fai/faiScript.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:17
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHookEntry.tpl:17
 #: plugins/admin/fai/faiTemplateEntry.tpl:11 plugins/admin/fai/faiHook.tpl:19
 #: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/component.tpl:25 plugins/admin/systems/server.tpl:25
-#: plugins/admin/systems/phone.tpl:25 plugins/admin/systems/printer.tpl:13
-#: plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/server.tpl:25 plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/component.tpl:25 plugins/admin/systems/phone.tpl:25
+#: plugins/admin/systems/printer.tpl:13
 #: plugins/admin/systems/wingeneric.tpl:25
 #: plugins/admin/ogroups/generic.tpl:13 plugins/gofon/macro/generic.tpl:36
 #: plugins/gofon/conference/generic.tpl:51
@@ -2217,49 +2205,28 @@ msgstr "Anmelde-Skript"
 
 #: plugins/personal/environment/logonManagement.tpl:75
 #: plugins/gofax/faxaccount/lists.tpl:31
-#: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiPackageConfiguration.tpl:6
+#: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiScriptEntry.tpl:68
+#: plugins/admin/fai/faiNewBranch.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:48
 #: plugins/admin/fai/faiPackageEntry.tpl:56
 #: plugins/admin/fai/faiHookEntry.tpl:70
 #: plugins/admin/fai/faiTemplateEntry.tpl:130
-#: plugins/admin/fai/faiNewBranch.tpl:19
-#: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/groups/application_options.tpl:8
-#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/systems/servRepositorySetup.tpl:41
+#: plugins/admin/systems/printerPPDDialog.tpl:22
 msgid "Apply"
 msgstr "Anwenden"
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:67
-#: plugins/personal/environment/class_kioskManagementDialog.inc:85
-#, php-format
-msgid "Can't delete '%s'. Error was: permission denied."
-msgstr ""
-"Kann Datei '%s' nicht entfernen. Die Fehlermeldung war: Zugriff verweigert."
+#: plugins/personal/environment/class_logonManagementDialog.inc:96
+msgid "Specified name is invalid."
+msgstr "Der angegebene Name ist ungültig."
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:70
-#: plugins/personal/environment/class_kioskManagementDialog.inc:88
-#, php-format
-msgid "Can't delete '%s'. Errow was: file doesn't exist."
-msgstr ""
-"Kann Datei '%s' nicht entfernen. Die Fehlermeldung war: Datei existiert "
-"nicht."
-
-#: plugins/personal/environment/class_kioskManagementDialog.inc:130
-msgid ""
-"There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
-msgstr ""
-"In Ihrer gosa.conf wurde kein 'KIOSKPATH' definiert. Die Verwaltung von "
-"KIOSK-Profilen ist nicht möglich."
-
-#: plugins/personal/environment/class_kioskManagementDialog.inc:136
-#, php-format
-msgid "Kiosk path '%s' is not accessible. Please check the permissions."
-msgstr ""
-"Auf den KIOSK-Pfad '%s' kann nicht zugegriffen werden. Bitte überprüfen Sie "
-"die Rechte."
+#: plugins/personal/environment/class_logonManagementDialog.inc:100
+msgid "Specified description contains invalid characters."
+msgstr "Das Feld 'Beschreibung' enthält ungültige Zeichen!"
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:1
 msgid "Create new hotplug entry"
@@ -2282,6 +2249,33 @@ msgstr "Ger
 msgid "save"
 msgstr "Sichern"
 
+#: plugins/personal/environment/class_kioskManagementDialog.inc:67
+#: plugins/personal/environment/class_kioskManagementDialog.inc:85
+#, php-format
+msgid "Can't delete '%s'. Error was: permission denied."
+msgstr "Kann Datei '%s' nicht entfernen. Die Fehlermeldung war: Zugriff verweigert."
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:70
+#: plugins/personal/environment/class_kioskManagementDialog.inc:88
+#, php-format
+msgid "Can't delete '%s'. Errow was: file doesn't exist."
+msgstr ""
+"Kann Datei '%s' nicht entfernen. Die Fehlermeldung war: Datei existiert "
+"nicht."
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:130
+msgid "There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
+msgstr ""
+"In Ihrer gosa.conf wurde kein 'KIOSKPATH' definiert. Die Verwaltung von "
+"KIOSK-Profilen ist nicht möglich."
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:136
+#, php-format
+msgid "Kiosk path '%s' is not accessible. Please check the permissions."
+msgstr ""
+"Auf den KIOSK-Pfad '%s' kann nicht zugegriffen werden. Bitte überprüfen Sie "
+"die Rechte."
+
 #: plugins/personal/environment/kioskManagement.tpl:1
 #: plugins/personal/environment/kioskManagement.tpl:5
 msgid "Kiosk profile management"
@@ -2294,20 +2288,163 @@ msgid "Browse"
 msgstr "Durchsuchen"
 
 #: plugins/personal/environment/kioskManagement.tpl:25
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
 #: plugins/admin/systems/glpi_edit_type.tpl:15
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:14
 #: plugins/admin/systems/glpiManufacturer.tpl:13
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
 #: plugins/admin/systems/glpi_edit_os.tpl:15
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:14
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
 #: include/class_MultiSelectWindow.inc:45
 msgid "Close"
 msgstr "Schliessen"
 
-#: plugins/personal/environment/main.inc:124
-msgid "User environment settings"
-msgstr "Einstellungen der Benutzer-Umgebung"
+#: plugins/personal/generic/class_user.inc:256
+msgid "female"
+msgstr "weiblich"
+
+#: plugins/personal/generic/class_user.inc:256
+msgid "male"
+msgstr "männlich"
+
+#: plugins/personal/generic/class_user.inc:270
+msgid "This account has no valid GOsa extensions."
+msgstr "Dieses Konto besitzt keine gültigen GOsa-Erweiterungen."
+
+#: plugins/personal/generic/class_user.inc:324
+msgid "The specified file has not been uploaded via HTTP POST! Aborted."
+msgstr ""
+"Die angegebene Datei wurde nicht über HTTP POST übertragen! Aktion "
+"abgebrochen."
+
+#: plugins/personal/generic/class_user.inc:420
+msgid "Please enter a valid serial number"
+msgstr "Bitte geben Sie eine gültige Seriennummer ein"
+
+#: plugins/personal/generic/class_user.inc:457
+#, php-format
+msgid "Certificate is valid from %s to %s and is currently %s."
+msgstr ""
+"Zertifkat ist gültig im Zeitraum von <b>%s</b> bis <b>%s</b> (momentan: <b>%"
+"s</b>)."
+
+#: plugins/personal/generic/class_user.inc:457
+msgid "valid"
+msgstr "gültig"
+
+#: plugins/personal/generic/class_user.inc:457
+msgid "invalid"
+msgstr "ungültig"
+
+#: plugins/personal/generic/class_user.inc:461
+msgid "No certificate installed"
+msgstr "Kein Zertifikat eingerichtet"
+
+#: plugins/personal/generic/class_user.inc:879
+msgid "Kerberos database communication failed"
+msgstr "Die Kommunikation mit der Kerberos-Datenbank ist fehlgeschlagen"
+
+#: plugins/personal/generic/class_user.inc:896
+msgid "Can't remove user from kerberos database."
+msgstr "Benutzer kann nicht aus der Kerberos-Datenbank entfernt werden."
+
+#: plugins/personal/generic/class_user.inc:907
+msgid "Can't add user to kerberos database."
+msgstr "Benutzer kann nicht zur Kerberos-Datenbank hinzugefügt werden."
+
+#: plugins/personal/generic/class_user.inc:947
+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:952
+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:958
+#: plugins/addons/addressbook/class_addressbook.inc:545
+#: plugins/admin/users/class_userManagement.inc:634
+msgid "The required field 'Name' is not set."
+msgstr "Das benötigte Feld 'Name' ist nicht gesetzt."
+
+#: plugins/personal/generic/class_user.inc:967
+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:973
+#: plugins/addons/addressbook/class_addressbook.inc:549
+#: plugins/admin/users/class_userManagement.inc:637
+msgid "The required field 'Given name' is not set."
+msgstr "Das benötigte Feld 'Vorname' ist nicht gesetzt."
+
+#: plugins/personal/generic/class_user.inc:976
+msgid "The required field 'Login' is not set."
+msgstr "Das benötigte Feld 'Kennung' ist nicht gesetzt."
+
+#: plugins/personal/generic/class_user.inc:983
+msgid ""
+"There's already a person with this 'Name'/'Given name' combination in the "
+"database."
+msgstr ""
+"Die von Ihnen angegebene Kombination aus 'Name'/'Vorname' ist bereits in der "
+"Datenbank vorhanden."
+
+#: plugins/personal/generic/class_user.inc:990
+msgid ""
+"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+"Das Feld 'Kennung' enthält ungültige Zeichen. Kleinbuchstaben, Zahlen und "
+"Bindestriche sind erlaubt."
+
+#: plugins/personal/generic/class_user.inc:993
+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:996
+#: plugins/personal/generic/class_user.inc:1021
+#: plugins/addons/addressbook/class_addressbook.inc:555
+#: plugins/addons/addressbook/class_addressbook.inc:583
+#: plugins/admin/departments/class_departmentGeneric.inc:211
+msgid "The field 'Name' contains invalid characters."
+msgstr "Das Feld 'Name' enthält ungültige Zeichen."
+
+#: plugins/personal/generic/class_user.inc:999
+#: plugins/personal/generic/class_user.inc:1018
+#: plugins/addons/addressbook/class_addressbook.inc:558
+#: plugins/addons/addressbook/class_addressbook.inc:580
+msgid "The field 'Given name' contains invalid characters."
+msgstr "Das Feld 'Vorname' enthält ungültige Zeichen."
+
+#: plugins/personal/generic/class_user.inc:1004
+#: plugins/addons/addressbook/class_addressbook.inc:563
+#: plugins/addons/addressbook/class_addressbook.inc:566
+#: plugins/admin/departments/class_departmentGeneric.inc:214
+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:1007
+#: plugins/addons/addressbook/class_addressbook.inc:569
+#: plugins/admin/departments/class_departmentGeneric.inc:217
+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:1010
+#: plugins/addons/addressbook/class_addressbook.inc:572
+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:1013
+#: plugins/addons/addressbook/class_addressbook.inc:575
+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:1140
+msgid "Could not open specified certificate!"
+msgstr "Die angegebene Datei konnte nicht geöffnet werden!"
 
 #: plugins/personal/generic/password.tpl:2
 msgid ""
@@ -2320,38 +2457,18 @@ msgstr ""
 "Passwort an dieser Stelle noch einmal eingeben, damit es von GOsa in der "
 "gewünschten Verschlüsselung abgelegt werden kann."
 
-#: plugins/personal/generic/generic_picture.tpl:5
-#: plugins/personal/generic/generic_picture.tpl:15
+#: 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_picture.tpl:5
+#: plugins/personal/generic/generic_picture.tpl:15
 #: plugins/personal/generic/paste_generic.tpl:41
 msgid "Personal picture"
 msgstr "Bild"
 
-#: plugins/personal/generic/generic_picture.tpl:27
-#: plugins/personal/generic/paste_generic.tpl:27
-msgid "Remove picture"
-msgstr "Bild entfernen"
-
-#: plugins/personal/generic/generic_picture.tpl:33
-#: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
-#: plugins/admin/systems/servnfs.tpl:75
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
-#: plugins/admin/systems/servdnseditzone.tpl:117
-#: plugins/admin/systems/glpi_devices.tpl:760
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
-#: include/class_MultiSelectWindow.inc:44
-#: ihtml/themes/default/copyPasteDialog.tpl:12
-msgid "Save"
-msgstr "Sichern"
-
-#: plugins/personal/generic/generic.tpl:6
-msgid "Personal information"
-msgstr "Persönliche Informationen"
-
 #: plugins/personal/generic/generic.tpl:24
 #: plugins/personal/generic/generic.tpl:34
 msgid "Change picture"
@@ -2382,8 +2499,8 @@ msgid "Login"
 msgstr "Kennung"
 
 #: plugins/personal/generic/generic.tpl:67
-#: plugins/addons/addressbook/address_info.tpl:22
 #: plugins/addons/addressbook/address_edit.tpl:54
+#: plugins/addons/addressbook/address_info.tpl:22
 msgid "Personal title"
 msgstr "Titel"
 
@@ -2397,7 +2514,7 @@ msgstr "Geburtsdatum"
 
 #: plugins/personal/generic/generic.tpl:100
 #: ihtml/themes/altlinux/sizelimit.tpl:14
-#: ihtml/themes/default/sizelimit.tpl:14
+#: ihtml/themes/default/sizelimit.tpl:14 ihtml/themes/lhs/sizelimit.tpl:14
 msgid "Set"
 msgstr "Setzen"
 
@@ -2411,30 +2528,31 @@ msgid "Preferred langage"
 msgstr "Bevorzugte Sprache"
 
 #: plugins/personal/generic/generic.tpl:127
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
 #: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/admin/fai/class_faiManagement.inc:670
-#: plugins/admin/groups/class_groupManagement.inc:458
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
+#: plugins/addons/godfs/class_dfsManagment.inc:186
+#: plugins/admin/fai/class_faiManagement.inc:678
+#: plugins/admin/groups/class_groupManagement.inc:459
 #: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/users/class_userManagement.inc:786
+#: plugins/admin/users/class_userManagement.inc:787
 #: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_applicationManagement.inc:477
+#: plugins/admin/applications/class_applicationManagement.inc:480
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_departmentManagement.inc:302
-#: plugins/admin/systems/component.tpl:13 plugins/admin/systems/server.tpl:13
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/terminal.tpl:18
-#: plugins/admin/systems/class_systemManagement.inc:771
-#: plugins/admin/systems/printer.tpl:20
+#: plugins/admin/departments/class_departmentManagement.inc:303
+#: plugins/admin/systems/server.tpl:13 plugins/admin/systems/terminal.tpl:18
 #: plugins/admin/systems/workstation.tpl:27
+#: plugins/admin/systems/component.tpl:13
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/phone.tpl:13
+#: plugins/admin/systems/class_systemManagement.inc:772
+#: plugins/admin/systems/printer.tpl:20
 #: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:43
-#: plugins/admin/ogroups/class_ogroupManagement.inc:451
-#: plugins/admin/ogroups/generic.tpl:21
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:330
-#: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/ogroups/class_ogroupManagement.inc:452
+#: plugins/admin/ogroups/generic.tpl:21 plugins/gofon/macro/generic.tpl:20
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 #: plugins/gofon/conference/generic.tpl:33
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
 msgid "Base"
 msgstr "Basis"
 
@@ -2445,10 +2563,10 @@ msgstr "W
 #: plugins/personal/generic/generic.tpl:134
 #: plugins/admin/groups/generic.tpl:26
 #: plugins/admin/departments/generic.tpl:33
-#: plugins/admin/systems/component.tpl:18 plugins/admin/systems/server.tpl:18
-#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/terminal.tpl:23
-#: plugins/admin/systems/printer.tpl:25
+#: plugins/admin/systems/server.tpl:18 plugins/admin/systems/terminal.tpl:23
 #: plugins/admin/systems/workstation.tpl:32
+#: plugins/admin/systems/component.tpl:18 plugins/admin/systems/phone.tpl:18
+#: plugins/admin/systems/printer.tpl:25
 #: plugins/admin/systems/wingeneric.tpl:18
 #: plugins/admin/ogroups/generic.tpl:26
 msgid "Select a base"
@@ -2456,10 +2574,10 @@ msgstr "W
 
 #: plugins/personal/generic/generic.tpl:147
 #: plugins/personal/generic/generic.tpl:291
-#: plugins/addons/addressbook/address_info.tpl:33
-#: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/addons/addressbook/address_edit.tpl:72
 #: plugins/addons/addressbook/address_edit.tpl:182
+#: plugins/addons/addressbook/address_info.tpl:33
+#: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/admin/departments/generic.tpl:55
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
 msgid "Address"
@@ -2503,17 +2621,17 @@ msgid "Organization"
 msgstr "Organisation"
 
 #: plugins/personal/generic/generic.tpl:213
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:323
-#: plugins/addons/addressbook/address_info.tpl:64
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
 #: plugins/addons/addressbook/address_edit.tpl:138
-#: plugins/admin/groups/class_groupManagement.inc:523
-#: plugins/admin/users/class_userManagement.inc:818
-#: plugins/admin/applications/class_applicationManagement.inc:518
-#: plugins/admin/systems/class_systemManagement.inc:791
-#: plugins/admin/ogroups/class_ogroupManagement.inc:517
-#: plugins/admin/ogroups/class_ogroupManagement.inc:585
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
-#: plugins/generic/references/class_reference.inc:38
+#: plugins/addons/addressbook/address_info.tpl:64
+#: plugins/admin/groups/class_groupManagement.inc:524
+#: plugins/admin/users/class_userManagement.inc:819
+#: plugins/admin/applications/class_applicationManagement.inc:521
+#: plugins/admin/systems/class_systemManagement.inc:792
+#: plugins/admin/ogroups/class_ogroupManagement.inc:518
+#: plugins/admin/ogroups/class_ogroupManagement.inc:586
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#: plugins/generic/references/class_reference.inc:38
 msgid "Department"
 msgstr "Abteilung"
 
@@ -2536,12 +2654,13 @@ msgstr "Zimmer-Nr."
 
 #: plugins/personal/generic/generic.tpl:257
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_info.tpl:40
-#: plugins/addons/addressbook/address_edit.tpl:95 html/getxls.php:236
+#: 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:283
+#: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:43
 #: plugins/admin/departments/generic.tpl:51
 #: plugins/admin/systems/workstation.tpl:18 html/getxls.php:174
@@ -2587,8 +2706,8 @@ msgid "Street"
 msgstr "Straße"
 
 #: plugins/personal/generic/generic.tpl:365
-#: plugins/addons/addressbook/address_info.tpl:70
-#: plugins/addons/addressbook/address_edit.tpl:158 html/getxls.php:174
+#: plugins/addons/addressbook/address_edit.tpl:158
+#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
 msgid "Postal code"
 msgstr "Postleitzahl"
 
@@ -2608,6 +2727,26 @@ msgstr "letzte 
 msgid "Public visible"
 msgstr "Öffentlich sichtbar"
 
+#: plugins/personal/generic/generic_picture.tpl:27
+#: plugins/personal/generic/paste_generic.tpl:27
+msgid "Remove picture"
+msgstr "Bild entfernen"
+
+#: plugins/personal/generic/generic_picture.tpl:33
+#: plugins/addons/addressbook/address_edit.tpl:233
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
+#: plugins/admin/systems/servnfs.tpl:75
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
+#: plugins/admin/systems/servdnseditzone.tpl:117
+#: plugins/admin/systems/glpi_devices.tpl:760
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
+#: include/class_MultiSelectWindow.inc:44
+#: ihtml/themes/default/copyPasteDialog.tpl:12
+msgid "Save"
+msgstr "Sichern"
+
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr "Standard-Zertifikat"
@@ -2624,153 +2763,6 @@ msgstr "PKCS12-Zertifikat"
 msgid "Certificate serial number"
 msgstr "Zertifikat-Seriennummer"
 
-#: plugins/personal/generic/class_user.inc:256
-msgid "female"
-msgstr "weiblich"
-
-#: plugins/personal/generic/class_user.inc:256
-msgid "male"
-msgstr "männlich"
-
-#: plugins/personal/generic/class_user.inc:270
-msgid "This account has no valid GOsa extensions."
-msgstr "Dieses Konto besitzt keine gültigen GOsa-Erweiterungen."
-
-#: plugins/personal/generic/class_user.inc:324
-msgid "The specified file has not been uploaded via HTTP POST! Aborted."
-msgstr ""
-"Die angegebene Datei wurde nicht über HTTP POST übertragen! Aktion "
-"abgebrochen."
-
-#: plugins/personal/generic/class_user.inc:420
-msgid "Please enter a valid serial number"
-msgstr "Bitte geben Sie eine gültige Seriennummer ein"
-
-#: plugins/personal/generic/class_user.inc:457
-#, php-format
-msgid "Certificate is valid from %s to %s and is currently %s."
-msgstr ""
-"Zertifkat ist gültig im Zeitraum von <b>%s</b> bis <b>%s</b> (momentan: <b>%"
-"s</b>)."
-
-#: plugins/personal/generic/class_user.inc:457
-msgid "valid"
-msgstr "gültig"
-
-#: plugins/personal/generic/class_user.inc:457
-msgid "invalid"
-msgstr "ungültig"
-
-#: plugins/personal/generic/class_user.inc:461
-msgid "No certificate installed"
-msgstr "Kein Zertifikat eingerichtet"
-
-#: plugins/personal/generic/class_user.inc:879
-msgid "Kerberos database communication failed"
-msgstr "Die Kommunikation mit der Kerberos-Datenbank ist fehlgeschlagen"
-
-#: plugins/personal/generic/class_user.inc:896
-msgid "Can't remove user from kerberos database."
-msgstr "Benutzer kann nicht aus der Kerberos-Datenbank entfernt werden."
-
-#: plugins/personal/generic/class_user.inc:907
-msgid "Can't add user to kerberos database."
-msgstr "Benutzer kann nicht zur Kerberos-Datenbank hinzugefügt werden."
-
-#: plugins/personal/generic/class_user.inc:947
-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:952
-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:958
-#: plugins/addons/addressbook/class_addressbook.inc:545
-#: plugins/admin/users/class_userManagement.inc:634
-msgid "The required field 'Name' is not set."
-msgstr "Das benötigte Feld 'Name' ist nicht gesetzt."
-
-#: plugins/personal/generic/class_user.inc:967
-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:973
-#: plugins/addons/addressbook/class_addressbook.inc:549
-#: plugins/admin/users/class_userManagement.inc:637
-msgid "The required field 'Given name' is not set."
-msgstr "Das benötigte Feld 'Vorname' ist nicht gesetzt."
-
-#: plugins/personal/generic/class_user.inc:976
-msgid "The required field 'Login' is not set."
-msgstr "Das benötigte Feld 'Kennung' ist nicht gesetzt."
-
-#: plugins/personal/generic/class_user.inc:983
-msgid ""
-"There's already a person with this 'Name'/'Given name' combination in the "
-"database."
-msgstr ""
-"Die von Ihnen angegebene Kombination aus 'Name'/'Vorname' ist bereits in der "
-"Datenbank vorhanden."
-
-#: plugins/personal/generic/class_user.inc:990
-msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-"Das Feld 'Kennung' enthält ungültige Zeichen. Kleinbuchstaben, Zahlen und "
-"Bindestriche sind erlaubt."
-
-#: plugins/personal/generic/class_user.inc:993
-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:996
-#: plugins/personal/generic/class_user.inc:1021
-#: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/addons/addressbook/class_addressbook.inc:583
-#: plugins/admin/departments/class_departmentGeneric.inc:211
-msgid "The field 'Name' contains invalid characters."
-msgstr "Das Feld 'Name' enthält ungültige Zeichen."
-
-#: plugins/personal/generic/class_user.inc:999
-#: plugins/personal/generic/class_user.inc:1018
-#: plugins/addons/addressbook/class_addressbook.inc:558
-#: plugins/addons/addressbook/class_addressbook.inc:580
-msgid "The field 'Given name' contains invalid characters."
-msgstr "Das Feld 'Vorname' enthält ungültige Zeichen."
-
-#: plugins/personal/generic/class_user.inc:1004
-#: plugins/addons/addressbook/class_addressbook.inc:563
-#: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/admin/departments/class_departmentGeneric.inc:214
-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:1007
-#: plugins/addons/addressbook/class_addressbook.inc:569
-#: plugins/admin/departments/class_departmentGeneric.inc:217
-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:1010
-#: plugins/addons/addressbook/class_addressbook.inc:572
-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:1013
-#: plugins/addons/addressbook/class_addressbook.inc:575
-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:1140
-msgid "Could not open specified certificate!"
-msgstr "Die angegebene Datei konnte nicht geöffnet werden!"
-
 #: plugins/personal/generic/main.inc:107
 msgid "You are not allowed to set your password!"
 msgstr "Sie haben keine Berechtigung, ihr Passwort zu ändern!"
@@ -2817,14 +2809,18 @@ msgstr "PPTP-Konto"
 msgid "Intranet account"
 msgstr "Intranet-Konto"
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:6
-msgid "WebDAV"
-msgstr "WebDAV"
-
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "phpGroupware-Konto"
 
+#: plugins/personal/connectivity/glpi.tpl:1
+msgid "GLPI account"
+msgstr "GLPI-Konto"
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:6
+msgid "WebDAV"
+msgstr "WebDAV"
+
 #: plugins/personal/connectivity/kolab.tpl:1
 msgid "Kolab account"
 msgstr "Kolab-Konto"
@@ -2926,10 +2922,6 @@ msgstr "W
 msgid "Temporary disable FTP access"
 msgstr "Temporäres Abschalten des FTP-Zugriffs"
 
-#: plugins/personal/connectivity/glpi.tpl:1
-msgid "GLPI account"
-msgstr "GLPI-Konto"
-
 #: plugins/personal/connectivity/oxchange.tpl:2
 msgid "Open-Xchange Account"
 msgstr "Open-Xchange Konto"
@@ -2962,6 +2954,27 @@ msgstr "Benutzerinformation"
 msgid "User Timezone"
 msgstr "Zeitzone des Benutzers"
 
+#: plugins/personal/connectivity/opengw.tpl:1
+msgid "Opengroupware"
+msgstr "Opengroupware"
+
+#: plugins/personal/connectivity/opengw.tpl:8
+msgid "Location team"
+msgstr "Örtliches Team"
+
+#: plugins/personal/connectivity/opengw.tpl:21
+msgid "Template user"
+msgstr "Benutzer-Vorlage"
+
+#: plugins/personal/connectivity/opengw.tpl:34
+#: plugins/admin/systems/class_workstationGeneric.inc:71
+msgid "Locked"
+msgstr "Gesperrt"
+
+#: plugins/personal/connectivity/opengw.tpl:49
+msgid "Teams"
+msgstr "Teams"
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
@@ -2998,16 +3011,40 @@ msgstr "Das numerische Feld der Kontingent-Einstellung ist leer."
 
 #: plugins/personal/connectivity/class_proxyAccount.inc:174
 msgid "Numerical value for Quota Setting is not valid."
-msgstr ""
-"Das numerische Feld der Kontingent-Einstellung enthält einen ungültigen Wert."
+msgstr "Das numerische Feld der Kontingent-Einstellung enthält einen ungültigen Wert."
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:14
+msgid "Intranet"
+msgstr "Intranet"
 
 #: plugins/personal/connectivity/class_pptpAccount.inc:26
 msgid "PPTP"
 msgstr "PPTP"
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:14
-msgid "Intranet"
-msgstr "Intranet"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
+msgstr "FTP"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+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:140
+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:143
+msgid "Value specified as 'Files' is not valid."
+msgstr "Das Feld 'Dateien' enthält eine ungültige Eingabe."
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:146
+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:149
+msgid "Value specified as 'Ratio' is not valid."
+msgstr "Das Feld 'Verhältins' enthält eine ungültige Eingabe."
 
 #: plugins/personal/connectivity/class_phpgwAccount.inc:5
 msgid "PHPGroupware"
@@ -3022,8 +3059,7 @@ msgid "Kolab"
 msgstr "Kolab"
 
 #: plugins/personal/connectivity/class_kolabAccount.inc:105
-msgid ""
-"You're trying to add an invalid email address to the list of delegations."
+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."
@@ -3080,30 +3116,9 @@ msgstr ""
 "Es gibt keinen Mail Benutzer mit der Adresse %s für Ihre Einladungs-"
 "Richtlinie!"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
-#: plugins/generic/references/class_reference.inc:34
-msgid "FTP"
-msgstr "FTP"
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
-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:140
-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:143
-msgid "Value specified as 'Files' is not valid."
-msgstr "Das Feld 'Dateien' enthält eine ungültige Eingabe."
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:146
-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:149
-msgid "Value specified as 'Ratio' is not valid."
-msgstr "Das Feld 'Verhältins' enthält eine ungültige Eingabe."
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
+msgstr "WebDAV-Konto"
 
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:24
 msgid "Open-Xchange"
@@ -3161,39 +3176,6 @@ msgstr ""
 msgid "you are not using any strange characters in the loginname."
 msgstr "Sie verwenden keine ungewöhnlichen Zeichen im Benutzernamen."
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
-msgstr "WebDAV-Konto"
-
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
-msgid "PHPscheduleit"
-msgstr "PHPscheduleit"
-
-#: plugins/personal/connectivity/class_connectivity.inc:63
-msgid "This account has no connectivity extensions."
-msgstr "Dieses Konto besitzt keine Konnektivitäts-Erweiterungen."
-
-#: plugins/personal/connectivity/opengw.tpl:1
-msgid "Opengroupware"
-msgstr "Opengroupware"
-
-#: plugins/personal/connectivity/opengw.tpl:8
-msgid "Location team"
-msgstr "Örtliches Team"
-
-#: plugins/personal/connectivity/opengw.tpl:21
-msgid "Template user"
-msgstr "Benutzer-Vorlage"
-
-#: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:71
-msgid "Locked"
-msgstr "Gesperrt"
-
-#: plugins/personal/connectivity/opengw.tpl:49
-msgid "Teams"
-msgstr "Teams"
-
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 msgid "Opengroupware account"
 msgstr "Opengroupware-Konto"
@@ -3218,6 +3200,57 @@ msgid ""
 "configuration twice."
 msgstr "OpenGroupware: Die angegebene Datenbank kann nicht erreicht werden."
 
+#: plugins/personal/connectivity/class_connectivity.inc:63
+msgid "This account has no connectivity extensions."
+msgstr "Dieses Konto besitzt keine Konnektivitäts-Erweiterungen."
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
+msgid "PHPscheduleit"
+msgstr "PHPscheduleit"
+
+#: plugins/gofax/blocklists/generic.tpl:8
+msgid "List name"
+msgstr "Listenname"
+
+#: plugins/gofax/blocklists/generic.tpl:10
+msgid "Name of blocklist"
+msgstr "Name der Sperrliste"
+
+#: plugins/gofax/blocklists/generic.tpl:16
+msgid "Select subtree to place blocklist in"
+msgstr "Wählen Sie den Teilbaum, in den die Sperrliste plaziert werden soll."
+
+#: plugins/gofax/blocklists/generic.tpl:32
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/systems/workstationService.tpl:42
+#: plugins/admin/systems/workstationService.tpl:120
+#: plugins/admin/systems/servnfs.tpl:39
+#: plugins/admin/systems/terminalService.tpl:42
+#: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/systems/glpi_devices.tpl:427
+#: plugins/admin/systems/glpi_devices.tpl:492
+#: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
+#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
+msgid "Type"
+msgstr "Typ"
+
+#: plugins/gofax/blocklists/generic.tpl:34
+msgid "Select wether to filter incoming or outgoing calls"
+msgstr "Wählen Sie, ob ein- oder abgehende Rufe gefiltert werden sollen"
+
+#: plugins/gofax/blocklists/generic.tpl:43
+msgid "Descriptive text for this blocklist"
+msgstr "Beschreibender Text zu dieser Sperrliste"
+
+#: plugins/gofax/blocklists/generic.tpl:56
+msgid "Blocked numbers"
+msgstr "Gesperrte Nummern"
+
+#: plugins/gofax/blocklists/generic.tpl:72
+msgid "Numbers can also contain wild cards."
+msgstr "Nummern können auch Platzhalter enthalten."
+
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
 msgid "FAX Blocklists"
 msgstr "Fax-Sperrlisten"
@@ -3236,74 +3269,76 @@ msgid "Please specify a valid phone number."
 msgstr "Bitte geben Sie eine gültige Telefonnummer an."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/admin/fai/class_faiManagement.inc:635
+#: plugins/admin/fai/class_faiManagement.inc:641
 #: plugins/admin/groups/class_groupManagement.inc:451
 #: plugins/admin/users/class_userManagement.inc:778
-#: plugins/admin/applications/class_applicationManagement.inc:470
+#: plugins/admin/applications/class_applicationManagement.inc:472
 #: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
 #: plugins/admin/ogroups/class_ogroupManagement.inc:442
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
-msgid "Go up one department"
-msgstr "Eine Abteilung nach oben"
+msgid "Go to root department"
+msgstr "Gehe zur Wurzel-Abteilung"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/admin/fai/class_faiManagement.inc:635
-#: plugins/admin/fai/class_faiProfile.inc:303
+#: plugins/addons/godfs/class_dfsManagment.inc:183
+#: plugins/admin/fai/class_faiManagement.inc:641
 #: plugins/admin/groups/class_groupManagement.inc:451
 #: plugins/admin/users/class_userManagement.inc:778
-#: plugins/admin/applications/class_applicationManagement.inc:470
+#: plugins/admin/applications/class_applicationManagement.inc:472
 #: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
-#: plugins/admin/systems/class_servDNSeditZone.inc:276
+#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: plugins/admin/ogroups/class_ogroupManagement.inc:442
-#: plugins/admin/ogroups/phonequeue.tpl:17
+#: plugins/admin/ogroups/class_ogroupManagement.inc:443
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
-msgid "Up"
-msgstr "Auf"
+msgid "Root"
+msgstr "Wurzel"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
-#: plugins/admin/fai/class_faiManagement.inc:638
+#: plugins/admin/fai/class_faiManagement.inc:644
 #: plugins/admin/groups/class_groupManagement.inc:452
 #: plugins/admin/users/class_userManagement.inc:779
-#: plugins/admin/applications/class_applicationManagement.inc:471
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:297
-#: plugins/admin/systems/class_systemManagement.inc:755
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_systemManagement.inc:755
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/class_ogroupManagement.inc:443
+#: plugins/admin/ogroups/class_ogroupManagement.inc:444
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
-msgid "Go to root department"
-msgstr "Gehe zur Wurzel-Abteilung"
+msgid "Go up one department"
+msgstr "Eine Abteilung nach oben"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
-#: plugins/admin/fai/class_faiManagement.inc:638
+#: plugins/addons/godfs/class_dfsManagment.inc:182
+#: plugins/admin/fai/class_faiManagement.inc:644
+#: plugins/admin/fai/class_faiProfile.inc:303
 #: plugins/admin/groups/class_groupManagement.inc:452
 #: plugins/admin/users/class_userManagement.inc:779
-#: plugins/admin/applications/class_applicationManagement.inc:471
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:297
-#: plugins/admin/systems/class_systemManagement.inc:755
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_systemManagement.inc:755
+#: plugins/admin/systems/class_servDNSeditZone.inc:276
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
 #: plugins/admin/ogroups/class_ogroupManagement.inc:444
+#: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
-msgid "Root"
-msgstr "Wurzel"
+msgid "Up"
+msgstr "Auf"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:309
 #: plugins/admin/groups/class_groupManagement.inc:453
 #: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:472
-#: plugins/admin/systems/class_systemManagement.inc:757
+#: plugins/admin/applications/class_applicationManagement.inc:474
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
 #: plugins/admin/ogroups/class_ogroupManagement.inc:445
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
@@ -3312,13 +3347,13 @@ msgid "Go to users department"
 msgstr "Gehe zur Abteilung des Benutzers"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:309
-#: plugins/admin/fai/class_faiManagement.inc:641
+#: plugins/admin/fai/class_faiManagement.inc:647
 #: plugins/admin/groups/class_groupManagement.inc:453
 #: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:472
+#: plugins/admin/applications/class_applicationManagement.inc:474
 #: plugins/admin/departments/class_departmentManagement.inc:298
-#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
 #: plugins/admin/ogroups/class_ogroupManagement.inc:446
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
@@ -3326,236 +3361,223 @@ msgstr "Gehe zur Abteilung des Benutzers"
 msgid "Home"
 msgstr "Heimat"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
+#: plugins/admin/fai/class_faiManagement.inc:649
+#: plugins/admin/groups/class_groupManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:781
+#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/departments/class_departmentManagement.inc:299
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/ogroups/class_ogroupManagement.inc:447
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
+msgid "Reload list"
+msgstr "Liste neu laden"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
+#: plugins/addons/godfs/class_dfsManagment.inc:187
+#: plugins/admin/fai/class_faiManagement.inc:649
+#: plugins/admin/fai/class_faiManagement.inc:679
+#: plugins/admin/groups/class_groupManagement.inc:454
+#: plugins/admin/groups/class_groupManagement.inc:460
+#: plugins/admin/users/class_userManagement.inc:781
+#: plugins/admin/users/class_userManagement.inc:788
+#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/applications/class_applicationManagement.inc:481
+#: plugins/admin/departments/class_departmentManagement.inc:299
+#: plugins/admin/departments/class_departmentManagement.inc:304
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/ogroups/class_ogroupManagement.inc:447
+#: plugins/admin/ogroups/class_ogroupManagement.inc:453
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:332
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
+msgid "Submit"
+msgstr "Übertragen"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
 msgid "Create new blocklist"
 msgstr "Erzeuge neue Sperrliste"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
 msgid "New Blocklist"
 msgstr "Neue Sperrlisten"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/fai/class_faiManagement.inc:671
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:787
-#: plugins/admin/applications/class_applicationManagement.inc:478
-#: plugins/admin/departments/class_departmentManagement.inc:303
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_glpiSelectUser.inc:168
-#: plugins/admin/ogroups/class_ogroupManagement.inc:452
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
+#: plugins/addons/godfs/class_dfsManagment.inc:187
+#: plugins/admin/fai/class_faiManagement.inc:679
+#: plugins/admin/groups/class_groupManagement.inc:460
+#: plugins/admin/users/class_userManagement.inc:788
+#: plugins/admin/applications/class_applicationManagement.inc:481
+#: plugins/admin/departments/class_departmentManagement.inc:304
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/ogroups/class_ogroupManagement.inc:453
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:332
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
 msgid "Submit department"
 msgstr "Aktualisieren"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/fai/class_faiManagement.inc:671
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:787
-#: plugins/admin/applications/class_applicationManagement.inc:478
-#: plugins/admin/departments/class_departmentManagement.inc:303
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_glpiSelectUser.inc:168
-#: plugins/admin/ogroups/class_ogroupManagement.inc:452
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
-msgid "Submit"
-msgstr "Übertragen"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
 #: plugins/admin/fai/class_faiScript.inc:227
 #: plugins/admin/fai/class_faiScript.inc:230
-#: plugins/admin/fai/class_faiManagement.inc:689
-#: plugins/admin/fai/class_faiManagement.inc:789
-#: plugins/admin/fai/class_faiManagement.inc:794
+#: plugins/admin/fai/class_faiManagement.inc:697
+#: plugins/admin/fai/class_faiManagement.inc:797
+#: plugins/admin/fai/class_faiManagement.inc:802
 #: plugins/admin/fai/class_faiHook.inc:251
 #: plugins/admin/fai/class_faiHook.inc:254
-#: plugins/admin/groups/class_groupManagement.inc:469
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/users/class_userManagement.inc:798
-#: plugins/admin/users/class_userManagement.inc:805
-#: plugins/admin/applications/class_applicationManagement.inc:489
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/departments/class_departmentManagement.inc:310
-#: plugins/admin/systems/class_systemManagement.inc:780
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/groups/class_groupManagement.inc:470
+#: plugins/admin/groups/class_groupManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:806
+#: plugins/admin/applications/class_applicationManagement.inc:492
+#: plugins/admin/applications/class_applicationManagement.inc:498
+#: plugins/admin/departments/class_departmentManagement.inc:311
 #: plugins/admin/systems/glpi.tpl:15 plugins/admin/systems/glpi.tpl:25
 #: plugins/admin/systems/glpi.tpl:35 plugins/admin/systems/glpiPrinter.tpl:15
 #: plugins/admin/systems/glpiPrinter.tpl:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:464
-#: plugins/admin/ogroups/class_ogroupManagement.inc:469
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/ogroups/class_ogroupManagement.inc:465
+#: plugins/admin/ogroups/class_ogroupManagement.inc:470
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
 msgid "edit"
 msgstr "Bearbeiten"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
-#: plugins/admin/users/class_userManagement.inc:799
-#: plugins/admin/users/class_userManagement.inc:806
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
+#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:807
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 msgid "Edit user"
 msgstr "Benutzer bearbeiten"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
 #: plugins/addons/mailqueue/contents.tpl:93
 #: plugins/admin/fai/class_faiScript.inc:231
-#: plugins/admin/fai/class_faiManagement.inc:690
-#: plugins/admin/fai/class_faiManagement.inc:796
+#: plugins/admin/fai/class_faiManagement.inc:698
+#: plugins/admin/fai/class_faiManagement.inc:804
 #: plugins/admin/fai/class_faiHook.inc:255
-#: plugins/admin/groups/class_groupManagement.inc:471
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/users/class_userManagement.inc:802
-#: plugins/admin/users/class_userManagement.inc:809
-#: plugins/admin/applications/class_applicationManagement.inc:491
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/departments/class_departmentManagement.inc:311
-#: plugins/admin/systems/class_systemManagement.inc:781
-#: plugins/admin/ogroups/class_ogroupManagement.inc:466
-#: plugins/admin/ogroups/class_ogroupManagement.inc:471
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
+#: plugins/admin/groups/class_groupManagement.inc:472
+#: plugins/admin/groups/class_groupManagement.inc:477
+#: plugins/admin/users/class_userManagement.inc:803
+#: plugins/admin/users/class_userManagement.inc:810
+#: plugins/admin/applications/class_applicationManagement.inc:494
+#: plugins/admin/applications/class_applicationManagement.inc:500
+#: plugins/admin/departments/class_departmentManagement.inc:312
+#: plugins/admin/systems/class_systemManagement.inc:782
+#: plugins/admin/ogroups/class_ogroupManagement.inc:467
+#: plugins/admin/ogroups/class_ogroupManagement.inc:472
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:338
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
 msgid "delete"
 msgstr "Entfernen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
-#: plugins/admin/users/class_userManagement.inc:803
-#: plugins/admin/users/class_userManagement.inc:810
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
+#: plugins/admin/users/class_userManagement.inc:804
+#: plugins/admin/users/class_userManagement.inc:811
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:338
 msgid "Delete user"
 msgstr "Benutzer entfernen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:323
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
 msgid "Blocklist name"
 msgstr "Name der Sperrliste"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:325
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/fai/class_faiManagement.inc:686
-#: plugins/admin/groups/class_groupManagement.inc:525
-#: plugins/admin/users/class_userManagement.inc:820
-#: plugins/admin/applications/class_applicationManagement.inc:519
-#: plugins/admin/departments/class_departmentManagement.inc:318
-#: plugins/admin/systems/class_systemManagement.inc:792
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/fai/class_faiManagement.inc:694
+#: plugins/admin/groups/class_groupManagement.inc:526
+#: plugins/admin/users/class_userManagement.inc:821
+#: plugins/admin/applications/class_applicationManagement.inc:522
+#: plugins/admin/departments/class_departmentManagement.inc:319
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
-#: plugins/admin/ogroups/class_ogroupManagement.inc:494
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
+#: plugins/admin/systems/class_systemManagement.inc:793
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/ogroups/class_ogroupManagement.inc:495
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:345
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:313
 msgid "Actions"
 msgstr "Aktionen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:327
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:328
 msgid "This table displays faxblocklists for the selected tree."
 msgstr "Diese Tabelle enthält Sperrlisten des ausgewählten Unterbaums."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:395
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:396
 msgid "send"
 msgstr "senden"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:395
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:396
 msgid "receive"
 msgstr "empfangen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:543
 msgid "You have no permissions to create a blocklist on this 'Base'."
-msgstr ""
-"Sie haben keine Berechtigung, eine Sperrliste unter dieser 'Basis' anzulegen."
+msgstr "Sie haben keine Berechtigung, eine Sperrliste unter dieser 'Basis' anzulegen."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:548
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:549
 #: plugins/admin/departments/class_departmentGeneric.inc:199
 msgid "Required field 'Name' is not set."
 msgstr "Das benötigte Feld 'Name' ist nicht ausgefüllt."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:551
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:552
 msgid "Required field 'Name' contains invalid characters"
 msgstr "Das benötigte Feld 'Name' enthält ungültige Zeichen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:558
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:559
 msgid "Specified name is already used."
 msgstr "Der angegebene Name wird bereits verwendet."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:565
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:566
 msgid "No permission to create a blocklist on this base."
 msgstr ""
 "Sie haben keine Berechtigung, eine Sperrliste unterhalb dieser Basis "
 "anzulegen."
 
-#: plugins/gofax/blocklists/generic.tpl:8
-msgid "List name"
-msgstr "Listenname"
+#: plugins/gofax/blocklists/remove.tpl:2
+#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/fai/remove.tpl:2
+#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/groups/remove.tpl:2
+#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2
+#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/ogroups/remove.tpl:2 plugins/gofon/macro/remove.tpl:2
+#: plugins/gofon/conference/remove.tpl:2 html/index.php:237 html/index.php:243
+#: html/index.php:301 ihtml/themes/altlinux/conflict.tpl:6
+#: ihtml/themes/altlinux/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
+#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/lhs/conflict.tpl:6
+#: ihtml/themes/lhs/islocked.tpl:6
+msgid "Warning"
+msgstr "Warnung"
 
-#: plugins/gofax/blocklists/generic.tpl:10
-msgid "Name of blocklist"
-msgstr "Name der Sperrliste"
+#: 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/generic.tpl:16
-msgid "Select subtree to place blocklist in"
-msgstr "Wählen Sie den Teilbaum, in den die Sperrliste plaziert werden soll."
-
-#: plugins/gofax/blocklists/generic.tpl:32
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
-#: plugins/admin/systems/workstationService.tpl:42
-#: plugins/admin/systems/workstationService.tpl:120
-#: plugins/admin/systems/servnfs.tpl:39
-#: plugins/admin/systems/terminalService.tpl:42
-#: plugins/admin/systems/terminalService.tpl:120
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
-#: plugins/admin/systems/glpi_devices.tpl:427
-#: plugins/admin/systems/glpi_devices.tpl:492
-#: plugins/admin/systems/glpi_devices.tpl:542
-#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
-msgid "Type"
-msgstr "Typ"
-
-#: plugins/gofax/blocklists/generic.tpl:34
-msgid "Select wether to filter incoming or outgoing calls"
-msgstr "Wählen Sie, ob ein- oder abgehende Rufe gefiltert werden sollen"
-
-#: plugins/gofax/blocklists/generic.tpl:43
-msgid "Descriptive text for this blocklist"
-msgstr "Beschreibender Text zu dieser Sperrliste"
-
-#: plugins/gofax/blocklists/generic.tpl:56
-msgid "Blocked numbers"
-msgstr "Gesperrte Nummern"
-
-#: plugins/gofax/blocklists/generic.tpl:72
-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/fai/remove.tpl:2
-#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/groups/remove.tpl:2
-#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:237 html/index.php:243 html/index.php:301
-#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/altlinux/islocked.tpl:6
-#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
-msgid "Warning"
-msgstr "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/fai/remove_branch.tpl:10 plugins/admin/groups/remove.tpl:10
-#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
-#: plugins/admin/ogroups/remove.tpl:10 plugins/gofon/macro/remove.tpl:9
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Wenn Sie sicher sind, drücken Sie <i>Löschen</i> um fortzufahren oder "
-"<i>Abbrechen</i> zum Abbruch."
+#: plugins/gofax/blocklists/remove.tpl:10
+#: plugins/addons/addressbook/remove.tpl:10
+#: plugins/admin/fai/remove_branch.tpl:10 plugins/admin/groups/remove.tpl:10
+#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
+#: plugins/admin/ogroups/remove.tpl:10 plugins/gofon/macro/remove.tpl:9
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Wenn Sie sicher sind, drücken Sie <i>Löschen</i> um fortzufahren oder "
+"<i>Abbrechen</i> zum Abbruch."
 
 #: plugins/gofax/blocklists/headpage.tpl:6
 msgid "List of blocklists"
@@ -3698,8 +3720,8 @@ msgid "FAX settings"
 msgstr "Fax-Einstellungen"
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:6
-#: plugins/addons/addressbook/address_info.tpl:88
 #: plugins/addons/addressbook/address_edit.tpl:206
+#: plugins/addons/addressbook/address_info.tpl:88
 #: plugins/generic/references/class_reference.inc:30
 msgid "FAX"
 msgstr "Fax"
@@ -3754,8 +3776,7 @@ msgstr "Bitte geben Sie eine g
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:651
 msgid "Mail delivery is checked, but no address has been specified."
-msgstr ""
-"Die Zustellung von Mail ist aktiviert, aber es wurde keine Adresse angegeben."
+msgstr "Die Zustellung von Mail ist aktiviert, aber es wurde keine Adresse angegeben."
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:653
 msgid "The mail address you've entered is invalid."
@@ -3785,7 +3806,7 @@ msgstr "Fax-ID"
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 #: plugins/admin/systems/class_printGeneric.inc:677
-#: plugins/admin/ogroups/class_ogroupManagement.inc:582
+#: plugins/admin/ogroups/class_ogroupManagement.inc:583
 msgid "User"
 msgstr "Benutzer"
 
@@ -3822,49 +3843,6 @@ msgstr "
 msgid "# pages"
 msgstr "# Seiten"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:6
-msgid "FAX Reports"
-msgstr "Fax-Berichte"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:109
-#: plugins/gofax/faxreports/class_faxreport.inc:119
-#: plugins/gofax/faxreports/class_faxreport.inc:165
-#: plugins/gofax/faxreports/class_faxreport.inc:274
-msgid "Can't connect to fax database, no reports can be shown!"
-msgstr ""
-"Die Fax-Datenbank kann nicht erreicht werden. Es können keine Berichte "
-"angezeigt werden!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:112
-#: plugins/addons/logview/class_logview.inc:66
-#: plugins/gofon/fonreports/class_fonreport.inc:99
-msgid "There is no mysql extension available, please check your php setup."
-msgstr ""
-"Die MySQL-Erweiterung wurde nicht gefunden, bitte überprüfen Sie Ihr PHP-"
-"Setup."
-
-#: plugins/gofax/faxreports/class_faxreport.inc:123
-#: plugins/gofax/faxreports/class_faxreport.inc:128
-#: plugins/gofax/faxreports/class_faxreport.inc:169
-#: plugins/gofax/faxreports/class_faxreport.inc:278
-msgid "Can't select fax database for report generation!"
-msgstr "Kann die Fax-Datenbank zur Berichterstellung nicht öffnen!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:177
-#: plugins/gofax/faxreports/class_faxreport.inc:286
-msgid "Query for fax database failed!"
-msgstr "Die Anfrage zur Fax-Datenbank ist fehlgeschlagen!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:185
-msgid "You have no permission to retrieve informations about this fax id!"
-msgstr "Sie haben keine Berechtigung, ein Fax mit dieser ID einzusehen!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:205
-#: plugins/gofax/faxreports/class_faxreport.inc:294
-#: plugins/gofon/fonreports/class_fonreport.inc:220
-msgid "Y-M-D"
-msgstr "D.M.Y"
-
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/fonreports/contents.tpl:2
@@ -3906,6 +3884,7 @@ msgstr "w
 #: plugins/addons/mailqueue/contents.tpl:26
 #: plugins/addons/logview/contents.tpl:67
 #: plugins/gofon/fonreports/contents.tpl:21 ihtml/themes/default/help.tpl:21
+#: ihtml/themes/lhs/help.tpl:21
 msgid "Search"
 msgstr "Suchen"
 
@@ -3930,36 +3909,66 @@ msgstr "Empf
 msgid "Search returned no results..."
 msgstr "Die Suche verlief ergebnislos..."
 
-#: plugins/gofax/faxreports/main.inc:5
-msgid "FAX reports"
+#: plugins/gofax/faxreports/class_faxreport.inc:6
+msgid "FAX Reports"
 msgstr "Fax-Berichte"
 
-#: plugins/addons/addressbook/dial.tpl:3
-msgid "Dial connection..."
-msgstr "Wähle Verbindung..."
+#: plugins/gofax/faxreports/class_faxreport.inc:109
+#: plugins/gofax/faxreports/class_faxreport.inc:119
+#: plugins/gofax/faxreports/class_faxreport.inc:165
+#: plugins/gofax/faxreports/class_faxreport.inc:274
+msgid "Can't connect to fax database, no reports can be shown!"
+msgstr ""
+"Die Fax-Datenbank kann nicht erreicht werden. Es können keine Berichte "
+"angezeigt werden!"
 
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:360
-#: plugins/addons/addressbook/class_addressbook.inc:367
-#: plugins/addons/addressbook/class_addressbook.inc:371
-#: plugins/addons/addressbook/class_addressbook.inc:453
-msgid "Dial"
-msgstr "Wähle"
+#: plugins/gofax/faxreports/class_faxreport.inc:112
+#: plugins/addons/logview/class_logview.inc:66
+#: plugins/gofon/fonreports/class_fonreport.inc:99
+msgid "There is no mysql extension available, please check your php setup."
+msgstr ""
+"Die MySQL-Erweiterung wurde nicht gefunden, bitte überprüfen Sie Ihr PHP-"
+"Setup."
+
+#: plugins/gofax/faxreports/class_faxreport.inc:123
+#: plugins/gofax/faxreports/class_faxreport.inc:128
+#: plugins/gofax/faxreports/class_faxreport.inc:169
+#: plugins/gofax/faxreports/class_faxreport.inc:278
+msgid "Can't select fax database for report generation!"
+msgstr "Kann die Fax-Datenbank zur Berichterstellung nicht öffnen!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:177
+#: plugins/gofax/faxreports/class_faxreport.inc:286
+msgid "Query for fax database failed!"
+msgstr "Die Anfrage zur Fax-Datenbank ist fehlgeschlagen!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:185
+msgid "You have no permission to retrieve informations about this fax id!"
+msgstr "Sie haben keine Berechtigung, ein Fax mit dieser ID einzusehen!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:205
+#: plugins/gofax/faxreports/class_faxreport.inc:294
+#: plugins/gofon/fonreports/class_fonreport.inc:220
+msgid "Y-M-D"
+msgstr "D.M.Y"
+
+#: plugins/gofax/faxreports/main.inc:5
+msgid "FAX reports"
+msgstr "Fax-Berichte"
 
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:513
 #: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/addons/addressbook/class_addressbook.inc:513
+#: plugins/admin/fai/faiVariable.tpl:9
 #: plugins/admin/fai/faiPartitionTable.tpl:9
-#: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiScriptEntry.tpl:9
-#: plugins/admin/fai/faiPackage.tpl:9 plugins/admin/fai/faiProfile.tpl:9
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiPackage.tpl:9
+#: plugins/admin/fai/faiProfile.tpl:9 plugins/admin/fai/faiScript.tpl:9
+#: plugins/admin/fai/faiVariableEntry.tpl:9
 #: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHookEntry.tpl:9
 #: plugins/admin/fai/faiTemplateEntry.tpl:7 plugins/admin/fai/faiHook.tpl:9
 #: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: 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
@@ -3973,14 +3982,16 @@ msgstr "W
 #: plugins/admin/systems/glpi_devices.tpl:615
 #: plugins/admin/systems/glpi_devices.tpl:669
 #: plugins/admin/systems/glpi_devices.tpl:715
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
 #: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
 msgid "Name"
 msgstr "Name"
 
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_info.tpl:29
 #: plugins/addons/addressbook/address_edit.tpl:66
+#: plugins/addons/addressbook/address_info.tpl:29
 msgid "Private"
 msgstr "Privat"
 
@@ -4043,6 +4054,60 @@ msgstr "W
 msgid "Search string"
 msgstr "Suchtext"
 
+#: plugins/addons/addressbook/dial.tpl:3
+msgid "Dial connection..."
+msgstr "Wähle Verbindung..."
+
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/class_addressbook.inc:360
+#: plugins/addons/addressbook/class_addressbook.inc:367
+#: plugins/addons/addressbook/class_addressbook.inc:371
+#: plugins/addons/addressbook/class_addressbook.inc:453
+msgid "Dial"
+msgstr "Wähle"
+
+#: plugins/addons/addressbook/address_edit.tpl:7
+msgid "Choose the department to store entry in"
+msgstr "Wählen Sie die Abteilung, in der der Eintrag abgelegt werden soll"
+
+#: plugins/addons/addressbook/address_edit.tpl:24
+#: plugins/addons/addressbook/address_info.tpl:12
+msgid "Personal"
+msgstr "Persönlich"
+
+#: plugins/addons/addressbook/address_edit.tpl:44
+#: plugins/addons/addressbook/address_info.tpl:19 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Initials"
+msgstr "Initialien"
+
+#: plugins/addons/addressbook/address_edit.tpl:105
+#: plugins/addons/addressbook/address_info.tpl:43
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:46
+msgid "Email"
+msgstr "Email"
+
+#: plugins/addons/addressbook/address_edit.tpl:119
+#: plugins/addons/addressbook/address_info.tpl:53
+msgid "Organizational"
+msgstr "Organisationsbezogen"
+
+#: plugins/addons/addressbook/address_edit.tpl:128
+#: plugins/addons/addressbook/address_info.tpl:61
+msgid "Company"
+msgstr "Firma"
+
+#: plugins/addons/addressbook/address_edit.tpl:148
+#: plugins/addons/addressbook/address_info.tpl:67 html/getxls.php:174
+#: html/getxls.php:236
+msgid "City"
+msgstr "Stadt"
+
+#: plugins/addons/addressbook/address_edit.tpl:168
+#: plugins/addons/addressbook/address_info.tpl:73
+msgid "Country"
+msgstr "Land"
+
 #: plugins/addons/addressbook/remove.tpl:6
 msgid ""
 "This includes all addressbook data in this entry. Please double check if "
@@ -4143,72 +4208,27 @@ msgid "User ID"
 msgstr "Benutzer-ID"
 
 #: plugins/addons/addressbook/class_addressbook.inc:596
-msgid ""
-"Cannot create a unique DN for your entry. Please fill more formular fields."
+msgid "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 "Es kann kein eindeutiger DN für diesen Eintrag erzeugt werden. Füllen Sie "
 "bitte weitere Felder aus."
 
 #: plugins/addons/addressbook/class_addressbook.inc:604
-msgid ""
-"You have no permissions to create or modify a global address book entry."
+msgid "You have no permissions to create or modify a global address book entry."
 msgstr ""
 "Sie haben keine Berechtigung, einen Eintrag unterhalb dieser 'Basis' "
 "anzulegen."
 
-#: plugins/addons/addressbook/address_info.tpl:12
-#: plugins/addons/addressbook/address_edit.tpl:24
-msgid "Personal"
-msgstr "Persönlich"
-
-#: plugins/addons/addressbook/address_info.tpl:19
-#: plugins/addons/addressbook/address_edit.tpl:44 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Initials"
-msgstr "Initialien"
-
-#: plugins/addons/addressbook/address_info.tpl:43
-#: plugins/addons/addressbook/address_edit.tpl:105
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:46
-msgid "Email"
-msgstr "Email"
-
-#: plugins/addons/addressbook/address_info.tpl:53
-#: plugins/addons/addressbook/address_edit.tpl:119
-msgid "Organizational"
-msgstr "Organisationsbezogen"
-
-#: plugins/addons/addressbook/address_info.tpl:61
-#: plugins/addons/addressbook/address_edit.tpl:128
-msgid "Company"
-msgstr "Firma"
-
-#: plugins/addons/addressbook/address_info.tpl:67
-#: plugins/addons/addressbook/address_edit.tpl:148 html/getxls.php:174
-#: html/getxls.php:236
-msgid "City"
-msgstr "Stadt"
-
-#: plugins/addons/addressbook/address_info.tpl:73
-#: plugins/addons/addressbook/address_edit.tpl:168
-msgid "Country"
-msgstr "Land"
-
-#: plugins/addons/addressbook/address_edit.tpl:7
-msgid "Choose the department to store entry in"
-msgstr "Wählen Sie die Abteilung, in der der Eintrag abgelegt werden soll"
-
-#: plugins/addons/mailqueue/class_mailqueue.inc:6
 #: plugins/addons/mailqueue/main.inc:23
+#: plugins/addons/mailqueue/class_mailqueue.inc:6
 msgid "Mail queue"
 msgstr "Mail-Warteschlange"
 
 #: plugins/addons/mailqueue/class_mailqueue.inc:58
-msgid ""
-"Please check your 'gosa.conf', there is no 'MAILQUEUESCRIPTPATH' specified."
+msgid "Please check your 'gosa.conf', there is no 'MAILQUEUESCRIPTPATH' specified."
 msgstr ""
-"Bitte überprüfen Sie Ihre 'gosa.conf' - der Eintrag "
-"'MAILQUEUESCRIPTPATH' wurde nicht gefunden."
+"Bitte überprüfen Sie Ihre 'gosa.conf' - der Eintrag 'MAILQUEUESCRIPTPATH' "
+"wurde nicht gefunden."
 
 #: plugins/addons/mailqueue/class_mailqueue.inc:85
 #: plugins/addons/mailqueue/class_mailqueue.inc:93
@@ -4218,8 +4238,7 @@ msgstr ""
 #: plugins/addons/mailqueue/class_mailqueue.inc:203
 #, php-format
 msgid "Please check your 'gosa.conf' the given '%s' can't be executed."
-msgstr ""
-"Bitte überprüfen Sie Ihre 'gosa.conf' - '%s' kann nicht ausgeführt werden."
+msgstr "Bitte überprüfen Sie Ihre 'gosa.conf' - '%s' kann nicht ausgeführt werden."
 
 #: plugins/addons/mailqueue/class_mailqueue.inc:256
 msgid "up"
@@ -4300,8 +4319,7 @@ msgstr "Alle Nachrichten wieder einreihen"
 
 #: plugins/addons/mailqueue/contents.tpl:36
 msgid "Requeue all messages in selected servers queue"
-msgstr ""
-"Alle Nachrichten in der Warteschlange des gewählten Servers wieder einreihen"
+msgstr "Alle Nachrichten in der Warteschlange des gewählten Servers wieder einreihen"
 
 #: plugins/addons/mailqueue/contents.tpl:46
 msgid "Search returned no results"
@@ -4401,8 +4419,7 @@ msgstr "Export erfolgreich"
 
 #: plugins/addons/ldapmanager/contentexportxls.tpl:62
 msgid "Click here to save the complete LDAP database to a xls file"
-msgstr ""
-"Hier klicken, um die gesamte LDAP-Datenbank in eine xls-Datei zu exportieren."
+msgstr "Hier klicken, um die gesamte LDAP-Datenbank in eine xls-Datei zu exportieren."
 
 #: plugins/addons/ldapmanager/contentexportxls.tpl:62
 msgid "Click here to save the LDAP Export to a xls file"
@@ -4533,8 +4550,7 @@ msgstr "XLS-Import"
 #: plugins/addons/ldapmanager/class_exportxls.inc:39
 #: plugins/addons/ldapmanager/class_export.inc:38
 msgid "You've no permission to do LDAP exports."
-msgstr ""
-"Sie haben keine Berechtigung, um Daten aus der LDAP-Datenbank zu exportieren."
+msgstr "Sie haben keine Berechtigung, um Daten aus der LDAP-Datenbank zu exportieren."
 
 #: plugins/addons/ldapmanager/class_exportxls.inc:89
 #: plugins/addons/ldapmanager/class_export.inc:83
@@ -4543,8 +4559,7 @@ msgstr "Fehler beim Export der angeforderten Eintr
 
 #: plugins/addons/ldapmanager/class_import.inc:41
 msgid "You've no permission to do LDAP imports."
-msgstr ""
-"Sie haben keine Berechtigung, um Daten in die LDAP-Datenbank zu importieren."
+msgstr "Sie haben keine Berechtigung, um Daten in die LDAP-Datenbank zu importieren."
 
 #: plugins/addons/ldapmanager/class_import.inc:108
 msgid "Unknown Error"
@@ -4566,8 +4581,7 @@ msgstr "Exportiere vollst
 
 #: plugins/addons/ldapmanager/contentexport.tpl:59
 msgid "Click here to save the complete LDAP database to a file"
-msgstr ""
-"Hier klicken, um die gesamte LDAP-Datenbank in eine Datei zu exportieren."
+msgstr "Hier klicken, um die gesamte LDAP-Datenbank in eine Datei zu exportieren."
 
 #: plugins/addons/ldapmanager/contentexport.tpl:59
 msgid "Click here to save the LDAP Export "
@@ -4677,6 +4691,105 @@ msgstr "Nachricht"
 msgid "System log view"
 msgstr "Systemprotokolle"
 
+#: plugins/addons/godfs/class_dfsManagment.inc:16
+#: plugins/addons/godfs/contents.tpl:8
+msgid "DFS Shares"
+msgstr "DFS-Freigaben"
+
+#: plugins/addons/godfs/class_dfsManagment.inc:141
+msgid "No DFS entries found"
+msgstr "Keine DFS-Einträge gefunden"
+
+#: plugins/addons/godfs/class_dfsManagment.inc:182
+msgid "Go up one dfsshare"
+msgstr "Eine DFS-Freigabe nach oben"
+
+#: plugins/addons/godfs/class_dfsManagment.inc:183
+msgid "Go to dfs root"
+msgstr "Gehe zur DFS-Basis"
+
+#: plugins/addons/godfs/class_dfsManagment.inc:184
+msgid "Create new dfsshare"
+msgstr "Neue DFS-Freigabe erstellen"
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:87
+msgid "You have no premissions to create a dfs share."
+msgstr "Sie haben keine Berechtigung, eine DFS-Freigabe innerhalb dieser 'Basis' anzulegen."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:94
+#: plugins/addons/godfs/class_dfsgeneric.inc:96
+msgid "Dfs share already exists."
+msgstr "Die angegebene DFS-Freigabe existiert bereits."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:101
+msgid "Required Field \"Name of dfs Share\" is not set."
+msgstr "Das benötigte Feld 'Name der DFS-Freigabe' ist nicht ausgefüllt."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:104
+msgid "Required Field \"Description\" is not set."
+msgstr "Das benötigte Feld 'Beschreibung' ist nicht gesetzt."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:107
+msgid "Required Field \"Fileserver\" is not set."
+msgstr "Das benötigte Feld 'Server' ist nicht ausgefüllt."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:110
+msgid "Required Field \"Share on fileserver\" is not set."
+msgstr "Das benötigte Feld 'Freigabe' ist nicht ausgefüllt."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:113
+msgid "Required Field \"Location\" is not set."
+msgstr "Das benötigte Feld 'Ort' ist nicht gesetzt."
+
+#: plugins/addons/godfs/contents.tpl:26
+#, fuzzy
+msgid ""
+"This menu allows you to create, delete and edit selected dfs shares. Having "
+"a large numbers of dfs shares, you might prefer the range selectors on top "
+"of the dfs share list."
+msgstr ""
+"Dieses Menü erlaubt es Ihnen, Abteilungen hinzuzufügen, zu bearbeiten oder "
+"zu entfernen. Bei einer Vielzahl von Abteilungen bietet sich die Verwendung "
+"der Bereichswahl an."
+
+#: plugins/addons/godfs/contents.tpl:40
+#, fuzzy
+msgid "Display dfs shares matching"
+msgstr "Zeige die Adressen, auf die das Folgende passt"
+
+#: plugins/addons/godfs/contents.tpl:44
+#, fuzzy
+msgid "Regular expression for matching dfs share names"
+msgstr "Regulärer Ausdruck für System-Namen"
+
+#: plugins/addons/godfs/generic.tpl:4
+msgid "DFS Properties"
+msgstr "DFS-Eigenschaften"
+
+#: plugins/addons/godfs/generic.tpl:8
+#, fuzzy
+msgid "Name of dfs Share"
+msgstr "Name der Abteilung"
+
+#: plugins/addons/godfs/generic.tpl:16
+#, fuzzy
+msgid "Fileserver"
+msgstr "Mail-Server"
+
+#: plugins/addons/godfs/generic.tpl:20
+#, fuzzy
+msgid "Share on Fileserver"
+msgstr "Parent-Server"
+
+#: plugins/addons/godfs/generic.tpl:30
+#, fuzzy
+msgid "DFS Location"
+msgstr "Ort"
+
+#: plugins/addons/godfs/main.inc:21 plugins/addons/godfs/main.inc:27
+msgid "Distributed Filesystem Administration"
+msgstr "DFS-Verwaltung"
+
 #: plugins/admin/fai/class_faiScript.inc:240
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
 #: plugins/admin/fai/class_faiHook.inc:264
@@ -4684,16 +4797,49 @@ msgstr "Systemprotokolle"
 msgid "Download"
 msgstr "Herunterladen"
 
+#: plugins/admin/fai/faiVariable.tpl:32
+#: plugins/admin/fai/faiPartitionTable.tpl:32
+#: plugins/admin/fai/faiScript.tpl:32 plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/class_faiProfileEntry.inc:155
+#: plugins/admin/fai/faiHook.tpl:32
+msgid "Objects"
+msgstr "Objekte"
+
+#: plugins/admin/fai/faiVariable.tpl:34
+msgid "List of assigned variables"
+msgstr "Liste benutzter Variablen"
+
+#: plugins/admin/fai/faiVariable.tpl:40
+msgid "Choose a variable to delete or edit"
+msgstr "Wählen Sie eine Variable zum Entfernen oder Bearbeiten"
+
 #: 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/tabsTemplate.inc:34 plugins/admin/fai/tabsProfile.inc:34
+#: plugins/admin/fai/tabsScript.inc:34
 #: plugins/admin/departments/tabs_department.inc:31
 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 "
 "Quellbaumes."
 
+#: plugins/admin/fai/class_faiPackageEntry.inc:35
+msgid "Please enter your search string here"
+msgstr "Bitte geben Sie hier einen Such-Text ein."
+
+#: plugins/admin/fai/class_faiPackageEntry.inc:48
+msgid "This list displays all assigned package names for this repository settings."
+msgstr "Diese Liste zeigt alle diesem Repository zugeordneten Paket-Namen."
+
+#: plugins/admin/fai/class_faiPackageEntry.inc:124
+#, php-format
+msgid ""
+"Your specified search string '%s' returned too many results. Only the first "
+"200 entries are shown, to keep the memory usage low."
+msgstr ""
+"Die Suche nach '%s' ergab zu viele Treffer. Es werden nur die ersten 200 "
+"Einträge angezeigt, um den Speicherverbrauch gering zu halten."
+
 #: plugins/admin/fai/class_faiManagement.inc:32
 msgid "FAI"
 msgstr "FAI"
@@ -4702,25 +4848,24 @@ msgstr "FAI"
 msgid "Fully Automatic Installation - management"
 msgstr "Verwaltung von FAI"
 
-#: plugins/admin/fai/class_faiManagement.inc:228
+#: plugins/admin/fai/class_faiManagement.inc:227
 #, php-format
 msgid "You're about to delete all information about the FAI class at '%s'."
-msgstr ""
-"Sie sind dabei, alle Informationen über die FAI-Klasse auf '%s' zu löschen."
+msgstr "Sie sind dabei, alle Informationen über die FAI-Klasse auf '%s' zu löschen."
 
-#: plugins/admin/fai/class_faiManagement.inc:234
-#: plugins/admin/fai/class_faiManagement.inc:272
+#: plugins/admin/fai/class_faiManagement.inc:233
+#: plugins/admin/fai/class_faiManagement.inc:271
 #: plugins/admin/systems/class_systemManagement.inc:532
 #: plugins/admin/systems/class_systemManagement.inc:603
 msgid "You are not allowed to delete this component!"
 msgstr "Es ist Ihnen nicht erlaubt, diese Komponente zu löschen!"
 
-#: plugins/admin/fai/class_faiManagement.inc:324
+#: plugins/admin/fai/class_faiManagement.inc:323
 #, php-format
 msgid "You're about to delete a fai branch / freeze  '%s'."
 msgstr "Sie sind dabei den Zweig / Freeze '%s' zu löschen."
 
-#: plugins/admin/fai/class_faiManagement.inc:327
+#: plugins/admin/fai/class_faiManagement.inc:326
 msgid "You are not allowed to delete this release!"
 msgstr "Sie haben keine Berechtigung, dieses Release zu löschen!"
 
@@ -4729,18 +4874,19 @@ msgid "Specified branch name is invalid."
 msgstr "Der angegebene Zweigname ist ungültig."
 
 #: plugins/admin/fai/class_faiManagement.inc:384
-#, fuzzy
 msgid "Specified freeze name is invalid."
-msgstr "Der angegebene Name ist ungültig."
+msgstr "Der angegebene \"Freeze\"-Name ist ungültig."
 
 #: plugins/admin/fai/class_faiManagement.inc:391
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:349
 #: plugins/admin/systems/class_servRepository.inc:208
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:349
 msgid "This name is already in use."
 msgstr "Der angegebene Name wird bereits verwendet."
 
-#: plugins/admin/fai/class_faiManagement.inc:605
+#: plugins/admin/fai/class_faiManagement.inc:444
+#: plugins/admin/fai/class_faiManagement.inc:611
 #: plugins/admin/fai/faiPackageNew.tpl:44 plugins/admin/users/template.tpl:44
+#: plugins/admin/departments/class_departmentGeneric.inc:333
 #: ihtml/themes/altlinux/setup_introduction.tpl:12
 #: ihtml/themes/altlinux/setup_useradmin.tpl:41
 #: ihtml/themes/altlinux/setup_step2.tpl:13
@@ -4749,152 +4895,133 @@ msgstr "Der angegebene Name wird bereits verwendet."
 #: ihtml/themes/default/setup_useradmin.tpl:41
 #: ihtml/themes/default/setup_step2.tpl:13
 #: ihtml/themes/default/setup_step3.tpl:18
+#: ihtml/themes/lhs/setup_introduction.tpl:12
+#: ihtml/themes/lhs/setup_useradmin.tpl:41 ihtml/themes/lhs/setup_step2.tpl:13
+#: ihtml/themes/lhs/setup_step3.tpl:18
 msgid "Continue"
 msgstr "Fortsetzen"
 
-#: plugins/admin/fai/class_faiManagement.inc:641
+#: plugins/admin/fai/class_faiManagement.inc:647
 #: plugins/admin/departments/class_departmentManagement.inc:298
 msgid "Go to users home department"
 msgstr "Gehe zur Abteilung des angemeldeten Benutzers"
 
-#: plugins/admin/fai/class_faiManagement.inc:646
+#: plugins/admin/fai/class_faiManagement.inc:654
 msgid "New profile"
 msgstr "Neues Profil"
 
-#: plugins/admin/fai/class_faiManagement.inc:646
+#: plugins/admin/fai/class_faiManagement.inc:654
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
 msgid "P"
 msgstr "P"
 
-#: plugins/admin/fai/class_faiManagement.inc:651
+#: plugins/admin/fai/class_faiManagement.inc:659
 msgid "New partition table"
 msgstr "Neue Partitions-Tabelle"
 
-#: plugins/admin/fai/class_faiManagement.inc:651
+#: plugins/admin/fai/class_faiManagement.inc:659
 msgid "PT"
 msgstr "PT"
 
-#: plugins/admin/fai/class_faiManagement.inc:654
+#: plugins/admin/fai/class_faiManagement.inc:662
 msgid "New scripts"
 msgstr "Neue Skripte"
 
-#: plugins/admin/fai/class_faiManagement.inc:654
+#: plugins/admin/fai/class_faiManagement.inc:662
 msgid "S"
 msgstr "S"
 
-#: plugins/admin/fai/class_faiManagement.inc:657
+#: plugins/admin/fai/class_faiManagement.inc:665
 msgid "New hooks"
 msgstr "Neue Hooks"
 
-#: plugins/admin/fai/class_faiManagement.inc:657
+#: plugins/admin/fai/class_faiManagement.inc:665
 msgid "H"
 msgstr "H"
 
-#: plugins/admin/fai/class_faiManagement.inc:660
+#: plugins/admin/fai/class_faiManagement.inc:668
 msgid "New variables"
 msgstr "Neue Variablen"
 
-#: plugins/admin/fai/class_faiManagement.inc:660
+#: plugins/admin/fai/class_faiManagement.inc:668
 msgid "V"
 msgstr "V"
 
-#: plugins/admin/fai/class_faiManagement.inc:663
+#: plugins/admin/fai/class_faiManagement.inc:671
 msgid "New templates"
 msgstr "Neue Vorlagen"
 
-#: plugins/admin/fai/class_faiManagement.inc:663
+#: plugins/admin/fai/class_faiManagement.inc:671
 msgid "T"
 msgstr "T"
 
-#: plugins/admin/fai/class_faiManagement.inc:666
+#: plugins/admin/fai/class_faiManagement.inc:674
 msgid "New package list"
 msgstr "Neue Paketliste"
 
-#: plugins/admin/fai/class_faiManagement.inc:666
+#: plugins/admin/fai/class_faiManagement.inc:674
 msgid "PK"
 msgstr "PK"
 
-#: plugins/admin/fai/class_faiManagement.inc:680
-#: plugins/admin/systems/class_systemManagement.inc:787
+#: plugins/admin/fai/class_faiManagement.inc:688
+#: plugins/admin/systems/class_systemManagement.inc:788
 msgid "This table displays all systems, in the selected tree."
 msgstr "Diese Tabelle enthält alle Systeme des gewählten Unterbaumes."
 
-#: plugins/admin/fai/class_faiManagement.inc:684
+#: plugins/admin/fai/class_faiManagement.inc:692
 msgid "Name of FAI class"
 msgstr "Name der FAI-Klasse"
 
-#: plugins/admin/fai/class_faiManagement.inc:685
+#: plugins/admin/fai/class_faiManagement.inc:693
 msgid "Class type"
 msgstr "Typ der Klasse"
 
-#: plugins/admin/fai/class_faiManagement.inc:689
-#: plugins/admin/fai/class_faiManagement.inc:790
-#: plugins/admin/fai/class_faiManagement.inc:795
+#: plugins/admin/fai/class_faiManagement.inc:697
+#: plugins/admin/fai/class_faiManagement.inc:798
+#: plugins/admin/fai/class_faiManagement.inc:803
 msgid "Edit class"
 msgstr "Klasse bearbeiten"
 
-#: plugins/admin/fai/class_faiManagement.inc:690
-#: plugins/admin/fai/class_faiManagement.inc:797
+#: plugins/admin/fai/class_faiManagement.inc:698
+#: plugins/admin/fai/class_faiManagement.inc:805
 msgid "Delete class"
 msgstr "Klasse entfernen"
 
-#: plugins/admin/fai/class_faiManagement.inc:710
+#: plugins/admin/fai/class_faiManagement.inc:718
 #: plugins/admin/groups/class_groupApplication.inc:521
-#: plugins/admin/departments/class_departmentManagement.inc:334
+#: plugins/admin/departments/class_departmentManagement.inc:335
 msgid "department"
 msgstr "Abteilung"
 
-#: plugins/admin/fai/class_faiManagement.inc:731
-#: plugins/admin/fai/class_faiManagement.inc:732
+#: plugins/admin/fai/class_faiManagement.inc:739
+#: plugins/admin/fai/class_faiManagement.inc:740
 #: plugins/admin/fai/class_faiProfile.inc:297
 #: plugins/admin/fai/class_faiProfileEntry.inc:124
 msgid "Partition table"
 msgstr "Partitionstabelle"
 
-#: plugins/admin/fai/class_faiManagement.inc:738
-#: plugins/admin/fai/class_faiManagement.inc:739
+#: plugins/admin/fai/class_faiManagement.inc:746
+#: plugins/admin/fai/class_faiManagement.inc:747
 msgid "Package list"
 msgstr "Paketliste"
 
-#: plugins/admin/fai/class_faiManagement.inc:745
-#: plugins/admin/fai/class_faiManagement.inc:746
+#: plugins/admin/fai/class_faiManagement.inc:753
+#: plugins/admin/fai/class_faiManagement.inc:754
 msgid "Scripts"
 msgstr "Skripte"
 
-#: plugins/admin/fai/class_faiManagement.inc:766
-#: plugins/admin/fai/class_faiManagement.inc:767
+#: plugins/admin/fai/class_faiManagement.inc:774
+#: plugins/admin/fai/class_faiManagement.inc:775
 msgid "Profile"
 msgstr "Profil"
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:35
-msgid "Please enter your search string here"
-msgstr "Bitte geben Sie hier einen Such-Text ein."
-
-#: plugins/admin/fai/class_faiPackageEntry.inc:48
-msgid ""
-"This list displays all assigned package names for this repository settings."
-msgstr "Diese Liste zeigt alle diesem Repository zugeordneten Paket-Namen."
-
-#: plugins/admin/fai/class_faiPackageEntry.inc:124
-#, php-format
-msgid ""
-"Your specified search string '%s' returned too many results. Only the first "
-"200 entries are shown, to keep the memory usage low."
-msgstr ""
-"Die Suche nach '%s' ergab zu viele Treffer. Es werden nur die ersten 200 "
-"Einträge angezeigt, um den Speicherverbrauch gering zu halten."
-
 #: plugins/admin/fai/main.inc:38 plugins/admin/fai/main.inc:40
 msgid "Fully Automatic Installation"
 msgstr "Automatische Installation"
 
-#: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiVariable.tpl:32 plugins/admin/fai/faiScript.tpl:32
-#: plugins/admin/fai/faiTemplate.tpl:29
-#: plugins/admin/fai/class_faiProfileEntry.inc:155
-#: plugins/admin/fai/faiHook.tpl:32
-msgid "Objects"
-msgstr "Objekte"
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+msgid "Package"
+msgstr "Paket"
 
 #: plugins/admin/fai/faiPartitionTable.tpl:34
 msgid "Discs"
@@ -4957,9 +5084,17 @@ msgstr "Zeige die Objekte, auf die Folgendes passt"
 msgid "Regular expression for matching object names"
 msgstr "Regulärer Ausdruck zum Abgleich mit Objekt-Namen"
 
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
-msgid "Package"
-msgstr "Paket"
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
+msgid "Device"
+msgstr "Gerät"
+
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
+msgid "Partition entries"
+msgstr "Partitions-Einträge"
+
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
+msgid "Add partition"
+msgstr "Partition hinzufügen"
 
 #: plugins/admin/fai/class_faiScriptEntry.inc:68
 #: plugins/admin/fai/class_faiHookEntry.inc:71
@@ -4982,21 +5117,13 @@ msgstr "Bitte geben Sie eine Namen ein."
 msgid "Please enter a script."
 msgstr "Bitte geben Sie einen Skript an."
 
-#: plugins/admin/fai/faiVariable.tpl:34
-msgid "List of assigned variables"
-msgstr "Liste benutzter Variablen"
-
-#: plugins/admin/fai/faiVariable.tpl:40
-msgid "Choose a variable to delete or edit"
-msgstr "Wählen Sie eine Variable zum Entfernen oder Bearbeiten"
-
 #: plugins/admin/fai/faiScriptEntry.tpl:29
-#: plugins/admin/groups/class_groupManagement.inc:524
-#: plugins/admin/users/class_userManagement.inc:819
+#: plugins/admin/groups/class_groupManagement.inc:525
+#: plugins/admin/users/class_userManagement.inc:820
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
-#: plugins/admin/ogroups/class_ogroupManagement.inc:493
+#: plugins/admin/ogroups/class_ogroupManagement.inc:494
 #: plugins/gofon/conference/generic.tpl:4
 msgid "Properties"
 msgstr "Eigenschaften"
@@ -5021,8 +5148,7 @@ msgstr "Bitte w
 
 #: plugins/admin/fai/class_faiPackage.inc:344
 msgid "Please choose a valid combination for your repository setup."
-msgstr ""
-"Bitte wählen Sie eine gültige Kombination für Ihr gewünschtes Repository"
+msgstr "Bitte wählen Sie eine gültige Kombination für Ihr gewünschtes Repository"
 
 #: plugins/admin/fai/class_faiPackage.inc:365
 msgid "package is configured"
@@ -5035,8 +5161,8 @@ msgstr "Paket '%s' existiert nicht."
 
 #: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:24
 #: plugins/admin/systems/workstationStartup.tpl:39
-#: plugins/admin/systems/servRepositorySetup.tpl:8
 #: plugins/admin/systems/class_servRepository.inc:242
+#: plugins/admin/systems/servRepositorySetup.tpl:8
 msgid "Release"
 msgstr "Release"
 
@@ -5110,13 +5236,31 @@ msgstr "Bitte geben Sie einen g
 
 #: plugins/admin/fai/class_faiProfile.inc:393
 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."
+msgstr "Der von Ihnen angegebene Klassen-Name ist bereits für ein Profil vergeben."
 
 #: plugins/admin/fai/faiProfile.tpl:32
 msgid "FAI classes"
 msgstr "FAI-Klassen"
 
+#: plugins/admin/fai/remove.tpl:7
+msgid ""
+"This includes 'all' object information. Please double check if your really "
+"want to do this since there is no way for GOsa to get your data back."
+msgstr ""
+"Dies umfasst <b>alle</b> Objekt-Informationen Bitte prüfen Sie genau, da es "
+"keine Möglichkeit für GOsa gibt, die Daten zu restaurieren. "
+
+#: plugins/admin/fai/remove.tpl:11 plugins/admin/departments/remove.tpl:10
+#: plugins/admin/systems/remove.tpl:10 plugins/gofon/conference/remove.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your LDAP tree in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Eine Sicherung der LDAP-Datenbank bietet sich an. Wenn Sie dies erledigt "
+"haben, drücken Sie <i>Entfernen</i> um Fortzufahren oder <i>Abbrechen</i>, "
+"um den Vorgang abzubrechen."
+
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
 msgid "FS type"
 msgstr "Dateisystem"
@@ -5193,18 +5337,6 @@ msgstr ""
 "Sie haben mehr als 3 primäre Partitionen in ihrer Konfiguration. Bitte "
 "prüfen Sie die Konfiguration."
 
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
-msgid "Device"
-msgstr "Gerät"
-
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
-msgid "Partition entries"
-msgstr "Partitions-Einträge"
-
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
-msgid "Add partition"
-msgstr "Partition hinzufügen"
-
 #: plugins/admin/fai/faiScript.tpl:34
 msgid "List of scripts"
 msgstr "Liste der Skripte"
@@ -5245,8 +5377,7 @@ msgstr ""
 "jedoch kann der Mirror bearbeitet werden."
 
 #: plugins/admin/fai/faiPackageNew.tpl:14
-msgid ""
-"First select the preferred release, then the section and finally the mirror."
+msgid "First select the preferred release, then the section and finally the mirror."
 msgstr ""
 "Bitte wählen Sie zunächst das gewünschte Release, dann die Section und "
 "abschliessend den Mirror."
@@ -5268,6 +5399,59 @@ msgstr "setzen"
 msgid "Please specify a value for the attribute 'content'."
 msgstr "Bitte geben Sie einen Wert für das Attribute 'Inhalt' an."
 
+#: plugins/admin/fai/faiNewBranch.tpl:5
+msgid ""
+"You are now going to create a branch or locked branch. This action clones "
+"the existing release to another release name. Branches can be modified as "
+"usual. FAI classes of locked branches cannot be modified, just additional "
+"classes are possible. Branch names should be alphanumeric, excluding the "
+"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
+"and 'fai'."
+msgstr ""
+"Sie sind dabei, einen neuen (evtl. gesperrten) Zweig zu erstellen. Diese "
+"Aktion klont das existierende Release auf einen anderen Releasenamen. Zweige "
+"können wie gewohnt bearbeitet werden. FAI-Klassen von gesperrten Zweigen "
+"können nicht bearbeitet werden, lediglich das Hinzufügen von Klassen ist "
+"möglich. Zweignamen sollten alphanumerisch sein, reservierte Namen sind "
+"'scripts', 'hooks', 'partitions', 'variables', 'templates' und 'fai'. Diese "
+"können nicht verwendet werden."
+
+#: plugins/admin/fai/faiNewBranch.tpl:11
+msgid "Please enter a name for the branch"
+msgstr "Bitte geben Sie einen Namen für den Zweig ein"
+
+#: plugins/admin/fai/faiNewBranch.tpl:33
+#: plugins/admin/departments/recursive_move.tpl:1
+msgid "Processing the requested operation"
+msgstr "Gewünschte Operation wird durchgeführt"
+
+#: plugins/admin/fai/faiNewBranch.tpl:34
+msgid ""
+"As soon as the copy operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the fai management "
+"dialog."
+msgstr ""
+"Sobald der Vorgang abgeschlossen wurde, können Sie zum unteren Ende der "
+"Seite blättern und auf den 'Weiter'-Knopf drücken, um zum FAI-Verwaltungs-"
+"Dialog zu gelangen."
+
+#: plugins/admin/fai/faiNewBranch.tpl:40
+#: plugins/admin/departments/recursive_move.tpl:7
+msgid ""
+"Your browser doesn't support iframes, please use this link to perform the "
+"requested operation."
+msgstr ""
+"Ihr Browser unterstützt keine IFrames - bitte wählen Sie diesen Link, um die "
+"gewünschte Operation durchzuführen."
+
+#: plugins/admin/fai/faiNewBranch.tpl:42
+msgid "Perform requested operation."
+msgstr "Gewünschte Operation durchführen."
+
+#: plugins/admin/fai/faiNewBranch.tpl:42
+msgid "Initiate operation"
+msgstr "Operation initiieren"
+
 #: plugins/admin/fai/faiVariableEntry.tpl:29
 msgid "Variable attributes"
 msgstr "Variablen-Attribute"
@@ -5296,25 +5480,6 @@ msgstr ""
 "Dieses Menü erlaubt es Ihnen, Pakete auszuwählen und zur gegenwärtig "
 "bearbeiteten Paketliste hinzuzufügen."
 
-#: plugins/admin/fai/remove.tpl:7
-msgid ""
-"This includes 'all' object information. Please double check if your really "
-"want to do this since there is no way for GOsa to get your data back."
-msgstr ""
-"Dies umfasst <b>alle</b> Objekt-Informationen Bitte prüfen Sie genau, da es "
-"keine Möglichkeit für GOsa gibt, die Daten zu restaurieren. "
-
-#: plugins/admin/fai/remove.tpl:11 plugins/admin/departments/remove.tpl:10
-#: plugins/admin/systems/remove.tpl:10 plugins/gofon/conference/remove.tpl:10
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Eine Sicherung der LDAP-Datenbank bietet sich an. Wenn Sie dies erledigt "
-"haben, drücken Sie <i>Entfernen</i> um Fortzufahren oder <i>Abbrechen</i>, "
-"um den Vorgang abzubrechen."
-
 #: plugins/admin/fai/headpage.tpl:6
 msgid "List of FAI classes"
 msgstr "Liste benutzter Klassen"
@@ -5336,12 +5501,12 @@ msgid "Current release"
 msgstr "Momentanes Release"
 
 #: plugins/admin/fai/headpage.tpl:47
-msgid "Create new branch using the current release"
-msgstr "Einen neuen Zweig mithilfe des momentanen Releases erstellen"
+msgid "Create new branch"
+msgstr "Neuen Teilbaum erstellen"
 
 #: plugins/admin/fai/headpage.tpl:51
-msgid "Create a locked version of the current release"
-msgstr "Erstelle eine gesperrte Version des momentanen Releases"
+msgid "Create new locked branch"
+msgstr "Nicht veränderbaren Teilbaum erzeugen"
 
 #: plugins/admin/fai/headpage.tpl:56
 msgid "Delete current release"
@@ -5375,13 +5540,25 @@ msgstr "Zeige Pakete"
 msgid "Show partitions"
 msgstr "Zeige Partitionen"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:263
-#: plugins/admin/fai/class_faiPartitionTable.inc:269
-#, php-format
-msgid "%s partition"
-msgstr "%s Partition"
+#: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
+msgid "Hook attributes"
+msgstr "Hook-Attribute"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:265
+#: 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"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:263
+#: plugins/admin/fai/class_faiPartitionTable.inc:269
+#, php-format
+msgid "%s partition"
+msgstr "%s Partition"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:265
 #: plugins/admin/fai/class_faiPartitionTable.inc:271
 #, php-format
 msgid "%s partition(s)"
@@ -5400,18 +5577,6 @@ msgstr "Paket-Gruppe"
 msgid "Class name"
 msgstr "Klassen-Name"
 
-#: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
-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"
-
 #: plugins/admin/fai/class_faiPackageConfiguration.inc:45
 #, php-format
 msgid "Debconf information for package '%s'"
@@ -5455,8 +5620,7 @@ msgstr "Der angebene Klassen-Name ist leer."
 
 #: plugins/admin/fai/class_askClassName.inc:141
 msgid "The specified class name is already in use for this object type."
-msgstr ""
-"Der angegebene Klassen-Name ist für diesen Objekt-Typ bereits in Gebrauch."
+msgstr "Der angegebene Klassen-Name ist für diesen Objekt-Typ bereits in Gebrauch."
 
 #: plugins/admin/fai/askClassName.tpl:6
 msgid ""
@@ -5494,13 +5658,13 @@ msgid "Choose class name"
 msgstr "Wählen Sie den Klassen-Namen"
 
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
+#: plugins/admin/systems/glpiDeviceManagement.tpl:51
 #: plugins/admin/systems/class_glpiSelectUser.inc:113
 #: plugins/admin/systems/class_glpiSelectUser.inc:140
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:51
 #: plugins/admin/systems/glpiAttachmentPool.tpl:51
-#: plugins/admin/systems/glpiDeviceManagement.tpl:51
 #: plugins/admin/systems/SelectDeviceType.tpl:44
-#: plugins/admin/systems/class_baseSelectDialog.inc:39
+#: plugins/admin/systems/class_baseSelectDialog.inc:40
 msgid "Use"
 msgstr "Benutzen"
 
@@ -5508,6 +5672,16 @@ msgstr "Benutzen"
 msgid "A new class name."
 msgstr "Ein neuer Klassen-Name."
 
+#: plugins/admin/fai/remove_branch.tpl:6
+msgid ""
+"This includes all account data, system access, etc. for this branch. Please "
+"double check if your really want to do this since there is no way for GOsa "
+"to get your data back."
+msgstr ""
+"Dies umfasst alle Kontodaten, Zugriffsregeln etc. für diesen Zweig. Bitte "
+"prüfen Sie genau, da es keine Möglichkeit gibt, diese Aktion rückgängig zu "
+"machen."
+
 #: plugins/admin/fai/class_faiTemplateEntry.inc:81
 msgid "no file uploaded yet"
 msgstr "Es wurden noch keine Datei hochgeladen."
@@ -5531,8 +5705,7 @@ msgstr "Bitte geben Sie einen Benutzer ein."
 
 #: plugins/admin/fai/class_faiTemplateEntry.inc:185
 msgid "Please enter a valid user. Only a-z/0-9 are allowed."
-msgstr ""
-"Bitte geben Sie einen gültigen Benutzer ein (0-9 und a-Z sind erlaubt)."
+msgstr "Bitte geben Sie einen gültigen Benutzer ein (0-9 und a-Z sind erlaubt)."
 
 #: plugins/admin/fai/class_faiTemplateEntry.inc:189
 msgid "Please enter a group."
@@ -5557,8 +5730,8 @@ msgstr "Vorlage speichern"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:40
 #: plugins/admin/applications/generic.tpl:95
-#: plugins/admin/systems/printerPPDDialog.tpl:11
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
+#: plugins/admin/systems/printerPPDDialog.tpl:11
 msgid "Upload"
 msgstr "Hochladen"
 
@@ -5567,7 +5740,7 @@ msgid "Destination path"
 msgstr "Ziel-Pfad"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
 msgid "Owner"
 msgstr "Besitzer"
 
@@ -5575,7 +5748,7 @@ msgstr "Besitzer"
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
 #: plugins/admin/systems/class_printGeneric.inc:672
 #: plugins/admin/systems/class_printGeneric.inc:674
-#: plugins/admin/ogroups/class_ogroupManagement.inc:583
+#: plugins/admin/ogroups/class_ogroupManagement.inc:584
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr "Gruppe"
@@ -5633,203 +5806,6 @@ msgstr "Liste der Hook-Skripte"
 msgid "Choose a hook to delete or edit"
 msgstr "Wählen Sie einen Hook zum Entfernen oder Bearbeiten"
 
-#: plugins/admin/fai/faiNewBranch.tpl:5
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr ""
-"Sie sind dabei, einen neuen (evtl. gesperrten) Zweig zu erstellen. Diese "
-"Aktion klont das existierende Release auf einen anderen Releasenamen. Zweige "
-"können wie gewohnt bearbeitet werden. FAI-Klassen von gesperrten Zweigen "
-"können nicht bearbeitet werden, lediglich das Hinzufügen von Klassen ist "
-"möglich. Zweignamen sollten alphanumerisch sein, reservierte Namen sind "
-"'scripts', 'hooks', 'partitions', 'variables', 'templates' und 'fai'. Diese "
-"können nicht verwendet werden."
-
-#: plugins/admin/fai/faiNewBranch.tpl:11
-msgid "Please enter a name for the branch"
-msgstr "Bitte geben Sie einen Namen für den Zweig ein"
-
-#: plugins/admin/fai/faiNewBranch.tpl:33
-#: plugins/admin/departments/recursive_moce.tpl:1
-msgid ""
-"Processing requested operation, the status of this operation will be "
-"displayed in an iframe below."
-msgstr ""
-"Verarbeite die gewünschte Operation, der Status wird in einem iframe im "
-"unteren Bereich angezeigt."
-
-#: plugins/admin/fai/faiNewBranch.tpl:34
-msgid ""
-"As soon as the operation has finished, you can scroll down to end of the "
-"page and press the 'Back' button to return to the fai management dialog."
-msgstr ""
-"Sobald der Vorgang abgeschlossen wurde, können Sie zum unteren Ende der "
-"Seite blättern und auf den 'Zurück'-Knopf drücken, um zum FAI-Verwaltungs-"
-"Dialog zurück zu gelangen."
-
-#: plugins/admin/fai/faiNewBranch.tpl:42
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
-"Ihr Browser unterstützt keine IFrames - bitte wählen Sie diesen Link, um die "
-"gewünschte Operation durchzuführen."
-
-#: plugins/admin/fai/faiNewBranch.tpl:44
-msgid "Perform requested operation."
-msgstr "Gewünschte Operation durchführen."
-
-#: plugins/admin/fai/faiNewBranch.tpl:44
-msgid "Initiate operation"
-msgstr "Operation initiieren"
-
-#: plugins/admin/fai/remove_branch.tpl:6
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for GOsa "
-"to get your data back."
-msgstr ""
-"Dies umfasst alle Kontodaten, Zugriffsregeln etc. für diesen Zweig. Bitte "
-"prüfen Sie genau, da es keine Möglichkeit gibt, diese Aktion rückgängig zu "
-"machen."
-
-#: plugins/admin/groups/mail.tpl:11 plugins/admin/groups/paste_mail.tpl:12
-msgid "Primary mail address for this shared folder"
-msgstr "Primäre Mail-Adresse dieses Austausch-Ordners"
-
-#: plugins/admin/groups/mail.tpl:16
-msgid "Select mail server to place user on"
-msgstr "Wählen Sie den Mail-Server, auf dem der Benutzer angelegt werden soll"
-
-#: plugins/admin/groups/mail.tpl:63
-msgid "IMAP shared folders"
-msgstr "IMAP Austausch-Ordner"
-
-#: plugins/admin/groups/mail.tpl:67
-msgid "Default permission"
-msgstr "Standard-Berechtigungen"
-
-#: plugins/admin/groups/mail.tpl:76
-msgid "Member permission"
-msgstr "Mitglieder-Berechtigungen"
-
-#: plugins/admin/groups/mail.tpl:88 plugins/admin/groups/paste_mail.tpl:34
-msgid "Forward messages to non group members"
-msgstr "Weiterleiten der Nachrichten an nicht-Gruppenmitglieder"
-
-#: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:55 html/getxls.php:97
-#: html/getxls.php:99 html/getxls.php:244
-msgid "Groups"
-msgstr "Gruppen"
-
-#: plugins/admin/groups/class_groupManagement.inc:357
-#, php-format
-msgid "You're about to delete the group '%s'."
-msgstr "Sie sind dabei die Gruppe '%s' zu löschen."
-
-#: plugins/admin/groups/class_groupManagement.inc:363
-#: plugins/admin/groups/class_groupManagement.inc:389
-msgid "You are not allowed to delete this group!"
-msgstr "Sie haben keine Berechtigung, diese Gruppe zu löschen!"
-
-#: plugins/admin/groups/class_groupManagement.inc:441
-#: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/applications/class_applicationManagement.inc:460
-#: plugins/admin/ogroups/class_ogroupManagement.inc:431
-msgid "Paste"
-msgstr "Einfügen"
-
-#: plugins/admin/groups/class_groupManagement.inc:443
-#: plugins/admin/users/class_userManagement.inc:769
-#: plugins/admin/applications/class_applicationManagement.inc:462
-#: plugins/admin/ogroups/class_ogroupManagement.inc:433
-msgid "Can't paste"
-msgstr "Kann nicht einfügen"
-
-#: plugins/admin/groups/class_groupManagement.inc:455
-msgid "Create new group"
-msgstr "Neue Gruppe erstellen"
-
-#: plugins/admin/groups/class_groupManagement.inc:465
-#: plugins/admin/users/class_userManagement.inc:795
-#: plugins/admin/applications/class_applicationManagement.inc:485
-#: plugins/admin/ogroups/class_ogroupManagement.inc:460
-msgid "cut"
-msgstr "Ausschneiden"
-
-#: plugins/admin/groups/class_groupManagement.inc:465
-#: plugins/admin/users/class_userManagement.inc:795
-#: plugins/admin/applications/class_applicationManagement.inc:485
-#: plugins/admin/ogroups/class_ogroupManagement.inc:460
-msgid "Cut this entry"
-msgstr "Diesen Eintrag ausschneiden"
-
-#: plugins/admin/groups/class_groupManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:797
-#: plugins/admin/applications/class_applicationManagement.inc:487
-#: plugins/admin/ogroups/class_ogroupManagement.inc:462
-msgid "copy"
-msgstr "Kopieren"
-
-#: plugins/admin/groups/class_groupManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:797
-#: plugins/admin/applications/class_applicationManagement.inc:487
-#: plugins/admin/ogroups/class_ogroupManagement.inc:462
-msgid "Copy this entry"
-msgstr "Diesen Eintrag kopieren"
-
-#: plugins/admin/groups/class_groupManagement.inc:469
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/applications/class_applicationManagement.inc:489
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/departments/class_departmentManagement.inc:310
-#: plugins/admin/ogroups/class_ogroupManagement.inc:464
-#: plugins/admin/ogroups/class_ogroupManagement.inc:469
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
-msgid "Edit this entry"
-msgstr "Diesen Eintrag bearbeiten"
-
-#: plugins/admin/groups/class_groupManagement.inc:471
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/applications/class_applicationManagement.inc:491
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/departments/class_departmentManagement.inc:311
-#: plugins/admin/ogroups/class_ogroupManagement.inc:466
-#: plugins/admin/ogroups/class_ogroupManagement.inc:471
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
-msgid "Delete this entry"
-msgstr "Diesen Eintrag entfernen"
-
-#: plugins/admin/groups/class_groupManagement.inc:499
-#: plugins/admin/users/class_userManagement.inc:856
-msgid "Posix"
-msgstr "Posix"
-
-#: plugins/admin/groups/class_groupManagement.inc:508
-#: plugins/admin/applications/class_applicationManagement.inc:509
-#: plugins/admin/ogroups/class_ogroupManagement.inc:584
-#: plugins/gofon/fonreports/contents.tpl:34
-#: plugins/generic/references/class_reference.inc:42
-msgid "Application"
-msgstr "Anwendung"
-
-#: plugins/admin/groups/class_groupManagement.inc:523
-msgid "Groupname"
-msgstr "Name der Gruppe"
-
-#: plugins/admin/groups/class_groupManagement.inc:528
-#: plugins/admin/applications/class_applicationManagement.inc:523
-#: plugins/admin/ogroups/class_ogroupManagement.inc:498
-msgid "This table displays all groups, in the selected tree."
-msgstr "Diese Tabelle enthält alle Gruppen des ausgewählten Unterbaums."
-
 #: plugins/admin/groups/class_groupGeneric.inc:122
 msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
@@ -5863,8 +5839,7 @@ msgstr "Spezielle Gruppe (%d)"
 
 #: plugins/admin/groups/class_groupGeneric.inc:445
 #, php-format
-msgid ""
-"Your search method returned more than '%s' users, only '%s' users are shown."
+msgid "Your search method returned more than '%s' users, only '%s' users are shown."
 msgstr ""
 "Ihre Such-Methode ergab mehr als '%s' Benutzer, es werden davon '%s' "
 "Benutzer angezeigt."
@@ -5886,8 +5861,7 @@ msgstr "Keine konfigurierte RIDBASE f
 #: plugins/admin/groups/class_groupGeneric.inc:716
 #: plugins/admin/ogroups/class_ogroup.inc:655
 msgid "You have no permissions to create a group on this 'Base'."
-msgstr ""
-"Sie haben keine Berechtigung, eine Gruppe unterhalb dieser 'Basis' anzulegen."
+msgstr "Sie haben keine Berechtigung, eine Gruppe unterhalb dieser 'Basis' anzulegen."
 
 #: plugins/admin/groups/class_groupGeneric.inc:726
 msgid ""
@@ -5903,17 +5877,29 @@ msgstr ""
 msgid "Value specified as 'Name' is already used."
 msgstr "Eine Gruppe mit diesem Namen existiert bereits."
 
-#: plugins/admin/groups/remove.tpl:6
-msgid ""
-"This may be a primary user group. Please double check if you really want to "
-"do this since there is no way for GOsa to get your data back."
-msgstr ""
-"Bitte prüfen Sie, ob Sie die Aktion wirklich durchführen möchten, da GOsa "
-"die Daten nicht wiederherstellen kann."
+#: plugins/admin/groups/mail.tpl:11 plugins/admin/groups/paste_mail.tpl:12
+msgid "Primary mail address for this shared folder"
+msgstr "Primäre Mail-Adresse dieses Austausch-Ordners"
 
-#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
-msgid "Group administration"
-msgstr "Gruppenverwaltung"
+#: plugins/admin/groups/mail.tpl:16
+msgid "Select mail server to place user on"
+msgstr "Wählen Sie den Mail-Server, auf dem der Benutzer angelegt werden soll"
+
+#: plugins/admin/groups/mail.tpl:63
+msgid "IMAP shared folders"
+msgstr "IMAP Austausch-Ordner"
+
+#: plugins/admin/groups/mail.tpl:67
+msgid "Default permission"
+msgstr "Standard-Berechtigungen"
+
+#: plugins/admin/groups/mail.tpl:76
+msgid "Member permission"
+msgstr "Mitglieder-Berechtigungen"
+
+#: plugins/admin/groups/mail.tpl:88 plugins/admin/groups/paste_mail.tpl:34
+msgid "Forward messages to non group members"
+msgstr "Weiterleiten der Nachrichten an nicht-Gruppenmitglieder"
 
 #: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
 msgid "List of groups"
@@ -5931,8 +5917,7 @@ msgstr ""
 
 #: plugins/admin/groups/headpage.tpl:41
 msgid "Select to see groups that are primary groups of users"
-msgstr ""
-"Auswählen, um die Gruppen zu sehen, die primären Gruppen der Benutzer sind"
+msgstr "Auswählen, um die Gruppen zu sehen, die primären Gruppen der Benutzer sind"
 
 #: plugins/admin/groups/headpage.tpl:42
 msgid "Show primary groups"
@@ -5940,8 +5925,7 @@ msgstr "Zeige prim
 
 #: plugins/admin/groups/headpage.tpl:46
 msgid "Select to see groups that have samba groups mappings"
-msgstr ""
-"Auswählen, um die Gruppen zu sehen, denen Samba-Eigenschaften zugeordnet sind"
+msgstr "Auswählen, um die Gruppen zu sehen, denen Samba-Eigenschaften zugeordnet sind"
 
 #: plugins/admin/groups/headpage.tpl:47
 msgid "Show samba groups"
@@ -5973,21 +5957,145 @@ msgstr "Ausw
 msgid "Show functional groups"
 msgstr "Zeige Funktions-Gruppen"
 
-#: plugins/admin/groups/class_groupMail.inc:278
-msgid "read"
-msgstr "lesen"
-
-#: plugins/admin/groups/class_groupMail.inc:279
-msgid "post"
-msgstr "posten"
+#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
+msgid "Group administration"
+msgstr "Gruppenverwaltung"
 
-#: plugins/admin/groups/class_groupMail.inc:280
-msgid "external post"
-msgstr "extern posten"
+#: plugins/admin/groups/class_groupManagement.inc:25
+#: plugins/admin/ogroups/class_ogroupManagement.inc:55 html/getxls.php:97
+#: html/getxls.php:99 html/getxls.php:244
+msgid "Groups"
+msgstr "Gruppen"
 
-#: plugins/admin/groups/class_groupMail.inc:281
-msgid "append"
-msgstr "anhängen"
+#: plugins/admin/groups/class_groupManagement.inc:357
+#, php-format
+msgid "You're about to delete the group '%s'."
+msgstr "Sie sind dabei die Gruppe '%s' zu löschen."
+
+#: plugins/admin/groups/class_groupManagement.inc:363
+#: plugins/admin/groups/class_groupManagement.inc:389
+msgid "You are not allowed to delete this group!"
+msgstr "Sie haben keine Berechtigung, diese Gruppe zu löschen!"
+
+#: plugins/admin/groups/class_groupManagement.inc:441
+#: plugins/admin/users/class_userManagement.inc:767
+#: plugins/admin/applications/class_applicationManagement.inc:462
+#: plugins/admin/ogroups/class_ogroupManagement.inc:431
+msgid "Paste"
+msgstr "Einfügen"
+
+#: plugins/admin/groups/class_groupManagement.inc:443
+#: plugins/admin/users/class_userManagement.inc:769
+#: plugins/admin/applications/class_applicationManagement.inc:464
+#: plugins/admin/ogroups/class_ogroupManagement.inc:433
+msgid "Can't paste"
+msgstr "Kann nicht einfügen"
+
+#: plugins/admin/groups/class_groupManagement.inc:456
+msgid "Create new group"
+msgstr "Neue Gruppe erstellen"
+
+#: plugins/admin/groups/class_groupManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/applications/class_applicationManagement.inc:488
+#: plugins/admin/ogroups/class_ogroupManagement.inc:461
+msgid "cut"
+msgstr "Ausschneiden"
+
+#: plugins/admin/groups/class_groupManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/applications/class_applicationManagement.inc:488
+#: plugins/admin/ogroups/class_ogroupManagement.inc:461
+msgid "Cut this entry"
+msgstr "Diesen Eintrag ausschneiden"
+
+#: plugins/admin/groups/class_groupManagement.inc:468
+#: plugins/admin/users/class_userManagement.inc:798
+#: plugins/admin/applications/class_applicationManagement.inc:490
+#: plugins/admin/ogroups/class_ogroupManagement.inc:463
+msgid "copy"
+msgstr "Kopieren"
+
+#: plugins/admin/groups/class_groupManagement.inc:468
+#: plugins/admin/users/class_userManagement.inc:798
+#: plugins/admin/applications/class_applicationManagement.inc:490
+#: plugins/admin/ogroups/class_ogroupManagement.inc:463
+msgid "Copy this entry"
+msgstr "Diesen Eintrag kopieren"
+
+#: plugins/admin/groups/class_groupManagement.inc:470
+#: plugins/admin/groups/class_groupManagement.inc:475
+#: plugins/admin/applications/class_applicationManagement.inc:492
+#: plugins/admin/applications/class_applicationManagement.inc:498
+#: plugins/admin/departments/class_departmentManagement.inc:311
+#: plugins/admin/ogroups/class_ogroupManagement.inc:465
+#: plugins/admin/ogroups/class_ogroupManagement.inc:470
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
+msgid "Edit this entry"
+msgstr "Diesen Eintrag bearbeiten"
+
+#: plugins/admin/groups/class_groupManagement.inc:472
+#: plugins/admin/groups/class_groupManagement.inc:477
+#: plugins/admin/applications/class_applicationManagement.inc:494
+#: plugins/admin/applications/class_applicationManagement.inc:500
+#: plugins/admin/departments/class_departmentManagement.inc:312
+#: plugins/admin/ogroups/class_ogroupManagement.inc:467
+#: plugins/admin/ogroups/class_ogroupManagement.inc:472
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
+msgid "Delete this entry"
+msgstr "Diesen Eintrag entfernen"
+
+#: plugins/admin/groups/class_groupManagement.inc:500
+#: plugins/admin/users/class_userManagement.inc:857
+msgid "Posix"
+msgstr "Posix"
+
+#: plugins/admin/groups/class_groupManagement.inc:509
+#: plugins/admin/applications/class_applicationManagement.inc:512
+#: plugins/admin/ogroups/class_ogroupManagement.inc:585
+#: plugins/gofon/fonreports/contents.tpl:34
+#: plugins/generic/references/class_reference.inc:42
+msgid "Application"
+msgstr "Anwendung"
+
+#: plugins/admin/groups/class_groupManagement.inc:524
+msgid "Groupname"
+msgstr "Name der Gruppe"
+
+#: plugins/admin/groups/class_groupManagement.inc:529
+#: plugins/admin/applications/class_applicationManagement.inc:526
+#: plugins/admin/ogroups/class_ogroupManagement.inc:499
+msgid "This table displays all groups, in the selected tree."
+msgstr "Diese Tabelle enthält alle Gruppen des ausgewählten Unterbaums."
+
+#: plugins/admin/groups/remove.tpl:6
+msgid ""
+"This may be a primary user group. Please double check if you really want to "
+"do this since there is no way for GOsa to get your data back."
+msgstr ""
+"Bitte prüfen Sie, ob Sie die Aktion wirklich durchführen möchten, da GOsa "
+"die Daten nicht wiederherstellen kann."
+
+#: plugins/admin/groups/application_options.tpl:1
+msgid "Application options"
+msgstr "Anwendungsoptionen"
+
+#: plugins/admin/groups/class_groupMail.inc:278
+msgid "read"
+msgstr "lesen"
+
+#: plugins/admin/groups/class_groupMail.inc:279
+msgid "post"
+msgstr "posten"
+
+#: plugins/admin/groups/class_groupMail.inc:280
+msgid "external post"
+msgstr "extern posten"
+
+#: plugins/admin/groups/class_groupMail.inc:281
+msgid "append"
+msgstr "anhängen"
 
 #: plugins/admin/groups/class_groupMail.inc:282
 msgid "write"
@@ -6012,8 +6120,7 @@ msgstr ""
 "ein."
 
 #: plugins/admin/groups/class_groupMail.inc:834
-msgid ""
-"Please choose valid permission settings. Default permission can't be emtpy."
+msgid "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 "Bitte wählen sie gültige Zugriffsrechte. Standard-Zugriffsrechte dürfen "
 "nicht leer sein."
@@ -6023,6 +6130,8 @@ msgid "Please select a valid mail server."
 msgstr "Bitte wählen Sie einen gültigen Mail-Server."
 
 #: plugins/admin/groups/acl.tpl:4
+#: plugins/admin/departments/class_departmentGeneric.inc:314
+#: include/class_ldap.inc:412
 msgid "Object"
 msgstr "Objekt"
 
@@ -6100,8 +6209,7 @@ msgstr "W
 #: plugins/admin/groups/generic.tpl:37
 #: plugins/admin/groups/paste_generic.tpl:13
 msgid "Normally IDs are autogenerated, select to specify manually"
-msgstr ""
-"Normalerweise werden IDs automatisch generiert. Auswählen um dies zu umgehen"
+msgstr "Normalerweise werden IDs automatisch generiert. Auswählen um dies zu umgehen"
 
 #: plugins/admin/groups/generic.tpl:37
 #: plugins/admin/groups/paste_generic.tpl:15
@@ -6141,9 +6249,9 @@ msgstr "Ordner-Administratoren"
 msgid "Select a specific department"
 msgstr "Wählen Sie eine bestimmte Abteilung"
 
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
-msgstr "Anwendungsoptionen"
+#: plugins/admin/groups/paste_generic.tpl:1
+msgid "Group settings"
+msgstr "Gruppen-Einstellungen"
 
 #: plugins/admin/groups/mail_locals.tpl:32
 msgid "Display addresses of department"
@@ -6222,10 +6330,6 @@ msgstr "Nach unten bewegen"
 msgid "Insert seperator"
 msgstr "Feldtrenner einfügen"
 
-#: plugins/admin/groups/paste_generic.tpl:1
-msgid "Group settings"
-msgstr "Gruppen-Einstellungen"
-
 #: plugins/admin/users/password.tpl:2
 msgid ""
 "To change the user password use the fields below. The changes take effect "
@@ -6236,10 +6340,34 @@ msgstr ""
 "Änderungen werden sofort wirksam. Merken Sie sich das Passwort, da sich der "
 "Benutzer ohne dieses Passwort nicht anmelden kann."
 
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr "Erzeugen eines neuen Benutzer aus einer Vorlage"
+
+#: plugins/admin/users/template.tpl:6
+msgid ""
+"Creating a new user can be assisted by using templates. Many database "
+"records will be filled automatically. Choose 'none' to skip the usage of "
+"templates."
+msgstr ""
+"Das Anlegen von neuen Benutzern kann durch die Verwendung von Vorlagen "
+"vereinfacht werden. Viele Datenbankeinträge lassen sich damit automatisch "
+"ausfüllen. Wählen sie <b>keine</b> um den Vorlagen-Dialog zu überspringen."
+
+#: plugins/admin/users/template.tpl:11
+#: plugins/admin/users/class_userManagement.inc:1181
+#: plugins/admin/systems/class_systemManagement.inc:918
+msgid "Template"
+msgstr "Vorlage"
+
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
+msgstr "Benutzerverwaltung"
+
 #: plugins/admin/users/class_userManagement.inc:25
-#: plugins/admin/systems/printer.tpl:66
-#: plugins/admin/systems/class_glpiSelectUser.inc:112 html/getxls.php:68
-#: html/getxls.php:70 html/getxls.php:243
+#: plugins/admin/systems/class_glpiSelectUser.inc:112
+#: plugins/admin/systems/printer.tpl:66 html/getxls.php:68 html/getxls.php:70
+#: html/getxls.php:243
 msgid "Users"
 msgstr "Benutzer"
 
@@ -6267,97 +6395,91 @@ msgstr "keine"
 
 #: plugins/admin/users/class_userManagement.inc:646
 msgid "A person with the choosen name is already used in this tree."
-msgstr ""
-"Ein Person mit dem ausgewählten Namen ist in diesem Baum bereits angelegt."
+msgstr "Ein Person mit dem ausgewählten Namen ist in diesem Baum bereits angelegt."
 
-#: plugins/admin/users/class_userManagement.inc:782
+#: plugins/admin/users/class_userManagement.inc:783
 msgid "Create new user"
 msgstr "Neuen Benutzer erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:782
+#: plugins/admin/users/class_userManagement.inc:783
 msgid "New user"
 msgstr "Neuer Benutzer"
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:784
 msgid "Create new template"
 msgstr "Neue Vorlage erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:784
 msgid "New template"
 msgstr "Neue Vorlage"
 
-#: plugins/admin/users/class_userManagement.inc:800
-#: plugins/admin/users/class_userManagement.inc:807
+#: plugins/admin/users/class_userManagement.inc:801
+#: plugins/admin/users/class_userManagement.inc:808
 msgid "password"
 msgstr "Passwort"
 
-#: plugins/admin/users/class_userManagement.inc:818
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
+#: plugins/admin/users/class_userManagement.inc:819
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
-#: ihtml/themes/default/setup_useradmin.tpl:22
+#: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/default/login.tpl:28 ihtml/themes/default/login.tpl:32
+#: ihtml/themes/default/setup_useradmin.tpl:22 ihtml/themes/lhs/login.tpl:28
+#: ihtml/themes/lhs/login.tpl:32 ihtml/themes/lhs/setup_useradmin.tpl:22
 msgid "Username"
 msgstr "Benutzername"
 
-#: plugins/admin/users/class_userManagement.inc:823
+#: plugins/admin/users/class_userManagement.inc:824
 msgid "This table displays all users, in the selected tree."
 msgstr "Diese Tabelle enthält alle Benutzer dieses Unterbaums."
 
-#: plugins/admin/users/class_userManagement.inc:854
+#: plugins/admin/users/class_userManagement.inc:855
 msgid "GOsa"
 msgstr "GOsa"
 
-#: plugins/admin/users/class_userManagement.inc:855
+#: plugins/admin/users/class_userManagement.inc:856
 msgid "Edit generic properties"
 msgstr "Allgemeine Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:857
+#: plugins/admin/users/class_userManagement.inc:858
 msgid "Edit UNIX properties"
 msgstr "UNIX-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:859
+#: plugins/admin/users/class_userManagement.inc:860
 msgid "Edit environment properties"
 msgstr "Umgebungs-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:861
+#: plugins/admin/users/class_userManagement.inc:862
 msgid "Edit mail properties"
 msgstr "Mail-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:863
+#: plugins/admin/users/class_userManagement.inc:864
 msgid "Edit phone properties"
 msgstr "Telefon-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:865
+#: plugins/admin/users/class_userManagement.inc:866
 msgid "Edit fax properies"
 msgstr "Fax-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:867
+#: plugins/admin/users/class_userManagement.inc:868
 msgid "Edit samba properties"
 msgstr "Samba-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:868
+#: plugins/admin/users/class_userManagement.inc:869
 msgid "Create user from template"
 msgstr "Neuen Benutzer aus Vorlage erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:869
+#: plugins/admin/users/class_userManagement.inc:870
 msgid "Create user with this template"
 msgstr "Neuen Benutzer aus dieser Vorlage erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:928
+#: plugins/admin/users/class_userManagement.inc:929
 msgid "Online"
 msgstr "aktiv"
 
-#: plugins/admin/users/class_userManagement.inc:935
+#: plugins/admin/users/class_userManagement.inc:936
 msgid "Offline"
 msgstr "inaktiv"
 
-#: plugins/admin/users/class_userManagement.inc:1180
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/systems/class_systemManagement.inc:917
-msgid "Template"
-msgstr "Vorlage"
-
 #: plugins/admin/users/remove.tpl:6
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -6405,8 +6527,7 @@ msgstr "Zeige UNIX-Benutzer"
 
 #: plugins/admin/users/headpage.tpl:41
 msgid "Select to see users that have mail settings"
-msgstr ""
-"Auswählen, um die Benutzer zu sehen, die eine Mail-Erweiterung besitzen"
+msgstr "Auswählen, um die Benutzer zu sehen, die eine Mail-Erweiterung besitzen"
 
 #: plugins/admin/users/headpage.tpl:41
 msgid "Show mail users"
@@ -6428,67 +6549,10 @@ msgstr "Ausw
 msgid "Show proxy users"
 msgstr "Zeige Proxy-Benutzer"
 
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
-msgstr "Benutzerverwaltung"
-
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
-msgstr "Erzeugen eines neuen Benutzer aus einer Vorlage"
-
-#: plugins/admin/users/template.tpl:6
-msgid ""
-"Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose 'none' to skip the usage of "
-"templates."
-msgstr ""
-"Das Anlegen von neuen Benutzern kann durch die Verwendung von Vorlagen "
-"vereinfacht werden. Viele Datenbankeinträge lassen sich damit automatisch "
-"ausfüllen. Wählen sie <b>keine</b> um den Vorlagen-Dialog zu überspringen."
-
-#: plugins/admin/applications/class_applicationParameters.inc:52
-msgid "Remove options"
-msgstr "Optionen entfernen"
-
-#: plugins/admin/applications/class_applicationParameters.inc:53
-msgid "This application has options. You can disable them by clicking below."
-msgstr ""
-"Diese Anwendung besitzt Optionen. Sie können diese durch Betätigen der "
-"Schaltfläche unten entfernen."
-
-#: plugins/admin/applications/class_applicationParameters.inc:55
-msgid "Create options"
-msgstr "Optionen aktivieren"
-
-#: plugins/admin/applications/class_applicationParameters.inc:56
-msgid ""
-"This application has options disabled. You can enable them by clicking below."
-msgstr ""
-"Diese Anwendung besitzt keine Optionen. Sie können diese durch Betätigen der "
-"Schaltfläche unten hinzufügen."
-
-#: plugins/admin/applications/class_applicationParameters.inc:93
-msgid "Variable"
-msgstr "Variable"
-
-#: plugins/admin/applications/class_applicationParameters.inc:93
-#: plugins/gofon/macro/parameter.tpl:9
-msgid "Default value"
-msgstr "Standardwert"
-
-#: plugins/admin/applications/class_applicationParameters.inc:104
-msgid "Add option"
-msgstr "Option hinzufügen"
-
-#: plugins/admin/applications/class_applicationParameters.inc:158
-#, php-format
-msgid "Value '%s' specified as option name is not valid."
-msgstr "Der von Ihnen angegebene Optionsname '%s' ist ungültig."
-
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
+#: plugins/admin/applications/class_applicationManagement.inc:521
 #: plugins/admin/applications/class_applicationGeneric.inc:379
-#: plugins/admin/applications/class_applicationManagement.inc:518
 msgid "Application name"
 msgstr "Name der Anwendung"
 
@@ -6542,6 +6606,44 @@ msgstr "Platziere einen Eintrag im Startmen
 msgid "Place entry in members launch bar"
 msgstr "Platziere einen Eintrag in der Kontrollleiste der Gruppenmitglieder"
 
+#: plugins/admin/applications/class_applicationParameters.inc:52
+msgid "Remove options"
+msgstr "Optionen entfernen"
+
+#: plugins/admin/applications/class_applicationParameters.inc:53
+msgid "This application has options. You can disable them by clicking below."
+msgstr ""
+"Diese Anwendung besitzt Optionen. Sie können diese durch Betätigen der "
+"Schaltfläche unten entfernen."
+
+#: plugins/admin/applications/class_applicationParameters.inc:55
+msgid "Create options"
+msgstr "Optionen aktivieren"
+
+#: plugins/admin/applications/class_applicationParameters.inc:56
+msgid "This application has options disabled. You can enable them by clicking below."
+msgstr ""
+"Diese Anwendung besitzt keine Optionen. Sie können diese durch Betätigen der "
+"Schaltfläche unten hinzufügen."
+
+#: plugins/admin/applications/class_applicationParameters.inc:93
+msgid "Variable"
+msgstr "Variable"
+
+#: plugins/admin/applications/class_applicationParameters.inc:93
+#: plugins/gofon/macro/parameter.tpl:9
+msgid "Default value"
+msgstr "Standardwert"
+
+#: plugins/admin/applications/class_applicationParameters.inc:104
+msgid "Add option"
+msgstr "Option hinzufügen"
+
+#: plugins/admin/applications/class_applicationParameters.inc:158
+#, php-format
+msgid "Value '%s' specified as option name is not valid."
+msgstr "Der von Ihnen angegebene Optionsname '%s' ist ungültig."
+
 #: plugins/admin/applications/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -6578,8 +6680,27 @@ msgstr "Regul
 msgid "Application management"
 msgstr "Anwendungsverwaltung"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:87
-msgid "no example"
+#: plugins/admin/applications/class_applicationManagement.inc:376
+#, php-format
+msgid "You're about to delete the application '%s'."
+msgstr "Sind sind dabei, den Anwendungseintrag '%s' zu löschen."
+
+#: plugins/admin/applications/class_applicationManagement.inc:382
+#: plugins/admin/applications/class_applicationManagement.inc:408
+msgid "You are not allowed to delete this application!"
+msgstr "Sie haben keine Berechtigung, diese Anwendung zu löschen!"
+
+#: plugins/admin/applications/class_applicationManagement.inc:477
+#: plugins/admin/ogroups/class_ogroupManagement.inc:449
+msgid "new"
+msgstr "Neu"
+
+#: plugins/admin/applications/class_applicationManagement.inc:477
+msgid "Create new application"
+msgstr "Neu Anwendung erstellen"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:87
+msgid "no example"
 msgstr "kein Beispiel"
 
 #: plugins/admin/applications/class_applicationGeneric.inc:107
@@ -6602,8 +6723,7 @@ msgstr "Das ben
 
 #: plugins/admin/applications/class_applicationGeneric.inc:307
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
-msgstr ""
-"Ungültiges Zeichen in Anwendungs-Name. Nur a-z und 0-9 sind erlaubte Zeichen."
+msgstr "Ungültiges Zeichen in Anwendungs-Name. Nur a-z und 0-9 sind erlaubte Zeichen."
 
 #: plugins/admin/applications/class_applicationGeneric.inc:311
 msgid "Required field 'Execute' is not filled."
@@ -6617,25 +6737,6 @@ msgstr "Eine Anwendung mit diesem Namen existiert bereits."
 msgid "Application settings"
 msgstr "Anwendungs-Einstellungen"
 
-#: plugins/admin/applications/class_applicationManagement.inc:374
-#, php-format
-msgid "You're about to delete the application '%s'."
-msgstr "Sind sind dabei, den Anwendungseintrag '%s' zu löschen."
-
-#: plugins/admin/applications/class_applicationManagement.inc:380
-#: plugins/admin/applications/class_applicationManagement.inc:406
-msgid "You are not allowed to delete this application!"
-msgstr "Sie haben keine Berechtigung, diese Anwendung zu löschen!"
-
-#: plugins/admin/applications/class_applicationManagement.inc:474
-#: plugins/admin/ogroups/class_ogroupManagement.inc:448
-msgid "new"
-msgstr "Neu"
-
-#: plugins/admin/applications/class_applicationManagement.inc:474
-msgid "Create new application"
-msgstr "Neu Anwendung erstellen"
-
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr "Name der Abteilung"
@@ -6719,6 +6820,40 @@ msgstr "Regul
 msgid "Department management"
 msgstr "Abteilungsverwaltung"
 
+#: plugins/admin/departments/class_departmentManagement.inc:25
+#: plugins/admin/systems/class_glpiSelectUser.inc:112
+#: plugins/admin/ogroups/class_ogroupManagement.inc:56
+#: plugins/admin/ogroups/class_ogroupManagement.inc:493
+msgid "Departments"
+msgstr "Abteilungen"
+
+#: plugins/admin/departments/class_departmentManagement.inc:186
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:182
+#, php-format
+msgid "You're about to delete the whole LDAP subtree placed under '%s'."
+msgstr "Sie sind dabei, einen gesamten LDAP-Baum unterhalb von '%s' zu löschen."
+
+#: plugins/admin/departments/class_departmentManagement.inc:203
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:197
+msgid "You have no permission to remove this department."
+msgstr "Sie haben keine Berechtigung, diese Abteilung zu entfernen."
+
+#: plugins/admin/departments/class_departmentManagement.inc:301
+msgid "Create new department"
+msgstr "Neue Abteilung erstellen"
+
+#: plugins/admin/departments/class_departmentManagement.inc:309
+msgid "This table displays all departments, in the selected tree."
+msgstr "Diese Tabelle enthält alle Abteilungen des gewählten Unterbaums"
+
+#: plugins/admin/departments/class_departmentManagement.inc:318
+msgid "Department name"
+msgstr "Name der Abteilung"
+
+#: plugins/admin/departments/class_departmentManagement.inc:412
+msgid ".."
+msgstr ".."
+
 #: plugins/admin/departments/class_departmentGeneric.inc:185
 msgid "You have no permissions to create a department on this 'Base'."
 msgstr ""
@@ -6742,106 +6877,70 @@ msgstr "Das Feld 'Name' enth
 msgid " Please choose another name."
 msgstr "Bitte wählen Sie einen anderen Namen."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:274
+#: plugins/admin/departments/class_departmentGeneric.inc:278
 #, php-format
-msgid "Moving %s in %s"
+msgid "Moving %s to %s"
 msgstr "Verschiebe %s nach %s"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:313
+#: plugins/admin/departments/class_departmentGeneric.inc:317
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "Fehler beim kopieren von %s, breche ab"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:321
-msgid "Complete"
-msgstr "Vollständig"
-
-#: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: plugins/admin/ogroups/class_ogroupManagement.inc:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:492
-msgid "Departments"
-msgstr "Abteilungen"
-
-#: plugins/admin/departments/class_departmentManagement.inc:186
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:182
-#, php-format
-msgid "You're about to delete the whole LDAP subtree placed under '%s'."
-msgstr ""
-"Sie sind dabei, einen gesamten LDAP-Baum unterhalb von '%s' zu löschen."
-
-#: plugins/admin/departments/class_departmentManagement.inc:203
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:197
-msgid "You have no permission to remove this department."
-msgstr "Sie haben keine Berechtigung, diese Abteilung zu entfernen."
-
-#: plugins/admin/departments/class_departmentManagement.inc:300
-msgid "Create new department"
-msgstr "Neue Abteilung erstellen"
-
-#: plugins/admin/departments/class_departmentManagement.inc:308
-msgid "This table displays all departments, in the selected tree."
-msgstr "Diese Tabelle enthält alle Abteilungen des gewählten Unterbaums"
-
-#: plugins/admin/departments/class_departmentManagement.inc:317
-msgid "Department name"
-msgstr "Name der Abteilung"
-
-#: plugins/admin/departments/class_departmentManagement.inc:411
-msgid ".."
-msgstr ".."
-
-#: plugins/admin/departments/recursive_moce.tpl:3
+#: plugins/admin/departments/recursive_move.tpl:2
 msgid ""
-"Your browser isn't able to display this iframe ... use the link below intead"
+"As soon as the move operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the department "
+"management dialog."
 msgstr ""
-"Ihr Browser kann dieses iframe nicht anzeigen - verwenden Sie stattdessen "
-"den unteren Link"
+"Sobald der Vorgang abgeschlossen wurde, können Sie zum unteren Ende der "
+"Seite blättern und auf den 'Weiter'-Knopf drücken, um zum Abteilungs-Verwaltungs-"
+"Dialog zurück zu gelangen."
 
 #: plugins/admin/systems/class_terminalInfo.inc:54
-#: plugins/admin/systems/class_terminalInfo.inc:199
+#: plugins/admin/systems/class_terminalInfo.inc:200
 msgid "present"
 msgstr "vorhanden"
 
-#: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_terminalService.inc:158
-#: plugins/admin/systems/class_terminalStartup.inc:99
+#: plugins/admin/systems/class_terminalInfo.inc:68
 #: plugins/admin/systems/class_workstationService.inc:151
 #: plugins/admin/systems/class_workstationStartup.inc:372
+#: plugins/admin/systems/class_terminalService.inc:158
+#: plugins/admin/systems/class_terminalStartup.inc:99
 #: plugins/admin/systems/class_terminalGeneric.inc:153
 msgid "This 'dn' has no terminal features."
 msgstr "Dieser 'DN' hat keine Terminal-Erweiterungen."
 
-#: plugins/admin/systems/class_terminalInfo.inc:74
+#: plugins/admin/systems/class_terminalInfo.inc:75
 msgid "There is no php snmp module installed, can't gather any informations."
 msgstr ""
 "Das PHP-SNMP-Modul ist nicht installiert, kann daher keine Information "
 "sammeln."
 
-#: plugins/admin/systems/class_terminalInfo.inc:80
-#: plugins/admin/systems/class_terminalInfo.inc:174
+#: plugins/admin/systems/class_terminalInfo.inc:81
+#: plugins/admin/systems/class_terminalInfo.inc:175
 msgid "unknown status"
 msgstr "unbekannter Status"
 
-#: plugins/admin/systems/class_terminalInfo.inc:89
+#: plugins/admin/systems/class_terminalInfo.inc:90
 msgid "This is a virtual terminal which has no properties to show here."
 msgstr ""
 "Dies ist ein virtuelles Terminal, deshalb können an dieser Stelle keine "
 "Informationen angezeigt werden."
 
-#: plugins/admin/systems/class_terminalInfo.inc:107
+#: plugins/admin/systems/class_terminalInfo.inc:108
 msgid "online"
 msgstr "aktiv"
 
-#: plugins/admin/systems/class_terminalInfo.inc:163
+#: plugins/admin/systems/class_terminalInfo.inc:164
 msgid "running"
 msgstr "läuft"
 
-#: plugins/admin/systems/class_terminalInfo.inc:166
+#: plugins/admin/systems/class_terminalInfo.inc:167
 msgid "not running"
 msgstr "läuft nicht"
 
-#: plugins/admin/systems/class_terminalInfo.inc:191
+#: plugins/admin/systems/class_terminalInfo.inc:192
 msgid "offline"
 msgstr "inaktiv"
 
@@ -6872,8 +6971,8 @@ msgid "Zone"
 msgstr "Zone"
 
 #: plugins/admin/systems/network.tpl:42
-#: plugins/admin/systems/class_servDNS.inc:298
 #: plugins/admin/systems/servdnseditzone.tpl:81
+#: plugins/admin/systems/class_servDNS.inc:298
 msgid "TTL"
 msgstr "TTL"
 
@@ -6881,366 +6980,104 @@ msgstr "TTL"
 msgid "Dns records"
 msgstr "DNS-Einträge"
 
-#: plugins/admin/systems/class_winGeneric.inc:73
-#: plugins/admin/systems/class_componentGeneric.inc:50
-msgid "This 'dn' has no network features."
-msgstr "Diese 'dn' hat keine Netzwerk-Erweiterungen."
-
-#: plugins/admin/systems/class_winGeneric.inc:162
-#: plugins/admin/systems/class_componentGeneric.inc:145
-msgid "You have no permissions to create a component on this 'Base'."
-msgstr ""
-"Sie haben keine Berechtigung, eine Komponente unterhalb dieser 'Basis' "
-"anzulegen."
-
-#: plugins/admin/systems/class_winGeneric.inc:172
-#: plugins/admin/systems/class_phoneGeneric.inc:314
-#: plugins/admin/systems/class_terminalGeneric.inc:286
-#: plugins/admin/systems/class_servGeneric.inc:209
-#: plugins/admin/systems/class_workstationGeneric.inc:245
-#: plugins/admin/systems/class_printGeneric.inc:529
-#: plugins/admin/systems/class_componentGeneric.inc:155
-#, php-format
-msgid "There is already an entry '%s' in the base choosen by you"
-msgstr ""
-"Der Eintrag '%s' ist in der von Ihnen ausgewählten Basis bereits vorhanden"
-
-#: plugins/admin/systems/info.tpl:1
-msgid "System information"
-msgstr "System-Information"
+#: plugins/admin/systems/workstationService.tpl:4
+#: plugins/admin/systems/terminalService.tpl:4
+msgid "Keyboard"
+msgstr "Tastatur"
 
-#: plugins/admin/systems/info.tpl:7
-msgid "CPU"
-msgstr "Prozessor"
+#: plugins/admin/systems/workstationService.tpl:7
+#: plugins/admin/systems/terminalService.tpl:7
+#: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/printerPPDDialog.tpl:5
+msgid "Model"
+msgstr "Modell"
 
-#: plugins/admin/systems/info.tpl:10
-msgid "Memory"
-msgstr "Speicher"
+#: plugins/admin/systems/workstationService.tpl:9
+#: plugins/admin/systems/terminalService.tpl:9
+msgid "Choose keyboard model"
+msgstr "Wählen Sie das Tastatur-Modell"
 
-#: plugins/admin/systems/info.tpl:13
-msgid "Boot MAC"
-msgstr "MAC-Adresse"
+#: plugins/admin/systems/workstationService.tpl:15
+#: plugins/admin/systems/terminalService.tpl:15
+msgid "Layout"
+msgstr "Layout"
 
-#: plugins/admin/systems/info.tpl:16
-msgid "USB support"
-msgstr "USB-Unterstützung"
+#: plugins/admin/systems/workstationService.tpl:17
+#: plugins/admin/systems/terminalService.tpl:17
+msgid "Choose keyboard layout"
+msgstr "Wählen Sie das Tastatur-Layout"
 
-#: plugins/admin/systems/info.tpl:19 plugins/admin/systems/info.tpl:87
-msgid "System status"
-msgstr "System-Status"
+#: plugins/admin/systems/workstationService.tpl:23
+#: plugins/admin/systems/terminalService.tpl:23
+msgid "Variant"
+msgstr "Variante"
 
-#: plugins/admin/systems/info.tpl:23
-msgid "Inventory number"
-msgstr "Inventarnummer"
+#: plugins/admin/systems/workstationService.tpl:25
+#: plugins/admin/systems/terminalService.tpl:25
+msgid "Choose keyboard variant"
+msgstr "Wählen Sie die Tastatur-Variante"
 
-#: plugins/admin/systems/info.tpl:27
-msgid "Last login"
-msgstr "Letzte Anmeldung"
+#: plugins/admin/systems/workstationService.tpl:39
+#: plugins/admin/systems/terminalService.tpl:39
+msgid "Mouse"
+msgstr "Maus"
 
-#: plugins/admin/systems/info.tpl:38
-msgid "Network devices"
-msgstr "Netzwerk-Geräte"
+#: plugins/admin/systems/workstationService.tpl:44
+#: plugins/admin/systems/terminalService.tpl:44
+msgid "Choose mouse type"
+msgstr "Wählen Sie den Maus-Typ"
 
-#: plugins/admin/systems/info.tpl:47
-msgid "IDE devices"
-msgstr "IDE-Geräte"
+#: plugins/admin/systems/workstationService.tpl:50
+#: plugins/admin/systems/terminalService.tpl:50
+msgid "Port"
+msgstr "Anschluss"
 
-#: plugins/admin/systems/info.tpl:56
-msgid "SCSI devices"
-msgstr "SCSI-Geräte"
+#: plugins/admin/systems/workstationService.tpl:52
+#: plugins/admin/systems/terminalService.tpl:52
+msgid "Choose mouse port"
+msgstr "Wählen Sie den Maus-Port"
 
-#: plugins/admin/systems/info.tpl:64
-msgid "Floppy device"
-msgstr "Disketten-Laufwerk"
+#: plugins/admin/systems/workstationService.tpl:66
+#: plugins/admin/systems/terminalService.tpl:66
+#: plugins/gofon/phoneaccount/generic.tpl:24
+#: plugins/gofon/phoneaccount/paste_generic.tpl:23
+msgid "Telephone hardware"
+msgstr "Telefon-Hardware"
 
-#: plugins/admin/systems/info.tpl:68
-msgid "CDROM device"
-msgstr "CDROM-Laufwerk"
+#: 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:25
+msgid "Telephone"
+msgstr "Telefon"
 
-#: plugins/admin/systems/info.tpl:73
 #: plugins/admin/systems/workstationService.tpl:83
+#: plugins/admin/systems/info.tpl:73
 #: plugins/admin/systems/terminalService.tpl:83
 msgid "Graphic device"
 msgstr "Grafikkarte"
 
-#: plugins/admin/systems/info.tpl:77
-msgid "Audio device"
-msgstr "Soundkarte"
-
-#: plugins/admin/systems/info.tpl:93
-msgid "Up since"
-msgstr "Eingeschaltet seit"
+#: plugins/admin/systems/workstationService.tpl:86
+#: plugins/admin/systems/terminalService.tpl:86
+#: plugins/admin/systems/printer.tpl:46
+msgid "Driver"
+msgstr "Treiber"
 
-#: plugins/admin/systems/info.tpl:96
-msgid "CPU load"
-msgstr "Prozessor-Last"
+#: plugins/admin/systems/workstationService.tpl:88
+#: plugins/admin/systems/terminalService.tpl:88
+msgid "Choose graphic driver that is needed by the installed graphic board"
+msgstr "Wählen Sie den Treiber, der von der installierten Grafikkarte benötigt wird."
 
-#: plugins/admin/systems/info.tpl:99
-msgid "Memory usage"
-msgstr "Speicher-Nutzung"
+#: plugins/admin/systems/workstationService.tpl:96
+#: plugins/admin/systems/terminalService.tpl:96
+msgid "Choose screen resolution used in graphic mode"
+msgstr "Wählen Sie die Auflösung, die im Grafik-Modus genutzt wird"
 
-#: plugins/admin/systems/info.tpl:102
-msgid "Swap usage"
-msgstr "Nutzung des virtuellen Speichers"
-
-#: plugins/admin/systems/info.tpl:116
-msgid "SSH service"
-msgstr "SSH-Dienst"
-
-#: plugins/admin/systems/info.tpl:119
-msgid "Print service"
-msgstr "Druck-Dienst"
-
-#: plugins/admin/systems/info.tpl:122
-msgid "Scan service"
-msgstr "Scan-Dienst"
-
-#: plugins/admin/systems/info.tpl:125
-msgid "Sound service"
-msgstr "Audio-Dienst"
-
-#: plugins/admin/systems/info.tpl:128
-msgid "GUI"
-msgstr "GUI"
-
-#: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_workstationService.inc:89
-msgid "default"
-msgstr "Standard"
-
-#: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_workstationService.inc:90
-msgid "show chooser"
-msgstr "zeige Auswahl"
-
-#: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:91
-msgid "direct"
-msgstr "direkt"
-
-#: plugins/admin/systems/class_terminalService.inc:107
-#: plugins/admin/systems/class_workstationService.inc:94
-msgid "load balanced"
-msgstr "lastverteilt"
-
-#: plugins/admin/systems/class_terminalService.inc:110
-#: plugins/admin/systems/class_workstationService.inc:97
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: plugins/admin/systems/class_terminalService.inc:111
-#: plugins/admin/systems/class_workstationService.inc:98
-msgid "ICA client"
-msgstr "Citrix Metaframe"
-
-#: plugins/admin/systems/class_terminalService.inc:209
-#: plugins/admin/systems/class_workstationService.inc:201
-msgid "Choose the phone located at the current terminal"
-msgstr "Wählen Sie das sich am momentanen Arbeitsplatz befindende Telefon."
-
-#: plugins/admin/systems/class_terminalService.inc:270
-#: plugins/admin/systems/class_terminalService.inc:275
-#: plugins/admin/systems/class_workstationService.inc:263
-#: plugins/admin/systems/class_workstationService.inc:268
-msgid "Please specify a valid VSync range."
-msgstr "Bitte geben Sie einen gültigen VSync-Bereich an."
-
-#: plugins/admin/systems/class_terminalService.inc:285
-#: plugins/admin/systems/class_terminalService.inc:290
-#: plugins/admin/systems/class_workstationService.inc:278
-#: plugins/admin/systems/class_workstationService.inc:283
-msgid "Please specify a valid HSync range."
-msgstr "Bitte geben Sie einen gültigen HSync-Bereich an."
-
-#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
-msgid "System management"
-msgstr "Systemverwaltung"
-
-#: plugins/admin/systems/class_servService.inc:272
-msgid "Terminal server, must have fontpath specified."
-msgstr "Terminal-Server benötigt einen Schrift-Suchpfad"
-
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
-msgstr "Zeit-Dienst"
-
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
-msgstr "LDAP-Dienst"
-
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
-msgstr "Terminal-Dienst"
-
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
-msgstr "Anmeldung sperren (temporär)"
-
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
-msgstr "Schrift-Suchpfad"
-
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
-msgstr "Protokoll-Dienst"
-
-#: plugins/admin/systems/servservice.tpl:101
-msgid "Print Service"
-msgstr "Druck-Dienst"
-
-#: plugins/admin/systems/servservice.tpl:109
-msgid "Mail server"
-msgstr "Mail-Server"
-
-#: 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/component.tpl:15 plugins/admin/systems/server.tpl:15
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/terminal.tpl:20
-#: plugins/admin/systems/printer.tpl:22
-#: plugins/admin/systems/workstation.tpl:29
-#: plugins/admin/systems/wingeneric.tpl:15
-msgid "Choose subtree to place terminal in"
-msgstr "Wählen Sie die Abteilung, in die das Terminal eingepflegt werden soll"
-
-#: plugins/admin/systems/workstationService.tpl:4
-#: plugins/admin/systems/terminalService.tpl:4
-msgid "Keyboard"
-msgstr "Tastatur"
-
-#: plugins/admin/systems/workstationService.tpl:7
-#: plugins/admin/systems/printerPPDDialog.tpl:5
-#: plugins/admin/systems/terminalService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:210
-msgid "Model"
-msgstr "Modell"
-
-#: plugins/admin/systems/workstationService.tpl:9
-#: plugins/admin/systems/terminalService.tpl:9
-msgid "Choose keyboard model"
-msgstr "Wählen Sie das Tastatur-Modell"
-
-#: plugins/admin/systems/workstationService.tpl:15
-#: plugins/admin/systems/terminalService.tpl:15
-msgid "Layout"
-msgstr "Layout"
-
-#: plugins/admin/systems/workstationService.tpl:17
-#: plugins/admin/systems/terminalService.tpl:17
-msgid "Choose keyboard layout"
-msgstr "Wählen Sie das Tastatur-Layout"
-
-#: plugins/admin/systems/workstationService.tpl:23
-#: plugins/admin/systems/terminalService.tpl:23
-msgid "Variant"
-msgstr "Variante"
-
-#: plugins/admin/systems/workstationService.tpl:25
-#: plugins/admin/systems/terminalService.tpl:25
-msgid "Choose keyboard variant"
-msgstr "Wählen Sie die Tastatur-Variante"
-
-#: plugins/admin/systems/workstationService.tpl:39
-#: plugins/admin/systems/terminalService.tpl:39
-msgid "Mouse"
-msgstr "Maus"
-
-#: plugins/admin/systems/workstationService.tpl:44
-#: plugins/admin/systems/terminalService.tpl:44
-msgid "Choose mouse type"
-msgstr "Wählen Sie den Maus-Typ"
-
-#: plugins/admin/systems/workstationService.tpl:50
-#: plugins/admin/systems/terminalService.tpl:50
-msgid "Port"
-msgstr "Anschluss"
-
-#: plugins/admin/systems/workstationService.tpl:52
-#: plugins/admin/systems/terminalService.tpl:52
-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:23
-msgid "Telephone hardware"
-msgstr "Telefon-Hardware"
-
-#: 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:25
-msgid "Telephone"
-msgstr "Telefon"
-
-#: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/printer.tpl:46
-#: plugins/admin/systems/terminalService.tpl:86
-msgid "Driver"
-msgstr "Treiber"
-
-#: plugins/admin/systems/workstationService.tpl:88
-#: plugins/admin/systems/terminalService.tpl:88
-msgid "Choose graphic driver that is needed by the installed graphic board"
-msgstr ""
-"Wählen Sie den Treiber, der von der installierten Grafikkarte benötigt wird."
-
-#: plugins/admin/systems/workstationService.tpl:96
-#: plugins/admin/systems/terminalService.tpl:96
-msgid "Choose screen resolution used in graphic mode"
-msgstr "Wählen Sie die Auflösung, die im Grafik-Modus genutzt wird"
-
-#: plugins/admin/systems/workstationService.tpl:102
-#: plugins/admin/systems/terminalService.tpl:102
-msgid "Color depth"
-msgstr "Farbtiefe"
+#: plugins/admin/systems/workstationService.tpl:102
+#: plugins/admin/systems/terminalService.tpl:102
+msgid "Color depth"
+msgstr "Farbtiefe"
 
 #: plugins/admin/systems/workstationService.tpl:104
 #: plugins/admin/systems/terminalService.tpl:104
@@ -7295,205 +7132,707 @@ msgstr "W
 msgid "Provide scan services"
 msgstr "Bilderfassungsdienste bereitstellen"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
-msgid "Select entries to add"
-msgstr "Wählen Sie die hinzuzufügenden Einträge"
+#: plugins/admin/systems/info.tpl:1
+msgid "System information"
+msgstr "System-Information"
+
+#: plugins/admin/systems/info.tpl:7
+msgid "CPU"
+msgstr "Prozessor"
+
+#: plugins/admin/systems/info.tpl:10
+msgid "Memory"
+msgstr "Speicher"
+
+#: plugins/admin/systems/info.tpl:13
+msgid "Boot MAC"
+msgstr "MAC-Adresse"
+
+#: plugins/admin/systems/info.tpl:16
+msgid "USB support"
+msgstr "USB-Unterstützung"
+
+#: plugins/admin/systems/info.tpl:19 plugins/admin/systems/info.tpl:87
+msgid "System status"
+msgstr "System-Status"
+
+#: plugins/admin/systems/info.tpl:23
+msgid "Inventory number"
+msgstr "Inventarnummer"
+
+#: plugins/admin/systems/info.tpl:27
+msgid "Last login"
+msgstr "Letzte Anmeldung"
+
+#: plugins/admin/systems/info.tpl:38
+msgid "Network devices"
+msgstr "Netzwerk-Geräte"
+
+#: plugins/admin/systems/info.tpl:47
+msgid "IDE devices"
+msgstr "IDE-Geräte"
+
+#: plugins/admin/systems/info.tpl:56
+msgid "SCSI devices"
+msgstr "SCSI-Geräte"
+
+#: plugins/admin/systems/info.tpl:64
+msgid "Floppy device"
+msgstr "Disketten-Laufwerk"
+
+#: plugins/admin/systems/info.tpl:68
+msgid "CDROM device"
+msgstr "CDROM-Laufwerk"
+
+#: plugins/admin/systems/info.tpl:77
+msgid "Audio device"
+msgstr "Soundkarte"
+
+#: plugins/admin/systems/info.tpl:93
+msgid "Up since"
+msgstr "Eingeschaltet seit"
+
+#: plugins/admin/systems/info.tpl:96
+msgid "CPU load"
+msgstr "Prozessor-Last"
+
+#: plugins/admin/systems/info.tpl:99
+msgid "Memory usage"
+msgstr "Speicher-Nutzung"
+
+#: plugins/admin/systems/info.tpl:102
+msgid "Swap usage"
+msgstr "Nutzung des virtuellen Speichers"
+
+#: plugins/admin/systems/info.tpl:116
+msgid "SSH service"
+msgstr "SSH-Dienst"
+
+#: plugins/admin/systems/info.tpl:119
+msgid "Print service"
+msgstr "Druck-Dienst"
+
+#: plugins/admin/systems/info.tpl:122
+msgid "Scan service"
+msgstr "Scan-Dienst"
+
+#: plugins/admin/systems/info.tpl:125
+msgid "Sound service"
+msgstr "Audio-Dienst"
+
+#: plugins/admin/systems/info.tpl:128
+msgid "GUI"
+msgstr "GUI"
+
+#: plugins/admin/systems/glpi.tpl:9
+#: plugins/admin/systems/SelectDeviceType.tpl:20
+msgid "System type"
+msgstr "System-Typ"
+
+#: plugins/admin/systems/glpi.tpl:19
+msgid "Operating system"
+msgstr "Betriebssystem"
+
+#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
+#: plugins/admin/systems/glpi_devices.tpl:24
+#: plugins/admin/systems/glpi_devices.tpl:123
+#: plugins/admin/systems/glpi_devices.tpl:164
+#: plugins/admin/systems/glpi_devices.tpl:219
+#: plugins/admin/systems/glpi_devices.tpl:275
+#: plugins/admin/systems/glpi_devices.tpl:333
+#: plugins/admin/systems/glpi_devices.tpl:397
+#: plugins/admin/systems/glpi_devices.tpl:469
+#: plugins/admin/systems/glpi_devices.tpl:533
+#: plugins/admin/systems/glpi_devices.tpl:580
+#: plugins/admin/systems/glpi_devices.tpl:633
+#: plugins/admin/systems/glpi_devices.tpl:687
+#: plugins/admin/systems/glpi_devices.tpl:733
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
+msgid "Manufacturer"
+msgstr "Hersteller"
+
+#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
+msgid "Contacts"
+msgstr "Kontakte"
+
+#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
+msgid "Contact person"
+msgstr "Kontaktperson"
+
+#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
+msgid "Technical responsible"
+msgstr "Technischer Kontakt"
+
+#: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
+#: plugins/admin/systems/glpi_devices.tpl:112
+#: plugins/admin/systems/glpi_devices.tpl:153
+#: plugins/admin/systems/glpi_devices.tpl:208
+#: plugins/admin/systems/glpi_devices.tpl:264
+#: plugins/admin/systems/glpi_devices.tpl:322
+#: plugins/admin/systems/glpi_devices.tpl:386
+#: plugins/admin/systems/glpi_devices.tpl:458
+#: plugins/admin/systems/glpi_devices.tpl:522
+#: plugins/admin/systems/glpi_devices.tpl:569
+#: plugins/admin/systems/glpi_devices.tpl:622
+#: plugins/admin/systems/glpi_devices.tpl:676
+#: plugins/admin/systems/glpi_devices.tpl:722
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
+msgid "Comment"
+msgstr "Kommentar"
+
+#: plugins/admin/systems/glpi.tpl:78
+msgid "Installed devices"
+msgstr "Installierte Geräte"
+
+#: plugins/admin/systems/glpi.tpl:90
+msgid "Trading"
+msgstr "Handeln"
+
+#: plugins/admin/systems/glpi.tpl:91
+msgid "Software"
+msgstr "Software"
+
+#: plugins/admin/systems/glpi.tpl:92
+msgid "Contracts"
+msgstr "Verträge"
+
+#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
+msgid "Attachments"
+msgstr "Anhänge"
+
+#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
+msgstr "Systemverwaltung"
+
+#: plugins/admin/systems/glpiPrinter.tpl:9
+msgid "Printer type"
+msgstr "Druckertyp"
+
+#: plugins/admin/systems/glpiPrinter.tpl:31
+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"
+
+#: plugins/admin/systems/glpiPrinter.tpl:54
+msgid "USB"
+msgstr "USB"
+
+#: plugins/admin/systems/glpiPrinter.tpl:114
+msgid "Installed cartridges"
+msgstr "Installierte Patronen"
+
+#: plugins/admin/systems/glpi_edit_type.tpl:1
+msgid "Manage System-types"
+msgstr "System-Typen verwalten"
+
+#: plugins/admin/systems/glpi_edit_type.tpl:9
+#: plugins/admin/systems/glpi_edit_type.tpl:28
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:8
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:29
+#: plugins/admin/systems/glpi_edit_os.tpl:9
+#: plugins/admin/systems/glpi_edit_os.tpl:28
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
+msgid "Rename"
+msgstr "Umbenennen"
+
+#: plugins/admin/systems/glpi_edit_type.tpl:24
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:25
+#: plugins/admin/systems/glpi_edit_os.tpl:24
+msgid "Please enter a new name"
+msgstr "Bitte geben Sie einen neuen Namen ein"
+
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr "Wählen Sie die hinzuzufügenden Objekte"
+
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
+#: plugins/admin/systems/printerPPDDialog.tpl:6
+msgid "Select"
+msgstr "Auswahl"
+
+#: plugins/admin/systems/class_workstationService.inc:89
+#: plugins/admin/systems/class_terminalService.inc:102
+msgid "default"
+msgstr "Standard"
+
+#: plugins/admin/systems/class_workstationService.inc:90
+#: plugins/admin/systems/class_terminalService.inc:103
+msgid "show chooser"
+msgstr "zeige Auswahl"
+
+#: plugins/admin/systems/class_workstationService.inc:91
+#: plugins/admin/systems/class_terminalService.inc:104
+msgid "direct"
+msgstr "direkt"
+
+#: plugins/admin/systems/class_workstationService.inc:94
+#: plugins/admin/systems/class_terminalService.inc:107
+msgid "load balanced"
+msgstr "lastverteilt"
+
+#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_terminalService.inc:110
+msgid "Windows RDP"
+msgstr "Windows RDP"
+
+#: plugins/admin/systems/class_workstationService.inc:98
+#: plugins/admin/systems/class_terminalService.inc:111
+msgid "ICA client"
+msgstr "Citrix Metaframe"
+
+#: plugins/admin/systems/class_workstationService.inc:201
+#: plugins/admin/systems/class_terminalService.inc:209
+msgid "Choose the phone located at the current terminal"
+msgstr "Wählen Sie das sich am momentanen Arbeitsplatz befindende Telefon."
+
+#: plugins/admin/systems/class_workstationService.inc:263
+#: plugins/admin/systems/class_workstationService.inc:268
+#: plugins/admin/systems/class_terminalService.inc:270
+#: plugins/admin/systems/class_terminalService.inc:275
+msgid "Please specify a valid VSync range."
+msgstr "Bitte geben Sie einen gültigen VSync-Bereich an."
+
+#: plugins/admin/systems/class_workstationService.inc:278
+#: plugins/admin/systems/class_workstationService.inc:283
+#: plugins/admin/systems/class_terminalService.inc:285
+#: plugins/admin/systems/class_terminalService.inc:290
+msgid "Please specify a valid HSync range."
+msgstr "Bitte geben Sie einen gültigen HSync-Bereich an."
+
+#: plugins/admin/systems/class_workstationStartup.inc:313
+msgid ""
+"There are packages in your configuration, which can't be resolved with "
+"current server/release settings."
+msgstr ""
+"Es existieren in Ihrer derzeitigen Konfiguration Pakete, die mit den "
+"momentanen Einstellungen für Server und Release nicht aufgelöst werden "
+"können."
+
+#: plugins/admin/systems/class_workstationStartup.inc:354
+msgid "Please select a 'FAI server' or remove the 'FAI classes'."
+msgstr "Bitte wählen Sie einen 'FAI-Server' oder entfernen Sie die FAI-Klassen."
+
+#: plugins/admin/systems/class_workstationStartup.inc:410
+msgid ""
+"There is already a profile in your selection that contain partition table "
+"configurations."
+msgstr ""
+"In Ihrer Auswahl befindet sich bereits ein Profil, das eine Konfiguration "
+"für Partitionstabellen enthält."
+
+#: plugins/admin/systems/class_workstationStartup.inc:691
+#, php-format
+msgid ""
+"Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
+"Server was reset to 'auto'."
+msgstr ""
+"Kann eine oder mehrere der angegebenen FAI-Klasse(n) [%s] für FAI-Server '%"
+"s' nicht auflösen. Der Server wurde auf 'auto' zurückgesetzt."
+
+#: plugins/admin/systems/class_workstationStartup.inc:702
+#, php-format
+msgid ""
+"Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
+"configurations, possibly some classes where deleted or renamed. !All classes "
+"have been removed from this account, press cancel if you don't want this to "
+"be saved."
+msgstr ""
+"Kann die angegebenen FAI-Klasse(n) [%s] nicht auflösen, bitte überprüfen Sie "
+"Ihre FAI-Konfigurationen (wahrscheinlich wurden einige Klassen entfernt oder "
+"umbenannt). Alle (!) Klassen wurden von diesem Konto entfernt. Drücken Sie "
+"'Abbrechen', wenn Sie die diese Änderung nicht speichern möchten."
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:67
+#, php-format
+msgid "Can't open '%s', ppd settings resetted."
+msgstr "Kann '%s' nicht öffnen, PPD-Einstellungen wurden  zurückgesetzt."
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:108
+#, php-format
+msgid ""
+"The specified PPD_PATH='%s' in your gosa.conf is invalid, can't read any ppd "
+"informations."
+msgstr ""
+"Der in Ihrer 'gosa.conf' angegebene PPD-Pfad (PPD_PATH) '%s' ist ungültig - "
+"kann daher keine ppd-Informationen lesen."
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:109
+msgid "Can't get ppd informations."
+msgstr "Kann PPD-Information nicht lesen"
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:125
+#, php-format
+msgid "Can't create folder '%s' for the uploaded ppd file."
+msgstr "Kann Verzeichnis '%s' für hochgeladene PPD-Datei nicht anlegen."
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:138
+#, php-format
+msgid "There is already a ppd file for this kind of printer."
+msgstr "Der von Ihnen gewählte Drucker-Typ verfügt bereits über eine PPD-Datei."
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:146
+#, php-format
+msgid "Can't save file '%s'."
+msgstr "Kann Datei '%s' nicht speichern."
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
-msgid "Display members of department"
-msgstr "Zeige die Mitglieder der Abteilung"
+#: plugins/admin/systems/class_printerPPDDialog.inc:163
+#: plugins/admin/systems/class_printerPPDDialog.inc:166
+msgid "Please specify a valid ppd file."
+msgstr "Bitte geben Sie eine gültige PPD-Datei an."
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
-msgid "Display members matching"
-msgstr "Zeige die Mitglieder, auf die Folgendes passt"
+#: plugins/admin/systems/class_printerPPDDialog.inc:190
+msgid "Please select a valid ppd."
+msgstr "Bitte wählen Sie eine gültige PPD."
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
-msgid "Regular expression for matching member names"
-msgstr "Regulärer Ausdruck zum Erkennen von Mitgliedsnamen"
+#: plugins/admin/systems/class_printerPPDDialog.inc:369
+#: plugins/admin/systems/class_printerPPDDialog.inc:372
+msgid "True"
+msgstr "wahr"
 
-#: plugins/admin/systems/class_workstationStartup.inc:313
+#: plugins/admin/systems/class_printerPPDDialog.inc:370
+#: plugins/admin/systems/class_printerPPDDialog.inc:373
+msgid "False"
+msgstr "falsch"
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:378
+#, php-format
+msgid "Unsupported ppd type '%s' used for '%s' "
+msgstr "Nicht unterstützter PPD-Typ '%s' (verwendet von '%s') "
+
+#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
+msgid "Server name"
+msgstr "Server-Name"
+
+#: plugins/admin/systems/server.tpl:15 plugins/admin/systems/terminal.tpl:20
+#: plugins/admin/systems/workstation.tpl:29
+#: plugins/admin/systems/component.tpl:15 plugins/admin/systems/phone.tpl:15
+#: plugins/admin/systems/printer.tpl:22
+#: plugins/admin/systems/wingeneric.tpl:15
+msgid "Choose subtree to place terminal in"
+msgstr "Wählen Sie die Abteilung, in die das Terminal eingepflegt werden soll"
+
+#: plugins/admin/systems/server.tpl:39 plugins/admin/systems/terminal.tpl:100
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
+#: plugins/admin/systems/workstation.tpl:79
+#: plugins/admin/systems/class_baseSelectDialog.inc:45
+#: plugins/admin/ogroups/termgroup.tpl:3
+msgid "Action"
+msgstr "Aktion"
+
+#: plugins/admin/systems/server.tpl:43
+msgid "Select action to execute for this server"
+msgstr "Wählen Sie die auszuführende Aktion für diesen Server"
+
+#: plugins/admin/systems/workstationStartup.tpl:4
+#: plugins/admin/systems/terminalStartup.tpl:1
+msgid "Boot parameters"
+msgstr "Boot-Parameter"
+
+#: plugins/admin/systems/workstationStartup.tpl:8
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "LDAP server"
+msgstr "LDAP-Server"
+
+#: plugins/admin/systems/workstationStartup.tpl:10
+#: plugins/admin/systems/terminalStartup.tpl:10
+msgid "Choose LDAP server to use for accounts and terminal management"
+msgstr ""
+"Wählen Sie den LDAP-Server, der für die Verwaltung von Benutzerkonten und "
+"Terminals genutzt wird"
+
+#: plugins/admin/systems/workstationStartup.tpl:17
+#: plugins/admin/systems/terminalStartup.tpl:17
+msgid "Boot kernel"
+msgstr "Boot-Kernel"
+
+#: plugins/admin/systems/workstationStartup.tpl:19
+#: plugins/admin/systems/terminalStartup.tpl:19
+msgid "Enter the filename of the kernel to use"
+msgstr "Geben Sie den Dateinamen des Kernels ein, der genutzt werden soll"
+
+#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/terminalStartup.tpl:22
+msgid "Custom options"
+msgstr "Angepasste Optionen"
+
+#: plugins/admin/systems/workstationStartup.tpl:24
+#: plugins/admin/systems/terminalStartup.tpl:24
 msgid ""
-"There are packages in your configuration, which can't be resolved with "
-"current server/release settings."
+"Enter any parameters that should be passed to the kernel as append line "
+"during bootup"
 msgstr ""
-"Es existieren in Ihrer derzeitigen Konfiguration Pakete, die mit den "
-"momentanen Einstellungen für Server und Release nicht aufgelöst werden "
-"können."
+"Geben Sie die Parameter ein, die dem Kernel beim Starten übergeben werden "
+"sollen"
 
-#: plugins/admin/systems/class_workstationStartup.inc:354
-msgid "Please select a 'FAI server' or remove the 'FAI classes'."
+#: plugins/admin/systems/workstationStartup.tpl:37
+msgid "FAI server"
+msgstr "FAI-Server"
+
+#: plugins/admin/systems/workstationStartup.tpl:54
+msgid "Assigned FAI classes"
+msgstr "Zugewiesene FAI-Klassen"
+
+#: plugins/admin/systems/workstationStartup.tpl:73
+#: plugins/admin/systems/terminalStartup.tpl:53
+msgid "Kernel modules (format: name parameters)"
+msgstr "Kernel-Module (Format: Name Parameter)"
+
+#: plugins/admin/systems/workstationStartup.tpl:75
+#: plugins/admin/systems/terminalStartup.tpl:55
+msgid "Add additional modules to load on startup"
+msgstr "Zusätzliche Module hinzufügen, die während des Starts geladen werden sollen"
+
+#: plugins/admin/systems/workstationStartup.tpl:99
+#: plugins/admin/systems/terminalStartup.tpl:79
+msgid "Mountpoint"
+msgstr "Mount-Pfad"
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:6
+msgid "List of devices"
+msgstr "Liste der Geräte"
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:23
+msgid "This dialog allows you to attach a device to your currently edited computer."
 msgstr ""
-"Bitte wählen Sie einen 'FAI-Server' oder entfernen Sie die FAI-Klassen."
+"Dieser Dialog erlaubt es Ihnen, ein Gerät zum momentan ausgewählten Computer "
+"hinzuzufügen."
 
-#: plugins/admin/systems/class_workstationStartup.inc:410
+#: plugins/admin/systems/glpiDeviceManagement.tpl:35
+msgid "Display devices matching"
+msgstr "Zeige die Geräte, auf die das Folgende passt"
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:37
+msgid "Regular expression for matching device names"
+msgstr "Regulärer Ausdruck zum Erkennen von Gerätenamen"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
+#: plugins/admin/systems/class_glpiAccount.inc:144
+msgid "There is no server with valid glpi database service."
+msgstr "Es wurde kein Server mit einer gültigen glpi-Datenbank gefunden."
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
+#: plugins/admin/systems/class_glpiAccount.inc:154
+msgid "Can't connect to glpi database, the php-mysql extension is missing."
+msgstr ""
+"Die MySQL-Erweiterung wurde nicht gefunden - kann daher nicht zur glpi-"
+"Datenbank verbinden."
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
+#: plugins/admin/systems/class_glpiAccount.inc:164
+msgid "Can't connect to glpi database, check configuration twice."
+msgstr ""
+"Kann nicht zur glpi-Datenbank verbinden - bitte überprüfen Sie Ihre "
+"Konfiguration."
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
+#: plugins/admin/systems/class_glpiAccount.inc:564
+msgid "Remove inventory"
+msgstr "Inventar entfernen"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
 msgid ""
-"There is already a profile in your selection that contain partition table "
-"configurations."
+"This server has inventory features enabled. You can disable them by clicking "
+"below."
 msgstr ""
-"In Ihrer Auswahl befindet sich bereits ein Profil, das eine Konfiguration "
-"für Partitionstabellen enthält."
+"Dieser Server besitzt aktivierte Inventar-Funtionen. Sie können diese durch "
+"einen Klick auf die Schaltfläche unten deaktivieren."
 
-#: plugins/admin/systems/class_workstationStartup.inc:691
-#, php-format
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
+#: plugins/admin/systems/class_glpiAccount.inc:567
+msgid "Add inventory"
+msgstr "Inventar hinzufügen"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
 msgid ""
-"Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
-"Server was reset to 'auto'."
+"This server has inventory features disabled. You can enable them by clicking "
+"below."
 msgstr ""
-"Kann eine oder mehrere der angegebenen FAI-Klasse(n) [%s] für FAI-Server '%"
-"s' nicht auflösen. Der Server wurde auf 'auto' zurückgesetzt."
+"Aktuell besitzt dieser Server keine aktivierten Inventar-Funktionen. Sie "
+"können diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/admin/systems/class_workstationStartup.inc:702
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
 #, php-format
 msgid ""
-"Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
-"configurations, possibly some classes where deleted or renamed. !All classes "
-"have been removed from this account, press cancel if you don't want this to "
-"be saved."
+"Can't rename given printer type to '%s', because this type name already "
+"exists."
 msgstr ""
-"Kann die angegebenen FAI-Klasse(n) [%s] nicht auflösen, bitte überprüfen Sie "
-"Ihre FAI-Konfigurationen (wahrscheinlich wurden einige Klassen entfernt oder "
-"umbenannt). Alle (!) Klassen wurden von diesem Konto entfernt. Drücken Sie "
-"'Abbrechen', wenn Sie die diese Änderung nicht speichern möchten."
+"Kann Druckertyp nicht in '%s' umbenennen - der angegebene Name wird bereits "
+"verwendet."
 
-#: plugins/admin/systems/class_phoneGeneric.inc:105
-msgid "This 'dn' has no phone features."
-msgstr "Diese 'dn' besitzt keine Telefon-Erweiterungen."
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
+#, php-format
+msgid "Can't delete printer type, it is still in use by '%s'."
+msgstr ""
+"Sie können diesen Druckertyp nicht entfernen, er wird noch von '%s' "
+"verwendet."
 
-#: plugins/admin/systems/class_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
-msgid "yes"
-msgstr "ja"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:609
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:623
+#: plugins/admin/systems/class_glpiAccount.inc:631
+#: plugins/admin/systems/class_glpiAccount.inc:645
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:288
+msgid "N/A"
+msgstr "N/A"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-msgid "no"
-msgstr "nein"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:750
+msgid "since"
+msgstr "seit"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:223
-msgid "dynamic"
-msgstr "dynamisch"
+#: plugins/admin/systems/terminal.tpl:9
+msgid "Terminal template"
+msgstr "Terminal-Vorlage"
+
+#: plugins/admin/systems/terminal.tpl:11
+msgid "Terminal name"
+msgstr "Terminal-Name"
+
+#: plugins/admin/systems/terminal.tpl:37
+#: plugins/admin/systems/workstation.tpl:46
+#: plugins/admin/systems/phonesettings.tpl:21
+msgid "Mode"
+msgstr "Modus"
+
+#: plugins/admin/systems/terminal.tpl:39
+#: plugins/admin/systems/workstation.tpl:48
+msgid "Select terminal mode"
+msgstr "Wählen Sie den Terminal-Modus"
+
+#: plugins/admin/systems/terminal.tpl:53
+msgid "Root server"
+msgstr "Root-Server"
+
+#: plugins/admin/systems/terminal.tpl:55
+msgid "Select NFS root filesystem to use"
+msgstr "Wählen Sie das NFS-Root-Dateisystem"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:223
-msgid "Networksettings"
-msgstr "Netzwerk-Einstellungen"
+#: plugins/admin/systems/terminal.tpl:61
+msgid "Swap server"
+msgstr "Auslagerungs-Server"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:238
-#, php-format
-msgid ""
-"Can't delete because there are user which are depending on this phone. One "
-"of them is user '%s'."
+#: plugins/admin/systems/terminal.tpl:63
+msgid "Choose NFS filesystem to place swap files on"
 msgstr ""
-"Das Telefon kann nicht entfernt werden, da es abhängige Benutzer gibt. Der "
-"erste Benutzer in der Liste ist '%s'."
+"Wählen Sie das NFS-Dateisystem, in dem die Auslagerungsdateien abgelegt "
+"werden sollen"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:294
-msgid "The required field 'Phone name' is not set."
-msgstr "Das benötigte Feld 'Telefon-Name' ist nicht gesetzt."
+#: plugins/admin/systems/terminal.tpl:75
+#: plugins/admin/systems/workstation.tpl:55
+msgid "Syslog server"
+msgstr "Protokoll-Server"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:297
-msgid "The 'Phone name' '0' is reserved and cannot be used."
-msgstr "Der Telefon-Name '0' ist reserviert und kann nicht verwendet werden."
+#: plugins/admin/systems/terminal.tpl:77
+#: plugins/admin/systems/workstation.tpl:57
+msgid "Choose server to use for logging"
+msgstr "Wählen Sie den Server, der für das Protokollieren genutzt werden soll"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:304
-msgid "You have no permissions to create a phone on this 'Base'."
-msgstr ""
-"Sie haben keine Berechtigung, ein Telefon unterhalb dieser 'Basis' anzulegen."
+#: plugins/admin/systems/terminal.tpl:83
+#: plugins/admin/systems/workstation.tpl:63
+msgid "NTP server"
+msgstr "Zeit-Server"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:67
+#: plugins/admin/systems/terminal.tpl:85
+#: plugins/admin/systems/workstation.tpl:65
+msgid "Choose server to use for synchronizing time"
+msgstr "Wählen Sie den Server, der zur Zeit-Synchronisation genutzt werden soll"
+
+#: plugins/admin/systems/terminal.tpl:104
+#: plugins/admin/systems/workstation.tpl:83
+msgid "Select action to execute for this terminal"
+msgstr "Wählen Sie die auszuführende Aktion für dieses Terminal"
+
+#: plugins/admin/systems/class_servDB.inc:135
+#: plugins/admin/systems/class_servDB.inc:144
+#: plugins/admin/systems/class_servDB.inc:161
+#: plugins/admin/systems/class_servDB.inc:171
+#: plugins/admin/systems/class_servDB.inc:176
+#: plugins/admin/systems/class_servDB.inc:182
 #, php-format
-msgid "Can't open '%s', ppd settings resetted."
-msgstr "Kann '%s' nicht öffnen, PPD-Einstellungen wurden  zurückgesetzt."
+msgid "The attribute '%s' is empty or contains invalid characters."
+msgstr "Das Attribut '%s' ist leer oder enthält ungültige Zeichen."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:108
+#: plugins/admin/systems/class_servDB.inc:151
 #, php-format
-msgid ""
-"The specified PPD_PATH='%s' in your gosa.conf is invalid, can't read any ppd "
-"informations."
-msgstr ""
-"Der in Ihrer 'gosa.conf' angegebene PPD-Pfad (PPD_PATH) '%s' ist ungültig - "
-"kann daher keine ppd-Informationen lesen."
+msgid "The imap connect string needs to be in the form '%s'."
+msgstr "Der IMAP-Verbindungsstring muss in der Form '%s' sein."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:109
-msgid "Can't get ppd informations."
-msgstr "Kann PPD-Information nicht lesen"
+#: plugins/admin/systems/class_servDB.inc:155
+msgid "The sieve port needs to be numeric."
+msgstr "Der Sieve-Port muss numerisch sein."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:125
+#: plugins/admin/systems/class_servDB.inc:166
 #, php-format
-msgid "Can't create folder '%s' for the uploaded ppd file."
-msgstr "Kann Verzeichnis '%s' für hochgeladene PPD-Datei nicht anlegen."
+msgid "The specified kerberos password is empty."
+msgstr "Das angebene Kerberos-Passwort ist leer."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:138
+#: plugins/admin/systems/class_servDB.inc:190
 #, php-format
-msgid "There is already a ppd file for this kind of printer."
+msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
-"Der von Ihnen gewählte Drucker-Typ verfügt bereits über eine PPD-Datei."
+"Das Feld 'Serverbezeichnung' muss entweder ein Hostname oder eine IP-Adresse "
+"sein."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:146
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
 #, php-format
-msgid "Can't save file '%s'."
-msgstr "Kann Datei '%s' nicht speichern."
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:163
-#: plugins/admin/systems/class_printerPPDDialog.inc:166
-msgid "Please specify a valid ppd file."
-msgstr "Bitte geben Sie eine gültige PPD-Datei an."
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:190
-msgid "Please select a valid ppd."
-msgstr "Bitte wählen Sie eine gültige PPD."
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:369
-#: plugins/admin/systems/class_printerPPDDialog.inc:372
-msgid "True"
-msgstr "wahr"
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:370
-#: plugins/admin/systems/class_printerPPDDialog.inc:373
-msgid "False"
-msgstr "falsch"
+msgid "You're about to delete the glpi cartridge type '%s'."
+msgstr "Sind sind dabei, den GLPI Patronentyp '%s' zu löschen."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:378
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:116
 #, php-format
-msgid "Unsupported ppd type '%s' used for '%s' "
-msgstr "Nicht unterstützter PPD-Typ '%s' (verwendet von '%s') "
+msgid ""
+"You can't delete this cartridge type, it is still in use by this printer(s) "
+"'%s'."
+msgstr ""
+"Sie können diesen Patronentyp nicht entfernen, er wird noch von folgendem(n) "
+"Drucker(n) verwendet: '%s'"
 
-#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
-msgid "Server name"
-msgstr "Server-Name"
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
+msgid "Cartridges"
+msgstr "Patronen"
 
-#: plugins/admin/systems/server.tpl:39 plugins/admin/systems/terminal.tpl:100
-#: plugins/admin/systems/workstation.tpl:79
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:44
-#: plugins/admin/ogroups/termgroup.tpl:3
-msgid "Action"
-msgstr "Aktion"
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
+msgid "New monitor"
+msgstr "Neuer Monitor"
 
-#: plugins/admin/systems/server.tpl:43
-msgid "Select action to execute for this server"
-msgstr "Wählen Sie die auszuführende Aktion für diesen Server"
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
+msgid "M"
+msgstr "M"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:61
-msgid "text"
-msgstr "textuell"
+#: plugins/admin/systems/class_workstationGeneric.inc:70
+msgid "Activated"
+msgstr "Aktiv"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:62
-msgid "graphic"
-msgstr "grafisch"
+#: plugins/admin/systems/class_workstationGeneric.inc:72
+msgid "Memory test"
+msgstr "Speichertest"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:90
-#: plugins/admin/systems/class_servGeneric.inc:62
-#: plugins/admin/ogroups/class_termgroup.inc:64
-msgid "No WAKECMD definition found in your gosa.conf"
-msgstr "Es ist kein WAKECMD in ihrer gosa.conf definiert"
+#: plugins/admin/systems/class_workstationGeneric.inc:73
+msgid "System analysis"
+msgstr "Systemanalyse"
 
+#: plugins/admin/systems/class_workstationGeneric.inc:100
+msgid "No ACTIONCMD definition found in your gosa.conf"
+msgstr "Es ist kein ACTIONCMD in ihrer gosa.conf definiert"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:104
 #: plugins/admin/systems/class_terminalGeneric.inc:94
 #: plugins/admin/systems/class_terminalGeneric.inc:106
 #: plugins/admin/systems/class_terminalGeneric.inc:118
 #: plugins/admin/systems/class_servGeneric.inc:66
 #: plugins/admin/systems/class_servGeneric.inc:78
 #: plugins/admin/systems/class_servGeneric.inc:90
-#: plugins/admin/systems/class_workstationGeneric.inc:104
 #: plugins/admin/ogroups/class_termgroup.inc:68
 #: plugins/admin/ogroups/class_termgroup.inc:80
 #: plugins/admin/ogroups/class_termgroup.inc:92
@@ -7501,255 +7840,289 @@ msgstr "Es ist kein WAKECMD in ihrer gosa.conf definiert"
 msgid "Execution of '%s' failed!"
 msgstr "Die Ausführung des Befehls '%s' ist fehlgeschlagen!"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:102
-#: plugins/admin/systems/class_servGeneric.inc:74
-#: plugins/admin/ogroups/class_termgroup.inc:76
-msgid "No REBOOTCMD definition found in your gosa.conf"
-msgstr "Es ist kein REBOOTCMD in ihrer gosa.conf definiert"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_servGeneric.inc:86
-#: plugins/admin/ogroups/class_termgroup.inc:88
-msgid "No HALTCMD definition found in your gosa.conf"
-msgstr "Es ist kein HALTCMD in ihrer gosa.conf definiert"
+#: plugins/admin/systems/class_workstationGeneric.inc:114
+msgid "This 'dn' has no workstation features."
+msgstr "Dieser 'DN' hat keine Arbeitsstations-Erweiterungen."
 
+#: plugins/admin/systems/class_workstationGeneric.inc:156
 #: plugins/admin/systems/class_terminalGeneric.inc:170
 #: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Switch off"
 msgstr "Ausschalten"
 
+#: plugins/admin/systems/class_workstationGeneric.inc:156
 #: plugins/admin/systems/class_terminalGeneric.inc:170
 #: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Reboot"
 msgstr "Neustarten"
 
+#: plugins/admin/systems/class_workstationGeneric.inc:157
+msgid "Instant update"
+msgstr "Sofortiges Update"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:158
+#: plugins/admin/systems/class_workstationGeneric.inc:164
+msgid "Scheduled update"
+msgstr "Geplantes Update"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:159
+#: plugins/admin/systems/class_workstationGeneric.inc:163
+msgid "Reinstall"
+msgstr "Neu-Installation"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:160
+msgid "Rescan hardware"
+msgstr "Hardware neu erkennen"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:162
 #: plugins/admin/systems/class_terminalGeneric.inc:172
 #: plugins/admin/systems/class_servGeneric.inc:142
-#: plugins/admin/systems/class_workstationGeneric.inc:162
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Wake up"
 msgstr "Aufwecken"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:269
-msgid "You have no permissions to create a terminal on this 'Base'."
+#: plugins/admin/systems/class_workstationGeneric.inc:228
+msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr ""
-"Sie haben keine Berechtigung, ein Terminal unterhalb dieser 'Basis' "
+"Sie haben keine Berechtigung, eine Arbeitsstation unter dieser 'Basis' "
 "anzulegen."
 
-#: plugins/admin/systems/class_terminalGeneric.inc:273
-msgid "The required field 'Terminal name' is not set."
-msgstr "Das benötigte Feld 'Terminal-Name' ist nicht gesetzt."
+#: plugins/admin/systems/class_workstationGeneric.inc:232
+msgid "The required field 'Workstation name' is not set."
+msgstr "Das benötigte Feld 'Arbeiststationsname' ist nicht gesetzt."
+
+#: plugins/admin/systems/class_workstationGeneric.inc:245
+#: plugins/admin/systems/class_componentGeneric.inc:155
+#: plugins/admin/systems/class_winGeneric.inc:172
+#: plugins/admin/systems/class_terminalGeneric.inc:286
+#: plugins/admin/systems/class_servGeneric.inc:209
+#: plugins/admin/systems/class_printGeneric.inc:529
+#: plugins/admin/systems/class_phoneGeneric.inc:314
+#, php-format
+msgid "There is already an entry '%s' in the base choosen by you"
+msgstr "Der Eintrag '%s' ist in der von Ihnen ausgewählten Basis bereits vorhanden"
+
+#: plugins/admin/systems/servdns.tpl:1
+msgid "Zones"
+msgstr "Zonen"
+
+#: plugins/admin/systems/workstation.tpl:9
+msgid "Workstation template"
+msgstr "Vorlage für Arbeitsstation"
+
+#: plugins/admin/systems/workstation.tpl:11
+msgid "Workstation name"
+msgstr "Name der Arbeitsstation"
+
+#: plugins/admin/systems/class_servNfs.inc:35
+msgid "The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+msgstr ""
+"Die Datei '/etc/gosa/encodings' wurde nicht gefunden, kann die unterstützten "
+"Zeichensätze nicht einlesen."
+
+#: plugins/admin/systems/class_servNfs.inc:38
+msgid "Can't read '/etc/gosa/encodings', please check permissions."
+msgstr "Kann '/etc/gosa/encodings' nicht lesen, bitte prüfen Sie die Rechte."
+
+#: plugins/admin/systems/class_servNfs.inc:125
+msgid "Please specify a valid path for your setup."
+msgstr "Bitte geben Sie einen gültigen Pfad an."
+
+#: plugins/admin/systems/class_servNfs.inc:131
+msgid "Please specify a valid name for your setup."
+msgstr "Bitte geben Sie einen gültigen Namen an."
 
-#: plugins/admin/systems/printerPPDDialog.tpl:1
-msgid "Printer driver"
-msgstr "Drucker-Treiber"
+#: plugins/admin/systems/class_servNfs.inc:134
+msgid "Please specify a name for your setup."
+msgstr "Bitte geben Sie einen Namen an."
 
-#: plugins/admin/systems/printerPPDDialog.tpl:6
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
-msgid "Select"
-msgstr "Auswahl"
+#: plugins/admin/systems/class_servNfs.inc:139
+msgid "Description contains invalid characters."
+msgstr "Das Feld 'Beschreibung' enthält ungültige Zeichen!"
 
-#: plugins/admin/systems/printerPPDDialog.tpl:9
-msgid "New driver"
-msgstr "Neuer Treiber"
+#: plugins/admin/systems/class_servNfs.inc:143
+msgid "Path contains invalid characters."
+msgstr "Das Feld 'Pfad' enthält ungültige Zeichen."
 
-#: plugins/admin/systems/workstationStartup.tpl:4
-#: plugins/admin/systems/terminalStartup.tpl:1
-msgid "Boot parameters"
-msgstr "Boot-Parameter"
+#: plugins/admin/systems/class_servNfs.inc:147
+msgid "Option contains invalid characters."
+msgstr "Das Feld 'Option' enthält ungültige Zeichen!"
 
-#: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "LDAP server"
-msgstr "LDAP-Server"
+#: plugins/admin/systems/servnfs.tpl:1
+msgid "Edit share"
+msgstr "Freigabe bearbeiten"
 
-#: plugins/admin/systems/workstationStartup.tpl:10
-#: plugins/admin/systems/terminalStartup.tpl:10
-msgid "Choose LDAP server to use for accounts and terminal management"
-msgstr ""
-"Wählen Sie den LDAP-Server, der für die Verwaltung von Benutzerkonten und "
-"Terminals genutzt wird"
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
+msgstr "NFS-Einrichtung"
 
-#: plugins/admin/systems/workstationStartup.tpl:17
-#: plugins/admin/systems/terminalStartup.tpl:17
-msgid "Boot kernel"
-msgstr "Boot-Kernel"
+#: plugins/admin/systems/servnfs.tpl:25
+msgid "Path"
+msgstr "Pfad"
 
-#: plugins/admin/systems/workstationStartup.tpl:19
-#: plugins/admin/systems/terminalStartup.tpl:19
-msgid "Enter the filename of the kernel to use"
-msgstr "Geben Sie den Dateinamen des Kernels ein, der genutzt werden soll"
+#: plugins/admin/systems/servnfs.tpl:49
+msgid "Codepage"
+msgstr "Codepage"
 
-#: plugins/admin/systems/workstationStartup.tpl:22
-#: plugins/admin/systems/terminalStartup.tpl:22
-msgid "Custom options"
-msgstr "Angepasste Optionen"
+#: plugins/admin/systems/servnfs.tpl:59
+msgid "Option"
+msgstr "Option"
 
-#: plugins/admin/systems/workstationStartup.tpl:24
-#: plugins/admin/systems/terminalStartup.tpl:24
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid "Remove Kolab extension"
+msgstr "Kolab-Erweiterung entfernen"
+
+#: plugins/admin/systems/class_servKolab.inc:115
 msgid ""
-"Enter any parameters that should be passed to the kernel as append line "
-"during bootup"
+"This server has kolab features enabled. You can disable them by clicking "
+"below."
 msgstr ""
-"Geben Sie die Parameter ein, die dem Kernel beim Starten übergeben werden "
-"sollen"
-
-#: plugins/admin/systems/workstationStartup.tpl:37
-msgid "FAI server"
-msgstr "FAI-Server"
+"Dieser Server besitzt aktivierte Kolab-Funtionen. Sie können diese durch "
+"einen Klick auf die Schaltfläche unten deaktivieren."
 
-#: plugins/admin/systems/workstationStartup.tpl:54
-msgid "Assigned FAI classes"
-msgstr "Zugewiesene FAI-Klassen"
+#: plugins/admin/systems/class_servKolab.inc:118
+msgid "Add Kolab service"
+msgstr "Kolab-Dienst hinzufügen"
 
-#: plugins/admin/systems/workstationStartup.tpl:73
-#: plugins/admin/systems/terminalStartup.tpl:53
-msgid "Kernel modules (format: name parameters)"
-msgstr "Kernel-Module (Format: Name Parameter)"
+#: plugins/admin/systems/class_servKolab.inc:118
+msgid ""
+"This server has kolab features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Aktuell besitzt dieser Server keine aktivierten Kolab-Funktionen. Sie können "
+"diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/admin/systems/workstationStartup.tpl:75
-#: plugins/admin/systems/terminalStartup.tpl:55
-msgid "Add additional modules to load on startup"
+#: plugins/admin/systems/class_servKolab.inc:146
+#, php-format
+msgid "Include data from %s days in the past when creating free/busy lists"
 msgstr ""
-"Zusätzliche Module hinzufügen, die während des Starts geladen werden sollen"
+"Berücksichtige %s Tage in der Vergangenheit beim Erstellen von Frei/Belegt-"
+"Listen"
 
-#: plugins/admin/systems/workstationStartup.tpl:99
-#: plugins/admin/systems/terminalStartup.tpl:79
-msgid "Mountpoint"
-msgstr "Mount-Pfad"
+#: plugins/admin/systems/class_servKolab.inc:152
+#, php-format
+msgid "Warn users when using more than %s%% of their mail quota"
+msgstr "Warne Benutzer, wenn sie mehr als %s%% ihres Mail-Kontigentes benutzen"
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
-msgstr "Telefon-Name"
+#: plugins/admin/systems/class_servKolab.inc:227
+msgid "Future days in Free/Busy settings must be set."
+msgstr "Intervall für Frei/Belegt-Informationen muß gesetzt sein."
 
-#: plugins/admin/systems/class_servGeneric.inc:52
-msgid "This 'dn' has no server features."
-msgstr "Diese 'dn' hat keine Server-Erweiterungen."
+#: plugins/admin/systems/class_servKolab.inc:229
+msgid "Future days in Free/Busy settings must be a positive value."
+msgstr "Intervall für Frei/Belegt-Informationen muß ein positiver Wert sein."
 
-#: plugins/admin/systems/class_servGeneric.inc:191
-msgid "The required field 'Server name' is not set."
-msgstr "Das benötigte Feld 'Server-Name' ist nicht gesetzt."
+#: plugins/admin/systems/class_servKolab.inc:233
+msgid "The given Quota settings value must be a number."
+msgstr "Der angegebene Kontingent-Wert muß numerisch sein."
 
-#: plugins/admin/systems/class_servGeneric.inc:198
-msgid "You have no permissions to create a server on this 'Base'."
-msgstr ""
-"Sie haben keine Berechtigung, einen Server unterhalb dieser 'Basis' "
-"anzulegen."
+#: plugins/admin/systems/class_servKolab.inc:235
+msgid "Please choose a value between 1 and 100 for Quota settings."
+msgstr "Bitte wählen Sie einen Kontingent-Wert zwischen 1 und 100."
 
-#: plugins/admin/systems/terminal.tpl:9
-msgid "Terminal template"
-msgstr "Terminal-Vorlage"
+#: plugins/admin/systems/class_servKolab.inc:237
+msgid "Future days must be a value."
+msgstr "Frei/Belegt-Intervall muß einen Wert besitzen."
 
-#: plugins/admin/systems/terminal.tpl:11
-msgid "Terminal name"
-msgstr "Terminal-Name"
+#: plugins/admin/systems/class_servKolab.inc:241
+msgid "No SMTP privileged networks set."
+msgstr "Es sind keine SMTP-privilegierten Netzwerke vorhanden."
 
-#: plugins/admin/systems/terminal.tpl:37
-#: plugins/admin/systems/workstation.tpl:46
-#: plugins/admin/systems/phonesettings.tpl:21
-msgid "Mode"
-msgstr "Modus"
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
+msgstr "Entfernte Arbeitsfläche"
 
-#: plugins/admin/systems/terminal.tpl:39
-#: plugins/admin/systems/workstation.tpl:48
-msgid "Select terminal mode"
-msgstr "Wählen Sie den Terminal-Modus"
+#: plugins/admin/systems/terminalService.tpl:145
+msgid "Connect method"
+msgstr "Verbindungsmethode"
 
-#: plugins/admin/systems/terminal.tpl:53
-msgid "Root server"
-msgstr "Root-Server"
+#: plugins/admin/systems/terminalService.tpl:147
+msgid "Choose method to connect to terminal server"
+msgstr "Wählen Sie die Methode der Anbindung an den Terminal-Server"
 
-#: plugins/admin/systems/terminal.tpl:55
-msgid "Select NFS root filesystem to use"
-msgstr "Wählen Sie das NFS-Root-Dateisystem"
+#: plugins/admin/systems/terminalService.tpl:154
+msgid "Terminal server"
+msgstr "Terminal-Server"
 
-#: plugins/admin/systems/terminal.tpl:61
-msgid "Swap server"
-msgstr "Auslagerungs-Server"
+#: plugins/admin/systems/terminalService.tpl:156
+msgid "Select specific terminal server to use"
+msgstr "Wählen Sie einen bestimmten Terminal-Server"
 
-#: plugins/admin/systems/terminal.tpl:63
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-"Wählen Sie das NFS-Dateisystem, in dem die Auslagerungsdateien abgelegt "
-"werden sollen"
+#: plugins/admin/systems/terminalService.tpl:163
+msgid "Font server"
+msgstr "Schriften-Server"
 
-#: plugins/admin/systems/terminal.tpl:75
-#: plugins/admin/systems/workstation.tpl:55
-msgid "Syslog server"
-msgstr "Protokoll-Server"
+#: plugins/admin/systems/terminalService.tpl:165
+msgid "Select specific font server to use"
+msgstr "Wählen Sie einen bestimmten Schriften-Server"
 
-#: plugins/admin/systems/terminal.tpl:77
-#: plugins/admin/systems/workstation.tpl:57
-msgid "Choose server to use for logging"
-msgstr "Wählen Sie den Server, der für das Protokollieren genutzt werden soll"
+#: plugins/admin/systems/terminalService.tpl:181
+msgid "Print device"
+msgstr "Drucker"
 
-#: plugins/admin/systems/terminal.tpl:83
-#: plugins/admin/systems/workstation.tpl:63
-msgid "NTP server"
-msgstr "Zeit-Server"
+#: plugins/admin/systems/terminalService.tpl:182
+msgid "Select to start IPP based printing service on terminal"
+msgstr "Auswählen, um auf dem Terminal IPP-basierte Druckdienste zu starten"
 
-#: plugins/admin/systems/terminal.tpl:85
-#: plugins/admin/systems/workstation.tpl:65
-msgid "Choose server to use for synchronizing time"
-msgstr ""
-"Wählen Sie den Server, der zur Zeit-Synchronisation genutzt werden soll"
+#: plugins/admin/systems/terminalService.tpl:183
+msgid "Provide print services"
+msgstr "Druckdienste bereitstellen"
 
-#: plugins/admin/systems/terminal.tpl:104
-#: plugins/admin/systems/workstation.tpl:83
-msgid "Select action to execute for this terminal"
-msgstr "Wählen Sie die auszuführende Aktion für dieses Terminal"
+#: plugins/admin/systems/terminalService.tpl:189
+msgid "Spool server"
+msgstr "Spool-Server"
 
-#: plugins/admin/systems/class_servDHCP.inc:36
-msgid "Remove DHCP service"
-msgstr "DHCP-Dienst entfernen"
+#: plugins/admin/systems/terminalService.tpl:191
+msgid "Select NFS filesystem to place spool files on"
+msgstr "Wählen Sie das NFS-Dateisystem, in dem die Spool-Dateien abgelegt werden"
 
-#: plugins/admin/systems/class_servDHCP.inc:37
-msgid ""
-"This server has DHCP features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Dieser Server besitzt aktivierte DHCP-Funktionen. Sie können diese durch "
-"einen Klick auf die untere Schaltfläche deaktivieren."
+#: plugins/admin/systems/terminalService.tpl:212
+msgid "Select scanner driver to use"
+msgstr "Wählen Sie den Scanner-Treiber, der benutzt werden soll"
+
+#: plugins/admin/systems/class_componentGeneric.inc:50
+#: plugins/admin/systems/class_winGeneric.inc:73
+msgid "This 'dn' has no network features."
+msgstr "Diese 'dn' hat keine Netzwerk-Erweiterungen."
 
-#: plugins/admin/systems/class_servDHCP.inc:39
-msgid "Add DHCP service"
-msgstr "DHCP Dienst hinzufügen"
+#: plugins/admin/systems/class_componentGeneric.inc:138
+msgid "The required field 'Component name' is not set."
+msgstr "Das benötigte Feld 'Gerätename' ist nicht gesetzt."
 
-#: plugins/admin/systems/class_servDHCP.inc:40
-msgid ""
-"This server has DHCP features disabled. You can enable them by clicking "
-"below."
+#: plugins/admin/systems/class_componentGeneric.inc:145
+#: plugins/admin/systems/class_winGeneric.inc:162
+msgid "You have no permissions to create a component on this 'Base'."
 msgstr ""
-"Aktuell besitzt dieser Server keine aktivierten DHCP-Funktionen. Sie können "
-"diese durch einen Klick auf die Schaltfläche unten aktivieren."
+"Sie haben keine Berechtigung, eine Komponente unterhalb dieser 'Basis' "
+"anzulegen."
 
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
-msgstr "Wählen Sie die hinzuzufügenden Objekte"
+#: plugins/admin/systems/terminalStartup.tpl:35
+msgid "Select if terminal supports graphical startup with progress bar"
+msgstr ""
+"Wählen, wenn das Terminal den grafischen Startvorgang mit Fortschrittsbalken "
+"unterstützt"
 
-#: plugins/admin/systems/class_glpiAccount.inc:144
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
-msgid "There is no server with valid glpi database service."
-msgstr "Es wurde kein Server mit einer gültigen glpi-Datenbank gefunden."
+#: plugins/admin/systems/terminalStartup.tpl:36
+msgid "use graphical bootup"
+msgstr "grafisches Booten nutzen"
 
-#: plugins/admin/systems/class_glpiAccount.inc:154
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
-msgid "Can't connect to glpi database, the php-mysql extension is missing."
-msgstr ""
-"Die MySQL-Erweiterung wurde nicht gefunden - kann daher nicht zur glpi-"
-"Datenbank verbinden."
+#: plugins/admin/systems/terminalStartup.tpl:38
+msgid "Select if terminal should boot in text mode"
+msgstr "Wählen, wenn das Terminal im Textmodus starten soll"
 
-#: plugins/admin/systems/class_glpiAccount.inc:164
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
-msgid "Can't connect to glpi database, check configuration twice."
-msgstr ""
-"Kann nicht zur glpi-Datenbank verbinden - bitte überprüfen Sie Ihre "
-"Konfiguration."
+#: plugins/admin/systems/terminalStartup.tpl:39
+msgid "use standard linux textual bootup"
+msgstr "Standard Textmodus nutzen"
+
+#: plugins/admin/systems/terminalStartup.tpl:41
+msgid "Select to get more verbose output during startup"
+msgstr "Wählen, um ausführlichere Informationen während des Starts zu erhalten"
+
+#: plugins/admin/systems/terminalStartup.tpl:42
+msgid "use debug mode for startup"
+msgstr "benutze Fehlersuch-Modus"
 
 #: plugins/admin/systems/class_glpiAccount.inc:178
 #: plugins/admin/systems/class_glpiAccount.inc:184
@@ -7765,16 +8138,14 @@ msgstr ""
 
 #: plugins/admin/systems/class_glpiAccount.inc:312
 #, php-format
-msgid ""
-"You can't delete this system type, it is still in use by these system(s) '%s'"
+msgid "You can't delete this system type, it is still in use by these system(s) '%s'"
 msgstr ""
 "Sie können diesen Systemtyp nicht entfernen, er wird noch von folgendem(n) "
 "System(en) verwendet: '%s'"
 
 #: plugins/admin/systems/class_glpiAccount.inc:323
 msgid "Rename failed, this system type name is already used."
-msgstr ""
-"Das Umbenennen schlug fehl: Der angegebene Name wird bereits verwendet."
+msgstr "Das Umbenennen schlug fehl: Der angegebene Name wird bereits verwendet."
 
 #: plugins/admin/systems/class_glpiAccount.inc:379
 msgid "Adding new operating system failed, specifed name is already used."
@@ -7797,11 +8168,6 @@ msgstr ""
 "Das Aktualisieren des Betriebssystems schlug fehl, da der angegebene Name "
 "bereits verwendet wird."
 
-#: plugins/admin/systems/class_glpiAccount.inc:564
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
-msgid "Remove inventory"
-msgstr "Inventar entfernen"
-
 #: plugins/admin/systems/class_glpiAccount.inc:565
 msgid ""
 "This device has inventory informations enabled. You can disable them by "
@@ -7810,11 +8176,6 @@ msgstr ""
 "Dieses Gerät besitzt aktivierte Inventar-Funktionen. Sie können diese durch "
 "einen Klick auf die Schaltfläche unten deaktivieren."
 
-#: plugins/admin/systems/class_glpiAccount.inc:567
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
-msgid "Add inventory"
-msgstr "Inventar hinzufügen"
-
 #: plugins/admin/systems/class_glpiAccount.inc:568
 msgid ""
 "This device has inventory informations disabled. You can enable them by "
@@ -7823,1389 +8184,1302 @@ msgstr ""
 "Aktuell besitzt dieses Gerät keine aktivierten Inventar-Funktionen. Sie "
 "können diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/admin/systems/class_glpiAccount.inc:631
-#: plugins/admin/systems/class_glpiAccount.inc:645
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:609
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:623
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:288
-msgid "N/A"
-msgstr "N/A"
+#: plugins/admin/systems/glpiManufacturer.tpl:1
+msgid "Manage manufacturers"
+msgstr "Hersteller verwalten"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:70
-msgid "Activated"
-msgstr "Aktiv"
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
+msgid "Attachment"
+msgstr "Anhang"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:72
-msgid "Memory test"
-msgstr "Speichertest"
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
+msgid "Filename"
+msgstr "Dateiname"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:73
-msgid "System analysis"
-msgstr "Systemanalyse"
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
+msgid "Mime-type"
+msgstr "MIME-Typ"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:100
-msgid "No ACTIONCMD definition found in your gosa.conf"
-msgstr "Es ist kein ACTIONCMD in ihrer gosa.conf definiert"
+#: plugins/admin/systems/class_termDNS.inc:313
+msgid "The required field 'IP-address' is not set."
+msgstr "Das benötigte Feld 'IP-Adresse' ist nicht gesetzt."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:114
-msgid "This 'dn' has no workstation features."
-msgstr "Dieser 'DN' hat keine Arbeitsstations-Erweiterungen."
+#: plugins/admin/systems/class_termDNS.inc:319
+msgid "Wrong IP format in field IP-address."
+msgstr "Ungültige IP-Adresse in Feld IP-Adresse"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:157
-msgid "Instant update"
-msgstr "Sofortiges Update"
+#: plugins/admin/systems/class_termDNS.inc:325
+msgid "The required field 'MAC-address' is not set."
+msgstr "Das benötigte Feld 'MAC-Adresse' ist nicht gesetzt."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:158
-#: plugins/admin/systems/class_workstationGeneric.inc:164
-msgid "Scheduled update"
-msgstr "Geplantes Update"
+#: plugins/admin/systems/class_termDNS.inc:331
+msgid ""
+"The given macaddress is invalid. There must be 6 1byte segments seperated by "
+"':'."
+msgstr ""
+"Die angebene MAC-Adresse ist nicht korrekt. Es müssen sechs 1-Byte Segmente "
+"angegeben werden (getrennt durch ':')."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:159
-#: plugins/admin/systems/class_workstationGeneric.inc:163
-msgid "Reinstall"
-msgstr "Neu-Installation"
+#: plugins/admin/systems/class_termDNS.inc:346
+#, php-format
+msgid "Found duplicate value for record type '%s'."
+msgstr "Es wurde ein doppelter Wert für Eintrag-Typ '%s' gefunden."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:160
-msgid "Rescan hardware"
-msgstr "Hardware neu erkennen"
+#: plugins/admin/systems/class_termDNS.inc:352
+#, php-format
+msgid "Found more than one entry for the uniqe record type '%s'."
+msgstr "Es wurde mehr als ein Eintrag für den eindeutigen Eintrags-Typ '%s' gefunden."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:228
-msgid "You have no permissions to create a workstation on this 'Base'."
+#: plugins/admin/systems/class_termDNS.inc:360
+#, php-format
+msgid ""
+"The device IP '%s' is added as 'A Record', this will be done automatically, "
+"please remove the record."
 msgstr ""
-"Sie haben keine Berechtigung, eine Arbeitsstation unter dieser 'Basis' "
-"anzulegen."
-
-#: plugins/admin/systems/class_workstationGeneric.inc:232
-msgid "The required field 'Workstation name' is not set."
-msgstr "Das benötigte Feld 'Arbeiststationsname' ist nicht gesetzt."
+"Das Gerät mit der-IP-Adresse '%s' erhält automatisch einen 'A'-Eintrag. "
+"Bitte entfernen Sie den Eintrag."
 
-#: plugins/admin/systems/class_systemManagement.inc:32
-msgid "Systems"
-msgstr "Systeme"
+#: plugins/admin/systems/class_termDNS.inc:366
+#: plugins/admin/systems/class_servDNSeditZone.inc:386
+#, php-format
+msgid "Only lowercase is allowed, please check your '%ss'."
+msgstr "Es sind nur Kleinbuchstaben erlaubt, bitte prüfen Sie '%ss'."
 
-#: plugins/admin/systems/class_systemManagement.inc:429
-msgid "You can't edit this object type yet!"
-msgstr "Dieser Objekt-Typ kann momentan noch nicht bearbeitet werden!"
+#: plugins/admin/systems/class_servRepository.inc:97
+msgid "Remove FAI repository extension."
+msgstr "FAI-Repository-Erweiterung entfernen"
 
-#: plugins/admin/systems/class_systemManagement.inc:455
-msgid "Passwords entered as new and repeated do not match!"
+#: plugins/admin/systems/class_servRepository.inc:98
+msgid ""
+"This server has FAI repository features enabled. You can disable them by "
+"clicking below."
 msgstr ""
-"Die Passworte, die Sie als 'Neues Passwort' und 'Wiederholung des neuen "
-"Passwort' eingegeben haben sind nicht identisch!"
+"Dieser Server besitzt aktivierte FAI-Repository-Erweiterungen. Sie können "
+"diese durch einen Klick auf die Schaltfläche unten deaktivieren."
 
-#: plugins/admin/systems/class_systemManagement.inc:472
-msgid "You are not allowed to set this systems password!"
+#: plugins/admin/systems/class_servRepository.inc:100
+msgid "Add FAI repository extension."
+msgstr "FAI-Repository-Erweiterung hinzufügen"
+
+#: plugins/admin/systems/class_servRepository.inc:101
+msgid ""
+"This server has FAI repository features disabled. You can enable them by "
+"clicking below."
 msgstr ""
-"Sie haben keine Berechtigung, das Passwort für dieses Systems zu setzen!"
+"Aktuell besitzt dieser Server keine aktivierten FAI-Repository-"
+"Erweiterungen. Sie können diese durch einen Klick auf die Schaltfläche unten "
+"aktivieren."
 
-#: plugins/admin/systems/class_systemManagement.inc:526
+#: plugins/admin/systems/class_servRepository.inc:144
 #, php-format
-msgid "You're about to delete all information about the component at '%s'."
+msgid ""
+"You can't delete this release, it is still used by these workstations [%s]. "
+"Please solve this dependencies first, to keep data base consistency."
 msgstr ""
-"Sie sind dabei, alle Informationen über die Komponente auf '%s' zu löschen."
-
-#: plugins/admin/systems/class_systemManagement.inc:760
-msgid "New Terminal template"
-msgstr "Neue Terminal-Vorlage"
-
-#: plugins/admin/systems/class_systemManagement.inc:760
-#: plugins/admin/systems/class_systemManagement.inc:924
-msgid "New Terminal"
-msgstr "Neues Terminal"
+"Sie können dieses Release nicht entfernen, da es momentan noch von diesen "
+"Arbeitsstationen verwendet wird [%s]. Bitte lösen Sie zunächst diese "
+"Abhängigkeiten, um die Konsistenz der Datenbank zu gewährleisten."
 
-#: plugins/admin/systems/class_systemManagement.inc:762
-msgid "New Workstation template"
-msgstr "Neue Vorlage für Arbeitsstation"
+#: plugins/admin/systems/class_servRepository.inc:176
+#, php-format
+msgid "Be careful editing this release, it is still used by these workstations [%s]."
+msgstr ""
+"Seien Sie vorsichtig, wenn Sie dieses Release editieren - es wird momentan "
+"noch von folgenden Arbeitsstationen verwendet [%s]."
 
-#: plugins/admin/systems/class_systemManagement.inc:762
-#: plugins/admin/systems/class_systemManagement.inc:925
-msgid "New Workstation"
-msgstr "Neue Arbeitsstation"
+#: plugins/admin/systems/class_servRepository.inc:243
+#: plugins/admin/systems/class_servRepository.inc:264
+#: plugins/admin/systems/servRepositorySetup.tpl:33
+msgid "Sections"
+msgstr "Sections"
 
-#: plugins/admin/systems/class_systemManagement.inc:763
-#: plugins/admin/systems/class_systemManagement.inc:764
-msgid "New Server"
-msgstr "Neuer Server"
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
+msgid "Can't delete this entry, it is still in use."
+msgstr "Kann diesen Eintrag nicht entfernen, da er noch benutzt wird."
 
-#: plugins/admin/systems/class_systemManagement.inc:765
-#: plugins/admin/systems/class_systemManagement.inc:766
-msgid "New Printer"
-msgstr "Neuer Drucker"
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:305
+msgid "The selected name is already in use."
+msgstr "Der angegebene Name wird bereits verwendet."
 
-#: plugins/admin/systems/class_systemManagement.inc:767
-#: plugins/admin/systems/class_systemManagement.inc:768
-msgid "New Phone"
-msgstr "Neues Telefon"
+#: plugins/admin/systems/servRepository.tpl:6
+msgid "List of configured repositories."
+msgstr "Liste der verfügbaren Repositories."
 
-#: plugins/admin/systems/class_systemManagement.inc:769
-#: plugins/admin/systems/class_systemManagement.inc:770
-msgid "New Component"
-msgstr "Neue Netzwerk-Komponente"
+#: plugins/admin/systems/servRepository.tpl:11
+msgid "Add repository"
+msgstr "Repository hinzufügen"
 
-#: plugins/admin/systems/class_systemManagement.inc:780
-msgid "Edit system"
-msgstr "System bearbeiten"
+#: plugins/admin/systems/servRepository.tpl:29
+msgid "This menu allows you to create, delete and edit repository settings."
+msgstr ""
+"Dieses Menü erlaubt es Ihnen, Repository-Einstellungen zu erstellen, zu "
+"entfernen und zu bearbeiten."
 
-#: plugins/admin/systems/class_systemManagement.inc:781
-msgid "Delete system"
-msgstr "Entferne System"
+#: plugins/admin/systems/servdnseditzone.tpl:7
+msgid "Zone name"
+msgstr "Zonenname"
 
-#: plugins/admin/systems/class_systemManagement.inc:791
-msgid "System"
-msgstr "Systeme"
+#: plugins/admin/systems/servdnseditzone.tpl:13
+msgid "Network address"
+msgstr "Netzwerk-Adresse"
 
-#: plugins/admin/systems/class_systemManagement.inc:829
-msgid "Cups Server"
-msgstr "CUPS-Server"
+#: plugins/admin/systems/servdnseditzone.tpl:24
+msgid "Zone entries"
+msgstr "Zonen-Einträge"
 
-#: plugins/admin/systems/class_systemManagement.inc:830
-msgid "Log Db"
-msgstr "Log-DB"
+#: plugins/admin/systems/servdnseditzone.tpl:35
+msgid "SOA record"
+msgstr "SOA-Eintrag"
 
-#: plugins/admin/systems/class_systemManagement.inc:831
-msgid "Syslog Server"
-msgstr "Syslog-Server"
+#: plugins/admin/systems/servdnseditzone.tpl:41
+msgid "Primary dns server for this zone"
+msgstr "Primärer DNS-Server für diese Zone"
 
-#: plugins/admin/systems/class_systemManagement.inc:832
-msgid "Mail Server"
-msgstr "Mail-Server"
+#: plugins/admin/systems/servdnseditzone.tpl:53
+msgid "Serial number (automatically incremented)"
+msgstr "Seriennummer (automatisch inkrementiert)"
 
-#: plugins/admin/systems/class_systemManagement.inc:833
-msgid "Imap Server"
-msgstr "IMAP-Server"
+#: plugins/admin/systems/servdnseditzone.tpl:69
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: ihtml/themes/altlinux/setup_finish.tpl:31
+#: ihtml/themes/default/setup_finish.tpl:31
+#: ihtml/themes/lhs/setup_finish.tpl:31
+msgid "Retry"
+msgstr "Wiederholen"
 
-#: plugins/admin/systems/class_systemManagement.inc:834
-msgid "Nfs Server"
-msgstr "NFS-Server"
+#: plugins/admin/systems/servdnseditzone.tpl:75
+msgid "Expire"
+msgstr "Ablauf"
 
-#: plugins/admin/systems/class_systemManagement.inc:835
-msgid "Kerberos Server"
-msgstr "Kerberos-Server"
+#: plugins/admin/systems/servdnseditzone.tpl:96
+msgid "MxRecords"
+msgstr "MX-Einträge"
 
-#: plugins/admin/systems/class_systemManagement.inc:836
-msgid "Asterisk Server"
-msgstr "Asterisk-Server"
+#: plugins/admin/systems/servdnseditzone.tpl:108
+msgid "Zone records"
+msgstr "Zonen-Einträge"
 
-#: plugins/admin/systems/class_systemManagement.inc:837
-msgid "Fax Server"
-msgstr "Fax-Server"
+#: plugins/admin/systems/class_glpiSelectUser.inc:140
+msgid "use"
+msgstr "verwenden"
 
-#: plugins/admin/systems/class_systemManagement.inc:838
-msgid "Ldap Server"
-msgstr "LDAP-Server"
+#: plugins/admin/systems/glpiSelectUser.tpl:23
+msgid "This dialog allows you to select a user as technical responsible person."
+msgstr ""
+"Dieser Dialog erlaubt es Ihnen, einen Benutzer als technische Kontaktperson "
+"zu wählen."
 
-#: plugins/admin/systems/class_systemManagement.inc:871
-msgid "Set root password"
-msgstr "root-Passwort setzen"
+#: plugins/admin/systems/glpi_devices.tpl:2
+msgid "Add/Edit monitor"
+msgstr "Monitor hinzufügen/bearbeiten"
 
-#: plugins/admin/systems/class_systemManagement.inc:916
-msgid "New System from incoming"
-msgstr "Neu erkanntes Gerät"
+#: plugins/admin/systems/glpi_devices.tpl:17
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+msgid "Comments"
+msgstr "Kommentare"
 
-#: plugins/admin/systems/class_systemManagement.inc:918
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:589
-msgid "Terminal"
-msgstr "Terminal"
+#: plugins/admin/systems/glpi_devices.tpl:33
+msgid "Monitor size"
+msgstr "Monitorgröße"
 
-#: plugins/admin/systems/class_systemManagement.inc:919
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:588
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
-msgstr "Arbeitsstation"
+#: plugins/admin/systems/glpi_devices.tpl:36
+msgid "Inch"
+msgstr "Zoll"
 
-#: plugins/admin/systems/class_systemManagement.inc:922
-msgid "Winstation"
-msgstr "Windows-Workstation"
+#: plugins/admin/systems/glpi_devices.tpl:44
+msgid "Integrated microphone"
+msgstr "Integriertes Mikrofon"
 
-#: plugins/admin/systems/class_systemManagement.inc:923
-msgid "Network Device"
-msgstr "Netzwerk-Gerät"
+#: plugins/admin/systems/glpi_devices.tpl:47
+#: plugins/admin/systems/glpi_devices.tpl:55
+#: plugins/admin/systems/glpi_devices.tpl:63
+#: plugins/admin/systems/glpi_devices.tpl:71
+#: plugins/admin/systems/glpi_devices.tpl:176
+#: plugins/admin/systems/glpi_devices.tpl:296
+#: plugins/admin/systems/glpi_devices.tpl:361
+msgid "Yes"
+msgstr "ja"
 
-#: plugins/admin/systems/class_systemManagement.inc:1146
-msgid "New terminal"
-msgstr "Neues Terminal"
+#: plugins/admin/systems/glpi_devices.tpl:48
+#: plugins/admin/systems/glpi_devices.tpl:56
+#: plugins/admin/systems/glpi_devices.tpl:64
+#: plugins/admin/systems/glpi_devices.tpl:72
+#: plugins/admin/systems/glpi_devices.tpl:177
+#: plugins/admin/systems/glpi_devices.tpl:297
+#: plugins/admin/systems/glpi_devices.tpl:362
+msgid "No"
+msgstr "nein"
 
-#: plugins/admin/systems/class_systemManagement.inc:1148
-msgid "New workstation"
-msgstr "Neue Arbeitsstation"
+#: plugins/admin/systems/glpi_devices.tpl:52
+msgid "Integrated speakers"
+msgstr "Integrierte Lautsprecher"
 
-#: plugins/admin/systems/class_systemManagement.inc:1150
-msgid "New Device"
-msgstr "Neues Gerät"
+#: plugins/admin/systems/glpi_devices.tpl:60
+msgid "Sub-D"
+msgstr "Sub-D"
 
-#: plugins/admin/systems/class_systemManagement.inc:1167
-msgid "Terminal template for"
-msgstr "Terminal-Vorlage für"
+#: plugins/admin/systems/glpi_devices.tpl:68
+msgid "BNC"
+msgstr "BNC"
 
-#: plugins/admin/systems/class_systemManagement.inc:1179
-msgid "Workstation template for"
-msgstr "Arbeitsstations-Vorlage für"
+#: plugins/admin/systems/glpi_devices.tpl:76
+msgid "Serial number"
+msgstr "Seriennumner"
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "General"
-msgstr "Allgemein"
+#: plugins/admin/systems/glpi_devices.tpl:83
+msgid "Additional serial number"
+msgstr "Zusätzliche Seriennummer"
 
-#: plugins/admin/systems/printer.tpl:9
-msgid "Printer name"
-msgstr "Druckername"
+#: plugins/admin/systems/glpi_devices.tpl:97
+msgid "Add/Edit other device"
+msgstr "Allgemeines Gerät hinzufügen/bearbeiten"
 
-#: plugins/admin/systems/printer.tpl:31
-msgid "Details"
-msgstr "Details"
+#: plugins/admin/systems/glpi_devices.tpl:138
+msgid "Add/Edit power supply"
+msgstr "Netzteil hinzufügen/bearbeiten"
 
-#: plugins/admin/systems/printer.tpl:34
-msgid "Printer location"
-msgstr "Drucker-Standort"
+#: plugins/admin/systems/glpi_devices.tpl:173
+msgid "Atx"
+msgstr "ATX"
 
-#: plugins/admin/systems/printer.tpl:38
-msgid "Printer URL"
-msgstr "Drucker URL"
+#: plugins/admin/systems/glpi_devices.tpl:181
+msgid "Power"
+msgstr "Strom"
 
-#: plugins/admin/systems/printer.tpl:58
-msgid "Permissions"
-msgstr "Berechtigungen"
+#: plugins/admin/systems/glpi_devices.tpl:193
+msgid "Add/Edit graphic card"
+msgstr "Grafikkarte hinzufügen/bearbeiten"
 
-#: plugins/admin/systems/printer.tpl:65
-msgid "Users which are allowed to use this printer"
-msgstr "Benutzer mit Berechtigung, diesen Drucker zu nutzen"
+#: plugins/admin/systems/glpi_devices.tpl:228
+#: plugins/admin/systems/glpi_devices.tpl:284
+#: plugins/admin/systems/glpi_devices.tpl:349
+msgid "Interface"
+msgstr "Interface"
 
-#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
-msgid "Add user"
-msgstr "Benutzer hinzufügen"
+#: plugins/admin/systems/glpi_devices.tpl:237
+msgid "Ram"
+msgstr "RAM"
 
-#: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
-msgid "Add group"
-msgstr "Gruppe hinzufügen"
+#: plugins/admin/systems/glpi_devices.tpl:249
+msgid "Add/Edit controller"
+msgstr "Controller hinzufügen/bearbeiten"
 
-#: plugins/admin/systems/printer.tpl:81
-msgid "Users which are allowed to administrate this printer"
-msgstr "Benutzer mit Berechtigung, diesen Drucker zu verwalten"
+#: plugins/admin/systems/glpi_devices.tpl:307
+msgid "Add/Edit drive"
+msgstr "Laufwerk hinzufügen/bearbeiten"
 
-#: plugins/admin/systems/printer.tpl:82
-msgid "Admins"
-msgstr "Administratoren"
+#: plugins/admin/systems/glpi_devices.tpl:342
+msgid "Speed"
+msgstr "Taktung"
 
-#: plugins/admin/systems/class_servDNS.inc:181
-#: plugins/admin/systems/class_inventory.inc:36
-msgid "Remove DNS service"
-msgstr "DNS-Dienst entfernen"
+#: plugins/admin/systems/glpi_devices.tpl:358
+msgid "Writeable"
+msgstr "Beschreibbar"
 
-#: plugins/admin/systems/class_servDNS.inc:182
-#: plugins/admin/systems/class_inventory.inc:37
-msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
-msgstr ""
-"Dieser Server besitzt aktivierte DNS-Funktionen. Sie können diese durch "
-"einen Klick auf die untere Schaltfläche deaktivieren."
+#: plugins/admin/systems/glpi_devices.tpl:371
+msgid "Add/Edit harddisk"
+msgstr "Festplatte hinzufügen/bearbeiten"
 
-#: plugins/admin/systems/class_servDNS.inc:184
-#: plugins/admin/systems/class_inventory.inc:39
-msgid "Add DNS service"
-msgstr "DNS-Dienst hinzufügen"
+#: plugins/admin/systems/glpi_devices.tpl:406
+msgid "Rpm"
+msgstr "Upm"
 
-#: plugins/admin/systems/class_servDNS.inc:185
-#: plugins/admin/systems/class_inventory.inc:40
-msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
-msgstr ""
-"Aktuell besitzt dieser Server keine aktivierten DNS-Funktionen. Sie können "
-"diese durch einen Klick auf die Schaltfläche unten aktivieren."
+#: plugins/admin/systems/glpi_devices.tpl:413
+msgid "Cache"
+msgstr "Cache"
 
-#: plugins/admin/systems/class_servDNS.inc:270
-#, php-format
-msgid ""
-"Can't delete the selected zone, because it is still in use by these entry/"
-"entries '%s'"
-msgstr ""
-"Sie können die gewählte Zone nicht entfernen, sie wird noch von folgendem(n) "
-"Eintrag / Einträgen verwendet: '%s'"
+#: plugins/admin/systems/glpi_devices.tpl:443
+msgid "Add/Edit memory"
+msgstr "Speicher hinzufügen/bearbeiten"
 
-#: plugins/admin/systems/class_servDNS.inc:297
-msgid "Reverse zone"
-msgstr "Reverse Zone"
+#: plugins/admin/systems/glpi_devices.tpl:478
+msgid "Frequenz"
+msgstr "Frequenz"
 
-#: plugins/admin/systems/class_servDB.inc:135
-#: plugins/admin/systems/class_servDB.inc:144
-#: plugins/admin/systems/class_servDB.inc:161
-#: plugins/admin/systems/class_servDB.inc:171
-#: plugins/admin/systems/class_servDB.inc:176
-#: plugins/admin/systems/class_servDB.inc:182
-#, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
-msgstr "Das Attribut '%s' ist leer oder enthält ungültige Zeichen."
+#: plugins/admin/systems/glpi_devices.tpl:507
+msgid "Add/Edit sound card"
+msgstr "Soundkarte hinzufügen/bearbeiten"
 
-#: plugins/admin/systems/class_servDB.inc:151
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
-msgstr "Der IMAP-Verbindungsstring muss in der Form '%s' sein."
+#: plugins/admin/systems/glpi_devices.tpl:553
+msgid "Add/Edit network interface"
+msgstr "Netzwerk-Interface hinzufügen/bearbeiten"
 
-#: plugins/admin/systems/class_servDB.inc:155
-msgid "The sieve port needs to be numeric."
-msgstr "Der Sieve-Port muss numerisch sein."
+#: plugins/admin/systems/glpi_devices.tpl:589
+msgid "MAC address"
+msgstr "MAC-Adresse"
 
-#: plugins/admin/systems/class_servDB.inc:166
-#, php-format
-msgid "The specified kerberos password is empty."
-msgstr "Das angebene Kerberos-Passwort ist leer."
+#: plugins/admin/systems/glpi_devices.tpl:607
+msgid "Add/Edit processor"
+msgstr "Prozessor hinzufügen/bearbeiten"
 
-#: plugins/admin/systems/class_servDB.inc:190
-#, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
-msgstr ""
-"Das Feld 'Serverbezeichnung' muss entweder ein Hostname oder eine IP-Adresse "
-"sein."
+#: plugins/admin/systems/glpi_devices.tpl:642
+msgid "Frequence"
+msgstr "Frequenz"
 
-#: plugins/admin/systems/servdns.tpl:1
-msgid "Zones"
-msgstr "Zonen"
+#: plugins/admin/systems/glpi_devices.tpl:649
+msgid "Default frequence"
+msgstr "Standardfrequenz"
 
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
-msgstr "Vorlage für Arbeitsstation"
+#: plugins/admin/systems/glpi_devices.tpl:661
+msgid "Add/Edit motherboard"
+msgstr "Motherboard hinzufügen/bearbeiten"
 
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
-msgstr "Name der Arbeitsstation"
+#: plugins/admin/systems/glpi_devices.tpl:696
+msgid "Chipset"
+msgstr "Chipsatz"
 
-#: plugins/admin/systems/class_servNfs.inc:35
-msgid ""
-"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
-msgstr ""
-"Die Datei '/etc/gosa/encodings' wurde nicht gefunden, kann die unterstützten "
-"Zeichensätze nicht einlesen."
+#: plugins/admin/systems/glpi_devices.tpl:707
+msgid "Add/Edit computer case"
+msgstr "Computergehäuse hinzufügen/bearbeiten"
 
-#: plugins/admin/systems/class_servNfs.inc:38
-msgid "Can't read '/etc/gosa/encodings', please check permissions."
-msgstr "Kann '/etc/gosa/encodings' nicht lesen, bitte prüfen Sie die Rechte."
+#: plugins/admin/systems/glpi_devices.tpl:742
+msgid "format"
+msgstr "Format"
 
-#: plugins/admin/systems/class_servNfs.inc:125
-msgid "Please specify a valid path for your setup."
-msgstr "Bitte geben Sie einen gültigen Pfad an."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
+#, php-format
+msgid "Internal Error can't create device of type '%s'"
+msgstr "Interner Fehler: Kann Gerät von Typ '%s' nicht anlegen."
 
-#: plugins/admin/systems/class_servNfs.inc:131
-msgid "Please specify a valid name for your setup."
-msgstr "Bitte geben Sie einen gültigen Namen an."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
+#, php-format
+msgid "You're about to delete the glpi device '%s'."
+msgstr "Sie sind dabei das GLPI Gerät '%s' zu löschen."
 
-#: plugins/admin/systems/class_servNfs.inc:134
-msgid "Please specify a name for your setup."
-msgstr "Bitte geben Sie einen Namen an."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
+msgid "Can't detect object name."
+msgstr "Kann Objektnamen nicht erkennen."
 
-#: plugins/admin/systems/class_servNfs.inc:139
-msgid "Description contains invalid characters."
-msgstr "Das Feld 'Beschreibung' enthält ungültige Zeichen!"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
+#, php-format
+msgid "You can't delete this device, it is still in use by these system(s) '%s'"
+msgstr ""
+"Sie können dieses Gerät nicht entfernen, es wird noch von folgendem(n) System"
+"(en) verwendet: '%s'"
 
-#: plugins/admin/systems/class_servNfs.inc:143
-msgid "Path contains invalid characters."
-msgstr "Das Feld 'Pfad' enthält ungültige Zeichen."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
+msgid "devices"
+msgstr "Geräte"
 
-#: plugins/admin/systems/class_servNfs.inc:147
-msgid "Option contains invalid characters."
-msgstr "Das Feld 'Option' enthält ungültige Zeichen!"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
+msgid "New mainbord"
+msgstr "Neues Mainboard"
 
-#: plugins/admin/systems/servdb.tpl:6
-msgid "Kerberos kadmin access"
-msgstr "Kerberos-Zugang via kadmin"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
+msgid "New processor"
+msgstr "Neuer Prozessor"
 
-#: plugins/admin/systems/servdb.tpl:10
-msgid "Kerberos Realm"
-msgstr "Kerberos Realm"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+msgid "New case"
+msgstr "Neues Gehäuse"
 
-#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
-msgid "Admin user"
-msgstr "Administrator"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+msgid "C"
+msgstr "C"
 
-#: plugins/admin/systems/servdb.tpl:26
-msgid "FAX database"
-msgstr "Fax-Datenbank"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+msgid "New network interface"
+msgstr "Neues Netzwerk-Interface"
 
-#: plugins/admin/systems/servdb.tpl:30
-msgid "FAX DB user"
-msgstr "Fax-DB Benutzer"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+msgid "NI"
+msgstr "NI"
 
-#: plugins/admin/systems/servdb.tpl:42
-msgid "Asterisk management"
-msgstr "Asterisk Verwaltung"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+msgid "New ram"
+msgstr "Neuer Arbeitsspeicher"
 
-#: plugins/admin/systems/servdb.tpl:46
-msgid "Asterisk DB user"
-msgstr "Asterisk-DB Benutzer"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+msgid "R"
+msgstr "R"
 
-#: plugins/admin/systems/servdb.tpl:54
-msgid "Country dial prefix"
-msgstr "Landesvorwahl"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+msgid "New hard disk"
+msgstr "Neue Festplatte"
 
-#: plugins/admin/systems/servdb.tpl:58
-msgid "Local dial prefix"
-msgstr "Ortsvorwahl"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+msgid "HDD"
+msgstr "HDD"
 
-#: plugins/admin/systems/servdb.tpl:70
-msgid "IMAP admin access"
-msgstr "IMAP-Administrationszugang"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+msgid "New drive"
+msgstr "Neues Laufwerk"
 
-#: plugins/admin/systems/servdb.tpl:74
-msgid "Server identifier"
-msgstr "Serverbezeichnung"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+msgid "D"
+msgstr "D"
 
-#: plugins/admin/systems/servdb.tpl:78
-msgid "Connect URL"
-msgstr "Verbindungs-URL"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+msgid "New controller"
+msgstr "Neuer Controller"
 
-#: plugins/admin/systems/servdb.tpl:91
-msgid "Sieve port"
-msgstr "Sieve-Port"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+msgid "CS"
+msgstr "CS"
 
-#: plugins/admin/systems/servdb.tpl:100
-msgid "Logging database"
-msgstr "Protokoll-Datenbank"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "New graphics card"
+msgstr "Neue Grafikkarte"
 
-#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
-msgid "Logging DB user"
-msgstr "Protokoll-DB Benutzer"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "GC"
+msgstr "GC"
 
-#: plugins/admin/systems/servdb.tpl:119
-msgid "Glpi database"
-msgstr "Glpi-Datenbank"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+msgid "New sound card"
+msgstr "Neue Soundkarte"
 
-#: plugins/admin/systems/servdb.tpl:133
-msgid "Database"
-msgstr "Datenbank"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+msgid "SC"
+msgstr "SC"
 
-#: plugins/admin/systems/servnfs.tpl:1
-msgid "Edit share"
-msgstr "Freigabe bearbeiten"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "New power supply"
+msgstr "Neues Netzteil"
 
-#: plugins/admin/systems/servnfs.tpl:2
-msgid "NFS setup"
-msgstr "NFS-Einrichtung"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "PS"
+msgstr "PS"
 
-#: plugins/admin/systems/servnfs.tpl:25
-msgid "Path"
-msgstr "Pfad"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+msgid "New misc device"
+msgstr "Neues allgemeines Gerät"
 
-#: plugins/admin/systems/servnfs.tpl:49
-msgid "Codepage"
-msgstr "Codepage"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+msgid "OC"
+msgstr "OC"
 
-#: plugins/admin/systems/servnfs.tpl:59
-msgid "Option"
-msgstr "Option"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:346
+msgid "You have to specify a valid name for this device."
+msgstr "Bitte geben Sie einen gültigen Namen für dieses Gerät an."
 
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid "Remove Kolab extension"
-msgstr "Kolab-Erweiterung entfernen"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:366
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:369
+msgid "This device name is already in use."
+msgstr "Der angegebene Gerätename wird bereits verwendet."
 
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid ""
-"This server has kolab features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Dieser Server besitzt aktivierte Kolab-Funtionen. Sie können diese durch "
-"einen Klick auf die Schaltfläche unten deaktivieren."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
+msgid "Other"
+msgstr "Andere"
 
-#: plugins/admin/systems/class_servKolab.inc:118
-msgid "Add Kolab service"
-msgstr "Kolab-Dienst hinzufügen"
+#: plugins/admin/systems/class_servService.inc:272
+msgid "Terminal server, must have fontpath specified."
+msgstr "Terminal-Server benötigt einen Schrift-Suchpfad"
 
-#: plugins/admin/systems/class_servKolab.inc:118
-msgid ""
-"This server has kolab features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Aktuell besitzt dieser Server keine aktivierten Kolab-Funktionen. Sie können "
-"diese durch einen Klick auf die Schaltfläche unten aktivieren."
+#: plugins/admin/systems/servRepositorySetup.tpl:15
+msgid "Parent server"
+msgstr "Parent-Server"
 
-#: plugins/admin/systems/class_servKolab.inc:146
-#, php-format
-msgid "Include data from %s days in the past when creating free/busy lists"
-msgstr ""
-"Berücksichtige %s Tage in der Vergangenheit beim Erstellen von Frei/Belegt-"
-"Listen"
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
+msgstr "Zeit-Dienst"
 
-#: plugins/admin/systems/class_servKolab.inc:152
-#, php-format
-msgid "Warn users when using more than %s%% of their mail quota"
-msgstr "Warne Benutzer, wenn sie mehr als %s%% ihres Mail-Kontigentes benutzen"
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
+msgstr "LDAP-Dienst"
 
-#: plugins/admin/systems/class_servKolab.inc:227
-msgid "Future days in Free/Busy settings must be set."
-msgstr "Intervall für Frei/Belegt-Informationen muß gesetzt sein."
+#: plugins/admin/systems/servservice.tpl:72
+msgid "Terminal Service"
+msgstr "Terminal-Dienst"
 
-#: plugins/admin/systems/class_servKolab.inc:229
-msgid "Future days in Free/Busy settings must be a positive value."
-msgstr "Intervall für Frei/Belegt-Informationen muß ein positiver Wert sein."
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
+msgstr "Anmeldung sperren (temporär)"
 
-#: plugins/admin/systems/class_servKolab.inc:233
-msgid "The given Quota settings value must be a number."
-msgstr "Der angegebene Kontingent-Wert muß numerisch sein."
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
+msgstr "Schrift-Suchpfad"
 
-#: plugins/admin/systems/class_servKolab.inc:235
-msgid "Please choose a value between 1 and 100 for Quota settings."
-msgstr "Bitte wählen Sie einen Kontingent-Wert zwischen 1 und 100."
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
+msgstr "Protokoll-Dienst"
 
-#: plugins/admin/systems/class_servKolab.inc:237
-msgid "Future days must be a value."
-msgstr "Frei/Belegt-Intervall muß einen Wert besitzen."
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
+msgstr "Druck-Dienst"
 
-#: plugins/admin/systems/class_servKolab.inc:241
-msgid "No SMTP privileged networks set."
-msgstr "Es sind keine SMTP-privilegierten Netzwerke vorhanden."
+#: plugins/admin/systems/servservice.tpl:109
+msgid "Mail server"
+msgstr "Mail-Server"
 
-#: plugins/admin/systems/class_printGeneric.inc:177
-#: plugins/admin/systems/class_printGeneric.inc:184
-#: plugins/admin/systems/class_printGeneric.inc:219
-#: plugins/admin/systems/class_printGeneric.inc:240
-#: plugins/admin/systems/class_printGeneric.inc:243
-msgid "Add printer extension"
-msgstr "Drucker-Erweiterung hinzufügen"
+#: plugins/admin/systems/glpi_edit_os.tpl:1
+msgid "Manage OS-types"
+msgstr "Betriebssysteme verwalten"
 
-#: plugins/admin/systems/class_printGeneric.inc:178
-msgid "This is a workstation template, printer tab is disabled."
-msgstr ""
-"Dies ist eine Arbeitsstations-Vorlage, der Drucker-Tab ist deaktiviert."
+#: plugins/admin/systems/printerPPDDialog.tpl:1
+msgid "Printer driver"
+msgstr "Drucker-Treiber"
 
-#: plugins/admin/systems/class_printGeneric.inc:185
-msgid "This is a terminal template, printer tab is disabled."
-msgstr "Dies ist eine Terminal-Vorlage, das Drucker-Tab ist deaktiviert."
+#: plugins/admin/systems/printerPPDDialog.tpl:9
+msgid "New driver"
+msgstr "Neuer Treiber"
 
-#: plugins/admin/systems/class_printGeneric.inc:220
-msgid ""
-"This workstation has printer extension disabled. You can't enable it while "
-"'cn' is not present in entry. Possibly you are currently creating a new "
-"terminal template"
-msgstr ""
-"Aktuell besitzt diese Workstation keine aktivierten Drucker-Erweiterung. Sie "
-"können diese nicht aktivieren, solange das 'cn'-Attribute nicht im Eintrag "
-"enthalten ist. Wahrscheinlich erstellen Sie gerade eine neue Terminal-"
-"Vorlage."
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
+msgstr "Telefon-Name"
 
-#: plugins/admin/systems/class_printGeneric.inc:232
-#: plugins/admin/systems/class_printGeneric.inc:235
-msgid "Remove printer extension"
-msgstr "Drucker-Erweiterung entfernen"
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
+msgid "List of available cartridge type for this type of printer"
+msgstr "Verfügbare Patronentypen für diesen Druckertyp"
 
-#: plugins/admin/systems/class_printGeneric.inc:233
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
 msgid ""
-"This workstation has printer extension enabled.You can disable it by "
-"clicking below."
+"This dialog allows you to create new types of cartridges, and select one or "
+"more types for your printer. Cartridge types depends on the printer type you "
+"have selected. For each selected cartridge type there will be a new "
+"cartridge created, this allows you to select the same cartridge type for "
+"more then one printer."
 msgstr ""
-"Diese Workstation besitzt aktivierte Drucker-Erweiterungen. Sie können diese "
-"durch einen Klick auf die Schaltfläche unten deaktivieren."
+"Dieser Dialog erlaubt es Ihnen, neue Arten von Patronen hinzuzufügen und "
+"einen oder mehrere Typen zu Ihrem Drucker zuzuordnen. Patronentypen sind "
+"abhängig von Ihrem gewählten Druckertyp. Für jeden gewählten Patronentyp "
+"wird eine neue Patrone erstellt. Dies erlaubt es Ihnen, den gleichen "
+"Patronentyp für mehr als einen Drucker zu verwenden."
 
-#: plugins/admin/systems/class_printGeneric.inc:236
-msgid ""
-"This terminal has printer extension enabled. You can disable it by clicking "
-"below."
-msgstr ""
-"Dieses Terminal besitzt aktivierte Drucker-Erweiterungen. Sie können diese "
-"durch einen Klick auf die Schaltfläche unten deaktivieren."
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
+msgid "Display cartridge types matching"
+msgstr "Zeige die Patronentypen, auf die Folgendes passt"
 
-#: plugins/admin/systems/class_printGeneric.inc:241
-msgid ""
-"This workstation has printer extension disabled. You can enable it by "
-"clicking below."
-msgstr ""
-"Aktuell besitzt diese Workstation keine aktivierten Drucker-Erweiterung. Sie "
-"können diese durch einen Klick auf die Schaltfläche unten aktivieren."
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
+msgid "Regular expression for matching cartridge types"
+msgstr "Regulärer Ausdruck zum Erkennen von Patronentypen"
 
-#: plugins/admin/systems/class_printGeneric.inc:244
-msgid ""
-"This terminal has printer extension disabled. You can enable it by clicking "
-"below."
-msgstr ""
-"Aktuell besitzt dieses Terminal keine aktivierten Drucker-Erweiterung. Sie "
-"können diese durch einen Klick auf die Schaltfläche unten aktivieren."
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
+msgid "Reference"
+msgstr "Referenz"
 
-#: plugins/admin/systems/class_printGeneric.inc:283
-msgid "This 'dn' has no printer features."
-msgstr "Dieser 'DN' hat keine Drucker-Erweiterungen."
+#: plugins/admin/systems/class_terminalGeneric.inc:61
+msgid "text"
+msgstr "textuell"
 
-#: plugins/admin/systems/class_printGeneric.inc:419
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr "Die momentan gewählte PPD-Datei '%s' wurde nicht gefunden."
+#: plugins/admin/systems/class_terminalGeneric.inc:62
+msgid "graphic"
+msgstr "grafisch"
 
-#: plugins/admin/systems/class_printGeneric.inc:427
-msgid "can't get ppd informations."
-msgstr "keine PPD-Informationen verfügbar"
+#: plugins/admin/systems/class_terminalGeneric.inc:90
+#: plugins/admin/systems/class_servGeneric.inc:62
+#: plugins/admin/ogroups/class_termgroup.inc:64
+msgid "No WAKECMD definition found in your gosa.conf"
+msgstr "Es ist kein WAKECMD in ihrer gosa.conf definiert"
 
-#: plugins/admin/systems/class_printGeneric.inc:439
-#, php-format
-msgid "This printer belongs to terminal %s. You can't rename this printer."
-msgstr "Dieser Drucker gehört zu Terminal %s. Sie können ihn nicht umbenennen."
+#: plugins/admin/systems/class_terminalGeneric.inc:102
+#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/ogroups/class_termgroup.inc:76
+msgid "No REBOOTCMD definition found in your gosa.conf"
+msgstr "Es ist kein REBOOTCMD in ihrer gosa.conf definiert"
 
-#: plugins/admin/systems/class_printGeneric.inc:441
-#, php-format
-msgid "This printer belongs to workstation %s. You can't rename this printer."
-msgstr ""
-"Dieser Drucker gehört zur Arbeitsstation %s. Ein Umbenennen ist daher nicht "
-"möglich."
+#: plugins/admin/systems/class_terminalGeneric.inc:114
+#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/ogroups/class_termgroup.inc:88
+msgid "No HALTCMD definition found in your gosa.conf"
+msgstr "Es ist kein HALTCMD in ihrer gosa.conf definiert"
 
-#: plugins/admin/systems/class_printGeneric.inc:519
-msgid "You have no permissions to create a printer on this 'Base'."
+#: plugins/admin/systems/class_terminalGeneric.inc:269
+msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr ""
-"Sie haben keine Berechtigung, einen Drucker unterhalb dieser 'Basis' "
+"Sie haben keine Berechtigung, ein Terminal unterhalb dieser 'Basis' "
 "anzulegen."
 
-#: plugins/admin/systems/servkolab.tpl:14
-msgid "POP3 service"
-msgstr "POP3-Dienst"
-
-#: plugins/admin/systems/servkolab.tpl:22
-msgid "POP3/SSL service"
-msgstr "POP3/SSL-Dienst"
-
-#: plugins/admin/systems/servkolab.tpl:30
-msgid "IMAP service"
-msgstr "IMAP-Dienst"
-
-#: plugins/admin/systems/servkolab.tpl:38
-msgid "IMAP/SSL service"
-msgstr "IMAP/SSL-Dienst"
-
-#: plugins/admin/systems/servkolab.tpl:46
-msgid "Sieve service"
-msgstr "Sieve-Dienst"
-
-#: plugins/admin/systems/servkolab.tpl:54
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr "FTP Frei/Belegt-Dienst (alt, inkompatibel mit Kolab 2)"
-
-#: plugins/admin/systems/servkolab.tpl:62
-msgid "HTTP FreeBusy service (legacy)"
-msgstr "HTTP Frei/Belegt-Dienst (alt)"
+#: plugins/admin/systems/class_terminalGeneric.inc:273
+msgid "The required field 'Terminal name' is not set."
+msgstr "Das benötigte Feld 'Terminal-Name' ist nicht gesetzt."
 
-#: plugins/admin/systems/servkolab.tpl:70
-msgid "Amavis email scanning (virus/spam)"
-msgstr "Email scannen (Virus/Spam)"
+#: plugins/admin/systems/remove_glpi.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your MySql database in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Es ist eine gute Idee, vor dieser Aktion eine komplette Sicherung Ihrer "
+"MySQL-Datenbank zu erstellen. Wenn Sie dies erledigt haben, drücken Sie "
+"'Entfernen', um fortzufahren oder 'Abbrechen', um die aktuelle Aktion "
+"abzubrechen."
 
-#: plugins/admin/systems/servkolab.tpl:81
-msgid "Quota settings"
-msgstr "Kontingent-Einstellungen"
+#: plugins/admin/systems/class_servGeneric.inc:52
+msgid "This 'dn' has no server features."
+msgstr "Diese 'dn' hat keine Server-Erweiterungen."
 
-#: plugins/admin/systems/servkolab.tpl:97
-msgid "Free/Busy settings"
-msgstr "Frei/Belegt-Einstellungen"
+#: plugins/admin/systems/class_servGeneric.inc:191
+msgid "The required field 'Server name' is not set."
+msgstr "Das benötigte Feld 'Server-Name' ist nicht gesetzt."
 
-#: plugins/admin/systems/servkolab.tpl:102
-msgid "Allow unauthenticated downloading of Free/Busy information"
+#: plugins/admin/systems/class_servGeneric.inc:198
+msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
-"Erlaube nicht-authentifiziertes Herunterladen von Frei/Belegt-Informationen"
+"Sie haben keine Berechtigung, einen Server unterhalb dieser 'Basis' "
+"anzulegen."
 
-#: plugins/admin/systems/servkolab.tpl:117
-msgid "SMTP privileged networks"
-msgstr "SMTP privilegierte Netzwerke"
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
+msgid "Add/Edit manufacturer"
+msgstr "Hersteller hinzufügen/bearbeiten"
 
-#: plugins/admin/systems/servkolab.tpl:122
-msgid "Hosts/networks allowed to relay"
-msgstr "Rechner/Netzwerke, denen Weiterleitung erlaubt ist"
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
+msgid "Website"
+msgstr "Website"
 
-#: plugins/admin/systems/servkolab.tpl:125
-msgid "Enter multiple values, seperated with"
-msgstr "Eingabe mehrerer Werte, getrennt durch"
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
+#: plugins/admin/ogroups/class_mailogroup.inc:137
+#: plugins/admin/ogroups/class_phonequeue.inc:690
+#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Phone number"
+msgstr "Telefonnummer"
 
-#: plugins/admin/systems/servkolab.tpl:138
-msgid "SMTP smarthost/relayhost"
-msgstr "SMTP smarthost/relayhost"
+#: plugins/admin/systems/class_servDHCP.inc:36
+msgid "Remove DHCP service"
+msgstr "DHCP-Dienst entfernen"
 
-#: plugins/admin/systems/servkolab.tpl:144
-msgid "Enable MX lookup for relayhost"
-msgstr "Aktiviere MX lookup für relayhost"
+#: plugins/admin/systems/class_servDHCP.inc:37
+msgid ""
+"This server has DHCP features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Dieser Server besitzt aktivierte DHCP-Funktionen. Sie können diese durch "
+"einen Klick auf die untere Schaltfläche deaktivieren."
 
-#: plugins/admin/systems/servkolab.tpl:149
-msgid "Host used to relay mails"
-msgstr "Host für Mail Relay"
+#: plugins/admin/systems/class_servDHCP.inc:39
+msgid "Add DHCP service"
+msgstr "DHCP Dienst hinzufügen"
 
-#: plugins/admin/systems/servkolab.tpl:163
-msgid "Accept Internet Mail"
-msgstr "Akzeptiere Internet-Mail"
+#: plugins/admin/systems/class_servDHCP.inc:40
+msgid ""
+"This server has DHCP features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Aktuell besitzt dieser Server keine aktivierten DHCP-Funktionen. Sie können "
+"diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/admin/systems/servkolab.tpl:169
-msgid "Accept mail from other domains over non-authenticated SMTP"
-msgstr "Akzeptiere Mails von anderen Domänen über nicht-authentifiziertes SMTP"
+#: plugins/admin/systems/class_systemManagement.inc:32
+msgid "Systems"
+msgstr "Systeme"
 
-#: plugins/admin/systems/phonesettings.tpl:1
-msgid "Advanced phone settings"
-msgstr "Erweiterte Telefon-Einstellungen"
+#: plugins/admin/systems/class_systemManagement.inc:429
+msgid "You can't edit this object type yet!"
+msgstr "Dieser Objekt-Typ kann momentan noch nicht bearbeitet werden!"
 
-#: plugins/admin/systems/phonesettings.tpl:6
-msgid "Phone type"
-msgstr "Telefon-Modell"
+#: plugins/admin/systems/class_systemManagement.inc:455
+msgid "Passwords entered as new and repeated do not match!"
+msgstr ""
+"Die Passworte, die Sie als 'Neues Passwort' und 'Wiederholung des neuen "
+"Passwort' eingegeben haben sind nicht identisch!"
 
-#: plugins/admin/systems/phonesettings.tpl:7
-#: plugins/admin/systems/phonesettings.tpl:25
-#: plugins/admin/systems/phonesettings.tpl:35
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:78
-#: plugins/admin/systems/phonesettings.tpl:109
-#: plugins/admin/systems/phonesettings.tpl:156
-msgid "Choose a phone type"
-msgstr "Wählen Sie das Telefon-Modell"
+#: plugins/admin/systems/class_systemManagement.inc:472
+msgid "You are not allowed to set this systems password!"
+msgstr "Sie haben keine Berechtigung, das Passwort für dieses Systems zu setzen!"
 
-#: plugins/admin/systems/phonesettings.tpl:10
-msgid "refresh"
-msgstr "Aktualisieren"
+#: plugins/admin/systems/class_systemManagement.inc:526
+#, php-format
+msgid "You're about to delete all information about the component at '%s'."
+msgstr "Sie sind dabei, alle Informationen über die Komponente auf '%s' zu löschen."
 
-#: plugins/admin/systems/phonesettings.tpl:32
-msgid "DTMF mode"
-msgstr "DTMF-Modus"
+#: plugins/admin/systems/class_systemManagement.inc:761
+msgid "New Terminal template"
+msgstr "Neue Terminal-Vorlage"
 
-#: plugins/admin/systems/phonesettings.tpl:46
-#: plugins/admin/systems/phonesettings.tpl:85
-msgid "Default IP"
-msgstr "Standard IP-Adresse"
+#: plugins/admin/systems/class_systemManagement.inc:761
+#: plugins/admin/systems/class_systemManagement.inc:925
+msgid "New Terminal"
+msgstr "Neues Terminal"
 
-#: plugins/admin/systems/phonesettings.tpl:56
-#: plugins/admin/systems/phonesettings.tpl:93
-msgid "Response timeout"
-msgstr "Wartezeit bis Antwort"
+#: plugins/admin/systems/class_systemManagement.inc:763
+msgid "New Workstation template"
+msgstr "Neue Vorlage für Arbeitsstation"
 
-#: plugins/admin/systems/phonesettings.tpl:75
-msgid "Modus"
-msgstr "Modus"
+#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/systems/class_systemManagement.inc:926
+msgid "New Workstation"
+msgstr "Neue Arbeitsstation"
 
-#: plugins/admin/systems/phonesettings.tpl:106
-msgid "Authtype"
-msgstr "Authentifizierung"
+#: plugins/admin/systems/class_systemManagement.inc:764
+#: plugins/admin/systems/class_systemManagement.inc:765
+msgid "New Server"
+msgstr "Neuer Server"
 
-#: plugins/admin/systems/phonesettings.tpl:116
-msgid "Secret"
-msgstr "Passwort"
+#: plugins/admin/systems/class_systemManagement.inc:766
+#: plugins/admin/systems/class_systemManagement.inc:767
+msgid "New Printer"
+msgstr "Neuer Drucker"
 
-#: plugins/admin/systems/phonesettings.tpl:124
-msgid "GoFonInkeys"
-msgstr "GOFon-Schlüssel (eingehend)"
+#: plugins/admin/systems/class_systemManagement.inc:768
+#: plugins/admin/systems/class_systemManagement.inc:769
+msgid "New Phone"
+msgstr "Neues Telefon"
 
-#: plugins/admin/systems/phonesettings.tpl:132
-msgid "GoFonOutKeys"
-msgstr "GOFon-Schlüssel (ausgehend)"
+#: plugins/admin/systems/class_systemManagement.inc:770
+#: plugins/admin/systems/class_systemManagement.inc:771
+msgid "New Component"
+msgstr "Neue Netzwerk-Komponente"
 
-#: plugins/admin/systems/phonesettings.tpl:145
-msgid "Account code"
-msgstr "Konto-Identifikation"
+#: plugins/admin/systems/class_systemManagement.inc:781
+msgid "Edit system"
+msgstr "System bearbeiten"
 
-#: plugins/admin/systems/phonesettings.tpl:153
-msgid "Trunk lines"
-msgstr "Leitungen zusammenfassen"
+#: plugins/admin/systems/class_systemManagement.inc:782
+msgid "Delete system"
+msgstr "Entferne System"
 
-#: plugins/admin/systems/phonesettings.tpl:168
-msgid "Hosts that are allowed to connect"
-msgstr "Erlaube diesen Rechnern die Verbindung"
+#: plugins/admin/systems/class_systemManagement.inc:792
+msgid "System"
+msgstr "Systeme"
 
-#: plugins/admin/systems/phonesettings.tpl:183
-msgid "Hosts that are not allowed to connect"
-msgstr "Verbiete diesen Rechnern die Verbindung"
+#: plugins/admin/systems/class_systemManagement.inc:830
+msgid "Cups Server"
+msgstr "CUPS-Server"
 
-#: plugins/admin/systems/phonesettings.tpl:205
-msgid "MSN"
-msgstr "MSN"
+#: plugins/admin/systems/class_systemManagement.inc:831
+msgid "Log Db"
+msgstr "Log-DB"
 
-#: plugins/admin/systems/wingeneric.tpl:6
-msgid "Machine name"
-msgstr "Name des Systems"
+#: plugins/admin/systems/class_systemManagement.inc:832
+msgid "Syslog Server"
+msgstr "Syslog-Server"
 
-#: plugins/admin/systems/terminalService.tpl:141
-msgid "Remote desktop"
-msgstr "Entfernte Arbeitsfläche"
+#: plugins/admin/systems/class_systemManagement.inc:833
+msgid "Mail Server"
+msgstr "Mail-Server"
 
-#: plugins/admin/systems/terminalService.tpl:145
-msgid "Connect method"
-msgstr "Verbindungsmethode"
+#: plugins/admin/systems/class_systemManagement.inc:834
+msgid "Imap Server"
+msgstr "IMAP-Server"
 
-#: plugins/admin/systems/terminalService.tpl:147
-msgid "Choose method to connect to terminal server"
-msgstr "Wählen Sie die Methode der Anbindung an den Terminal-Server"
+#: plugins/admin/systems/class_systemManagement.inc:835
+msgid "Nfs Server"
+msgstr "NFS-Server"
 
-#: plugins/admin/systems/terminalService.tpl:154
-msgid "Terminal server"
-msgstr "Terminal-Server"
+#: plugins/admin/systems/class_systemManagement.inc:836
+msgid "Kerberos Server"
+msgstr "Kerberos-Server"
 
-#: plugins/admin/systems/terminalService.tpl:156
-msgid "Select specific terminal server to use"
-msgstr "Wählen Sie einen bestimmten Terminal-Server"
+#: plugins/admin/systems/class_systemManagement.inc:837
+msgid "Asterisk Server"
+msgstr "Asterisk-Server"
 
-#: plugins/admin/systems/terminalService.tpl:163
-msgid "Font server"
-msgstr "Schriften-Server"
+#: plugins/admin/systems/class_systemManagement.inc:838
+msgid "Fax Server"
+msgstr "Fax-Server"
 
-#: plugins/admin/systems/terminalService.tpl:165
-msgid "Select specific font server to use"
-msgstr "Wählen Sie einen bestimmten Schriften-Server"
+#: plugins/admin/systems/class_systemManagement.inc:839
+msgid "Ldap Server"
+msgstr "LDAP-Server"
+
+#: plugins/admin/systems/class_systemManagement.inc:872
+msgid "Set root password"
+msgstr "root-Passwort setzen"
 
-#: plugins/admin/systems/terminalService.tpl:181
-msgid "Print device"
-msgstr "Drucker"
+#: plugins/admin/systems/class_systemManagement.inc:917
+msgid "New System from incoming"
+msgstr "Neu erkanntes Gerät"
 
-#: plugins/admin/systems/terminalService.tpl:182
-msgid "Select to start IPP based printing service on terminal"
-msgstr "Auswählen, um auf dem Terminal IPP-basierte Druckdienste zu starten"
+#: plugins/admin/systems/class_systemManagement.inc:919
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:590
+msgid "Terminal"
+msgstr "Terminal"
 
-#: plugins/admin/systems/terminalService.tpl:183
-msgid "Provide print services"
-msgstr "Druckdienste bereitstellen"
+#: plugins/admin/systems/class_systemManagement.inc:920
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:589
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr "Arbeitsstation"
 
-#: plugins/admin/systems/terminalService.tpl:189
-msgid "Spool server"
-msgstr "Spool-Server"
+#: plugins/admin/systems/class_systemManagement.inc:923
+msgid "Winstation"
+msgstr "Windows-Workstation"
 
-#: plugins/admin/systems/terminalService.tpl:191
-msgid "Select NFS filesystem to place spool files on"
-msgstr ""
-"Wählen Sie das NFS-Dateisystem, in dem die Spool-Dateien abgelegt werden"
+#: plugins/admin/systems/class_systemManagement.inc:924
+msgid "Network Device"
+msgstr "Netzwerk-Gerät"
 
-#: plugins/admin/systems/terminalService.tpl:212
-msgid "Select scanner driver to use"
-msgstr "Wählen Sie den Scanner-Treiber, der benutzt werden soll"
+#: plugins/admin/systems/class_systemManagement.inc:1147
+msgid "New terminal"
+msgstr "Neues Terminal"
 
-#: plugins/admin/systems/remove.tpl:6
-msgid ""
-"This includes <b>all</b> system and setup informations. Please double check "
-"if your really want to do this since there is no way for GOsa to get your "
-"data back."
-msgstr ""
-"Dies umfasst <b>alle</b> System- und Setup-Informationen Bitte prüfen Sie "
-"genau, da es keine Möglichkeit für GOsa gibt, die Daten zu restaurieren. "
+#: plugins/admin/systems/class_systemManagement.inc:1149
+msgid "New workstation"
+msgstr "Neue Arbeitsstation"
 
-#: plugins/admin/systems/headpage.tpl:6
-msgid "List of systems"
-msgstr "Liste der Systeme"
+#: plugins/admin/systems/class_systemManagement.inc:1151
+msgid "New Device"
+msgstr "Neues Gerät"
 
-#: plugins/admin/systems/headpage.tpl:24
-msgid ""
-"This menu allows you to add, remove and change the properties of specific "
-"systems. You can only add systems which have already been started once."
-msgstr ""
-"Mit diesem Menü können Sie Systeme hinzufügen, diese löschen oder die "
-"Eigenschaften bestimmter Systeme verändern. Sie können nur Systeme "
-"hinzufügen, die bereits einmal im Netz gestartet wurden."
+#: plugins/admin/systems/class_systemManagement.inc:1168
+msgid "Terminal template for"
+msgstr "Terminal-Vorlage für"
 
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
-msgstr "Zeige Server"
+#: plugins/admin/systems/class_systemManagement.inc:1180
+msgid "Workstation template for"
+msgstr "Arbeitsstations-Vorlage für"
 
-#: plugins/admin/systems/headpage.tpl:39
-msgid "Select to see Linux terminals"
-msgstr "Wählen, um Linux-Terminals zu sehen"
+#: plugins/admin/systems/class_servRepositorySetup.inc:117
+msgid "Please enter a value for 'release'."
+msgstr "Bitte geben Sie einen Wert für 'Release' ein."
 
-#: plugins/admin/systems/headpage.tpl:39
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
-msgstr "Zeige Terminals"
+#: plugins/admin/systems/class_servRepositorySetup.inc:121
+msgid "Please specify a valid value for 'url'."
+msgstr "Bitte geben Sie im Feld 'url' einen gültigen Wert ein."
 
-#: plugins/admin/systems/headpage.tpl:40
-msgid "Select to see Linux workstations"
-msgstr "Wählen, um Linux-Arbeitsstationen zu sehen"
+#: plugins/admin/systems/printer.tpl:6
+msgid "General"
+msgstr "Allgemein"
 
-#: plugins/admin/systems/headpage.tpl:40
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
-msgstr "Zeige Arbeitsstationen"
+#: plugins/admin/systems/printer.tpl:9
+msgid "Printer name"
+msgstr "Druckername"
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Select to see MicroSoft Windows based workstations"
-msgstr "Auswählen, um Microsoft Windows Arbeitsstationen zu sehen"
+#: plugins/admin/systems/printer.tpl:31
+msgid "Details"
+msgstr "Details"
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Show windows based workstations"
-msgstr "Zeige Windows basierte Arbeitsstationen"
+#: plugins/admin/systems/printer.tpl:34
+msgid "Printer location"
+msgstr "Drucker-Standort"
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Select to see network printers"
-msgstr "Wählen, um die 'Netzwerk-Drucker' zu sehen"
+#: plugins/admin/systems/printer.tpl:38
+msgid "Printer URL"
+msgstr "Drucker URL"
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Show network printers"
-msgstr "Zeige Netzwerk-Drucker"
+#: plugins/admin/systems/printer.tpl:58
+msgid "Permissions"
+msgstr "Berechtigungen"
 
-#: plugins/admin/systems/headpage.tpl:43
-msgid "Select to see VOIP phones"
-msgstr "Wählen, um 'VoIP-Telefone' zu sehen"
+#: plugins/admin/systems/printer.tpl:65
+msgid "Users which are allowed to use this printer"
+msgstr "Benutzer mit Berechtigung, diesen Drucker zu nutzen"
 
-#: plugins/admin/systems/headpage.tpl:43
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
-msgstr "Zeige Telefone"
+#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
+msgid "Add user"
+msgstr "Benutzer hinzufügen"
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Select to see network devices"
-msgstr "Wählen, um Netzwerk-Geräte zu sehen"
+#: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
+msgid "Add group"
+msgstr "Gruppe hinzufügen"
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Show network devices"
-msgstr "Zeige Netzwerk-Geräte"
+#: plugins/admin/systems/printer.tpl:81
+msgid "Users which are allowed to administrate this printer"
+msgstr "Benutzer mit Berechtigung, diesen Drucker zu verwalten"
 
-#: plugins/admin/systems/headpage.tpl:52
-msgid "Regular expression for matching system names"
-msgstr "Regulärer Ausdruck für System-Namen"
+#: plugins/admin/systems/printer.tpl:82
+msgid "Admins"
+msgstr "Administratoren"
 
-#: plugins/admin/systems/headpage.tpl:59
-msgid "Display systems of user"
-msgstr "Zeige Systeme des Benutzers"
+#: plugins/admin/systems/class_servDNS.inc:181
+#: plugins/admin/systems/class_inventory.inc:36
+msgid "Remove DNS service"
+msgstr "DNS-Dienst entfernen"
 
-#: plugins/admin/systems/headpage.tpl:62
-msgid "User name of which terminal(s) are shown"
-msgstr "Benutzername, dessen Terminal(s) gezeigt werden"
+#: plugins/admin/systems/class_servDNS.inc:182
+#: plugins/admin/systems/class_inventory.inc:37
+msgid "This server has DNS features enabled. You can disable them by clicking below."
+msgstr ""
+"Dieser Server besitzt aktivierte DNS-Funktionen. Sie können diese durch "
+"einen Klick auf die untere Schaltfläche deaktivieren."
 
-#: plugins/admin/systems/class_componentGeneric.inc:138
-msgid "The required field 'Component name' is not set."
-msgstr "Das benötigte Feld 'Gerätename' ist nicht gesetzt."
+#: plugins/admin/systems/class_servDNS.inc:184
+#: plugins/admin/systems/class_inventory.inc:39
+msgid "Add DNS service"
+msgstr "DNS-Dienst hinzufügen"
 
-#: plugins/admin/systems/terminalStartup.tpl:35
-msgid "Select if terminal supports graphical startup with progress bar"
+#: plugins/admin/systems/class_servDNS.inc:185
+#: plugins/admin/systems/class_inventory.inc:40
+msgid "This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
-"Wählen, wenn das Terminal den grafischen Startvorgang mit Fortschrittsbalken "
-"unterstützt"
+"Aktuell besitzt dieser Server keine aktivierten DNS-Funktionen. Sie können "
+"diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/admin/systems/terminalStartup.tpl:36
-msgid "use graphical bootup"
-msgstr "grafisches Booten nutzen"
+#: plugins/admin/systems/class_servDNS.inc:270
+#, php-format
+msgid ""
+"Can't delete the selected zone, because it is still in use by these entry/"
+"entries '%s'"
+msgstr ""
+"Sie können die gewählte Zone nicht entfernen, sie wird noch von folgendem(n) "
+"Eintrag / Einträgen verwendet: '%s'"
 
-#: plugins/admin/systems/terminalStartup.tpl:38
-msgid "Select if terminal should boot in text mode"
-msgstr "Wählen, wenn das Terminal im Textmodus starten soll"
+#: plugins/admin/systems/class_servDNS.inc:297
+msgid "Reverse zone"
+msgstr "Reverse Zone"
 
-#: plugins/admin/systems/terminalStartup.tpl:39
-msgid "use standard linux textual bootup"
-msgstr "Standard Textmodus nutzen"
+#: plugins/admin/systems/class_servDNSeditZone.inc:336
+msgid "This zoneName is already in use"
+msgstr "Der angegebene Zonen-Name wird bereits verwendet."
 
-#: plugins/admin/systems/terminalStartup.tpl:41
-msgid "Select to get more verbose output during startup"
-msgstr "Wählen, um ausführlichere Informationen während des Starts zu erhalten"
+#: plugins/admin/systems/class_servDNSeditZone.inc:339
+msgid "This reverse zone is already in use"
+msgstr "Die reverse-Zone wird bereits verwendet."
 
-#: plugins/admin/systems/terminalStartup.tpl:42
-msgid "use debug mode for startup"
-msgstr "benutze Fehlersuch-Modus"
+#: plugins/admin/systems/class_servDNSeditZone.inc:344
+msgid "Primary dns server must end with '.' to be a valid entry."
+msgstr "Der Primäre DNS-Server muss mit '.' enden, um ein gültiger Eintrag zu sein."
 
-#: plugins/admin/systems/password.tpl:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you "
-"wouldn't be able to log in."
+#: plugins/admin/systems/class_servDNSeditZone.inc:348
+msgid "Your specified mail address must end with '.' to be a valid record."
 msgstr ""
-"Um das root-Passwort des Terminals zu ändern, nutzen Sie die Felder unten. "
-"Die Änderungen werden beim nächsten Neustart wirksam. Merken Sie sich das "
-"Passwort, da eine Anmeldung ohne dieses Passwort nicht möglich ist."
+"Die angegebene Email-Adresse muss mit '.' enden, um ein gültiger Eintrag zu "
+"sein."
 
-#: plugins/admin/systems/password.tpl:5
-msgid "Leave fields blank for password inheritance from default entries."
+#: plugins/admin/systems/class_servDNSeditZone.inc:352
+#: plugins/admin/systems/class_servDNSeditZone.inc:356
+msgid ""
+"Your mail address contains '@' replace this with '.' to enable GOsa to "
+"create a valid SOA record."
 msgstr ""
-"Lassen Sie die Felder leer, um das Passwort aus den Standard-Einträgen zu "
-"übernehmen."
+"Ihre Email-Adresse enthält '@'. Bitte ersetzen Sie dieses Zeichen durch '.', "
+"um einen gültigen SOA-Eintrag zu erzeugen."
 
-#: plugins/admin/systems/password.tpl:9
-msgid "Changing the password impinges on authentification only."
-msgstr ""
-"Das Ändern des Passwortes wirkt sich nur auf die Authentifizierung aus."
+#: plugins/admin/systems/class_servDNSeditZone.inc:360
+msgid "Only lowercase strings are allowed as zone name."
+msgstr "Für den Zonennamen sind nur Kleinbuchstaben zugelassen."
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
-msgid "Printer ppd selection."
-msgstr "Auswahl der Drucker-PPD"
+#: plugins/admin/systems/class_servDNSeditZone.inc:364
+msgid "Please specify a numeric value for serial number."
+msgstr "Bitte geben Sie im Feld 'Seriennummer' einen numerischen Wert ein."
 
-#: plugins/admin/systems/servRepositorySetup.tpl:15
-msgid "Parent server"
-msgstr "Parent-Server"
+#: plugins/admin/systems/class_servDNSeditZone.inc:368
+msgid "Please specify a numeric value for refresh."
+msgstr "Bitte geben Sie im Feld 'Aktualisieren' einen numerischen Wert ein."
 
-#: plugins/admin/systems/servRepositorySetup.tpl:33
-#: plugins/admin/systems/class_servRepository.inc:243
-#: plugins/admin/systems/class_servRepository.inc:264
-msgid "Sections"
-msgstr "Sections"
+#: plugins/admin/systems/class_servDNSeditZone.inc:372
+msgid "Please specify a numeric value for ttl."
+msgstr "Bitte geben Sie im Feld 'TTL' einen numerischen Wert ein."
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:117
-msgid "Please enter a value for 'release'."
-msgstr "Bitte geben Sie einen Wert für 'Release' ein."
+#: plugins/admin/systems/class_servDNSeditZone.inc:376
+msgid "Please specify a numeric value for expire."
+msgstr "Bitte geben Sie im Feld 'Ablauf' einen numerischen Wert ein."
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:121
-msgid "Please specify a valid value for 'url'."
-msgstr "Bitte geben Sie im Feld 'url' einen gültigen Wert ein."
+#: plugins/admin/systems/class_servDNSeditZone.inc:380
+msgid "Please specify a numeric value for retry."
+msgstr "Bitte geben Sie im Feld 'Wiederholen' einen numerischen Wert ein."
 
-#: plugins/admin/systems/servRepository.tpl:6
-msgid "List of configured repositories."
-msgstr "Liste der verfügbaren Repositories."
+#: plugins/admin/systems/servdb.tpl:6
+msgid "Kerberos kadmin access"
+msgstr "Kerberos-Zugang via kadmin"
 
-#: plugins/admin/systems/servRepository.tpl:11
-msgid "Add repository"
-msgstr "Repository hinzufügen"
+#: plugins/admin/systems/servdb.tpl:10
+msgid "Kerberos Realm"
+msgstr "Kerberos Realm"
 
-#: plugins/admin/systems/servRepository.tpl:29
-msgid "This menu allows you to create, delete and edit repository settings."
-msgstr ""
-"Dieses Menü erlaubt es Ihnen, Repository-Einstellungen zu erstellen, zu "
-"entfernen und zu bearbeiten."
+#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
+msgid "Admin user"
+msgstr "Administrator"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
-msgid ""
-"This server has inventory features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Dieser Server besitzt aktivierte Inventar-Funtionen. Sie können diese durch "
-"einen Klick auf die Schaltfläche unten deaktivieren."
+#: plugins/admin/systems/servdb.tpl:26
+msgid "FAX database"
+msgstr "Fax-Datenbank"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
-msgid ""
-"This server has inventory features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Aktuell besitzt dieser Server keine aktivierten Inventar-Funktionen. Sie "
-"können diese durch einen Klick auf die Schaltfläche unten aktivieren."
+#: plugins/admin/systems/servdb.tpl:30
+msgid "FAX DB user"
+msgstr "Fax-DB Benutzer"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
-#, php-format
-msgid ""
-"Can't rename given printer type to '%s', because this type name already "
-"exists."
-msgstr ""
-"Kann Druckertyp nicht in '%s' umbenennen - der angegebene Name wird bereits "
-"verwendet."
+#: plugins/admin/systems/servdb.tpl:42
+msgid "Asterisk management"
+msgstr "Asterisk Verwaltung"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
-#, php-format
-msgid "Can't delete printer type, it is still in use by '%s'."
-msgstr ""
-"Sie können diesen Druckertyp nicht entfernen, er wird noch von '%s' "
-"verwendet."
+#: plugins/admin/systems/servdb.tpl:46
+msgid "Asterisk DB user"
+msgstr "Asterisk-DB Benutzer"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:750
-msgid "since"
-msgstr "seit"
+#: plugins/admin/systems/servdb.tpl:54
+msgid "Country dial prefix"
+msgstr "Landesvorwahl"
 
-#: plugins/admin/systems/glpi_edit_type.tpl:1
-msgid "Manage System-types"
-msgstr "System-Typen verwalten"
+#: plugins/admin/systems/servdb.tpl:58
+msgid "Local dial prefix"
+msgstr "Ortsvorwahl"
 
-#: plugins/admin/systems/glpi_edit_type.tpl:9
-#: plugins/admin/systems/glpi_edit_type.tpl:28
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
-#: plugins/admin/systems/glpi_edit_os.tpl:9
-#: plugins/admin/systems/glpi_edit_os.tpl:28
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:8
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:29
-msgid "Rename"
-msgstr "Umbenennen"
+#: plugins/admin/systems/servdb.tpl:70
+msgid "IMAP admin access"
+msgstr "IMAP-Administrationszugang"
 
-#: plugins/admin/systems/glpi_edit_type.tpl:24
-#: plugins/admin/systems/glpi_edit_os.tpl:24
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:25
-msgid "Please enter a new name"
-msgstr "Bitte geben Sie einen neuen Namen ein"
+#: plugins/admin/systems/servdb.tpl:74
+msgid "Server identifier"
+msgstr "Serverbezeichnung"
 
-#: plugins/admin/systems/remove_glpi.tpl:10
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your MySql database in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Es ist eine gute Idee, vor dieser Aktion eine komplette Sicherung Ihrer "
-"MySQL-Datenbank zu erstellen. Wenn Sie dies erledigt haben, drücken Sie "
-"'Entfernen', um fortzufahren oder 'Abbrechen', um die aktuelle Aktion "
-"abzubrechen."
+#: plugins/admin/systems/servdb.tpl:78
+msgid "Connect URL"
+msgstr "Verbindungs-URL"
 
-#: plugins/admin/systems/glpiManufacturer.tpl:1
-msgid "Manage manufacturers"
-msgstr "Hersteller verwalten"
+#: plugins/admin/systems/servdb.tpl:91
+msgid "Sieve port"
+msgstr "Sieve-Port"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
-msgid "Reference"
-msgstr "Referenz"
+#: plugins/admin/systems/servdb.tpl:100
+msgid "Logging database"
+msgstr "Protokoll-Datenbank"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
-#: plugins/admin/systems/glpi_devices.tpl:17
-msgid "Comments"
-msgstr "Kommentare"
+#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
+msgid "Logging DB user"
+msgstr "Protokoll-DB Benutzer"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
-#: plugins/admin/systems/glpi.tpl:63
-#: plugins/admin/systems/glpi_devices.tpl:112
-#: plugins/admin/systems/glpi_devices.tpl:153
-#: plugins/admin/systems/glpi_devices.tpl:208
-#: plugins/admin/systems/glpi_devices.tpl:264
-#: plugins/admin/systems/glpi_devices.tpl:322
-#: plugins/admin/systems/glpi_devices.tpl:386
-#: plugins/admin/systems/glpi_devices.tpl:458
-#: plugins/admin/systems/glpi_devices.tpl:522
-#: plugins/admin/systems/glpi_devices.tpl:569
-#: plugins/admin/systems/glpi_devices.tpl:622
-#: plugins/admin/systems/glpi_devices.tpl:676
-#: plugins/admin/systems/glpi_devices.tpl:722
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
-msgid "Comment"
-msgstr "Kommentar"
+#: plugins/admin/systems/servdb.tpl:119
+msgid "Glpi database"
+msgstr "Glpi-Datenbank"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
-#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
-#: plugins/admin/systems/glpi_devices.tpl:24
-#: plugins/admin/systems/glpi_devices.tpl:123
-#: plugins/admin/systems/glpi_devices.tpl:164
-#: plugins/admin/systems/glpi_devices.tpl:219
-#: plugins/admin/systems/glpi_devices.tpl:275
-#: plugins/admin/systems/glpi_devices.tpl:333
-#: plugins/admin/systems/glpi_devices.tpl:397
-#: plugins/admin/systems/glpi_devices.tpl:469
-#: plugins/admin/systems/glpi_devices.tpl:533
-#: plugins/admin/systems/glpi_devices.tpl:580
-#: plugins/admin/systems/glpi_devices.tpl:633
-#: plugins/admin/systems/glpi_devices.tpl:687
-#: plugins/admin/systems/glpi_devices.tpl:733
-msgid "Manufacturer"
-msgstr "Hersteller"
+#: plugins/admin/systems/servdb.tpl:133
+msgid "Database"
+msgstr "Datenbank"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
-#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
-msgid "Technical responsible"
-msgstr "Technischer Kontakt"
+#: plugins/admin/systems/class_printGeneric.inc:177
+#: plugins/admin/systems/class_printGeneric.inc:184
+#: plugins/admin/systems/class_printGeneric.inc:219
+#: plugins/admin/systems/class_printGeneric.inc:240
+#: plugins/admin/systems/class_printGeneric.inc:243
+msgid "Add printer extension"
+msgstr "Drucker-Erweiterung hinzufügen"
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:140
-msgid "use"
-msgstr "verwenden"
+#: plugins/admin/systems/class_printGeneric.inc:178
+msgid "This is a workstation template, printer tab is disabled."
+msgstr "Dies ist eine Arbeitsstations-Vorlage, der Drucker-Tab ist deaktiviert."
 
-#: plugins/admin/systems/glpiSelectUser.tpl:23
+#: plugins/admin/systems/class_printGeneric.inc:185
+msgid "This is a terminal template, printer tab is disabled."
+msgstr "Dies ist eine Terminal-Vorlage, das Drucker-Tab ist deaktiviert."
+
+#: plugins/admin/systems/class_printGeneric.inc:220
 msgid ""
-"This dialog allows you to select a user as technical responsible person."
+"This workstation has printer extension disabled. You can't enable it while "
+"'cn' is not present in entry. Possibly you are currently creating a new "
+"terminal template"
 msgstr ""
-"Dieser Dialog erlaubt es Ihnen, einen Benutzer als technische Kontaktperson "
-"zu wählen."
+"Aktuell besitzt diese Workstation keine aktivierten Drucker-Erweiterung. Sie "
+"können diese nicht aktivieren, solange das 'cn'-Attribute nicht im Eintrag "
+"enthalten ist. Wahrscheinlich erstellen Sie gerade eine neue Terminal-"
+"Vorlage."
 
-#: plugins/admin/systems/glpi_edit_os.tpl:1
-msgid "Manage OS-types"
-msgstr "Betriebssysteme verwalten"
+#: plugins/admin/systems/class_printGeneric.inc:232
+#: plugins/admin/systems/class_printGeneric.inc:235
+msgid "Remove printer extension"
+msgstr "Drucker-Erweiterung entfernen"
 
-#: plugins/admin/systems/class_termDNS.inc:313
-msgid "The required field 'IP-address' is not set."
-msgstr "Das benötigte Feld 'IP-Adresse' ist nicht gesetzt."
+#: plugins/admin/systems/class_printGeneric.inc:233
+msgid ""
+"This workstation has printer extension enabled.You can disable it by "
+"clicking below."
+msgstr ""
+"Diese Workstation besitzt aktivierte Drucker-Erweiterungen. Sie können diese "
+"durch einen Klick auf die Schaltfläche unten deaktivieren."
 
-#: plugins/admin/systems/class_termDNS.inc:319
-msgid "Wrong IP format in field IP-address."
-msgstr "Ungültige IP-Adresse in Feld IP-Adresse"
+#: plugins/admin/systems/class_printGeneric.inc:236
+msgid ""
+"This terminal has printer extension enabled. You can disable it by clicking "
+"below."
+msgstr ""
+"Dieses Terminal besitzt aktivierte Drucker-Erweiterungen. Sie können diese "
+"durch einen Klick auf die Schaltfläche unten deaktivieren."
 
-#: plugins/admin/systems/class_termDNS.inc:325
-msgid "The required field 'MAC-address' is not set."
-msgstr "Das benötigte Feld 'MAC-Adresse' ist nicht gesetzt."
+#: plugins/admin/systems/class_printGeneric.inc:241
+msgid ""
+"This workstation has printer extension disabled. You can enable it by "
+"clicking below."
+msgstr ""
+"Aktuell besitzt diese Workstation keine aktivierten Drucker-Erweiterung. Sie "
+"können diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/admin/systems/class_termDNS.inc:331
+#: plugins/admin/systems/class_printGeneric.inc:244
 msgid ""
-"The given macaddress is invalid. There must be 6 1byte segments seperated by "
-"':'."
+"This terminal has printer extension disabled. You can enable it by clicking "
+"below."
 msgstr ""
-"Die angebene MAC-Adresse ist nicht korrekt. Es müssen sechs 1-Byte Segmente "
-"angegeben werden (getrennt durch ':')."
+"Aktuell besitzt dieses Terminal keine aktivierten Drucker-Erweiterung. Sie "
+"können diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/admin/systems/class_termDNS.inc:346
+#: plugins/admin/systems/class_printGeneric.inc:283
+msgid "This 'dn' has no printer features."
+msgstr "Dieser 'DN' hat keine Drucker-Erweiterungen."
+
+#: plugins/admin/systems/class_printGeneric.inc:419
 #, php-format
-msgid "Found duplicate value for record type '%s'."
-msgstr "Es wurde ein doppelter Wert für Eintrag-Typ '%s' gefunden."
+msgid "Your currently selected PPD file '%s' doesn't exist."
+msgstr "Die momentan gewählte PPD-Datei '%s' wurde nicht gefunden."
 
-#: plugins/admin/systems/class_termDNS.inc:352
+#: plugins/admin/systems/class_printGeneric.inc:427
+msgid "can't get ppd informations."
+msgstr "keine PPD-Informationen verfügbar"
+
+#: plugins/admin/systems/class_printGeneric.inc:439
 #, php-format
-msgid "Found more than one entry for the uniqe record type '%s'."
-msgstr ""
-"Es wurde mehr als ein Eintrag für den eindeutigen Eintrags-Typ '%s' gefunden."
+msgid "This printer belongs to terminal %s. You can't rename this printer."
+msgstr "Dieser Drucker gehört zu Terminal %s. Sie können ihn nicht umbenennen."
 
-#: plugins/admin/systems/class_termDNS.inc:360
+#: plugins/admin/systems/class_printGeneric.inc:441
 #, php-format
-msgid ""
-"The device IP '%s' is added as 'A Record', this will be done automatically, "
-"please remove the record."
+msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
-"Das Gerät mit der-IP-Adresse '%s' erhält automatisch einen 'A'-Eintrag. "
-"Bitte entfernen Sie den Eintrag."
+"Dieser Drucker gehört zur Arbeitsstation %s. Ein Umbenennen ist daher nicht "
+"möglich."
 
-#: plugins/admin/systems/class_termDNS.inc:366
-#: plugins/admin/systems/class_servDNSeditZone.inc:386
-#, php-format
-msgid "Only lowercase is allowed, please check your '%ss'."
-msgstr "Es sind nur Kleinbuchstaben erlaubt, bitte prüfen Sie '%ss'."
+#: plugins/admin/systems/class_printGeneric.inc:519
+msgid "You have no permissions to create a printer on this 'Base'."
+msgstr ""
+"Sie haben keine Berechtigung, einen Drucker unterhalb dieser 'Basis' "
+"anzulegen."
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
-msgid "Add/Edit manufacturer"
-msgstr "Hersteller hinzufügen/bearbeiten"
+#: plugins/admin/systems/servkolab.tpl:14
+msgid "POP3 service"
+msgstr "POP3-Dienst"
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
-msgid "Website"
-msgstr "Website"
+#: plugins/admin/systems/servkolab.tpl:22
+msgid "POP3/SSL service"
+msgstr "POP3/SSL-Dienst"
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
-#: plugins/admin/ogroups/class_mailogroup.inc:137
-#: plugins/admin/ogroups/class_phonequeue.inc:690
-#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Phone number"
-msgstr "Telefonnummer"
+#: plugins/admin/systems/servkolab.tpl:30
+msgid "IMAP service"
+msgstr "IMAP-Dienst"
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
-msgid "List of available cartridge type for this type of printer"
-msgstr "Verfügbare Patronentypen für diesen Druckertyp"
+#: plugins/admin/systems/servkolab.tpl:38
+msgid "IMAP/SSL service"
+msgstr "IMAP/SSL-Dienst"
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
-msgid ""
-"This dialog allows you to create new types of cartridges, and select one or "
-"more types for your printer. Cartridge types depends on the printer type you "
-"have selected. For each selected cartridge type there will be a new "
-"cartridge created, this allows you to select the same cartridge type for "
-"more then one printer."
-msgstr ""
-"Dieser Dialog erlaubt es Ihnen, neue Arten von Patronen hinzuzufügen und "
-"einen oder mehrere Typen zu Ihrem Drucker zuzuordnen. Patronentypen sind "
-"abhängig von Ihrem gewählten Druckertyp. Für jeden gewählten Patronentyp "
-"wird eine neue Patrone erstellt. Dies erlaubt es Ihnen, den gleichen "
-"Patronentyp für mehr als einen Drucker zu verwenden."
+#: plugins/admin/systems/servkolab.tpl:46
+msgid "Sieve service"
+msgstr "Sieve-Dienst"
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
-msgid "Display cartridge types matching"
-msgstr "Zeige die Patronentypen, auf die Folgendes passt"
+#: plugins/admin/systems/servkolab.tpl:54
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+msgstr "FTP Frei/Belegt-Dienst (alt, inkompatibel mit Kolab 2)"
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
-msgid "Regular expression for matching cartridge types"
-msgstr "Regulärer Ausdruck zum Erkennen von Patronentypen"
+#: plugins/admin/systems/servkolab.tpl:62
+msgid "HTTP FreeBusy service (legacy)"
+msgstr "HTTP Frei/Belegt-Dienst (alt)"
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:58
-#, php-format
-msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
-msgstr ""
-"Sie können diesen Hersteller nicht entfernen, er wird noch von folgendem(n) "
-"System(en) verwendet: '%s'"
+#: plugins/admin/systems/servkolab.tpl:70
+msgid "Amavis email scanning (virus/spam)"
+msgstr "Email scannen (Virus/Spam)"
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:104
-msgid "Please specify a name."
-msgstr "Bitte geben Sie einen Namen ein!"
+#: plugins/admin/systems/servkolab.tpl:81
+msgid "Quota settings"
+msgstr "Kontingent-Einstellungen"
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:113
-#: plugins/admin/systems/class_glpiManufacturer.inc:119
-msgid "Specified name is already in use, please choose another one."
-msgstr ""
-"Der angegebene Name wird bereits verwendet. Bitte wählen Sie einen anderen."
+#: plugins/admin/systems/servkolab.tpl:97
+msgid "Free/Busy settings"
+msgstr "Frei/Belegt-Einstellungen"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:6
-msgid "List of attachments"
-msgstr "Anhänge"
+#: plugins/admin/systems/servkolab.tpl:102
+msgid "Allow unauthenticated downloading of Free/Busy information"
+msgstr "Erlaube nicht-authentifiziertes Herunterladen von Frei/Belegt-Informationen"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:23
-msgid ""
-"This dialog allow you to attach additional objects (like manuals, guides, "
-"etc.)  to your currently edited computer."
-msgstr ""
-"Dieser Dialog erlaubt es Ihnen, verschiedene Objekte (wie Anleitungen, "
-"Hilfen, etc.) zum momentan gewählten Computer hinzuzufügen."
+#: plugins/admin/systems/servkolab.tpl:117
+msgid "SMTP privileged networks"
+msgstr "SMTP privilegierte Netzwerke"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:35
-msgid "Display attachments matching"
-msgstr "Zeige Anhänge, auf die zutrifft"
+#: plugins/admin/systems/servkolab.tpl:122
+msgid "Hosts/networks allowed to relay"
+msgstr "Rechner/Netzwerke, denen Weiterleitung erlaubt ist"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:37
-msgid "Regular expression for matching attachment names"
-msgstr "Regulärer Ausdruck zur Suche nach Anhangs-Namen"
+#: plugins/admin/systems/servkolab.tpl:125
+msgid "Enter multiple values, seperated with"
+msgstr "Eingabe mehrerer Werte, getrennt durch"
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
-msgid "Can't delete this entry, it is still in use."
-msgstr "Kann diesen Eintrag nicht entfernen, da er noch benutzt wird."
+#: plugins/admin/systems/servkolab.tpl:138
+msgid "SMTP smarthost/relayhost"
+msgstr "SMTP smarthost/relayhost"
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:305
-msgid "The selected name is already in use."
-msgstr "Der angegebene Name wird bereits verwendet."
+#: plugins/admin/systems/servkolab.tpl:144
+msgid "Enable MX lookup for relayhost"
+msgstr "Aktiviere MX lookup für relayhost"
 
-#: plugins/admin/systems/glpi.tpl:9
-#: plugins/admin/systems/SelectDeviceType.tpl:20
-msgid "System type"
-msgstr "System-Typ"
+#: plugins/admin/systems/servkolab.tpl:149
+msgid "Host used to relay mails"
+msgstr "Host für Mail Relay"
 
-#: plugins/admin/systems/glpi.tpl:19
-msgid "Operating system"
-msgstr "Betriebssystem"
+#: plugins/admin/systems/servkolab.tpl:163
+msgid "Accept Internet Mail"
+msgstr "Akzeptiere Internet-Mail"
 
-#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
-msgid "Contacts"
-msgstr "Kontakte"
+#: plugins/admin/systems/servkolab.tpl:169
+msgid "Accept mail from other domains over non-authenticated SMTP"
+msgstr "Akzeptiere Mails von anderen Domänen über nicht-authentifiziertes SMTP"
 
-#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
-msgid "Contact person"
-msgstr "Kontaktperson"
+#: plugins/admin/systems/phonesettings.tpl:1
+msgid "Advanced phone settings"
+msgstr "Erweiterte Telefon-Einstellungen"
 
-#: plugins/admin/systems/glpi.tpl:78
-msgid "Installed devices"
-msgstr "Installierte Geräte"
+#: plugins/admin/systems/phonesettings.tpl:6
+msgid "Phone type"
+msgstr "Telefon-Modell"
 
-#: plugins/admin/systems/glpi.tpl:90
-msgid "Trading"
-msgstr "Handeln"
+#: plugins/admin/systems/phonesettings.tpl:7
+#: plugins/admin/systems/phonesettings.tpl:25
+#: plugins/admin/systems/phonesettings.tpl:35
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:78
+#: plugins/admin/systems/phonesettings.tpl:109
+#: plugins/admin/systems/phonesettings.tpl:156
+msgid "Choose a phone type"
+msgstr "Wählen Sie das Telefon-Modell"
 
-#: plugins/admin/systems/glpi.tpl:91
-msgid "Software"
-msgstr "Software"
+#: plugins/admin/systems/phonesettings.tpl:10
+msgid "refresh"
+msgstr "Aktualisieren"
 
-#: plugins/admin/systems/glpi.tpl:92
-msgid "Contracts"
-msgstr "Verträge"
+#: plugins/admin/systems/phonesettings.tpl:32
+msgid "DTMF mode"
+msgstr "DTMF-Modus"
 
-#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
-msgid "Attachments"
-msgstr "Anhänge"
+#: plugins/admin/systems/phonesettings.tpl:46
+#: plugins/admin/systems/phonesettings.tpl:85
+msgid "Default IP"
+msgstr "Standard IP-Adresse"
 
-#: plugins/admin/systems/servdnseditzone.tpl:7
-msgid "Zone name"
-msgstr "Zonenname"
+#: plugins/admin/systems/phonesettings.tpl:56
+#: plugins/admin/systems/phonesettings.tpl:93
+msgid "Response timeout"
+msgstr "Wartezeit bis Antwort"
 
-#: plugins/admin/systems/servdnseditzone.tpl:13
-msgid "Network address"
-msgstr "Netzwerk-Adresse"
+#: plugins/admin/systems/phonesettings.tpl:75
+msgid "Modus"
+msgstr "Modus"
 
-#: plugins/admin/systems/servdnseditzone.tpl:24
-msgid "Zone entries"
-msgstr "Zonen-Einträge"
+#: plugins/admin/systems/phonesettings.tpl:106
+msgid "Authtype"
+msgstr "Authentifizierung"
 
-#: plugins/admin/systems/servdnseditzone.tpl:35
-msgid "SOA record"
-msgstr "SOA-Eintrag"
+#: plugins/admin/systems/phonesettings.tpl:116
+msgid "Secret"
+msgstr "Passwort"
+
+#: plugins/admin/systems/phonesettings.tpl:124
+msgid "GoFonInkeys"
+msgstr "GOFon-Schlüssel (eingehend)"
 
-#: plugins/admin/systems/servdnseditzone.tpl:41
-msgid "Primary dns server for this zone"
-msgstr "Primärer DNS-Server für diese Zone"
+#: plugins/admin/systems/phonesettings.tpl:132
+msgid "GoFonOutKeys"
+msgstr "GOFon-Schlüssel (ausgehend)"
 
-#: plugins/admin/systems/servdnseditzone.tpl:53
-msgid "Serial number (automatically incremented)"
-msgstr "Seriennummer (automatisch inkrementiert)"
+#: plugins/admin/systems/phonesettings.tpl:145
+msgid "Account code"
+msgstr "Konto-Identifikation"
 
-#: plugins/admin/systems/servdnseditzone.tpl:69
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/altlinux/setup_finish.tpl:31
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr "Wiederholen"
+#: plugins/admin/systems/phonesettings.tpl:153
+msgid "Trunk lines"
+msgstr "Leitungen zusammenfassen"
 
-#: plugins/admin/systems/servdnseditzone.tpl:75
-msgid "Expire"
-msgstr "Ablauf"
+#: plugins/admin/systems/phonesettings.tpl:168
+msgid "Hosts that are allowed to connect"
+msgstr "Erlaube diesen Rechnern die Verbindung"
 
-#: plugins/admin/systems/servdnseditzone.tpl:96
-msgid "MxRecords"
-msgstr "MX-Einträge"
+#: plugins/admin/systems/phonesettings.tpl:183
+msgid "Hosts that are not allowed to connect"
+msgstr "Verbiete diesen Rechnern die Verbindung"
 
-#: plugins/admin/systems/servdnseditzone.tpl:108
-msgid "Zone records"
-msgstr "Zonen-Einträge"
+#: plugins/admin/systems/phonesettings.tpl:205
+msgid "MSN"
+msgstr "MSN"
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:6
-msgid "List of devices"
-msgstr "Liste der Geräte"
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
+msgstr "Name des Systems"
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:23
+#: plugins/admin/systems/remove.tpl:6
 msgid ""
-"This dialog allows you to attach a device to your currently edited computer."
+"This includes <b>all</b> system and setup informations. Please double check "
+"if your really want to do this since there is no way for GOsa to get your "
+"data back."
 msgstr ""
-"Dieser Dialog erlaubt es Ihnen, ein Gerät zum momentan ausgewählten Computer "
-"hinzuzufügen."
-
-#: plugins/admin/systems/glpiDeviceManagement.tpl:35
-msgid "Display devices matching"
-msgstr "Zeige die Geräte, auf die das Folgende passt"
-
-#: plugins/admin/systems/glpiDeviceManagement.tpl:37
-msgid "Regular expression for matching device names"
-msgstr "Regulärer Ausdruck zum Erkennen von Gerätenamen"
+"Dies umfasst <b>alle</b> System- und Setup-Informationen Bitte prüfen Sie "
+"genau, da es keine Möglichkeit für GOsa gibt, die Daten zu restaurieren. "
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:73
 #, php-format
@@ -9214,8 +9488,7 @@ msgstr "Sind sind dabei, den GLPI Anhang '%s' zu l
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:112
 #, php-format
-msgid ""
-"You can't delete this attachment, it is still in use by these system(s) '%s'"
+msgid "You can't delete this attachment, it is still in use by these system(s) '%s'"
 msgstr ""
 "Sie können diesen Anhang nicht entfernen, er wird noch von folgendem(n) "
 "System(en) verwendet: '%s'"
@@ -9264,427 +9537,271 @@ msgstr "MIME"
 msgid "This table displays all available attachments."
 msgstr "Diese Tabelle enthält alle verfügbaren Anhänge."
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:222
-msgid "empty"
-msgstr "leer"
-
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
-msgid "Create new attachment"
-msgstr "Neuen Anhang erstellen"
-
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
-msgid "New Attachment"
-msgstr "Neuer Anhang"
-
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:352
-msgid "Please specify a valid name for this attachment."
-msgstr "Bitte geben Sie einen gültigen Namen für diesen Anhang an."
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
-#, php-format
-msgid "Internal Error can't create device of type '%s'"
-msgstr "Interner Fehler: Kann Gerät von Typ '%s' nicht anlegen."
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
-#, php-format
-msgid "You're about to delete the glpi device '%s'."
-msgstr "Sie sind dabei das GLPI Gerät '%s' zu löschen."
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
-msgid "Can't detect object name."
-msgstr "Kann Objektnamen nicht erkennen."
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
-#, php-format
-msgid ""
-"You can't delete this device, it is still in use by these system(s) '%s'"
-msgstr ""
-"Sie können dieses Gerät nicht entfernen, es wird noch von folgendem(n) System"
-"(en) verwendet: '%s'"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
-msgid "devices"
-msgstr "Geräte"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-msgid "New monitor"
-msgstr "Neuer Monitor"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-msgid "M"
-msgstr "M"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
-msgid "New mainbord"
-msgstr "Neues Mainboard"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-msgid "New processor"
-msgstr "Neuer Prozessor"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
-msgid "New case"
-msgstr "Neues Gehäuse"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
-msgid "C"
-msgstr "C"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
-msgid "New network interface"
-msgstr "Neues Netzwerk-Interface"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
-msgid "NI"
-msgstr "NI"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
-msgid "New ram"
-msgstr "Neuer Arbeitsspeicher"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
-msgid "R"
-msgstr "R"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
-msgid "New hard disk"
-msgstr "Neue Festplatte"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
-msgid "HDD"
-msgstr "HDD"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
-msgid "New drive"
-msgstr "Neues Laufwerk"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
-msgid "D"
-msgstr "D"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
-msgid "New controller"
-msgstr "Neuer Controller"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
-msgid "CS"
-msgstr "CS"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
-msgid "New graphics card"
-msgstr "Neue Grafikkarte"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
-msgid "GC"
-msgstr "GC"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
-msgid "New sound card"
-msgstr "Neue Soundkarte"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
-msgid "SC"
-msgstr "SC"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
-msgid "New power supply"
-msgstr "Neues Netzteil"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
-msgid "PS"
-msgstr "PS"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
-msgid "New misc device"
-msgstr "Neues allgemeines Gerät"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
-msgid "OC"
-msgstr "OC"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:346
-msgid "You have to specify a valid name for this device."
-msgstr "Bitte geben Sie einen gültigen Namen für dieses Gerät an."
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:366
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:369
-msgid "This device name is already in use."
-msgstr "Der angegebene Gerätename wird bereits verwendet."
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
-msgid "Other"
-msgstr "Andere"
-
-#: plugins/admin/systems/glpiPrinter.tpl:9
-msgid "Printer type"
-msgstr "Druckertyp"
-
-#: plugins/admin/systems/glpiPrinter.tpl:31
-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"
-
-#: plugins/admin/systems/glpiPrinter.tpl:54
-msgid "USB"
-msgstr "USB"
-
-#: plugins/admin/systems/glpiPrinter.tpl:114
-msgid "Installed cartridges"
-msgstr "Installierte Patronen"
-
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
-#, php-format
-msgid "You're about to delete the glpi cartridge type '%s'."
-msgstr "Sind sind dabei, den GLPI Patronentyp '%s' zu löschen."
-
-#: 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 ""
-"Sie können diesen Patronentyp nicht entfernen, er wird noch von folgendem(n) "
-"Drucker(n) verwendet: '%s'"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:222
+msgid "empty"
+msgstr "leer"
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
-msgid "Cartridges"
-msgstr "Patronen"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
+msgid "Create new attachment"
+msgstr "Neuen Anhang erstellen"
 
-#: plugins/admin/systems/glpi_devices.tpl:2
-msgid "Add/Edit monitor"
-msgstr "Monitor hinzufügen/bearbeiten"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
+msgid "New Attachment"
+msgstr "Neuer Anhang"
 
-#: plugins/admin/systems/glpi_devices.tpl:33
-msgid "Monitor size"
-msgstr "Monitorgröße"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:352
+msgid "Please specify a valid name for this attachment."
+msgstr "Bitte geben Sie einen gültigen Namen für diesen Anhang an."
 
-#: plugins/admin/systems/glpi_devices.tpl:36
-msgid "Inch"
-msgstr "Zoll"
+#: plugins/admin/systems/headpage.tpl:6
+msgid "List of systems"
+msgstr "Liste der Systeme"
 
-#: plugins/admin/systems/glpi_devices.tpl:44
-msgid "Integrated microphone"
-msgstr "Integriertes Mikrofon"
+#: plugins/admin/systems/headpage.tpl:24
+msgid ""
+"This menu allows you to add, remove and change the properties of specific "
+"systems. You can only add systems which have already been started once."
+msgstr ""
+"Mit diesem Menü können Sie Systeme hinzufügen, diese löschen oder die "
+"Eigenschaften bestimmter Systeme verändern. Sie können nur Systeme "
+"hinzufügen, die bereits einmal im Netz gestartet wurden."
 
-#: plugins/admin/systems/glpi_devices.tpl:47
-#: plugins/admin/systems/glpi_devices.tpl:55
-#: plugins/admin/systems/glpi_devices.tpl:63
-#: plugins/admin/systems/glpi_devices.tpl:71
-#: plugins/admin/systems/glpi_devices.tpl:176
-#: plugins/admin/systems/glpi_devices.tpl:296
-#: plugins/admin/systems/glpi_devices.tpl:361
-msgid "Yes"
-msgstr "ja"
+#: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
+msgstr "Zeige Server"
 
-#: plugins/admin/systems/glpi_devices.tpl:48
-#: plugins/admin/systems/glpi_devices.tpl:56
-#: plugins/admin/systems/glpi_devices.tpl:64
-#: plugins/admin/systems/glpi_devices.tpl:72
-#: plugins/admin/systems/glpi_devices.tpl:177
-#: plugins/admin/systems/glpi_devices.tpl:297
-#: plugins/admin/systems/glpi_devices.tpl:362
-msgid "No"
-msgstr "nein"
+#: plugins/admin/systems/headpage.tpl:39
+msgid "Select to see Linux terminals"
+msgstr "Wählen, um Linux-Terminals zu sehen"
 
-#: plugins/admin/systems/glpi_devices.tpl:52
-msgid "Integrated speakers"
-msgstr "Integrierte Lautsprecher"
+#: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
+msgstr "Zeige Terminals"
 
-#: plugins/admin/systems/glpi_devices.tpl:60
-msgid "Sub-D"
-msgstr "Sub-D"
+#: plugins/admin/systems/headpage.tpl:40
+msgid "Select to see Linux workstations"
+msgstr "Wählen, um Linux-Arbeitsstationen zu sehen"
 
-#: plugins/admin/systems/glpi_devices.tpl:68
-msgid "BNC"
-msgstr "BNC"
+#: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
+msgstr "Zeige Arbeitsstationen"
 
-#: plugins/admin/systems/glpi_devices.tpl:76
-msgid "Serial number"
-msgstr "Seriennumner"
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Select to see MicroSoft Windows based workstations"
+msgstr "Auswählen, um Microsoft Windows Arbeitsstationen zu sehen"
 
-#: plugins/admin/systems/glpi_devices.tpl:83
-msgid "Additional serial number"
-msgstr "Zusätzliche Seriennummer"
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Show windows based workstations"
+msgstr "Zeige Windows basierte Arbeitsstationen"
 
-#: plugins/admin/systems/glpi_devices.tpl:97
-msgid "Add/Edit other device"
-msgstr "Allgemeines Gerät hinzufügen/bearbeiten"
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Select to see network printers"
+msgstr "Wählen, um die 'Netzwerk-Drucker' zu sehen"
 
-#: plugins/admin/systems/glpi_devices.tpl:138
-msgid "Add/Edit power supply"
-msgstr "Netzteil hinzufügen/bearbeiten"
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Show network printers"
+msgstr "Zeige Netzwerk-Drucker"
 
-#: plugins/admin/systems/glpi_devices.tpl:173
-msgid "Atx"
-msgstr "ATX"
+#: plugins/admin/systems/headpage.tpl:43
+msgid "Select to see VOIP phones"
+msgstr "Wählen, um 'VoIP-Telefone' zu sehen"
 
-#: plugins/admin/systems/glpi_devices.tpl:181
-msgid "Power"
-msgstr "Strom"
+#: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
+msgstr "Zeige Telefone"
 
-#: plugins/admin/systems/glpi_devices.tpl:193
-msgid "Add/Edit graphic card"
-msgstr "Grafikkarte hinzufügen/bearbeiten"
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Select to see network devices"
+msgstr "Wählen, um Netzwerk-Geräte zu sehen"
 
-#: plugins/admin/systems/glpi_devices.tpl:228
-#: plugins/admin/systems/glpi_devices.tpl:284
-#: plugins/admin/systems/glpi_devices.tpl:349
-msgid "Interface"
-msgstr "Interface"
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Show network devices"
+msgstr "Zeige Netzwerk-Geräte"
 
-#: plugins/admin/systems/glpi_devices.tpl:237
-msgid "Ram"
-msgstr "RAM"
+#: plugins/admin/systems/headpage.tpl:52
+msgid "Regular expression for matching system names"
+msgstr "Regulärer Ausdruck für System-Namen"
 
-#: plugins/admin/systems/glpi_devices.tpl:249
-msgid "Add/Edit controller"
-msgstr "Controller hinzufügen/bearbeiten"
+#: plugins/admin/systems/headpage.tpl:59
+msgid "Display systems of user"
+msgstr "Zeige Systeme des Benutzers"
 
-#: plugins/admin/systems/glpi_devices.tpl:307
-msgid "Add/Edit drive"
-msgstr "Laufwerk hinzufügen/bearbeiten"
+#: plugins/admin/systems/headpage.tpl:62
+msgid "User name of which terminal(s) are shown"
+msgstr "Benutzername, dessen Terminal(s) gezeigt werden"
 
-#: plugins/admin/systems/glpi_devices.tpl:342
-msgid "Speed"
-msgstr "Taktung"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:6
+msgid "List of attachments"
+msgstr "Anhänge"
 
-#: plugins/admin/systems/glpi_devices.tpl:358
-msgid "Writeable"
-msgstr "Beschreibbar"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:23
+msgid ""
+"This dialog allow you to attach additional objects (like manuals, guides, "
+"etc.)  to your currently edited computer."
+msgstr ""
+"Dieser Dialog erlaubt es Ihnen, verschiedene Objekte (wie Anleitungen, "
+"Hilfen, etc.) zum momentan gewählten Computer hinzuzufügen."
 
-#: plugins/admin/systems/glpi_devices.tpl:371
-msgid "Add/Edit harddisk"
-msgstr "Festplatte hinzufügen/bearbeiten"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:35
+msgid "Display attachments matching"
+msgstr "Zeige Anhänge, auf die zutrifft"
 
-#: plugins/admin/systems/glpi_devices.tpl:406
-msgid "Rpm"
-msgstr "Upm"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:37
+msgid "Regular expression for matching attachment names"
+msgstr "Regulärer Ausdruck zur Suche nach Anhangs-Namen"
 
-#: plugins/admin/systems/glpi_devices.tpl:413
-msgid "Cache"
-msgstr "Cache"
+#: plugins/admin/systems/password.tpl:2
+msgid ""
+"To change the terminal root password use the fields below. The changes take "
+"effect during the next reboot. Please memorize the new password, because you "
+"wouldn't be able to log in."
+msgstr ""
+"Um das root-Passwort des Terminals zu ändern, nutzen Sie die Felder unten. "
+"Die Änderungen werden beim nächsten Neustart wirksam. Merken Sie sich das "
+"Passwort, da eine Anmeldung ohne dieses Passwort nicht möglich ist."
 
-#: plugins/admin/systems/glpi_devices.tpl:443
-msgid "Add/Edit memory"
-msgstr "Speicher hinzufügen/bearbeiten"
+#: plugins/admin/systems/password.tpl:5
+msgid "Leave fields blank for password inheritance from default entries."
+msgstr ""
+"Lassen Sie die Felder leer, um das Passwort aus den Standard-Einträgen zu "
+"übernehmen."
 
-#: plugins/admin/systems/glpi_devices.tpl:478
-msgid "Frequenz"
-msgstr "Frequenz"
+#: plugins/admin/systems/password.tpl:9
+msgid "Changing the password impinges on authentification only."
+msgstr "Das Ändern des Passwortes wirkt sich nur auf die Authentifizierung aus."
 
-#: plugins/admin/systems/glpi_devices.tpl:507
-msgid "Add/Edit sound card"
-msgstr "Soundkarte hinzufügen/bearbeiten"
+#: 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/glpi_devices.tpl:553
-msgid "Add/Edit network interface"
-msgstr "Netzwerk-Interface hinzufügen/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/glpi_devices.tpl:589
-msgid "MAC address"
-msgstr "MAC-Adresse"
+#: plugins/admin/systems/chooser.tpl:7
+msgid "Linux thin client template"
+msgstr "Linux Thin-Client Vorlage"
 
-#: plugins/admin/systems/glpi_devices.tpl:607
-msgid "Add/Edit processor"
-msgstr "Prozessor hinzufügen/bearbeiten"
+#: plugins/admin/systems/chooser.tpl:8
+msgid "Linux workstation template"
+msgstr "Linux Arbeitsstations-Vorlage"
 
-#: plugins/admin/systems/glpi_devices.tpl:642
-msgid "Frequence"
-msgstr "Frequenz"
+#: plugins/admin/systems/chooser.tpl:9
+msgid "Linux Server"
+msgstr "Linux Server"
 
-#: plugins/admin/systems/glpi_devices.tpl:649
-msgid "Default frequence"
-msgstr "Standardfrequenz"
+#: plugins/admin/systems/chooser.tpl:10
+msgid "Windows workstation"
+msgstr "Windows Arbeitsstation"
 
-#: plugins/admin/systems/glpi_devices.tpl:661
-msgid "Add/Edit motherboard"
-msgstr "Motherboard hinzufügen/bearbeiten"
+#: plugins/admin/systems/chooser.tpl:11
+msgid "Network printer"
+msgstr "Netzwerk-Drucker"
 
-#: plugins/admin/systems/glpi_devices.tpl:696
-msgid "Chipset"
-msgstr "Chipsatz"
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
+msgstr "Andere Netzwerk-Komponente"
 
-#: plugins/admin/systems/glpi_devices.tpl:707
-msgid "Add/Edit computer case"
-msgstr "Computergehäuse hinzufügen/bearbeiten"
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
+msgstr "Anlegen"
 
-#: plugins/admin/systems/glpi_devices.tpl:742
-msgid "format"
-msgstr "Format"
+#: plugins/admin/systems/class_glpiManufacturer.inc:58
+#, php-format
+msgid ""
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
+msgstr ""
+"Sie können diesen Hersteller nicht entfernen, er wird noch von folgendem(n) "
+"System(en) verwendet: '%s'"
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
-msgid "Attachment"
-msgstr "Anhang"
+#: plugins/admin/systems/class_glpiManufacturer.inc:104
+msgid "Please specify a name."
+msgstr "Bitte geben Sie einen Namen ein!"
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
-msgid "Filename"
-msgstr "Dateiname"
+#: plugins/admin/systems/class_glpiManufacturer.inc:113
+#: plugins/admin/systems/class_glpiManufacturer.inc:119
+msgid "Specified name is already in use, please choose another one."
+msgstr "Der angegebene Name wird bereits verwendet. Bitte wählen Sie einen anderen."
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
-msgid "Mime-type"
-msgstr "MIME-Typ"
+#: plugins/admin/systems/class_phoneGeneric.inc:105
+msgid "This 'dn' has no phone features."
+msgstr "Diese 'dn' besitzt keine Telefon-Erweiterungen."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:336
-msgid "This zoneName is already in use"
-msgstr "Der angegebene Zonen-Name wird bereits verwendet."
+#: plugins/admin/systems/class_phoneGeneric.inc:202
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+msgid "yes"
+msgstr "ja"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:339
-msgid "This reverse zone is already in use"
-msgstr "Die reverse-Zone wird bereits verwendet."
+#: plugins/admin/systems/class_phoneGeneric.inc:202
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
+msgid "no"
+msgstr "nein"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:344
-msgid "Primary dns server must end with '.' to be a valid entry."
-msgstr ""
-"Der Primäre DNS-Server muss mit '.' enden, um ein gültiger Eintrag zu sein."
+#: plugins/admin/systems/class_phoneGeneric.inc:223
+msgid "dynamic"
+msgstr "dynamisch"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:348
-msgid "Your specified mail address must end with '.' to be a valid record."
-msgstr ""
-"Die angegebene Email-Adresse muss mit '.' enden, um ein gültiger Eintrag zu "
-"sein."
+#: plugins/admin/systems/class_phoneGeneric.inc:223
+msgid "Networksettings"
+msgstr "Netzwerk-Einstellungen"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:352
-#: plugins/admin/systems/class_servDNSeditZone.inc:356
+#: plugins/admin/systems/class_phoneGeneric.inc:238
+#, php-format
 msgid ""
-"Your mail address contains '@' replace this with '.' to enable GOsa to "
-"create a valid SOA record."
+"Can't delete because there are user which are depending on this phone. One "
+"of them is user '%s'."
 msgstr ""
-"Ihre Email-Adresse enthält '@'. Bitte ersetzen Sie dieses Zeichen durch '.', "
-"um einen gültigen SOA-Eintrag zu erzeugen."
+"Das Telefon kann nicht entfernt werden, da es abhängige Benutzer gibt. Der "
+"erste Benutzer in der Liste ist '%s'."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:360
-msgid "Only lowercase strings are allowed as zone name."
-msgstr "Für den Zonennamen sind nur Kleinbuchstaben zugelassen."
+#: plugins/admin/systems/class_phoneGeneric.inc:294
+msgid "The required field 'Phone name' is not set."
+msgstr "Das benötigte Feld 'Telefon-Name' ist nicht gesetzt."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:364
-msgid "Please specify a numeric value for serial number."
-msgstr "Bitte geben Sie im Feld 'Seriennummer' einen numerischen Wert ein."
+#: plugins/admin/systems/class_phoneGeneric.inc:297
+msgid "The 'Phone name' '0' is reserved and cannot be used."
+msgstr "Der Telefon-Name '0' ist reserviert und kann nicht verwendet werden."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:368
-msgid "Please specify a numeric value for refresh."
-msgstr "Bitte geben Sie im Feld 'Aktualisieren' einen numerischen Wert ein."
+#: plugins/admin/systems/class_phoneGeneric.inc:304
+msgid "You have no permissions to create a phone on this 'Base'."
+msgstr "Sie haben keine Berechtigung, ein Telefon unterhalb dieser 'Basis' anzulegen."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:372
-msgid "Please specify a numeric value for ttl."
-msgstr "Bitte geben Sie im Feld 'TTL' einen numerischen Wert ein."
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
+msgid "Printer ppd selection."
+msgstr "Auswahl der Drucker-PPD"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:376
-msgid "Please specify a numeric value for expire."
-msgstr "Bitte geben Sie im Feld 'Ablauf' einen numerischen Wert ein."
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
+msgid "Select entries to add"
+msgstr "Wählen Sie die hinzuzufügenden Einträge"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:380
-msgid "Please specify a numeric value for retry."
-msgstr "Bitte geben Sie im Feld 'Wiederholen' einen numerischen Wert ein."
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
+msgid "Display members of department"
+msgstr "Zeige die Mitglieder der Abteilung"
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
+msgid "Display members matching"
+msgstr "Zeige die Mitglieder, auf die Folgendes passt"
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
+msgid "Regular expression for matching member names"
+msgstr "Regulärer Ausdruck zum Erkennen von Mitgliedsnamen"
 
 #: plugins/admin/systems/SelectDeviceType.tpl:3
 msgid ""
@@ -9701,8 +9818,7 @@ msgstr ""
 
 #: plugins/admin/systems/SelectDeviceType.tpl:9
 msgid "Please select a system type and if prefered select a object group too."
-msgstr ""
-"Bitte wählen Sie einen Systemtyp (und wenn  gewünscht eine Objektgruppe)."
+msgstr "Bitte wählen Sie einen Systemtyp (und wenn  gewünscht eine Objektgruppe)."
 
 #: plugins/admin/systems/SelectDeviceType.tpl:21
 msgid "Choose a system type"
@@ -9731,8 +9847,7 @@ msgstr "Einstellungen f
 msgid ""
 "The name '%s' can't be used as free hand entry, the name is already used in "
 "this ldap tree."
-msgstr ""
-"Ein Person mit dem ausgewählten Namen ist in diesem Baum bereits angelegt."
+msgstr "Ein Person mit dem ausgewählten Namen ist in diesem Baum bereits angelegt."
 
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:408
 #, php-format
@@ -9742,8 +9857,7 @@ msgstr "Der Eintragsname '%s' enth
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:420
 #, php-format
 msgid "Can't rename the server '%s' to '%s', the server contains this zone."
-msgstr ""
-"Kann den Server '%s' nicht in '%s' umbenennen, der Server enthält diese Zone."
+msgstr "Kann den Server '%s' nicht in '%s' umbenennen, der Server enthält diese Zone."
 
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:432
 #, php-format
@@ -9754,10 +9868,8 @@ msgstr ""
 
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:436
 #, php-format
-msgid ""
-"Can't rename '%s' to '%s',the destination name contains invalid characters."
-msgstr ""
-"Kann '%s' nicht in '%s' umbenennen: Der neue Name enthält ungültige Zeichen."
+msgid "Can't rename '%s' to '%s',the destination name contains invalid characters."
+msgstr "Kann '%s' nicht in '%s' umbenennen: Der neue Name enthält ungültige Zeichen."
 
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:450
 #, php-format
@@ -9776,54 +9888,11 @@ msgstr "F
 msgid "There is a duplicate entry in '%s' for '%s'."
 msgstr "Es wurde in '%s' ein doppelter Eintrag für '%s' gefunden."
 
-#: plugins/admin/systems/class_servRepository.inc:97
-msgid "Remove FAI repository extension."
-msgstr "FAI-Repository-Erweiterung entfernen"
-
-#: plugins/admin/systems/class_servRepository.inc:98
-msgid ""
-"This server has FAI repository features enabled. You can disable them by "
-"clicking below."
-msgstr ""
-"Dieser Server besitzt aktivierte FAI-Repository-Erweiterungen. Sie können "
-"diese durch einen Klick auf die Schaltfläche unten deaktivieren."
-
-#: plugins/admin/systems/class_servRepository.inc:100
-msgid "Add FAI repository extension."
-msgstr "FAI-Repository-Erweiterung hinzufügen"
-
-#: plugins/admin/systems/class_servRepository.inc:101
-msgid ""
-"This server has FAI repository features disabled. You can enable them by "
-"clicking below."
-msgstr ""
-"Aktuell besitzt dieser Server keine aktivierten FAI-Repository-"
-"Erweiterungen. Sie können diese durch einen Klick auf die Schaltfläche unten "
-"aktivieren."
-
-#: plugins/admin/systems/class_servRepository.inc:144
-#, php-format
-msgid ""
-"You can't delete this release, it is still used by these workstations [%s]. "
-"Please solve this dependencies first, to keep data base consistency."
-msgstr ""
-"Sie können dieses Release nicht entfernen, da es momentan noch von diesen "
-"Arbeitsstationen verwendet wird [%s]. Bitte lösen Sie zunächst diese "
-"Abhängigkeiten, um die Konsistenz der Datenbank zu gewährleisten."
-
-#: plugins/admin/systems/class_servRepository.inc:176
-#, php-format
-msgid ""
-"Be careful editing this release, it is still used by these workstations [%s]."
-msgstr ""
-"Seien Sie vorsichtig, wenn Sie dieses Release editieren - es wird momentan "
-"noch von folgenden Arbeitsstationen verwendet [%s]."
-
 #: plugins/admin/systems/class_baseSelectDialog.inc:23
 msgid "Choose a base"
 msgstr "Wählen Sie eine Basis"
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:33
+#: plugins/admin/systems/class_baseSelectDialog.inc:34
 msgid ""
 "Step in the prefered tree and click save to use the current subtree as base. "
 "Or click the image at the end of each entry."
@@ -9832,11 +9901,11 @@ msgstr ""
 "Baum als Basis zu nutzen (Oder klicken sie auf das Bild am Ende des "
 "Eintrags)."
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:50
+#: plugins/admin/systems/class_baseSelectDialog.inc:51
 msgid "Filter entries with this syntax"
 msgstr "Einträge mit dieser Syntax filtern"
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:114
+#: plugins/admin/systems/class_baseSelectDialog.inc:115
 #, php-format
 msgid "Select this base"
 msgstr "Diese Basis auswählen"
@@ -9946,52 +10015,6 @@ msgstr ""
 msgid "Select action to execute for this   group of terminals"
 msgstr "Wählen Sie die auszuführende Aktion für diese Gruppe von Terminals"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
-msgid "Object groups"
-msgstr "Objektgruppen"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:54
-msgid "UNIX accounts"
-msgstr "Unix-Konten"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:58 html/getxls.php:149
-#: html/getxls.php:151 html/getxls.php:158 html/getxls.php:179
-#: html/getxls.php:245 html/getxls.php:316
-msgid "Servers"
-msgstr "Server"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:59
-msgid "Thin Clients"
-msgstr "Thin Clients"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:60
-msgid "Workstations"
-msgstr "Workstations"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:279
-#, php-format
-msgid "You're about to delete the object group '%s'."
-msgstr "Sie sind dabei die Objektgruppe '%s' zu löschen."
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:285
-#: plugins/admin/ogroups/class_ogroupManagement.inc:311
-msgid "You are not allowed to delete this object group!"
-msgstr "Es ist Ihnen nicht erlaubt, diese Objektgruppe zu löschen!"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:448
-msgid "Create new object group"
-msgstr "Erstelle neue Objektgruppe"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:492
-msgid "Name of object groups"
-msgstr "Name der Objektgruppen"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:541
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
-msgstr "Objektgruppe"
-
 #: plugins/admin/ogroups/class_ogroup.inc:144
 msgid "This 'dn' is no object group."
 msgstr "Diese 'dn' ist keine Objektgruppenerweiterungen."
@@ -10032,26 +10055,71 @@ msgstr "Terminals"
 msgid "phones"
 msgstr "Telefone"
 
-#: plugins/admin/ogroups/class_ogroup.inc:289
-msgid "printers"
-msgstr "Drucker"
+#: plugins/admin/ogroups/class_ogroup.inc:289
+msgid "printers"
+msgstr "Drucker"
+
+#: plugins/admin/ogroups/class_ogroup.inc:296
+msgid "and"
+msgstr "und"
+
+#: plugins/admin/ogroups/class_ogroup.inc:508
+msgid "Non existing dn: "
+msgstr "Unbekannte dn: "
+
+#: plugins/admin/ogroups/class_ogroup.inc:648
+msgid "There is already an object with this cn."
+msgstr "Diese cn ist bereits vergeben."
+
+#: plugins/admin/ogroups/class_ogroup.inc:665
+msgid "You can combine two different object types at maximum only!"
+msgstr "Sie können maximal zwei verschiedene Objekttypen miteinander kombinieren!"
+
+#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+msgid "Object groups"
+msgstr "Objektgruppen"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:54
+msgid "UNIX accounts"
+msgstr "Unix-Konten"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:58 html/getxls.php:149
+#: html/getxls.php:151 html/getxls.php:158 html/getxls.php:179
+#: html/getxls.php:245 html/getxls.php:316
+msgid "Servers"
+msgstr "Server"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:59
+msgid "Thin Clients"
+msgstr "Thin Clients"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:60
+msgid "Workstations"
+msgstr "Workstations"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:279
+#, php-format
+msgid "You're about to delete the object group '%s'."
+msgstr "Sie sind dabei die Objektgruppe '%s' zu löschen."
 
-#: plugins/admin/ogroups/class_ogroup.inc:296
-msgid "and"
-msgstr "und"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:285
+#: plugins/admin/ogroups/class_ogroupManagement.inc:311
+msgid "You are not allowed to delete this object group!"
+msgstr "Es ist Ihnen nicht erlaubt, diese Objektgruppe zu löschen!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:508
-msgid "Non existing dn: "
-msgstr "Unbekannte dn: "
+#: plugins/admin/ogroups/class_ogroupManagement.inc:449
+msgid "Create new object group"
+msgstr "Erstelle neue Objektgruppe"
 
-#: plugins/admin/ogroups/class_ogroup.inc:648
-msgid "There is already an object with this cn."
-msgstr "Diese cn ist bereits vergeben."
+#: plugins/admin/ogroups/class_ogroupManagement.inc:493
+msgid "Name of object groups"
+msgstr "Name der Objektgruppen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:665
-msgid "You can combine two different object types at maximum only!"
-msgstr ""
-"Sie können maximal zwei verschiedene Objekttypen miteinander kombinieren!"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:542
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
+msgstr "Objektgruppe"
 
 #: plugins/admin/ogroups/generic.tpl:9
 msgid "Name of the group"
@@ -10062,15 +10130,13 @@ msgid "Member objects"
 msgstr "Zusammengefasste Objekte"
 
 #: plugins/admin/ogroups/class_mailogroup.inc:41
-msgid ""
-"This group has mail features enabled. You can disable them by clicking below."
+msgid "This group has mail features enabled. You can disable them by clicking below."
 msgstr ""
 "Diese Gruppe besitzt aktivierte Mail-Erweiterungen. Sie können diese "
 "deaktivieren, indem Sie auf die Schaltfläche unten klicken."
 
 #: plugins/admin/ogroups/class_mailogroup.inc:43
-msgid ""
-"This group has mail features disabled. You can enable them by clicking below."
+msgid "This group has mail features disabled. You can enable them by clicking below."
 msgstr ""
 "Diese Gruppe besitz keine Mail-Erweiterungen. Sie können diese aktivieren, "
 "wenn Sie auf die untere Schaltfläche klicken."
@@ -10104,8 +10170,7 @@ msgid "Remove the phone queue from this Account"
 msgstr "Warteschlange von diesem Konto entfernen"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:114
-msgid ""
-"Phone queue is enabled for this group. You can disable it by clicking below."
+msgid "Phone queue is enabled for this group. You can disable it by clicking below."
 msgstr ""
 "Diese Gruppe besitzt aktivierte die Warteschlangen-Erweiterung. Sie können "
 "diese durch einen Klick auf die untere Schaltfläche deaktivieren."
@@ -10143,8 +10208,7 @@ msgid "There must be least one queue number defined."
 msgstr "Es ist mindestens eine Telefonnummer erforderlich."
 
 #: plugins/admin/ogroups/class_phonequeue.inc:225
-msgid ""
-"There is currently no asterisk server defined. Your settings can't be saved."
+msgid "There is currently no asterisk server defined. Your settings can't be saved."
 msgstr ""
 "Im Moment ist kein Asterisk-Server definiert. Ihre Einstellungen können "
 "nicht gespeichert werden."
@@ -10373,6 +10437,75 @@ msgstr "Auflegen durch Dr
 msgid "Ring instead of playing background music"
 msgstr "Klingelton statt Hintergrund-Musik"
 
+#: plugins/gofon/fonreports/class_fonreport.inc:6
+msgid "Phone Reports"
+msgstr "Telefon-Berichte"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:96
+#: plugins/gofon/fonreports/class_fonreport.inc:106
+msgid "Can't connect to phone database, no reports can be shown!"
+msgstr ""
+"Die Fax-Datenbank kann nicht erreicht werden. Es können keine Berichte "
+"angezeigt werden!"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:110
+msgid "Can't select phone database for report generation!"
+msgstr ""
+"Die Fax-Datenbank kann bezüglich der Berichtgenerierung nicht ausgewählt "
+"werden!"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:212
+msgid "Query for phone database failed!"
+msgstr "Die Anfrage zur Telefon-Datenbank ist fehlgeschlagen!"
+
+#: plugins/gofon/fonreports/contents.tpl:31
+msgid "Source"
+msgstr "Quelle"
+
+#: plugins/gofon/fonreports/contents.tpl:32
+msgid "Destination"
+msgstr "Ziel"
+
+#: plugins/gofon/fonreports/contents.tpl:33
+msgid "Channel"
+msgstr "Kanal"
+
+#: plugins/gofon/fonreports/contents.tpl:36
+msgid "Duration"
+msgstr "Dauer"
+
+#: plugins/gofon/fonreports/main.inc:5
+msgid "Phone reports"
+msgstr "Telefon-Berichte"
+
+#: plugins/gofon/macro/parameter.tpl:3
+msgid "Argument"
+msgstr "Argument"
+
+#: plugins/gofon/macro/parameter.tpl:7
+msgid "type"
+msgstr "Typ"
+
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+msgid "Macro name"
+msgstr "Makro-Name"
+
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
+msgstr "Makro-Name der angezeigt wird"
+
+#: plugins/gofon/macro/generic.tpl:22
+msgid "Choose subtree to place macro in"
+msgstr "Wählen Sie den Unterbaum, in den das Makro eingepflegt werden soll"
+
+#: plugins/gofon/macro/generic.tpl:43
+msgid "Visible for user"
+msgstr "Sichtbar für Benutzer"
+
+#: plugins/gofon/macro/generic.tpl:52
+msgid "Macro text"
+msgstr "Makro-Inhalt"
+
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:25
 msgid "Phone macros"
 msgstr "Telefon-Makros"
@@ -10387,27 +10520,27 @@ msgstr "Sie sind dabei das Makro '%s' zu l
 msgid "You are not allowed to delete this macro!"
 msgstr "Sie sind nicht berechtigt, dieses Makro zu löschen!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
 msgid "Create new phone macro"
 msgstr "Neues Telefon-Makro erstellen"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
 msgid "Visible"
 msgstr "Sichtbar"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:348
 msgid "This table displays all phone macros, in the selected tree."
 msgstr "Diese Tabelle enthält alle Telefon-Markos des gewählten Unterbaumes."
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
 msgid "Macro"
 msgstr "Makro"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
 msgid "visible"
 msgstr "sichtbar"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
 msgid "invisible"
 msgstr "unsichtbar"
 
@@ -10474,8 +10607,7 @@ msgstr "Die Kennung '%s' exisitiert bereits."
 
 #: plugins/gofon/macro/class_gofonMacro.inc:362
 msgid "You must specify the 'Display Name' in order to save this macro"
-msgstr ""
-"Um das Makro zu speichern, darf das Feld 'Angezeigter Name'f nicht leer sein"
+msgstr "Um das Makro zu speichern, darf das Feld 'Angezeigter Name'f nicht leer sein"
 
 #: plugins/gofon/macro/class_gofonMacro.inc:366
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
@@ -10498,25 +10630,31 @@ msgstr "Das Makro darf nicht l
 msgid "Please choose a valid  base."
 msgstr "Bitte wählen Sie eine gültige Basis."
 
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
-msgid "Macro name"
-msgstr "Makro-Name"
+#: plugins/gofon/macro/headpage.tpl:6
+msgid "List of macros"
+msgstr "Liste der Makros"
 
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
-msgstr "Makro-Name der angezeigt wird"
+#: plugins/gofon/macro/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit and remove selected macros. You may want "
+"to use the range selector on top of the macro listbox, when working with a "
+"large number of macros."
+msgstr ""
+"Dieses Menü erlaubt es Ihnen Makros hinzuzufügen, zu bearbeiten oder zu "
+"entfernen. Bei einer großen Anzahl von Makros bietet sich die Verwendung der "
+"Bereichsauswahl an."
 
-#: plugins/gofon/macro/generic.tpl:22
-msgid "Choose subtree to place macro in"
-msgstr "Wählen Sie den Unterbaum, in den das Makro eingepflegt werden soll"
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros matching"
+msgstr "Zeige Makros, auf die zutrifft"
 
-#: plugins/gofon/macro/generic.tpl:43
-msgid "Visible for user"
-msgstr "Sichtbar für Benutzer"
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros  matching"
+msgstr "Zeige Makros, auf die zutrifft"
 
-#: plugins/gofon/macro/generic.tpl:52
-msgid "Macro text"
-msgstr "Makro-Inhalt"
+#: plugins/gofon/macro/headpage.tpl:41
+msgid "Regular expression for matching macro names"
+msgstr "Regulärer Ausdruck zum Suchen in Makro-Namen"
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:245
 msgid "String"
@@ -10563,43 +10701,14 @@ msgstr ""
 "Die Parameterzahl des Makros hat sich geändert, sie müssen jeden Benutzer "
 "aktualisieren, der das Makro '%s' benutzt."
 
-#: plugins/gofon/macro/headpage.tpl:6
-msgid "List of macros"
-msgstr "Liste der Makros"
-
-#: plugins/gofon/macro/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit and remove selected macros. You may want "
-"to use the range selector on top of the macro listbox, when working with a "
-"large number of macros."
-msgstr ""
-"Dieses Menü erlaubt es Ihnen Makros hinzuzufügen, zu bearbeiten oder zu "
-"entfernen. Bei einer großen Anzahl von Makros bietet sich die Verwendung der "
-"Bereichsauswahl an."
-
-#: plugins/gofon/macro/headpage.tpl:38
-msgid "Display macros matching"
-msgstr "Zeige Makros, auf die zutrifft"
-
-#: plugins/gofon/macro/headpage.tpl:38
-msgid "Display macros  matching"
-msgstr "Zeige Makros, auf die zutrifft"
-
-#: plugins/gofon/macro/headpage.tpl:41
-msgid "Regular expression for matching macro names"
-msgstr "Regulärer Ausdruck zum Suchen in Makro-Namen"
-
 #: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
 msgid "Phone macro management"
 msgstr "Telefon-Makro-Verwaltung"
 
-#: plugins/gofon/macro/parameter.tpl:3
-msgid "Argument"
-msgstr "Argument"
-
-#: plugins/gofon/macro/parameter.tpl:7
-msgid "type"
-msgstr "Typ"
+#: plugins/gofon/phoneaccount/main.inc:122
+#: plugins/gofon/phoneaccount/paste_generic.tpl:1
+msgid "Phone settings"
+msgstr "Telefon-Einstellungen"
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:118
 msgid "no macro"
@@ -10630,8 +10739,7 @@ msgstr "Dieses Konto besitzt keine Telefon-Erweiterungen."
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
-msgstr ""
-"Das gewählte Makro ist nicht mehr verfügbar, bitte wählen Sie ein anderes."
+msgstr "Das gewählte Makro ist nicht mehr verfügbar, bitte wählen Sie ein anderes."
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:750
 msgid "Remove phone account"
@@ -10727,44 +10835,6 @@ msgstr "Telefon-PIN"
 msgid "Phone macro"
 msgstr "Telefon-Makro"
 
-#: plugins/gofon/phoneaccount/main.inc:122
-#: plugins/gofon/phoneaccount/paste_generic.tpl:1
-msgid "Phone settings"
-msgstr "Telefon-Einstellungen"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
-msgid "Phone conferences"
-msgstr "Telefon-Konferenzen"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-msgid "Management"
-msgstr "Verwaltung"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
-msgid "Create new conference"
-msgstr "Neue Konferenz erstellen"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
-msgid "New conference"
-msgstr "Neue Konferenz"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
-msgid "This table displays all available conference rooms."
-msgstr "Diese Tabelle enthält alle verfügbaren Konferenzräume."
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:309
-msgid "Name - Number"
-msgstr "Name - Nummer"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
-#: plugins/gofon/conference/generic.tpl:107
-msgid "PIN"
-msgstr "PIN"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:365
-msgid "Conference"
-msgstr "Konferenz"
-
 #: plugins/gofon/conference/generic.tpl:13
 msgid "Conference name"
 msgstr "Konferenz-Name"
@@ -10786,6 +10856,11 @@ msgstr "Lebenszeit (in Tagen)"
 msgid "Preset PIN"
 msgstr "PIN voreinstellen"
 
+#: plugins/gofon/conference/generic.tpl:107
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
+msgid "PIN"
+msgstr "PIN"
+
 #: plugins/gofon/conference/generic.tpl:113
 msgid "Record conference"
 msgstr "Konferenz aufnehmen"
@@ -10802,13 +10877,59 @@ msgstr "Wartemusik bei Halten"
 msgid "Activate session menu"
 msgstr "Sitzungsmenü aktivieren"
 
-#: plugins/gofon/conference/generic.tpl:150
-msgid "Announce users joining or leaving the conference"
-msgstr "Benachrichtige über Abgang/Zugang von Teilnehmern"
+#: plugins/gofon/conference/generic.tpl:150
+msgid "Announce users joining or leaving the conference"
+msgstr "Benachrichtige über Abgang/Zugang von Teilnehmern"
+
+#: plugins/gofon/conference/generic.tpl:156
+msgid "Count users"
+msgstr "Zähle Benutzer"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+msgid "Phone conferences"
+msgstr "Telefon-Konferenzen"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Management"
+msgstr "Verwaltung"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
+msgid "Create new conference"
+msgstr "Neue Konferenz erstellen"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
+msgid "New conference"
+msgstr "Neue Konferenz"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:306
+msgid "This table displays all available conference rooms."
+msgstr "Diese Tabelle enthält alle verfügbaren Konferenzräume."
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
+msgid "Name - Number"
+msgstr "Name - Nummer"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:366
+msgid "Conference"
+msgstr "Konferenz"
+
+#: plugins/gofon/conference/headpage.tpl:6
+msgid "List of conference rooms"
+msgstr "Liste der Konferenz-Räume"
 
-#: plugins/gofon/conference/generic.tpl:156
-msgid "Count users"
-msgstr "Zähle Benutzer"
+#: plugins/gofon/conference/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected phone conferences. "
+"Having a large number of phone conferences, you might prefer the range "
+"selectors on top of the conferences list."
+msgstr ""
+"Dieses Menü erlaubt es Ihnen Telefon-Konferenzen hinzuzufügen, zu bearbeiten "
+"oder zu entfernen. Bei einer großen Anzahl von Abteilungen bietet sich die "
+"Verwendung der Bereichswahl an."
+
+#: plugins/gofon/conference/headpage.tpl:36
+msgid "Regular expression for        matching user names"
+msgstr "Regulärer Ausdruck zum Erkennen von Benutzernamen"
 
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
 msgid ""
@@ -10843,69 +10964,10 @@ msgstr ""
 "Die MySQL-Erweiterung wurde nicht gefunden - kann daher keine Änderungen in "
 "der Asterisk-DB speichern."
 
-#: plugins/gofon/conference/headpage.tpl:6
-msgid "List of conference rooms"
-msgstr "Liste der Konferenz-Räume"
-
-#: plugins/gofon/conference/headpage.tpl:24
-msgid ""
-"This menu allows you to create, delete and edit selected phone conferences. "
-"Having a large number of phone conferences, you might prefer the range "
-"selectors on top of the conferences list."
-msgstr ""
-"Dieses Menü erlaubt es Ihnen Telefon-Konferenzen hinzuzufügen, zu bearbeiten "
-"oder zu entfernen. Bei einer großen Anzahl von Abteilungen bietet sich die "
-"Verwendung der Bereichswahl an."
-
-#: plugins/gofon/conference/headpage.tpl:36
-msgid "Regular expression for        matching user names"
-msgstr "Regulärer Ausdruck zum Erkennen von Benutzernamen"
-
 #: plugins/gofon/conference/main.inc:38 plugins/gofon/conference/main.inc:40
 msgid "Conference management"
 msgstr "Konferenz-Verwaltung"
 
-#: plugins/gofon/fonreports/class_fonreport.inc:6
-msgid "Phone Reports"
-msgstr "Telefon-Berichte"
-
-#: plugins/gofon/fonreports/class_fonreport.inc:96
-#: plugins/gofon/fonreports/class_fonreport.inc:106
-msgid "Can't connect to phone database, no reports can be shown!"
-msgstr ""
-"Die Fax-Datenbank kann nicht erreicht werden. Es können keine Berichte "
-"angezeigt werden!"
-
-#: plugins/gofon/fonreports/class_fonreport.inc:110
-msgid "Can't select phone database for report generation!"
-msgstr ""
-"Die Fax-Datenbank kann bezüglich der Berichtgenerierung nicht ausgewählt "
-"werden!"
-
-#: plugins/gofon/fonreports/class_fonreport.inc:212
-msgid "Query for phone database failed!"
-msgstr "Die Anfrage zur Telefon-Datenbank ist fehlgeschlagen!"
-
-#: plugins/gofon/fonreports/contents.tpl:31
-msgid "Source"
-msgstr "Quelle"
-
-#: plugins/gofon/fonreports/contents.tpl:32
-msgid "Destination"
-msgstr "Ziel"
-
-#: plugins/gofon/fonreports/contents.tpl:33
-msgid "Channel"
-msgstr "Kanal"
-
-#: plugins/gofon/fonreports/contents.tpl:36
-msgid "Duration"
-msgstr "Dauer"
-
-#: plugins/gofon/fonreports/main.inc:5
-msgid "Phone reports"
-msgstr "Telefon-Berichte"
-
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
 msgstr "Thin Client"
@@ -10949,34 +11011,76 @@ msgstr "Das GOsa Team"
 msgid "Welcome %s!"
 msgstr "Willkommen %s!"
 
-#: include/class_plugin.inc:465
-#, php-format
+#: include/class_mail-methods-cyrus.inc:39
 msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+"Warning: Account has an invalid mailserver string! Please check the mail "
+"server settings in the mail tab."
 msgstr ""
-"Das in POSTCREATE angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
-"existieren."
+"Warnung: Das Konto hat eine ungültige Mail-Server Adresse! Bitte überprüfen "
+"Sie die Einstellungen des Mail-Servers."
 
-#: include/class_plugin.inc:493 include/class_password-methods.inc:181
-#, php-format
+#: include/class_mail-methods-cyrus.inc:52
 msgid ""
-"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+"Warning: IMAP Server cannot be reached! If you save this account, some mail "
+"settings will not be stored on your server!"
 msgstr ""
-"Das in POSTMODIFY angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
-"existieren."
+"Warnung: Der IMAP-Server kann nicht erreicht werden! Einige Mail-"
+"Einstellungen werden nicht auf den Server übertragen!"
 
-#: include/class_plugin.inc:521
+#: include/class_mail-methods-cyrus.inc:115
 #, php-format
-msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgid "Can't create IMAP mailbox. Server says '%s'."
+msgstr "Kann das IMAP-Postfach nicht anlegen. Der Server meldet '%s'."
+
+#: include/class_mail-methods-cyrus.inc:131
+#, php-format
+msgid "Can't write IMAP quota. Server says '%s'."
+msgstr "Kann die Kontingent-Einstellungen nicht sichern. Der Server meldete '%s'."
+
+#: include/class_mail-methods-cyrus.inc:155
+msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
 msgstr ""
-"Das in POSTREMOVE angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
-"existieren."
+"Achtung: Die PHP-Funktion 'imap_getacl' ist nicht verfügbar - "
+"Zugriffsinformationen können nicht entfernt werden."
+
+#: include/class_mail-methods-cyrus.inc:173
+msgid "Warning: imap_getacl is not available, can't get imap permissions!"
+msgstr ""
+"Achtung: Die PHP-Funktion imap_get_acl ist nicht verfügbar, die IMAP-"
+"Berechtigungen können nicht gelesen werden!"
+
+#: include/class_mail-methods-cyrus.inc:195
+#, php-format
+msgid "Can't remove IMAP mailbox. Server says '%s'."
+msgstr "Kann das IMAP-Postfach nicht entfernen. Der Server meldete '%s'."
+
+#: include/class_mail-methods-cyrus.inc:223
+#, php-format
+msgid "Can't log into SIEVE server. Server says '%s'."
+msgstr "Die Anmeldung am SIEVE-Server ist fehlgeschlagen. Die Meldung war '%s'."
+
+#: include/class_mail-methods-cyrus.inc:236
+#, php-format
+msgid "Can't get sieve script. Server says '%s'."
+msgstr "Kann das aktive SIEVE-Skript nicht herunterladen. Die Meldung lautet '%s'."
+
+#: include/class_mail-methods-cyrus.inc:307
+#, php-format
+msgid "Can't send sieve script. Server says '%s'."
+msgstr "Kann das SIEVE-Skript nicht übertragen. Die Meldung lautet '%s'."
+
+#: include/class_mail-methods-cyrus.inc:311
+#, php-format
+msgid "Can't activate GOsa sieve script. Server says '%s'."
+msgstr "Kann das GOsa SIEVE-Skript nicht aktivieren. Die Meldung lautet '%s'."
+
+#: include/class_debconfTemplate.inc:250
+msgid "This package has no debconf options."
+msgstr "Dieses Paket verfügt über keine debconf-Optionen."
 
 #: include/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
-msgstr ""
-"Kann den LDAP-Server nicht erreichen: keine Überprüfung der Schemata möglich!"
+msgstr "Kann den LDAP-Server nicht erreichen: keine Überprüfung der Schemata möglich!"
 
 #: include/functions_setup.inc:107 include/functions_setup.inc:116
 msgid "Can't get schema information from server. No schema check possible!"
@@ -10995,8 +11099,7 @@ msgstr ""
 
 #: include/functions_setup.inc:140
 #, php-format
-msgid ""
-"Optional objectclass '%s' required by plugin '%s' does not have version %s"
+msgid "Optional objectclass '%s' required by plugin '%s' does not have version %s"
 msgstr ""
 "Die optionale Objektklasse '%s' (benötigt vom Modul '%s') hat nicht die "
 "Versionsnummer %s"
@@ -11018,8 +11121,7 @@ msgstr "Die ben
 
 #: include/functions_setup.inc:170
 msgid "SAMBA 3 support disabled, no schema seems to be installed"
-msgstr ""
-"SAMBA 3.x Unterstützung wurde deaktiviert, kein passendes Schema installiert"
+msgstr "SAMBA 3.x Unterstützung wurde deaktiviert, kein passendes Schema installiert"
 
 #: include/functions_setup.inc:175
 msgid "SAMBA 3 support enabled"
@@ -11027,8 +11129,7 @@ msgstr "SAMBA 3 Unterst
 
 #: include/functions_setup.inc:180
 msgid "SAMBA 2 support disabled, no schema seems to be installed"
-msgstr ""
-"SAMBA 2.x Unterstützung wurde deaktiviert, kein passendes Schema installiert"
+msgstr "SAMBA 2.x Unterstützung wurde deaktiviert, kein passendes Schema installiert"
 
 #: include/functions_setup.inc:185
 msgid "SAMBA 2 support enabled"
@@ -11155,8 +11256,7 @@ msgstr "Suche LDAP-Modul"
 
 #: include/functions_setup.inc:313
 msgid "This is the main module used by GOsa and therefore really required."
-msgstr ""
-"GOsa benötigt dieses Modul für LDAP-Zugriffe, daher ist es unabkömmlich."
+msgstr "GOsa benötigt dieses Modul für LDAP-Zugriffe, daher ist es unabkömmlich."
 
 #: include/functions_setup.inc:316
 msgid "Checking for XML functions"
@@ -11164,8 +11264,7 @@ msgstr "Pr
 
 #: include/functions_setup.inc:317
 msgid "XML functions are required to parse the configuration file."
-msgstr ""
-"Die XML-Funktionen werden benötigt, um die Konfigurationsdatei zu lesen."
+msgstr "Die XML-Funktionen werden benötigt, um die Konfigurationsdatei zu lesen."
 
 #: include/functions_setup.inc:320
 msgid "Checking for gettext support"
@@ -11235,8 +11334,7 @@ msgstr "Suche MySQL-Modul"
 
 #: include/functions_setup.inc:341
 msgid "MySQL support is needed for reading GOfax reports from databases."
-msgstr ""
-"Das MySQL-Modul wird benötigt, um Fax-Berichte anzuzeigen und auszuwerten."
+msgstr "Das MySQL-Modul wird benötigt, um Fax-Berichte anzuzeigen und auszuwerten."
 
 #: include/functions_setup.inc:344
 msgid "Checking for cups module"
@@ -11267,8 +11365,7 @@ msgid "Checking for snmp Module"
 msgstr "Suche SNMP-Modul"
 
 #: include/functions_setup.inc:353
-msgid ""
-"Simple Network Management Protocol (SNMP) is required for client monitoring."
+msgid "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 "Simple Network Management Protocol (SNMP) wird zur Client-Überwachung "
 "benötigt."
@@ -11303,8 +11400,7 @@ msgstr "Suche nach ImageMagick (>=5.4.0)"
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
-msgstr ""
-"ImageMagick wird für die Konvertierung von hochgeladenen Bildern verwendet."
+msgstr "ImageMagick wird für die Konvertierung von hochgeladenen Bildern verwendet."
 
 #: include/functions_setup.inc:418
 msgid "Checking imagick module for PHP"
@@ -11314,8 +11410,7 @@ msgstr "Pr
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
-msgstr ""
-"ImageMagick wird für die Konvertierung von hochgeladenen Bildern verwendet."
+msgstr "ImageMagick wird für die Konvertierung von hochgeladenen Bildern verwendet."
 
 #: include/functions_setup.inc:426
 msgid "Checking for fping utility"
@@ -11464,13 +11559,13 @@ msgstr ""
 #: include/functions_setup.inc:940
 #, php-format
 msgid "Can't log into LDAP server. Reason was: %s."
-msgstr ""
-"Die Anmeldung am LDAP-Server ist fehlgeschlagen. Die Meldung lautet '%s'."
+msgstr "Die Anmeldung am LDAP-Server ist fehlgeschlagen. Die Meldung lautet '%s'."
 
 #: include/functions_setup.inc:1050 include/functions_setup.inc:1073
 #: include/functions_setup.inc:1082 html/index.php:181
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
+#: ihtml/themes/lhs/setup_useradmin.tpl:6
 msgid ""
 "You're missing an administrative account for GOsa, you'll not be able to "
 "administrate anything!"
@@ -11485,9 +11580,15 @@ msgstr ""
 "Das Setzen des Passwortes ist fehlgeschlagen. Die Meldung vom LDAP-Server "
 "lautet '%s'."
 
+#: include/class_password-methods.inc:181 include/class_plugin.inc:493
+#, php-format
+msgid "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Das in POSTMODIFY angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
+"existieren."
+
 #: include/class_password-methods.inc:202
-msgid ""
-"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
+msgid "Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
 msgstr ""
 "Die Einstellung 'SMBHASH' in /etc/gosa/gosa.conf ist nicht korrekt! Das "
 "Samba-Passwort kann nicht geändert werden."
@@ -11523,23 +11624,6 @@ msgstr "%s Ergebnisse f
 msgid "%s%% hit rate in file %s"
 msgstr "%s%% Trefferquote in Datei %s"
 
-#: include/class_password-methods-kerberos.inc:43
-msgid ""
-"Warning: Can't set kerberos password. Your PHP version has no kerberos "
-"support, password has not been changed."
-msgstr ""
-"Achtung: Das Kerberos-Passwort kann nicht gesetzt werden. Die von Ihnen "
-"verwendete PHP-Version besitzt keine Unterstützung für Kerberos."
-
-#: include/class_password-methods-kerberos.inc:52
-msgid "Kerberos database communication failed!"
-msgstr "Die Kommunikation mit der Kerberos-Datenbank ist fehlgeschlagen!"
-
-#: include/class_password-methods-kerberos.inc:59
-msgid "Changing password in kerberos database failed!"
-msgstr ""
-"Die Änderung des Passworts in der Kerberos-Datenbank ist fehlgeschlagen!"
-
 #: include/class_ppdManager.inc:13
 #, php-format
 msgid "PPD manager : The specified path '%s' doesn't exists."
@@ -11581,6 +11665,22 @@ msgstr ""
 "Das Verarbeiten der PPD-Datei '%s' ist fehlgeschlagen - keine Information "
 "gefunden."
 
+#: include/class_password-methods-kerberos.inc:43
+msgid ""
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
+msgstr ""
+"Achtung: Das Kerberos-Passwort kann nicht gesetzt werden. Die von Ihnen "
+"verwendete PHP-Version besitzt keine Unterstützung für Kerberos."
+
+#: include/class_password-methods-kerberos.inc:52
+msgid "Kerberos database communication failed!"
+msgstr "Die Kommunikation mit der Kerberos-Datenbank ist fehlgeschlagen!"
+
+#: include/class_password-methods-kerberos.inc:59
+msgid "Changing password in kerberos database failed!"
+msgstr "Die Änderung des Passworts in der Kerberos-Datenbank ist fehlgeschlagen!"
+
 #: include/class_certificate.inc:35
 msgid "Can't open specified file, check accessibility and or existence"
 msgstr ""
@@ -11671,8 +11771,7 @@ msgstr "Die Kennung ist nicht eindeutig. Bitte pr
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
-msgstr ""
-"Fehler beim Anlegen eines Locks. Die Parameter sind nicht korrekt gesetzt!"
+msgstr "Fehler beim Anlegen eines Locks. Die Parameter sind nicht korrekt gesetzt!"
 
 #: include/functions.inc:379
 #, php-format
@@ -11687,8 +11786,7 @@ msgstr ""
 #: include/functions.inc:394
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
-msgstr ""
-"Kann keinen Zugriffsschutz anlegen. Die Meldung des LDAP-Servers lautet '%s'."
+msgstr "Kann keinen Zugriffsschutz anlegen. Die Meldung des LDAP-Servers lautet '%s'."
 
 #: include/functions.inc:420
 #, php-format
@@ -11790,6 +11888,7 @@ msgstr ""
 #: include/class_pluglist.inc:130 ihtml/themes/altlinux/framework.tpl:14
 #: ihtml/themes/altlinux/framework.tpl:24
 #: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
+#: ihtml/themes/lhs/framework.tpl:14 ihtml/themes/lhs/framework.tpl:24
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
 "changes?"
@@ -11812,25 +11911,26 @@ msgstr ""
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr "SID und/oder RIDBASE fehlen in der Konfiguration!"
 
-#: include/class_ldap.inc:406
+#: include/class_ldap.inc:405
 #, php-format
-msgid "Creating duplicate of %s in %s"
-msgstr "Erstelle Duplikat von %s nach %s"
+msgid "Creating copy of %s"
+msgstr "Erstelle Kopie von %s"
 
-#: include/class_ldap.inc:409
+#: include/class_ldap.inc:408
 msgid "Processing"
 msgstr "Verarbeite"
 
-#: include/class_ldap.inc:515
+#: include/class_ldap.inc:448
+#, fuzzy
+msgid "Error while fetching source dn - aborted!"
+msgstr "Fehler beim Speichern des Druckers"
+
+#: include/class_ldap.inc:511
 #, php-format
 msgid "Unknown FAIstate %s"
 msgstr "unbekannter FAI-Status %s"
 
-#: include/class_ldap.inc:558
-msgid "Successfully finished"
-msgstr "Erfolgreich abgeschlossen"
-
-#: include/class_ldap.inc:635
+#: include/class_ldap.inc:632
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -11839,106 +11939,60 @@ msgstr ""
 "Das automatische Erzeugen des Objekt-Typs '%s' wird momentan nicht "
 "unterstützt. Bitte melden Sie dies an das Entwicklerteam."
 
-#: include/class_ldap.inc:897
+#: include/class_ldap.inc:894
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
-"Dies ist keine valide DN: '%s'.  Ein Block für den Import sollte mit "
-"'dn:...' beginnen in Zeile %s"
-
-#: include/class_ldap.inc:910
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
-msgstr "Der DN: '%s' (aus Zeile %s) existiert bereits in der LDAP-Datenbank."
-
-#: include/class_ldap.inc:926
-#, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
-msgstr ""
-"Fehler beim Importieren von dn: '%s', bitte überprüfen Sie die LDIF-Datei ab "
-"Zeile %s!"
-
-#: include/class_debconfTemplate.inc:250
-msgid "This package has no debconf options."
-msgstr "Dieses Paket verfügt über keine debconf-Optionen."
-
-#: include/class_mail-methods-cyrus.inc:39
-msgid ""
-"Warning: Account has an invalid mailserver string! Please check the mail "
-"server settings in the mail tab."
-msgstr ""
-"Warnung: Das Konto hat eine ungültige Mail-Server Adresse! Bitte überprüfen "
-"Sie die Einstellungen des Mail-Servers."
-
-#: include/class_mail-methods-cyrus.inc:52
-msgid ""
-"Warning: IMAP Server cannot be reached! If you save this account, some mail "
-"settings will not be stored on your server!"
-msgstr ""
-"Warnung: Der IMAP-Server kann nicht erreicht werden! Einige Mail-"
-"Einstellungen werden nicht auf den Server übertragen!"
-
-#: include/class_mail-methods-cyrus.inc:115
-#, php-format
-msgid "Can't create IMAP mailbox. Server says '%s'."
-msgstr "Kann das IMAP-Postfach nicht anlegen. Der Server meldet '%s'."
-
-#: include/class_mail-methods-cyrus.inc:131
-#, php-format
-msgid "Can't write IMAP quota. Server says '%s'."
-msgstr ""
-"Kann die Kontingent-Einstellungen nicht sichern. Der Server meldete '%s'."
-
-#: include/class_mail-methods-cyrus.inc:155
-msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
-msgstr ""
-"Achtung: Die PHP-Funktion 'imap_getacl' ist nicht verfügbar - "
-"Zugriffsinformationen können nicht entfernt werden."
-
-#: include/class_mail-methods-cyrus.inc:173
-msgid "Warning: imap_getacl is not available, can't get imap permissions!"
-msgstr ""
-"Achtung: Die PHP-Funktion imap_get_acl ist nicht verfügbar, die IMAP-"
-"Berechtigungen können nicht gelesen werden!"
+"Dies ist keine valide DN: '%s'.  Ein Block für den Import sollte mit "
+"'dn:...' beginnen in Zeile %s"
 
-#: include/class_mail-methods-cyrus.inc:195
+#: include/class_ldap.inc:907
 #, php-format
-msgid "Can't remove IMAP mailbox. Server says '%s'."
-msgstr "Kann das IMAP-Postfach nicht entfernen. Der Server meldete '%s'."
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr "Der DN: '%s' (aus Zeile %s) existiert bereits in der LDAP-Datenbank."
 
-#: include/class_mail-methods-cyrus.inc:223
+#: include/class_ldap.inc:923
 #, php-format
-msgid "Can't log into SIEVE server. Server says '%s'."
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
-"Die Anmeldung am SIEVE-Server ist fehlgeschlagen. Die Meldung war '%s'."
+"Fehler beim Importieren von dn: '%s', bitte überprüfen Sie die LDIF-Datei ab "
+"Zeile %s!"
 
-#: include/class_mail-methods-cyrus.inc:236
+#: include/class_plugin.inc:465
 #, php-format
-msgid "Can't get sieve script. Server says '%s'."
+msgid "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
-"Kann das aktive SIEVE-Skript nicht herunterladen. Die Meldung lautet '%s'."
-
-#: include/class_mail-methods-cyrus.inc:307
-#, php-format
-msgid "Can't send sieve script. Server says '%s'."
-msgstr "Kann das SIEVE-Skript nicht übertragen. Die Meldung lautet '%s'."
+"Das in POSTCREATE angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
+"existieren."
 
-#: include/class_mail-methods-cyrus.inc:311
+#: include/class_plugin.inc:521
 #, php-format
-msgid "Can't activate GOsa sieve script. Server says '%s'."
-msgstr "Kann das GOsa SIEVE-Skript nicht aktivieren. Die Meldung lautet '%s'."
+msgid "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Das in POSTREMOVE angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
+"existieren."
 
 #: include/class_CopyPasteHandler.inc:172
 #, php-format
 msgid "You are going to copy the entry '%s'."
 msgstr "Sie kopieren gerade den Eintrag %s."
 
+#: html/helpviewer.php:116
+msgid "There is no helpfile specified for this class."
+msgstr "Für diese Klasse wurde keine Hilfedatei angegeben."
+
+#: html/helpviewer.php:226
+#, php-format
+msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
+msgstr ""
+"Auf das Hilfeverzeichnis '%s' kann nicht zugegriffen werden - kann daher "
+"keine Hilfedateien lesen."
+
 #: html/getvcard.php:36
 msgid "Error: getcvard.php needs a parameter to export a vcard!"
-msgstr ""
-"Fehler: getvcard.php benötigt einen Parameter um eine vcard zu exportieren!"
+msgstr "Fehler: getvcard.php benötigt einen Parameter um eine vcard zu exportieren!"
 
 #: html/setup.php:86
 #, php-format
@@ -12074,8 +12128,7 @@ msgstr ""
 "anfordern. Bitte stellen Sie sicher, dass dies möglich ist."
 
 #: html/index.php:162
-msgid ""
-"Your ldap setup contains old schema definitions. Please re-run the setup."
+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."
@@ -12104,19 +12157,9 @@ msgstr "SSL Sitzung"
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr "Ihr Browser hat Cookies deaktiviert. Bitte aktivieren Sie zunächst Cookies und laden "
-"anschliessend diese Seite neu, bevor Sie sich anmelden!"
-
-#: html/helpviewer.php:116
-msgid "There is no helpfile specified for this class."
-msgstr "Für diese Klasse wurde keine Hilfedatei angegeben."
-
-#: html/helpviewer.php:226
-#, php-format
-msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
 msgstr ""
-"Auf das Hilfeverzeichnis '%s' kann nicht zugegriffen werden - kann daher "
-"keine Hilfedateien lesen."
+"Ihr Browser hat Cookies deaktiviert. Bitte aktivieren Sie zunächst Cookies "
+"und laden anschliessend diese Seite neu, bevor Sie sich anmelden!"
 
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
@@ -12130,6 +12173,16 @@ msgstr "Die angegebene Datenbank kann nicht ausgew
 msgid "Database query failed!"
 msgstr "Die Datenbankabfrage ist fehlgeschlagen!"
 
+#: html/getkiosk.php:25
+#, php-format
+msgid "Can't open file '%s', possibly the file does not exist."
+msgstr "Kann Datei '%s' nicht öffnen, möglicherweise existiert sie nicht."
+
+#: html/getkiosk.php:30
+#, php-format
+msgid "Can't read file '%s', check permissions."
+msgstr "Kann Datei '%s' nicht lesen, überprüfen Sie die Rechte."
+
 #: html/main.php:151
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
@@ -12157,16 +12210,6 @@ msgstr ""
 "Der W3C-Validator meldete einen oder mehrere Fehler beim Erzeugen dieser "
 "Seite!"
 
-#: html/getkiosk.php:25
-#, php-format
-msgid "Can't open file '%s', possibly the file does not exist."
-msgstr "Kann Datei '%s' nicht öffnen, möglicherweise existiert sie nicht."
-
-#: html/getkiosk.php:30
-#, php-format
-msgid "Can't read file '%s', check permissions."
-msgstr "Kann Datei '%s' nicht lesen, überprüfen Sie die Rechte."
-
 #: html/get_attachment.php:47
 msgid ""
 "Can't connect to glpi database, there is no mysl extension available in your "
@@ -12176,8 +12219,7 @@ msgstr ""
 "PHP-Umgebung nicht verfügbar ist."
 
 #: html/get_attachment.php:55
-msgid ""
-"Can't connect to specified database, please check your glpi configuration."
+msgid "Can't connect to specified database, please check your glpi configuration."
 msgstr ""
 "Kann die angegebene Datenbank nicht erreiche, bitte überprüfen Sie Ihre glpi-"
 "Konfiguration."
@@ -12193,11 +12235,46 @@ msgstr ""
 msgid "Can't open file '%s'."
 msgstr "Kann Datei '%s' nicht öffnen."
 
+#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
+#: ihtml/themes/lhs/sizelimit.tpl:3
+msgid ""
+"The size limit option makes LDAP operations faster and saves the LDAP server "
+"from getting too much load. The easiest way to handle big databases without "
+"long timeouts would be to limit your search to smaller values and use "
+"filters to get the entries you are looking for."
+msgstr ""
+"Die Größenbeschränkung sorgt dafür, daß die LDAP-Operationen schneller "
+"durchgeführt werden können und verringern die Last auf dem LDAP-Server. Der "
+"einfachste Weg, große Datenbanken ohne große Zeitüberschreitungen zu "
+"bearbeiten ist es Filter zu verwenden und die Größenbeschränkungen auf einen "
+"sinnvollen Wert einzustellen."
+
+#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
+#: ihtml/themes/lhs/sizelimit.tpl:6
+msgid "Please choose the way to react for this session"
+msgstr "Bitte entscheiden Sie, wie für diese Sitzung verfahren werden soll"
+
+#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
+#: ihtml/themes/lhs/sizelimit.tpl:9
+msgid "ignore this error and show all entries the LDAP server returns"
+msgstr "Ignoriere diesen Fehler und zeige alle vom LDAP-Server gelieferten Einträge"
+
+#: ihtml/themes/altlinux/sizelimit.tpl:10
+#: ihtml/themes/default/sizelimit.tpl:10 ihtml/themes/lhs/sizelimit.tpl:10
+msgid ""
+"ignore this error and show all entries that fit into the defined sizelimit "
+"and let me use filters instead"
+msgstr ""
+"Ignoriere diesen Fehler und zeige alle Einträge, die innerhalb der "
+"Größenbeschränkung liegen"
+
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
+#: ihtml/themes/lhs/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr "Ein Sitzungskonflikt wurde festgestellt"
 
 #: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/default/conflict.tpl:6
+#: ihtml/themes/lhs/conflict.tpl:6
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
@@ -12211,6 +12288,7 @@ msgstr ""
 "<b>Abmelden</b> schließt diese Sitzung."
 
 #: ihtml/themes/altlinux/conflict.tpl:10 ihtml/themes/default/conflict.tpl:10
+#: ihtml/themes/lhs/conflict.tpl:10
 msgid ""
 "Ignoring this message will change/destroy the data you're currently editing, "
 "so please close multiple windows and log in again."
@@ -12220,11 +12298,36 @@ msgstr ""
 "und melden sich neu an."
 
 #: ihtml/themes/altlinux/conflict.tpl:14 ihtml/themes/default/conflict.tpl:14
+#: ihtml/themes/lhs/conflict.tpl:14
 msgid "Logout"
 msgstr "Abmelden"
 
+#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
+#: ihtml/themes/lhs/login.tpl:17
+msgid "Please use your <i>username</i> and <i>password</i> to log in"
+msgstr ""
+"Melden Sie sich bitte mit Ihrem <i>Benutzernamen</i> und Ihrem <i>Passwort</"
+"i> an"
+
+#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
+#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
+#: ihtml/themes/lhs/login.tpl:46 ihtml/themes/lhs/login.tpl:49
+msgid "Directory"
+msgstr "Verzeichnis"
+
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:57
+#: ihtml/themes/lhs/login.tpl:57
+msgid "Sign in"
+msgstr "Anmelden"
+
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:58
+#: ihtml/themes/lhs/login.tpl:58
+msgid "Click here to log in"
+msgstr "Hier klicken zum Anmelden"
+
 #: ihtml/themes/altlinux/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
+#: ihtml/themes/lhs/setup_introduction.tpl:1
 msgid "Welcome to the GOsa setup!"
 msgstr "Willkommen bei der GOsa Einrichtung!"
 
@@ -12247,11 +12350,13 @@ msgstr ""
 
 #: ihtml/themes/altlinux/setup_useradmin.tpl:3
 #: ihtml/themes/default/setup_useradmin.tpl:3
+#: ihtml/themes/lhs/setup_useradmin.tpl:3
 msgid "You already have an Administrative Account and a Group."
 msgstr "Sie haben bereits ein administratives Konto und eine passende Gruppe."
 
 #: ihtml/themes/altlinux/setup_useradmin.tpl:10
 #: ihtml/themes/default/setup_useradmin.tpl:10
+#: ihtml/themes/lhs/setup_useradmin.tpl:10
 msgid ""
 "To provide full administrative access to GOsa, you need to create a special "
 "group which contains the administrative user. The setup program can assist "
@@ -12264,102 +12369,38 @@ msgstr ""
 "Benutzernamen und das zugehörige Passwort in das untere Feld ein, um die "
 "fehlenden Einträge zu erstellen."
 
-#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
-msgid "Please use your <i>username</i> and <i>password</i> to log in"
-msgstr ""
-"Melden Sie sich bitte mit Ihrem <i>Benutzernamen</i> und Ihrem <i>Passwort</"
-"i> an"
-
-#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
-#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
-msgid "Directory"
-msgstr "Verzeichnis"
-
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:57
-msgid "Sign in"
-msgstr "Anmelden"
-
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:58
-msgid "Click here to log in"
-msgstr "Hier klicken zum Anmelden"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
-msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
-"filters to get the entries you are looking for."
-msgstr ""
-"Die Größenbeschränkung sorgt dafür, daß die LDAP-Operationen schneller "
-"durchgeführt werden können und verringern die Last auf dem LDAP-Server. Der "
-"einfachste Weg, große Datenbanken ohne große Zeitüberschreitungen zu "
-"bearbeiten ist es Filter zu verwenden und die Größenbeschränkungen auf einen "
-"sinnvollen Wert einzustellen."
-
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
-msgid "Please choose the way to react for this session"
-msgstr "Bitte entscheiden Sie, wie für diese Sitzung verfahren werden soll"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
-msgid "ignore this error and show all entries the LDAP server returns"
-msgstr ""
-"Ignoriere diesen Fehler und zeige alle vom LDAP-Server gelieferten Einträge"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:10
-#: ihtml/themes/default/sizelimit.tpl:10
-msgid ""
-"ignore this error and show all entries that fit into the defined sizelimit "
-"and let me use filters instead"
-msgstr ""
-"Ignoriere diesen Fehler und zeige alle Einträge, die innerhalb der "
-"Größenbeschränkung liegen"
-
 #: ihtml/themes/altlinux/framework.tpl:15
-#: ihtml/themes/default/framework.tpl:15
+#: ihtml/themes/default/framework.tpl:15 ihtml/themes/lhs/framework.tpl:15
 msgid "Main"
 msgstr "Hauptmenü"
 
 #: ihtml/themes/altlinux/framework.tpl:20
-#: ihtml/themes/default/framework.tpl:20
+#: ihtml/themes/default/framework.tpl:20 ihtml/themes/lhs/framework.tpl:20
 msgid "Help"
 msgstr "Hilfe"
 
 #: ihtml/themes/altlinux/framework.tpl:25
-#: ihtml/themes/default/framework.tpl:25
+#: ihtml/themes/default/framework.tpl:25 ihtml/themes/lhs/framework.tpl:25
 msgid "Sign out"
 msgstr "Abmelden"
 
 #: ihtml/themes/altlinux/framework.tpl:33
-#: ihtml/themes/default/framework.tpl:33
+#: ihtml/themes/default/framework.tpl:33 ihtml/themes/lhs/framework.tpl:33
 msgid "Signed in:"
 msgstr "Angemeldet:"
 
-#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
-msgid "Locking conflict detected"
-msgstr "Ein Zugriffskonflikt wurde festgestellt"
-
-#: ihtml/themes/altlinux/islocked.tpl:9
-msgid ""
-"If this lock detection is false, the other person has obviously closed the "
-"webbrowser during the edit operation. You may delete the lockfile in this "
-"case by pressing the <i>Remove</i> button."
-msgstr ""
-"Wenn diese Anzeige eines Zugriffskonflikts fehlerhaft ist, hat eine andere "
-"Person offenbar während der Bearbeitung eines Eintrages einfach den "
-"Webbrowser geschlossen. In einem solchen Fall können Sie den Konflikt durch "
-"einen Klick auf <i>Entfernen</i> beseitigen."
-
 #: ihtml/themes/altlinux/setup_step2.tpl:1
 #: ihtml/themes/altlinux/setup_step3.tpl:1
 #: ihtml/themes/altlinux/setup_step4.tpl:1
 #: ihtml/themes/default/setup_step2.tpl:1
 #: ihtml/themes/default/setup_step3.tpl:1
-#: ihtml/themes/default/setup_step4.tpl:1
+#: ihtml/themes/default/setup_step4.tpl:1 ihtml/themes/lhs/setup_step2.tpl:1
+#: ihtml/themes/lhs/setup_step3.tpl:1 ihtml/themes/lhs/setup_step4.tpl:1
 msgid "Setup continued..."
 msgstr "Einrichtung wird fortgesetzt..."
 
 #: ihtml/themes/altlinux/setup_step2.tpl:4
-#: ihtml/themes/default/setup_step2.tpl:4
+#: ihtml/themes/default/setup_step2.tpl:4 ihtml/themes/lhs/setup_step2.tpl:4
 msgid ""
 "Step two looks for a set of helper programms and checks if they have the "
 "correct minimum version."
@@ -12367,8 +12408,24 @@ msgstr ""
 "Der zweite Schritt prüft auf die Verfügbarkeit einiger Hilfsprogramme und "
 "testet, ob sie in der richtigen Version vorliegen."
 
+#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
+#: ihtml/themes/lhs/islocked.tpl:2
+msgid "Locking conflict detected"
+msgstr "Ein Zugriffskonflikt wurde festgestellt"
+
+#: ihtml/themes/altlinux/islocked.tpl:9 ihtml/themes/lhs/islocked.tpl:9
+msgid ""
+"If this lock detection is false, the other person has obviously closed the "
+"webbrowser during the edit operation. You may delete the lockfile in this "
+"case by pressing the <i>Remove</i> button."
+msgstr ""
+"Wenn diese Anzeige eines Zugriffskonflikts fehlerhaft ist, hat eine andere "
+"Person offenbar während der Bearbeitung eines Eintrages einfach den "
+"Webbrowser geschlossen. In einem solchen Fall können Sie den Konflikt durch "
+"einen Klick auf <i>Entfernen</i> beseitigen."
+
 #: ihtml/themes/altlinux/setup_step3.tpl:4
-#: ihtml/themes/default/setup_step3.tpl:4
+#: ihtml/themes/default/setup_step3.tpl:4 ihtml/themes/lhs/setup_step3.tpl:4
 msgid ""
 "Now we're going include your LDAP server and create an initial "
 "configuration. After you've entered the server URI below, a quick check is "
@@ -12384,7 +12441,7 @@ msgstr ""
 "der Verzeichnisstruktur erfolgt später."
 
 #: ihtml/themes/altlinux/setup_step3.tpl:10
-#: ihtml/themes/default/setup_step3.tpl:10
+#: ihtml/themes/default/setup_step3.tpl:10 ihtml/themes/lhs/setup_step3.tpl:10
 msgid ""
 "Please enter the server URI to allow the setup to connect your LDAP server "
 "<i>(Example: ldap://your.server:389).</i>"
@@ -12393,7 +12450,7 @@ msgstr ""
 "Server verbinden kann<i>(Beispiel: ldap://ihr.server:389)</i>"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:2
-#: ihtml/themes/default/setup_step4.tpl:2
+#: ihtml/themes/default/setup_step4.tpl:2 ihtml/themes/lhs/setup_step4.tpl:2
 msgid ""
 "The following fields allow the basic configuration of GOsa's behaviour and "
 "affect various properties in your main configuration."
@@ -12402,17 +12459,17 @@ msgstr ""
 "beeinflussen verschiedene Eigenschaften der Hauptkonfiguration."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:7
-#: ihtml/themes/default/setup_step4.tpl:7
+#: ihtml/themes/default/setup_step4.tpl:7 ihtml/themes/lhs/setup_step4.tpl:7
 msgid "Enter a description for the location you're configuring here"
 msgstr "Geben Sie eine Beschreibung des hier konfigurierten Standortes ein"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:11
-#: ihtml/themes/default/setup_step4.tpl:11
+#: ihtml/themes/default/setup_step4.tpl:11 ihtml/themes/lhs/setup_step4.tpl:11
 msgid "Location name"
 msgstr "Name des Standortes:"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:18
-#: ihtml/themes/default/setup_step4.tpl:18
+#: ihtml/themes/default/setup_step4.tpl:18 ihtml/themes/lhs/setup_step4.tpl:18
 msgid ""
 "GOsa always acts as admin and manages access rights internally. This is a "
 "workaround till OpenLDAP's in directory ACI's are fully implemented. For "
@@ -12425,17 +12482,17 @@ msgstr ""
 "Passwort benötigt."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:23
-#: ihtml/themes/default/setup_step4.tpl:23
+#: ihtml/themes/default/setup_step4.tpl:23 ihtml/themes/lhs/setup_step4.tpl:23
 msgid "Admin DN"
 msgstr "Administrator-DN:"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:27
-#: ihtml/themes/default/setup_step4.tpl:27
+#: ihtml/themes/default/setup_step4.tpl:27 ihtml/themes/lhs/setup_step4.tpl:27
 msgid "Admin password"
 msgstr "Administrator-Passwort:"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:34
-#: ihtml/themes/default/setup_step4.tpl:34
+#: ihtml/themes/default/setup_step4.tpl:34 ihtml/themes/lhs/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
 "saves people and groups, including the way accounts get created. Check the "
@@ -12446,32 +12503,32 @@ msgstr ""
 "Vorgaben entsprechen."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:39
-#: ihtml/themes/default/setup_step4.tpl:39
+#: ihtml/themes/default/setup_step4.tpl:39 ihtml/themes/lhs/setup_step4.tpl:39
 msgid "Base "
 msgstr "Basis:"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:43
-#: ihtml/themes/default/setup_step4.tpl:43
+#: ihtml/themes/default/setup_step4.tpl:43 ihtml/themes/lhs/setup_step4.tpl:43
 msgid "People storage ou"
 msgstr "Ablage-OU für Benutzer:"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:47
-#: ihtml/themes/default/setup_step4.tpl:47
+#: ihtml/themes/default/setup_step4.tpl:47 ihtml/themes/lhs/setup_step4.tpl:47
 msgid "People dn attribute"
 msgstr "DN-Attribut für Benutzer:"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:55
-#: ihtml/themes/default/setup_step4.tpl:55
+#: ihtml/themes/default/setup_step4.tpl:55 ihtml/themes/lhs/setup_step4.tpl:55
 msgid "Group storage ou"
 msgstr "Ablage-OU für Gruppen:"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:59
-#: ihtml/themes/default/setup_step4.tpl:59
+#: ihtml/themes/default/setup_step4.tpl:59 ihtml/themes/lhs/setup_step4.tpl:59
 msgid "ID base for users/groups"
 msgstr "ID-Basis für Benutzer/Gruppen:"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:67
-#: ihtml/themes/default/setup_step4.tpl:67
+#: ihtml/themes/default/setup_step4.tpl:67 ihtml/themes/lhs/setup_step4.tpl:67
 msgid ""
 "GOsa supports several encryption types for your passwords. Normally this is "
 "adjustable via user templates, but you can specify a default method to be "
@@ -12482,12 +12539,12 @@ msgstr ""
 "eine Standardmethode festlegen, die benutzt werden soll."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:72
-#: ihtml/themes/default/setup_step4.tpl:72
+#: ihtml/themes/default/setup_step4.tpl:72 ihtml/themes/lhs/setup_step4.tpl:72
 msgid "Encryption algorithm"
 msgstr "Verschlüsselungsalgorithmus"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:83
-#: ihtml/themes/default/setup_step4.tpl:83
+#: ihtml/themes/default/setup_step4.tpl:83 ihtml/themes/lhs/setup_step4.tpl:83
 msgid ""
 "GOsa has modular support for several mail methods. These methods provide "
 "interfaces to users mailboxes and general handling for quotas. You can "
@@ -12499,7 +12556,7 @@ msgstr ""
 "zu lassen."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:88
-#: ihtml/themes/default/setup_step4.tpl:88
+#: ihtml/themes/default/setup_step4.tpl:88 ihtml/themes/lhs/setup_step4.tpl:88
 msgid "Mail method"
 msgstr "Zustellungs-Methode"
 
@@ -12515,31 +12572,35 @@ msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:103
 #: ihtml/themes/default/setup_step4.tpl:104
+#: ihtml/themes/lhs/setup_step4.tpl:104
 msgid "Display PHP errors"
 msgstr "Zeige PHP-Fehler an"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:106
 #: ihtml/themes/default/setup_step4.tpl:107
+#: ihtml/themes/lhs/setup_step4.tpl:107
 msgid "true"
 msgstr "wahr"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:107
 #: ihtml/themes/default/setup_step4.tpl:108
+#: ihtml/themes/lhs/setup_step4.tpl:108
 msgid "false"
 msgstr "falsch"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:115
 #: ihtml/themes/default/setup_step4.tpl:115
+#: ihtml/themes/lhs/setup_step4.tpl:115
 msgid "Check"
 msgstr "Prüfen"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:1
-#: ihtml/themes/default/setup_finish.tpl:1
+#: ihtml/themes/default/setup_finish.tpl:1 ihtml/themes/lhs/setup_finish.tpl:1
 msgid "Setup finished"
 msgstr "Einrichtung abgeschlossen"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:3
-#: ihtml/themes/default/setup_finish.tpl:3
+#: ihtml/themes/default/setup_finish.tpl:3 ihtml/themes/lhs/setup_finish.tpl:3
 msgid ""
 "Basically the setup is finished. You can check the result of the schema "
 "check here and download the autogenerated gosa.conf below."
@@ -12549,17 +12610,19 @@ msgstr ""
 "herunterladen."
 
 #: ihtml/themes/altlinux/setup_finish.tpl:7
-#: ihtml/themes/default/setup_finish.tpl:7
+#: ihtml/themes/default/setup_finish.tpl:7 ihtml/themes/lhs/setup_finish.tpl:7
 msgid "Schema Configuration"
 msgstr "Schema-Konfiguration"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:12
 #: ihtml/themes/default/setup_finish.tpl:12
+#: ihtml/themes/lhs/setup_finish.tpl:12
 msgid "Configuration File"
 msgstr "Konfigurationsdatei"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:14
 #: ihtml/themes/default/setup_finish.tpl:14
+#: ihtml/themes/lhs/setup_finish.tpl:14
 msgid ""
 "GOsa setup has collected all data needed to create an initial configuration "
 "file. Save the the link below as your gosa.conf and place that file in /etc/"
@@ -12572,11 +12635,13 @@ msgstr ""
 
 #: ihtml/themes/altlinux/setup_finish.tpl:17
 #: ihtml/themes/default/setup_finish.tpl:17
+#: ihtml/themes/lhs/setup_finish.tpl:17
 msgid "Download configuration"
 msgstr "Konfiguration herunterladen"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:20
 #: ihtml/themes/default/setup_finish.tpl:20
+#: ihtml/themes/lhs/setup_finish.tpl:20
 msgid ""
 "After placing the file under /etc/gosa, place make sure that the webserver "
 "user is able to read gosa.conf, while other users shouldn't. You may want to "
@@ -12587,7 +12652,16 @@ msgstr ""
 "während normale Nutzer dies nicht dürfen. Führen Sie diese Kommandos aus, um "
 "die obigen Voraussetzungen zu erfüllen:"
 
+#: ihtml/themes/default/help.tpl:9 ihtml/themes/lhs/help.tpl:9
+msgid "GOsa help viewer"
+msgstr "GOsa Hilfe-Browser"
+
+#: ihtml/themes/default/help.tpl:15 ihtml/themes/lhs/help.tpl:15
+msgid "Index"
+msgstr "Index"
+
 #: ihtml/themes/default/setup_introduction.tpl:4
+#: ihtml/themes/lhs/setup_introduction.tpl:4
 msgid ""
 "It looks like you're calling GOsa for the first time - no configuration was "
 "found. This setup like script will try to aid you in creating a working "
@@ -12606,6 +12680,7 @@ msgstr ""
 "Verbindung konfiguriert."
 
 #: ihtml/themes/default/setup_introduction.tpl:17
+#: ihtml/themes/lhs/setup_introduction.tpl:17
 msgid ""
 "You can also use the new and more-advanced way of inspecting your PHP-"
 "installation. It will give you information about the exact function that "
@@ -12618,16 +12693,27 @@ msgstr ""
 "werden kann. Diese Methode ist nützlich, wenn Sie genau wissen, was Sie tun."
 
 #: ihtml/themes/default/setup_introduction.tpl:19
+#: ihtml/themes/lhs/setup_introduction.tpl:19
 msgid "Toggle Show/Hide"
 msgstr "Zeige/Verstecke"
 
-#: ihtml/themes/default/help.tpl:9
-msgid "GOsa help viewer"
-msgstr "GOsa Hilfe-Browser"
+#: ihtml/themes/default/logout.tpl:5 ihtml/themes/lhs/logout.tpl:5
+msgid "Your GOsa session has expired!"
+msgstr "Die Gültigkeit ihrer GOsa-Sitzung ist abgelaufen!"
 
-#: ihtml/themes/default/help.tpl:15
-msgid "Index"
-msgstr "Index"
+#: ihtml/themes/default/logout.tpl:7 ihtml/themes/lhs/logout.tpl:7
+msgid ""
+"The last interaction with the GOsa web interface has been some time ago in "
+"the past. For security reasons, the session has been closed. To continue "
+"with administrative tasks, please sign in again."
+msgstr ""
+"Die letzte in der Web-Applikation durchgeführte Aktion liegt einige Zeit in "
+"der Vergangenheit. Aus Sicherheitsgründen wurde die Sitzung geschlossen. Um "
+"mit der Administration fortzufahren, melden Sie sich bitte erneut an."
+
+#: ihtml/themes/default/logout.tpl:10 ihtml/themes/lhs/logout.tpl:10
+msgid "Sign in again"
+msgstr "Erneut anmelden"
 
 #: ihtml/themes/default/islocked.tpl:9
 msgid ""
@@ -12644,33 +12730,6 @@ msgstr ""
 msgid "Edit anyway"
 msgstr "Trotzdem bearbeiten"
 
-#: ihtml/themes/default/setup_step4.tpl:100
-msgid ""
-"GOsa may cause PHP interpreter errors, particularly in case of Beta "
-"versions. In some cases it would be helpful to enable the error reporting."
-msgstr ""
-"GOsa kann Fehler im PHP-Interpreter erzeugen. In einigen Fällen ist es "
-"hilfreich, das 'error_reporting' zu aktivieren (dies kann jedoch ein "
-"Sicherheitsrisiko darstellen)."
-
-#: ihtml/themes/default/logout.tpl:5
-msgid "Your GOsa session has expired!"
-msgstr "Die Gültigkeit ihrer GOsa-Sitzung ist abgelaufen!"
-
-#: ihtml/themes/default/logout.tpl:7
-msgid ""
-"The last interaction with the GOsa web interface has been some time ago in "
-"the past. For security reasons, the session has been closed. To continue "
-"with administrative tasks, please sign in again."
-msgstr ""
-"Die letzte in der Web-Applikation durchgeführte Aktion liegt einige Zeit in "
-"der Vergangenheit. Aus Sicherheitsgründen wurde die Sitzung geschlossen. Um "
-"mit der Administration fortzufahren, melden Sie sich bitte erneut an."
-
-#: ihtml/themes/default/logout.tpl:10
-msgid "Sign in again"
-msgstr "Erneut anmelden"
-
 #: ihtml/themes/default/copyPasteDialog.tpl:1
 msgid "Copy &amp; paste wizard"
 msgstr "Kopieren &amp; Einfügen - Assistent"
@@ -12680,28 +12739,23 @@ msgid ""
 "Some values need to be unique in the complete directory while some "
 "combinations make no sense. GOsa shows the relevant attributes. Please "
 "maintain the values below to fullfill the policies."
-msgstr "Bestimmte Werte müssen im gesamten Verzeichnis eindeutig sein, während andere "
-"Kombinationen keinen Sinn ergeben. GOsa zeigt die relevanten Attribute. Bitte "
-"verwalten Sie die Werte, die unten angezeigt werden, um die Auflagen zu erfüllen."
+msgstr ""
+"Bestimmte Werte müssen im gesamten Verzeichnis eindeutig sein, während "
+"andere Kombinationen keinen Sinn ergeben. GOsa zeigt die relevanten "
+"Attribute. Bitte verwalten Sie die Werte, die unten angezeigt werden, um die "
+"Auflagen zu erfüllen."
 
 #: ihtml/themes/default/copyPasteDialog.tpl:18
 msgid "Operation complete"
 msgstr "Vorgang abgeschlossen"
 
-#~ msgid "Releases"
-#~ msgstr "Releases"
-
-#~ msgid "No SMTP smarthost/relayhost set."
-#~ msgstr "Es ist kein SMTP smarthost/relayhost gesetzt."
-
-#~ msgid "Subnet"
-#~ msgstr "Subnetz"
-
-#~ msgid "SOA record for this zone"
-#~ msgstr "SOA-Eintrag fÃŒr diese Zone"
-
-#~ msgid "DNS TTL"
-#~ msgstr "DNS TTL"
+#: ihtml/themes/default/setup_step4.tpl:100
+#: ihtml/themes/lhs/setup_step4.tpl:100
+msgid ""
+"GOsa may cause PHP interpreter errors, particularly in case of Beta "
+"versions. In some cases it would be helpful to enable the error reporting."
+msgstr ""
+"GOsa kann Fehler im PHP-Interpreter erzeugen. In einigen Fällen ist es "
+"hilfreich, das 'error_reporting' zu aktivieren (dies kann jedoch ein "
+"Sicherheitsrisiko darstellen)."
 
-#~ msgid "DNS Class"
-#~ msgstr "DNS-Klasse"
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 6a0712df1..42ef06572 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -36,21 +36,19 @@ msgstr "Agregados"
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
-#: plugins/gofax/faxaccount/generic.tpl:6
+#: plugins/gofax/faxaccount/generic.tpl:6 plugins/admin/fai/faiVariable.tpl:4
 #: plugins/admin/fai/faiPartitionTable.tpl:4
-#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiScriptEntry.tpl:5
-#: plugins/admin/fai/faiPackage.tpl:4 plugins/admin/fai/faiProfile.tpl:4
-#: plugins/admin/fai/faiProfile.tpl:32
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
+#: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiPackage.tpl:4
+#: plugins/admin/fai/faiProfile.tpl:4 plugins/admin/fai/faiProfile.tpl:32
 #: plugins/admin/fai/faiScript.tpl:4 plugins/admin/fai/faiVariableEntry.tpl:5
 #: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3 plugins/admin/fai/faiHook.tpl:4
-#: plugins/admin/groups/mail.tpl:7
+#: plugins/admin/groups/mail.tpl:7 plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/glpiPrinter.tpl:6
+#: plugins/admin/systems/servdnseditzone.tpl:1
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
-#: plugins/admin/systems/glpi.tpl:6
-#: plugins/admin/systems/servdnseditzone.tpl:1
-#: plugins/admin/systems/glpiPrinter.tpl:6
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr "Genérico"
@@ -61,25 +59,25 @@ msgstr "Unix"
 
 #: contrib/gosa.conf:76 contrib/gosa.conf:88
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:514
-#: plugins/admin/users/class_userManagement.inc:858
+#: plugins/admin/groups/class_groupManagement.inc:515
+#: plugins/admin/users/class_userManagement.inc:859
 msgid "Environment"
 msgstr "Entorno"
 
 #: contrib/gosa.conf:77 contrib/gosa.conf:90
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_groupManagement.inc:502
-#: plugins/admin/users/class_userManagement.inc:860
+#: plugins/admin/groups/class_groupManagement.inc:503
+#: plugins/admin/users/class_userManagement.inc:861
 #: plugins/admin/ogroups/tabs_ogroups.inc:72
 #: plugins/admin/ogroups/tabs_ogroups.inc:160
-#: plugins/admin/ogroups/class_ogroupManagement.inc:483
+#: plugins/admin/ogroups/class_ogroupManagement.inc:484
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Correo Electrónico"
 
 #: contrib/gosa.conf:78 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:505
-#: plugins/admin/users/class_userManagement.inc:866
+#: plugins/admin/groups/class_groupManagement.inc:506
+#: plugins/admin/users/class_userManagement.inc:867
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -94,7 +92,7 @@ msgstr "Conectividad"
 #: plugins/personal/generic/generic.tpl:398
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:864
+#: plugins/admin/users/class_userManagement.inc:865
 #: plugins/admin/departments/generic.tpl:63
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
@@ -104,17 +102,17 @@ msgstr "Fax"
 #: contrib/gosa.conf:81 plugins/personal/generic/generic.tpl:250
 #: plugins/personal/generic/generic.tpl:388
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/address_info.tpl:37
-#: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
-#: plugins/admin/groups/class_groupManagement.inc:511
-#: plugins/admin/users/class_userManagement.inc:862
+#: plugins/addons/addressbook/address_info.tpl:37
+#: plugins/addons/addressbook/address_info.tpl:85
+#: plugins/admin/groups/class_groupManagement.inc:512
+#: plugins/admin/users/class_userManagement.inc:863
 #: plugins/admin/departments/generic.tpl:59
+#: plugins/admin/systems/class_systemManagement.inc:921
 #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/systems/class_systemManagement.inc:920
 #: plugins/admin/ogroups/class_ogroupManagement.inc:61
-#: plugins/admin/ogroups/class_ogroupManagement.inc:587
+#: plugins/admin/ogroups/class_ogroupManagement.inc:588
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
@@ -143,8 +141,8 @@ msgid "ACL"
 msgstr "ACL"
 
 #: contrib/gosa.conf:97 plugins/admin/applications/generic.tpl:66
-#: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/systems/class_servRepository.inc:244
+#: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/ogroups/phonequeue.tpl:31
 #: plugins/gofon/conference/generic.tpl:87
 msgid "Options"
@@ -167,9 +165,9 @@ msgstr "Servicios"
 
 #: contrib/gosa.conf:116 contrib/gosa.conf:141
 #: plugins/personal/environment/environment.tpl:172
-#: plugins/admin/systems/class_systemManagement.inc:926
+#: plugins/admin/systems/class_systemManagement.inc:927
 #: plugins/admin/ogroups/class_ogroupManagement.inc:62
-#: plugins/admin/ogroups/class_ogroupManagement.inc:590
+#: plugins/admin/ogroups/class_ogroupManagement.inc:591
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Impresora"
@@ -178,18 +176,19 @@ msgstr "Impresora"
 #: plugins/gofax/blocklists/generic.tpl:70
 #: plugins/gofax/blocklists/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
+#: plugins/addons/godfs/contents.tpl:22
 #: plugins/admin/fai/faiProfileEntry.tpl:21
 #: plugins/admin/fai/faiPackageEntry.tpl:22 plugins/admin/fai/headpage.tpl:20
 #: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
 #: plugins/admin/applications/headpage.tpl:20
 #: plugins/admin/departments/headpage.tpl:20
-#: plugins/admin/systems/headpage.tpl:20
+#: plugins/admin/systems/glpiPrinter.tpl:104
+#: plugins/admin/systems/glpiDeviceManagement.tpl:20
 #: plugins/admin/systems/servRepository.tpl:24
 #: plugins/admin/systems/glpiSelectUser.tpl:20
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:20
+#: plugins/admin/systems/headpage.tpl:20
 #: plugins/admin/systems/glpiAttachmentPool.tpl:20
-#: plugins/admin/systems/glpiDeviceManagement.tpl:20
-#: plugins/admin/systems/glpiPrinter.tpl:104
 #: plugins/admin/ogroups/headpage.tpl:20 plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
@@ -256,19 +255,19 @@ msgstr "Destino"
 msgid "Script"
 msgstr "Ruta del Script"
 
-#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:759
-#: plugins/admin/fai/class_faiManagement.inc:760
+#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:767
+#: plugins/admin/fai/class_faiManagement.inc:768
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:752
-#: plugins/admin/fai/class_faiManagement.inc:753
+#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:760
+#: plugins/admin/fai/class_faiManagement.inc:761
 #, fuzzy
 msgid "Variables"
 msgstr "Variable"
 
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiManagement.inc:773
-#: plugins/admin/fai/class_faiManagement.inc:774
+#: contrib/gosa.conf:218 plugins/admin/fai/class_faiManagement.inc:781
+#: plugins/admin/fai/class_faiManagement.inc:782
 #, fuzzy
 msgid "Templates"
 msgstr "Plantilla"
@@ -315,97 +314,95 @@ msgstr "Inglés"
 msgid "Italian"
 msgstr "Italiano"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:19
-#: plugins/personal/mail/class_mailAccount.inc:23
-#: plugins/personal/password/class_password.inc:6
-#: plugins/personal/posix/class_posixAccount.inc:17
-#: plugins/personal/samba/class_sambaAccount.inc:25
-#: plugins/personal/environment/class_environment.inc:13
-#: plugins/personal/generic/class_user.inc:17
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_proxyAccount.inc:6
-#: plugins/personal/connectivity/class_pptpAccount.inc:27
-#: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_phpgwAccount.inc:6
-#: plugins/personal/connectivity/class_kolabAccount.inc:6
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
-#: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/personal/connectivity/class_opengwAccount.inc:7
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
-#: plugins/gofax/faxreports/class_faxreport.inc:7
-#: plugins/addons/addressbook/class_addressbook.inc:7
-#: plugins/addons/mailqueue/class_mailqueue.inc:7
-#: plugins/addons/ldapmanager/class_csvimport.inc:7
-#: plugins/addons/ldapmanager/class_exportxls.inc:8
-#: plugins/addons/ldapmanager/class_import.inc:7
-#: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:7
-#: plugins/addons/logview/class_logview.inc:7
-#: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:26
-#: plugins/admin/applications/class_applicationManagement.inc:26
-#: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/systems/class_systemManagement.inc:33
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-#: plugins/gofon/fonreports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Esto hace algo"
+#: plugins/personal/nagios/nagios.tpl:4
+#, fuzzy
+msgid "Nagios Account"
+msgstr "Contacto"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:92
+#: plugins/personal/nagios/nagios.tpl:7
 #, fuzzy
-msgid "This account has no nagios extensions."
-msgstr "Esta cuenta no tiene extensiones validas de correo."
+msgid "Alias"
+msgstr "Italiano"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:101
+#: plugins/personal/nagios/nagios.tpl:12
+#: plugins/admin/systems/servdnseditzone.tpl:47 html/getxls.php:174
 #, fuzzy
-msgid "Remove nagios account"
-msgstr "Borrar cuenta de correo"
+msgid "Mail address"
+msgstr "Dirección MAC"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:102
+#: plugins/personal/nagios/nagios.tpl:17
 #, fuzzy
-msgid ""
-"This account has nagios features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Esta cuenta tiene las características de correo activas. Puede desactivarlas "
-"apretando a continuación."
+msgid "Host notification period"
+msgstr "Opciones de aplicaciones"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:104
+#: plugins/personal/nagios/nagios.tpl:25
 #, fuzzy
-msgid "Create nagios account"
-msgstr "Crear cuenta de correo"
+msgid "Service notification period"
+msgstr "Opciones de aplicaciones"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:104
+#: plugins/personal/nagios/nagios.tpl:32
 #, fuzzy
-msgid ""
-"This account has nagios features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Esta cuenta tiene las características de correo desactivadas.Puede "
-"activarlas pulsando aqui."
+msgid "Service notification options"
+msgstr "Opciones de aplicaciones"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:165
+#: plugins/personal/nagios/nagios.tpl:41
 #, fuzzy
-msgid "The required field 'NagiosAlias' is not set."
-msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+msgid "Host notification options"
+msgstr "Opciones de aplicaciones"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:168
+#: plugins/personal/nagios/nagios.tpl:48
+#: plugins/personal/generic/generic.tpl:261
+#: plugins/addons/addressbook/address_edit.tpl:217
+#: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Pager"
+msgstr "Dispositivo de aviso"
+
+#: plugins/personal/nagios/nagios.tpl:53
 #, fuzzy
-msgid "The required field 'NagiosMail' is not set."
-msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+msgid "Service notification commands"
+msgstr "Opciones de aplicaciones"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:172
-#: plugins/personal/nagios/class_nagiosAccount.inc:176
+#: plugins/personal/nagios/nagios.tpl:57
 #, fuzzy
-msgid "Please enter a valid email address in 'NagiosMail' field."
+msgid "Host notification commands"
+msgstr "Opciones de aplicaciones"
+
+#: plugins/personal/nagios/nagios.tpl:66
+#, fuzzy
+msgid "Nagios authentification"
+msgstr "Estación de trabajo Windows"
+
+#: plugins/personal/nagios/nagios.tpl:69
+#, fuzzy
+msgid "view system informations"
+msgstr "Información de sistema"
+
+#: plugins/personal/nagios/nagios.tpl:72
+#, fuzzy
+msgid "view configuration information"
+msgstr "Información organizativa"
+
+#: plugins/personal/nagios/nagios.tpl:75
+msgid "trigger system commands"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:78
+#, fuzzy
+msgid "view all services"
+msgstr "Provee servicios de exploración"
+
+#: plugins/personal/nagios/nagios.tpl:81
+msgid "view all hosts"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:83
+msgid "trigger all service commands"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:86
+msgid "trigger all host commands"
 msgstr ""
-"Por favor introduzca una dirección valida de correo electrónico en el campo "
-"'Cuenta Principal'."
 
 #: plugins/personal/nagios/main.inc:104 plugins/personal/mail/main.inc:104
 #: plugins/personal/posix/main.inc:110 plugins/personal/samba/main.inc:104
@@ -415,11 +412,12 @@ msgstr ""
 #: plugins/personal/connectivity/main.inc:118
 #: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/fai/class_faiManagement.inc:599
+#: plugins/addons/godfs/class_dfsManagment.inc:217
+#: plugins/admin/fai/class_faiManagement.inc:605
 #: plugins/admin/groups/class_groupManagement.inc:412
 #: plugins/admin/users/class_userManagement.inc:720
-#: plugins/admin/applications/class_applicationManagement.inc:428
-#: plugins/admin/departments/class_departmentManagement.inc:366
+#: plugins/admin/applications/class_applicationManagement.inc:430
+#: plugins/admin/departments/class_departmentManagement.inc:367
 #: plugins/admin/systems/class_systemManagement.inc:720
 #: plugins/admin/ogroups/class_ogroupManagement.inc:400
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:300
@@ -431,16 +429,15 @@ msgstr "Terminar"
 
 #: plugins/personal/nagios/main.inc:106 plugins/personal/mail/main.inc:106
 #: plugins/personal/mail/mail_locals.tpl:43
-#: plugins/personal/posix/posix_groups.tpl:67
 #: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112
+#: plugins/personal/posix/posix_groups.tpl:67
+#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
 #: plugins/personal/samba/samba3_workstations.tpl:41
-#: plugins/personal/samba/main.inc:106
+#: plugins/personal/environment/main.inc:106
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
 #: plugins/personal/environment/hotplugDialogNew.tpl:39
-#: plugins/personal/environment/main.inc:106
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
 #: plugins/personal/generic/generic_certs.tpl:78
@@ -451,54 +448,55 @@ msgstr "Terminar"
 #: plugins/gofax/faxaccount/locals.tpl:62
 #: plugins/gofax/faxaccount/lists.tpl:33 plugins/gofax/faxaccount/main.inc:91
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
-#: plugins/admin/fai/class_faiManagement.inc:601
-#: plugins/admin/fai/class_faiManagement.inc:606
-#: plugins/admin/fai/faiProfileEntry.tpl:71
+#: plugins/addons/addressbook/remove.tpl:16
+#: plugins/addons/godfs/class_dfsManagment.inc:219
+#: plugins/admin/fai/class_faiManagement.inc:607
+#: plugins/admin/fai/class_faiManagement.inc:612
 #: plugins/admin/fai/faiPackageConfiguration.tpl:7
-#: plugins/admin/fai/faiScriptEntry.tpl:69
+#: plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
+#: plugins/admin/fai/faiScriptEntry.tpl:69 plugins/admin/fai/remove.tpl:17
 #: plugins/admin/fai/faiPackageNew.tpl:45
+#: plugins/admin/fai/faiNewBranch.tpl:20
 #: plugins/admin/fai/faiVariableEntry.tpl:49
-#: plugins/admin/fai/faiPackageEntry.tpl:57 plugins/admin/fai/remove.tpl:17
+#: plugins/admin/fai/faiPackageEntry.tpl:57
 #: plugins/admin/fai/faiHookEntry.tpl:71
-#: plugins/admin/fai/faiTemplateEntry.tpl:131
-#: plugins/admin/fai/faiNewBranch.tpl:20
 #: plugins/admin/fai/remove_branch.tpl:16
+#: plugins/admin/fai/faiTemplateEntry.tpl:131
 #: plugins/admin/groups/class_groupManagement.inc:414
 #: plugins/admin/groups/remove.tpl:16
+#: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/template.tpl:46
 #: plugins/admin/users/class_userManagement.inc:722
-#: plugins/admin/users/remove.tpl:16 plugins/admin/users/template.tpl:46
-#: plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:430
+#: plugins/admin/users/remove.tpl:16 plugins/admin/applications/remove.tpl:15
+#: plugins/admin/applications/class_applicationManagement.inc:432
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:368
-#: plugins/admin/systems/chooser.tpl:18
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
-#: plugins/admin/systems/printerPPDDialog.tpl:23
-#: plugins/admin/systems/class_systemManagement.inc:722
-#: plugins/admin/systems/servnfs.tpl:76 plugins/admin/systems/remove.tpl:16
-#: plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/servRepositorySetup.tpl:43
+#: plugins/admin/departments/class_departmentManagement.inc:369
 #: plugins/admin/systems/glpi_edit_type.tpl:29
-#: plugins/admin/systems/remove_glpi.tpl:16
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:30
+#: plugins/admin/systems/glpiDeviceManagement.tpl:52
+#: plugins/admin/systems/servnfs.tpl:76
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
+#: plugins/admin/systems/servdnseditzone.tpl:118
 #: plugins/admin/systems/glpiSelectUser.tpl:51
+#: plugins/admin/systems/glpi_devices.tpl:761
+#: plugins/admin/systems/servRepositorySetup.tpl:43
 #: plugins/admin/systems/glpi_edit_os.tpl:29
+#: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:52
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
+#: plugins/admin/systems/remove_glpi.tpl:16
+#: plugins/admin/systems/class_systemManagement.inc:722
+#: plugins/admin/systems/remove.tpl:16
 #: plugins/admin/systems/glpiAttachmentPool.tpl:52
-#: plugins/admin/systems/servdnseditzone.tpl:118
-#: plugins/admin/systems/glpiDeviceManagement.tpl:52
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:30
-#: plugins/admin/systems/glpi_devices.tpl:761
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
+#: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/SelectDeviceType.tpl:45
-#: plugins/admin/systems/class_baseSelectDialog.inc:40
+#: plugins/admin/systems/class_baseSelectDialog.inc:41
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:13
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:402
@@ -509,6 +507,7 @@ msgstr "Terminar"
 #: plugins/gofon/conference/remove.tpl:16
 #: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
 #: ihtml/themes/default/copyPasteDialog.tpl:13
+#: ihtml/themes/lhs/islocked.tpl:15
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -525,26 +524,27 @@ msgstr ""
 
 #: plugins/personal/nagios/main.inc:115 plugins/personal/mail/main.inc:115
 #: plugins/personal/posix/main.inc:122 plugins/personal/samba/main.inc:115
-#: plugins/personal/environment/environment.tpl:139
 #: plugins/personal/environment/main.inc:115
+#: plugins/personal/environment/environment.tpl:139
 #: plugins/personal/generic/main.inc:172
 #: plugins/personal/connectivity/main.inc:129
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
+#: plugins/admin/fai/faiVariable.tpl:45
 #: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/admin/fai/faiVariable.tpl:45 plugins/admin/fai/faiScript.tpl:45
-#: plugins/admin/fai/faiTemplate.tpl:42 plugins/admin/fai/faiHook.tpl:45
-#: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/printer.tpl:47 plugins/admin/systems/servdns.tpl:7
-#: plugins/admin/systems/glpiManufacturer.tpl:7
-#: plugins/admin/systems/glpi.tpl:48 plugins/admin/systems/glpi.tpl:56
-#: plugins/admin/systems/glpi.tpl:85
-#: plugins/admin/systems/servdnseditzone.tpl:27
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:191
+#: plugins/admin/fai/faiScript.tpl:45 plugins/admin/fai/faiTemplate.tpl:42
+#: plugins/admin/fai/faiHook.tpl:45 plugins/admin/systems/glpi.tpl:48
+#: plugins/admin/systems/glpi.tpl:56 plugins/admin/systems/glpi.tpl:85
 #: plugins/admin/systems/glpiPrinter.tpl:73
 #: plugins/admin/systems/glpiPrinter.tpl:82
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:167
+#: plugins/admin/systems/servdns.tpl:7
+#: plugins/admin/systems/glpiManufacturer.tpl:7
+#: plugins/admin/systems/servdnseditzone.tpl:27
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:191
+#: plugins/admin/systems/servservice.tpl:21
+#: plugins/admin/systems/printer.tpl:47
 #: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr "Editar"
@@ -554,94 +554,218 @@ msgstr "Editar"
 msgid "Nagios settings"
 msgstr "Parametros del correo de usuarios"
 
-#: plugins/personal/nagios/nagios.tpl:4
-#, fuzzy
-msgid "Nagios Account"
-msgstr "Contacto"
-
-#: plugins/personal/nagios/nagios.tpl:7
-#, fuzzy
-msgid "Alias"
-msgstr "Italiano"
-
-#: plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:47 html/getxls.php:174
-#, fuzzy
-msgid "Mail address"
-msgstr "Dirección MAC"
-
-#: plugins/personal/nagios/nagios.tpl:17
-#, fuzzy
-msgid "Host notification period"
-msgstr "Opciones de aplicaciones"
-
-#: plugins/personal/nagios/nagios.tpl:25
-#, fuzzy
-msgid "Service notification period"
-msgstr "Opciones de aplicaciones"
-
-#: plugins/personal/nagios/nagios.tpl:32
+#: plugins/personal/nagios/class_nagiosAccount.inc:19
+#: plugins/personal/mail/class_mailAccount.inc:23
+#: plugins/personal/password/class_password.inc:6
+#: plugins/personal/posix/class_posixAccount.inc:17
+#: plugins/personal/samba/class_sambaAccount.inc:25
+#: plugins/personal/environment/class_environment.inc:13
+#: plugins/personal/generic/class_user.inc:17
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_intranetAccount.inc:16
+#: plugins/personal/connectivity/class_pptpAccount.inc:27
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
+#: plugins/personal/connectivity/class_phpgwAccount.inc:6
+#: plugins/personal/connectivity/class_kolabAccount.inc:6
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
+#: plugins/personal/connectivity/class_opengwAccount.inc:7
+#: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
+#: plugins/gofax/faxreports/class_faxreport.inc:7
+#: plugins/addons/addressbook/class_addressbook.inc:7
+#: plugins/addons/mailqueue/class_mailqueue.inc:7
+#: plugins/addons/ldapmanager/class_csvimport.inc:7
+#: plugins/addons/ldapmanager/class_exportxls.inc:8
+#: plugins/addons/ldapmanager/class_import.inc:7
+#: plugins/addons/ldapmanager/class_ldif.inc:8
+#: plugins/addons/ldapmanager/class_export.inc:7
+#: plugins/addons/logview/class_logview.inc:7
+#: plugins/addons/godfs/class_dfsManagment.inc:17
+#: plugins/admin/groups/class_groupManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:26
+#: plugins/admin/applications/class_applicationManagement.inc:26
+#: plugins/admin/departments/class_departmentManagement.inc:26
+#: plugins/admin/systems/class_systemManagement.inc:33
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/gofon/fonreports/class_fonreport.inc:7
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
+msgid "This does something"
+msgstr "Esto hace algo"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:92
 #, fuzzy
-msgid "Service notification options"
-msgstr "Opciones de aplicaciones"
+msgid "This account has no nagios extensions."
+msgstr "Esta cuenta no tiene extensiones validas de correo."
 
-#: plugins/personal/nagios/nagios.tpl:41
+#: plugins/personal/nagios/class_nagiosAccount.inc:101
 #, fuzzy
-msgid "Host notification options"
-msgstr "Opciones de aplicaciones"
+msgid "Remove nagios account"
+msgstr "Borrar cuenta de correo"
 
-#: plugins/personal/nagios/nagios.tpl:48
-#: plugins/personal/generic/generic.tpl:261
-#: plugins/addons/addressbook/address_info.tpl:91
-#: plugins/addons/addressbook/address_edit.tpl:217 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Pager"
-msgstr "Dispositivo de aviso"
+#: plugins/personal/nagios/class_nagiosAccount.inc:102
+#, fuzzy
+msgid ""
+"This account has nagios features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Esta cuenta tiene las características de correo activas. Puede desactivarlas "
+"apretando a continuación."
 
-#: plugins/personal/nagios/nagios.tpl:53
+#: plugins/personal/nagios/class_nagiosAccount.inc:104
 #, fuzzy
-msgid "Service notification commands"
-msgstr "Opciones de aplicaciones"
+msgid "Create nagios account"
+msgstr "Crear cuenta de correo"
 
-#: plugins/personal/nagios/nagios.tpl:57
+#: plugins/personal/nagios/class_nagiosAccount.inc:104
 #, fuzzy
-msgid "Host notification commands"
-msgstr "Opciones de aplicaciones"
+msgid ""
+"This account has nagios features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Esta cuenta tiene las características de correo desactivadas.Puede "
+"activarlas pulsando aqui."
 
-#: plugins/personal/nagios/nagios.tpl:66
+#: plugins/personal/nagios/class_nagiosAccount.inc:165
 #, fuzzy
-msgid "Nagios authentification"
-msgstr "Estación de trabajo Windows"
+msgid "The required field 'NagiosAlias' is not set."
+msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/personal/nagios/nagios.tpl:69
+#: plugins/personal/nagios/class_nagiosAccount.inc:168
 #, fuzzy
-msgid "view system informations"
-msgstr "Información de sistema"
+msgid "The required field 'NagiosMail' is not set."
+msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/personal/nagios/nagios.tpl:72
+#: plugins/personal/nagios/class_nagiosAccount.inc:172
+#: plugins/personal/nagios/class_nagiosAccount.inc:176
 #, fuzzy
-msgid "view configuration information"
-msgstr "Información organizativa"
+msgid "Please enter a valid email address in 'NagiosMail' field."
+msgstr ""
+"Por favor introduzca una dirección valida de correo electrónico en el campo "
+"'Cuenta Principal'."
 
-#: plugins/personal/nagios/nagios.tpl:75
-msgid "trigger system commands"
+#: plugins/personal/mail/class_mailAccount.inc:79
+#: plugins/admin/groups/class_groupMail.inc:75
+#, php-format
+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:176
+msgid "No DESC tag in vacation file:"
+msgstr "En el archivo de ausencia no existe la etiqueta 'DESC':"
+
+#: plugins/personal/mail/class_mailAccount.inc:216
+msgid "This account has no mail extensions."
+msgstr "Esta cuenta no tiene extensiones validas de correo."
+
+#: plugins/personal/mail/class_mailAccount.inc:225
+#: plugins/admin/groups/class_groupMail.inc:314
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid "Remove mail account"
+msgstr "Borrar cuenta de correo"
+
+#: plugins/personal/mail/class_mailAccount.inc:226
+#: plugins/admin/groups/class_groupMail.inc:315
+msgid ""
+"This account has mail features enabled. You can disable them by clicking "
+"below."
 msgstr ""
+"Esta cuenta tiene las características de correo activas. Puede desactivarlas "
+"apretando a continuación."
 
-#: plugins/personal/nagios/nagios.tpl:78
-#, fuzzy
-msgid "view all services"
-msgstr "Provee servicios de exploración"
+#: plugins/personal/mail/class_mailAccount.inc:228
+#: plugins/admin/groups/class_groupMail.inc:317
+#: plugins/admin/ogroups/class_mailogroup.inc:43
+msgid "Create mail account"
+msgstr "Crear cuenta de correo"
 
-#: plugins/personal/nagios/nagios.tpl:81
-msgid "view all hosts"
+#: plugins/personal/mail/class_mailAccount.inc:228
+#: plugins/admin/groups/class_groupMail.inc:318
+msgid ""
+"This account has mail features disabled. You can enable them by clicking "
+"below."
 msgstr ""
+"Esta cuenta tiene las características de correo desactivadas.Puede "
+"activarlas pulsando aqui."
 
-#: plugins/personal/nagios/nagios.tpl:83
-msgid "trigger all service commands"
+#: plugins/personal/mail/class_mailAccount.inc:276
+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/nagios/nagios.tpl:86
-msgid "trigger all host commands"
+#: plugins/personal/mail/class_mailAccount.inc:282
+#: plugins/admin/groups/class_groupMail.inc:377
+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:317
+#: plugins/personal/mail/class_mailAccount.inc:322
+#: plugins/admin/groups/class_groupMail.inc:405
+msgid ""
+"You're trying to add an invalid email address to the list of alternate "
+"addresses."
+msgstr ""
+"Esta intentando añadir una dirección de correo no valida a la lista de "
+"direcciones alternativas"
+
+#: plugins/personal/mail/class_mailAccount.inc:332
+#: plugins/admin/groups/class_groupMail.inc:410
+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:714
+msgid ""
+"There is no valid mailserver specified, please add one in the system setup."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:719
+#: plugins/admin/groups/class_groupMail.inc:798
+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:723
+#: plugins/personal/mail/class_mailAccount.inc:727
+#: plugins/addons/addressbook/class_addressbook.inc:588
+#: plugins/admin/ogroups/class_mailogroup.inc:70
+msgid "Please enter a valid email address in 'Primary address' field."
+msgstr ""
+"Por favor introduzca una dirección valida de correo electrónico en el campo "
+"'Cuenta Principal'."
+
+#: plugins/personal/mail/class_mailAccount.inc:733
+#: plugins/admin/groups/class_groupMail.inc:807
+#: plugins/admin/ogroups/class_mailogroup.inc:77
+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:739
+#: plugins/admin/groups/class_groupMail.inc:813
+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:748
+#: plugins/admin/groups/class_groupMail.inc:822
+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:758
+#: plugins/admin/groups/class_groupMail.inc:830
+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:762
+msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:7 plugins/personal/mail/copypaste.tpl:7
@@ -652,9 +776,9 @@ 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_systemManagement.inc:921
+#: plugins/admin/systems/class_systemManagement.inc:922
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:586
+#: plugins/admin/ogroups/class_ogroupManagement.inc:587
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
 msgstr "Servidor"
@@ -668,7 +792,7 @@ msgid "Quota usage"
 msgstr "Uso de la Cola de Correo"
 
 #: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
-#: plugins/admin/systems/class_terminalInfo.inc:169
+#: plugins/admin/systems/class_terminalInfo.inc:170
 #: plugins/admin/systems/class_printGeneric.inc:424
 msgid "not defined"
 msgstr "sin definirse"
@@ -693,8 +817,8 @@ msgstr "Lista de direcciones de correo alternativas."
 #: plugins/personal/mail/mail_locals.tpl:41
 #: plugins/personal/mail/copypaste.tpl:21
 #: plugins/personal/mail/copypaste.tpl:44
-#: plugins/personal/posix/posix_groups.tpl:65
 #: plugins/personal/posix/trust_machines.tpl:39
+#: plugins/personal/posix/posix_groups.tpl:65
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
 #: plugins/personal/samba/samba3.tpl:330
@@ -710,43 +834,42 @@ msgstr "Lista de direcciones de correo alternativas."
 #: plugins/gofax/blocklists/generic.tpl:63
 #: plugins/gofax/faxaccount/generic.tpl:76
 #: plugins/gofax/faxaccount/locals.tpl:60
-#: plugins/gofax/faxaccount/lists.tpl:13
+#: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiPackage.tpl:71
-#: plugins/admin/fai/faiProfile.tpl:38 plugins/admin/fai/faiScript.tpl:48
-#: plugins/admin/fai/faiTemplate.tpl:41 plugins/admin/fai/faiHook.tpl:48
-#: plugins/admin/groups/mail.tpl:51 plugins/admin/groups/mail.tpl:95
+#: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
+#: plugins/admin/fai/faiScript.tpl:48 plugins/admin/fai/faiTemplate.tpl:41
+#: plugins/admin/fai/faiHook.tpl:48 plugins/admin/groups/mail.tpl:51
+#: plugins/admin/groups/mail.tpl:95
 #: plugins/admin/groups/class_groupMail.inc:533
 #: plugins/admin/groups/application.tpl:15
 #: plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/generic.tpl:104
 #: plugins/admin/groups/mail_locals.tpl:66
 #: plugins/admin/groups/paste_mail.tpl:30
-#: plugins/admin/groups/paste_mail.tpl:41
-#: plugins/admin/systems/servservice.tpl:20
-#: plugins/admin/systems/servservice.tpl:47
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
+#: plugins/admin/groups/paste_mail.tpl:41 plugins/admin/systems/glpi.tpl:100
+#: plugins/admin/systems/glpiPrinter.tpl:93
+#: plugins/admin/systems/glpiPrinter.tpl:121
+#: plugins/admin/systems/glpi_edit_type.tpl:8
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:7
 #: plugins/admin/systems/workstationStartup.tpl:61
 #: plugins/admin/systems/workstationStartup.tpl:81
 #: plugins/admin/systems/workstationStartup.tpl:100
 #: plugins/admin/systems/servdns.tpl:6
-#: plugins/admin/systems/phonesettings.tpl:176
-#: plugins/admin/systems/phonesettings.tpl:191
 #: plugins/admin/systems/terminalStartup.tpl:61
 #: plugins/admin/systems/terminalStartup.tpl:80
-#: plugins/admin/systems/servRepositorySetup.tpl:36
-#: plugins/admin/systems/glpi_edit_type.tpl:8
 #: plugins/admin/systems/glpiManufacturer.tpl:6
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
-#: plugins/admin/systems/glpi_edit_os.tpl:8
 #: plugins/admin/systems/class_termDNS.inc:461
 #: plugins/admin/systems/class_termDNS.inc:482
-#: plugins/admin/systems/glpi.tpl:100
 #: plugins/admin/systems/servdnseditzone.tpl:102
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/glpiPrinter.tpl:93
-#: plugins/admin/systems/glpiPrinter.tpl:121
+#: plugins/admin/systems/servRepositorySetup.tpl:36
+#: plugins/admin/systems/servservice.tpl:20
+#: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/glpi_edit_os.tpl:8
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
 #: plugins/admin/systems/class_servDNSeditZone.inc:478
+#: plugins/admin/systems/phonesettings.tpl:176
+#: plugins/admin/systems/phonesettings.tpl:191
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:270
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/generic.tpl:39
@@ -771,38 +894,37 @@ msgstr "Añadir"
 #: plugins/gofax/faxaccount/generic.tpl:78
 #: plugins/gofax/faxaccount/lists.tpl:14
 #: plugins/addons/addressbook/remove.tpl:14
-#: plugins/admin/fai/faiPartitionTable.tpl:45
-#: plugins/admin/fai/faiVariable.tpl:46 plugins/admin/fai/faiScript.tpl:46
-#: plugins/admin/fai/faiTemplate.tpl:43 plugins/admin/fai/remove.tpl:15
-#: plugins/admin/fai/faiHook.tpl:46 plugins/admin/fai/remove_branch.tpl:14
+#: plugins/admin/fai/faiVariable.tpl:46
+#: plugins/admin/fai/faiPartitionTable.tpl:45 plugins/admin/fai/remove.tpl:15
+#: plugins/admin/fai/faiScript.tpl:46 plugins/admin/fai/faiTemplate.tpl:43
+#: plugins/admin/fai/remove_branch.tpl:14 plugins/admin/fai/faiHook.tpl:46
 #: plugins/admin/groups/mail.tpl:52 plugins/admin/groups/mail.tpl:97
 #: plugins/admin/groups/remove.tpl:14 plugins/admin/groups/generic.tpl:106
 #: plugins/admin/groups/paste_mail.tpl:31
 #: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/users/remove.tpl:14
 #: plugins/admin/applications/remove.tpl:13
 #: plugins/admin/departments/remove.tpl:14
-#: plugins/admin/systems/servservice.tpl:22
-#: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/glpi_edit_type.tpl:10
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/workstationStartup.tpl:62
 #: plugins/admin/systems/workstationStartup.tpl:82
-#: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
-#: plugins/admin/systems/phonesettings.tpl:177
-#: plugins/admin/systems/phonesettings.tpl:192
-#: plugins/admin/systems/remove.tpl:14
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
 #: plugins/admin/systems/terminalStartup.tpl:62
-#: plugins/admin/systems/glpi_edit_type.tpl:10
-#: plugins/admin/systems/remove_glpi.tpl:14
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
-#: plugins/admin/systems/glpi_edit_os.tpl:10
 #: plugins/admin/systems/class_termDNS.inc:476
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:192
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
+#: plugins/admin/systems/servservice.tpl:22
+#: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/glpi_edit_os.tpl:10
+#: plugins/admin/systems/remove_glpi.tpl:14
+#: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
 #: plugins/admin/systems/class_servDNSeditZone.inc:279
 #: plugins/admin/systems/class_servDNSeditZone.inc:472
-#: plugins/admin/ogroups/generic.tpl:40 plugins/admin/ogroups/remove.tpl:14
-#: plugins/admin/ogroups/phonequeue.tpl:25 plugins/gofon/macro/remove.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:15
+#: plugins/admin/systems/phonesettings.tpl:177
+#: plugins/admin/systems/phonesettings.tpl:192
+#: plugins/admin/systems/remove.tpl:14 plugins/admin/ogroups/generic.tpl:40
+#: plugins/admin/ogroups/remove.tpl:14 plugins/admin/ogroups/phonequeue.tpl:25
+#: plugins/gofon/macro/remove.tpl:13 plugins/gofon/phoneaccount/generic.tpl:15
 #: plugins/gofon/phoneaccount/paste_generic.tpl:15
 #: plugins/gofon/conference/remove.tpl:14
 msgid "Delete"
@@ -916,6 +1038,7 @@ msgstr "Seleccione dirección para añadir"
 #: plugins/gofax/blocklists/headpage.tpl:29
 #: plugins/gofax/faxaccount/locals.tpl:19
 #: plugins/addons/addressbook/contents.tpl:58
+#: plugins/addons/godfs/contents.tpl:31
 #: plugins/admin/fai/faiProfileEntry.tpl:31
 #: plugins/admin/fai/faiPackageEntry.tpl:32 plugins/admin/fai/headpage.tpl:64
 #: plugins/admin/groups/headpage.tpl:30
@@ -923,14 +1046,14 @@ msgstr "Seleccione dirección para añadir"
 #: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
 #: plugins/admin/applications/headpage.tpl:47
 #: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
-#: plugins/admin/systems/headpage.tpl:29
+#: plugins/admin/systems/glpiDeviceManagement.tpl:27
 #: plugins/admin/systems/servRepository.tpl:36
 #: plugins/admin/systems/glpiSelectUser.tpl:27
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:27
+#: plugins/admin/systems/headpage.tpl:29
 #: plugins/admin/systems/glpiAttachmentPool.tpl:27
-#: plugins/admin/systems/glpiDeviceManagement.tpl:27
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/admin/ogroups/headpage.tpl:29 plugins/gofon/macro/headpage.tpl:29
 #: plugins/gofon/conference/headpage.tpl:29
@@ -940,8 +1063,8 @@ msgid "Filters"
 msgstr "Filtros"
 
 #: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:32
 #: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:32
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/personal/environment/selectPrinterDialog.tpl:34
 #: plugins/gofax/faxaccount/locals.tpl:29
@@ -970,148 +1093,28 @@ msgstr "Mostrar direcciones del usuario"
 msgid "User name of which addresses are shown"
 msgstr "Nombre de usuario de las direcciones mostradas"
 
-#: plugins/personal/mail/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:75
-#, php-format
-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:176
-msgid "No DESC tag in vacation file:"
-msgstr "En el archivo de ausencia no existe la etiqueta 'DESC':"
-
-#: plugins/personal/mail/class_mailAccount.inc:216
-msgid "This account has no mail extensions."
-msgstr "Esta cuenta no tiene extensiones validas de correo."
-
-#: plugins/personal/mail/class_mailAccount.inc:225
-#: plugins/admin/groups/class_groupMail.inc:314
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid "Remove mail account"
-msgstr "Borrar cuenta de correo"
-
-#: plugins/personal/mail/class_mailAccount.inc:226
-#: plugins/admin/groups/class_groupMail.inc:315
-msgid ""
-"This account has mail features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Esta cuenta tiene las características de correo activas. Puede desactivarlas "
-"apretando a continuación."
-
-#: plugins/personal/mail/class_mailAccount.inc:228
-#: plugins/admin/groups/class_groupMail.inc:317
-#: plugins/admin/ogroups/class_mailogroup.inc:43
-msgid "Create mail account"
-msgstr "Crear cuenta de correo"
-
-#: plugins/personal/mail/class_mailAccount.inc:228
-#: plugins/admin/groups/class_groupMail.inc:318
-msgid ""
-"This account has mail features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Esta cuenta tiene las características de correo desactivadas.Puede "
-"activarlas pulsando aqui."
-
-#: plugins/personal/mail/class_mailAccount.inc:276
-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:282
-#: plugins/admin/groups/class_groupMail.inc:377
-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:317
-#: plugins/personal/mail/class_mailAccount.inc:322
-#: plugins/admin/groups/class_groupMail.inc:405
-msgid ""
-"You're trying to add an invalid email address to the list of alternate "
-"addresses."
-msgstr ""
-"Esta intentando añadir una dirección de correo no valida a la lista de "
-"direcciones alternativas"
-
-#: plugins/personal/mail/class_mailAccount.inc:332
-#: plugins/admin/groups/class_groupMail.inc:410
-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:714
-msgid ""
-"There is no valid mailserver specified, please add one in the system setup."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:719
-#: plugins/admin/groups/class_groupMail.inc:798
-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:723
-#: plugins/personal/mail/class_mailAccount.inc:727
-#: plugins/addons/addressbook/class_addressbook.inc:588
-#: plugins/admin/ogroups/class_mailogroup.inc:70
-msgid "Please enter a valid email address in 'Primary address' field."
-msgstr ""
-"Por favor introduzca una dirección valida de correo electrónico en el campo "
-"'Cuenta Principal'."
-
-#: plugins/personal/mail/class_mailAccount.inc:733
-#: plugins/admin/groups/class_groupMail.inc:807
-#: plugins/admin/ogroups/class_mailogroup.inc:77
-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:739
-#: plugins/admin/groups/class_groupMail.inc:813
-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:748
-#: plugins/admin/groups/class_groupMail.inc:822
-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:758
-#: plugins/admin/groups/class_groupMail.inc:830
-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:762
-msgid "You specified Spam settings, but there is no Folder specified."
-msgstr ""
-
 #: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
 #, fuzzy
 msgid "Mail settings"
 msgstr "Parametros del correo de usuarios"
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:871
+#: plugins/admin/systems/class_systemManagement.inc:872
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
-#: ihtml/themes/altlinux/setup_useradmin.tpl:30
 #: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/default/setup_useradmin.tpl:30
+#: ihtml/themes/altlinux/setup_useradmin.tpl:30
 #: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
+#: ihtml/themes/default/setup_useradmin.tpl:30 ihtml/themes/lhs/login.tpl:37
+#: ihtml/themes/lhs/login.tpl:41 ihtml/themes/lhs/setup_useradmin.tpl:30
 msgid "Password"
 msgstr "Contraseña"
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:801
-#: plugins/admin/users/class_userManagement.inc:808
+#: plugins/admin/users/class_userManagement.inc:802
+#: plugins/admin/users/class_userManagement.inc:809
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
@@ -1175,9 +1178,8 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
 #: plugins/addons/ldapmanager/contentexport.tpl:66
-#: plugins/admin/fai/class_faiManagement.inc:441
-#: plugins/admin/fai/faiNewBranch.tpl:52
-#: plugins/admin/departments/recursive_moce.tpl:10 include/functions.inc:1382
+#: plugins/admin/fai/faiNewBranch.tpl:50
+#: plugins/admin/departments/recursive_move.tpl:18 include/functions.inc:1382
 #: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_step3.tpl:17
@@ -1188,6 +1190,9 @@ msgstr ""
 #: ihtml/themes/default/setup_step3.tpl:17
 #: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_finish.tpl:30
+#: ihtml/themes/lhs/setup_useradmin.tpl:40 ihtml/themes/lhs/setup_step2.tpl:12
+#: ihtml/themes/lhs/setup_step3.tpl:17 ihtml/themes/lhs/setup_step4.tpl:114
+#: ihtml/themes/lhs/setup_finish.tpl:30
 msgid "Back"
 msgstr "Atras"
 
@@ -1231,6 +1236,19 @@ msgstr "No tiene permisos para cambiar su contraseña."
 msgid "External password changer reported a problem: "
 msgstr "El programa externo de cambio de contraseña informo de un problema: "
 
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Seleccione sistema a añadir"
+
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr "Mostrar sistemas de departamentos"
+
+#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/systems/headpage.tpl:50
+msgid "Display systems matching"
+msgstr "Mostrar sistemas que concuerden con"
+
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
 msgstr "Seleccione grupo a añadir"
@@ -1269,19 +1287,6 @@ msgstr ""
 msgid "Password expires on"
 msgstr "La contraseña expira en"
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
-msgstr "Seleccione sistema a añadir"
-
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
-msgstr "Mostrar sistemas de departamentos"
-
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:50
-msgid "Display systems matching"
-msgstr "Mostrar sistemas que concuerden con"
-
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
@@ -1341,6 +1346,10 @@ msgstr "Autentificación del sistema"
 msgid "Trust mode"
 msgstr "Modo"
 
+#: plugins/personal/posix/main.inc:131
+msgid "Unix settings"
+msgstr "Parametros Unix"
+
 #: plugins/personal/posix/class_posixAccount.inc:16
 #: plugins/generic/references/class_reference.inc:22
 msgid "UNIX"
@@ -1356,9 +1365,9 @@ msgid "unconfigured"
 msgstr "Desconfigurado"
 
 #: plugins/personal/posix/class_posixAccount.inc:195
-#: plugins/admin/systems/class_terminalService.inc:141
 #: plugins/admin/systems/class_workstationService.inc:134
 #: plugins/admin/systems/class_workstationStartup.inc:623
+#: plugins/admin/systems/class_terminalService.inc:141
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:211
 msgid "automatic"
 msgstr "automático"
@@ -1560,7 +1569,7 @@ msgstr "Diciembre"
 #: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/admin/systems/class_terminalGeneric.inc:60
 #: ihtml/themes/altlinux/setup_step4.tpl:91
-#: ihtml/themes/default/setup_step4.tpl:91
+#: ihtml/themes/default/setup_step4.tpl:91 ihtml/themes/lhs/setup_step4.tpl:91
 msgid "disabled"
 msgstr "desactivado"
 
@@ -1647,10 +1656,6 @@ msgstr ""
 msgid "Too many users, can't allocate a free ID!"
 msgstr "¡Demasiados usuarios, no hay identificadores (ID) libres!"
 
-#: plugins/personal/posix/main.inc:131
-msgid "Unix settings"
-msgstr "Parametros Unix"
-
 #: plugins/personal/posix/paste_generic.tpl:4
 #, fuzzy
 msgid "Posix settings"
@@ -1782,6 +1787,10 @@ msgstr "La cuenta expirará después de"
 msgid "Allow connection from these workstations only"
 msgstr "Permitir la conexión solo desde estas estaciones de trabajo"
 
+#: plugins/personal/samba/main.inc:123
+msgid "Samba settings"
+msgstr "Parametros de samba"
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "Selecciones estaciones de trabajo para añadir"
@@ -1790,10 +1799,6 @@ msgstr "Selecciones estaciones de trabajo para añadir"
 msgid "Display workstations of department"
 msgstr "Mostrar estaciones de trabajo de departamentos"
 
-#: plugins/personal/samba/main.inc:123
-msgid "Samba settings"
-msgstr "Parametros de samba"
-
 #: plugins/personal/samba/class_sambaAccount.inc:196
 msgid "This account has no samba extensions."
 msgstr "Esta cuenta no tiene extensión samba valida."
@@ -1901,6 +1906,11 @@ msgstr ""
 "Aviso: No puedo identificar el grupo primario de usuarios - ¡No se puede "
 "realizar una conversión a grupo de samba!"
 
+#: plugins/personal/environment/main.inc:124
+#, fuzzy
+msgid "User environment settings"
+msgstr "Parametros del correo de usuarios"
+
 #: plugins/personal/environment/class_hotplugDialog.inc:111
 #, fuzzy
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
@@ -1926,12 +1936,6 @@ msgstr "Ya existe un Departamento con este 'Nombre'."
 msgid "Please select an entry or press cancel."
 msgstr "¡Por favor introduzca un número de teléfono valido!"
 
-#: plugins/personal/environment/class_selectPrinterDialog.inc:67
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:99
-#, fuzzy
-msgid "Please select a printer or press cancel."
-msgstr "¡Por favor introduzca un número de teléfono valido!"
-
 #: plugins/personal/environment/hotplugDialog.tpl:1
 #, fuzzy
 msgid "Add hotplug devices"
@@ -1965,6 +1969,12 @@ msgstr "Mostrar usuarios que concuerden con"
 msgid "Regular expression for        matching hotplugs"
 msgstr "Expresiones regulares que concuerden con nombres de usuarios"
 
+#: plugins/personal/environment/class_selectPrinterDialog.inc:67
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:99
+#, fuzzy
+msgid "Please select a printer or press cancel."
+msgstr "¡Por favor introduzca un número de teléfono valido!"
+
 #: plugins/personal/environment/class_environment.inc:253
 #: plugins/personal/environment/class_environment.inc:290
 #, fuzzy
@@ -2017,8 +2027,8 @@ msgstr "ninguno"
 
 #: plugins/personal/environment/class_environment.inc:510
 #: plugins/personal/environment/class_environment.inc:521
-#: plugins/admin/systems/class_terminalStartup.inc:134
 #: plugins/admin/systems/class_workstationStartup.inc:503
+#: plugins/admin/systems/class_terminalStartup.inc:134
 #, fuzzy
 msgid "You must specify a valid mount point."
 msgstr "Por favor especifique un nombre de usuario valido."
@@ -2140,9 +2150,9 @@ msgid "Resolution"
 msgstr "Resolución"
 
 #: plugins/personal/environment/environment.tpl:105
-#: plugins/admin/systems/servservice.tpl:11
 #: plugins/admin/systems/workstationStartup.tpl:86
 #: plugins/admin/systems/terminalStartup.tpl:66
+#: plugins/admin/systems/servservice.tpl:11
 #, fuzzy
 msgid "Shares"
 msgstr "Borrar"
@@ -2157,13 +2167,14 @@ msgstr "Borrar"
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:266
 #: plugins/admin/groups/class_groupMail.inc:537
 #: plugins/admin/applications/class_applicationParameters.inc:100
+#: plugins/admin/systems/glpiPrinter.tpl:122
 #: plugins/admin/systems/workstationStartup.tpl:101
-#: plugins/admin/systems/printer.tpl:48 plugins/admin/systems/servdns.tpl:8
+#: plugins/admin/systems/servdns.tpl:8
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/glpiManufacturer.tpl:8
-#: plugins/admin/systems/glpiPrinter.tpl:122
+#: plugins/admin/systems/printer.tpl:48
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:274
-#: ihtml/themes/altlinux/islocked.tpl:13
+#: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/lhs/islocked.tpl:13
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -2189,9 +2200,9 @@ msgid "Hotplug device settings"
 msgstr "Disquetera"
 
 #: plugins/personal/environment/environment.tpl:164
-#: plugins/admin/groups/class_groupManagement.inc:455
+#: plugins/admin/groups/class_groupManagement.inc:456
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:273
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
 msgid "New"
 msgstr "Nuevo"
 
@@ -2209,16 +2220,6 @@ msgstr "Configuración telefónica"
 msgid "Admin Toggle"
 msgstr "Usuario administrador"
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:96
-#, fuzzy
-msgid "Specified name is invalid."
-msgstr "El nombre especificado ya esta siendo usado"
-
-#: plugins/personal/environment/class_logonManagementDialog.inc:100
-#, fuzzy
-msgid "Specified description contains invalid characters."
-msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
-
 #: plugins/personal/environment/logonManagement.tpl:8
 #, fuzzy
 msgid "Logon script settings"
@@ -2231,22 +2232,21 @@ msgstr "Nombre de la lista"
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:41
+#: plugins/gofax/blocklists/generic.tpl:41 plugins/addons/godfs/generic.tpl:12
+#: plugins/addons/godfs/generic.tpl:38 plugins/admin/fai/faiVariable.tpl:19
 #: plugins/admin/fai/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiVariable.tpl:19
-#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
-#: plugins/admin/fai/faiProfile.tpl:19
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:11
-#: plugins/admin/fai/faiScript.tpl:19
+#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
+#: plugins/admin/fai/faiProfile.tpl:19 plugins/admin/fai/faiScript.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:17
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHookEntry.tpl:17
 #: plugins/admin/fai/faiTemplateEntry.tpl:11 plugins/admin/fai/faiHook.tpl:19
 #: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/component.tpl:25 plugins/admin/systems/server.tpl:25
-#: plugins/admin/systems/phone.tpl:25 plugins/admin/systems/printer.tpl:13
-#: plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/server.tpl:25 plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/component.tpl:25 plugins/admin/systems/phone.tpl:25
+#: plugins/admin/systems/printer.tpl:13
 #: plugins/admin/systems/wingeneric.tpl:25
 #: plugins/admin/ogroups/generic.tpl:13 plugins/gofon/macro/generic.tpl:36
 #: plugins/gofon/conference/generic.tpl:51
@@ -2279,42 +2279,30 @@ msgstr ""
 
 #: plugins/personal/environment/logonManagement.tpl:75
 #: plugins/gofax/faxaccount/lists.tpl:31
-#: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiPackageConfiguration.tpl:6
+#: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiScriptEntry.tpl:68
+#: plugins/admin/fai/faiNewBranch.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:48
 #: plugins/admin/fai/faiPackageEntry.tpl:56
 #: plugins/admin/fai/faiHookEntry.tpl:70
 #: plugins/admin/fai/faiTemplateEntry.tpl:130
-#: plugins/admin/fai/faiNewBranch.tpl:19
-#: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/groups/application_options.tpl:8
-#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/systems/servRepositorySetup.tpl:41
+#: plugins/admin/systems/printerPPDDialog.tpl:22
 msgid "Apply"
 msgstr "Aplicar"
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:67
-#: plugins/personal/environment/class_kioskManagementDialog.inc:85
-#, php-format
-msgid "Can't delete '%s'. Error was: permission denied."
-msgstr ""
+#: plugins/personal/environment/class_logonManagementDialog.inc:96
+#, fuzzy
+msgid "Specified name is invalid."
+msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:70
-#: plugins/personal/environment/class_kioskManagementDialog.inc:88
-#, php-format
-msgid "Can't delete '%s'. Errow was: file doesn't exist."
-msgstr ""
-
-#: plugins/personal/environment/class_kioskManagementDialog.inc:130
-msgid ""
-"There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
-msgstr ""
-
-#: plugins/personal/environment/class_kioskManagementDialog.inc:136
-#, php-format
-msgid "Kiosk path '%s' is not accessible. Please check the permissions."
-msgstr ""
+#: plugins/personal/environment/class_logonManagementDialog.inc:100
+#, fuzzy
+msgid "Specified description contains invalid characters."
+msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:1
 #, fuzzy
@@ -2341,6 +2329,28 @@ msgstr "Servicios"
 msgid "save"
 msgstr "Guardar"
 
+#: plugins/personal/environment/class_kioskManagementDialog.inc:67
+#: plugins/personal/environment/class_kioskManagementDialog.inc:85
+#, php-format
+msgid "Can't delete '%s'. Error was: permission denied."
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:70
+#: plugins/personal/environment/class_kioskManagementDialog.inc:88
+#, php-format
+msgid "Can't delete '%s'. Errow was: file doesn't exist."
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:130
+msgid ""
+"There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:136
+#, php-format
+msgid "Kiosk path '%s' is not accessible. Please check the permissions."
+msgstr ""
+
 #: plugins/personal/environment/kioskManagement.tpl:1
 #: plugins/personal/environment/kioskManagement.tpl:5
 #, fuzzy
@@ -2354,22 +2364,160 @@ msgid "Browse"
 msgstr "Visualizar"
 
 #: plugins/personal/environment/kioskManagement.tpl:25
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
 #: plugins/admin/systems/glpi_edit_type.tpl:15
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:14
 #: plugins/admin/systems/glpiManufacturer.tpl:13
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
 #: plugins/admin/systems/glpi_edit_os.tpl:15
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:14
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
 #: include/class_MultiSelectWindow.inc:45
 #, fuzzy
 msgid "Close"
 msgstr "Elige"
 
-#: plugins/personal/environment/main.inc:124
+#: plugins/personal/generic/class_user.inc:256
+msgid "female"
+msgstr "mujer"
+
+#: plugins/personal/generic/class_user.inc:256
+msgid "male"
+msgstr "hombre"
+
+#: plugins/personal/generic/class_user.inc:270
+msgid "This account has no valid GOsa extensions."
+msgstr "Esta cuenta no tiene extensiones GOsa validas"
+
+#: plugins/personal/generic/class_user.inc:324
+msgid "The specified file has not been uploaded via HTTP POST! Aborted."
+msgstr ""
+"¡El archivo especificado no ha podido ser subido vía HTTP POST! Abortado."
+
+#: plugins/personal/generic/class_user.inc:420
+msgid "Please enter a valid serial number"
+msgstr "Por favor introduzca un número de serie válido"
+
+#: plugins/personal/generic/class_user.inc:457
+#, php-format
+msgid "Certificate is valid from %s to %s and is currently %s."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:457
+msgid "valid"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:457
+msgid "invalid"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:461
 #, fuzzy
-msgid "User environment settings"
-msgstr "Parametros del correo de usuarios"
+msgid "No certificate installed"
+msgstr "Editar certificados"
+
+#: plugins/personal/generic/class_user.inc:879
+msgid "Kerberos database communication failed"
+msgstr "La comunicación con la base de datos Kerberos ha fallado"
+
+#: plugins/personal/generic/class_user.inc:896
+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:907
+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:947
+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:952
+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:958
+#: plugins/addons/addressbook/class_addressbook.inc:545
+#: plugins/admin/users/class_userManagement.inc:634
+msgid "The required field 'Name' is not set."
+msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+
+#: plugins/personal/generic/class_user.inc:967
+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:973
+#: plugins/addons/addressbook/class_addressbook.inc:549
+#: plugins/admin/users/class_userManagement.inc:637
+msgid "The required field 'Given name' is not set."
+msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
+
+#: plugins/personal/generic/class_user.inc:976
+msgid "The required field 'Login' is not set."
+msgstr " El campo requerido 'Login' no ha sido rellenado."
+
+#: plugins/personal/generic/class_user.inc:983
+msgid ""
+"There's already a person with this 'Name'/'Given name' combination in the "
+"database."
+msgstr ""
+"Ya existe un usuario con la misma combinación 'Nombre' / 'Sobrenombre' en la "
+"base de datos."
+
+#: plugins/personal/generic/class_user.inc:990
+msgid ""
+"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+"El campo 'Login' contiene caracteres no validos. Solo minúsculas, números y "
+"guiones están permitidos."
+
+#: plugins/personal/generic/class_user.inc:993
+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:996
+#: plugins/personal/generic/class_user.inc:1021
+#: plugins/addons/addressbook/class_addressbook.inc:555
+#: plugins/addons/addressbook/class_addressbook.inc:583
+#: plugins/admin/departments/class_departmentGeneric.inc:211
+msgid "The field 'Name' contains invalid characters."
+msgstr "El campo 'Nombre' contiene caracteres no validos."
+
+#: plugins/personal/generic/class_user.inc:999
+#: plugins/personal/generic/class_user.inc:1018
+#: plugins/addons/addressbook/class_addressbook.inc:558
+#: plugins/addons/addressbook/class_addressbook.inc:580
+msgid "The field 'Given name' contains invalid characters."
+msgstr "El campo 'Sobrenombre' contiene caracteres no validos"
+
+#: plugins/personal/generic/class_user.inc:1004
+#: plugins/addons/addressbook/class_addressbook.inc:563
+#: plugins/addons/addressbook/class_addressbook.inc:566
+#: plugins/admin/departments/class_departmentGeneric.inc:214
+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:1007
+#: plugins/addons/addressbook/class_addressbook.inc:569
+#: plugins/admin/departments/class_departmentGeneric.inc:217
+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:1010
+#: plugins/addons/addressbook/class_addressbook.inc:572
+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:1013
+#: plugins/addons/addressbook/class_addressbook.inc:575
+msgid "The field 'Pager' contains an invalid phone number."
+msgstr ""
+"El campo 'Dispositivo de Busqueda' contiene un número de teléfono invalido."
+
+#: plugins/personal/generic/class_user.inc:1140
+#, fuzzy
+msgid "Could not open specified certificate!"
+msgstr "No puedo seleccionar la base de datos."
 
 #: plugins/personal/generic/password.tpl:2
 msgid ""
@@ -2381,38 +2529,18 @@ msgstr ""
 "Por esa razón tiene que volver a reintroducir su contraseña de nuevo. Gosa "
 "codificara esta con el nuevo método seleccionado."
 
-#: plugins/personal/generic/generic_picture.tpl:5
-#: plugins/personal/generic/generic_picture.tpl:15
+#: 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_picture.tpl:5
+#: plugins/personal/generic/generic_picture.tpl:15
 #: plugins/personal/generic/paste_generic.tpl:41
 msgid "Personal picture"
 msgstr "Foto Personal"
 
-#: plugins/personal/generic/generic_picture.tpl:27
-#: plugins/personal/generic/paste_generic.tpl:27
-msgid "Remove picture"
-msgstr "Eliminar foto"
-
-#: plugins/personal/generic/generic_picture.tpl:33
-#: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
-#: plugins/admin/systems/servnfs.tpl:75
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
-#: plugins/admin/systems/servdnseditzone.tpl:117
-#: plugins/admin/systems/glpi_devices.tpl:760
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
-#: include/class_MultiSelectWindow.inc:44
-#: ihtml/themes/default/copyPasteDialog.tpl:12
-msgid "Save"
-msgstr "Guardar"
-
-#: plugins/personal/generic/generic.tpl:6
-msgid "Personal information"
-msgstr "Información personal"
-
 #: plugins/personal/generic/generic.tpl:24
 #: plugins/personal/generic/generic.tpl:34
 msgid "Change picture"
@@ -2446,8 +2574,8 @@ msgid "Login"
 msgstr "Inicio"
 
 #: plugins/personal/generic/generic.tpl:67
-#: plugins/addons/addressbook/address_info.tpl:22
 #: plugins/addons/addressbook/address_edit.tpl:54
+#: plugins/addons/addressbook/address_info.tpl:22
 msgid "Personal title"
 msgstr "Título Personal"
 
@@ -2461,7 +2589,7 @@ msgstr "Fecha de nacimiento"
 
 #: plugins/personal/generic/generic.tpl:100
 #: ihtml/themes/altlinux/sizelimit.tpl:14
-#: ihtml/themes/default/sizelimit.tpl:14
+#: ihtml/themes/default/sizelimit.tpl:14 ihtml/themes/lhs/sizelimit.tpl:14
 msgid "Set"
 msgstr "por debajo"
 
@@ -2476,30 +2604,31 @@ msgid "Preferred langage"
 msgstr "Lenguaje por defecto"
 
 #: plugins/personal/generic/generic.tpl:127
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
 #: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/admin/fai/class_faiManagement.inc:670
-#: plugins/admin/groups/class_groupManagement.inc:458
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
+#: plugins/addons/godfs/class_dfsManagment.inc:186
+#: plugins/admin/fai/class_faiManagement.inc:678
+#: plugins/admin/groups/class_groupManagement.inc:459
 #: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/users/class_userManagement.inc:786
+#: plugins/admin/users/class_userManagement.inc:787
 #: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_applicationManagement.inc:477
+#: plugins/admin/applications/class_applicationManagement.inc:480
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_departmentManagement.inc:302
-#: plugins/admin/systems/component.tpl:13 plugins/admin/systems/server.tpl:13
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/terminal.tpl:18
-#: plugins/admin/systems/class_systemManagement.inc:771
-#: plugins/admin/systems/printer.tpl:20
+#: plugins/admin/departments/class_departmentManagement.inc:303
+#: plugins/admin/systems/server.tpl:13 plugins/admin/systems/terminal.tpl:18
 #: plugins/admin/systems/workstation.tpl:27
+#: plugins/admin/systems/component.tpl:13
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/phone.tpl:13
+#: plugins/admin/systems/class_systemManagement.inc:772
+#: plugins/admin/systems/printer.tpl:20
 #: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:43
-#: plugins/admin/ogroups/class_ogroupManagement.inc:451
-#: plugins/admin/ogroups/generic.tpl:21
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:330
-#: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/ogroups/class_ogroupManagement.inc:452
+#: plugins/admin/ogroups/generic.tpl:21 plugins/gofon/macro/generic.tpl:20
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 #: plugins/gofon/conference/generic.tpl:33
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
 msgid "Base"
 msgstr "Base"
 
@@ -2510,10 +2639,10 @@ msgstr "Elija el subárbol donde colocar el usuario"
 #: plugins/personal/generic/generic.tpl:134
 #: plugins/admin/groups/generic.tpl:26
 #: plugins/admin/departments/generic.tpl:33
-#: plugins/admin/systems/component.tpl:18 plugins/admin/systems/server.tpl:18
-#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/terminal.tpl:23
-#: plugins/admin/systems/printer.tpl:25
+#: plugins/admin/systems/server.tpl:18 plugins/admin/systems/terminal.tpl:23
 #: plugins/admin/systems/workstation.tpl:32
+#: plugins/admin/systems/component.tpl:18 plugins/admin/systems/phone.tpl:18
+#: plugins/admin/systems/printer.tpl:25
 #: plugins/admin/systems/wingeneric.tpl:18
 #: plugins/admin/ogroups/generic.tpl:26
 #, fuzzy
@@ -2522,10 +2651,10 @@ msgstr "Seleccione para ver los servidores"
 
 #: plugins/personal/generic/generic.tpl:147
 #: plugins/personal/generic/generic.tpl:291
-#: plugins/addons/addressbook/address_info.tpl:33
-#: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/addons/addressbook/address_edit.tpl:72
 #: plugins/addons/addressbook/address_edit.tpl:182
+#: plugins/addons/addressbook/address_info.tpl:33
+#: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/admin/departments/generic.tpl:55
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
 msgid "Address"
@@ -2569,16 +2698,16 @@ msgid "Organization"
 msgstr "Organización"
 
 #: plugins/personal/generic/generic.tpl:213
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:323
-#: plugins/addons/addressbook/address_info.tpl:64
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
 #: plugins/addons/addressbook/address_edit.tpl:138
-#: plugins/admin/groups/class_groupManagement.inc:523
-#: plugins/admin/users/class_userManagement.inc:818
-#: plugins/admin/applications/class_applicationManagement.inc:518
-#: plugins/admin/systems/class_systemManagement.inc:791
-#: plugins/admin/ogroups/class_ogroupManagement.inc:517
-#: plugins/admin/ogroups/class_ogroupManagement.inc:585
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
+#: plugins/addons/addressbook/address_info.tpl:64
+#: plugins/admin/groups/class_groupManagement.inc:524
+#: plugins/admin/users/class_userManagement.inc:819
+#: plugins/admin/applications/class_applicationManagement.inc:521
+#: plugins/admin/systems/class_systemManagement.inc:792
+#: plugins/admin/ogroups/class_ogroupManagement.inc:518
+#: plugins/admin/ogroups/class_ogroupManagement.inc:586
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #: plugins/generic/references/class_reference.inc:38
 msgid "Department"
 msgstr "Departamento"
@@ -2602,12 +2731,13 @@ msgstr "Habitación No."
 
 #: plugins/personal/generic/generic.tpl:257
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_info.tpl:40
-#: plugins/addons/addressbook/address_edit.tpl:95 html/getxls.php:236
+#: 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:283
+#: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:43
 #: plugins/admin/departments/generic.tpl:51
 #: plugins/admin/systems/workstation.tpl:18 html/getxls.php:174
@@ -2653,8 +2783,8 @@ msgid "Street"
 msgstr "Calle"
 
 #: plugins/personal/generic/generic.tpl:365
-#: plugins/addons/addressbook/address_info.tpl:70
-#: plugins/addons/addressbook/address_edit.tpl:158 html/getxls.php:174
+#: plugins/addons/addressbook/address_edit.tpl:158
+#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
 msgid "Postal code"
 msgstr "Código Postal"
 
@@ -2674,11 +2804,31 @@ msgstr "Último envío"
 msgid "Public visible"
 msgstr "Visible Publicamente"
 
-#: plugins/personal/generic/generic_certs.tpl:8
-msgid "Standard certificate"
-msgstr "Certificado estandar"
-
-#: plugins/personal/generic/generic_certs.tpl:28
+#: plugins/personal/generic/generic_picture.tpl:27
+#: plugins/personal/generic/paste_generic.tpl:27
+msgid "Remove picture"
+msgstr "Eliminar foto"
+
+#: plugins/personal/generic/generic_picture.tpl:33
+#: plugins/addons/addressbook/address_edit.tpl:233
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
+#: plugins/admin/systems/servnfs.tpl:75
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
+#: plugins/admin/systems/servdnseditzone.tpl:117
+#: plugins/admin/systems/glpi_devices.tpl:760
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
+#: include/class_MultiSelectWindow.inc:44
+#: ihtml/themes/default/copyPasteDialog.tpl:12
+msgid "Save"
+msgstr "Guardar"
+
+#: plugins/personal/generic/generic_certs.tpl:8
+msgid "Standard certificate"
+msgstr "Certificado estandar"
+
+#: plugins/personal/generic/generic_certs.tpl:28
 msgid "S/MIME certificate"
 msgstr "Certificado S/MIME"
 
@@ -2690,149 +2840,6 @@ msgstr "Certificado PKCS12"
 msgid "Certificate serial number"
 msgstr "Numero de serie del certificado"
 
-#: plugins/personal/generic/class_user.inc:256
-msgid "female"
-msgstr "mujer"
-
-#: plugins/personal/generic/class_user.inc:256
-msgid "male"
-msgstr "hombre"
-
-#: plugins/personal/generic/class_user.inc:270
-msgid "This account has no valid GOsa extensions."
-msgstr "Esta cuenta no tiene extensiones GOsa validas"
-
-#: plugins/personal/generic/class_user.inc:324
-msgid "The specified file has not been uploaded via HTTP POST! Aborted."
-msgstr ""
-"¡El archivo especificado no ha podido ser subido vía HTTP POST! Abortado."
-
-#: plugins/personal/generic/class_user.inc:420
-msgid "Please enter a valid serial number"
-msgstr "Por favor introduzca un número de serie válido"
-
-#: plugins/personal/generic/class_user.inc:457
-#, php-format
-msgid "Certificate is valid from %s to %s and is currently %s."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:457
-msgid "valid"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:457
-msgid "invalid"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:461
-#, fuzzy
-msgid "No certificate installed"
-msgstr "Editar certificados"
-
-#: plugins/personal/generic/class_user.inc:879
-msgid "Kerberos database communication failed"
-msgstr "La comunicación con la base de datos Kerberos ha fallado"
-
-#: plugins/personal/generic/class_user.inc:896
-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:907
-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:947
-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:952
-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:958
-#: plugins/addons/addressbook/class_addressbook.inc:545
-#: plugins/admin/users/class_userManagement.inc:634
-msgid "The required field 'Name' is not set."
-msgstr "El campo requerido 'Nombre' no ha sido rellenado."
-
-#: plugins/personal/generic/class_user.inc:967
-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:973
-#: plugins/addons/addressbook/class_addressbook.inc:549
-#: plugins/admin/users/class_userManagement.inc:637
-msgid "The required field 'Given name' is not set."
-msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
-
-#: plugins/personal/generic/class_user.inc:976
-msgid "The required field 'Login' is not set."
-msgstr " El campo requerido 'Login' no ha sido rellenado."
-
-#: plugins/personal/generic/class_user.inc:983
-msgid ""
-"There's already a person with this 'Name'/'Given name' combination in the "
-"database."
-msgstr ""
-"Ya existe un usuario con la misma combinación 'Nombre' / 'Sobrenombre' en la "
-"base de datos."
-
-#: plugins/personal/generic/class_user.inc:990
-msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-"El campo 'Login' contiene caracteres no validos. Solo minúsculas, números y "
-"guiones están permitidos."
-
-#: plugins/personal/generic/class_user.inc:993
-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:996
-#: plugins/personal/generic/class_user.inc:1021
-#: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/addons/addressbook/class_addressbook.inc:583
-#: plugins/admin/departments/class_departmentGeneric.inc:211
-msgid "The field 'Name' contains invalid characters."
-msgstr "El campo 'Nombre' contiene caracteres no validos."
-
-#: plugins/personal/generic/class_user.inc:999
-#: plugins/personal/generic/class_user.inc:1018
-#: plugins/addons/addressbook/class_addressbook.inc:558
-#: plugins/addons/addressbook/class_addressbook.inc:580
-msgid "The field 'Given name' contains invalid characters."
-msgstr "El campo 'Sobrenombre' contiene caracteres no validos"
-
-#: plugins/personal/generic/class_user.inc:1004
-#: plugins/addons/addressbook/class_addressbook.inc:563
-#: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/admin/departments/class_departmentGeneric.inc:214
-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:1007
-#: plugins/addons/addressbook/class_addressbook.inc:569
-#: plugins/admin/departments/class_departmentGeneric.inc:217
-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:1010
-#: plugins/addons/addressbook/class_addressbook.inc:572
-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:1013
-#: plugins/addons/addressbook/class_addressbook.inc:575
-msgid "The field 'Pager' contains an invalid phone number."
-msgstr ""
-"El campo 'Dispositivo de Busqueda' contiene un número de teléfono invalido."
-
-#: plugins/personal/generic/class_user.inc:1140
-#, fuzzy
-msgid "Could not open specified certificate!"
-msgstr "No puedo seleccionar la base de datos."
-
 #: plugins/personal/generic/main.inc:107
 msgid "You are not allowed to set your password!"
 msgstr "¡No tiene permisos para cambiar su contraseña!"
@@ -2881,14 +2888,19 @@ msgstr "Cuenta FTP"
 msgid "Intranet account"
 msgstr "Crear cuenta telefónica"
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:6
-msgid "WebDAV"
-msgstr "WebDAV"
-
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "Cuenta PHPGroupware"
 
+#: plugins/personal/connectivity/glpi.tpl:1
+#, fuzzy
+msgid "GLPI account"
+msgstr "Cuenta FTP"
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:6
+msgid "WebDAV"
+msgstr "WebDAV"
+
 #: plugins/personal/connectivity/kolab.tpl:1
 msgid "Kolab account"
 msgstr "Cuenta Kolab"
@@ -2990,11 +3002,6 @@ msgstr "Active para desactivar acceso FTP"
 msgid "Temporary disable FTP access"
 msgstr "Acceso FTP desactivado temporalmente"
 
-#: plugins/personal/connectivity/glpi.tpl:1
-#, fuzzy
-msgid "GLPI account"
-msgstr "Cuenta FTP"
-
 #: plugins/personal/connectivity/oxchange.tpl:2
 msgid "Open-Xchange Account"
 msgstr "Cuenta Open-Xchange"
@@ -3027,6 +3034,31 @@ msgstr "Información de Usuario"
 msgid "User Timezone"
 msgstr "Zona de uso horario del usuario"
 
+#: plugins/personal/connectivity/opengw.tpl:1
+#, fuzzy
+msgid "Opengroupware"
+msgstr "Cuenta PHPGroupware"
+
+#: plugins/personal/connectivity/opengw.tpl:8
+#, fuzzy
+msgid "Location team"
+msgstr "Nombre de la localización"
+
+#: plugins/personal/connectivity/opengw.tpl:21
+#, fuzzy
+msgid "Template user"
+msgstr "Plantilla"
+
+#: plugins/personal/connectivity/opengw.tpl:34
+#: plugins/admin/systems/class_workstationGeneric.inc:71
+msgid "Locked"
+msgstr ""
+
+#: plugins/personal/connectivity/opengw.tpl:49
+#, fuzzy
+msgid "Teams"
+msgstr "Días para tareas"
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
@@ -3066,13 +3098,38 @@ msgstr ""
 msgid "Numerical value for Quota Setting is not valid."
 msgstr "El valor de 'Tamaño de Cola' no es valido."
 
+#: plugins/personal/connectivity/class_intranetAccount.inc:14
+msgid "Intranet"
+msgstr ""
+
 #: plugins/personal/connectivity/class_pptpAccount.inc:26
 msgid "PPTP"
 msgstr ""
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:14
-msgid "Intranet"
-msgstr ""
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
+msgstr "FTP"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+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:140
+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:143
+msgid "Value specified as 'Files' is not valid."
+msgstr "El valor especificado como 'Archivos' no es válido"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:146
+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:149
+msgid "Value specified as 'Ratio' is not valid."
+msgstr "El valor especificado como 'relación' no es válido"
 
 #: plugins/personal/connectivity/class_phpgwAccount.inc:5
 msgid "PHPGroupware"
@@ -3147,34 +3204,13 @@ msgstr ""
 "¡No hay ningún usuario con cuenta de correo '%s' para su política de "
 "invitación!"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
-#: plugins/generic/references/class_reference.inc:34
-msgid "FTP"
-msgstr "FTP"
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
+msgstr "Cuenta WebDAV"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
-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:140
-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:143
-msgid "Value specified as 'Files' is not valid."
-msgstr "El valor especificado como 'Archivos' no es válido"
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:146
-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:149
-msgid "Value specified as 'Ratio' is not valid."
-msgstr "El valor especificado como 'relación' no es válido"
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
-msgid "Open-Xchange"
-msgstr "Open-Xchange"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
+msgid "Open-Xchange"
+msgstr "Open-Xchange"
 
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:613
 #, fuzzy, php-format
@@ -3232,44 +3268,6 @@ msgstr ""
 msgid "you are not using any strange characters in the loginname."
 msgstr ""
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
-msgstr "Cuenta WebDAV"
-
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
-#, fuzzy
-msgid "PHPscheduleit"
-msgstr "Cuenta PHPGroupware"
-
-#: plugins/personal/connectivity/class_connectivity.inc:63
-msgid "This account has no connectivity extensions."
-msgstr "Esta cuenta no tiene extensiones de conectividad"
-
-#: plugins/personal/connectivity/opengw.tpl:1
-#, fuzzy
-msgid "Opengroupware"
-msgstr "Cuenta PHPGroupware"
-
-#: plugins/personal/connectivity/opengw.tpl:8
-#, fuzzy
-msgid "Location team"
-msgstr "Nombre de la localización"
-
-#: plugins/personal/connectivity/opengw.tpl:21
-#, fuzzy
-msgid "Template user"
-msgstr "Plantilla"
-
-#: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:71
-msgid "Locked"
-msgstr ""
-
-#: plugins/personal/connectivity/opengw.tpl:49
-#, fuzzy
-msgid "Teams"
-msgstr "Días para tareas"
-
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 #, fuzzy
 msgid "Opengroupware account"
@@ -3293,6 +3291,58 @@ msgid ""
 "configuration twice."
 msgstr ""
 
+#: plugins/personal/connectivity/class_connectivity.inc:63
+msgid "This account has no connectivity extensions."
+msgstr "Esta cuenta no tiene extensiones de conectividad"
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
+#, fuzzy
+msgid "PHPscheduleit"
+msgstr "Cuenta PHPGroupware"
+
+#: plugins/gofax/blocklists/generic.tpl:8
+msgid "List name"
+msgstr "Nombre de la lista"
+
+#: plugins/gofax/blocklists/generic.tpl:10
+msgid "Name of blocklist"
+msgstr "Nombre de la lista de bloqueos"
+
+#: plugins/gofax/blocklists/generic.tpl:16
+msgid "Select subtree to place blocklist in"
+msgstr "Seleccione un subárbol para colocar la lista de bloqueos"
+
+#: plugins/gofax/blocklists/generic.tpl:32
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/systems/workstationService.tpl:42
+#: plugins/admin/systems/workstationService.tpl:120
+#: plugins/admin/systems/servnfs.tpl:39
+#: plugins/admin/systems/terminalService.tpl:42
+#: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/systems/glpi_devices.tpl:427
+#: plugins/admin/systems/glpi_devices.tpl:492
+#: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
+#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
+msgid "Type"
+msgstr "Tipo"
+
+#: plugins/gofax/blocklists/generic.tpl:34
+msgid "Select wether to filter incoming or outgoing calls"
+msgstr "Seleccione la manera de filtrar llamadas entrantes o salientes"
+
+#: plugins/gofax/blocklists/generic.tpl:43
+msgid "Descriptive text for this blocklist"
+msgstr "Descripción de esta lista de bloqueos"
+
+#: plugins/gofax/blocklists/generic.tpl:56
+msgid "Blocked numbers"
+msgstr "Números bloqueados"
+
+#: plugins/gofax/blocklists/generic.tpl:72
+msgid "Numbers can also contain wild cards."
+msgstr "Los números pueden contener también comodínes"
+
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
 msgid "FAX Blocklists"
 msgstr "Lista de bloqueos de FAX"
@@ -3311,77 +3361,79 @@ msgid "Please specify a valid phone number."
 msgstr "Por favor especifique un usuario valido."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/admin/fai/class_faiManagement.inc:635
+#: plugins/admin/fai/class_faiManagement.inc:641
 #: plugins/admin/groups/class_groupManagement.inc:451
 #: plugins/admin/users/class_userManagement.inc:778
-#: plugins/admin/applications/class_applicationManagement.inc:470
+#: plugins/admin/applications/class_applicationManagement.inc:472
 #: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
 #: plugins/admin/ogroups/class_ogroupManagement.inc:442
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
 #, fuzzy
-msgid "Go up one department"
-msgstr "Nombre del departamento"
+msgid "Go to root department"
+msgstr "Lista de Departamentos"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/admin/fai/class_faiManagement.inc:635
-#: plugins/admin/fai/class_faiProfile.inc:303
+#: plugins/addons/godfs/class_dfsManagment.inc:183
+#: plugins/admin/fai/class_faiManagement.inc:641
 #: plugins/admin/groups/class_groupManagement.inc:451
 #: plugins/admin/users/class_userManagement.inc:778
-#: plugins/admin/applications/class_applicationManagement.inc:470
+#: plugins/admin/applications/class_applicationManagement.inc:472
 #: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
-#: plugins/admin/systems/class_servDNSeditZone.inc:276
+#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: plugins/admin/ogroups/class_ogroupManagement.inc:442
-#: plugins/admin/ogroups/phonequeue.tpl:17
+#: plugins/admin/ogroups/class_ogroupManagement.inc:443
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
-msgid "Up"
-msgstr ""
+#, fuzzy
+msgid "Root"
+msgstr "Reiniciar"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
-#: plugins/admin/fai/class_faiManagement.inc:638
+#: plugins/admin/fai/class_faiManagement.inc:644
 #: plugins/admin/groups/class_groupManagement.inc:452
 #: plugins/admin/users/class_userManagement.inc:779
-#: plugins/admin/applications/class_applicationManagement.inc:471
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:297
-#: plugins/admin/systems/class_systemManagement.inc:755
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_systemManagement.inc:755
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/class_ogroupManagement.inc:443
+#: plugins/admin/ogroups/class_ogroupManagement.inc:444
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
 #, fuzzy
-msgid "Go to root department"
-msgstr "Lista de Departamentos"
+msgid "Go up one department"
+msgstr "Nombre del departamento"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
-#: plugins/admin/fai/class_faiManagement.inc:638
+#: plugins/addons/godfs/class_dfsManagment.inc:182
+#: plugins/admin/fai/class_faiManagement.inc:644
+#: plugins/admin/fai/class_faiProfile.inc:303
 #: plugins/admin/groups/class_groupManagement.inc:452
 #: plugins/admin/users/class_userManagement.inc:779
-#: plugins/admin/applications/class_applicationManagement.inc:471
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:297
-#: plugins/admin/systems/class_systemManagement.inc:755
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_systemManagement.inc:755
+#: plugins/admin/systems/class_servDNSeditZone.inc:276
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
 #: plugins/admin/ogroups/class_ogroupManagement.inc:444
+#: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
-#, fuzzy
-msgid "Root"
-msgstr "Reiniciar"
+msgid "Up"
+msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:309
 #: plugins/admin/groups/class_groupManagement.inc:453
 #: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:472
-#: plugins/admin/systems/class_systemManagement.inc:757
+#: plugins/admin/applications/class_applicationManagement.inc:474
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
 #: plugins/admin/ogroups/class_ogroupManagement.inc:445
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
@@ -3391,13 +3443,13 @@ msgid "Go to users department"
 msgstr "Seleccione para ver los departamentos"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:309
-#: plugins/admin/fai/class_faiManagement.inc:641
+#: plugins/admin/fai/class_faiManagement.inc:647
 #: plugins/admin/groups/class_groupManagement.inc:453
 #: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:472
+#: plugins/admin/applications/class_applicationManagement.inc:474
 #: plugins/admin/departments/class_departmentManagement.inc:298
-#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
 #: plugins/admin/ogroups/class_ogroupManagement.inc:446
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
@@ -3406,231 +3458,219 @@ msgstr "Seleccione para ver los departamentos"
 msgid "Home"
 msgstr "Nombre de Maquina"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
+#: plugins/admin/fai/class_faiManagement.inc:649
+#: plugins/admin/groups/class_groupManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:781
+#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/departments/class_departmentManagement.inc:299
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/ogroups/class_ogroupManagement.inc:447
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
+msgid "Reload list"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
+#: plugins/addons/godfs/class_dfsManagment.inc:187
+#: plugins/admin/fai/class_faiManagement.inc:649
+#: plugins/admin/fai/class_faiManagement.inc:679
+#: plugins/admin/groups/class_groupManagement.inc:454
+#: plugins/admin/groups/class_groupManagement.inc:460
+#: plugins/admin/users/class_userManagement.inc:781
+#: plugins/admin/users/class_userManagement.inc:788
+#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/applications/class_applicationManagement.inc:481
+#: plugins/admin/departments/class_departmentManagement.inc:299
+#: plugins/admin/departments/class_departmentManagement.inc:304
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/ogroups/class_ogroupManagement.inc:447
+#: plugins/admin/ogroups/class_ogroupManagement.inc:453
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:332
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
+msgid "Submit"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
 #, fuzzy
 msgid "Create new blocklist"
 msgstr "Nombre de la lista de bloqueos"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
 #, fuzzy
 msgid "New Blocklist"
 msgstr "Listas de bloqueo"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/fai/class_faiManagement.inc:671
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:787
-#: plugins/admin/applications/class_applicationManagement.inc:478
-#: plugins/admin/departments/class_departmentManagement.inc:303
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_glpiSelectUser.inc:168
-#: plugins/admin/ogroups/class_ogroupManagement.inc:452
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
+#: plugins/addons/godfs/class_dfsManagment.inc:187
+#: plugins/admin/fai/class_faiManagement.inc:679
+#: plugins/admin/groups/class_groupManagement.inc:460
+#: plugins/admin/users/class_userManagement.inc:788
+#: plugins/admin/applications/class_applicationManagement.inc:481
+#: plugins/admin/departments/class_departmentManagement.inc:304
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/ogroups/class_ogroupManagement.inc:453
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:332
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
 #, fuzzy
 msgid "Submit department"
 msgstr "Mostrar departamentos"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/fai/class_faiManagement.inc:671
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:787
-#: plugins/admin/applications/class_applicationManagement.inc:478
-#: plugins/admin/departments/class_departmentManagement.inc:303
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_glpiSelectUser.inc:168
-#: plugins/admin/ogroups/class_ogroupManagement.inc:452
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
-msgid "Submit"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
 #: plugins/admin/fai/class_faiScript.inc:227
 #: plugins/admin/fai/class_faiScript.inc:230
-#: plugins/admin/fai/class_faiManagement.inc:689
-#: plugins/admin/fai/class_faiManagement.inc:789
-#: plugins/admin/fai/class_faiManagement.inc:794
+#: plugins/admin/fai/class_faiManagement.inc:697
+#: plugins/admin/fai/class_faiManagement.inc:797
+#: plugins/admin/fai/class_faiManagement.inc:802
 #: plugins/admin/fai/class_faiHook.inc:251
 #: plugins/admin/fai/class_faiHook.inc:254
-#: plugins/admin/groups/class_groupManagement.inc:469
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/users/class_userManagement.inc:798
-#: plugins/admin/users/class_userManagement.inc:805
-#: plugins/admin/applications/class_applicationManagement.inc:489
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/departments/class_departmentManagement.inc:310
-#: plugins/admin/systems/class_systemManagement.inc:780
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/groups/class_groupManagement.inc:470
+#: plugins/admin/groups/class_groupManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:806
+#: plugins/admin/applications/class_applicationManagement.inc:492
+#: plugins/admin/applications/class_applicationManagement.inc:498
+#: plugins/admin/departments/class_departmentManagement.inc:311
 #: plugins/admin/systems/glpi.tpl:15 plugins/admin/systems/glpi.tpl:25
 #: plugins/admin/systems/glpi.tpl:35 plugins/admin/systems/glpiPrinter.tpl:15
 #: plugins/admin/systems/glpiPrinter.tpl:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:464
-#: plugins/admin/ogroups/class_ogroupManagement.inc:469
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/ogroups/class_ogroupManagement.inc:465
+#: plugins/admin/ogroups/class_ogroupManagement.inc:470
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
 #, fuzzy
 msgid "edit"
 msgstr "Editar"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
-#: plugins/admin/users/class_userManagement.inc:799
-#: plugins/admin/users/class_userManagement.inc:806
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
+#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:807
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 #, fuzzy
 msgid "Edit user"
 msgstr "Usuario administrador"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
 #: plugins/addons/mailqueue/contents.tpl:93
 #: plugins/admin/fai/class_faiScript.inc:231
-#: plugins/admin/fai/class_faiManagement.inc:690
-#: plugins/admin/fai/class_faiManagement.inc:796
+#: plugins/admin/fai/class_faiManagement.inc:698
+#: plugins/admin/fai/class_faiManagement.inc:804
 #: plugins/admin/fai/class_faiHook.inc:255
-#: plugins/admin/groups/class_groupManagement.inc:471
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/users/class_userManagement.inc:802
-#: plugins/admin/users/class_userManagement.inc:809
-#: plugins/admin/applications/class_applicationManagement.inc:491
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/departments/class_departmentManagement.inc:311
-#: plugins/admin/systems/class_systemManagement.inc:781
-#: plugins/admin/ogroups/class_ogroupManagement.inc:466
-#: plugins/admin/ogroups/class_ogroupManagement.inc:471
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
+#: plugins/admin/groups/class_groupManagement.inc:472
+#: plugins/admin/groups/class_groupManagement.inc:477
+#: plugins/admin/users/class_userManagement.inc:803
+#: plugins/admin/users/class_userManagement.inc:810
+#: plugins/admin/applications/class_applicationManagement.inc:494
+#: plugins/admin/applications/class_applicationManagement.inc:500
+#: plugins/admin/departments/class_departmentManagement.inc:312
+#: plugins/admin/systems/class_systemManagement.inc:782
+#: plugins/admin/ogroups/class_ogroupManagement.inc:467
+#: plugins/admin/ogroups/class_ogroupManagement.inc:472
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:338
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
 #, fuzzy
 msgid "delete"
 msgstr "Borrar"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
-#: plugins/admin/users/class_userManagement.inc:803
-#: plugins/admin/users/class_userManagement.inc:810
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
+#: plugins/admin/users/class_userManagement.inc:804
+#: plugins/admin/users/class_userManagement.inc:811
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:338
 #, fuzzy
 msgid "Delete user"
 msgstr "Borrar"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:323
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
 #, fuzzy
 msgid "Blocklist name"
 msgstr "Gestión de listas de bloqueo"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:325
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/fai/class_faiManagement.inc:686
-#: plugins/admin/groups/class_groupManagement.inc:525
-#: plugins/admin/users/class_userManagement.inc:820
-#: plugins/admin/applications/class_applicationManagement.inc:519
-#: plugins/admin/departments/class_departmentManagement.inc:318
-#: plugins/admin/systems/class_systemManagement.inc:792
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/fai/class_faiManagement.inc:694
+#: plugins/admin/groups/class_groupManagement.inc:526
+#: plugins/admin/users/class_userManagement.inc:821
+#: plugins/admin/applications/class_applicationManagement.inc:522
+#: plugins/admin/departments/class_departmentManagement.inc:319
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
-#: plugins/admin/ogroups/class_ogroupManagement.inc:494
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
+#: plugins/admin/systems/class_systemManagement.inc:793
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/ogroups/class_ogroupManagement.inc:495
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:345
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:313
 msgid "Actions"
 msgstr "Acciones"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:327
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:328
 msgid "This table displays faxblocklists for the selected tree."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:395
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:396
 msgid "send"
 msgstr "enviar"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:395
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:396
 msgid "receive"
 msgstr "recibir"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:543
 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:548
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:549
 #: plugins/admin/departments/class_departmentGeneric.inc:199
 msgid "Required field 'Name' is not set."
 msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:551
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:552
 msgid "Required field 'Name' contains invalid characters"
 msgstr "El campo requerido 'Nombre' contiene caracteres no validos"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:558
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:559
 msgid "Specified name is already used."
 msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:565
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:566
 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/generic.tpl:8
-msgid "List name"
-msgstr "Nombre de la lista"
-
-#: plugins/gofax/blocklists/generic.tpl:10
-msgid "Name of blocklist"
-msgstr "Nombre de la lista de bloqueos"
+#: plugins/gofax/blocklists/remove.tpl:2
+#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/fai/remove.tpl:2
+#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/groups/remove.tpl:2
+#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2
+#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/ogroups/remove.tpl:2 plugins/gofon/macro/remove.tpl:2
+#: plugins/gofon/conference/remove.tpl:2 html/index.php:237 html/index.php:243
+#: html/index.php:301 ihtml/themes/altlinux/conflict.tpl:6
+#: ihtml/themes/altlinux/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
+#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/lhs/conflict.tpl:6
+#: ihtml/themes/lhs/islocked.tpl:6
+msgid "Warning"
+msgstr "Aviso"
 
-#: plugins/gofax/blocklists/generic.tpl:16
-msgid "Select subtree to place blocklist in"
-msgstr "Seleccione un subárbol para colocar la lista de bloqueos"
-
-#: plugins/gofax/blocklists/generic.tpl:32
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
-#: plugins/admin/systems/workstationService.tpl:42
-#: plugins/admin/systems/workstationService.tpl:120
-#: plugins/admin/systems/servnfs.tpl:39
-#: plugins/admin/systems/terminalService.tpl:42
-#: plugins/admin/systems/terminalService.tpl:120
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
-#: plugins/admin/systems/glpi_devices.tpl:427
-#: plugins/admin/systems/glpi_devices.tpl:492
-#: plugins/admin/systems/glpi_devices.tpl:542
-#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
-msgid "Type"
-msgstr "Tipo"
-
-#: plugins/gofax/blocklists/generic.tpl:34
-msgid "Select wether to filter incoming or outgoing calls"
-msgstr "Seleccione la manera de filtrar llamadas entrantes o salientes"
-
-#: plugins/gofax/blocklists/generic.tpl:43
-msgid "Descriptive text for this blocklist"
-msgstr "Descripción de esta lista de bloqueos"
-
-#: plugins/gofax/blocklists/generic.tpl:56
-msgid "Blocked numbers"
-msgstr "Números bloqueados"
-
-#: plugins/gofax/blocklists/generic.tpl:72
-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/fai/remove.tpl:2
-#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/groups/remove.tpl:2
-#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:237 html/index.php:243 html/index.php:301
-#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/altlinux/islocked.tpl:6
-#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
-msgid "Warning"
-msgstr "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: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
@@ -3787,8 +3827,8 @@ msgid "FAX settings"
 msgstr "Parametros del Fax"
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:6
-#: plugins/addons/addressbook/address_info.tpl:88
 #: plugins/addons/addressbook/address_edit.tpl:206
+#: plugins/addons/addressbook/address_info.tpl:88
 #: plugins/generic/references/class_reference.inc:30
 msgid "FAX"
 msgstr "FAX"
@@ -3874,7 +3914,7 @@ msgstr "FAX ID"
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 #: plugins/admin/systems/class_printGeneric.inc:677
-#: plugins/admin/ogroups/class_ogroupManagement.inc:582
+#: plugins/admin/ogroups/class_ogroupManagement.inc:583
 msgid "User"
 msgstr "Usuario"
 
@@ -3911,50 +3951,6 @@ msgstr "Tiempo de envio"
 msgid "# pages"
 msgstr "# páginas"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:6
-msgid "FAX Reports"
-msgstr "Informes de FAX"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:109
-#: plugins/gofax/faxreports/class_faxreport.inc:119
-#: plugins/gofax/faxreports/class_faxreport.inc:165
-#: plugins/gofax/faxreports/class_faxreport.inc:274
-msgid "Can't connect to fax database, no reports can be shown!"
-msgstr ""
-"No puedo conectar a la de base de datos de fax, ¡no se pueden mostrar los "
-"informes!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:112
-#: plugins/addons/logview/class_logview.inc:66
-#: plugins/gofon/fonreports/class_fonreport.inc:99
-msgid "There is no mysql extension available, please check your php setup."
-msgstr ""
-
-#: plugins/gofax/faxreports/class_faxreport.inc:123
-#: plugins/gofax/faxreports/class_faxreport.inc:128
-#: plugins/gofax/faxreports/class_faxreport.inc:169
-#: plugins/gofax/faxreports/class_faxreport.inc:278
-msgid "Can't select fax database for report generation!"
-msgstr ""
-"¡No puedo seleccionar la base de datos de fax para la generación de informes!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:177
-#: plugins/gofax/faxreports/class_faxreport.inc:286
-msgid "Query for fax database failed!"
-msgstr "¡La consulta a la base de datos de fax ha fallado!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:185
-msgid "You have no permission to retrieve informations about this fax id!"
-msgstr ""
-"¡No tiene permisos para recuperar información sobre el identificador (ID) "
-"del fax!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:205
-#: plugins/gofax/faxreports/class_faxreport.inc:294
-#: plugins/gofon/fonreports/class_fonreport.inc:220
-msgid "Y-M-D"
-msgstr "Y-M-D"
-
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/fonreports/contents.tpl:2
@@ -3996,6 +3992,7 @@ msgstr "durante"
 #: plugins/addons/mailqueue/contents.tpl:26
 #: plugins/addons/logview/contents.tpl:67
 #: plugins/gofon/fonreports/contents.tpl:21 ihtml/themes/default/help.tpl:21
+#: ihtml/themes/lhs/help.tpl:21
 msgid "Search"
 msgstr "Buscar"
 
@@ -4020,36 +4017,67 @@ msgstr "Receptor"
 msgid "Search returned no results..."
 msgstr "La busqueda no ha encontrado resultados"
 
+#: plugins/gofax/faxreports/class_faxreport.inc:6
+msgid "FAX Reports"
+msgstr "Informes de FAX"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:109
+#: plugins/gofax/faxreports/class_faxreport.inc:119
+#: plugins/gofax/faxreports/class_faxreport.inc:165
+#: plugins/gofax/faxreports/class_faxreport.inc:274
+msgid "Can't connect to fax database, no reports can be shown!"
+msgstr ""
+"No puedo conectar a la de base de datos de fax, ¡no se pueden mostrar los "
+"informes!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:112
+#: plugins/addons/logview/class_logview.inc:66
+#: plugins/gofon/fonreports/class_fonreport.inc:99
+msgid "There is no mysql extension available, please check your php setup."
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:123
+#: plugins/gofax/faxreports/class_faxreport.inc:128
+#: plugins/gofax/faxreports/class_faxreport.inc:169
+#: plugins/gofax/faxreports/class_faxreport.inc:278
+msgid "Can't select fax database for report generation!"
+msgstr ""
+"¡No puedo seleccionar la base de datos de fax para la generación de informes!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:177
+#: plugins/gofax/faxreports/class_faxreport.inc:286
+msgid "Query for fax database failed!"
+msgstr "¡La consulta a la base de datos de fax ha fallado!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:185
+msgid "You have no permission to retrieve informations about this fax id!"
+msgstr ""
+"¡No tiene permisos para recuperar información sobre el identificador (ID) "
+"del fax!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:205
+#: plugins/gofax/faxreports/class_faxreport.inc:294
+#: plugins/gofon/fonreports/class_fonreport.inc:220
+msgid "Y-M-D"
+msgstr "Y-M-D"
+
 #: plugins/gofax/faxreports/main.inc:5
 msgid "FAX reports"
 msgstr "Reportes de FAX"
 
-#: plugins/addons/addressbook/dial.tpl:3
-msgid "Dial connection..."
-msgstr "Marcando conexión"
-
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:360
-#: plugins/addons/addressbook/class_addressbook.inc:367
-#: plugins/addons/addressbook/class_addressbook.inc:371
-#: plugins/addons/addressbook/class_addressbook.inc:453
-msgid "Dial"
-msgstr "Llamar"
-
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:513
 #: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/addons/addressbook/class_addressbook.inc:513
+#: plugins/admin/fai/faiVariable.tpl:9
 #: plugins/admin/fai/faiPartitionTable.tpl:9
-#: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiScriptEntry.tpl:9
-#: plugins/admin/fai/faiPackage.tpl:9 plugins/admin/fai/faiProfile.tpl:9
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiPackage.tpl:9
+#: plugins/admin/fai/faiProfile.tpl:9 plugins/admin/fai/faiScript.tpl:9
+#: plugins/admin/fai/faiVariableEntry.tpl:9
 #: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHookEntry.tpl:9
 #: plugins/admin/fai/faiTemplateEntry.tpl:7 plugins/admin/fai/faiHook.tpl:9
 #: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: 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
@@ -4063,14 +4091,16 @@ msgstr "Llamar"
 #: plugins/admin/systems/glpi_devices.tpl:615
 #: plugins/admin/systems/glpi_devices.tpl:669
 #: plugins/admin/systems/glpi_devices.tpl:715
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
 #: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
 msgid "Name"
 msgstr "Nombre"
 
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_info.tpl:29
 #: plugins/addons/addressbook/address_edit.tpl:66
+#: plugins/addons/addressbook/address_info.tpl:29
 msgid "Private"
 msgstr "Privado"
 
@@ -4133,6 +4163,60 @@ msgstr "Elegir el objeto que sera buscado"
 msgid "Search string"
 msgstr "Cadena de busqueda"
 
+#: plugins/addons/addressbook/dial.tpl:3
+msgid "Dial connection..."
+msgstr "Marcando conexión"
+
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/class_addressbook.inc:360
+#: plugins/addons/addressbook/class_addressbook.inc:367
+#: plugins/addons/addressbook/class_addressbook.inc:371
+#: plugins/addons/addressbook/class_addressbook.inc:453
+msgid "Dial"
+msgstr "Llamar"
+
+#: plugins/addons/addressbook/address_edit.tpl:7
+msgid "Choose the department to store entry in"
+msgstr "Elija un departamento para guardar la entrada"
+
+#: plugins/addons/addressbook/address_edit.tpl:24
+#: plugins/addons/addressbook/address_info.tpl:12
+msgid "Personal"
+msgstr "Personal"
+
+#: plugins/addons/addressbook/address_edit.tpl:44
+#: plugins/addons/addressbook/address_info.tpl:19 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Initials"
+msgstr "Iniciales"
+
+#: plugins/addons/addressbook/address_edit.tpl:105
+#: plugins/addons/addressbook/address_info.tpl:43
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:46
+msgid "Email"
+msgstr "Correo Electrónico"
+
+#: plugins/addons/addressbook/address_edit.tpl:119
+#: plugins/addons/addressbook/address_info.tpl:53
+msgid "Organizational"
+msgstr "De organización"
+
+#: plugins/addons/addressbook/address_edit.tpl:128
+#: plugins/addons/addressbook/address_info.tpl:61
+msgid "Company"
+msgstr "Compañia"
+
+#: plugins/addons/addressbook/address_edit.tpl:148
+#: plugins/addons/addressbook/address_info.tpl:67 html/getxls.php:174
+#: html/getxls.php:236
+msgid "City"
+msgstr "Ciudad"
+
+#: plugins/addons/addressbook/address_edit.tpl:168
+#: plugins/addons/addressbook/address_info.tpl:73
+msgid "Country"
+msgstr "Pais"
+
 #: plugins/addons/addressbook/remove.tpl:6
 msgid ""
 "This includes all addressbook data in this entry. Please double check if "
@@ -4247,50 +4331,8 @@ msgstr ""
 "No tiene permisos para crear o modificar una entrada de libreta de "
 "direcciones global."
 
-#: plugins/addons/addressbook/address_info.tpl:12
-#: plugins/addons/addressbook/address_edit.tpl:24
-msgid "Personal"
-msgstr "Personal"
-
-#: plugins/addons/addressbook/address_info.tpl:19
-#: plugins/addons/addressbook/address_edit.tpl:44 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Initials"
-msgstr "Iniciales"
-
-#: plugins/addons/addressbook/address_info.tpl:43
-#: plugins/addons/addressbook/address_edit.tpl:105
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:46
-msgid "Email"
-msgstr "Correo Electrónico"
-
-#: plugins/addons/addressbook/address_info.tpl:53
-#: plugins/addons/addressbook/address_edit.tpl:119
-msgid "Organizational"
-msgstr "De organización"
-
-#: plugins/addons/addressbook/address_info.tpl:61
-#: plugins/addons/addressbook/address_edit.tpl:128
-msgid "Company"
-msgstr "Compañia"
-
-#: plugins/addons/addressbook/address_info.tpl:67
-#: plugins/addons/addressbook/address_edit.tpl:148 html/getxls.php:174
-#: html/getxls.php:236
-msgid "City"
-msgstr "Ciudad"
-
-#: plugins/addons/addressbook/address_info.tpl:73
-#: plugins/addons/addressbook/address_edit.tpl:168
-msgid "Country"
-msgstr "Pais"
-
-#: plugins/addons/addressbook/address_edit.tpl:7
-msgid "Choose the department to store entry in"
-msgstr "Elija un departamento para guardar la entrada"
-
-#: plugins/addons/mailqueue/class_mailqueue.inc:6
 #: plugins/addons/mailqueue/main.inc:23
+#: plugins/addons/mailqueue/class_mailqueue.inc:6
 #, fuzzy
 msgid "Mail queue"
 msgstr "Servidor"
@@ -4786,22 +4828,167 @@ msgstr "Mensaje"
 msgid "System log view"
 msgstr "Ver registro del sistema"
 
-#: plugins/admin/fai/class_faiScript.inc:240
-#: plugins/admin/fai/class_faiScriptEntry.inc:89
-#: plugins/admin/fai/class_faiHook.inc:264
-#: plugins/admin/fai/class_faiHookEntry.inc:84
+#: plugins/addons/godfs/class_dfsManagment.inc:16
+#: plugins/addons/godfs/contents.tpl:8
 #, fuzzy
-msgid "Download"
-msgstr "Dominio"
+msgid "DFS Shares"
+msgstr "Borrar"
 
-#: 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/addons/godfs/class_dfsManagment.inc:141
+msgid "No DFS entries found"
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsManagment.inc:182
+#, fuzzy
+msgid "Go up one dfsshare"
+msgstr "Nombre del departamento"
+
+#: plugins/addons/godfs/class_dfsManagment.inc:183
+msgid "Go to dfs root"
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsManagment.inc:184
+#, fuzzy
+msgid "Create new dfsshare"
+msgstr "Crear una nueva entrada en"
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:87
+#, fuzzy
+msgid "You have no premissions to create a dfs share."
+msgstr "No tiene permisos para crear un usuario en esta 'Base'."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:94
+#: plugins/addons/godfs/class_dfsgeneric.inc:96
+#, fuzzy
+msgid "Dfs share already exists."
+msgstr "Ya existe un Departamento con este 'Nombre'."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:101
+#, fuzzy
+msgid "Required Field \"Name of dfs Share\" is not set."
+msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:104
+#, fuzzy
+msgid "Required Field \"Description\" is not set."
+msgstr "El campo requerido 'Descripción' no ha sido rellenado."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:107
+#, fuzzy
+msgid "Required Field \"Fileserver\" is not set."
+msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:110
+#, fuzzy
+msgid "Required Field \"Share on fileserver\" is not set."
+msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:113
+#, fuzzy
+msgid "Required Field \"Location\" is not set."
+msgstr "El campo requerido 'Descripción' no ha sido rellenado."
+
+#: plugins/addons/godfs/contents.tpl:26
+#, fuzzy
+msgid ""
+"This menu allows you to create, delete and edit selected dfs shares. Having "
+"a large numbers of dfs shares, you might prefer the range selectors on top "
+"of the dfs share list."
+msgstr ""
+"Este menú permite añadir, editar o eliminar los departamentos seleccionados. "
+"Puede usar el selector de rango en la parte superior de la lista de "
+"departamentos, cuando trabaja con un gran número de departamentos."
+
+#: plugins/addons/godfs/contents.tpl:40
+#, fuzzy
+msgid "Display dfs shares matching"
+msgstr "Mostrar direcciones que concuerden con"
+
+#: plugins/addons/godfs/contents.tpl:44
+#, fuzzy
+msgid "Regular expression for matching dfs share names"
+msgstr "Expresiones regulares para encontrar nombres de sistemas"
+
+#: plugins/addons/godfs/generic.tpl:4
+#, fuzzy
+msgid "DFS Properties"
+msgstr "Propiedades"
+
+#: plugins/addons/godfs/generic.tpl:8
+#, fuzzy
+msgid "Name of dfs Share"
+msgstr "Nombre del departamento"
+
+#: plugins/addons/godfs/generic.tpl:16
+#, fuzzy
+msgid "Fileserver"
+msgstr "Servidor"
+
+#: plugins/addons/godfs/generic.tpl:20
+#, fuzzy
+msgid "Share on Fileserver"
+msgstr "Servicio de impresión"
+
+#: plugins/addons/godfs/generic.tpl:30
+#, fuzzy
+msgid "DFS Location"
+msgstr "Localización"
+
+#: plugins/addons/godfs/main.inc:21 plugins/addons/godfs/main.inc:27
+msgid "Distributed Filesystem Administration"
+msgstr ""
+
+#: plugins/admin/fai/class_faiScript.inc:240
+#: plugins/admin/fai/class_faiScriptEntry.inc:89
+#: plugins/admin/fai/class_faiHook.inc:264
+#: plugins/admin/fai/class_faiHookEntry.inc:84
+#, fuzzy
+msgid "Download"
+msgstr "Dominio"
+
+#: plugins/admin/fai/faiVariable.tpl:32
+#: plugins/admin/fai/faiPartitionTable.tpl:32
+#: plugins/admin/fai/faiScript.tpl:32 plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/class_faiProfileEntry.inc:155
+#: plugins/admin/fai/faiHook.tpl:32
+#, fuzzy
+msgid "Objects"
+msgstr "Objeto"
+
+#: plugins/admin/fai/faiVariable.tpl:34
+#, fuzzy
+msgid "List of assigned variables"
+msgstr "Elija tipo de ratón"
+
+#: plugins/admin/fai/faiVariable.tpl:40
+msgid "Choose a variable to delete or edit"
+msgstr ""
+
+#: 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/tabsTemplate.inc:34 plugins/admin/fai/tabsProfile.inc:34
+#: plugins/admin/fai/tabsScript.inc:34
 #: plugins/admin/departments/tabs_department.inc:31
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 
+#: plugins/admin/fai/class_faiPackageEntry.inc:35
+#, fuzzy
+msgid "Please enter your search string here"
+msgstr "Por favor introduzca un número de serie válido"
+
+#: plugins/admin/fai/class_faiPackageEntry.inc:48
+msgid ""
+"This list displays all assigned package names for this repository settings."
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackageEntry.inc:124
+#, php-format
+msgid ""
+"Your specified search string '%s' returned too many results. Only the first "
+"200 entries are shown, to keep the memory usage low."
+msgstr ""
+
 #: plugins/admin/fai/class_faiManagement.inc:32
 #, fuzzy
 msgid "FAI"
@@ -4812,25 +4999,25 @@ msgstr "FAX ID"
 msgid "Fully Automatic Installation - management"
 msgstr "Mantenimiento de aplicaciones"
 
-#: plugins/admin/fai/class_faiManagement.inc:228
+#: plugins/admin/fai/class_faiManagement.inc:227
 #, fuzzy, php-format
 msgid "You're about to delete all information about the FAI class at '%s'."
 msgstr ""
 "Esta a punto de borrar toda la información sobre el componente en '%s'."
 
-#: plugins/admin/fai/class_faiManagement.inc:234
-#: plugins/admin/fai/class_faiManagement.inc:272
+#: plugins/admin/fai/class_faiManagement.inc:233
+#: plugins/admin/fai/class_faiManagement.inc:271
 #: plugins/admin/systems/class_systemManagement.inc:532
 #: plugins/admin/systems/class_systemManagement.inc:603
 msgid "You are not allowed to delete this component!"
 msgstr "¡No tiene permisos para eliminar este componente!"
 
-#: plugins/admin/fai/class_faiManagement.inc:324
+#: plugins/admin/fai/class_faiManagement.inc:323
 #, fuzzy, php-format
 msgid "You're about to delete a fai branch / freeze  '%s'."
 msgstr "Está a punto de borrar el grupo '%s'."
 
-#: plugins/admin/fai/class_faiManagement.inc:327
+#: plugins/admin/fai/class_faiManagement.inc:326
 #, fuzzy
 msgid "You are not allowed to delete this release!"
 msgstr "No le es permitido borrar este usuario"
@@ -4846,14 +5033,16 @@ msgid "Specified freeze name is invalid."
 msgstr "El nombre especificado ya esta siendo usado"
 
 #: plugins/admin/fai/class_faiManagement.inc:391
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:349
 #: plugins/admin/systems/class_servRepository.inc:208
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:349
 #, fuzzy
 msgid "This name is already in use."
 msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/admin/fai/class_faiManagement.inc:605
+#: plugins/admin/fai/class_faiManagement.inc:444
+#: plugins/admin/fai/class_faiManagement.inc:611
 #: plugins/admin/fai/faiPackageNew.tpl:44 plugins/admin/users/template.tpl:44
+#: plugins/admin/departments/class_departmentGeneric.inc:333
 #: ihtml/themes/altlinux/setup_introduction.tpl:12
 #: ihtml/themes/altlinux/setup_useradmin.tpl:41
 #: ihtml/themes/altlinux/setup_step2.tpl:13
@@ -4862,168 +5051,150 @@ msgstr "El nombre especificado ya esta siendo usado"
 #: ihtml/themes/default/setup_useradmin.tpl:41
 #: ihtml/themes/default/setup_step2.tpl:13
 #: ihtml/themes/default/setup_step3.tpl:18
+#: ihtml/themes/lhs/setup_introduction.tpl:12
+#: ihtml/themes/lhs/setup_useradmin.tpl:41 ihtml/themes/lhs/setup_step2.tpl:13
+#: ihtml/themes/lhs/setup_step3.tpl:18
 msgid "Continue"
 msgstr "Continuar"
 
-#: plugins/admin/fai/class_faiManagement.inc:641
+#: plugins/admin/fai/class_faiManagement.inc:647
 #: plugins/admin/departments/class_departmentManagement.inc:298
 #, fuzzy
 msgid "Go to users home department"
 msgstr "Mostrar usuarios del departamento"
 
-#: plugins/admin/fai/class_faiManagement.inc:646
+#: plugins/admin/fai/class_faiManagement.inc:654
 #, fuzzy
 msgid "New profile"
 msgstr "Gestión de Asterisk PBX"
 
-#: plugins/admin/fai/class_faiManagement.inc:646
+#: plugins/admin/fai/class_faiManagement.inc:654
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
 msgid "P"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:651
+#: plugins/admin/fai/class_faiManagement.inc:659
 #, fuzzy
 msgid "New partition table"
 msgstr "Impresora"
 
-#: plugins/admin/fai/class_faiManagement.inc:651
+#: plugins/admin/fai/class_faiManagement.inc:659
 msgid "PT"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:654
+#: plugins/admin/fai/class_faiManagement.inc:662
 #, fuzzy
 msgid "New scripts"
 msgstr "Mostrar equipos"
 
-#: plugins/admin/fai/class_faiManagement.inc:654
+#: plugins/admin/fai/class_faiManagement.inc:662
 msgid "S"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:657
+#: plugins/admin/fai/class_faiManagement.inc:665
 #, fuzzy
 msgid "New hooks"
 msgstr "Mostrar equipos"
 
-#: plugins/admin/fai/class_faiManagement.inc:657
+#: plugins/admin/fai/class_faiManagement.inc:665
 msgid "H"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:660
+#: plugins/admin/fai/class_faiManagement.inc:668
 #, fuzzy
 msgid "New variables"
 msgstr "Mostrar terminales"
 
-#: plugins/admin/fai/class_faiManagement.inc:660
+#: plugins/admin/fai/class_faiManagement.inc:668
 msgid "V"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:663
+#: plugins/admin/fai/class_faiManagement.inc:671
 #, fuzzy
 msgid "New templates"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/fai/class_faiManagement.inc:663
+#: plugins/admin/fai/class_faiManagement.inc:671
 msgid "T"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:666
+#: plugins/admin/fai/class_faiManagement.inc:674
 #, fuzzy
 msgid "New package list"
 msgstr "# páginas"
 
-#: plugins/admin/fai/class_faiManagement.inc:666
+#: plugins/admin/fai/class_faiManagement.inc:674
 msgid "PK"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:680
-#: plugins/admin/systems/class_systemManagement.inc:787
+#: plugins/admin/fai/class_faiManagement.inc:688
+#: plugins/admin/systems/class_systemManagement.inc:788
 msgid "This table displays all systems, in the selected tree."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:684
+#: plugins/admin/fai/class_faiManagement.inc:692
 #, fuzzy
 msgid "Name of FAI class"
 msgstr "Nombre de la lista de bloqueos"
 
-#: plugins/admin/fai/class_faiManagement.inc:685
+#: plugins/admin/fai/class_faiManagement.inc:693
 msgid "Class type"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:689
-#: plugins/admin/fai/class_faiManagement.inc:790
-#: plugins/admin/fai/class_faiManagement.inc:795
+#: plugins/admin/fai/class_faiManagement.inc:697
+#: plugins/admin/fai/class_faiManagement.inc:798
+#: plugins/admin/fai/class_faiManagement.inc:803
 #, fuzzy
 msgid "Edit class"
 msgstr "clase"
 
-#: plugins/admin/fai/class_faiManagement.inc:690
-#: plugins/admin/fai/class_faiManagement.inc:797
+#: plugins/admin/fai/class_faiManagement.inc:698
+#: plugins/admin/fai/class_faiManagement.inc:805
 #, fuzzy
 msgid "Delete class"
 msgstr "Borrar"
 
-#: plugins/admin/fai/class_faiManagement.inc:710
+#: plugins/admin/fai/class_faiManagement.inc:718
 #: plugins/admin/groups/class_groupApplication.inc:521
-#: plugins/admin/departments/class_departmentManagement.inc:334
+#: plugins/admin/departments/class_departmentManagement.inc:335
 #, fuzzy
 msgid "department"
 msgstr "departamentos"
 
-#: plugins/admin/fai/class_faiManagement.inc:731
-#: plugins/admin/fai/class_faiManagement.inc:732
+#: plugins/admin/fai/class_faiManagement.inc:739
+#: plugins/admin/fai/class_faiManagement.inc:740
 #: plugins/admin/fai/class_faiProfile.inc:297
 #: plugins/admin/fai/class_faiProfileEntry.inc:124
 #, fuzzy
 msgid "Partition table"
 msgstr "Variable"
 
-#: plugins/admin/fai/class_faiManagement.inc:738
-#: plugins/admin/fai/class_faiManagement.inc:739
+#: plugins/admin/fai/class_faiManagement.inc:746
+#: plugins/admin/fai/class_faiManagement.inc:747
 msgid "Package list"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:745
-#: plugins/admin/fai/class_faiManagement.inc:746
+#: plugins/admin/fai/class_faiManagement.inc:753
+#: plugins/admin/fai/class_faiManagement.inc:754
 #, fuzzy
 msgid "Scripts"
 msgstr "Ruta del Script"
 
-#: plugins/admin/fai/class_faiManagement.inc:766
-#: plugins/admin/fai/class_faiManagement.inc:767
+#: plugins/admin/fai/class_faiManagement.inc:774
+#: plugins/admin/fai/class_faiManagement.inc:775
 #, fuzzy
 msgid "Profile"
 msgstr "Ruta del Perfil"
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:35
-#, fuzzy
-msgid "Please enter your search string here"
-msgstr "Por favor introduzca un número de serie válido"
-
-#: plugins/admin/fai/class_faiPackageEntry.inc:48
-msgid ""
-"This list displays all assigned package names for this repository settings."
-msgstr ""
-
-#: plugins/admin/fai/class_faiPackageEntry.inc:124
-#, php-format
-msgid ""
-"Your specified search string '%s' returned too many results. Only the first "
-"200 entries are shown, to keep the memory usage low."
-msgstr ""
-
 #: plugins/admin/fai/main.inc:38 plugins/admin/fai/main.inc:40
 #, fuzzy
 msgid "Fully Automatic Installation"
 msgstr "Mantenimiento de aplicaciones"
 
-#: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiVariable.tpl:32 plugins/admin/fai/faiScript.tpl:32
-#: plugins/admin/fai/faiTemplate.tpl:29
-#: plugins/admin/fai/class_faiProfileEntry.inc:155
-#: plugins/admin/fai/faiHook.tpl:32
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
 #, fuzzy
-msgid "Objects"
-msgstr "Objeto"
+msgid "Package"
+msgstr "Mostrar teléfonos"
 
 #: plugins/admin/fai/faiPartitionTable.tpl:34
 #, fuzzy
@@ -5088,10 +5259,20 @@ msgstr "Mostrar objetos que concuerden con"
 msgid "Regular expression for matching object names"
 msgstr "Expresiones regulares que concuerden con nombres de objetos"
 
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
 #, fuzzy
-msgid "Package"
-msgstr "Mostrar teléfonos"
+msgid "Device"
+msgstr "Servicios"
+
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
+#, fuzzy
+msgid "Partition entries"
+msgstr "Variable"
+
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
+#, fuzzy
+msgid "Add partition"
+msgstr "Añadir opción"
 
 #: plugins/admin/fai/class_faiScriptEntry.inc:68
 #: plugins/admin/fai/class_faiHookEntry.inc:71
@@ -5118,22 +5299,13 @@ msgstr "Por favor especifique una dirección de servidor - URI - válida."
 msgid "Please enter a script."
 msgstr "Por favor introduzca un número de serie válido"
 
-#: plugins/admin/fai/faiVariable.tpl:34
-#, fuzzy
-msgid "List of assigned variables"
-msgstr "Elija tipo de ratón"
-
-#: plugins/admin/fai/faiVariable.tpl:40
-msgid "Choose a variable to delete or edit"
-msgstr ""
-
 #: plugins/admin/fai/faiScriptEntry.tpl:29
-#: plugins/admin/groups/class_groupManagement.inc:524
-#: plugins/admin/users/class_userManagement.inc:819
+#: plugins/admin/groups/class_groupManagement.inc:525
+#: plugins/admin/users/class_userManagement.inc:820
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
-#: plugins/admin/ogroups/class_ogroupManagement.inc:493
+#: plugins/admin/ogroups/class_ogroupManagement.inc:494
 #: plugins/gofon/conference/generic.tpl:4
 msgid "Properties"
 msgstr "Propiedades"
@@ -5177,8 +5349,8 @@ msgstr ""
 
 #: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:24
 #: plugins/admin/systems/workstationStartup.tpl:39
-#: plugins/admin/systems/servRepositorySetup.tpl:8
 #: plugins/admin/systems/class_servRepository.inc:242
+#: plugins/admin/systems/servRepositorySetup.tpl:8
 #, fuzzy
 msgid "Release"
 msgstr "Paquete de reglas"
@@ -5270,6 +5442,28 @@ msgstr "Ya existe un usuario con este 'Login' en la base de datos."
 msgid "FAI classes"
 msgstr "Elija tipo de ratón"
 
+#: plugins/admin/fai/remove.tpl:7
+#, fuzzy
+msgid ""
+"This includes 'all' object information. Please double check if your really "
+"want to do this since there is no way for GOsa to get your data back."
+msgstr ""
+"Esto incluye <b>toda</b> la información de configuración y de sistema. Por "
+"favor pulse dos veces si realmente quiere hacer esto, ya que una vez hecho "
+"esto, no hay forma de que GOsa recupere la información."
+
+#: plugins/admin/fai/remove.tpl:11 plugins/admin/departments/remove.tpl:10
+#: plugins/admin/systems/remove.tpl:10 plugins/gofon/conference/remove.tpl:10
+#, fuzzy
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your LDAP tree in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"La mejor opción antes de ejecutar esta acción es haber grabado el contenido "
+"actual de su árbol LDAP en un fichero. Entonces - Y solo si lo ha hecho - "
+"presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para abortar."
+
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
 #, fuzzy
 msgid "FS type"
@@ -5346,21 +5540,6 @@ msgid ""
 "please check your configuration twice."
 msgstr ""
 
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
-#, fuzzy
-msgid "Device"
-msgstr "Servicios"
-
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
-#, fuzzy
-msgid "Partition entries"
-msgstr "Variable"
-
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
-#, fuzzy
-msgid "Add partition"
-msgstr "Añadir opción"
-
 #: plugins/admin/fai/faiScript.tpl:34
 #, fuzzy
 msgid "List of scripts"
@@ -5419,6 +5598,50 @@ msgstr "Borrar"
 msgid "Please specify a value for the attribute 'content'."
 msgstr "Por favor especifique un usuario valido."
 
+#: plugins/admin/fai/faiNewBranch.tpl:5
+msgid ""
+"You are now going to create a branch or locked branch. This action clones "
+"the existing release to another release name. Branches can be modified as "
+"usual. FAI classes of locked branches cannot be modified, just additional "
+"classes are possible. Branch names should be alphanumeric, excluding the "
+"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
+"and 'fai'."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:11
+#, fuzzy
+msgid "Please enter a name for the branch"
+msgstr "¡Por favor introduzca un número de teléfono valido!"
+
+#: plugins/admin/fai/faiNewBranch.tpl:33
+#: plugins/admin/departments/recursive_move.tpl:1
+#, fuzzy
+msgid "Processing the requested operation"
+msgstr "¡Error mientras se exportaban las entradas indicadas!"
+
+#: plugins/admin/fai/faiNewBranch.tpl:34
+msgid ""
+"As soon as the copy operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the fai management "
+"dialog."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:40
+#: plugins/admin/departments/recursive_move.tpl:7
+msgid ""
+"Your browser doesn't support iframes, please use this link to perform the "
+"requested operation."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:42
+msgid "Perform requested operation."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:42
+#, fuzzy
+msgid "Initiate operation"
+msgstr "Crear opciones"
+
 #: plugins/admin/fai/faiVariableEntry.tpl:29
 #, fuzzy
 msgid "Variable attributes"
@@ -5450,29 +5673,7 @@ msgid ""
 "currently edited package list."
 msgstr ""
 
-#: plugins/admin/fai/remove.tpl:7
-#, fuzzy
-msgid ""
-"This includes 'all' object information. Please double check if your really "
-"want to do this since there is no way for GOsa to get your data back."
-msgstr ""
-"Esto incluye <b>toda</b> la información de configuración y de sistema. Por "
-"favor pulse dos veces si realmente quiere hacer esto, ya que una vez hecho "
-"esto, no hay forma de que GOsa recupere la información."
-
-#: plugins/admin/fai/remove.tpl:11 plugins/admin/departments/remove.tpl:10
-#: plugins/admin/systems/remove.tpl:10 plugins/gofon/conference/remove.tpl:10
-#, fuzzy
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"La mejor opción antes de ejecutar esta acción es haber grabado el contenido "
-"actual de su árbol LDAP en un fichero. Entonces - Y solo si lo ha hecho - "
-"presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para abortar."
-
-#: plugins/admin/fai/headpage.tpl:6
+#: plugins/admin/fai/headpage.tpl:6
 #, fuzzy
 msgid "List of FAI classes"
 msgstr "Elija tipo de ratón"
@@ -5494,12 +5695,14 @@ msgid "Current release"
 msgstr "Contraseña actual"
 
 #: plugins/admin/fai/headpage.tpl:47
-msgid "Create new branch using the current release"
-msgstr ""
+#, fuzzy
+msgid "Create new branch"
+msgstr "Crear una nueva entrada en"
 
 #: plugins/admin/fai/headpage.tpl:51
-msgid "Create a locked version of the current release"
-msgstr ""
+#, fuzzy
+msgid "Create new locked branch"
+msgstr "Crear una nueva entrada en"
 
 #: plugins/admin/fai/headpage.tpl:56
 #, fuzzy
@@ -5540,6 +5743,20 @@ msgstr "Mostrar teléfonos"
 msgid "Show partitions"
 msgstr "Mostrar estaciones de trabajo"
 
+#: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
+#, fuzzy
+msgid "Hook attributes"
+msgstr "Atributo 'dn' de los usuarios"
+
+#: plugins/admin/fai/faiHookEntry.tpl:34
+#, fuzzy
+msgid "Task"
+msgstr "Días para tareas"
+
+#: plugins/admin/fai/faiHookEntry.tpl:36
+msgid "Choose an existing FAI task"
+msgstr ""
+
 #: plugins/admin/fai/class_faiPartitionTable.inc:263
 #: plugins/admin/fai/class_faiPartitionTable.inc:269
 #, fuzzy, php-format
@@ -5567,20 +5784,6 @@ msgstr ""
 msgid "Class name"
 msgstr "Elija tipo de ratón"
 
-#: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
-#, fuzzy
-msgid "Hook attributes"
-msgstr "Atributo 'dn' de los usuarios"
-
-#: plugins/admin/fai/faiHookEntry.tpl:34
-#, fuzzy
-msgid "Task"
-msgstr "Días para tareas"
-
-#: plugins/admin/fai/faiHookEntry.tpl:36
-msgid "Choose an existing FAI task"
-msgstr ""
-
 #: plugins/admin/fai/class_faiPackageConfiguration.inc:45
 #, php-format
 msgid "Debconf information for package '%s'"
@@ -5665,13 +5868,13 @@ msgid "Choose class name"
 msgstr "Elija tipo de ratón"
 
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
+#: plugins/admin/systems/glpiDeviceManagement.tpl:51
 #: plugins/admin/systems/class_glpiSelectUser.inc:113
 #: plugins/admin/systems/class_glpiSelectUser.inc:140
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:51
 #: plugins/admin/systems/glpiAttachmentPool.tpl:51
-#: plugins/admin/systems/glpiDeviceManagement.tpl:51
 #: plugins/admin/systems/SelectDeviceType.tpl:44
-#: plugins/admin/systems/class_baseSelectDialog.inc:39
+#: plugins/admin/systems/class_baseSelectDialog.inc:40
 #, fuzzy
 msgid "Use"
 msgstr "Usuario"
@@ -5681,6 +5884,18 @@ msgstr "Usuario"
 msgid "A new class name."
 msgstr "Aplicaciones disponibles"
 
+#: plugins/admin/fai/remove_branch.tpl:6
+#, fuzzy
+msgid ""
+"This includes all account data, system access, etc. for this branch. Please "
+"double check if your really want to do this since there is no way for GOsa "
+"to get your data back."
+msgstr ""
+"Esto incluye toda las información de cuentas, reglas de acceso al sistema, "
+"configuración IMAP, etc. de este usuario. Por favor pulse dos veces si "
+"quiere realmente hacer esta, ya que no hay manera de que GOsa recupere "
+"posteriormente la información."
+
 #: plugins/admin/fai/class_faiTemplateEntry.inc:81
 #, fuzzy
 msgid "no file uploaded yet"
@@ -5738,8 +5953,8 @@ msgstr "Nueva plantilla"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:40
 #: plugins/admin/applications/generic.tpl:95
-#: plugins/admin/systems/printerPPDDialog.tpl:11
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
+#: plugins/admin/systems/printerPPDDialog.tpl:11
 #, fuzzy
 msgid "Upload"
 msgstr "Carga de CPU"
@@ -5750,7 +5965,7 @@ msgid "Destination path"
 msgstr "Destino"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
 msgid "Owner"
 msgstr ""
 
@@ -5758,7 +5973,7 @@ msgstr ""
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
 #: plugins/admin/systems/class_printGeneric.inc:672
 #: plugins/admin/systems/class_printGeneric.inc:674
-#: plugins/admin/ogroups/class_ogroupManagement.inc:583
+#: plugins/admin/ogroups/class_ogroupManagement.inc:584
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr "Grupo"
@@ -5826,60 +6041,76 @@ msgstr "Lista de listas de bloqueos"
 msgid "Choose a hook to delete or edit"
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:5
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
+#: plugins/admin/groups/class_groupGeneric.inc:122
+msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
+"¡No se puede encontrar el identificador samba de grupo (SID) en LDAP o en el "
+"archivo de configuración!"
 
-#: plugins/admin/fai/faiNewBranch.tpl:11
-#, fuzzy
-msgid "Please enter a name for the branch"
-msgstr "¡Por favor introduzca un número de teléfono valido!"
+#: plugins/admin/groups/class_groupGeneric.inc:179
+msgid "This 'dn' is no group."
+msgstr "Este 'dn' no es un grupo."
 
-#: plugins/admin/fai/faiNewBranch.tpl:33
-#: plugins/admin/departments/recursive_moce.tpl:1
-msgid ""
-"Processing requested operation, the status of this operation will be "
-"displayed in an iframe below."
-msgstr ""
+#: plugins/admin/groups/class_groupGeneric.inc:329
+msgid "Samba group"
+msgstr "Grupo de samba"
 
-#: plugins/admin/fai/faiNewBranch.tpl:34
+#: plugins/admin/groups/class_groupGeneric.inc:329
+msgid "Domain admins"
+msgstr "Administradores del dominio"
+
+#: plugins/admin/groups/class_groupGeneric.inc:329
+msgid "Domain users"
+msgstr "Usuarios del dominio"
+
+#: plugins/admin/groups/class_groupGeneric.inc:330
+msgid "Domain guests"
+msgstr "Invitados del dominio"
+
+#: plugins/admin/groups/class_groupGeneric.inc:335
+#, php-format
+msgid "Special group (%d)"
+msgstr "Grupo especial (%d)"
+
+#: plugins/admin/groups/class_groupGeneric.inc:445
+#, php-format
 msgid ""
-"As soon as the operation has finished, you can scroll down to end of the "
-"page and press the 'Back' button to return to the fai management dialog."
+"Your search method returned more than '%s' users, only '%s' users are shown."
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:42
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
+#: plugins/admin/groups/class_groupGeneric.inc:462
+#, fuzzy
+msgid "! unknown id"
+msgstr "estado desconocido"
+
+#: plugins/admin/groups/class_groupGeneric.inc:598
+#, php-format
+msgid "No configured SID found for '%s'."
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:44
-msgid "Perform requested operation."
+#: plugins/admin/groups/class_groupGeneric.inc:603
+#, php-format
+msgid "No configured RIDBASE found for '%s'."
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:44
-#, fuzzy
-msgid "Initiate operation"
-msgstr "Crear opciones"
+#: plugins/admin/groups/class_groupGeneric.inc:716
+#: plugins/admin/ogroups/class_ogroup.inc:655
+msgid "You have no permissions to create a group on this 'Base'."
+msgstr "No tiene permisos para crear un grupo en esta 'Base'."
 
-#: plugins/admin/fai/remove_branch.tpl:6
-#, fuzzy
+#: plugins/admin/groups/class_groupGeneric.inc:726
 msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for GOsa "
-"to get your data back."
+"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
 msgstr ""
-"Esto incluye toda las información de cuentas, reglas de acceso al sistema, "
-"configuración IMAP, etc. de este usuario. Por favor pulse dos veces si "
-"quiere realmente hacer esta, ya que no hay manera de que GOsa recupere "
-"posteriormente la información."
+"El campo 'Nombre' contiene caracteres no validos. Puede utilizar minúsculas, "
+"numeros y guiones."
+
+#: plugins/admin/groups/class_groupGeneric.inc:738
+#: plugins/admin/groups/class_groupGeneric.inc:752
+#: plugins/admin/groups/class_groupGeneric.inc:759
+msgid "Value specified as 'Name' is already used."
+msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
 
 #: plugins/admin/groups/mail.tpl:11 plugins/admin/groups/paste_mail.tpl:12
 msgid "Primary mail address for this shared folder"
@@ -5905,6 +6136,65 @@ msgstr "Miembro con Permisos"
 msgid "Forward messages to non group members"
 msgstr "Reenviar mensajes a miembros que no sean del grupo"
 
+#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
+msgstr "Lista de grupos"
+
+#: plugins/admin/groups/headpage.tpl:25
+msgid ""
+"This menu allows you to add, edit and remove selected groups. You may want "
+"to use the range selector on top of the group listbox, when working with a "
+"large number of groups."
+msgstr ""
+"Este menú permite añadir, editar o eliminar los grupos seleccionados. Puede "
+"usar el selector de rango en la parte superior de la lista de grupos, cuando "
+"trabaja con un gran número de grupos."
+
+#: plugins/admin/groups/headpage.tpl:41
+msgid "Select to see groups that are primary groups of users"
+msgstr "Seleccione para ver que grupos son grupos primarios de usuarios"
+
+#: plugins/admin/groups/headpage.tpl:42
+msgid "Show primary groups"
+msgstr "Mostrar grupos primarios"
+
+#: plugins/admin/groups/headpage.tpl:46
+msgid "Select to see groups that have samba groups mappings"
+msgstr "Seleccione para ver que grupos tienen asignado un grupo samba"
+
+#: plugins/admin/groups/headpage.tpl:47
+msgid "Show samba groups"
+msgstr "Mostrar los grupos samba"
+
+#: plugins/admin/groups/headpage.tpl:50
+msgid "Select to see groups that have applications configured"
+msgstr "Seleccione para ver que grupos tienen aplicaciones configuradas"
+
+#: plugins/admin/groups/headpage.tpl:51
+msgid "Show application groups"
+msgstr "Mostrar los grupos de aplicaciones"
+
+#: plugins/admin/groups/headpage.tpl:54
+msgid "Select to see groups that have mail settings"
+msgstr ""
+"Seleccione para ver que grupos tienen configuración de correo electrónico"
+
+#: plugins/admin/groups/headpage.tpl:55
+msgid "Show mail groups"
+msgstr "Mostrar grupos de correo"
+
+#: plugins/admin/groups/headpage.tpl:58
+msgid "Select to see normal groups that have only functional aspects"
+msgstr "Seleccione para ver que grupos tienen solo aspectos funcionales"
+
+#: plugins/admin/groups/headpage.tpl:59
+msgid "Show functional groups"
+msgstr "Mostrar grupos funcionales"
+
+#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
+msgid "Group administration"
+msgstr "Administración de grupos"
+
 #: plugins/admin/groups/class_groupManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:55 html/getxls.php:97
 #: html/getxls.php:99 html/getxls.php:244
@@ -5923,7 +6213,7 @@ msgstr "¡No le está permitido eliminar este grupo!"
 
 #: plugins/admin/groups/class_groupManagement.inc:441
 #: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/applications/class_applicationManagement.inc:460
+#: plugins/admin/applications/class_applicationManagement.inc:462
 #: plugins/admin/ogroups/class_ogroupManagement.inc:431
 #, fuzzy
 msgid "Paste"
@@ -5931,235 +6221,109 @@ msgstr "Fecha"
 
 #: plugins/admin/groups/class_groupManagement.inc:443
 #: plugins/admin/users/class_userManagement.inc:769
-#: plugins/admin/applications/class_applicationManagement.inc:462
+#: plugins/admin/applications/class_applicationManagement.inc:464
 #: plugins/admin/ogroups/class_ogroupManagement.inc:433
 #, fuzzy
 msgid "Can't paste"
 msgstr "Crear cuenta telefónica"
 
-#: plugins/admin/groups/class_groupManagement.inc:455
+#: plugins/admin/groups/class_groupManagement.inc:456
 #, fuzzy
 msgid "Create new group"
 msgstr "Crear cuenta telefónica"
 
-#: plugins/admin/groups/class_groupManagement.inc:465
-#: plugins/admin/users/class_userManagement.inc:795
-#: plugins/admin/applications/class_applicationManagement.inc:485
-#: plugins/admin/ogroups/class_ogroupManagement.inc:460
+#: plugins/admin/groups/class_groupManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/applications/class_applicationManagement.inc:488
+#: plugins/admin/ogroups/class_ogroupManagement.inc:461
 #, fuzzy
 msgid "cut"
 msgstr "Ejecute"
 
-#: plugins/admin/groups/class_groupManagement.inc:465
-#: plugins/admin/users/class_userManagement.inc:795
-#: plugins/admin/applications/class_applicationManagement.inc:485
-#: plugins/admin/ogroups/class_ogroupManagement.inc:460
+#: plugins/admin/groups/class_groupManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/applications/class_applicationManagement.inc:488
+#: plugins/admin/ogroups/class_ogroupManagement.inc:461
 #, fuzzy
 msgid "Cut this entry"
 msgstr "Editar entrada"
 
-#: plugins/admin/groups/class_groupManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:797
-#: plugins/admin/applications/class_applicationManagement.inc:487
-#: plugins/admin/ogroups/class_ogroupManagement.inc:462
+#: plugins/admin/groups/class_groupManagement.inc:468
+#: plugins/admin/users/class_userManagement.inc:798
+#: plugins/admin/applications/class_applicationManagement.inc:490
+#: plugins/admin/ogroups/class_ogroupManagement.inc:463
 msgid "copy"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:797
-#: plugins/admin/applications/class_applicationManagement.inc:487
-#: plugins/admin/ogroups/class_ogroupManagement.inc:462
+#: plugins/admin/groups/class_groupManagement.inc:468
+#: plugins/admin/users/class_userManagement.inc:798
+#: plugins/admin/applications/class_applicationManagement.inc:490
+#: plugins/admin/ogroups/class_ogroupManagement.inc:463
 #, fuzzy
 msgid "Copy this entry"
 msgstr "Editar entrada"
 
-#: plugins/admin/groups/class_groupManagement.inc:469
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/applications/class_applicationManagement.inc:489
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/departments/class_departmentManagement.inc:310
-#: plugins/admin/ogroups/class_ogroupManagement.inc:464
-#: plugins/admin/ogroups/class_ogroupManagement.inc:469
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
+#: plugins/admin/groups/class_groupManagement.inc:470
+#: plugins/admin/groups/class_groupManagement.inc:475
+#: plugins/admin/applications/class_applicationManagement.inc:492
+#: plugins/admin/applications/class_applicationManagement.inc:498
+#: plugins/admin/departments/class_departmentManagement.inc:311
+#: plugins/admin/ogroups/class_ogroupManagement.inc:465
+#: plugins/admin/ogroups/class_ogroupManagement.inc:470
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
 #, fuzzy
 msgid "Edit this entry"
 msgstr "Editar entrada"
 
-#: plugins/admin/groups/class_groupManagement.inc:471
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/applications/class_applicationManagement.inc:491
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/departments/class_departmentManagement.inc:311
-#: plugins/admin/ogroups/class_ogroupManagement.inc:466
-#: plugins/admin/ogroups/class_ogroupManagement.inc:471
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
+#: plugins/admin/groups/class_groupManagement.inc:472
+#: plugins/admin/groups/class_groupManagement.inc:477
+#: plugins/admin/applications/class_applicationManagement.inc:494
+#: plugins/admin/applications/class_applicationManagement.inc:500
+#: plugins/admin/departments/class_departmentManagement.inc:312
+#: plugins/admin/ogroups/class_ogroupManagement.inc:467
+#: plugins/admin/ogroups/class_ogroupManagement.inc:472
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
 #, fuzzy
 msgid "Delete this entry"
 msgstr "Borrar"
 
-#: plugins/admin/groups/class_groupManagement.inc:499
-#: plugins/admin/users/class_userManagement.inc:856
+#: plugins/admin/groups/class_groupManagement.inc:500
+#: plugins/admin/users/class_userManagement.inc:857
 #, fuzzy
 msgid "Posix"
 msgstr "Proxy"
 
-#: plugins/admin/groups/class_groupManagement.inc:508
-#: plugins/admin/applications/class_applicationManagement.inc:509
-#: plugins/admin/ogroups/class_ogroupManagement.inc:584
+#: plugins/admin/groups/class_groupManagement.inc:509
+#: plugins/admin/applications/class_applicationManagement.inc:512
+#: plugins/admin/ogroups/class_ogroupManagement.inc:585
 #: plugins/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
 msgid "Application"
 msgstr "Aplicación"
 
-#: plugins/admin/groups/class_groupManagement.inc:523
+#: plugins/admin/groups/class_groupManagement.inc:524
 #, fuzzy
 msgid "Groupname"
 msgstr "Nombre del grupo"
 
-#: plugins/admin/groups/class_groupManagement.inc:528
-#: plugins/admin/applications/class_applicationManagement.inc:523
-#: plugins/admin/ogroups/class_ogroupManagement.inc:498
+#: plugins/admin/groups/class_groupManagement.inc:529
+#: plugins/admin/applications/class_applicationManagement.inc:526
+#: plugins/admin/ogroups/class_ogroupManagement.inc:499
 msgid "This table displays all groups, in the selected tree."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:122
-msgid "Can't find this groups SID in LDAP or in your configuration file!"
+#: plugins/admin/groups/remove.tpl:6
+msgid ""
+"This may be a primary user group. Please double check if you really want to "
+"do this since there is no way for GOsa to get your data back."
 msgstr ""
-"¡No se puede encontrar el identificador samba de grupo (SID) en LDAP o en el "
-"archivo de configuración!"
+"Este puede ser un grupo primario. Por favor pinche dos veces si realmente "
+"quiere hacerlo, dado que GOsa no tiene manera de recuperar esta información."
 
-#: plugins/admin/groups/class_groupGeneric.inc:179
-msgid "This 'dn' is no group."
-msgstr "Este 'dn' no es un grupo."
-
-#: plugins/admin/groups/class_groupGeneric.inc:329
-msgid "Samba group"
-msgstr "Grupo de samba"
-
-#: plugins/admin/groups/class_groupGeneric.inc:329
-msgid "Domain admins"
-msgstr "Administradores del dominio"
-
-#: plugins/admin/groups/class_groupGeneric.inc:329
-msgid "Domain users"
-msgstr "Usuarios del dominio"
-
-#: plugins/admin/groups/class_groupGeneric.inc:330
-msgid "Domain guests"
-msgstr "Invitados del dominio"
-
-#: plugins/admin/groups/class_groupGeneric.inc:335
-#, php-format
-msgid "Special group (%d)"
-msgstr "Grupo especial (%d)"
-
-#: plugins/admin/groups/class_groupGeneric.inc:445
-#, php-format
-msgid ""
-"Your search method returned more than '%s' users, only '%s' users are shown."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:462
-#, fuzzy
-msgid "! unknown id"
-msgstr "estado desconocido"
-
-#: plugins/admin/groups/class_groupGeneric.inc:598
-#, php-format
-msgid "No configured SID found for '%s'."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:603
-#, php-format
-msgid "No configured RIDBASE found for '%s'."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:716
-#: plugins/admin/ogroups/class_ogroup.inc:655
-msgid "You have no permissions to create a group on this 'Base'."
-msgstr "No tiene permisos para crear un grupo en esta 'Base'."
-
-#: plugins/admin/groups/class_groupGeneric.inc:726
-msgid ""
-"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-"El campo 'Nombre' contiene caracteres no validos. Puede utilizar minúsculas, "
-"numeros y guiones."
-
-#: plugins/admin/groups/class_groupGeneric.inc:738
-#: plugins/admin/groups/class_groupGeneric.inc:752
-#: plugins/admin/groups/class_groupGeneric.inc:759
-msgid "Value specified as 'Name' is already used."
-msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
-
-#: plugins/admin/groups/remove.tpl:6
-msgid ""
-"This may be a primary user group. Please double check if you really want to "
-"do this since there is no way for GOsa to get your data back."
-msgstr ""
-"Este puede ser un grupo primario. Por favor pinche dos veces si realmente "
-"quiere hacerlo, dado que GOsa no tiene manera de recuperar esta información."
-
-#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
-msgid "Group administration"
-msgstr "Administración de grupos"
-
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
-msgid "List of groups"
-msgstr "Lista de grupos"
-
-#: plugins/admin/groups/headpage.tpl:25
-msgid ""
-"This menu allows you to add, edit and remove selected groups. You may want "
-"to use the range selector on top of the group listbox, when working with a "
-"large number of groups."
-msgstr ""
-"Este menú permite añadir, editar o eliminar los grupos seleccionados. Puede "
-"usar el selector de rango en la parte superior de la lista de grupos, cuando "
-"trabaja con un gran número de grupos."
-
-#: plugins/admin/groups/headpage.tpl:41
-msgid "Select to see groups that are primary groups of users"
-msgstr "Seleccione para ver que grupos son grupos primarios de usuarios"
-
-#: plugins/admin/groups/headpage.tpl:42
-msgid "Show primary groups"
-msgstr "Mostrar grupos primarios"
-
-#: plugins/admin/groups/headpage.tpl:46
-msgid "Select to see groups that have samba groups mappings"
-msgstr "Seleccione para ver que grupos tienen asignado un grupo samba"
-
-#: plugins/admin/groups/headpage.tpl:47
-msgid "Show samba groups"
-msgstr "Mostrar los grupos samba"
-
-#: plugins/admin/groups/headpage.tpl:50
-msgid "Select to see groups that have applications configured"
-msgstr "Seleccione para ver que grupos tienen aplicaciones configuradas"
-
-#: plugins/admin/groups/headpage.tpl:51
-msgid "Show application groups"
-msgstr "Mostrar los grupos de aplicaciones"
-
-#: plugins/admin/groups/headpage.tpl:54
-msgid "Select to see groups that have mail settings"
-msgstr ""
-"Seleccione para ver que grupos tienen configuración de correo electrónico"
-
-#: plugins/admin/groups/headpage.tpl:55
-msgid "Show mail groups"
-msgstr "Mostrar grupos de correo"
-
-#: plugins/admin/groups/headpage.tpl:58
-msgid "Select to see normal groups that have only functional aspects"
-msgstr "Seleccione para ver que grupos tienen solo aspectos funcionales"
-
-#: plugins/admin/groups/headpage.tpl:59
-msgid "Show functional groups"
-msgstr "Mostrar grupos funcionales"
+#: plugins/admin/groups/application_options.tpl:1
+msgid "Application options"
+msgstr "Opciones de aplicaciones"
 
 #: plugins/admin/groups/class_groupMail.inc:278
 msgid "read"
@@ -6210,6 +6374,8 @@ msgid "Please select a valid mail server."
 msgstr "Por favor introduzca un número de serie válido"
 
 #: plugins/admin/groups/acl.tpl:4
+#: plugins/admin/departments/class_departmentGeneric.inc:314
+#: include/class_ldap.inc:412
 msgid "Object"
 msgstr "Objeto"
 
@@ -6332,9 +6498,10 @@ msgstr "Administradores de Carpetas"
 msgid "Select a specific department"
 msgstr "Seleccionar un departamento especifico"
 
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
-msgstr "Opciones de aplicaciones"
+#: plugins/admin/groups/paste_generic.tpl:1
+#, fuzzy
+msgid "Group settings"
+msgstr "Parámetros de quotas"
 
 #: plugins/admin/groups/mail_locals.tpl:32
 msgid "Display addresses of department"
@@ -6418,11 +6585,6 @@ msgstr "Dominio"
 msgid "Insert seperator"
 msgstr ""
 
-#: plugins/admin/groups/paste_generic.tpl:1
-#, fuzzy
-msgid "Group settings"
-msgstr "Parámetros de quotas"
-
 #: plugins/admin/users/password.tpl:2
 msgid ""
 "To change the user password use the fields below. The changes take effect "
@@ -6433,10 +6595,35 @@ msgstr ""
 "cambios tomarán efecto inmediatamente. Por favor, recuerde la nueva "
 "contraseña, el usuario no podrá autenticarse sin ella."
 
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr "Crear un nuevo usuario usando plantillas"
+
+#: plugins/admin/users/template.tpl:6
+#, fuzzy
+msgid ""
+"Creating a new user can be assisted by using templates. Many database "
+"records will be filled automatically. Choose 'none' to skip the usage of "
+"templates."
+msgstr ""
+"Crear un nuevo usuario puede ser asistido a través de plantillas. Algunos "
+"valores en la base de datos serán rellenado automáticamente. Elegir "
+"<b>ninguno</b> para saltarse el uso de plantillas."
+
+#: plugins/admin/users/template.tpl:11
+#: plugins/admin/users/class_userManagement.inc:1181
+#: plugins/admin/systems/class_systemManagement.inc:918
+msgid "Template"
+msgstr "Plantilla"
+
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
+msgstr "Administración de Usuarios"
+
 #: plugins/admin/users/class_userManagement.inc:25
-#: plugins/admin/systems/printer.tpl:66
-#: plugins/admin/systems/class_glpiSelectUser.inc:112 html/getxls.php:68
-#: html/getxls.php:70 html/getxls.php:243
+#: plugins/admin/systems/class_glpiSelectUser.inc:112
+#: plugins/admin/systems/printer.tpl:66 html/getxls.php:68 html/getxls.php:70
+#: html/getxls.php:243
 msgid "Users"
 msgstr "Usuarios"
 
@@ -6466,109 +6653,104 @@ msgstr "ninguno"
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Una persona con el nombre elegido ya existe en el árbol"
 
-#: plugins/admin/users/class_userManagement.inc:782
+#: plugins/admin/users/class_userManagement.inc:783
 #, fuzzy
 msgid "Create new user"
 msgstr "Crear una nueva entrada en"
 
-#: plugins/admin/users/class_userManagement.inc:782
+#: plugins/admin/users/class_userManagement.inc:783
 #, fuzzy
 msgid "New user"
 msgstr "usuarios"
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:784
 #, fuzzy
 msgid "Create new template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:784
 msgid "New template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:800
-#: plugins/admin/users/class_userManagement.inc:807
+#: plugins/admin/users/class_userManagement.inc:801
+#: plugins/admin/users/class_userManagement.inc:808
 #, fuzzy
 msgid "password"
 msgstr "Contraseña"
 
-#: plugins/admin/users/class_userManagement.inc:818
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
+#: plugins/admin/users/class_userManagement.inc:819
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
-#: ihtml/themes/default/setup_useradmin.tpl:22
+#: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/default/login.tpl:28 ihtml/themes/default/login.tpl:32
+#: ihtml/themes/default/setup_useradmin.tpl:22 ihtml/themes/lhs/login.tpl:28
+#: ihtml/themes/lhs/login.tpl:32 ihtml/themes/lhs/setup_useradmin.tpl:22
 msgid "Username"
 msgstr "Nombre de Usuario"
 
-#: plugins/admin/users/class_userManagement.inc:823
+#: plugins/admin/users/class_userManagement.inc:824
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:854
+#: plugins/admin/users/class_userManagement.inc:855
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:855
+#: plugins/admin/users/class_userManagement.inc:856
 #, fuzzy
 msgid "Edit generic properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:857
+#: plugins/admin/users/class_userManagement.inc:858
 #, fuzzy
 msgid "Edit UNIX properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:859
+#: plugins/admin/users/class_userManagement.inc:860
 #, fuzzy
 msgid "Edit environment properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:861
+#: plugins/admin/users/class_userManagement.inc:862
 #, fuzzy
 msgid "Edit mail properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:863
+#: plugins/admin/users/class_userManagement.inc:864
 #, fuzzy
 msgid "Edit phone properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:865
+#: plugins/admin/users/class_userManagement.inc:866
 #, fuzzy
 msgid "Edit fax properies"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:867
+#: plugins/admin/users/class_userManagement.inc:868
 #, fuzzy
 msgid "Edit samba properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:868
+#: plugins/admin/users/class_userManagement.inc:869
 #, fuzzy
 msgid "Create user from template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:869
+#: plugins/admin/users/class_userManagement.inc:870
 #, fuzzy
 msgid "Create user with this template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:928
+#: plugins/admin/users/class_userManagement.inc:929
 #, fuzzy
 msgid "Online"
 msgstr "en linea"
 
-#: plugins/admin/users/class_userManagement.inc:935
+#: plugins/admin/users/class_userManagement.inc:936
 #, fuzzy
 msgid "Offline"
 msgstr "fuera de linea"
 
-#: plugins/admin/users/class_userManagement.inc:1180
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/systems/class_systemManagement.inc:917
-msgid "Template"
-msgstr "Plantilla"
-
 #: plugins/admin/users/remove.tpl:6
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -6639,65 +6821,10 @@ msgstr "Seleccione para ver los usuarios que tienen configuraciones de proxy"
 msgid "Show proxy users"
 msgstr "Mostrar los usuarios de proxy"
 
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
-msgstr "Administración de Usuarios"
-
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
-msgstr "Crear un nuevo usuario usando plantillas"
-
-#: plugins/admin/users/template.tpl:6
-#, fuzzy
-msgid ""
-"Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose 'none' to skip the usage of "
-"templates."
-msgstr ""
-"Crear un nuevo usuario puede ser asistido a través de plantillas. Algunos "
-"valores en la base de datos serán rellenado automáticamente. Elegir "
-"<b>ninguno</b> para saltarse el uso de plantillas."
-
-#: plugins/admin/applications/class_applicationParameters.inc:52
-msgid "Remove options"
-msgstr "Eliminar opciones"
-
-#: plugins/admin/applications/class_applicationParameters.inc:53
-msgid "This application has options. You can disable them by clicking below."
-msgstr "Esta aplicación tiene opciones. Puede desactivarlas pulsando aquí."
-
-#: plugins/admin/applications/class_applicationParameters.inc:55
-msgid "Create options"
-msgstr "Crear opciones"
-
-#: plugins/admin/applications/class_applicationParameters.inc:56
-msgid ""
-"This application has options disabled. You can enable them by clicking below."
-msgstr ""
-"Esta aplicación tiene opciones desactivadas. Puede activarlas pulsando aquí."
-
-#: plugins/admin/applications/class_applicationParameters.inc:93
-msgid "Variable"
-msgstr "Variable"
-
-#: plugins/admin/applications/class_applicationParameters.inc:93
-#: plugins/gofon/macro/parameter.tpl:9
-msgid "Default value"
-msgstr "Valor por defecto"
-
-#: plugins/admin/applications/class_applicationParameters.inc:104
-msgid "Add option"
-msgstr "Añadir opción"
-
-#: plugins/admin/applications/class_applicationParameters.inc:158
-#, php-format
-msgid "Value '%s' specified as option name is not valid."
-msgstr "El valor '%s' especificado como nombre de opción no es valido."
-
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
+#: plugins/admin/applications/class_applicationManagement.inc:521
 #: plugins/admin/applications/class_applicationGeneric.inc:379
-#: plugins/admin/applications/class_applicationManagement.inc:518
 msgid "Application name"
 msgstr "Nombre de la aplicación"
 
@@ -6753,10 +6880,46 @@ msgstr "Colocar entrado en los menús de inicio de los miembros"
 msgid "Place entry in members launch bar"
 msgstr "Colocar entrado en los menús de inicio de los miembros"
 
-#: plugins/admin/applications/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
-msgid ""
-"This may be used by several groups. Please double check if your really want "
-"to do this since there is no way for GOsa to get your data back."
+#: plugins/admin/applications/class_applicationParameters.inc:52
+msgid "Remove options"
+msgstr "Eliminar opciones"
+
+#: plugins/admin/applications/class_applicationParameters.inc:53
+msgid "This application has options. You can disable them by clicking below."
+msgstr "Esta aplicación tiene opciones. Puede desactivarlas pulsando aquí."
+
+#: plugins/admin/applications/class_applicationParameters.inc:55
+msgid "Create options"
+msgstr "Crear opciones"
+
+#: plugins/admin/applications/class_applicationParameters.inc:56
+msgid ""
+"This application has options disabled. You can enable them by clicking below."
+msgstr ""
+"Esta aplicación tiene opciones desactivadas. Puede activarlas pulsando aquí."
+
+#: plugins/admin/applications/class_applicationParameters.inc:93
+msgid "Variable"
+msgstr "Variable"
+
+#: plugins/admin/applications/class_applicationParameters.inc:93
+#: plugins/gofon/macro/parameter.tpl:9
+msgid "Default value"
+msgstr "Valor por defecto"
+
+#: plugins/admin/applications/class_applicationParameters.inc:104
+msgid "Add option"
+msgstr "Añadir opción"
+
+#: plugins/admin/applications/class_applicationParameters.inc:158
+#, php-format
+msgid "Value '%s' specified as option name is not valid."
+msgstr "El valor '%s' especificado como nombre de opción no es valido."
+
+#: plugins/admin/applications/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
+msgid ""
+"This may be used by several groups. Please double check if your really want "
+"to do this since there is no way for GOsa to get your data back."
 msgstr ""
 "Esta puede ser usada por varios grupos. Por favor pulse dos veces si quiere "
 "realmente hacer esto, ya que no hay manera de que GOsa recupere "
@@ -6789,6 +6952,27 @@ msgstr "Expresiones regulares para encontrar nombres de aplicaciones"
 msgid "Application management"
 msgstr "Mantenimiento de aplicaciones"
 
+#: plugins/admin/applications/class_applicationManagement.inc:376
+#, php-format
+msgid "You're about to delete the application '%s'."
+msgstr "Va ha eliminar la aplicación '%s'."
+
+#: plugins/admin/applications/class_applicationManagement.inc:382
+#: plugins/admin/applications/class_applicationManagement.inc:408
+msgid "You are not allowed to delete this application!"
+msgstr "¡No tiene permisos para eliminar esta aplicación!"
+
+#: plugins/admin/applications/class_applicationManagement.inc:477
+#: plugins/admin/ogroups/class_ogroupManagement.inc:449
+#, fuzzy
+msgid "new"
+msgstr "Nuevo"
+
+#: plugins/admin/applications/class_applicationManagement.inc:477
+#, fuzzy
+msgid "Create new application"
+msgstr "Crear aplicaciones"
+
 #: plugins/admin/applications/class_applicationGeneric.inc:87
 #, fuzzy
 msgid "no example"
@@ -6827,27 +7011,6 @@ msgstr "Ya existe una aplicación con este 'Nombre'."
 msgid "Application settings"
 msgstr "Opciones de aplicaciones"
 
-#: plugins/admin/applications/class_applicationManagement.inc:374
-#, php-format
-msgid "You're about to delete the application '%s'."
-msgstr "Va ha eliminar la aplicación '%s'."
-
-#: plugins/admin/applications/class_applicationManagement.inc:380
-#: plugins/admin/applications/class_applicationManagement.inc:406
-msgid "You are not allowed to delete this application!"
-msgstr "¡No tiene permisos para eliminar esta aplicación!"
-
-#: plugins/admin/applications/class_applicationManagement.inc:474
-#: plugins/admin/ogroups/class_ogroupManagement.inc:448
-#, fuzzy
-msgid "new"
-msgstr "Nuevo"
-
-#: plugins/admin/applications/class_applicationManagement.inc:474
-#, fuzzy
-msgid "Create new application"
-msgstr "Crear aplicaciones"
-
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr "Nombre del departamento"
@@ -6932,46 +7095,10 @@ msgstr "Expresiones regulares para encontrar nombres de departamentos"
 msgid "Department management"
 msgstr "Mantenimiento de Departamentos"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:185
-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:192
-#: plugins/admin/departments/class_departmentGeneric.inc:194
-msgid "Department with that 'Name' already exists."
-msgstr "Ya existe un Departamento con este 'Nombre'."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:202
-msgid "Required field 'Description' is not set."
-msgstr "El campo requerido 'Descripción' no ha sido rellenado."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:207
-msgid "The field 'Name' contains the reserved word 'incoming'."
-msgstr "El campo 'Nombre' contiene la palabra reservada 'incoming'."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:208
-msgid " Please choose another name."
-msgstr "Por favor elija otro nombre."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:274
-#, php-format
-msgid "Moving %s in %s"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:313
-#, php-format
-msgid "FAILED to copy %s, aborting operation"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:321
-#, fuzzy
-msgid "Complete"
-msgstr "incompleto"
-
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
 #: plugins/admin/ogroups/class_ogroupManagement.inc:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:492
+#: plugins/admin/ogroups/class_ogroupManagement.inc:493
 msgid "Departments"
 msgstr "Departamentos"
 
@@ -6986,73 +7113,106 @@ msgstr "Esta a punto de borrar todo el subárbol LDAP colocado bajo '%s'."
 msgid "You have no permission to remove this department."
 msgstr "No tiene permisos para eliminar este departamento."
 
-#: plugins/admin/departments/class_departmentManagement.inc:300
+#: plugins/admin/departments/class_departmentManagement.inc:301
 #, fuzzy
 msgid "Create new department"
 msgstr "Nombre del departamento"
 
-#: plugins/admin/departments/class_departmentManagement.inc:308
+#: plugins/admin/departments/class_departmentManagement.inc:309
 msgid "This table displays all departments, in the selected tree."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:317
+#: plugins/admin/departments/class_departmentManagement.inc:318
 #, fuzzy
 msgid "Department name"
 msgstr "Mantenimiento de Departamentos"
 
-#: plugins/admin/departments/class_departmentManagement.inc:411
+#: plugins/admin/departments/class_departmentManagement.inc:412
 msgid ".."
 msgstr ""
 
-#: plugins/admin/departments/recursive_moce.tpl:3
+#: plugins/admin/departments/class_departmentGeneric.inc:185
+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:192
+#: plugins/admin/departments/class_departmentGeneric.inc:194
+msgid "Department with that 'Name' already exists."
+msgstr "Ya existe un Departamento con este 'Nombre'."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:202
+msgid "Required field 'Description' is not set."
+msgstr "El campo requerido 'Descripción' no ha sido rellenado."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:207
+msgid "The field 'Name' contains the reserved word 'incoming'."
+msgstr "El campo 'Nombre' contiene la palabra reservada 'incoming'."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:208
+msgid " Please choose another name."
+msgstr "Por favor elija otro nombre."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:278
+#, php-format
+msgid "Moving %s to %s"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:317
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
+msgstr ""
+
+#: plugins/admin/departments/recursive_move.tpl:2
 msgid ""
-"Your browser isn't able to display this iframe ... use the link below intead"
+"As soon as the move operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the department "
+"management dialog."
 msgstr ""
 
 #: plugins/admin/systems/class_terminalInfo.inc:54
-#: plugins/admin/systems/class_terminalInfo.inc:199
+#: plugins/admin/systems/class_terminalInfo.inc:200
 msgid "present"
 msgstr "presente"
 
-#: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_terminalService.inc:158
-#: plugins/admin/systems/class_terminalStartup.inc:99
+#: plugins/admin/systems/class_terminalInfo.inc:68
 #: plugins/admin/systems/class_workstationService.inc:151
 #: plugins/admin/systems/class_workstationStartup.inc:372
+#: plugins/admin/systems/class_terminalService.inc:158
+#: plugins/admin/systems/class_terminalStartup.inc:99
 #: plugins/admin/systems/class_terminalGeneric.inc:153
 msgid "This 'dn' has no terminal features."
 msgstr "Esta 'dn' no tiene características de terminal."
 
-#: plugins/admin/systems/class_terminalInfo.inc:74
+#: plugins/admin/systems/class_terminalInfo.inc:75
 #, fuzzy
 msgid "There is no php snmp module installed, can't gather any informations."
 msgstr ""
 "Aviso: imap_getacl no ha sido implementado, no se modificara información "
 "sobre las listas de acceso."
 
-#: plugins/admin/systems/class_terminalInfo.inc:80
-#: plugins/admin/systems/class_terminalInfo.inc:174
+#: plugins/admin/systems/class_terminalInfo.inc:81
+#: plugins/admin/systems/class_terminalInfo.inc:175
 msgid "unknown status"
 msgstr "estado desconocido"
 
-#: plugins/admin/systems/class_terminalInfo.inc:89
+#: plugins/admin/systems/class_terminalInfo.inc:90
 msgid "This is a virtual terminal which has no properties to show here."
 msgstr ""
 "Este es un terminal virtual que no tiene propiedades que puedan ser mostradas"
 
-#: plugins/admin/systems/class_terminalInfo.inc:107
+#: plugins/admin/systems/class_terminalInfo.inc:108
 msgid "online"
 msgstr "en linea"
 
-#: plugins/admin/systems/class_terminalInfo.inc:163
+#: plugins/admin/systems/class_terminalInfo.inc:164
 msgid "running"
 msgstr "Activo"
 
-#: plugins/admin/systems/class_terminalInfo.inc:166
+#: plugins/admin/systems/class_terminalInfo.inc:167
 msgid "not running"
 msgstr "no esta activo"
 
-#: plugins/admin/systems/class_terminalInfo.inc:191
+#: plugins/admin/systems/class_terminalInfo.inc:192
 msgid "offline"
 msgstr "fuera de linea"
 
@@ -7086,8 +7246,8 @@ msgid "Zone"
 msgstr "teléfonos"
 
 #: plugins/admin/systems/network.tpl:42
-#: plugins/admin/systems/class_servDNS.inc:298
 #: plugins/admin/systems/servdnseditzone.tpl:81
+#: plugins/admin/systems/class_servDNS.inc:298
 msgid "TTL"
 msgstr ""
 
@@ -7096,70 +7256,203 @@ msgstr ""
 msgid "Dns records"
 msgstr "Directorio"
 
-#: plugins/admin/systems/class_winGeneric.inc:73
-#: plugins/admin/systems/class_componentGeneric.inc:50
-msgid "This 'dn' has no network features."
-msgstr "Esta 'dn' no tiene características de red."
+#: plugins/admin/systems/workstationService.tpl:4
+#: plugins/admin/systems/terminalService.tpl:4
+msgid "Keyboard"
+msgstr "Teclado"
 
-#: plugins/admin/systems/class_winGeneric.inc:162
-#: plugins/admin/systems/class_componentGeneric.inc:145
-msgid "You have no permissions to create a component on this 'Base'."
-msgstr "No tiene permisos para crear un componente en esta 'Base'."
+#: plugins/admin/systems/workstationService.tpl:7
+#: plugins/admin/systems/terminalService.tpl:7
+#: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/printerPPDDialog.tpl:5
+msgid "Model"
+msgstr "Modelo"
 
-#: plugins/admin/systems/class_winGeneric.inc:172
-#: plugins/admin/systems/class_phoneGeneric.inc:314
-#: plugins/admin/systems/class_terminalGeneric.inc:286
-#: plugins/admin/systems/class_servGeneric.inc:209
-#: plugins/admin/systems/class_workstationGeneric.inc:245
-#: plugins/admin/systems/class_printGeneric.inc:529
-#: plugins/admin/systems/class_componentGeneric.inc:155
-#, php-format
-msgid "There is already an entry '%s' in the base choosen by you"
-msgstr "Ya hay una entrada '%s' en la base elegida"
+#: plugins/admin/systems/workstationService.tpl:9
+#: plugins/admin/systems/terminalService.tpl:9
+msgid "Choose keyboard model"
+msgstr "Elija modelo de teclado"
 
-#: plugins/admin/systems/info.tpl:1
-msgid "System information"
-msgstr "Información de sistema"
+#: plugins/admin/systems/workstationService.tpl:15
+#: plugins/admin/systems/terminalService.tpl:15
+msgid "Layout"
+msgstr "Disposición"
 
-#: plugins/admin/systems/info.tpl:7
-msgid "CPU"
-msgstr "CPU"
+#: plugins/admin/systems/workstationService.tpl:17
+#: plugins/admin/systems/terminalService.tpl:17
+msgid "Choose keyboard layout"
+msgstr "Elija localización del teclado"
 
-#: plugins/admin/systems/info.tpl:10
-msgid "Memory"
-msgstr "Memoria"
+#: plugins/admin/systems/workstationService.tpl:23
+#: plugins/admin/systems/terminalService.tpl:23
+msgid "Variant"
+msgstr "Variante"
 
-#: plugins/admin/systems/info.tpl:13
-msgid "Boot MAC"
-msgstr "MAC"
+#: plugins/admin/systems/workstationService.tpl:25
+#: plugins/admin/systems/terminalService.tpl:25
+msgid "Choose keyboard variant"
+msgstr "Elija variante de teclado"
 
-#: plugins/admin/systems/info.tpl:16
-msgid "USB support"
-msgstr "Soporte USB"
+#: plugins/admin/systems/workstationService.tpl:39
+#: plugins/admin/systems/terminalService.tpl:39
+msgid "Mouse"
+msgstr "Ratón"
 
-#: plugins/admin/systems/info.tpl:19 plugins/admin/systems/info.tpl:87
-msgid "System status"
-msgstr "Estado del Sistema"
+#: plugins/admin/systems/workstationService.tpl:44
+#: plugins/admin/systems/terminalService.tpl:44
+msgid "Choose mouse type"
+msgstr "Elija tipo de ratón"
 
-#: plugins/admin/systems/info.tpl:23
-msgid "Inventory number"
-msgstr "Número de inventario"
+#: plugins/admin/systems/workstationService.tpl:50
+#: plugins/admin/systems/terminalService.tpl:50
+msgid "Port"
+msgstr "Puerto"
 
-#: plugins/admin/systems/info.tpl:27
-msgid "Last login"
-msgstr "Ultimo Inicio de Sesion"
+#: plugins/admin/systems/workstationService.tpl:52
+#: plugins/admin/systems/terminalService.tpl:52
+msgid "Choose mouse port"
+msgstr "Elija el puerto del ratón"
 
-#: plugins/admin/systems/info.tpl:38
-msgid "Network devices"
-msgstr "Dispositivos de Red"
+#: plugins/admin/systems/workstationService.tpl:66
+#: plugins/admin/systems/terminalService.tpl:66
+#: plugins/gofon/phoneaccount/generic.tpl:24
+#: plugins/gofon/phoneaccount/paste_generic.tpl:23
+msgid "Telephone hardware"
+msgstr "Componente telefónico"
 
-#: plugins/admin/systems/info.tpl:47
-msgid "IDE devices"
-msgstr "Controladora IDE"
+#: 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:25
+msgid "Telephone"
+msgstr "Teléfono"
 
-#: plugins/admin/systems/info.tpl:56
-msgid "SCSI devices"
-msgstr "Controladora SCSI"
+#: plugins/admin/systems/workstationService.tpl:83
+#: plugins/admin/systems/info.tpl:73
+#: plugins/admin/systems/terminalService.tpl:83
+msgid "Graphic device"
+msgstr "Tarjeta Gráfica"
+
+#: plugins/admin/systems/workstationService.tpl:86
+#: plugins/admin/systems/terminalService.tpl:86
+#: plugins/admin/systems/printer.tpl:46
+msgid "Driver"
+msgstr "Controlador"
+
+#: plugins/admin/systems/workstationService.tpl:88
+#: plugins/admin/systems/terminalService.tpl:88
+msgid "Choose graphic driver that is needed by the installed graphic board"
+msgstr ""
+"Elija controlador gráfico que se necesita para la tarjeta gráfica instalada"
+
+#: plugins/admin/systems/workstationService.tpl:96
+#: plugins/admin/systems/terminalService.tpl:96
+msgid "Choose screen resolution used in graphic mode"
+msgstr "Elija la resolución gráfica usada en modo gráfico"
+
+#: plugins/admin/systems/workstationService.tpl:102
+#: plugins/admin/systems/terminalService.tpl:102
+msgid "Color depth"
+msgstr "Profundidad del Color"
+
+#: plugins/admin/systems/workstationService.tpl:104
+#: plugins/admin/systems/terminalService.tpl:104
+msgid "Choose colordepth used in graphic mode"
+msgstr "Elija la profundidad de color usada en modo gráfico"
+
+#: plugins/admin/systems/workstationService.tpl:117
+#: plugins/admin/systems/terminalService.tpl:117
+msgid "Display device"
+msgstr "Mostrar dispositivo"
+
+#: plugins/admin/systems/workstationService.tpl:121
+#, fuzzy
+msgid "unknown"
+msgstr "estado desconocido"
+
+#: plugins/admin/systems/workstationService.tpl:126
+msgid "Automatic modelines"
+msgstr ""
+
+#: plugins/admin/systems/workstationService.tpl:130
+#: plugins/admin/systems/terminalService.tpl:124
+msgid "HSync"
+msgstr "HSync"
+
+#: plugins/admin/systems/workstationService.tpl:132
+#: plugins/admin/systems/terminalService.tpl:126
+msgid "Horizontal refresh frequency for installed monitor"
+msgstr "Frecuencia de refresco horizontal para el monitor instalado"
+
+#: plugins/admin/systems/workstationService.tpl:135
+#: plugins/admin/systems/terminalService.tpl:129
+msgid "VSync"
+msgstr "VSync"
+
+#: plugins/admin/systems/workstationService.tpl:137
+#: plugins/admin/systems/terminalService.tpl:131
+msgid "Vertical refresh frequency for installed monitor"
+msgstr "Frecuencia de refresco vertical para el monitor instalado"
+
+#: plugins/admin/systems/workstationService.tpl:149
+#: plugins/admin/systems/terminalService.tpl:203
+msgid "Scan device"
+msgstr "Dispositivo de escaneo"
+
+#: plugins/admin/systems/workstationService.tpl:150
+#: plugins/admin/systems/terminalService.tpl:204
+msgid "Select to start SANE scan service on terminal"
+msgstr "Seleccione para iniciar el servicio de escáner 'SANE' en el terminal"
+
+#: plugins/admin/systems/workstationService.tpl:151
+#: plugins/admin/systems/terminalService.tpl:205
+msgid "Provide scan services"
+msgstr "Provee servicios de exploración"
+
+#: plugins/admin/systems/info.tpl:1
+msgid "System information"
+msgstr "Información de sistema"
+
+#: plugins/admin/systems/info.tpl:7
+msgid "CPU"
+msgstr "CPU"
+
+#: plugins/admin/systems/info.tpl:10
+msgid "Memory"
+msgstr "Memoria"
+
+#: plugins/admin/systems/info.tpl:13
+msgid "Boot MAC"
+msgstr "MAC"
+
+#: plugins/admin/systems/info.tpl:16
+msgid "USB support"
+msgstr "Soporte USB"
+
+#: plugins/admin/systems/info.tpl:19 plugins/admin/systems/info.tpl:87
+msgid "System status"
+msgstr "Estado del Sistema"
+
+#: plugins/admin/systems/info.tpl:23
+msgid "Inventory number"
+msgstr "Número de inventario"
+
+#: plugins/admin/systems/info.tpl:27
+msgid "Last login"
+msgstr "Ultimo Inicio de Sesion"
+
+#: plugins/admin/systems/info.tpl:38
+msgid "Network devices"
+msgstr "Dispositivos de Red"
+
+#: plugins/admin/systems/info.tpl:47
+msgid "IDE devices"
+msgstr "Controladora IDE"
+
+#: plugins/admin/systems/info.tpl:56
+msgid "SCSI devices"
+msgstr "Controladora SCSI"
 
 #: plugins/admin/systems/info.tpl:64
 msgid "Floppy device"
@@ -7169,12 +7462,6 @@ msgstr "Disquetera"
 msgid "CDROM device"
 msgstr "Unidad de CDROM"
 
-#: plugins/admin/systems/info.tpl:73
-#: plugins/admin/systems/workstationService.tpl:83
-#: plugins/admin/systems/terminalService.tpl:83
-msgid "Graphic device"
-msgstr "Tarjeta Gráfica"
-
 #: plugins/admin/systems/info.tpl:77
 msgid "Audio device"
 msgstr "Tarjeta Sonido"
@@ -7215,320 +7502,209 @@ msgstr "Servicio de sonido"
 msgid "GUI"
 msgstr "GUI"
 
-#: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_workstationService.inc:89
-msgid "default"
-msgstr "por defecto"
+#: plugins/admin/systems/glpi.tpl:9
+#: plugins/admin/systems/SelectDeviceType.tpl:20
+#, fuzzy
+msgid "System type"
+msgstr "Sistemas"
 
-#: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_workstationService.inc:90
-msgid "show chooser"
-msgstr "mostrar elegidos"
+#: plugins/admin/systems/glpi.tpl:19
+#, fuzzy
+msgid "Operating system"
+msgstr "Borrar"
 
-#: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:91
-msgid "direct"
-msgstr "Directo"
+#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
+#: plugins/admin/systems/glpi_devices.tpl:24
+#: plugins/admin/systems/glpi_devices.tpl:123
+#: plugins/admin/systems/glpi_devices.tpl:164
+#: plugins/admin/systems/glpi_devices.tpl:219
+#: plugins/admin/systems/glpi_devices.tpl:275
+#: plugins/admin/systems/glpi_devices.tpl:333
+#: plugins/admin/systems/glpi_devices.tpl:397
+#: plugins/admin/systems/glpi_devices.tpl:469
+#: plugins/admin/systems/glpi_devices.tpl:533
+#: plugins/admin/systems/glpi_devices.tpl:580
+#: plugins/admin/systems/glpi_devices.tpl:633
+#: plugins/admin/systems/glpi_devices.tpl:687
+#: plugins/admin/systems/glpi_devices.tpl:733
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
+msgid "Manufacturer"
+msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:107
-#: plugins/admin/systems/class_workstationService.inc:94
-msgid "load balanced"
-msgstr "balanceo de carga"
+#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
+#, fuzzy
+msgid "Contacts"
+msgstr "Contacto"
 
-#: plugins/admin/systems/class_terminalService.inc:110
-#: plugins/admin/systems/class_workstationService.inc:97
-msgid "Windows RDP"
-msgstr "Windows RDP"
+#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
+#, fuzzy
+msgid "Contact person"
+msgstr "Contacto"
 
-#: plugins/admin/systems/class_terminalService.inc:111
-#: plugins/admin/systems/class_workstationService.inc:98
-msgid "ICA client"
-msgstr "Cliente ICA"
+#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
+msgid "Technical responsible"
+msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:209
-#: plugins/admin/systems/class_workstationService.inc:201
-msgid "Choose the phone located at the current terminal"
-msgstr "Elija el teléfono localizado en el terminal actual"
+#: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
+#: plugins/admin/systems/glpi_devices.tpl:112
+#: plugins/admin/systems/glpi_devices.tpl:153
+#: plugins/admin/systems/glpi_devices.tpl:208
+#: plugins/admin/systems/glpi_devices.tpl:264
+#: plugins/admin/systems/glpi_devices.tpl:322
+#: plugins/admin/systems/glpi_devices.tpl:386
+#: plugins/admin/systems/glpi_devices.tpl:458
+#: plugins/admin/systems/glpi_devices.tpl:522
+#: plugins/admin/systems/glpi_devices.tpl:569
+#: plugins/admin/systems/glpi_devices.tpl:622
+#: plugins/admin/systems/glpi_devices.tpl:676
+#: plugins/admin/systems/glpi_devices.tpl:722
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
+#, fuzzy
+msgid "Comment"
+msgstr "Contacto"
 
-#: plugins/admin/systems/class_terminalService.inc:270
-#: plugins/admin/systems/class_terminalService.inc:275
-#: plugins/admin/systems/class_workstationService.inc:263
-#: plugins/admin/systems/class_workstationService.inc:268
-msgid "Please specify a valid VSync range."
-msgstr "Por favor especifique un rango VSync valido"
+#: plugins/admin/systems/glpi.tpl:78
+#, fuzzy
+msgid "Installed devices"
+msgstr "Dispositivos clientes"
 
-#: plugins/admin/systems/class_terminalService.inc:285
-#: plugins/admin/systems/class_terminalService.inc:290
-#: plugins/admin/systems/class_workstationService.inc:278
-#: plugins/admin/systems/class_workstationService.inc:283
-msgid "Please specify a valid HSync range."
-msgstr "Por favor especifique un rango HSync valido"
+#: plugins/admin/systems/glpi.tpl:90
+#, fuzzy
+msgid "Trading"
+msgstr "Ocultamiento"
+
+#: plugins/admin/systems/glpi.tpl:91
+#, fuzzy
+msgid "Software"
+msgstr "Estado"
+
+#: plugins/admin/systems/glpi.tpl:92
+#, fuzzy
+msgid "Contracts"
+msgstr "Contacto"
+
+#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
+#, fuzzy
+msgid "Attachments"
+msgstr "Argumentos"
 
 #: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
 msgid "System management"
 msgstr "Gestión del sistema"
 
-#: plugins/admin/systems/class_servService.inc:272
-msgid "Terminal server, must have fontpath specified."
-msgstr ""
-
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
-msgstr "Servicio de Hora"
+#: plugins/admin/systems/glpiPrinter.tpl:9
+#, fuzzy
+msgid "Printer type"
+msgstr "Nombre de la impresora"
 
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
-msgstr "Servicio LDAP"
-
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
-msgstr "Servidor de terminal"
-
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
-msgstr "Desactivación temporal del acceso"
-
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
-msgstr "Ruta a las fuentes tipográficas"
-
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
-msgstr "Servicio de Logs"
-
-#: plugins/admin/systems/servservice.tpl:101
-msgid "Print Service"
-msgstr "Servicio de impresión"
-
-#: plugins/admin/systems/servservice.tpl:109
+#: plugins/admin/systems/glpiPrinter.tpl:31
 #, fuzzy
-msgid "Mail server"
-msgstr "Servidor"
-
-#: 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"
+msgid "Supported interfaces"
 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/component.tpl:15 plugins/admin/systems/server.tpl:15
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/terminal.tpl:20
-#: plugins/admin/systems/printer.tpl:22
-#: plugins/admin/systems/workstation.tpl:29
-#: plugins/admin/systems/wingeneric.tpl:15
-msgid "Choose subtree to place terminal in"
-msgstr "Elija un subárbol donde colocar el terminal"
-
-#: plugins/admin/systems/workstationService.tpl:4
-#: plugins/admin/systems/terminalService.tpl:4
-msgid "Keyboard"
-msgstr "Teclado"
-
-#: plugins/admin/systems/workstationService.tpl:7
-#: plugins/admin/systems/printerPPDDialog.tpl:5
-#: plugins/admin/systems/terminalService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:210
-msgid "Model"
-msgstr "Modelo"
-
-#: plugins/admin/systems/workstationService.tpl:9
-#: plugins/admin/systems/terminalService.tpl:9
-msgid "Choose keyboard model"
-msgstr "Elija modelo de teclado"
-
-#: plugins/admin/systems/workstationService.tpl:15
-#: plugins/admin/systems/terminalService.tpl:15
-msgid "Layout"
-msgstr "Disposición"
-
-#: plugins/admin/systems/workstationService.tpl:17
-#: plugins/admin/systems/terminalService.tpl:17
-msgid "Choose keyboard layout"
-msgstr "Elija localización del teclado"
-
-#: plugins/admin/systems/workstationService.tpl:23
-#: plugins/admin/systems/terminalService.tpl:23
-msgid "Variant"
-msgstr "Variante"
-
-#: plugins/admin/systems/workstationService.tpl:25
-#: plugins/admin/systems/terminalService.tpl:25
-msgid "Choose keyboard variant"
-msgstr "Elija variante de teclado"
-
-#: plugins/admin/systems/workstationService.tpl:39
-#: plugins/admin/systems/terminalService.tpl:39
-msgid "Mouse"
-msgstr "Ratón"
-
-#: plugins/admin/systems/workstationService.tpl:44
-#: plugins/admin/systems/terminalService.tpl:44
-msgid "Choose mouse type"
-msgstr "Elija tipo de ratón"
-
-#: plugins/admin/systems/workstationService.tpl:50
-#: plugins/admin/systems/terminalService.tpl:50
-msgid "Port"
-msgstr "Puerto"
-
-#: plugins/admin/systems/workstationService.tpl:52
-#: plugins/admin/systems/terminalService.tpl:52
-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:23
-msgid "Telephone hardware"
-msgstr "Componente telefónico"
-
-#: 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:25
-msgid "Telephone"
-msgstr "Teléfono"
+#: plugins/admin/systems/glpiPrinter.tpl:38
+#, fuzzy
+msgid "Serial"
+msgstr "terminales"
 
-#: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/printer.tpl:46
-#: plugins/admin/systems/terminalService.tpl:86
-msgid "Driver"
-msgstr "Controlador"
+#: plugins/admin/systems/glpiPrinter.tpl:46
+#, fuzzy
+msgid "Parallel"
+msgstr "Variable"
 
-#: plugins/admin/systems/workstationService.tpl:88
-#: plugins/admin/systems/terminalService.tpl:88
-msgid "Choose graphic driver that is needed by the installed graphic board"
+#: plugins/admin/systems/glpiPrinter.tpl:54
+msgid "USB"
 msgstr ""
-"Elija controlador gráfico que se necesita para la tarjeta gráfica instalada"
-
-#: plugins/admin/systems/workstationService.tpl:96
-#: plugins/admin/systems/terminalService.tpl:96
-msgid "Choose screen resolution used in graphic mode"
-msgstr "Elija la resolución gráfica usada en modo gráfico"
-
-#: plugins/admin/systems/workstationService.tpl:102
-#: plugins/admin/systems/terminalService.tpl:102
-msgid "Color depth"
-msgstr "Profundidad del Color"
 
-#: plugins/admin/systems/workstationService.tpl:104
-#: plugins/admin/systems/terminalService.tpl:104
-msgid "Choose colordepth used in graphic mode"
-msgstr "Elija la profundidad de color usada en modo gráfico"
+#: plugins/admin/systems/glpiPrinter.tpl:114
+#, fuzzy
+msgid "Installed cartridges"
+msgstr "Dispositivos clientes"
 
-#: plugins/admin/systems/workstationService.tpl:117
-#: plugins/admin/systems/terminalService.tpl:117
-msgid "Display device"
-msgstr "Mostrar dispositivo"
+#: plugins/admin/systems/glpi_edit_type.tpl:1
+#, fuzzy
+msgid "Manage System-types"
+msgstr "Sistemas"
 
-#: plugins/admin/systems/workstationService.tpl:121
+#: plugins/admin/systems/glpi_edit_type.tpl:9
+#: plugins/admin/systems/glpi_edit_type.tpl:28
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:8
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:29
+#: plugins/admin/systems/glpi_edit_os.tpl:9
+#: plugins/admin/systems/glpi_edit_os.tpl:28
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
 #, fuzzy
-msgid "unknown"
-msgstr "estado desconocido"
+msgid "Rename"
+msgstr "Nombre del servidor"
 
-#: plugins/admin/systems/workstationService.tpl:126
-msgid "Automatic modelines"
-msgstr ""
+#: plugins/admin/systems/glpi_edit_type.tpl:24
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:25
+#: plugins/admin/systems/glpi_edit_os.tpl:24
+#, fuzzy
+msgid "Please enter a new name"
+msgstr "Por favor especifique una dirección de servidor - URI - válida."
 
-#: plugins/admin/systems/workstationService.tpl:130
-#: plugins/admin/systems/terminalService.tpl:124
-msgid "HSync"
-msgstr "HSync"
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr "Seleccione objetos a añadir"
 
-#: plugins/admin/systems/workstationService.tpl:132
-#: plugins/admin/systems/terminalService.tpl:126
-msgid "Horizontal refresh frequency for installed monitor"
-msgstr "Frecuencia de refresco horizontal para el monitor instalado"
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
+#: plugins/admin/systems/printerPPDDialog.tpl:6
+#, fuzzy
+msgid "Select"
+msgstr "Borrar"
 
-#: plugins/admin/systems/workstationService.tpl:135
-#: plugins/admin/systems/terminalService.tpl:129
-msgid "VSync"
-msgstr "VSync"
+#: plugins/admin/systems/class_workstationService.inc:89
+#: plugins/admin/systems/class_terminalService.inc:102
+msgid "default"
+msgstr "por defecto"
 
-#: plugins/admin/systems/workstationService.tpl:137
-#: plugins/admin/systems/terminalService.tpl:131
-msgid "Vertical refresh frequency for installed monitor"
-msgstr "Frecuencia de refresco vertical para el monitor instalado"
+#: plugins/admin/systems/class_workstationService.inc:90
+#: plugins/admin/systems/class_terminalService.inc:103
+msgid "show chooser"
+msgstr "mostrar elegidos"
 
-#: plugins/admin/systems/workstationService.tpl:149
-#: plugins/admin/systems/terminalService.tpl:203
-msgid "Scan device"
-msgstr "Dispositivo de escaneo"
+#: plugins/admin/systems/class_workstationService.inc:91
+#: plugins/admin/systems/class_terminalService.inc:104
+msgid "direct"
+msgstr "Directo"
 
-#: plugins/admin/systems/workstationService.tpl:150
-#: plugins/admin/systems/terminalService.tpl:204
-msgid "Select to start SANE scan service on terminal"
-msgstr "Seleccione para iniciar el servicio de escáner 'SANE' en el terminal"
+#: plugins/admin/systems/class_workstationService.inc:94
+#: plugins/admin/systems/class_terminalService.inc:107
+msgid "load balanced"
+msgstr "balanceo de carga"
 
-#: plugins/admin/systems/workstationService.tpl:151
-#: plugins/admin/systems/terminalService.tpl:205
-msgid "Provide scan services"
-msgstr "Provee servicios de exploración"
+#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_terminalService.inc:110
+msgid "Windows RDP"
+msgstr "Windows RDP"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
-#, fuzzy
-msgid "Select entries to add"
-msgstr "Seleccione usuarios que serán añadidos"
+#: plugins/admin/systems/class_workstationService.inc:98
+#: plugins/admin/systems/class_terminalService.inc:111
+msgid "ICA client"
+msgstr "Cliente ICA"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
-#, fuzzy
-msgid "Display members of department"
-msgstr "Mostrar número de Departamentos"
+#: plugins/admin/systems/class_workstationService.inc:201
+#: plugins/admin/systems/class_terminalService.inc:209
+msgid "Choose the phone located at the current terminal"
+msgstr "Elija el teléfono localizado en el terminal actual"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
-#, fuzzy
-msgid "Display members matching"
-msgstr "Mostrar números que concuerdan con"
+#: plugins/admin/systems/class_workstationService.inc:263
+#: plugins/admin/systems/class_workstationService.inc:268
+#: plugins/admin/systems/class_terminalService.inc:270
+#: plugins/admin/systems/class_terminalService.inc:275
+msgid "Please specify a valid VSync range."
+msgstr "Por favor especifique un rango VSync valido"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
-#, fuzzy
-msgid "Regular expression for matching member names"
-msgstr "Expresiones regulares que concuerden con nombres de usuarios"
+#: plugins/admin/systems/class_workstationService.inc:278
+#: plugins/admin/systems/class_workstationService.inc:283
+#: plugins/admin/systems/class_terminalService.inc:285
+#: plugins/admin/systems/class_terminalService.inc:290
+msgid "Please specify a valid HSync range."
+msgstr "Por favor especifique un rango HSync valido"
 
 #: plugins/admin/systems/class_workstationStartup.inc:313
 msgid ""
@@ -7564,51 +7740,6 @@ msgid ""
 "be saved."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:105
-msgid "This 'dn' has no phone features."
-msgstr "Esta 'dn' no tiene características de teléfono."
-
-#: plugins/admin/systems/class_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
-#, fuzzy
-msgid "yes"
-msgstr "Sistemas"
-
-#: plugins/admin/systems/class_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-#, fuzzy
-msgid "no"
-msgstr "ninguno"
-
-#: plugins/admin/systems/class_phoneGeneric.inc:223
-msgid "dynamic"
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:223
-#, fuzzy
-msgid "Networksettings"
-msgstr "Configuración de red"
-
-#: plugins/admin/systems/class_phoneGeneric.inc:238
-#, php-format
-msgid ""
-"Can't delete because there are user which are depending on this phone. One "
-"of them is user '%s'."
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:294
-#, fuzzy
-msgid "The required field 'Phone name' is not set."
-msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
-
-#: plugins/admin/systems/class_phoneGeneric.inc:297
-msgid "The 'Phone name' '0' is reserved and cannot be used."
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:304
-msgid "You have no permissions to create a phone on this 'Base'."
-msgstr "No tiene permisos para crear un teléfono en esta 'Base'."
-
 #: plugins/admin/systems/class_printerPPDDialog.inc:67
 #, php-format
 msgid "Can't open '%s', ppd settings resetted."
@@ -7673,10 +7804,18 @@ msgstr ""
 msgid "Server name"
 msgstr "Nombre del servidor"
 
+#: plugins/admin/systems/server.tpl:15 plugins/admin/systems/terminal.tpl:20
+#: plugins/admin/systems/workstation.tpl:29
+#: plugins/admin/systems/component.tpl:15 plugins/admin/systems/phone.tpl:15
+#: plugins/admin/systems/printer.tpl:22
+#: plugins/admin/systems/wingeneric.tpl:15
+msgid "Choose subtree to place terminal in"
+msgstr "Elija un subárbol donde colocar el terminal"
+
 #: plugins/admin/systems/server.tpl:39 plugins/admin/systems/terminal.tpl:100
-#: plugins/admin/systems/workstation.tpl:79
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/workstation.tpl:79
+#: plugins/admin/systems/class_baseSelectDialog.inc:45
 #: plugins/admin/ogroups/termgroup.tpl:3
 msgid "Action"
 msgstr "Acción"
@@ -7685,91 +7824,6 @@ msgstr "Acción"
 msgid "Select action to execute for this server"
 msgstr "Seleccione una acción que se ejecutara en este servidor"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:61
-msgid "text"
-msgstr "texto"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:62
-msgid "graphic"
-msgstr "Gráfico"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:90
-#: plugins/admin/systems/class_servGeneric.inc:62
-#: plugins/admin/ogroups/class_termgroup.inc:64
-msgid "No WAKECMD definition found in your gosa.conf"
-msgstr "No se ha encontrado ninguna definición de 'WAKECMD' en 'gosa.conf'"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:94
-#: plugins/admin/systems/class_terminalGeneric.inc:106
-#: plugins/admin/systems/class_terminalGeneric.inc:118
-#: plugins/admin/systems/class_servGeneric.inc:66
-#: plugins/admin/systems/class_servGeneric.inc:78
-#: plugins/admin/systems/class_servGeneric.inc:90
-#: plugins/admin/systems/class_workstationGeneric.inc:104
-#: plugins/admin/ogroups/class_termgroup.inc:68
-#: plugins/admin/ogroups/class_termgroup.inc:80
-#: plugins/admin/ogroups/class_termgroup.inc:92
-#, php-format
-msgid "Execution of '%s' failed!"
-msgstr "¡La ejecución de '%s' ha fallado!"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:102
-#: plugins/admin/systems/class_servGeneric.inc:74
-#: plugins/admin/ogroups/class_termgroup.inc:76
-msgid "No REBOOTCMD definition found in your gosa.conf"
-msgstr "No se ha encontrado ninguna definición de 'REBOOTCMD' en 'gosa.conf'"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_servGeneric.inc:86
-#: plugins/admin/ogroups/class_termgroup.inc:88
-msgid "No HALTCMD definition found in your gosa.conf"
-msgstr "No se ha encontrado ninguna definición de 'HALTCMD' en 'gosa.conf'"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
-#: plugins/admin/ogroups/class_termgroup.inc:104
-msgid "Switch off"
-msgstr "Apagar"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
-#: plugins/admin/ogroups/class_termgroup.inc:104
-msgid "Reboot"
-msgstr "Reiniciar"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:172
-#: plugins/admin/systems/class_servGeneric.inc:142
-#: plugins/admin/systems/class_workstationGeneric.inc:162
-#: plugins/admin/ogroups/class_termgroup.inc:104
-msgid "Wake up"
-msgstr "Despertar"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:269
-msgid "You have no permissions to create a terminal on this 'Base'."
-msgstr "No tiene permisos para crear un terminal en esta 'Base'."
-
-#: plugins/admin/systems/class_terminalGeneric.inc:273
-msgid "The required field 'Terminal name' is not set."
-msgstr " El campo requerido 'Nombre del terminal' no ha sido rellenado."
-
-#: plugins/admin/systems/printerPPDDialog.tpl:1
-#, fuzzy
-msgid "Printer driver"
-msgstr "Dispositivo de Impresión"
-
-#: plugins/admin/systems/printerPPDDialog.tpl:6
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
-#, fuzzy
-msgid "Select"
-msgstr "Borrar"
-
-#: plugins/admin/systems/printerPPDDialog.tpl:9
-#, fuzzy
-msgid "New driver"
-msgstr "Servidor"
-
 #: plugins/admin/systems/workstationStartup.tpl:4
 #: plugins/admin/systems/terminalStartup.tpl:1
 msgid "Boot parameters"
@@ -7802,57 +7856,137 @@ msgstr "Introduzca el nombre del fichero del núcleo que se usara"
 msgid "Custom options"
 msgstr "Otras opciones"
 
-#: plugins/admin/systems/workstationStartup.tpl:24
-#: plugins/admin/systems/terminalStartup.tpl:24
-msgid ""
-"Enter any parameters that should be passed to the kernel as append line "
-"during bootup"
+#: plugins/admin/systems/workstationStartup.tpl:24
+#: plugins/admin/systems/terminalStartup.tpl:24
+msgid ""
+"Enter any parameters that should be passed to the kernel as append line "
+"during bootup"
+msgstr ""
+"Introducir que parametros serán pasados a la configuración de arranque del "
+"nucleo"
+
+#: plugins/admin/systems/workstationStartup.tpl:37
+#, fuzzy
+msgid "FAI server"
+msgstr "Servidor LDAP"
+
+#: plugins/admin/systems/workstationStartup.tpl:54
+#, fuzzy
+msgid "Assigned FAI classes"
+msgstr "Elija tipo de ratón"
+
+#: plugins/admin/systems/workstationStartup.tpl:73
+#: plugins/admin/systems/terminalStartup.tpl:53
+msgid "Kernel modules (format: name parameters)"
+msgstr "Módulos del núcleo (formato: nombre parametros)"
+
+#: plugins/admin/systems/workstationStartup.tpl:75
+#: plugins/admin/systems/terminalStartup.tpl:55
+msgid "Add additional modules to load on startup"
+msgstr "Añadir módulos adicionales que serán cargados al arrancar"
+
+#: plugins/admin/systems/workstationStartup.tpl:99
+#: plugins/admin/systems/terminalStartup.tpl:79
+#, fuzzy
+msgid "Mountpoint"
+msgstr "Monitor"
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:6
+#, fuzzy
+msgid "List of devices"
+msgstr "Lista de usuarios"
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:23
+msgid ""
+"This dialog allows you to attach a device to your currently edited computer."
+msgstr ""
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:35
+#, fuzzy
+msgid "Display devices matching"
+msgstr "Mostrar direcciones que concuerden con"
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:37
+#, fuzzy
+msgid "Regular expression for matching device names"
+msgstr "Expresiones regulares que concuerden con nombres de usuarios"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
+#: plugins/admin/systems/class_glpiAccount.inc:144
+msgid "There is no server with valid glpi database service."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
+#: plugins/admin/systems/class_glpiAccount.inc:154
+#, fuzzy
+msgid "Can't connect to glpi database, the php-mysql extension is missing."
 msgstr ""
-"Introducir que parametros serán pasados a la configuración de arranque del "
-"nucleo"
+"No puedo conectar a la base de datos de registro. ¡No se pueden mostrar "
+"registros!"
 
-#: plugins/admin/systems/workstationStartup.tpl:37
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
+#: plugins/admin/systems/class_glpiAccount.inc:164
 #, fuzzy
-msgid "FAI server"
-msgstr "Servidor LDAP"
+msgid "Can't connect to glpi database, check configuration twice."
+msgstr ""
+"No puedo conectar a la base de datos de registro. ¡No se pueden mostrar "
+"registros!"
 
-#: plugins/admin/systems/workstationStartup.tpl:54
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
+#: plugins/admin/systems/class_glpiAccount.inc:564
 #, fuzzy
-msgid "Assigned FAI classes"
-msgstr "Elija tipo de ratón"
+msgid "Remove inventory"
+msgstr "Eliminar entrada"
 
-#: plugins/admin/systems/workstationStartup.tpl:73
-#: plugins/admin/systems/terminalStartup.tpl:53
-msgid "Kernel modules (format: name parameters)"
-msgstr "Módulos del núcleo (formato: nombre parametros)"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
+#, fuzzy
+msgid ""
+"This server has inventory features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/workstationStartup.tpl:75
-#: plugins/admin/systems/terminalStartup.tpl:55
-msgid "Add additional modules to load on startup"
-msgstr "Añadir módulos adicionales que serán cargados al arrancar"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
+#: plugins/admin/systems/class_glpiAccount.inc:567
+#, fuzzy
+msgid "Add inventory"
+msgstr "Añadir entrada"
 
-#: plugins/admin/systems/workstationStartup.tpl:99
-#: plugins/admin/systems/terminalStartup.tpl:79
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
 #, fuzzy
-msgid "Mountpoint"
-msgstr "Monitor"
+msgid ""
+"This server has inventory features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
-msgstr "Número de teléfono"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
+#, php-format
+msgid ""
+"Can't rename given printer type to '%s', because this type name already "
+"exists."
+msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:52
-msgid "This 'dn' has no server features."
-msgstr "Esta 'dn' no tiene características de servidor."
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
+#, php-format
+msgid "Can't delete printer type, it is still in use by '%s'."
+msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:191
-#, fuzzy
-msgid "The required field 'Server name' is not set."
-msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:609
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:623
+#: plugins/admin/systems/class_glpiAccount.inc:631
+#: plugins/admin/systems/class_glpiAccount.inc:645
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:288
+msgid "N/A"
+msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:198
-msgid "You have no permissions to create a server on this 'Base'."
-msgstr "No tiene permisos para crear un servidor en esta 'Base'."
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:750
+#, fuzzy
+msgid "since"
+msgstr "Arriba desde"
 
 #: plugins/admin/systems/terminal.tpl:9
 msgid "Terminal template"
@@ -7916,131 +8050,62 @@ msgstr "Elija un servidor que será usado para sincronización horaria"
 msgid "Select action to execute for this terminal"
 msgstr "Seleccione una acción que se ejecutara en este terminal"
 
-#: plugins/admin/systems/class_servDHCP.inc:36
-msgid "Remove DHCP service"
-msgstr "Eliminar servicio DHCP"
-
-#: plugins/admin/systems/class_servDHCP.inc:37
-msgid ""
-"This server has DHCP features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Este servidor tiene la extensión DHCP activada. Puede desactivarla pulsando "
-"aquí."
-
-#: plugins/admin/systems/class_servDHCP.inc:39
-msgid "Add DHCP service"
-msgstr "Añadir servicio DHCP"
-
-#: plugins/admin/systems/class_servDHCP.inc:40
-msgid ""
-"This server has DHCP features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Este servidor tiene la extensión DHCP desactivada. Puede activarla pulsando "
-"aquí."
-
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
-msgstr "Seleccione objetos a añadir"
-
-#: plugins/admin/systems/class_glpiAccount.inc:144
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
-msgid "There is no server with valid glpi database service."
-msgstr ""
-
-#: plugins/admin/systems/class_glpiAccount.inc:154
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
-#, fuzzy
-msgid "Can't connect to glpi database, the php-mysql extension is missing."
-msgstr ""
-"No puedo conectar a la base de datos de registro. ¡No se pueden mostrar "
-"registros!"
-
-#: plugins/admin/systems/class_glpiAccount.inc:164
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
-#, fuzzy
-msgid "Can't connect to glpi database, check configuration twice."
-msgstr ""
-"No puedo conectar a la base de datos de registro. ¡No se pueden mostrar "
-"registros!"
+#: plugins/admin/systems/class_servDB.inc:135
+#: plugins/admin/systems/class_servDB.inc:144
+#: plugins/admin/systems/class_servDB.inc:161
+#: plugins/admin/systems/class_servDB.inc:171
+#: plugins/admin/systems/class_servDB.inc:176
+#: plugins/admin/systems/class_servDB.inc:182
+#, php-format
+msgid "The attribute '%s' is empty or contains invalid characters."
+msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
 
-#: plugins/admin/systems/class_glpiAccount.inc:178
-#: plugins/admin/systems/class_glpiAccount.inc:184
-#: plugins/admin/systems/class_glpiAccount.inc:190
-msgid "This feature is not implemented yet."
-msgstr ""
+#: plugins/admin/systems/class_servDB.inc:151
+#, php-format
+msgid "The imap connect string needs to be in the form '%s'."
+msgstr "La cadena de conexión imap necesita estar en la forma '%s'."
 
-#: plugins/admin/systems/class_glpiAccount.inc:292
-msgid "Adding new sytem type failed, this system type name is already used."
-msgstr ""
+#: plugins/admin/systems/class_servDB.inc:155
+msgid "The sieve port needs to be numeric."
+msgstr "El puerto sieve necesita ser un numero."
 
-#: plugins/admin/systems/class_glpiAccount.inc:312
-#, php-format
-msgid ""
-"You can't delete this system type, it is still in use by these system(s) '%s'"
-msgstr ""
+#: plugins/admin/systems/class_servDB.inc:166
+#, fuzzy, php-format
+msgid "The specified kerberos password is empty."
+msgstr "El archivo especificado está vacío."
 
-#: plugins/admin/systems/class_glpiAccount.inc:323
-#, fuzzy
-msgid "Rename failed, this system type name is already used."
-msgstr "El nombre especificado ya esta siendo usado"
+#: plugins/admin/systems/class_servDB.inc:190
+#, fuzzy, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
+msgstr "La cadena de conexión imap necesita estar en la forma '%s'."
 
-#: plugins/admin/systems/class_glpiAccount.inc:379
-#, fuzzy
-msgid "Adding new operating system failed, specifed name is already used."
-msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
+#, fuzzy, php-format
+msgid "You're about to delete the glpi cartridge type '%s'."
+msgstr "Va ha eliminar la aplicación '%s'."
 
-#: plugins/admin/systems/class_glpiAccount.inc:401
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:116
 #, php-format
 msgid ""
-"You can't delete this operating system, it is still in use by these system"
-"(s) '%s'"
+"You can't delete this cartridge type, it is still in use by this printer(s) "
+"'%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:413
-#, fuzzy
-msgid "Updating operating system failed, specifed name is already used."
-msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
-
-#: plugins/admin/systems/class_glpiAccount.inc:564
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
-#, fuzzy
-msgid "Remove inventory"
-msgstr "Eliminar entrada"
-
-#: plugins/admin/systems/class_glpiAccount.inc:565
-#, fuzzy
-msgid ""
-"This device has inventory informations enabled. You can disable them by "
-"clicking below."
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
+msgid "Cartridges"
 msgstr ""
-"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
-"aquí."
 
-#: plugins/admin/systems/class_glpiAccount.inc:567
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
 #, fuzzy
-msgid "Add inventory"
-msgstr "Añadir entrada"
+msgid "New monitor"
+msgstr "Nueva contraseña"
 
-#: plugins/admin/systems/class_glpiAccount.inc:568
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
 #, fuzzy
-msgid ""
-"This device has inventory informations disabled. You can enable them by "
-"clicking below."
-msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
-
-#: plugins/admin/systems/class_glpiAccount.inc:631
-#: plugins/admin/systems/class_glpiAccount.inc:645
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:609
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:623
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:288
-msgid "N/A"
-msgstr ""
+msgid "M"
+msgstr "Mb"
 
 #: plugins/admin/systems/class_workstationGeneric.inc:70
 #, fuzzy
@@ -8062,10 +8127,38 @@ msgstr "Registro del sistema"
 msgid "No ACTIONCMD definition found in your gosa.conf"
 msgstr "No se ha encontrado ninguna definición de 'HALTCMD' en 'gosa.conf'"
 
+#: plugins/admin/systems/class_workstationGeneric.inc:104
+#: plugins/admin/systems/class_terminalGeneric.inc:94
+#: plugins/admin/systems/class_terminalGeneric.inc:106
+#: plugins/admin/systems/class_terminalGeneric.inc:118
+#: plugins/admin/systems/class_servGeneric.inc:66
+#: plugins/admin/systems/class_servGeneric.inc:78
+#: plugins/admin/systems/class_servGeneric.inc:90
+#: plugins/admin/ogroups/class_termgroup.inc:68
+#: plugins/admin/ogroups/class_termgroup.inc:80
+#: plugins/admin/ogroups/class_termgroup.inc:92
+#, php-format
+msgid "Execution of '%s' failed!"
+msgstr "¡La ejecución de '%s' ha fallado!"
+
 #: plugins/admin/systems/class_workstationGeneric.inc:114
 msgid "This 'dn' has no workstation features."
 msgstr "Esta 'dn' no tiene características de estación de trabajo."
 
+#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/systems/class_terminalGeneric.inc:170
+#: plugins/admin/systems/class_servGeneric.inc:140
+#: plugins/admin/ogroups/class_termgroup.inc:104
+msgid "Switch off"
+msgstr "Apagar"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/systems/class_terminalGeneric.inc:170
+#: plugins/admin/systems/class_servGeneric.inc:140
+#: plugins/admin/ogroups/class_termgroup.inc:104
+msgid "Reboot"
+msgstr "Reiniciar"
+
 #: plugins/admin/systems/class_workstationGeneric.inc:157
 #, fuzzy
 msgid "Instant update"
@@ -8087,6 +8180,13 @@ msgstr ""
 msgid "Rescan hardware"
 msgstr "Componente telefónico"
 
+#: plugins/admin/systems/class_workstationGeneric.inc:162
+#: plugins/admin/systems/class_terminalGeneric.inc:172
+#: plugins/admin/systems/class_servGeneric.inc:142
+#: plugins/admin/ogroups/class_termgroup.inc:104
+msgid "Wake up"
+msgstr "Despertar"
+
 #: plugins/admin/systems/class_workstationGeneric.inc:228
 msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr "No tiene permisos para crear una estación de trabajo en esta 'Base'."
@@ -8096,998 +8196,1215 @@ msgid "The required field 'Workstation name' is not set."
 msgstr ""
 " El campo requerido 'Nombre de la estación de trabajo' no ha sido rellenado."
 
-#: plugins/admin/systems/class_systemManagement.inc:32
-msgid "Systems"
-msgstr "Sistemas"
+#: plugins/admin/systems/class_workstationGeneric.inc:245
+#: plugins/admin/systems/class_componentGeneric.inc:155
+#: plugins/admin/systems/class_winGeneric.inc:172
+#: plugins/admin/systems/class_terminalGeneric.inc:286
+#: plugins/admin/systems/class_servGeneric.inc:209
+#: plugins/admin/systems/class_printGeneric.inc:529
+#: plugins/admin/systems/class_phoneGeneric.inc:314
+#, php-format
+msgid "There is already an entry '%s' in the base choosen by you"
+msgstr "Ya hay una entrada '%s' en la base elegida"
 
-#: plugins/admin/systems/class_systemManagement.inc:429
-msgid "You can't edit this object type yet!"
-msgstr "¡No puede editar este tipo de objeto todavía!"
+#: plugins/admin/systems/servdns.tpl:1
+#, fuzzy
+msgid "Zones"
+msgstr "teléfonos"
 
-#: plugins/admin/systems/class_systemManagement.inc:455
-msgid "Passwords entered as new and repeated do not match!"
-msgstr "!Las contraseñas introducidas como 'nuevo' y 'repetir' no son iguales¡"
+#: plugins/admin/systems/workstation.tpl:9
+msgid "Workstation template"
+msgstr "Plantilla de estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:472
-msgid "You are not allowed to set this systems password!"
-msgstr "¡No tiene permisos para cambiar contraseñas de sistema!"
+#: plugins/admin/systems/workstation.tpl:11
+msgid "Workstation name"
+msgstr "Nombre de la estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:526
-#, php-format
-msgid "You're about to delete all information about the component at '%s'."
+#: plugins/admin/systems/class_servNfs.inc:35
+msgid ""
+"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
 msgstr ""
-"Esta a punto de borrar toda la información sobre el componente en '%s'."
 
-#: plugins/admin/systems/class_systemManagement.inc:760
+#: plugins/admin/systems/class_servNfs.inc:38
 #, fuzzy
-msgid "New Terminal template"
-msgstr "Plantilla de terminal"
+msgid "Can't read '/etc/gosa/encodings', please check permissions."
+msgstr "Borrar"
 
-#: plugins/admin/systems/class_systemManagement.inc:760
-#: plugins/admin/systems/class_systemManagement.inc:924
+#: plugins/admin/systems/class_servNfs.inc:125
 #, fuzzy
-msgid "New Terminal"
-msgstr "Nuevo terminal"
+msgid "Please specify a valid path for your setup."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/class_systemManagement.inc:762
+#: plugins/admin/systems/class_servNfs.inc:131
 #, fuzzy
-msgid "New Workstation template"
-msgstr "Plantilla de estación de trabajo"
+msgid "Please specify a valid name for your setup."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/class_systemManagement.inc:762
-#: plugins/admin/systems/class_systemManagement.inc:925
+#: plugins/admin/systems/class_servNfs.inc:134
 #, fuzzy
-msgid "New Workstation"
-msgstr "Nueva estación de trabajo"
+msgid "Please specify a name for your setup."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/class_systemManagement.inc:763
-#: plugins/admin/systems/class_systemManagement.inc:764
+#: plugins/admin/systems/class_servNfs.inc:139
 #, fuzzy
-msgid "New Server"
-msgstr "Servidor"
+msgid "Description contains invalid characters."
+msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
+
+#: plugins/admin/systems/class_servNfs.inc:143
+#, fuzzy
+msgid "Path contains invalid characters."
+msgstr "El campo 'Nombre' contiene caracteres no validos."
+
+#: plugins/admin/systems/class_servNfs.inc:147
+#, fuzzy
+msgid "Option contains invalid characters."
+msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
+
+#: plugins/admin/systems/servnfs.tpl:1
+#, fuzzy
+msgid "Edit share"
+msgstr "Usuario administrador"
+
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
+msgstr ""
+
+#: plugins/admin/systems/servnfs.tpl:25
+msgid "Path"
+msgstr ""
+
+#: plugins/admin/systems/servnfs.tpl:49
+#, fuzzy
+msgid "Codepage"
+msgstr "Página Web Principal"
+
+#: plugins/admin/systems/servnfs.tpl:59
+#, fuzzy
+msgid "Option"
+msgstr "Opciones"
+
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid "Remove Kolab extension"
+msgstr "Eliminar extensión Kolab"
+
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid ""
+"This server has kolab features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
+"aquí."
+
+#: plugins/admin/systems/class_servKolab.inc:118
+msgid "Add Kolab service"
+msgstr "Añadir el servicio Kolab"
+
+#: plugins/admin/systems/class_servKolab.inc:118
+msgid ""
+"This server has kolab features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
+"aquí."
+
+#: plugins/admin/systems/class_servKolab.inc:146
+#, php-format
+msgid "Include data from %s days in the past when creating free/busy lists"
+msgstr ""
+"Incluye información desde hace '%s' días cuando cree listas de presencia"
+
+#: plugins/admin/systems/class_servKolab.inc:152
+#, php-format
+msgid "Warn users when using more than %s%% of their mail quota"
+msgstr ""
+"Avisar a los usuarios de que están usando mas de %s%% de su cuota de correo"
+
+#: plugins/admin/systems/class_servKolab.inc:227
+msgid "Future days in Free/Busy settings must be set."
+msgstr "Se deben poner días futuros en la configuración de presencia"
+
+#: plugins/admin/systems/class_servKolab.inc:229
+msgid "Future days in Free/Busy settings must be a positive value."
+msgstr ""
+"Días futuros en la configuración de presencia debe ser un número positivo."
+
+#: plugins/admin/systems/class_servKolab.inc:233
+msgid "The given Quota settings value must be a number."
+msgstr "El valor introducido como cuota debe ser un número."
+
+#: plugins/admin/systems/class_servKolab.inc:235
+msgid "Please choose a value between 1 and 100 for Quota settings."
+msgstr ""
+"Por favor introduzca un valor entre 1 y 100 para el parámetro de cuota."
+
+#: plugins/admin/systems/class_servKolab.inc:237
+msgid "Future days must be a value."
+msgstr "Días futuros debe ser un valor"
+
+#: plugins/admin/systems/class_servKolab.inc:241
+msgid "No SMTP privileged networks set."
+msgstr "No se han indicado redes privilegiadas SMTP."
+
+#: 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"
+
+#: plugins/admin/systems/terminalService.tpl:147
+msgid "Choose method to connect to terminal server"
+msgstr "Elija el método de conexión con el servidor de terminal"
+
+#: plugins/admin/systems/terminalService.tpl:154
+msgid "Terminal server"
+msgstr "Servidor de terminal"
+
+#: plugins/admin/systems/terminalService.tpl:156
+msgid "Select specific terminal server to use"
+msgstr "Seleccione específicamente que servidor de terminal usará"
+
+#: plugins/admin/systems/terminalService.tpl:163
+msgid "Font server"
+msgstr "Servidor de fuentes"
+
+#: plugins/admin/systems/terminalService.tpl:165
+msgid "Select specific font server to use"
+msgstr "Seleccione específicamente que servidor de fuentes usará"
+
+#: plugins/admin/systems/terminalService.tpl:181
+msgid "Print device"
+msgstr "Dispositivo de Impresión"
+
+#: plugins/admin/systems/terminalService.tpl:182
+msgid "Select to start IPP based printing service on terminal"
+msgstr ""
+"Seleccione para iniciar el servicio de impresión basado en 'IPP' en el "
+"terminal"
+
+#: plugins/admin/systems/terminalService.tpl:183
+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 ""
+"Seleccione un sistema de archivos 'NFS' para colocar los ficheros de la cola"
+
+#: plugins/admin/systems/terminalService.tpl:212
+msgid "Select scanner driver to use"
+msgstr "Seleccione que controladores de escáner se usaran"
+
+#: plugins/admin/systems/class_componentGeneric.inc:50
+#: plugins/admin/systems/class_winGeneric.inc:73
+msgid "This 'dn' has no network features."
+msgstr "Esta 'dn' no tiene características de red."
+
+#: plugins/admin/systems/class_componentGeneric.inc:138
+#, fuzzy
+msgid "The required field 'Component name' is not set."
+msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
+
+#: plugins/admin/systems/class_componentGeneric.inc:145
+#: plugins/admin/systems/class_winGeneric.inc:162
+msgid "You have no permissions to create a component on this 'Base'."
+msgstr "No tiene permisos para crear un componente en esta 'Base'."
 
-#: plugins/admin/systems/class_systemManagement.inc:765
-#: plugins/admin/systems/class_systemManagement.inc:766
-#, fuzzy
-msgid "New Printer"
-msgstr "Impresora"
+#: plugins/admin/systems/terminalStartup.tpl:35
+msgid "Select if terminal supports graphical startup with progress bar"
+msgstr "Seleccione si el terminal soporta inicio gráfico con barra de progreso"
 
-#: plugins/admin/systems/class_systemManagement.inc:767
-#: plugins/admin/systems/class_systemManagement.inc:768
-#, fuzzy
-msgid "New Phone"
-msgstr "Teléfono"
+#: plugins/admin/systems/terminalStartup.tpl:36
+msgid "use graphical bootup"
+msgstr "Usar arranque gráfico"
 
-#: plugins/admin/systems/class_systemManagement.inc:769
-#: plugins/admin/systems/class_systemManagement.inc:770
-#, fuzzy
-msgid "New Component"
-msgstr "Otros componentes de red"
+#: plugins/admin/systems/terminalStartup.tpl:38
+msgid "Select if terminal should boot in text mode"
+msgstr "Seleccione si el terminal debería arrancar en modo texto"
 
-#: plugins/admin/systems/class_systemManagement.inc:780
-#, fuzzy
-msgid "Edit system"
-msgstr "Lista de sistemas"
+#: plugins/admin/systems/terminalStartup.tpl:39
+msgid "use standard linux textual bootup"
+msgstr "Usar arranque en modo texto"
 
-#: plugins/admin/systems/class_systemManagement.inc:781
-#, fuzzy
-msgid "Delete system"
-msgstr "Borrar"
+#: plugins/admin/systems/terminalStartup.tpl:41
+msgid "Select to get more verbose output during startup"
+msgstr ""
+"Seleccione para obtener una información mas prolija durante el arranque"
 
-#: plugins/admin/systems/class_systemManagement.inc:791
-#, fuzzy
-msgid "System"
-msgstr "Sistemas"
+#: plugins/admin/systems/terminalStartup.tpl:42
+msgid "use debug mode for startup"
+msgstr "Usar el modo de depuración durante el arranque"
 
-#: plugins/admin/systems/class_systemManagement.inc:829
-#, fuzzy
-msgid "Cups Server"
-msgstr "Servidor"
+#: plugins/admin/systems/class_glpiAccount.inc:178
+#: plugins/admin/systems/class_glpiAccount.inc:184
+#: plugins/admin/systems/class_glpiAccount.inc:190
+msgid "This feature is not implemented yet."
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:830
-msgid "Log Db"
+#: plugins/admin/systems/class_glpiAccount.inc:292
+msgid "Adding new sytem type failed, this system type name is already used."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:831
-#, fuzzy
-msgid "Syslog Server"
-msgstr "Servidor de Logs"
+#: plugins/admin/systems/class_glpiAccount.inc:312
+#, php-format
+msgid ""
+"You can't delete this system type, it is still in use by these system(s) '%s'"
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:832
+#: plugins/admin/systems/class_glpiAccount.inc:323
 #, fuzzy
-msgid "Mail Server"
-msgstr "Servidor"
+msgid "Rename failed, this system type name is already used."
+msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/admin/systems/class_systemManagement.inc:833
+#: plugins/admin/systems/class_glpiAccount.inc:379
 #, fuzzy
-msgid "Imap Server"
-msgstr "Servidor de Intercambio"
+msgid "Adding new operating system failed, specifed name is already used."
+msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
 
-#: plugins/admin/systems/class_systemManagement.inc:834
-#, fuzzy
-msgid "Nfs Server"
-msgstr "Servidor"
+#: plugins/admin/systems/class_glpiAccount.inc:401
+#, php-format
+msgid ""
+"You can't delete this operating system, it is still in use by these system"
+"(s) '%s'"
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:835
+#: plugins/admin/systems/class_glpiAccount.inc:413
 #, fuzzy
-msgid "Kerberos Server"
-msgstr "Kerberos"
+msgid "Updating operating system failed, specifed name is already used."
+msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
 
-#: plugins/admin/systems/class_systemManagement.inc:836
+#: plugins/admin/systems/class_glpiAccount.inc:565
 #, fuzzy
-msgid "Asterisk Server"
-msgstr "Base de datos de usuarios Asterisk"
+msgid ""
+"This device has inventory informations enabled. You can disable them by "
+"clicking below."
+msgstr ""
+"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/class_systemManagement.inc:837
+#: plugins/admin/systems/class_glpiAccount.inc:568
 #, fuzzy
-msgid "Fax Server"
-msgstr "Servidor"
+msgid ""
+"This device has inventory informations disabled. You can enable them by "
+"clicking below."
+msgstr ""
+"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/class_systemManagement.inc:838
+#: plugins/admin/systems/glpiManufacturer.tpl:1
 #, fuzzy
-msgid "Ldap Server"
-msgstr "Servidor de Intercambio"
+msgid "Manage manufacturers"
+msgstr "Editar entrada"
 
-#: plugins/admin/systems/class_systemManagement.inc:871
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
 #, fuzzy
-msgid "Set root password"
-msgstr "Poner Contraseña"
+msgid "Attachment"
+msgstr "Argumentos"
 
-#: plugins/admin/systems/class_systemManagement.inc:916
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
 #, fuzzy
-msgid "New System from incoming"
-msgstr "Información de sistema"
+msgid "Filename"
+msgstr "Nombre del servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:918
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:589
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
 #, fuzzy
-msgid "Terminal"
-msgstr "Terminales"
-
-#: plugins/admin/systems/class_systemManagement.inc:919
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:588
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
-msgstr "Estación de trabajo"
+msgid "Mime-type"
+msgstr "Tipo"
 
-#: plugins/admin/systems/class_systemManagement.inc:922
+#: plugins/admin/systems/class_termDNS.inc:313
 #, fuzzy
-msgid "Winstation"
-msgstr "Estación de trabajo"
+msgid "The required field 'IP-address' is not set."
+msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
 
-#: plugins/admin/systems/class_systemManagement.inc:923
+#: plugins/admin/systems/class_termDNS.inc:319
+msgid "Wrong IP format in field IP-address."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:325
 #, fuzzy
-msgid "Network Device"
-msgstr "Dispositivos de Red"
+msgid "The required field 'MAC-address' is not set."
+msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
 
-#: plugins/admin/systems/class_systemManagement.inc:1146
-msgid "New terminal"
-msgstr "Nuevo terminal"
+#: plugins/admin/systems/class_termDNS.inc:331
+msgid ""
+"The given macaddress is invalid. There must be 6 1byte segments seperated by "
+"':'."
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1148
-msgid "New workstation"
-msgstr "Nueva estación de trabajo"
+#: plugins/admin/systems/class_termDNS.inc:346
+#, php-format
+msgid "Found duplicate value for record type '%s'."
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1150
-#, fuzzy
-msgid "New Device"
-msgstr "Dispositivos de Red"
+#: plugins/admin/systems/class_termDNS.inc:352
+#, php-format
+msgid "Found more than one entry for the uniqe record type '%s'."
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1167
-#, fuzzy
-msgid "Terminal template for"
-msgstr "Plantilla de terminal"
+#: plugins/admin/systems/class_termDNS.inc:360
+#, php-format
+msgid ""
+"The device IP '%s' is added as 'A Record', this will be done automatically, "
+"please remove the record."
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1179
-msgid "Workstation template for"
-msgstr "Plantilla de estación de trabajo para"
+#: plugins/admin/systems/class_termDNS.inc:366
+#: plugins/admin/systems/class_servDNSeditZone.inc:386
+#, php-format
+msgid "Only lowercase is allowed, please check your '%ss'."
+msgstr ""
 
-#: plugins/admin/systems/printer.tpl:6
+#: plugins/admin/systems/class_servRepository.inc:97
 #, fuzzy
-msgid "General"
-msgstr "Genérico"
+msgid "Remove FAI repository extension."
+msgstr "Eliminar extensión Kolab"
 
-#: plugins/admin/systems/printer.tpl:9
-msgid "Printer name"
-msgstr "Nombre de la impresora"
+#: plugins/admin/systems/class_servRepository.inc:98
+#, fuzzy
+msgid ""
+"This server has FAI repository features enabled. You can disable them by "
+"clicking below."
+msgstr ""
+"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/printer.tpl:31
-msgid "Details"
+#: plugins/admin/systems/class_servRepository.inc:100
+msgid "Add FAI repository extension."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:34
+#: plugins/admin/systems/class_servRepository.inc:101
 #, fuzzy
-msgid "Printer location"
-msgstr "Configuración telefónica"
+msgid ""
+"This server has FAI repository features disabled. You can enable them by "
+"clicking below."
+msgstr ""
+"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/printer.tpl:38
-msgid "Printer URL"
-msgstr "URL de la impresora"
+#: plugins/admin/systems/class_servRepository.inc:144
+#, php-format
+msgid ""
+"You can't delete this release, it is still used by these workstations [%s]. "
+"Please solve this dependencies first, to keep data base consistency."
+msgstr ""
 
-#: plugins/admin/systems/printer.tpl:58
-#, fuzzy
-msgid "Permissions"
-msgstr "Miembro con Permisos"
+#: plugins/admin/systems/class_servRepository.inc:176
+#, php-format
+msgid ""
+"Be careful editing this release, it is still used by these workstations [%s]."
+msgstr ""
 
-#: plugins/admin/systems/printer.tpl:65
+#: plugins/admin/systems/class_servRepository.inc:243
+#: plugins/admin/systems/class_servRepository.inc:264
+#: plugins/admin/systems/servRepositorySetup.tpl:33
 #, fuzzy
-msgid "Users which are allowed to use this printer"
-msgstr "¡No tiene permisos para eliminar esta entrada!"
+msgid "Sections"
+msgstr "Acción"
 
-#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
-#, fuzzy
-msgid "Add user"
-msgstr "Usuario administrador"
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
+msgid "Can't delete this entry, it is still in use."
+msgstr ""
 
-#: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:305
 #, fuzzy
-msgid "Add group"
-msgstr "grupos"
+msgid "The selected name is already in use."
+msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/admin/systems/printer.tpl:81
+#: plugins/admin/systems/servRepository.tpl:6
 #, fuzzy
-msgid "Users which are allowed to administrate this printer"
-msgstr "¡No tiene permisos para eliminar esta entrada!"
+msgid "List of configured repositories."
+msgstr "Lista de grupos"
 
-#: plugins/admin/systems/printer.tpl:82
+#: plugins/admin/systems/servRepository.tpl:11
 #, fuzzy
-msgid "Admins"
-msgstr "DN del administrador"
-
-#: plugins/admin/systems/class_servDNS.inc:181
-#: plugins/admin/systems/class_inventory.inc:36
-msgid "Remove DNS service"
-msgstr "Eliminar servicio DNS"
+msgid "Add repository"
+msgstr "Reintentar"
 
-#: plugins/admin/systems/class_servDNS.inc:182
-#: plugins/admin/systems/class_inventory.inc:37
-msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
+#: plugins/admin/systems/servRepository.tpl:29
+msgid "This menu allows you to create, delete and edit repository settings."
 msgstr ""
-"Esta servidor tiene la extensión DNS activada. Puede desactivarla pulsando "
-"aquí."
-
-#: plugins/admin/systems/class_servDNS.inc:184
-#: plugins/admin/systems/class_inventory.inc:39
-msgid "Add DNS service"
-msgstr "Añadir servicio DNS"
 
-#: plugins/admin/systems/class_servDNS.inc:185
-#: plugins/admin/systems/class_inventory.inc:40
-msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
-msgstr ""
-"Este servidor tiene la extensión DNS desactivada. Puede activarla pulsando "
-"aquí."
+#: plugins/admin/systems/servdnseditzone.tpl:7
+#, fuzzy
+msgid "Zone name"
+msgstr "Número de teléfono"
 
-#: plugins/admin/systems/class_servDNS.inc:270
-#, php-format
-msgid ""
-"Can't delete the selected zone, because it is still in use by these entry/"
-"entries '%s'"
-msgstr ""
+#: plugins/admin/systems/servdnseditzone.tpl:13
+#, fuzzy
+msgid "Network address"
+msgstr "Dispositivos de Red"
 
-#: plugins/admin/systems/class_servDNS.inc:297
+#: plugins/admin/systems/servdnseditzone.tpl:24
 #, fuzzy
-msgid "Reverse zone"
-msgstr "Referencias"
+msgid "Zone entries"
+msgstr "Configuración telefónica"
 
-#: plugins/admin/systems/class_servDB.inc:135
-#: plugins/admin/systems/class_servDB.inc:144
-#: plugins/admin/systems/class_servDB.inc:161
-#: plugins/admin/systems/class_servDB.inc:171
-#: plugins/admin/systems/class_servDB.inc:176
-#: plugins/admin/systems/class_servDB.inc:182
-#, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
-msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
+#: plugins/admin/systems/servdnseditzone.tpl:35
+#, fuzzy
+msgid "SOA record"
+msgstr "Directorio"
 
-#: plugins/admin/systems/class_servDB.inc:151
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
-msgstr "La cadena de conexión imap necesita estar en la forma '%s'."
+#: plugins/admin/systems/servdnseditzone.tpl:41
+#, fuzzy
+msgid "Primary dns server for this zone"
+msgstr "Dirección de correo electrónica primaria para esta carpeta compartida"
 
-#: plugins/admin/systems/class_servDB.inc:155
-msgid "The sieve port needs to be numeric."
-msgstr "El puerto sieve necesita ser un numero."
+#: plugins/admin/systems/servdnseditzone.tpl:53
+msgid "Serial number (automatically incremented)"
+msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:166
-#, fuzzy, php-format
-msgid "The specified kerberos password is empty."
-msgstr "El archivo especificado está vacío."
+#: plugins/admin/systems/servdnseditzone.tpl:69
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: ihtml/themes/altlinux/setup_finish.tpl:31
+#: ihtml/themes/default/setup_finish.tpl:31
+#: ihtml/themes/lhs/setup_finish.tpl:31
+msgid "Retry"
+msgstr "Reintentar"
 
-#: plugins/admin/systems/class_servDB.inc:190
-#, fuzzy, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
-msgstr "La cadena de conexión imap necesita estar en la forma '%s'."
+#: plugins/admin/systems/servdnseditzone.tpl:75
+#, fuzzy
+msgid "Expire"
+msgstr "Exportar"
 
-#: plugins/admin/systems/servdns.tpl:1
+#: plugins/admin/systems/servdnseditzone.tpl:96
 #, fuzzy
-msgid "Zones"
-msgstr "teléfonos"
+msgid "MxRecords"
+msgstr "Directorio"
 
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
-msgstr "Plantilla de estación de trabajo"
+#: plugins/admin/systems/servdnseditzone.tpl:108
+#, fuzzy
+msgid "Zone records"
+msgstr "Directorio"
 
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
-msgstr "Nombre de la estación de trabajo"
+#: plugins/admin/systems/class_glpiSelectUser.inc:140
+#, fuzzy
+msgid "use"
+msgstr "Ratón"
 
-#: plugins/admin/systems/class_servNfs.inc:35
+#: plugins/admin/systems/glpiSelectUser.tpl:23
 msgid ""
-"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+"This dialog allows you to select a user as technical responsible person."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:38
+#: plugins/admin/systems/glpi_devices.tpl:2
 #, fuzzy
-msgid "Can't read '/etc/gosa/encodings', please check permissions."
-msgstr "Borrar"
+msgid "Add/Edit monitor"
+msgstr "Editar entrada"
 
-#: plugins/admin/systems/class_servNfs.inc:125
+#: plugins/admin/systems/glpi_devices.tpl:17
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
 #, fuzzy
-msgid "Please specify a valid path for your setup."
-msgstr "Por favor especifique un usuario valido."
+msgid "Comments"
+msgstr "Contacto"
 
-#: plugins/admin/systems/class_servNfs.inc:131
+#: plugins/admin/systems/glpi_devices.tpl:33
 #, fuzzy
-msgid "Please specify a valid name for your setup."
-msgstr "Por favor especifique un usuario valido."
+msgid "Monitor size"
+msgstr "Monitor"
 
-#: plugins/admin/systems/class_servNfs.inc:134
+#: plugins/admin/systems/glpi_devices.tpl:36
 #, fuzzy
-msgid "Please specify a name for your setup."
-msgstr "Por favor especifique un usuario valido."
+msgid "Inch"
+msgstr "Francés"
 
-#: plugins/admin/systems/class_servNfs.inc:139
+#: plugins/admin/systems/glpi_devices.tpl:44
+msgid "Integrated microphone"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:47
+#: plugins/admin/systems/glpi_devices.tpl:55
+#: plugins/admin/systems/glpi_devices.tpl:63
+#: plugins/admin/systems/glpi_devices.tpl:71
+#: plugins/admin/systems/glpi_devices.tpl:176
+#: plugins/admin/systems/glpi_devices.tpl:296
+#: plugins/admin/systems/glpi_devices.tpl:361
 #, fuzzy
-msgid "Description contains invalid characters."
-msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
+msgid "Yes"
+msgstr "Sistemas"
 
-#: plugins/admin/systems/class_servNfs.inc:143
+#: plugins/admin/systems/glpi_devices.tpl:48
+#: plugins/admin/systems/glpi_devices.tpl:56
+#: plugins/admin/systems/glpi_devices.tpl:64
+#: plugins/admin/systems/glpi_devices.tpl:72
+#: plugins/admin/systems/glpi_devices.tpl:177
+#: plugins/admin/systems/glpi_devices.tpl:297
+#: plugins/admin/systems/glpi_devices.tpl:362
 #, fuzzy
-msgid "Path contains invalid characters."
-msgstr "El campo 'Nombre' contiene caracteres no validos."
+msgid "No"
+msgstr "ninguno"
 
-#: plugins/admin/systems/class_servNfs.inc:147
+#: plugins/admin/systems/glpi_devices.tpl:52
+msgid "Integrated speakers"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:60
+msgid "Sub-D"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:68
+msgid "BNC"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:76
 #, fuzzy
-msgid "Option contains invalid characters."
-msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
+msgid "Serial number"
+msgstr "Nombre de terminal"
 
-#: plugins/admin/systems/servdb.tpl:6
-msgid "Kerberos kadmin access"
-msgstr "Acceso a Kerberos kadmin"
+#: plugins/admin/systems/glpi_devices.tpl:83
+#, fuzzy
+msgid "Additional serial number"
+msgstr "Numero de serie del certificado"
 
-#: plugins/admin/systems/servdb.tpl:10
-msgid "Kerberos Realm"
-msgstr "Dominio Kerberos"
+#: plugins/admin/systems/glpi_devices.tpl:97
+#, fuzzy
+msgid "Add/Edit other device"
+msgstr "Tarjeta Sonido"
 
-#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
-msgid "Admin user"
-msgstr "Usuario administrador"
+#: plugins/admin/systems/glpi_devices.tpl:138
+msgid "Add/Edit power supply"
+msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:26
-msgid "FAX database"
-msgstr "Base de datos de FAX"
+#: plugins/admin/systems/glpi_devices.tpl:173
+msgid "Atx"
+msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:30
-msgid "FAX DB user"
-msgstr "Base de datos de usuarios de FAX"
+#: plugins/admin/systems/glpi_devices.tpl:181
+#, fuzzy
+msgid "Power"
+msgstr "Puerto"
 
-#: plugins/admin/systems/servdb.tpl:42
-msgid "Asterisk management"
-msgstr "Gestión de Asterisk PBX"
+#: plugins/admin/systems/glpi_devices.tpl:193
+msgid "Add/Edit graphic card"
+msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:46
-msgid "Asterisk DB user"
-msgstr "Base de datos de usuarios Asterisk"
+#: plugins/admin/systems/glpi_devices.tpl:228
+#: plugins/admin/systems/glpi_devices.tpl:284
+#: plugins/admin/systems/glpi_devices.tpl:349
+msgid "Interface"
+msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:54
-msgid "Country dial prefix"
-msgstr "Prefijo de marcado nacional"
+#: plugins/admin/systems/glpi_devices.tpl:237
+#, fuzzy
+msgid "Ram"
+msgstr "Nombre del servidor"
 
-#: plugins/admin/systems/servdb.tpl:58
-msgid "Local dial prefix"
-msgstr "Prefijo de marcado local"
+#: plugins/admin/systems/glpi_devices.tpl:249
+#, fuzzy
+msgid "Add/Edit controller"
+msgstr "Número de teléfono"
 
-#: plugins/admin/systems/servdb.tpl:70
-msgid "IMAP admin access"
-msgstr "Acceso administrador imap"
+#: plugins/admin/systems/glpi_devices.tpl:307
+msgid "Add/Edit drive"
+msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:74
-msgid "Server identifier"
-msgstr "Identificador de servidor"
+#: plugins/admin/systems/glpi_devices.tpl:342
+#, fuzzy
+msgid "Speed"
+msgstr "Sexo"
 
-#: plugins/admin/systems/servdb.tpl:78
-msgid "Connect URL"
-msgstr "Conectar a la URL"
+#: plugins/admin/systems/glpi_devices.tpl:358
+#, fuzzy
+msgid "Writeable"
+msgstr "escribir"
 
-#: plugins/admin/systems/servdb.tpl:91
-msgid "Sieve port"
-msgstr "Puerto de Sieve"
+#: plugins/admin/systems/glpi_devices.tpl:371
+#, fuzzy
+msgid "Add/Edit harddisk"
+msgstr "Servidor"
 
-#: plugins/admin/systems/servdb.tpl:100
-msgid "Logging database"
-msgstr "Base de datos de Logs"
+#: plugins/admin/systems/glpi_devices.tpl:406
+msgid "Rpm"
+msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
-msgid "Logging DB user"
-msgstr "Base de datos de acceso de usuarios"
+#: plugins/admin/systems/glpi_devices.tpl:413
+#, fuzzy
+msgid "Cache"
+msgstr "Cancelar"
 
-#: plugins/admin/systems/servdb.tpl:119
+#: plugins/admin/systems/glpi_devices.tpl:443
 #, fuzzy
-msgid "Glpi database"
-msgstr "Base de datos de FAX"
+msgid "Add/Edit memory"
+msgstr "Editar entrada"
 
-#: plugins/admin/systems/servdb.tpl:133
+#: plugins/admin/systems/glpi_devices.tpl:478
 #, fuzzy
-msgid "Database"
-msgstr "Bases de datos"
+msgid "Frequenz"
+msgstr "Número de teléfono"
 
-#: plugins/admin/systems/servnfs.tpl:1
+#: plugins/admin/systems/glpi_devices.tpl:507
 #, fuzzy
-msgid "Edit share"
-msgstr "Usuario administrador"
+msgid "Add/Edit sound card"
+msgstr "Nueva contraseña"
 
-#: plugins/admin/systems/servnfs.tpl:2
-msgid "NFS setup"
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:553
+#, fuzzy
+msgid "Add/Edit network interface"
+msgstr "Impresora de Red"
 
-#: plugins/admin/systems/servnfs.tpl:25
-msgid "Path"
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:589
+#, fuzzy
+msgid "MAC address"
+msgstr "Dirección MAC"
 
-#: plugins/admin/systems/servnfs.tpl:49
+#: plugins/admin/systems/glpi_devices.tpl:607
 #, fuzzy
-msgid "Codepage"
-msgstr "Página Web Principal"
+msgid "Add/Edit processor"
+msgstr "Nueva contraseña"
 
-#: plugins/admin/systems/servnfs.tpl:59
+#: plugins/admin/systems/glpi_devices.tpl:642
 #, fuzzy
-msgid "Option"
-msgstr "Opciones"
+msgid "Frequence"
+msgstr "Número de teléfono"
 
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid "Remove Kolab extension"
-msgstr "Eliminar extensión Kolab"
+#: plugins/admin/systems/glpi_devices.tpl:649
+#, fuzzy
+msgid "Default frequence"
+msgstr "Valor por defecto"
 
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid ""
-"This server has kolab features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
-"aquí."
+#: plugins/admin/systems/glpi_devices.tpl:661
+#, fuzzy
+msgid "Add/Edit motherboard"
+msgstr "Teclado"
 
-#: plugins/admin/systems/class_servKolab.inc:118
-msgid "Add Kolab service"
-msgstr "Añadir el servicio Kolab"
+#: plugins/admin/systems/glpi_devices.tpl:696
+#, fuzzy
+msgid "Chipset"
+msgstr "Borrar"
 
-#: plugins/admin/systems/class_servKolab.inc:118
-msgid ""
-"This server has kolab features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
+#: plugins/admin/systems/glpi_devices.tpl:707
+#, fuzzy
+msgid "Add/Edit computer case"
+msgstr "incompleto"
 
-#: plugins/admin/systems/class_servKolab.inc:146
-#, php-format
-msgid "Include data from %s days in the past when creating free/busy lists"
-msgstr ""
-"Incluye información desde hace '%s' días cuando cree listas de presencia"
+#: plugins/admin/systems/glpi_devices.tpl:742
+#, fuzzy
+msgid "format"
+msgstr "Puerto"
 
-#: plugins/admin/systems/class_servKolab.inc:152
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
 #, php-format
-msgid "Warn users when using more than %s%% of their mail quota"
+msgid "Internal Error can't create device of type '%s'"
 msgstr ""
-"Avisar a los usuarios de que están usando mas de %s%% de su cuota de correo"
 
-#: plugins/admin/systems/class_servKolab.inc:227
-msgid "Future days in Free/Busy settings must be set."
-msgstr "Se deben poner días futuros en la configuración de presencia"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
+#, fuzzy, php-format
+msgid "You're about to delete the glpi device '%s'."
+msgstr "Está a punto de borrar el grupo '%s'."
 
-#: plugins/admin/systems/class_servKolab.inc:229
-msgid "Future days in Free/Busy settings must be a positive value."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
+msgid "Can't detect object name."
 msgstr ""
-"Días futuros en la configuración de presencia debe ser un número positivo."
-
-#: plugins/admin/systems/class_servKolab.inc:233
-msgid "The given Quota settings value must be a number."
-msgstr "El valor introducido como cuota debe ser un número."
 
-#: plugins/admin/systems/class_servKolab.inc:235
-msgid "Please choose a value between 1 and 100 for Quota settings."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
+#, php-format
+msgid ""
+"You can't delete this device, it is still in use by these system(s) '%s'"
 msgstr ""
-"Por favor introduzca un valor entre 1 y 100 para el parámetro de cuota."
 
-#: plugins/admin/systems/class_servKolab.inc:237
-msgid "Future days must be a value."
-msgstr "Días futuros debe ser un valor"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
+#, fuzzy
+msgid "devices"
+msgstr "Servicios"
 
-#: plugins/admin/systems/class_servKolab.inc:241
-msgid "No SMTP privileged networks set."
-msgstr "No se han indicado redes privilegiadas SMTP."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
+#, fuzzy
+msgid "New mainbord"
+msgstr "Nueva contraseña"
 
-#: plugins/admin/systems/class_printGeneric.inc:177
-#: plugins/admin/systems/class_printGeneric.inc:184
-#: plugins/admin/systems/class_printGeneric.inc:219
-#: plugins/admin/systems/class_printGeneric.inc:240
-#: plugins/admin/systems/class_printGeneric.inc:243
-msgid "Add printer extension"
-msgstr ""
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
+#, fuzzy
+msgid "New processor"
+msgstr "Nueva contraseña"
 
-#: plugins/admin/systems/class_printGeneric.inc:178
-msgid "This is a workstation template, printer tab is disabled."
-msgstr ""
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+#, fuzzy
+msgid "New case"
+msgstr "usuarios"
 
-#: plugins/admin/systems/class_printGeneric.inc:185
-msgid "This is a terminal template, printer tab is disabled."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+msgid "C"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:220
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
 #, fuzzy
-msgid ""
-"This workstation has printer extension disabled. You can't enable it while "
-"'cn' is not present in entry. Possibly you are currently creating a new "
-"terminal template"
-msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
+msgid "New network interface"
+msgstr "Impresora de Red"
 
-#: plugins/admin/systems/class_printGeneric.inc:232
-#: plugins/admin/systems/class_printGeneric.inc:235
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
 #, fuzzy
-msgid "Remove printer extension"
-msgstr "Eliminar extensión Kolab"
+msgid "NI"
+msgstr "UNIX"
 
-#: plugins/admin/systems/class_printGeneric.inc:233
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
 #, fuzzy
-msgid ""
-"This workstation has printer extension enabled.You can disable it by "
-"clicking below."
+msgid "New ram"
+msgstr "usuarios"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+msgid "R"
 msgstr ""
-"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
-"aquí."
 
-#: plugins/admin/systems/class_printGeneric.inc:236
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
 #, fuzzy
-msgid ""
-"This terminal has printer extension enabled. You can disable it by clicking "
-"below."
+msgid "New hard disk"
+msgstr "Servidor"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+msgid "HDD"
 msgstr ""
-"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
-"aquí."
 
-#: plugins/admin/systems/class_printGeneric.inc:241
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+#, fuzzy
+msgid "New drive"
+msgstr "Servidor"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
 #, fuzzy
-msgid ""
-"This workstation has printer extension disabled. You can enable it by "
-"clicking below."
-msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
+msgid "D"
+msgstr "UID"
 
-#: plugins/admin/systems/class_printGeneric.inc:244
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
 #, fuzzy
-msgid ""
-"This terminal has printer extension disabled. You can enable it by clicking "
-"below."
+msgid "New controller"
+msgstr "Número de teléfono"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+msgid "CS"
 msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
 
-#: plugins/admin/systems/class_printGeneric.inc:283
-msgid "This 'dn' has no printer features."
-msgstr "Esta 'dn' no tiene características de impresora."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "New graphics card"
+msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:419
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "GC"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:427
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
 #, fuzzy
-msgid "can't get ppd informations."
-msgstr "Información de sistema"
+msgid "New sound card"
+msgstr "Nueva contraseña"
 
-#: plugins/admin/systems/class_printGeneric.inc:439
-#, php-format
-msgid "This printer belongs to terminal %s. You can't rename this printer."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+msgid "SC"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:441
-#, php-format
-msgid "This printer belongs to workstation %s. You can't rename this printer."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "New power supply"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:519
-msgid "You have no permissions to create a printer on this 'Base'."
-msgstr "No tiene permisos para crear una impresora en esta 'Base'."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "PS"
+msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:14
-msgid "POP3 service"
-msgstr "Servicio POP3"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+#, fuzzy
+msgid "New misc device"
+msgstr "Dispositivos de Red"
 
-#: plugins/admin/systems/servkolab.tpl:22
-msgid "POP3/SSL service"
-msgstr "Servicio POP3/SSL"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+msgid "OC"
+msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:30
-msgid "IMAP service"
-msgstr "Servicio IMAP"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:346
+#, fuzzy
+msgid "You have to specify a valid name for this device."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/servkolab.tpl:38
-msgid "IMAP/SSL service"
-msgstr "Servicio IMAP/SSL"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:366
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:369
+#, fuzzy
+msgid "This device name is already in use."
+msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/admin/systems/servkolab.tpl:46
-msgid "Sieve service"
-msgstr "Servicio Sieve"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
+#, fuzzy
+msgid "Other"
+msgstr "Filtros"
 
-#: plugins/admin/systems/servkolab.tpl:54
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+#: plugins/admin/systems/class_servService.inc:272
+msgid "Terminal server, must have fontpath specified."
 msgstr ""
-"Servicio de presencia de FTP (propio, no tiene interacción con el servicio "
-"de presencia de Kolab2)"
-
-#: plugins/admin/systems/servkolab.tpl:62
-msgid "HTTP FreeBusy service (legacy)"
-msgstr "Servicio de presencia HTTP (propio)"
-
-#: plugins/admin/systems/servkolab.tpl:70
-msgid "Amavis email scanning (virus/spam)"
-msgstr "Desinfectado de correo Amavis (virus/spam)"
-
-#: plugins/admin/systems/servkolab.tpl:81
-msgid "Quota settings"
-msgstr "Parámetros de quotas"
 
-#: plugins/admin/systems/servkolab.tpl:97
-msgid "Free/Busy settings"
-msgstr "Parámetros de Presencia"
+#: plugins/admin/systems/servRepositorySetup.tpl:15
+#, fuzzy
+msgid "Parent server"
+msgstr "Servicio de impresión"
 
-#: plugins/admin/systems/servkolab.tpl:102
-msgid "Allow unauthenticated downloading of Free/Busy information"
-msgstr "Permite descarga no autentificada de información de presencia."
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
+msgstr "Servicio de Hora"
 
-#: plugins/admin/systems/servkolab.tpl:117
-msgid "SMTP privileged networks"
-msgstr "Redes privilegiadas SMTP"
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
+msgstr "Servicio LDAP"
 
-#: plugins/admin/systems/servkolab.tpl:122
-msgid "Hosts/networks allowed to relay"
-msgstr "Equipos/Redes que son permitidos para hacer relay"
+#: plugins/admin/systems/servservice.tpl:72
+msgid "Terminal Service"
+msgstr "Servidor de terminal"
 
-#: plugins/admin/systems/servkolab.tpl:125
-msgid "Enter multiple values, seperated with"
-msgstr ""
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
+msgstr "Desactivación temporal del acceso"
 
-#: plugins/admin/systems/servkolab.tpl:138
-msgid "SMTP smarthost/relayhost"
-msgstr "SMTP smarthost/relayhos"
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
+msgstr "Ruta a las fuentes tipográficas"
 
-#: plugins/admin/systems/servkolab.tpl:144
-msgid "Enable MX lookup for relayhost"
-msgstr "Permitir búsquedas MX para los relayhost"
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
+msgstr "Servicio de Logs"
 
-#: plugins/admin/systems/servkolab.tpl:149
-msgid "Host used to relay mails"
-msgstr "Equipo usado para reenviar correos"
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
+msgstr "Servicio de impresión"
 
-#: plugins/admin/systems/servkolab.tpl:163
-msgid "Accept Internet Mail"
-msgstr "Aceptar correo desde internet"
+#: plugins/admin/systems/servservice.tpl:109
+#, fuzzy
+msgid "Mail server"
+msgstr "Servidor"
 
-#: plugins/admin/systems/servkolab.tpl:169
-msgid "Accept mail from other domains over non-authenticated SMTP"
+#: plugins/admin/systems/glpi_edit_os.tpl:1
+msgid "Manage OS-types"
 msgstr ""
-"Aceptar correo desde otros dominios que usen ninguna autentificación SMTP"
 
-#: plugins/admin/systems/phonesettings.tpl:1
+#: plugins/admin/systems/printerPPDDialog.tpl:1
 #, fuzzy
-msgid "Advanced phone settings"
-msgstr "Configuración telefónica"
+msgid "Printer driver"
+msgstr "Dispositivo de Impresión"
 
-#: plugins/admin/systems/phonesettings.tpl:6
+#: plugins/admin/systems/printerPPDDialog.tpl:9
 #, fuzzy
-msgid "Phone type"
+msgid "New driver"
+msgstr "Servidor"
+
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
 msgstr "Número de teléfono"
 
-#: plugins/admin/systems/phonesettings.tpl:7
-#: plugins/admin/systems/phonesettings.tpl:25
-#: plugins/admin/systems/phonesettings.tpl:35
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:78
-#: plugins/admin/systems/phonesettings.tpl:109
-#: plugins/admin/systems/phonesettings.tpl:156
-#, fuzzy
-msgid "Choose a phone type"
-msgstr "Elija tipo de ratón"
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
+msgid "List of available cartridge type for this type of printer"
+msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:10
-msgid "refresh"
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
+msgid ""
+"This dialog allows you to create new types of cartridges, and select one or "
+"more types for your printer. Cartridge types depends on the printer type you "
+"have selected. For each selected cartridge type there will be a new "
+"cartridge created, this allows you to select the same cartridge type for "
+"more then one printer."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:32
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
 #, fuzzy
-msgid "DTMF mode"
-msgstr "Modo"
+msgid "Display cartridge types matching"
+msgstr "Mostrar números que concuerdan con"
 
-#: plugins/admin/systems/phonesettings.tpl:46
-#: plugins/admin/systems/phonesettings.tpl:85
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
 #, fuzzy
-msgid "Default IP"
-msgstr "por defecto"
-
-#: plugins/admin/systems/phonesettings.tpl:56
-#: plugins/admin/systems/phonesettings.tpl:93
-msgid "Response timeout"
-msgstr ""
+msgid "Regular expression for matching cartridge types"
+msgstr "Expresiones regulares que concuerden con direcciones"
 
-#: plugins/admin/systems/phonesettings.tpl:75
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
 #, fuzzy
-msgid "Modus"
-msgstr "Ratón"
+msgid "Reference"
+msgstr "Referencias"
 
-#: plugins/admin/systems/phonesettings.tpl:106
-msgid "Authtype"
-msgstr ""
+#: plugins/admin/systems/class_terminalGeneric.inc:61
+msgid "text"
+msgstr "texto"
 
-#: plugins/admin/systems/phonesettings.tpl:116
-#, fuzzy
-msgid "Secret"
-msgstr "Calle"
+#: plugins/admin/systems/class_terminalGeneric.inc:62
+msgid "graphic"
+msgstr "Gráfico"
 
-#: plugins/admin/systems/phonesettings.tpl:124
-msgid "GoFonInkeys"
-msgstr ""
+#: plugins/admin/systems/class_terminalGeneric.inc:90
+#: plugins/admin/systems/class_servGeneric.inc:62
+#: plugins/admin/ogroups/class_termgroup.inc:64
+msgid "No WAKECMD definition found in your gosa.conf"
+msgstr "No se ha encontrado ninguna definición de 'WAKECMD' en 'gosa.conf'"
 
-#: plugins/admin/systems/phonesettings.tpl:132
-msgid "GoFonOutKeys"
-msgstr ""
+#: plugins/admin/systems/class_terminalGeneric.inc:102
+#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/ogroups/class_termgroup.inc:76
+msgid "No REBOOTCMD definition found in your gosa.conf"
+msgstr "No se ha encontrado ninguna definición de 'REBOOTCMD' en 'gosa.conf'"
 
-#: plugins/admin/systems/phonesettings.tpl:145
-#, fuzzy
-msgid "Account code"
-msgstr "Cuenta"
+#: plugins/admin/systems/class_terminalGeneric.inc:114
+#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/ogroups/class_termgroup.inc:88
+msgid "No HALTCMD definition found in your gosa.conf"
+msgstr "No se ha encontrado ninguna definición de 'HALTCMD' en 'gosa.conf'"
 
-#: plugins/admin/systems/phonesettings.tpl:153
-#, fuzzy
-msgid "Trunk lines"
-msgstr "Clientes Ligeros"
+#: plugins/admin/systems/class_terminalGeneric.inc:269
+msgid "You have no permissions to create a terminal on this 'Base'."
+msgstr "No tiene permisos para crear un terminal en esta 'Base'."
 
-#: plugins/admin/systems/phonesettings.tpl:168
-#, fuzzy
-msgid "Hosts that are allowed to connect"
-msgstr "Equipos/Redes que son permitidos para hacer relay"
+#: plugins/admin/systems/class_terminalGeneric.inc:273
+msgid "The required field 'Terminal name' is not set."
+msgstr " El campo requerido 'Nombre del terminal' no ha sido rellenado."
 
-#: plugins/admin/systems/phonesettings.tpl:183
+#: plugins/admin/systems/remove_glpi.tpl:10
 #, fuzzy
-msgid "Hosts that are not allowed to connect"
-msgstr "¡No tiene permisos para eliminar este componente!"
-
-#: plugins/admin/systems/phonesettings.tpl:205
-msgid "MSN"
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your MySql database in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
 msgstr ""
+"La mejor opción antes de ejecutar esta acción es haber grabado el contenido "
+"actual de su árbol LDAP en un fichero. Entonces - Y solo si lo ha hecho - "
+"presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para abortar."
 
-#: plugins/admin/systems/wingeneric.tpl:6
-msgid "Machine name"
-msgstr "Nombre de la maquina"
+#: plugins/admin/systems/class_servGeneric.inc:52
+msgid "This 'dn' has no server features."
+msgstr "Esta 'dn' no tiene características de servidor."
 
-#: plugins/admin/systems/terminalService.tpl:141
-msgid "Remote desktop"
-msgstr "Escritorio remoto"
+#: plugins/admin/systems/class_servGeneric.inc:191
+#, fuzzy
+msgid "The required field 'Server name' is not set."
+msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
 
-#: plugins/admin/systems/terminalService.tpl:145
-msgid "Connect method"
-msgstr "Método de conexión"
+#: plugins/admin/systems/class_servGeneric.inc:198
+msgid "You have no permissions to create a server on this 'Base'."
+msgstr "No tiene permisos para crear un servidor en esta 'Base'."
 
-#: plugins/admin/systems/terminalService.tpl:147
-msgid "Choose method to connect to terminal server"
-msgstr "Elija el método de conexión con el servidor de terminal"
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
+#, fuzzy
+msgid "Add/Edit manufacturer"
+msgstr "Editar entrada"
 
-#: plugins/admin/systems/terminalService.tpl:154
-msgid "Terminal server"
-msgstr "Servidor de terminal"
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
+#, fuzzy
+msgid "Website"
+msgstr "escribir"
 
-#: plugins/admin/systems/terminalService.tpl:156
-msgid "Select specific terminal server to use"
-msgstr "Seleccione específicamente que servidor de terminal usará"
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
+#: plugins/admin/ogroups/class_mailogroup.inc:137
+#: plugins/admin/ogroups/class_phonequeue.inc:690
+#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
+#: html/getxls.php:236
+#, fuzzy
+msgid "Phone number"
+msgstr "Números de teléfonos"
 
-#: plugins/admin/systems/terminalService.tpl:163
-msgid "Font server"
-msgstr "Servidor de fuentes"
+#: plugins/admin/systems/class_servDHCP.inc:36
+msgid "Remove DHCP service"
+msgstr "Eliminar servicio DHCP"
 
-#: plugins/admin/systems/terminalService.tpl:165
-msgid "Select specific font server to use"
-msgstr "Seleccione específicamente que servidor de fuentes usará"
+#: plugins/admin/systems/class_servDHCP.inc:37
+msgid ""
+"This server has DHCP features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Este servidor tiene la extensión DHCP activada. Puede desactivarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/terminalService.tpl:181
-msgid "Print device"
-msgstr "Dispositivo de Impresión"
+#: plugins/admin/systems/class_servDHCP.inc:39
+msgid "Add DHCP service"
+msgstr "Añadir servicio DHCP"
 
-#: plugins/admin/systems/terminalService.tpl:182
-msgid "Select to start IPP based printing service on terminal"
+#: plugins/admin/systems/class_servDHCP.inc:40
+msgid ""
+"This server has DHCP features disabled. You can enable them by clicking "
+"below."
 msgstr ""
-"Seleccione para iniciar el servicio de impresión basado en 'IPP' en el "
-"terminal"
+"Este servidor tiene la extensión DHCP desactivada. Puede activarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/terminalService.tpl:183
-msgid "Provide print services"
-msgstr "Proveer servicios de impresión"
+#: plugins/admin/systems/class_systemManagement.inc:32
+msgid "Systems"
+msgstr "Sistemas"
 
-#: plugins/admin/systems/terminalService.tpl:189
-msgid "Spool server"
-msgstr "Servidor de Cola"
+#: plugins/admin/systems/class_systemManagement.inc:429
+msgid "You can't edit this object type yet!"
+msgstr "¡No puede editar este tipo de objeto todavía!"
 
-#: plugins/admin/systems/terminalService.tpl:191
-msgid "Select NFS filesystem to place spool files on"
-msgstr ""
-"Seleccione un sistema de archivos 'NFS' para colocar los ficheros de la cola"
+#: plugins/admin/systems/class_systemManagement.inc:455
+msgid "Passwords entered as new and repeated do not match!"
+msgstr "!Las contraseñas introducidas como 'nuevo' y 'repetir' no son iguales¡"
 
-#: plugins/admin/systems/terminalService.tpl:212
-msgid "Select scanner driver to use"
-msgstr "Seleccione que controladores de escáner se usaran"
+#: plugins/admin/systems/class_systemManagement.inc:472
+msgid "You are not allowed to set this systems password!"
+msgstr "¡No tiene permisos para cambiar contraseñas de sistema!"
 
-#: plugins/admin/systems/remove.tpl:6
-msgid ""
-"This includes <b>all</b> system and setup informations. Please double check "
-"if your really want to do this since there is no way for GOsa to get your "
-"data back."
+#: plugins/admin/systems/class_systemManagement.inc:526
+#, php-format
+msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
-"Esto incluye <b>toda</b> la información de configuración y de sistema. Por "
-"favor pulse dos veces si realmente quiere hacer esto, ya que una vez hecho "
-"esto, no hay forma de que GOsa recupere la información."
+"Esta a punto de borrar toda la información sobre el componente en '%s'."
 
-#: plugins/admin/systems/headpage.tpl:6
-msgid "List of systems"
-msgstr "Lista de sistemas"
+#: plugins/admin/systems/class_systemManagement.inc:761
+#, fuzzy
+msgid "New Terminal template"
+msgstr "Plantilla de terminal"
 
-#: plugins/admin/systems/headpage.tpl:24
-msgid ""
-"This menu allows you to add, remove and change the properties of specific "
-"systems. You can only add systems which have already been started once."
-msgstr ""
-"Este menú permite añadir, modificar o eliminar las propiedades de sistemas "
-"específicos. Solo puede añadir sistemas que han sido ya iniciados alguna vez."
+#: plugins/admin/systems/class_systemManagement.inc:761
+#: plugins/admin/systems/class_systemManagement.inc:925
+#, fuzzy
+msgid "New Terminal"
+msgstr "Nuevo terminal"
 
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
-msgstr "Mostrar servidores"
+#: plugins/admin/systems/class_systemManagement.inc:763
+#, fuzzy
+msgid "New Workstation template"
+msgstr "Plantilla de estación de trabajo"
 
-#: plugins/admin/systems/headpage.tpl:39
-msgid "Select to see Linux terminals"
-msgstr "Seleccione para ver los terminales Linux"
+#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/systems/class_systemManagement.inc:926
+#, fuzzy
+msgid "New Workstation"
+msgstr "Nueva estación de trabajo"
 
-#: plugins/admin/systems/headpage.tpl:39
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
-msgstr "Mostrar terminales"
+#: plugins/admin/systems/class_systemManagement.inc:764
+#: plugins/admin/systems/class_systemManagement.inc:765
+#, fuzzy
+msgid "New Server"
+msgstr "Servidor"
 
-#: plugins/admin/systems/headpage.tpl:40
-msgid "Select to see Linux workstations"
-msgstr "Seleccione para ver las estaciones de trabajo Linux"
+#: plugins/admin/systems/class_systemManagement.inc:766
+#: plugins/admin/systems/class_systemManagement.inc:767
+#, fuzzy
+msgid "New Printer"
+msgstr "Impresora"
 
-#: plugins/admin/systems/headpage.tpl:40
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
-msgstr "Mostrar estaciones de trabajo"
+#: plugins/admin/systems/class_systemManagement.inc:768
+#: plugins/admin/systems/class_systemManagement.inc:769
+#, fuzzy
+msgid "New Phone"
+msgstr "Teléfono"
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Select to see MicroSoft Windows based workstations"
-msgstr "Seleccione para ver estaciones de trabajo basadas en Windows"
+#: plugins/admin/systems/class_systemManagement.inc:770
+#: plugins/admin/systems/class_systemManagement.inc:771
+#, fuzzy
+msgid "New Component"
+msgstr "Otros componentes de red"
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Show windows based workstations"
-msgstr "Mostrara estaciones de trabajo basadas en windows"
+#: plugins/admin/systems/class_systemManagement.inc:781
+#, fuzzy
+msgid "Edit system"
+msgstr "Lista de sistemas"
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Select to see network printers"
-msgstr "Seleccione para ver impresoras de red"
+#: plugins/admin/systems/class_systemManagement.inc:782
+#, fuzzy
+msgid "Delete system"
+msgstr "Borrar"
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Show network printers"
-msgstr "Mostrar impresoras de red"
+#: plugins/admin/systems/class_systemManagement.inc:792
+#, fuzzy
+msgid "System"
+msgstr "Sistemas"
 
-#: plugins/admin/systems/headpage.tpl:43
-msgid "Select to see VOIP phones"
-msgstr "Seleccione para ver teléfonos VOIP"
+#: plugins/admin/systems/class_systemManagement.inc:830
+#, fuzzy
+msgid "Cups Server"
+msgstr "Servidor"
 
-#: plugins/admin/systems/headpage.tpl:43
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
-msgstr "Mostrar teléfonos"
+#: plugins/admin/systems/class_systemManagement.inc:831
+msgid "Log Db"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:832
+#, fuzzy
+msgid "Syslog Server"
+msgstr "Servidor de Logs"
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Select to see network devices"
-msgstr "Seleccione para ver los dispositivos de red"
+#: plugins/admin/systems/class_systemManagement.inc:833
+#, fuzzy
+msgid "Mail Server"
+msgstr "Servidor"
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Show network devices"
-msgstr "Mostrar dispositivos de Red"
+#: plugins/admin/systems/class_systemManagement.inc:834
+#, fuzzy
+msgid "Imap Server"
+msgstr "Servidor de Intercambio"
 
-#: plugins/admin/systems/headpage.tpl:52
-msgid "Regular expression for matching system names"
-msgstr "Expresiones regulares para encontrar nombres de sistemas"
+#: plugins/admin/systems/class_systemManagement.inc:835
+#, fuzzy
+msgid "Nfs Server"
+msgstr "Servidor"
 
-#: plugins/admin/systems/headpage.tpl:59
+#: plugins/admin/systems/class_systemManagement.inc:836
 #, fuzzy
-msgid "Display systems of user"
-msgstr "Mostrar direcciones del usuario"
+msgid "Kerberos Server"
+msgstr "Kerberos"
 
-#: plugins/admin/systems/headpage.tpl:62
-msgid "User name of which terminal(s) are shown"
-msgstr "Nombre del usuario cuyo(s) terminal(es) son mostrados "
+#: plugins/admin/systems/class_systemManagement.inc:837
+#, fuzzy
+msgid "Asterisk Server"
+msgstr "Base de datos de usuarios Asterisk"
 
-#: plugins/admin/systems/class_componentGeneric.inc:138
+#: plugins/admin/systems/class_systemManagement.inc:838
 #, fuzzy
-msgid "The required field 'Component name' is not set."
-msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
+msgid "Fax Server"
+msgstr "Servidor"
 
-#: plugins/admin/systems/terminalStartup.tpl:35
-msgid "Select if terminal supports graphical startup with progress bar"
-msgstr "Seleccione si el terminal soporta inicio gráfico con barra de progreso"
+#: plugins/admin/systems/class_systemManagement.inc:839
+#, fuzzy
+msgid "Ldap Server"
+msgstr "Servidor de Intercambio"
 
-#: plugins/admin/systems/terminalStartup.tpl:36
-msgid "use graphical bootup"
-msgstr "Usar arranque gráfico"
+#: plugins/admin/systems/class_systemManagement.inc:872
+#, fuzzy
+msgid "Set root password"
+msgstr "Poner Contraseña"
 
-#: plugins/admin/systems/terminalStartup.tpl:38
-msgid "Select if terminal should boot in text mode"
-msgstr "Seleccione si el terminal debería arrancar en modo texto"
+#: plugins/admin/systems/class_systemManagement.inc:917
+#, fuzzy
+msgid "New System from incoming"
+msgstr "Información de sistema"
 
-#: plugins/admin/systems/terminalStartup.tpl:39
-msgid "use standard linux textual bootup"
-msgstr "Usar arranque en modo texto"
+#: plugins/admin/systems/class_systemManagement.inc:919
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:590
+#, fuzzy
+msgid "Terminal"
+msgstr "Terminales"
 
-#: plugins/admin/systems/terminalStartup.tpl:41
-msgid "Select to get more verbose output during startup"
-msgstr ""
-"Seleccione para obtener una información mas prolija durante el arranque"
+#: plugins/admin/systems/class_systemManagement.inc:920
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:589
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr "Estación de trabajo"
 
-#: plugins/admin/systems/terminalStartup.tpl:42
-msgid "use debug mode for startup"
-msgstr "Usar el modo de depuración durante el arranque"
+#: plugins/admin/systems/class_systemManagement.inc:923
+#, fuzzy
+msgid "Winstation"
+msgstr "Estación de trabajo"
 
-#: plugins/admin/systems/password.tpl:2
+#: plugins/admin/systems/class_systemManagement.inc:924
 #, fuzzy
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you "
-"wouldn't be able to log in."
-msgstr ""
-"Para cambiar la contraseña del usuario use los campos a continuación. Los "
-"cambios tomarán efecto inmediatamente. Por favor, recuerde la nueva "
-"contraseña, el usuario no podrá autenticarse sin ella."
+msgid "Network Device"
+msgstr "Dispositivos de Red"
 
-#: plugins/admin/systems/password.tpl:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:1147
+msgid "New terminal"
+msgstr "Nuevo terminal"
 
-#: plugins/admin/systems/password.tpl:9
-msgid "Changing the password impinges on authentification only."
-msgstr "Cambiar la contraseña afecta solamente a la autenticación."
+#: plugins/admin/systems/class_systemManagement.inc:1149
+msgid "New workstation"
+msgstr "Nueva estación de trabajo"
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
+#: plugins/admin/systems/class_systemManagement.inc:1151
 #, fuzzy
-msgid "Printer ppd selection."
-msgstr "Configuración telefónica"
+msgid "New Device"
+msgstr "Dispositivos de Red"
 
-#: plugins/admin/systems/servRepositorySetup.tpl:15
+#: plugins/admin/systems/class_systemManagement.inc:1168
 #, fuzzy
-msgid "Parent server"
-msgstr "Servicio de impresión"
+msgid "Terminal template for"
+msgstr "Plantilla de terminal"
 
-#: plugins/admin/systems/servRepositorySetup.tpl:33
-#: plugins/admin/systems/class_servRepository.inc:243
-#: plugins/admin/systems/class_servRepository.inc:264
-#, fuzzy
-msgid "Sections"
-msgstr "Acción"
+#: plugins/admin/systems/class_systemManagement.inc:1180
+msgid "Workstation template for"
+msgstr "Plantilla de estación de trabajo para"
 
 #: plugins/admin/systems/class_servRepositorySetup.inc:117
 #, fuzzy
@@ -9099,412 +9416,495 @@ msgstr "Por favor especifique un usuario valido."
 msgid "Please specify a valid value for 'url'."
 msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/servRepository.tpl:6
-#, fuzzy
-msgid "List of configured repositories."
-msgstr "Lista de grupos"
-
-#: plugins/admin/systems/servRepository.tpl:11
+#: plugins/admin/systems/printer.tpl:6
 #, fuzzy
-msgid "Add repository"
-msgstr "Reintentar"
+msgid "General"
+msgstr "Genérico"
 
-#: plugins/admin/systems/servRepository.tpl:29
-msgid "This menu allows you to create, delete and edit repository settings."
-msgstr ""
+#: plugins/admin/systems/printer.tpl:9
+msgid "Printer name"
+msgstr "Nombre de la impresora"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
-#, fuzzy
-msgid ""
-"This server has inventory features enabled. You can disable them by clicking "
-"below."
+#: plugins/admin/systems/printer.tpl:31
+msgid "Details"
 msgstr ""
-"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
-"aquí."
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
+#: plugins/admin/systems/printer.tpl:34
 #, fuzzy
-msgid ""
-"This server has inventory features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
+msgid "Printer location"
+msgstr "Configuración telefónica"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
-#, php-format
-msgid ""
-"Can't rename given printer type to '%s', because this type name already "
-"exists."
-msgstr ""
+#: plugins/admin/systems/printer.tpl:38
+msgid "Printer URL"
+msgstr "URL de la impresora"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
-#, php-format
-msgid "Can't delete printer type, it is still in use by '%s'."
-msgstr ""
+#: plugins/admin/systems/printer.tpl:58
+#, fuzzy
+msgid "Permissions"
+msgstr "Miembro con Permisos"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:750
+#: plugins/admin/systems/printer.tpl:65
 #, fuzzy
-msgid "since"
-msgstr "Arriba desde"
+msgid "Users which are allowed to use this printer"
+msgstr "¡No tiene permisos para eliminar esta entrada!"
 
-#: plugins/admin/systems/glpi_edit_type.tpl:1
+#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
 #, fuzzy
-msgid "Manage System-types"
-msgstr "Sistemas"
+msgid "Add user"
+msgstr "Usuario administrador"
 
-#: plugins/admin/systems/glpi_edit_type.tpl:9
-#: plugins/admin/systems/glpi_edit_type.tpl:28
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
-#: plugins/admin/systems/glpi_edit_os.tpl:9
-#: plugins/admin/systems/glpi_edit_os.tpl:28
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:8
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:29
+#: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
 #, fuzzy
-msgid "Rename"
-msgstr "Nombre del servidor"
+msgid "Add group"
+msgstr "grupos"
 
-#: plugins/admin/systems/glpi_edit_type.tpl:24
-#: plugins/admin/systems/glpi_edit_os.tpl:24
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:25
+#: plugins/admin/systems/printer.tpl:81
 #, fuzzy
-msgid "Please enter a new name"
-msgstr "Por favor especifique una dirección de servidor - URI - válida."
+msgid "Users which are allowed to administrate this printer"
+msgstr "¡No tiene permisos para eliminar esta entrada!"
 
-#: plugins/admin/systems/remove_glpi.tpl:10
+#: plugins/admin/systems/printer.tpl:82
 #, fuzzy
+msgid "Admins"
+msgstr "DN del administrador"
+
+#: plugins/admin/systems/class_servDNS.inc:181
+#: plugins/admin/systems/class_inventory.inc:36
+msgid "Remove DNS service"
+msgstr "Eliminar servicio DNS"
+
+#: plugins/admin/systems/class_servDNS.inc:182
+#: plugins/admin/systems/class_inventory.inc:37
 msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your MySql database in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
+"This server has DNS features enabled. You can disable them by clicking below."
 msgstr ""
-"La mejor opción antes de ejecutar esta acción es haber grabado el contenido "
-"actual de su árbol LDAP en un fichero. Entonces - Y solo si lo ha hecho - "
-"presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para abortar."
+"Esta servidor tiene la extensión DNS activada. Puede desactivarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/glpiManufacturer.tpl:1
-#, fuzzy
-msgid "Manage manufacturers"
-msgstr "Editar entrada"
+#: plugins/admin/systems/class_servDNS.inc:184
+#: plugins/admin/systems/class_inventory.inc:39
+msgid "Add DNS service"
+msgstr "Añadir servicio DNS"
+
+#: plugins/admin/systems/class_servDNS.inc:185
+#: plugins/admin/systems/class_inventory.inc:40
+msgid ""
+"This server has DNS features disabled. You can enable them by clicking below."
+msgstr ""
+"Este servidor tiene la extensión DNS desactivada. Puede activarla pulsando "
+"aquí."
+
+#: plugins/admin/systems/class_servDNS.inc:270
+#, php-format
+msgid ""
+"Can't delete the selected zone, because it is still in use by these entry/"
+"entries '%s'"
+msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
+#: plugins/admin/systems/class_servDNS.inc:297
 #, fuzzy
-msgid "Reference"
+msgid "Reverse zone"
 msgstr "Referencias"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
-#: plugins/admin/systems/glpi_devices.tpl:17
+#: plugins/admin/systems/class_servDNSeditZone.inc:336
 #, fuzzy
-msgid "Comments"
-msgstr "Contacto"
+msgid "This zoneName is already in use"
+msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
-#: plugins/admin/systems/glpi.tpl:63
-#: plugins/admin/systems/glpi_devices.tpl:112
-#: plugins/admin/systems/glpi_devices.tpl:153
-#: plugins/admin/systems/glpi_devices.tpl:208
-#: plugins/admin/systems/glpi_devices.tpl:264
-#: plugins/admin/systems/glpi_devices.tpl:322
-#: plugins/admin/systems/glpi_devices.tpl:386
-#: plugins/admin/systems/glpi_devices.tpl:458
-#: plugins/admin/systems/glpi_devices.tpl:522
-#: plugins/admin/systems/glpi_devices.tpl:569
-#: plugins/admin/systems/glpi_devices.tpl:622
-#: plugins/admin/systems/glpi_devices.tpl:676
-#: plugins/admin/systems/glpi_devices.tpl:722
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
+#: plugins/admin/systems/class_servDNSeditZone.inc:339
 #, fuzzy
-msgid "Comment"
-msgstr "Contacto"
+msgid "This reverse zone is already in use"
+msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
-#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
-#: plugins/admin/systems/glpi_devices.tpl:24
-#: plugins/admin/systems/glpi_devices.tpl:123
-#: plugins/admin/systems/glpi_devices.tpl:164
-#: plugins/admin/systems/glpi_devices.tpl:219
-#: plugins/admin/systems/glpi_devices.tpl:275
-#: plugins/admin/systems/glpi_devices.tpl:333
-#: plugins/admin/systems/glpi_devices.tpl:397
-#: plugins/admin/systems/glpi_devices.tpl:469
-#: plugins/admin/systems/glpi_devices.tpl:533
-#: plugins/admin/systems/glpi_devices.tpl:580
-#: plugins/admin/systems/glpi_devices.tpl:633
-#: plugins/admin/systems/glpi_devices.tpl:687
-#: plugins/admin/systems/glpi_devices.tpl:733
-msgid "Manufacturer"
+#: plugins/admin/systems/class_servDNSeditZone.inc:344
+msgid "Primary dns server must end with '.' to be a valid entry."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
-#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
-msgid "Technical responsible"
+#: plugins/admin/systems/class_servDNSeditZone.inc:348
+msgid "Your specified mail address must end with '.' to be a valid record."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:140
-#, fuzzy
-msgid "use"
-msgstr "Ratón"
-
-#: plugins/admin/systems/glpiSelectUser.tpl:23
+#: plugins/admin/systems/class_servDNSeditZone.inc:352
+#: plugins/admin/systems/class_servDNSeditZone.inc:356
 msgid ""
-"This dialog allows you to select a user as technical responsible person."
+"Your mail address contains '@' replace this with '.' to enable GOsa to "
+"create a valid SOA record."
 msgstr ""
 
-#: plugins/admin/systems/glpi_edit_os.tpl:1
-msgid "Manage OS-types"
+#: plugins/admin/systems/class_servDNSeditZone.inc:360
+msgid "Only lowercase strings are allowed as zone name."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:313
+#: plugins/admin/systems/class_servDNSeditZone.inc:364
 #, fuzzy
-msgid "The required field 'IP-address' is not set."
-msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
+msgid "Please specify a numeric value for serial number."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/class_termDNS.inc:319
-msgid "Wrong IP format in field IP-address."
-msgstr ""
+#: plugins/admin/systems/class_servDNSeditZone.inc:368
+#, fuzzy
+msgid "Please specify a numeric value for refresh."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/class_termDNS.inc:325
+#: plugins/admin/systems/class_servDNSeditZone.inc:372
 #, fuzzy
-msgid "The required field 'MAC-address' is not set."
-msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
+msgid "Please specify a numeric value for ttl."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/class_termDNS.inc:331
-msgid ""
-"The given macaddress is invalid. There must be 6 1byte segments seperated by "
-"':'."
+#: plugins/admin/systems/class_servDNSeditZone.inc:376
+#, fuzzy
+msgid "Please specify a numeric value for expire."
+msgstr "Por favor especifique un usuario valido."
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:380
+#, fuzzy
+msgid "Please specify a numeric value for retry."
+msgstr "Por favor especifique un usuario valido."
+
+#: plugins/admin/systems/servdb.tpl:6
+msgid "Kerberos kadmin access"
+msgstr "Acceso a Kerberos kadmin"
+
+#: plugins/admin/systems/servdb.tpl:10
+msgid "Kerberos Realm"
+msgstr "Dominio Kerberos"
+
+#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
+msgid "Admin user"
+msgstr "Usuario administrador"
+
+#: plugins/admin/systems/servdb.tpl:26
+msgid "FAX database"
+msgstr "Base de datos de FAX"
+
+#: plugins/admin/systems/servdb.tpl:30
+msgid "FAX DB user"
+msgstr "Base de datos de usuarios de FAX"
+
+#: plugins/admin/systems/servdb.tpl:42
+msgid "Asterisk management"
+msgstr "Gestión de Asterisk PBX"
+
+#: plugins/admin/systems/servdb.tpl:46
+msgid "Asterisk DB user"
+msgstr "Base de datos de usuarios Asterisk"
+
+#: plugins/admin/systems/servdb.tpl:54
+msgid "Country dial prefix"
+msgstr "Prefijo de marcado nacional"
+
+#: plugins/admin/systems/servdb.tpl:58
+msgid "Local dial prefix"
+msgstr "Prefijo de marcado local"
+
+#: plugins/admin/systems/servdb.tpl:70
+msgid "IMAP admin access"
+msgstr "Acceso administrador imap"
+
+#: plugins/admin/systems/servdb.tpl:74
+msgid "Server identifier"
+msgstr "Identificador de servidor"
+
+#: plugins/admin/systems/servdb.tpl:78
+msgid "Connect URL"
+msgstr "Conectar a la URL"
+
+#: plugins/admin/systems/servdb.tpl:91
+msgid "Sieve port"
+msgstr "Puerto de Sieve"
+
+#: plugins/admin/systems/servdb.tpl:100
+msgid "Logging database"
+msgstr "Base de datos de Logs"
+
+#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
+msgid "Logging DB user"
+msgstr "Base de datos de acceso de usuarios"
+
+#: plugins/admin/systems/servdb.tpl:119
+#, fuzzy
+msgid "Glpi database"
+msgstr "Base de datos de FAX"
+
+#: plugins/admin/systems/servdb.tpl:133
+#, fuzzy
+msgid "Database"
+msgstr "Bases de datos"
+
+#: plugins/admin/systems/class_printGeneric.inc:177
+#: plugins/admin/systems/class_printGeneric.inc:184
+#: plugins/admin/systems/class_printGeneric.inc:219
+#: plugins/admin/systems/class_printGeneric.inc:240
+#: plugins/admin/systems/class_printGeneric.inc:243
+msgid "Add printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:346
-#, php-format
-msgid "Found duplicate value for record type '%s'."
+#: plugins/admin/systems/class_printGeneric.inc:178
+msgid "This is a workstation template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:352
-#, php-format
-msgid "Found more than one entry for the uniqe record type '%s'."
+#: plugins/admin/systems/class_printGeneric.inc:185
+msgid "This is a terminal template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:360
-#, php-format
+#: plugins/admin/systems/class_printGeneric.inc:220
+#, fuzzy
 msgid ""
-"The device IP '%s' is added as 'A Record', this will be done automatically, "
-"please remove the record."
+"This workstation has printer extension disabled. You can't enable it while "
+"'cn' is not present in entry. Possibly you are currently creating a new "
+"terminal template"
 msgstr ""
+"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/class_termDNS.inc:366
-#: plugins/admin/systems/class_servDNSeditZone.inc:386
-#, php-format
-msgid "Only lowercase is allowed, please check your '%ss'."
-msgstr ""
+#: plugins/admin/systems/class_printGeneric.inc:232
+#: plugins/admin/systems/class_printGeneric.inc:235
+#, fuzzy
+msgid "Remove printer extension"
+msgstr "Eliminar extensión Kolab"
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
+#: plugins/admin/systems/class_printGeneric.inc:233
 #, fuzzy
-msgid "Add/Edit manufacturer"
-msgstr "Editar entrada"
+msgid ""
+"This workstation has printer extension enabled.You can disable it by "
+"clicking below."
+msgstr ""
+"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
+#: plugins/admin/systems/class_printGeneric.inc:236
 #, fuzzy
-msgid "Website"
-msgstr "escribir"
+msgid ""
+"This terminal has printer extension enabled. You can disable it by clicking "
+"below."
+msgstr ""
+"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
-#: plugins/admin/ogroups/class_mailogroup.inc:137
-#: plugins/admin/ogroups/class_phonequeue.inc:690
-#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/admin/systems/class_printGeneric.inc:241
 #, fuzzy
-msgid "Phone number"
-msgstr "Números de teléfonos"
+msgid ""
+"This workstation has printer extension disabled. You can enable it by "
+"clicking below."
+msgstr ""
+"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
-msgid "List of available cartridge type for this type of printer"
+#: plugins/admin/systems/class_printGeneric.inc:244
+#, fuzzy
+msgid ""
+"This terminal has printer extension disabled. You can enable it by clicking "
+"below."
 msgstr ""
+"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
+"aquí."
+
+#: plugins/admin/systems/class_printGeneric.inc:283
+msgid "This 'dn' has no printer features."
+msgstr "Esta 'dn' no tiene características de impresora."
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
-msgid ""
-"This dialog allows you to create new types of cartridges, and select one or "
-"more types for your printer. Cartridge types depends on the printer type you "
-"have selected. For each selected cartridge type there will be a new "
-"cartridge created, this allows you to select the same cartridge type for "
-"more then one printer."
+#: plugins/admin/systems/class_printGeneric.inc:419
+#, php-format
+msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
+#: plugins/admin/systems/class_printGeneric.inc:427
 #, fuzzy
-msgid "Display cartridge types matching"
-msgstr "Mostrar números que concuerdan con"
+msgid "can't get ppd informations."
+msgstr "Información de sistema"
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
-#, fuzzy
-msgid "Regular expression for matching cartridge types"
-msgstr "Expresiones regulares que concuerden con direcciones"
+#: plugins/admin/systems/class_printGeneric.inc:439
+#, php-format
+msgid "This printer belongs to terminal %s. You can't rename this printer."
+msgstr ""
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:58
+#: plugins/admin/systems/class_printGeneric.inc:441
 #, php-format
-msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
+msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:104
-#, fuzzy
-msgid "Please specify a name."
-msgstr "Por favor especifique un nombre de usuario valido."
+#: plugins/admin/systems/class_printGeneric.inc:519
+msgid "You have no permissions to create a printer on this 'Base'."
+msgstr "No tiene permisos para crear una impresora en esta 'Base'."
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:113
-#: plugins/admin/systems/class_glpiManufacturer.inc:119
-#, fuzzy
-msgid "Specified name is already in use, please choose another one."
-msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
+#: plugins/admin/systems/servkolab.tpl:14
+msgid "POP3 service"
+msgstr "Servicio POP3"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:6
-#, fuzzy
-msgid "List of attachments"
-msgstr "Lista de Departamentos"
+#: plugins/admin/systems/servkolab.tpl:22
+msgid "POP3/SSL service"
+msgstr "Servicio POP3/SSL"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:23
-msgid ""
-"This dialog allow you to attach additional objects (like manuals, guides, "
-"etc.)  to your currently edited computer."
+#: plugins/admin/systems/servkolab.tpl:30
+msgid "IMAP service"
+msgstr "Servicio IMAP"
+
+#: plugins/admin/systems/servkolab.tpl:38
+msgid "IMAP/SSL service"
+msgstr "Servicio IMAP/SSL"
+
+#: plugins/admin/systems/servkolab.tpl:46
+msgid "Sieve service"
+msgstr "Servicio Sieve"
+
+#: plugins/admin/systems/servkolab.tpl:54
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
 msgstr ""
+"Servicio de presencia de FTP (propio, no tiene interacción con el servicio "
+"de presencia de Kolab2)"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:35
-#, fuzzy
-msgid "Display attachments matching"
-msgstr "Mostrar Departamentos que concuerden con"
+#: plugins/admin/systems/servkolab.tpl:62
+msgid "HTTP FreeBusy service (legacy)"
+msgstr "Servicio de presencia HTTP (propio)"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:37
-#, fuzzy
-msgid "Regular expression for matching attachment names"
-msgstr "Expresiones regulares para encontrar nombres de departamentos"
+#: plugins/admin/systems/servkolab.tpl:70
+msgid "Amavis email scanning (virus/spam)"
+msgstr "Desinfectado de correo Amavis (virus/spam)"
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
-msgid "Can't delete this entry, it is still in use."
+#: plugins/admin/systems/servkolab.tpl:81
+msgid "Quota settings"
+msgstr "Parámetros de quotas"
+
+#: plugins/admin/systems/servkolab.tpl:97
+msgid "Free/Busy settings"
+msgstr "Parámetros de Presencia"
+
+#: plugins/admin/systems/servkolab.tpl:102
+msgid "Allow unauthenticated downloading of Free/Busy information"
+msgstr "Permite descarga no autentificada de información de presencia."
+
+#: plugins/admin/systems/servkolab.tpl:117
+msgid "SMTP privileged networks"
+msgstr "Redes privilegiadas SMTP"
+
+#: plugins/admin/systems/servkolab.tpl:122
+msgid "Hosts/networks allowed to relay"
+msgstr "Equipos/Redes que son permitidos para hacer relay"
+
+#: plugins/admin/systems/servkolab.tpl:125
+msgid "Enter multiple values, seperated with"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:305
-#, fuzzy
-msgid "The selected name is already in use."
-msgstr "El nombre especificado ya esta siendo usado"
+#: plugins/admin/systems/servkolab.tpl:138
+msgid "SMTP smarthost/relayhost"
+msgstr "SMTP smarthost/relayhos"
 
-#: plugins/admin/systems/glpi.tpl:9
-#: plugins/admin/systems/SelectDeviceType.tpl:20
-#, fuzzy
-msgid "System type"
-msgstr "Sistemas"
+#: plugins/admin/systems/servkolab.tpl:144
+msgid "Enable MX lookup for relayhost"
+msgstr "Permitir búsquedas MX para los relayhost"
 
-#: plugins/admin/systems/glpi.tpl:19
-#, fuzzy
-msgid "Operating system"
-msgstr "Borrar"
+#: plugins/admin/systems/servkolab.tpl:149
+msgid "Host used to relay mails"
+msgstr "Equipo usado para reenviar correos"
 
-#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
-#, fuzzy
-msgid "Contacts"
-msgstr "Contacto"
+#: plugins/admin/systems/servkolab.tpl:163
+msgid "Accept Internet Mail"
+msgstr "Aceptar correo desde internet"
 
-#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
-#, fuzzy
-msgid "Contact person"
-msgstr "Contacto"
+#: plugins/admin/systems/servkolab.tpl:169
+msgid "Accept mail from other domains over non-authenticated SMTP"
+msgstr ""
+"Aceptar correo desde otros dominios que usen ninguna autentificación SMTP"
 
-#: plugins/admin/systems/glpi.tpl:78
+#: plugins/admin/systems/phonesettings.tpl:1
 #, fuzzy
-msgid "Installed devices"
-msgstr "Dispositivos clientes"
+msgid "Advanced phone settings"
+msgstr "Configuración telefónica"
 
-#: plugins/admin/systems/glpi.tpl:90
+#: plugins/admin/systems/phonesettings.tpl:6
 #, fuzzy
-msgid "Trading"
-msgstr "Ocultamiento"
+msgid "Phone type"
+msgstr "Número de teléfono"
 
-#: plugins/admin/systems/glpi.tpl:91
+#: plugins/admin/systems/phonesettings.tpl:7
+#: plugins/admin/systems/phonesettings.tpl:25
+#: plugins/admin/systems/phonesettings.tpl:35
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:78
+#: plugins/admin/systems/phonesettings.tpl:109
+#: plugins/admin/systems/phonesettings.tpl:156
 #, fuzzy
-msgid "Software"
-msgstr "Estado"
+msgid "Choose a phone type"
+msgstr "Elija tipo de ratón"
 
-#: plugins/admin/systems/glpi.tpl:92
-#, fuzzy
-msgid "Contracts"
-msgstr "Contacto"
+#: plugins/admin/systems/phonesettings.tpl:10
+msgid "refresh"
+msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
+#: plugins/admin/systems/phonesettings.tpl:32
 #, fuzzy
-msgid "Attachments"
-msgstr "Argumentos"
+msgid "DTMF mode"
+msgstr "Modo"
 
-#: plugins/admin/systems/servdnseditzone.tpl:7
+#: plugins/admin/systems/phonesettings.tpl:46
+#: plugins/admin/systems/phonesettings.tpl:85
 #, fuzzy
-msgid "Zone name"
-msgstr "Número de teléfono"
+msgid "Default IP"
+msgstr "por defecto"
 
-#: plugins/admin/systems/servdnseditzone.tpl:13
-#, fuzzy
-msgid "Network address"
-msgstr "Dispositivos de Red"
+#: plugins/admin/systems/phonesettings.tpl:56
+#: plugins/admin/systems/phonesettings.tpl:93
+msgid "Response timeout"
+msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:24
+#: plugins/admin/systems/phonesettings.tpl:75
 #, fuzzy
-msgid "Zone entries"
-msgstr "Configuración telefónica"
+msgid "Modus"
+msgstr "Ratón"
 
-#: plugins/admin/systems/servdnseditzone.tpl:35
-#, fuzzy
-msgid "SOA record"
-msgstr "Directorio"
+#: plugins/admin/systems/phonesettings.tpl:106
+msgid "Authtype"
+msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:41
+#: plugins/admin/systems/phonesettings.tpl:116
 #, fuzzy
-msgid "Primary dns server for this zone"
-msgstr "Dirección de correo electrónica primaria para esta carpeta compartida"
+msgid "Secret"
+msgstr "Calle"
 
-#: plugins/admin/systems/servdnseditzone.tpl:53
-msgid "Serial number (automatically incremented)"
+#: plugins/admin/systems/phonesettings.tpl:124
+msgid "GoFonInkeys"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:69
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/altlinux/setup_finish.tpl:31
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr "Reintentar"
+#: plugins/admin/systems/phonesettings.tpl:132
+msgid "GoFonOutKeys"
+msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:75
+#: plugins/admin/systems/phonesettings.tpl:145
 #, fuzzy
-msgid "Expire"
-msgstr "Exportar"
+msgid "Account code"
+msgstr "Cuenta"
 
-#: plugins/admin/systems/servdnseditzone.tpl:96
+#: plugins/admin/systems/phonesettings.tpl:153
 #, fuzzy
-msgid "MxRecords"
-msgstr "Directorio"
+msgid "Trunk lines"
+msgstr "Clientes Ligeros"
 
-#: plugins/admin/systems/servdnseditzone.tpl:108
+#: plugins/admin/systems/phonesettings.tpl:168
 #, fuzzy
-msgid "Zone records"
-msgstr "Directorio"
+msgid "Hosts that are allowed to connect"
+msgstr "Equipos/Redes que son permitidos para hacer relay"
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:6
+#: plugins/admin/systems/phonesettings.tpl:183
 #, fuzzy
-msgid "List of devices"
-msgstr "Lista de usuarios"
+msgid "Hosts that are not allowed to connect"
+msgstr "¡No tiene permisos para eliminar este componente!"
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:23
-msgid ""
-"This dialog allows you to attach a device to your currently edited computer."
+#: plugins/admin/systems/phonesettings.tpl:205
+msgid "MSN"
 msgstr ""
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:35
-#, fuzzy
-msgid "Display devices matching"
-msgstr "Mostrar direcciones que concuerden con"
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
+msgstr "Nombre de la maquina"
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:37
-#, fuzzy
-msgid "Regular expression for matching device names"
-msgstr "Expresiones regulares que concuerden con nombres de usuarios"
+#: plugins/admin/systems/remove.tpl:6
+msgid ""
+"This includes <b>all</b> system and setup informations. Please double check "
+"if your really want to do this since there is no way for GOsa to get your "
+"data back."
+msgstr ""
+"Esto incluye <b>toda</b> la información de configuración y de sistema. Por "
+"favor pulse dos veces si realmente quiere hacer esto, ya que una vez hecho "
+"esto, no hay forma de que GOsa recupere la información."
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:73
 #, fuzzy, php-format
@@ -9564,482 +9964,283 @@ msgstr "Teléfono Móvil"
 msgid "This table displays all available attachments."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:222
-#, fuzzy
-msgid "empty"
-msgstr "Plantilla"
-
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
-#, fuzzy
-msgid "Create new attachment"
-msgstr "Nombre del departamento"
-
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
-#, fuzzy
-msgid "New Attachment"
-msgstr "Argumentos"
-
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:352
-#, fuzzy
-msgid "Please specify a valid name for this attachment."
-msgstr "Por favor especifique un usuario valido."
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
-#, php-format
-msgid "Internal Error can't create device of type '%s'"
-msgstr ""
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
-#, fuzzy, php-format
-msgid "You're about to delete the glpi device '%s'."
-msgstr "Está a punto de borrar el grupo '%s'."
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
-msgid "Can't detect object name."
-msgstr ""
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
-#, php-format
-msgid ""
-"You can't delete this device, it is still in use by these system(s) '%s'"
-msgstr ""
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
-#, fuzzy
-msgid "devices"
-msgstr "Servicios"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-#, fuzzy
-msgid "New monitor"
-msgstr "Nueva contraseña"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-#, fuzzy
-msgid "M"
-msgstr "Mb"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
-#, fuzzy
-msgid "New mainbord"
-msgstr "Nueva contraseña"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-#, fuzzy
-msgid "New processor"
-msgstr "Nueva contraseña"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
-#, fuzzy
-msgid "New case"
-msgstr "usuarios"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
-msgid "C"
-msgstr ""
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
-#, fuzzy
-msgid "New network interface"
-msgstr "Impresora de Red"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
-#, fuzzy
-msgid "NI"
-msgstr "UNIX"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
-#, fuzzy
-msgid "New ram"
-msgstr "usuarios"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
-msgid "R"
-msgstr ""
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
-#, fuzzy
-msgid "New hard disk"
-msgstr "Servidor"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
-msgid "HDD"
-msgstr ""
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
-#, fuzzy
-msgid "New drive"
-msgstr "Servidor"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
-#, fuzzy
-msgid "D"
-msgstr "UID"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
-#, fuzzy
-msgid "New controller"
-msgstr "Número de teléfono"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
-msgid "CS"
-msgstr ""
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
-msgid "New graphics card"
-msgstr ""
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
-msgid "GC"
-msgstr ""
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
-#, fuzzy
-msgid "New sound card"
-msgstr "Nueva contraseña"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
-msgid "SC"
-msgstr ""
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
-msgid "New power supply"
-msgstr ""
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
-msgid "PS"
-msgstr ""
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
-#, fuzzy
-msgid "New misc device"
-msgstr "Dispositivos de Red"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
-msgid "OC"
-msgstr ""
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:346
-#, fuzzy
-msgid "You have to specify a valid name for this device."
-msgstr "Por favor especifique un usuario valido."
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:366
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:369
-#, fuzzy
-msgid "This device name is already in use."
-msgstr "El nombre especificado ya esta siendo usado"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
-#, fuzzy
-msgid "Other"
-msgstr "Filtros"
-
-#: plugins/admin/systems/glpiPrinter.tpl:9
-#, fuzzy
-msgid "Printer type"
-msgstr "Nombre de la impresora"
-
-#: plugins/admin/systems/glpiPrinter.tpl:31
-#, fuzzy
-msgid "Supported interfaces"
-msgstr "Impresora de Red"
-
-#: plugins/admin/systems/glpiPrinter.tpl:38
-#, fuzzy
-msgid "Serial"
-msgstr "terminales"
-
-#: plugins/admin/systems/glpiPrinter.tpl:46
-#, fuzzy
-msgid "Parallel"
-msgstr "Variable"
-
-#: plugins/admin/systems/glpiPrinter.tpl:54
-msgid "USB"
-msgstr ""
-
-#: plugins/admin/systems/glpiPrinter.tpl:114
-#, fuzzy
-msgid "Installed cartridges"
-msgstr "Dispositivos clientes"
-
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
-#, fuzzy, php-format
-msgid "You're about to delete the glpi cartridge type '%s'."
-msgstr "Va ha eliminar la aplicación '%s'."
-
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:116
-#, php-format
-msgid ""
-"You can't delete this cartridge type, it is still in use by this printer(s) "
-"'%s'."
-msgstr ""
-
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
-msgid "Cartridges"
-msgstr ""
-
-#: plugins/admin/systems/glpi_devices.tpl:2
-#, fuzzy
-msgid "Add/Edit monitor"
-msgstr "Editar entrada"
-
-#: plugins/admin/systems/glpi_devices.tpl:33
-#, fuzzy
-msgid "Monitor size"
-msgstr "Monitor"
-
-#: plugins/admin/systems/glpi_devices.tpl:36
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:222
 #, fuzzy
-msgid "Inch"
-msgstr "Francés"
+msgid "empty"
+msgstr "Plantilla"
 
-#: plugins/admin/systems/glpi_devices.tpl:44
-msgid "Integrated microphone"
-msgstr ""
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
+#, fuzzy
+msgid "Create new attachment"
+msgstr "Nombre del departamento"
 
-#: plugins/admin/systems/glpi_devices.tpl:47
-#: plugins/admin/systems/glpi_devices.tpl:55
-#: plugins/admin/systems/glpi_devices.tpl:63
-#: plugins/admin/systems/glpi_devices.tpl:71
-#: plugins/admin/systems/glpi_devices.tpl:176
-#: plugins/admin/systems/glpi_devices.tpl:296
-#: plugins/admin/systems/glpi_devices.tpl:361
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
 #, fuzzy
-msgid "Yes"
-msgstr "Sistemas"
+msgid "New Attachment"
+msgstr "Argumentos"
 
-#: plugins/admin/systems/glpi_devices.tpl:48
-#: plugins/admin/systems/glpi_devices.tpl:56
-#: plugins/admin/systems/glpi_devices.tpl:64
-#: plugins/admin/systems/glpi_devices.tpl:72
-#: plugins/admin/systems/glpi_devices.tpl:177
-#: plugins/admin/systems/glpi_devices.tpl:297
-#: plugins/admin/systems/glpi_devices.tpl:362
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:352
 #, fuzzy
-msgid "No"
-msgstr "ninguno"
+msgid "Please specify a valid name for this attachment."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/glpi_devices.tpl:52
-msgid "Integrated speakers"
-msgstr ""
+#: plugins/admin/systems/headpage.tpl:6
+msgid "List of systems"
+msgstr "Lista de sistemas"
 
-#: plugins/admin/systems/glpi_devices.tpl:60
-msgid "Sub-D"
+#: plugins/admin/systems/headpage.tpl:24
+msgid ""
+"This menu allows you to add, remove and change the properties of specific "
+"systems. You can only add systems which have already been started once."
 msgstr ""
+"Este menú permite añadir, modificar o eliminar las propiedades de sistemas "
+"específicos. Solo puede añadir sistemas que han sido ya iniciados alguna vez."
 
-#: plugins/admin/systems/glpi_devices.tpl:68
-msgid "BNC"
-msgstr ""
+#: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
+msgstr "Mostrar servidores"
 
-#: plugins/admin/systems/glpi_devices.tpl:76
-#, fuzzy
-msgid "Serial number"
-msgstr "Nombre de terminal"
+#: plugins/admin/systems/headpage.tpl:39
+msgid "Select to see Linux terminals"
+msgstr "Seleccione para ver los terminales Linux"
 
-#: plugins/admin/systems/glpi_devices.tpl:83
-#, fuzzy
-msgid "Additional serial number"
-msgstr "Numero de serie del certificado"
+#: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
+msgstr "Mostrar terminales"
 
-#: plugins/admin/systems/glpi_devices.tpl:97
-#, fuzzy
-msgid "Add/Edit other device"
-msgstr "Tarjeta Sonido"
+#: plugins/admin/systems/headpage.tpl:40
+msgid "Select to see Linux workstations"
+msgstr "Seleccione para ver las estaciones de trabajo Linux"
 
-#: plugins/admin/systems/glpi_devices.tpl:138
-msgid "Add/Edit power supply"
-msgstr ""
+#: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
+msgstr "Mostrar estaciones de trabajo"
 
-#: plugins/admin/systems/glpi_devices.tpl:173
-msgid "Atx"
-msgstr ""
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Select to see MicroSoft Windows based workstations"
+msgstr "Seleccione para ver estaciones de trabajo basadas en Windows"
 
-#: plugins/admin/systems/glpi_devices.tpl:181
-#, fuzzy
-msgid "Power"
-msgstr "Puerto"
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Show windows based workstations"
+msgstr "Mostrara estaciones de trabajo basadas en windows"
 
-#: plugins/admin/systems/glpi_devices.tpl:193
-msgid "Add/Edit graphic card"
-msgstr ""
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Select to see network printers"
+msgstr "Seleccione para ver impresoras de red"
 
-#: plugins/admin/systems/glpi_devices.tpl:228
-#: plugins/admin/systems/glpi_devices.tpl:284
-#: plugins/admin/systems/glpi_devices.tpl:349
-msgid "Interface"
-msgstr ""
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Show network printers"
+msgstr "Mostrar impresoras de red"
 
-#: plugins/admin/systems/glpi_devices.tpl:237
-#, fuzzy
-msgid "Ram"
-msgstr "Nombre del servidor"
+#: plugins/admin/systems/headpage.tpl:43
+msgid "Select to see VOIP phones"
+msgstr "Seleccione para ver teléfonos VOIP"
 
-#: plugins/admin/systems/glpi_devices.tpl:249
-#, fuzzy
-msgid "Add/Edit controller"
-msgstr "Número de teléfono"
+#: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
+msgstr "Mostrar teléfonos"
 
-#: plugins/admin/systems/glpi_devices.tpl:307
-msgid "Add/Edit drive"
-msgstr ""
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Select to see network devices"
+msgstr "Seleccione para ver los dispositivos de red"
 
-#: plugins/admin/systems/glpi_devices.tpl:342
-#, fuzzy
-msgid "Speed"
-msgstr "Sexo"
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Show network devices"
+msgstr "Mostrar dispositivos de Red"
 
-#: plugins/admin/systems/glpi_devices.tpl:358
+#: plugins/admin/systems/headpage.tpl:52
+msgid "Regular expression for matching system names"
+msgstr "Expresiones regulares para encontrar nombres de sistemas"
+
+#: plugins/admin/systems/headpage.tpl:59
 #, fuzzy
-msgid "Writeable"
-msgstr "escribir"
+msgid "Display systems of user"
+msgstr "Mostrar direcciones del usuario"
 
-#: plugins/admin/systems/glpi_devices.tpl:371
+#: plugins/admin/systems/headpage.tpl:62
+msgid "User name of which terminal(s) are shown"
+msgstr "Nombre del usuario cuyo(s) terminal(es) son mostrados "
+
+#: plugins/admin/systems/glpiAttachmentPool.tpl:6
 #, fuzzy
-msgid "Add/Edit harddisk"
-msgstr "Servidor"
+msgid "List of attachments"
+msgstr "Lista de Departamentos"
 
-#: plugins/admin/systems/glpi_devices.tpl:406
-msgid "Rpm"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:23
+msgid ""
+"This dialog allow you to attach additional objects (like manuals, guides, "
+"etc.)  to your currently edited computer."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:413
+#: plugins/admin/systems/glpiAttachmentPool.tpl:35
 #, fuzzy
-msgid "Cache"
-msgstr "Cancelar"
+msgid "Display attachments matching"
+msgstr "Mostrar Departamentos que concuerden con"
 
-#: plugins/admin/systems/glpi_devices.tpl:443
+#: plugins/admin/systems/glpiAttachmentPool.tpl:37
 #, fuzzy
-msgid "Add/Edit memory"
-msgstr "Editar entrada"
+msgid "Regular expression for matching attachment names"
+msgstr "Expresiones regulares para encontrar nombres de departamentos"
 
-#: plugins/admin/systems/glpi_devices.tpl:478
+#: plugins/admin/systems/password.tpl:2
 #, fuzzy
-msgid "Frequenz"
-msgstr "Número de teléfono"
+msgid ""
+"To change the terminal root password use the fields below. The changes take "
+"effect during the next reboot. Please memorize the new password, because you "
+"wouldn't be able to log in."
+msgstr ""
+"Para cambiar la contraseña del usuario use los campos a continuación. Los "
+"cambios tomarán efecto inmediatamente. Por favor, recuerde la nueva "
+"contraseña, el usuario no podrá autenticarse sin ella."
 
-#: plugins/admin/systems/glpi_devices.tpl:507
-#, fuzzy
-msgid "Add/Edit sound card"
-msgstr "Nueva contraseña"
+#: plugins/admin/systems/password.tpl:5
+msgid "Leave fields blank for password inheritance from default entries."
+msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:553
-#, fuzzy
-msgid "Add/Edit network interface"
-msgstr "Impresora de Red"
+#: plugins/admin/systems/password.tpl:9
+msgid "Changing the password impinges on authentification only."
+msgstr "Cambiar la contraseña afecta solamente a la autenticación."
 
-#: plugins/admin/systems/glpi_devices.tpl:589
-#, fuzzy
-msgid "MAC address"
-msgstr "Dirección MAC"
+#: 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/glpi_devices.tpl:607
-#, fuzzy
-msgid "Add/Edit processor"
-msgstr "Nueva contraseña"
+#: 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/glpi_devices.tpl:642
-#, fuzzy
-msgid "Frequence"
-msgstr "Número de teléfono"
+#: plugins/admin/systems/chooser.tpl:7
+msgid "Linux thin client template"
+msgstr "Plantilla de clientes ligeros Linux"
 
-#: plugins/admin/systems/glpi_devices.tpl:649
-#, fuzzy
-msgid "Default frequence"
-msgstr "Valor por defecto"
+#: plugins/admin/systems/chooser.tpl:8
+msgid "Linux workstation template"
+msgstr "Plantilla de estaciones de trabajo linux"
 
-#: plugins/admin/systems/glpi_devices.tpl:661
-#, fuzzy
-msgid "Add/Edit motherboard"
-msgstr "Teclado"
+#: 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/glpi_devices.tpl:696
-#, fuzzy
-msgid "Chipset"
-msgstr "Borrar"
+#: plugins/admin/systems/chooser.tpl:11
+msgid "Network printer"
+msgstr "Impresora de Red"
 
-#: plugins/admin/systems/glpi_devices.tpl:707
-#, fuzzy
-msgid "Add/Edit computer case"
-msgstr "incompleto"
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
+msgstr "Otros componentes de red"
 
-#: plugins/admin/systems/glpi_devices.tpl:742
-#, fuzzy
-msgid "format"
-msgstr "Puerto"
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
+msgstr "Crear"
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
-#, fuzzy
-msgid "Attachment"
-msgstr "Argumentos"
+#: plugins/admin/systems/class_glpiManufacturer.inc:58
+#, php-format
+msgid ""
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
+msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
+#: plugins/admin/systems/class_glpiManufacturer.inc:104
 #, fuzzy
-msgid "Filename"
-msgstr "Nombre del servidor"
+msgid "Please specify a name."
+msgstr "Por favor especifique un nombre de usuario valido."
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
+#: plugins/admin/systems/class_glpiManufacturer.inc:113
+#: plugins/admin/systems/class_glpiManufacturer.inc:119
 #, fuzzy
-msgid "Mime-type"
-msgstr "Tipo"
+msgid "Specified name is already in use, please choose another one."
+msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:336
+#: plugins/admin/systems/class_phoneGeneric.inc:105
+msgid "This 'dn' has no phone features."
+msgstr "Esta 'dn' no tiene características de teléfono."
+
+#: plugins/admin/systems/class_phoneGeneric.inc:202
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
 #, fuzzy
-msgid "This zoneName is already in use"
-msgstr "El nombre especificado ya esta siendo usado"
+msgid "yes"
+msgstr "Sistemas"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:339
+#: plugins/admin/systems/class_phoneGeneric.inc:202
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
 #, fuzzy
-msgid "This reverse zone is already in use"
-msgstr "El nombre especificado ya esta siendo usado"
+msgid "no"
+msgstr "ninguno"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:344
-msgid "Primary dns server must end with '.' to be a valid entry."
+#: plugins/admin/systems/class_phoneGeneric.inc:223
+msgid "dynamic"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:348
-msgid "Your specified mail address must end with '.' to be a valid record."
-msgstr ""
+#: plugins/admin/systems/class_phoneGeneric.inc:223
+#, fuzzy
+msgid "Networksettings"
+msgstr "Configuración de red"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:352
-#: plugins/admin/systems/class_servDNSeditZone.inc:356
+#: plugins/admin/systems/class_phoneGeneric.inc:238
+#, php-format
 msgid ""
-"Your mail address contains '@' replace this with '.' to enable GOsa to "
-"create a valid SOA record."
+"Can't delete because there are user which are depending on this phone. One "
+"of them is user '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:360
-msgid "Only lowercase strings are allowed as zone name."
+#: plugins/admin/systems/class_phoneGeneric.inc:294
+#, fuzzy
+msgid "The required field 'Phone name' is not set."
+msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
+
+#: plugins/admin/systems/class_phoneGeneric.inc:297
+msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:364
+#: plugins/admin/systems/class_phoneGeneric.inc:304
+msgid "You have no permissions to create a phone on this 'Base'."
+msgstr "No tiene permisos para crear un teléfono en esta 'Base'."
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
 #, fuzzy
-msgid "Please specify a numeric value for serial number."
-msgstr "Por favor especifique un usuario valido."
+msgid "Printer ppd selection."
+msgstr "Configuración telefónica"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:368
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
 #, fuzzy
-msgid "Please specify a numeric value for refresh."
-msgstr "Por favor especifique un usuario valido."
+msgid "Select entries to add"
+msgstr "Seleccione usuarios que serán añadidos"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:372
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
 #, fuzzy
-msgid "Please specify a numeric value for ttl."
-msgstr "Por favor especifique un usuario valido."
+msgid "Display members of department"
+msgstr "Mostrar número de Departamentos"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:376
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
 #, fuzzy
-msgid "Please specify a numeric value for expire."
-msgstr "Por favor especifique un usuario valido."
+msgid "Display members matching"
+msgstr "Mostrar números que concuerdan con"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:380
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
 #, fuzzy
-msgid "Please specify a numeric value for retry."
-msgstr "Por favor especifique un usuario valido."
+msgid "Regular expression for matching member names"
+msgstr "Expresiones regulares que concuerden con nombres de usuarios"
 
 #: plugins/admin/systems/SelectDeviceType.tpl:3
 msgid ""
@@ -10120,62 +10321,22 @@ msgstr "No hay protocolo de correo %s configurado en su 'gosa.conf'."
 msgid "There is a duplicate entry in '%s' for '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:97
-#, fuzzy
-msgid "Remove FAI repository extension."
-msgstr "Eliminar extensión Kolab"
-
-#: plugins/admin/systems/class_servRepository.inc:98
-#, fuzzy
-msgid ""
-"This server has FAI repository features enabled. You can disable them by "
-"clicking below."
-msgstr ""
-"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
-"aquí."
-
-#: plugins/admin/systems/class_servRepository.inc:100
-msgid "Add FAI repository extension."
-msgstr ""
-
-#: plugins/admin/systems/class_servRepository.inc:101
-#, fuzzy
-msgid ""
-"This server has FAI repository features disabled. You can enable them by "
-"clicking below."
-msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
-
-#: plugins/admin/systems/class_servRepository.inc:144
-#, php-format
-msgid ""
-"You can't delete this release, it is still used by these workstations [%s]. "
-"Please solve this dependencies first, to keep data base consistency."
-msgstr ""
-
-#: plugins/admin/systems/class_servRepository.inc:176
-#, php-format
-msgid ""
-"Be careful editing this release, it is still used by these workstations [%s]."
-msgstr ""
-
 #: plugins/admin/systems/class_baseSelectDialog.inc:23
 #, fuzzy
 msgid "Choose a base"
 msgstr "Elija tipo de ratón"
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:33
+#: plugins/admin/systems/class_baseSelectDialog.inc:34
 msgid ""
 "Step in the prefered tree and click save to use the current subtree as base. "
 "Or click the image at the end of each entry."
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:50
+#: plugins/admin/systems/class_baseSelectDialog.inc:51
 msgid "Filter entries with this syntax"
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:114
+#: plugins/admin/systems/class_baseSelectDialog.inc:115
 #, fuzzy, php-format
 msgid "Select this base"
 msgstr "Borrar"
@@ -10282,54 +10443,6 @@ msgstr ""
 msgid "Select action to execute for this   group of terminals"
 msgstr "Seleccione una acción que se ejecutara en este grupo de terminales"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
-msgid "Object groups"
-msgstr "Grupos de objetos"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:54
-msgid "UNIX accounts"
-msgstr "Cuentas UNIX"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:58 html/getxls.php:149
-#: html/getxls.php:151 html/getxls.php:158 html/getxls.php:179
-#: html/getxls.php:245 html/getxls.php:316
-msgid "Servers"
-msgstr "Servidores"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:59
-msgid "Thin Clients"
-msgstr "Clientes Ligeros"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:60
-msgid "Workstations"
-msgstr "Estaciones de trabajo"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:279
-#, php-format
-msgid "You're about to delete the object group '%s'."
-msgstr "Has decidido eliminar el objeto grupo '%s'."
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:285
-#: plugins/admin/ogroups/class_ogroupManagement.inc:311
-msgid "You are not allowed to delete this object group!"
-msgstr "¡No tiene permisos para eliminar este objeto grupo!"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:448
-#, fuzzy
-msgid "Create new object group"
-msgstr "Grupo de objetos"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:492
-#, fuzzy
-msgid "Name of object groups"
-msgstr "Nombre del grupo"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:541
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
-msgstr "Grupo de objetos"
-
 #: plugins/admin/ogroups/class_ogroup.inc:144
 msgid "This 'dn' is no object group."
 msgstr "Este 'dn' no es un objeto tipo grupo."
@@ -10391,6 +10504,54 @@ msgstr "Ya existe un usuario con este 'Login' en la base de datos."
 msgid "You can combine two different object types at maximum only!"
 msgstr "¡Solo se pueden combinar dos objetos diferentes hasta un máximo!"
 
+#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+msgid "Object groups"
+msgstr "Grupos de objetos"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:54
+msgid "UNIX accounts"
+msgstr "Cuentas UNIX"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:58 html/getxls.php:149
+#: html/getxls.php:151 html/getxls.php:158 html/getxls.php:179
+#: html/getxls.php:245 html/getxls.php:316
+msgid "Servers"
+msgstr "Servidores"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:59
+msgid "Thin Clients"
+msgstr "Clientes Ligeros"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:60
+msgid "Workstations"
+msgstr "Estaciones de trabajo"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:279
+#, php-format
+msgid "You're about to delete the object group '%s'."
+msgstr "Has decidido eliminar el objeto grupo '%s'."
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:285
+#: plugins/admin/ogroups/class_ogroupManagement.inc:311
+msgid "You are not allowed to delete this object group!"
+msgstr "¡No tiene permisos para eliminar este objeto grupo!"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:449
+#, fuzzy
+msgid "Create new object group"
+msgstr "Grupo de objetos"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:493
+#, fuzzy
+msgid "Name of object groups"
+msgstr "Nombre del grupo"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:542
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
+msgstr "Grupo de objetos"
+
 #: plugins/admin/ogroups/generic.tpl:9
 msgid "Name of the group"
 msgstr "Nombre del grupo"
@@ -10724,6 +10885,82 @@ msgstr ""
 msgid "Ring instead of playing background music"
 msgstr ""
 
+#: plugins/gofon/fonreports/class_fonreport.inc:6
+msgid "Phone Reports"
+msgstr "Informes telefónicos"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:96
+#: plugins/gofon/fonreports/class_fonreport.inc:106
+#, fuzzy
+msgid "Can't connect to phone database, no reports can be shown!"
+msgstr ""
+"No puedo conectar a la de base de datos de fax, ¡no se pueden mostrar los "
+"informes!"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:110
+#, fuzzy
+msgid "Can't select phone database for report generation!"
+msgstr ""
+"¡No puedo seleccionar la base de datos de fax para la generación de informes!"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:212
+msgid "Query for phone database failed!"
+msgstr "¡La consulta a la base de datos de teléfonos ha fallado!"
+
+#: plugins/gofon/fonreports/contents.tpl:31
+msgid "Source"
+msgstr "Fuente"
+
+#: plugins/gofon/fonreports/contents.tpl:32
+msgid "Destination"
+msgstr "Destino"
+
+#: plugins/gofon/fonreports/contents.tpl:33
+msgid "Channel"
+msgstr "Canal"
+
+#: plugins/gofon/fonreports/contents.tpl:36
+msgid "Duration"
+msgstr "Duración"
+
+#: plugins/gofon/fonreports/main.inc:5
+msgid "Phone reports"
+msgstr "Informes telefónicos"
+
+#: plugins/gofon/macro/parameter.tpl:3
+#, fuzzy
+msgid "Argument"
+msgstr "Argumentos"
+
+#: plugins/gofon/macro/parameter.tpl:7
+#, fuzzy
+msgid "type"
+msgstr "Tipo"
+
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+#, fuzzy
+msgid "Macro name"
+msgstr "Nombre de la maquina"
+
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
+msgstr ""
+
+#: plugins/gofon/macro/generic.tpl:22
+#, fuzzy
+msgid "Choose subtree to place macro in"
+msgstr "Elija lugar del árbol para colocar la aplicación"
+
+#: plugins/gofon/macro/generic.tpl:43
+#, fuzzy
+msgid "Visible for user"
+msgstr "Lista de usuarios"
+
+#: plugins/gofon/macro/generic.tpl:52
+#, fuzzy
+msgid "Macro text"
+msgstr "Nombre de la maquina"
+
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:25
 #, fuzzy
 msgid "Phone macros"
@@ -10740,31 +10977,31 @@ msgstr "Está a punto de borrar el grupo '%s'."
 msgid "You are not allowed to delete this macro!"
 msgstr "¡No le está permitido eliminar este grupo!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
 #, fuzzy
 msgid "Create new phone macro"
 msgstr "Crear cuenta telefónica"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
 #, fuzzy
 msgid "Visible"
 msgstr "Variable"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:348
 msgid "This table displays all phone macros, in the selected tree."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
 #, fuzzy
 msgid "Macro"
 msgstr "Nombre de la maquina"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
 #, fuzzy
 msgid "visible"
 msgstr "Visible Publicamente"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
 #, fuzzy
 msgid "invisible"
 msgstr "Visible Publicamente"
@@ -10845,29 +11082,36 @@ msgstr ""
 msgid "Please choose a valid  base."
 msgstr "Por favor especifique un rango VSync valido"
 
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+#: plugins/gofon/macro/headpage.tpl:6
 #, fuzzy
-msgid "Macro name"
-msgstr "Nombre de la maquina"
+msgid "List of macros"
+msgstr "Lista de grupos"
 
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
+#: plugins/gofon/macro/headpage.tpl:24
+#, fuzzy
+msgid ""
+"This menu allows you to add, edit and remove selected macros. You may want "
+"to use the range selector on top of the macro listbox, when working with a "
+"large number of macros."
 msgstr ""
+"Este menú permite añadir, editar o eliminar los grupos seleccionados. Puede "
+"usar el selector de rango en la parte superior de la lista de grupos, cuando "
+"trabaja con un gran número de grupos."
 
-#: plugins/gofon/macro/generic.tpl:22
+#: plugins/gofon/macro/headpage.tpl:38
 #, fuzzy
-msgid "Choose subtree to place macro in"
-msgstr "Elija lugar del árbol para colocar la aplicación"
+msgid "Display macros matching"
+msgstr "Mostrar grupos que concuerden con"
 
-#: plugins/gofon/macro/generic.tpl:43
+#: plugins/gofon/macro/headpage.tpl:38
 #, fuzzy
-msgid "Visible for user"
-msgstr "Lista de usuarios"
+msgid "Display macros  matching"
+msgstr "Mostrar grupos que concuerden con"
 
-#: plugins/gofon/macro/generic.tpl:52
+#: plugins/gofon/macro/headpage.tpl:41
 #, fuzzy
-msgid "Macro text"
-msgstr "Nombre de la maquina"
+msgid "Regular expression for matching macro names"
+msgstr "Expresión regular que concuerde con nombres de grupos"
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:245
 #, fuzzy
@@ -10910,51 +11154,15 @@ msgid ""
 "using this macro '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:6
-#, fuzzy
-msgid "List of macros"
-msgstr "Lista de grupos"
-
-#: plugins/gofon/macro/headpage.tpl:24
-#, fuzzy
-msgid ""
-"This menu allows you to add, edit and remove selected macros. You may want "
-"to use the range selector on top of the macro listbox, when working with a "
-"large number of macros."
-msgstr ""
-"Este menú permite añadir, editar o eliminar los grupos seleccionados. Puede "
-"usar el selector de rango en la parte superior de la lista de grupos, cuando "
-"trabaja con un gran número de grupos."
-
-#: plugins/gofon/macro/headpage.tpl:38
-#, fuzzy
-msgid "Display macros matching"
-msgstr "Mostrar grupos que concuerden con"
-
-#: plugins/gofon/macro/headpage.tpl:38
-#, fuzzy
-msgid "Display macros  matching"
-msgstr "Mostrar grupos que concuerden con"
-
-#: plugins/gofon/macro/headpage.tpl:41
-#, fuzzy
-msgid "Regular expression for matching macro names"
-msgstr "Expresión regular que concuerde con nombres de grupos"
-
 #: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
 #, fuzzy
 msgid "Phone macro management"
 msgstr "Gestión del sistema"
 
-#: plugins/gofon/macro/parameter.tpl:3
-#, fuzzy
-msgid "Argument"
-msgstr "Argumentos"
-
-#: plugins/gofon/macro/parameter.tpl:7
-#, fuzzy
-msgid "type"
-msgstr "Tipo"
+#: plugins/gofon/phoneaccount/main.inc:122
+#: plugins/gofon/phoneaccount/paste_generic.tpl:1
+msgid "Phone settings"
+msgstr "Configuración telefónica"
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:118
 #, fuzzy
@@ -11087,50 +11295,6 @@ msgstr "Teléfono"
 msgid "Phone macro"
 msgstr "Informes telefónicos"
 
-#: plugins/gofon/phoneaccount/main.inc:122
-#: plugins/gofon/phoneaccount/paste_generic.tpl:1
-msgid "Phone settings"
-msgstr "Configuración telefónica"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
-#, 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_phoneConferenceManagment.inc:289
-#, fuzzy
-msgid "Create new conference"
-msgstr "Crear una nueva entrada en"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
-#, fuzzy
-msgid "New conference"
-msgstr "Número de teléfono"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
-msgid "This table displays all available conference rooms."
-msgstr ""
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:309
-#, fuzzy
-msgid "Name - Number"
-msgstr "Número de teléfono"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
-#: plugins/gofon/conference/generic.tpl:107
-msgid "PIN"
-msgstr ""
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:365
-#, fuzzy
-msgid "Conference"
-msgstr "Referencias"
-
 #: plugins/gofon/conference/generic.tpl:13
 #, fuzzy
 msgid "Conference name"
@@ -11156,6 +11320,11 @@ msgstr ""
 msgid "Preset PIN"
 msgstr "presente"
 
+#: plugins/gofon/conference/generic.tpl:107
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
+msgid "PIN"
+msgstr ""
+
 #: plugins/gofon/conference/generic.tpl:113
 #, fuzzy
 msgid "Record conference"
@@ -11180,8 +11349,63 @@ msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:156
 #, fuzzy
-msgid "Count users"
-msgstr "Pais"
+msgid "Count users"
+msgstr "Pais"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+#, 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_phoneConferenceManagment.inc:290
+#, fuzzy
+msgid "Create new conference"
+msgstr "Crear una nueva entrada en"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
+#, fuzzy
+msgid "New conference"
+msgstr "Número de teléfono"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:306
+msgid "This table displays all available conference rooms."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
+#, fuzzy
+msgid "Name - Number"
+msgstr "Número de teléfono"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:366
+#, fuzzy
+msgid "Conference"
+msgstr "Referencias"
+
+#: plugins/gofon/conference/headpage.tpl:6
+#, fuzzy
+msgid "List of conference rooms"
+msgstr "Lista de grupos"
+
+#: plugins/gofon/conference/headpage.tpl:24
+#, fuzzy
+msgid ""
+"This menu allows you to create, delete and edit selected phone conferences. "
+"Having a large number of phone conferences, you might prefer the range "
+"selectors on top of the conferences list."
+msgstr ""
+"Este menú permite añadir, editar o eliminar los departamentos seleccionados. "
+"Puede usar el selector de rango en la parte superior de la lista de "
+"departamentos, cuando trabaja con un gran número de departamentos."
+
+#: plugins/gofon/conference/headpage.tpl:36
+#, fuzzy
+msgid "Regular expression for        matching user names"
+msgstr "Expresiones regulares que concuerden con nombres de usuarios"
 
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
 msgid ""
@@ -11214,74 +11438,11 @@ msgid ""
 "extension available in your php setup."
 msgstr ""
 
-#: plugins/gofon/conference/headpage.tpl:6
-#, fuzzy
-msgid "List of conference rooms"
-msgstr "Lista de grupos"
-
-#: plugins/gofon/conference/headpage.tpl:24
-#, fuzzy
-msgid ""
-"This menu allows you to create, delete and edit selected phone conferences. "
-"Having a large number of phone conferences, you might prefer the range "
-"selectors on top of the conferences list."
-msgstr ""
-"Este menú permite añadir, editar o eliminar los departamentos seleccionados. "
-"Puede usar el selector de rango en la parte superior de la lista de "
-"departamentos, cuando trabaja con un gran número de departamentos."
-
-#: plugins/gofon/conference/headpage.tpl:36
-#, fuzzy
-msgid "Regular expression for        matching user names"
-msgstr "Expresiones regulares que concuerden con nombres de usuarios"
-
 #: plugins/gofon/conference/main.inc:38 plugins/gofon/conference/main.inc:40
 #, fuzzy
 msgid "Conference management"
 msgstr "Mantenimiento de Departamentos"
 
-#: plugins/gofon/fonreports/class_fonreport.inc:6
-msgid "Phone Reports"
-msgstr "Informes telefónicos"
-
-#: plugins/gofon/fonreports/class_fonreport.inc:96
-#: plugins/gofon/fonreports/class_fonreport.inc:106
-#, fuzzy
-msgid "Can't connect to phone database, no reports can be shown!"
-msgstr ""
-"No puedo conectar a la de base de datos de fax, ¡no se pueden mostrar los "
-"informes!"
-
-#: plugins/gofon/fonreports/class_fonreport.inc:110
-#, fuzzy
-msgid "Can't select phone database for report generation!"
-msgstr ""
-"¡No puedo seleccionar la base de datos de fax para la generación de informes!"
-
-#: plugins/gofon/fonreports/class_fonreport.inc:212
-msgid "Query for phone database failed!"
-msgstr "¡La consulta a la base de datos de teléfonos ha fallado!"
-
-#: plugins/gofon/fonreports/contents.tpl:31
-msgid "Source"
-msgstr "Fuente"
-
-#: plugins/gofon/fonreports/contents.tpl:32
-msgid "Destination"
-msgstr "Destino"
-
-#: plugins/gofon/fonreports/contents.tpl:33
-msgid "Channel"
-msgstr "Canal"
-
-#: plugins/gofon/fonreports/contents.tpl:36
-msgid "Duration"
-msgstr "Duración"
-
-#: plugins/gofon/fonreports/main.inc:5
-msgid "Phone reports"
-msgstr "Informes telefónicos"
-
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
 msgstr "Cliente ligero"
@@ -11327,29 +11488,78 @@ msgstr "El equipo de GOsa"
 msgid "Welcome %s!"
 msgstr "¡Bienvenido %s!"
 
-#: include/class_plugin.inc:465
-#, php-format
+#: include/class_mail-methods-cyrus.inc:39
 msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+"Warning: Account has an invalid mailserver string! Please check the mail "
+"server settings in the mail tab."
 msgstr ""
-"El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
-"parece existir."
 
-#: include/class_plugin.inc:493 include/class_password-methods.inc:181
-#, php-format
+#: include/class_mail-methods-cyrus.inc:52
 msgid ""
-"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+"Warning: IMAP Server cannot be reached! If you save this account, some mail "
+"settings will not be stored on your server!"
 msgstr ""
-"El comando '%s', especificado como POSTMODIFY para la extensión '%s' no "
-"parece existir."
+"Aviso: ¡No se puede acceder al servidor IMAP! Si guarda esta cuenta, algunos "
+"de los valores de la configuración del correo no serán guardados en el "
+"servidor"
 
-#: include/class_plugin.inc:521
+#: include/class_mail-methods-cyrus.inc:115
 #, php-format
-msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgid "Can't create IMAP mailbox. Server says '%s'."
 msgstr ""
-"El comando '%s', especificado como POSTREMOVE para la extensión '%s' no "
-"parece existir."
+"No se pueden crear carpetas de correo IMAP. El error del servidor es: '%s'"
+
+#: include/class_mail-methods-cyrus.inc:131
+#, php-format
+msgid "Can't write IMAP quota. Server says '%s'."
+msgstr "No se puede activar una cuota IMAP. El error del servidor es: '%s'"
+
+#: include/class_mail-methods-cyrus.inc:155
+#, fuzzy
+msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
+msgstr ""
+"Aviso: imap_getacl no ha sido implementado, no se modificara información "
+"sobre las listas de acceso."
+
+#: include/class_mail-methods-cyrus.inc:173
+msgid "Warning: imap_getacl is not available, can't get imap permissions!"
+msgstr ""
+"Aviso: no esta disponible imap_getacl, ¡no se puede acceder a los permisos "
+"IMAP!"
+
+#: include/class_mail-methods-cyrus.inc:195
+#, php-format
+msgid "Can't remove IMAP mailbox. Server says '%s'."
+msgstr ""
+"No se puede eliminar la carpeta de correo IMAP. El error del servidor es: '%"
+"s'"
+
+#: include/class_mail-methods-cyrus.inc:223
+#, php-format
+msgid "Can't log into SIEVE server. Server says '%s'."
+msgstr "No se puede conectar al servidor SIEVE. El error del servidor es: '%s'"
+
+#: include/class_mail-methods-cyrus.inc:236
+#, php-format
+msgid "Can't get sieve script. Server says '%s'."
+msgstr "No puedo ejecutar un 'script' SIEVE. El error del servidor es: '%s'"
+
+#: include/class_mail-methods-cyrus.inc:307
+#, php-format
+msgid "Can't send sieve script. Server says '%s'."
+msgstr "No puedo subir un 'script' SIEVE. El error del servidor es: '%s'"
+
+#: include/class_mail-methods-cyrus.inc:311
+#, php-format
+msgid "Can't activate GOsa sieve script. Server says '%s'."
+msgstr ""
+"No se puede activar el 'script GOsa para SIEVE'. El error del servidor es: '%"
+"s'"
+
+#: include/class_debconfTemplate.inc:250
+#, fuzzy
+msgid "This package has no debconf options."
+msgstr "Esta cuenta no tiene extensiones telefónicas"
 
 #: include/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
@@ -11858,6 +12068,7 @@ msgstr "No se puede conectar al servidor LDAP. El motivo fue: %s."
 #: include/functions_setup.inc:1082 html/index.php:181
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
+#: ihtml/themes/lhs/setup_useradmin.tpl:6
 msgid ""
 "You're missing an administrative account for GOsa, you'll not be able to "
 "administrate anything!"
@@ -11870,6 +12081,14 @@ msgid "Setting the password failed. LDAP server says '%s'."
 msgstr ""
 "Fallo al tratar de configurar la contraseña. El servidor LDAP contesto '%s'."
 
+#: include/class_password-methods.inc:181 include/class_plugin.inc:493
+#, php-format
+msgid ""
+"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+msgstr ""
+"El comando '%s', especificado como POSTMODIFY para la extensión '%s' no "
+"parece existir."
+
 #: include/class_password-methods.inc:202
 msgid ""
 "Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
@@ -11910,23 +12129,6 @@ msgstr ""
 msgid "%s%% hit rate in file %s"
 msgstr ""
 
-#: include/class_password-methods-kerberos.inc:43
-msgid ""
-"Warning: Can't set kerberos password. Your PHP version has no kerberos "
-"support, password has not been changed."
-msgstr ""
-"Aviso: No se puede poner la contraseña Kerberos. Su versión de PHP no tiene "
-"soporte Kerberos, la contraseña no ha sido cambiada."
-
-#: include/class_password-methods-kerberos.inc:52
-msgid "Kerberos database communication failed!"
-msgstr "¡La comunicación con la base de datos Kerberos fallo!."
-
-#: include/class_password-methods-kerberos.inc:59
-msgid "Changing password in kerberos database failed!"
-msgstr ""
-"¡Fallo al tratar de cambiar la contraseña en la base de datos de kerberos!."
-
 #: include/class_ppdManager.inc:13
 #, php-format
 msgid "PPD manager : The specified path '%s' doesn't exists."
@@ -11966,6 +12168,23 @@ msgstr ""
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 
+#: include/class_password-methods-kerberos.inc:43
+msgid ""
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
+msgstr ""
+"Aviso: No se puede poner la contraseña Kerberos. Su versión de PHP no tiene "
+"soporte Kerberos, la contraseña no ha sido cambiada."
+
+#: include/class_password-methods-kerberos.inc:52
+msgid "Kerberos database communication failed!"
+msgstr "¡La comunicación con la base de datos Kerberos fallo!."
+
+#: include/class_password-methods-kerberos.inc:59
+msgid "Changing password in kerberos database failed!"
+msgstr ""
+"¡Fallo al tratar de cambiar la contraseña en la base de datos de kerberos!."
+
 #: include/class_certificate.inc:35
 msgid "Can't open specified file, check accessibility and or existence"
 msgstr ""
@@ -12171,6 +12390,7 @@ msgstr ""
 #: include/class_pluglist.inc:130 ihtml/themes/altlinux/framework.tpl:14
 #: ihtml/themes/altlinux/framework.tpl:24
 #: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
+#: ihtml/themes/lhs/framework.tpl:14 ihtml/themes/lhs/framework.tpl:24
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
 "changes?"
@@ -12193,133 +12413,86 @@ msgstr ""
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr "SID y/o RIDBASE no se encuentran en su configuración."
 
-#: include/class_ldap.inc:406
+#: include/class_ldap.inc:405
 #, fuzzy, php-format
-msgid "Creating duplicate of %s in %s"
+msgid "Creating copy of %s"
 msgstr "Lista de usuarios"
 
-#: include/class_ldap.inc:409
+#: include/class_ldap.inc:408
 msgid "Processing"
 msgstr ""
 
-#: include/class_ldap.inc:515
+#: include/class_ldap.inc:448
+#, fuzzy
+msgid "Error while fetching source dn - aborted!"
+msgstr "¡Error mientras se exportaban las entradas indicadas!"
+
+#: include/class_ldap.inc:511
 #, fuzzy, php-format
 msgid "Unknown FAIstate %s"
 msgstr "estado desconocido"
 
-#: include/class_ldap.inc:558
-#, fuzzy
-msgid "Successfully finished"
-msgstr "Configuración finalizada"
-
-#: include/class_ldap.inc:635
+#: include/class_ldap.inc:632
 #, php-format
 msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
-msgstr ""
-"Actualmente no esta soportada la creación automática del tipo '%s'. Por "
-"favor, informe de esto al equipo de desarrollo de GOsa."
-
-#: include/class_ldap.inc:897
-#, php-format
-msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-"El DN: '%s' no es válido, Un bloque importado debería comenzar por 'dn:...' "
-"en la linea %s"
-
-#: include/class_ldap.inc:910
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
-msgstr "El DN: '%s' (de la linea %s) ya existe en la base de datos LDAP."
-
-#: include/class_ldap.inc:926
-#, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
-msgstr ""
-"Ha habido un error mientras se importaba el dn: '%s', ¡pro favor compruebe "
-"el LDIF desde la linea %s en adelante!"
-
-#: include/class_debconfTemplate.inc:250
-#, fuzzy
-msgid "This package has no debconf options."
-msgstr "Esta cuenta no tiene extensiones telefónicas"
-
-#: include/class_mail-methods-cyrus.inc:39
-msgid ""
-"Warning: Account has an invalid mailserver string! Please check the mail "
-"server settings in the mail tab."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:52
-msgid ""
-"Warning: IMAP Server cannot be reached! If you save this account, some mail "
-"settings will not be stored on your server!"
-msgstr ""
-"Aviso: ¡No se puede acceder al servidor IMAP! Si guarda esta cuenta, algunos "
-"de los valores de la configuración del correo no serán guardados en el "
-"servidor"
-
-#: include/class_mail-methods-cyrus.inc:115
-#, php-format
-msgid "Can't create IMAP mailbox. Server says '%s'."
-msgstr ""
-"No se pueden crear carpetas de correo IMAP. El error del servidor es: '%s'"
-
-#: include/class_mail-methods-cyrus.inc:131
-#, php-format
-msgid "Can't write IMAP quota. Server says '%s'."
-msgstr "No se puede activar una cuota IMAP. El error del servidor es: '%s'"
-
-#: include/class_mail-methods-cyrus.inc:155
-#, fuzzy
-msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
-msgstr ""
-"Aviso: imap_getacl no ha sido implementado, no se modificara información "
-"sobre las listas de acceso."
-
-#: include/class_mail-methods-cyrus.inc:173
-msgid "Warning: imap_getacl is not available, can't get imap permissions!"
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
 msgstr ""
-"Aviso: no esta disponible imap_getacl, ¡no se puede acceder a los permisos "
-"IMAP!"
+"Actualmente no esta soportada la creación automática del tipo '%s'. Por "
+"favor, informe de esto al equipo de desarrollo de GOsa."
 
-#: include/class_mail-methods-cyrus.inc:195
+#: include/class_ldap.inc:894
 #, php-format
-msgid "Can't remove IMAP mailbox. Server says '%s'."
+msgid ""
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
 msgstr ""
-"No se puede eliminar la carpeta de correo IMAP. El error del servidor es: '%"
-"s'"
+"El DN: '%s' no es válido, Un bloque importado debería comenzar por 'dn:...' "
+"en la linea %s"
 
-#: include/class_mail-methods-cyrus.inc:223
+#: include/class_ldap.inc:907
 #, php-format
-msgid "Can't log into SIEVE server. Server says '%s'."
-msgstr "No se puede conectar al servidor SIEVE. El error del servidor es: '%s'"
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr "El DN: '%s' (de la linea %s) ya existe en la base de datos LDAP."
 
-#: include/class_mail-methods-cyrus.inc:236
+#: include/class_ldap.inc:923
 #, php-format
-msgid "Can't get sieve script. Server says '%s'."
-msgstr "No puedo ejecutar un 'script' SIEVE. El error del servidor es: '%s'"
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+"Ha habido un error mientras se importaba el dn: '%s', ¡pro favor compruebe "
+"el LDIF desde la linea %s en adelante!"
 
-#: include/class_mail-methods-cyrus.inc:307
+#: include/class_plugin.inc:465
 #, php-format
-msgid "Can't send sieve script. Server says '%s'."
-msgstr "No puedo subir un 'script' SIEVE. El error del servidor es: '%s'"
+msgid ""
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+msgstr ""
+"El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
+"parece existir."
 
-#: include/class_mail-methods-cyrus.inc:311
+#: include/class_plugin.inc:521
 #, php-format
-msgid "Can't activate GOsa sieve script. Server says '%s'."
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
-"No se puede activar el 'script GOsa para SIEVE'. El error del servidor es: '%"
-"s'"
+"El comando '%s', especificado como POSTREMOVE para la extensión '%s' no "
+"parece existir."
 
 #: include/class_CopyPasteHandler.inc:172
 #, fuzzy, php-format
 msgid "You are going to copy the entry '%s'."
 msgstr "Has decidido eliminar la entrada %s"
 
+#: html/helpviewer.php:116
+#, fuzzy
+msgid "There is no helpfile specified for this class."
+msgstr "No hay protocolo de correo %s configurado en su 'gosa.conf'."
+
+#: html/helpviewer.php:226
+#, php-format
+msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
+msgstr ""
+
 #: html/getvcard.php:36
 msgid "Error: getcvard.php needs a parameter to export a vcard!"
 msgstr "Error: getcvard.php necesita un parametro para exportar a vcard."
@@ -12503,16 +12676,6 @@ msgid ""
 "page before logging in!"
 msgstr ""
 
-#: html/helpviewer.php:116
-#, fuzzy
-msgid "There is no helpfile specified for this class."
-msgstr "No hay protocolo de correo %s configurado en su 'gosa.conf'."
-
-#: html/helpviewer.php:226
-#, php-format
-msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
-msgstr ""
-
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
 msgstr "No puedo conectar al servidor de base de datos."
@@ -12525,6 +12688,16 @@ msgstr "No puedo seleccionar la base de datos."
 msgid "Database query failed!"
 msgstr "La consulta a la base de datos ha fallado."
 
+#: html/getkiosk.php:25
+#, php-format
+msgid "Can't open file '%s', possibly the file does not exist."
+msgstr ""
+
+#: html/getkiosk.php:30
+#, fuzzy, php-format
+msgid "Can't read file '%s', check permissions."
+msgstr "Borrar"
+
 #: html/main.php:151
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
@@ -12552,16 +12725,6 @@ msgstr ""
 "¡La generación de esta página provoca que el interprete PHP muestre algunos "
 "errores!"
 
-#: html/getkiosk.php:25
-#, php-format
-msgid "Can't open file '%s', possibly the file does not exist."
-msgstr ""
-
-#: html/getkiosk.php:30
-#, fuzzy, php-format
-msgid "Can't read file '%s', check permissions."
-msgstr "Borrar"
-
 #: html/get_attachment.php:47
 #, fuzzy
 msgid ""
@@ -12588,11 +12751,47 @@ msgstr ""
 msgid "Can't open file '%s'."
 msgstr "Borrar"
 
+#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
+#: ihtml/themes/lhs/sizelimit.tpl:3
+msgid ""
+"The size limit option makes LDAP operations faster and saves the LDAP server "
+"from getting too much load. The easiest way to handle big databases without "
+"long timeouts would be to limit your search to smaller values and use "
+"filters to get the entries you are looking for."
+msgstr ""
+"La opción 'tamaño limite' permite unas operaciones con LDAP mas rápidas y "
+"protege al servidor LDAP de alcanzar una mayor carga. La manera mas fácil de "
+"manipular grandes bases de datos sin grandes perdidas de tiempo es limitar "
+"la busqueda a valores pequeños y usar filtros para encontrar las entradas "
+"que está buscando."
+
+#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
+#: ihtml/themes/lhs/sizelimit.tpl:6
+msgid "Please choose the way to react for this session"
+msgstr "Por favor elije la manera en que la sesión reaccione"
+
+#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
+#: ihtml/themes/lhs/sizelimit.tpl:9
+msgid "ignore this error and show all entries the LDAP server returns"
+msgstr ""
+"ignore este error y enseñe todas las entradas devueltas por el servidor LDAP"
+
+#: ihtml/themes/altlinux/sizelimit.tpl:10
+#: ihtml/themes/default/sizelimit.tpl:10 ihtml/themes/lhs/sizelimit.tpl:10
+msgid ""
+"ignore this error and show all entries that fit into the defined sizelimit "
+"and let me use filters instead"
+msgstr ""
+"ignore este error y muestre todas las entradas que concuerdan con el 'tamaño "
+"limite' definido y active el uso de filtros en su lugar"
+
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
+#: ihtml/themes/lhs/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr "Detectado conflicto de sesiones."
 
 #: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/default/conflict.tpl:6
+#: ihtml/themes/lhs/conflict.tpl:6
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
@@ -12605,6 +12804,7 @@ msgstr ""
 "decir, IE y Mozilla). Apretando el botón <b>Salir</b> cerrará está sesión."
 
 #: ihtml/themes/altlinux/conflict.tpl:10 ihtml/themes/default/conflict.tpl:10
+#: ihtml/themes/lhs/conflict.tpl:10
 msgid ""
 "Ignoring this message will change/destroy the data you're currently editing, "
 "so please close multiple windows and log in again."
@@ -12613,11 +12813,35 @@ msgstr ""
 "editando. Por favor, cierre las ventanas múltiples y vuelva a entrar."
 
 #: ihtml/themes/altlinux/conflict.tpl:14 ihtml/themes/default/conflict.tpl:14
+#: ihtml/themes/lhs/conflict.tpl:14
 msgid "Logout"
 msgstr "Salir"
 
+#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
+#: ihtml/themes/lhs/login.tpl:17
+msgid "Please use your <i>username</i> and <i>password</i> to log in"
+msgstr ""
+"Por favor introduzca su <i>usuario</i> y <i>contraseña</i> para entrar."
+
+#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
+#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
+#: ihtml/themes/lhs/login.tpl:46 ihtml/themes/lhs/login.tpl:49
+msgid "Directory"
+msgstr "Directorio"
+
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:57
+#: ihtml/themes/lhs/login.tpl:57
+msgid "Sign in"
+msgstr "Entrando"
+
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:58
+#: ihtml/themes/lhs/login.tpl:58
+msgid "Click here to log in"
+msgstr "Pulse aquí para entrar"
+
 #: ihtml/themes/altlinux/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
+#: ihtml/themes/lhs/setup_introduction.tpl:1
 msgid "Welcome to the GOsa setup!"
 msgstr "Bienvenido a la configuración de GOsa"
 
@@ -12639,11 +12863,13 @@ msgstr ""
 
 #: ihtml/themes/altlinux/setup_useradmin.tpl:3
 #: ihtml/themes/default/setup_useradmin.tpl:3
+#: ihtml/themes/lhs/setup_useradmin.tpl:3
 msgid "You already have an Administrative Account and a Group."
 msgstr "Ya tiene una cuenta y un grupo administrativo."
 
 #: ihtml/themes/altlinux/setup_useradmin.tpl:10
 #: ihtml/themes/default/setup_useradmin.tpl:10
+#: ihtml/themes/lhs/setup_useradmin.tpl:10
 msgid ""
 "To provide full administrative access to GOsa, you need to create a special "
 "group which contains the administrative user. The setup program can assist "
@@ -12655,100 +12881,38 @@ msgstr ""
 "configuración puede ayudarle en esta tarea. Introduzca el nombre y "
 "contraseñas deseadas para crear las entradas necesarias."
 
-#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
-msgid "Please use your <i>username</i> and <i>password</i> to log in"
-msgstr ""
-"Por favor introduzca su <i>usuario</i> y <i>contraseña</i> para entrar."
-
-#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
-#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
-msgid "Directory"
-msgstr "Directorio"
-
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:57
-msgid "Sign in"
-msgstr "Entrando"
-
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:58
-msgid "Click here to log in"
-msgstr "Pulse aquí para entrar"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
-msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
-"filters to get the entries you are looking for."
-msgstr ""
-"La opción 'tamaño limite' permite unas operaciones con LDAP mas rápidas y "
-"protege al servidor LDAP de alcanzar una mayor carga. La manera mas fácil de "
-"manipular grandes bases de datos sin grandes perdidas de tiempo es limitar "
-"la busqueda a valores pequeños y usar filtros para encontrar las entradas "
-"que está buscando."
-
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
-msgid "Please choose the way to react for this session"
-msgstr "Por favor elije la manera en que la sesión reaccione"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
-msgid "ignore this error and show all entries the LDAP server returns"
-msgstr ""
-"ignore este error y enseñe todas las entradas devueltas por el servidor LDAP"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:10
-#: ihtml/themes/default/sizelimit.tpl:10
-msgid ""
-"ignore this error and show all entries that fit into the defined sizelimit "
-"and let me use filters instead"
-msgstr ""
-"ignore este error y muestre todas las entradas que concuerdan con el 'tamaño "
-"limite' definido y active el uso de filtros en su lugar"
-
 #: ihtml/themes/altlinux/framework.tpl:15
-#: ihtml/themes/default/framework.tpl:15
+#: ihtml/themes/default/framework.tpl:15 ihtml/themes/lhs/framework.tpl:15
 msgid "Main"
 msgstr "Inicio"
 
 #: ihtml/themes/altlinux/framework.tpl:20
-#: ihtml/themes/default/framework.tpl:20
+#: ihtml/themes/default/framework.tpl:20 ihtml/themes/lhs/framework.tpl:20
 msgid "Help"
 msgstr "Ayuda"
 
 #: ihtml/themes/altlinux/framework.tpl:25
-#: ihtml/themes/default/framework.tpl:25
+#: ihtml/themes/default/framework.tpl:25 ihtml/themes/lhs/framework.tpl:25
 msgid "Sign out"
 msgstr "Salir"
 
 #: ihtml/themes/altlinux/framework.tpl:33
-#: ihtml/themes/default/framework.tpl:33
+#: ihtml/themes/default/framework.tpl:33 ihtml/themes/lhs/framework.tpl:33
 msgid "Signed in:"
 msgstr "Entrando"
 
-#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
-msgid "Locking conflict detected"
-msgstr "Detectado conflicto de Bloqueos"
-
-#: ihtml/themes/altlinux/islocked.tpl:9
-msgid ""
-"If this lock detection is false, the other person has obviously closed the "
-"webbrowser during the edit operation. You may delete the lockfile in this "
-"case by pressing the <i>Remove</i> button."
-msgstr ""
-"Si esta detección de bloqueo es falsa, la otra persona cerro su navegador "
-"mientras estaba editando. Puede borrar el archivo de bloqueo en ese caso, "
-"pulsando en el botón <i>Eliminar</i>."
-
 #: ihtml/themes/altlinux/setup_step2.tpl:1
 #: ihtml/themes/altlinux/setup_step3.tpl:1
 #: ihtml/themes/altlinux/setup_step4.tpl:1
 #: ihtml/themes/default/setup_step2.tpl:1
 #: ihtml/themes/default/setup_step3.tpl:1
-#: ihtml/themes/default/setup_step4.tpl:1
+#: ihtml/themes/default/setup_step4.tpl:1 ihtml/themes/lhs/setup_step2.tpl:1
+#: ihtml/themes/lhs/setup_step3.tpl:1 ihtml/themes/lhs/setup_step4.tpl:1
 msgid "Setup continued..."
 msgstr "La instalación continua"
 
 #: ihtml/themes/altlinux/setup_step2.tpl:4
-#: ihtml/themes/default/setup_step2.tpl:4
+#: ihtml/themes/default/setup_step2.tpl:4 ihtml/themes/lhs/setup_step2.tpl:4
 msgid ""
 "Step two looks for a set of helper programms and checks if they have the "
 "correct minimum version."
@@ -12756,8 +12920,23 @@ msgstr ""
 "El paso dos busca por una colección de programas/herramientas de soporte y "
 "comprueba si tienen al menos la mínima versión necesaria."
 
+#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
+#: ihtml/themes/lhs/islocked.tpl:2
+msgid "Locking conflict detected"
+msgstr "Detectado conflicto de Bloqueos"
+
+#: ihtml/themes/altlinux/islocked.tpl:9 ihtml/themes/lhs/islocked.tpl:9
+msgid ""
+"If this lock detection is false, the other person has obviously closed the "
+"webbrowser during the edit operation. You may delete the lockfile in this "
+"case by pressing the <i>Remove</i> button."
+msgstr ""
+"Si esta detección de bloqueo es falsa, la otra persona cerro su navegador "
+"mientras estaba editando. Puede borrar el archivo de bloqueo en ese caso, "
+"pulsando en el botón <i>Eliminar</i>."
+
 #: ihtml/themes/altlinux/setup_step3.tpl:4
-#: ihtml/themes/default/setup_step3.tpl:4
+#: ihtml/themes/default/setup_step3.tpl:4 ihtml/themes/lhs/setup_step3.tpl:4
 msgid ""
 "Now we're going include your LDAP server and create an initial "
 "configuration. After you've entered the server URI below, a quick check is "
@@ -12773,7 +12952,7 @@ msgstr ""
 "preguntados más adelante."
 
 #: ihtml/themes/altlinux/setup_step3.tpl:10
-#: ihtml/themes/default/setup_step3.tpl:10
+#: ihtml/themes/default/setup_step3.tpl:10 ihtml/themes/lhs/setup_step3.tpl:10
 msgid ""
 "Please enter the server URI to allow the setup to connect your LDAP server "
 "<i>(Example: ldap://your.server:389).</i>"
@@ -12783,7 +12962,7 @@ msgstr ""
 "servidor:389).</i>"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:2
-#: ihtml/themes/default/setup_step4.tpl:2
+#: ihtml/themes/default/setup_step4.tpl:2 ihtml/themes/lhs/setup_step4.tpl:2
 msgid ""
 "The following fields allow the basic configuration of GOsa's behaviour and "
 "affect various properties in your main configuration."
@@ -12792,17 +12971,17 @@ msgstr ""
 "afectara a varios parámetros de su configuración principal."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:7
-#: ihtml/themes/default/setup_step4.tpl:7
+#: ihtml/themes/default/setup_step4.tpl:7 ihtml/themes/lhs/setup_step4.tpl:7
 msgid "Enter a description for the location you're configuring here"
 msgstr "Ingrese una descripción para la ubicación que está configurando"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:11
-#: ihtml/themes/default/setup_step4.tpl:11
+#: ihtml/themes/default/setup_step4.tpl:11 ihtml/themes/lhs/setup_step4.tpl:11
 msgid "Location name"
 msgstr "Nombre de la localización"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:18
-#: ihtml/themes/default/setup_step4.tpl:18
+#: ihtml/themes/default/setup_step4.tpl:18 ihtml/themes/lhs/setup_step4.tpl:18
 msgid ""
 "GOsa always acts as admin and manages access rights internally. This is a "
 "workaround till OpenLDAP's in directory ACI's are fully implemented. For "
@@ -12815,17 +12994,17 @@ msgstr ""
 "correspondiente."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:23
-#: ihtml/themes/default/setup_step4.tpl:23
+#: ihtml/themes/default/setup_step4.tpl:23 ihtml/themes/lhs/setup_step4.tpl:23
 msgid "Admin DN"
 msgstr "DN del administrador"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:27
-#: ihtml/themes/default/setup_step4.tpl:27
+#: ihtml/themes/default/setup_step4.tpl:27 ihtml/themes/lhs/setup_step4.tpl:27
 msgid "Admin password"
 msgstr "Nueva contraseña"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:34
-#: ihtml/themes/default/setup_step4.tpl:34
+#: ihtml/themes/default/setup_step4.tpl:34 ihtml/themes/lhs/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
 "saves people and groups, including the way accounts get created. Check the "
@@ -12837,33 +13016,33 @@ msgstr ""
 "continuación si se ajustan a sus necesidades."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:39
-#: ihtml/themes/default/setup_step4.tpl:39
+#: ihtml/themes/default/setup_step4.tpl:39 ihtml/themes/lhs/setup_step4.tpl:39
 #, fuzzy
 msgid "Base "
 msgstr "Base"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:43
-#: ihtml/themes/default/setup_step4.tpl:43
+#: ihtml/themes/default/setup_step4.tpl:43 ihtml/themes/lhs/setup_step4.tpl:43
 msgid "People storage ou"
 msgstr "Carpeta de almacenamiento - ou - para los usuarios"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:47
-#: ihtml/themes/default/setup_step4.tpl:47
+#: ihtml/themes/default/setup_step4.tpl:47 ihtml/themes/lhs/setup_step4.tpl:47
 msgid "People dn attribute"
 msgstr "Atributo 'dn' de los usuarios"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:55
-#: ihtml/themes/default/setup_step4.tpl:55
+#: ihtml/themes/default/setup_step4.tpl:55 ihtml/themes/lhs/setup_step4.tpl:55
 msgid "Group storage ou"
 msgstr "Carpeta de almacenamiento - ou - para los grupos"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:59
-#: ihtml/themes/default/setup_step4.tpl:59
+#: ihtml/themes/default/setup_step4.tpl:59 ihtml/themes/lhs/setup_step4.tpl:59
 msgid "ID base for users/groups"
 msgstr "Identificador base - ID -, para usuarios y grupos"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:67
-#: ihtml/themes/default/setup_step4.tpl:67
+#: ihtml/themes/default/setup_step4.tpl:67 ihtml/themes/lhs/setup_step4.tpl:67
 msgid ""
 "GOsa supports several encryption types for your passwords. Normally this is "
 "adjustable via user templates, but you can specify a default method to be "
@@ -12874,12 +13053,12 @@ msgstr ""
 "usted puede especificar un método para ser usado por defecto."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:72
-#: ihtml/themes/default/setup_step4.tpl:72
+#: ihtml/themes/default/setup_step4.tpl:72 ihtml/themes/lhs/setup_step4.tpl:72
 msgid "Encryption algorithm"
 msgstr "Algoritmo de encriptación"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:83
-#: ihtml/themes/default/setup_step4.tpl:83
+#: ihtml/themes/default/setup_step4.tpl:83 ihtml/themes/lhs/setup_step4.tpl:83
 msgid ""
 "GOsa has modular support for several mail methods. These methods provide "
 "interfaces to users mailboxes and general handling for quotas. You can "
@@ -12891,7 +13070,7 @@ msgstr ""
 "configuración de correo limpia."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:88
-#: ihtml/themes/default/setup_step4.tpl:88
+#: ihtml/themes/default/setup_step4.tpl:88 ihtml/themes/lhs/setup_step4.tpl:88
 msgid "Mail method"
 msgstr "Método de correo"
 
@@ -12904,34 +13083,38 @@ msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:103
 #: ihtml/themes/default/setup_step4.tpl:104
+#: ihtml/themes/lhs/setup_step4.tpl:104
 #, fuzzy
 msgid "Display PHP errors"
 msgstr "Error PHP:"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:106
 #: ihtml/themes/default/setup_step4.tpl:107
+#: ihtml/themes/lhs/setup_step4.tpl:107
 #, fuzzy
 msgid "true"
 msgstr "Futuro"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:107
 #: ihtml/themes/default/setup_step4.tpl:108
+#: ihtml/themes/lhs/setup_step4.tpl:108
 #, fuzzy
 msgid "false"
 msgstr "mujer"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:115
 #: ihtml/themes/default/setup_step4.tpl:115
+#: ihtml/themes/lhs/setup_step4.tpl:115
 msgid "Check"
 msgstr "Comprobación"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:1
-#: ihtml/themes/default/setup_finish.tpl:1
+#: ihtml/themes/default/setup_finish.tpl:1 ihtml/themes/lhs/setup_finish.tpl:1
 msgid "Setup finished"
 msgstr "Configuración finalizada"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:3
-#: ihtml/themes/default/setup_finish.tpl:3
+#: ihtml/themes/default/setup_finish.tpl:3 ihtml/themes/lhs/setup_finish.tpl:3
 msgid ""
 "Basically the setup is finished. You can check the result of the schema "
 "check here and download the autogenerated gosa.conf below."
@@ -12940,17 +13123,19 @@ msgstr ""
 "este esquema aquí y descargar el gosa.conf generado automáticamente."
 
 #: ihtml/themes/altlinux/setup_finish.tpl:7
-#: ihtml/themes/default/setup_finish.tpl:7
+#: ihtml/themes/default/setup_finish.tpl:7 ihtml/themes/lhs/setup_finish.tpl:7
 msgid "Schema Configuration"
 msgstr "Configuración de esquemas"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:12
 #: ihtml/themes/default/setup_finish.tpl:12
+#: ihtml/themes/lhs/setup_finish.tpl:12
 msgid "Configuration File"
 msgstr "Fichero de configuración"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:14
 #: ihtml/themes/default/setup_finish.tpl:14
+#: ihtml/themes/lhs/setup_finish.tpl:14
 msgid ""
 "GOsa setup has collected all data needed to create an initial configuration "
 "file. Save the the link below as your gosa.conf and place that file in /etc/"
@@ -12962,11 +13147,13 @@ msgstr ""
 
 #: ihtml/themes/altlinux/setup_finish.tpl:17
 #: ihtml/themes/default/setup_finish.tpl:17
+#: ihtml/themes/lhs/setup_finish.tpl:17
 msgid "Download configuration"
 msgstr "Descargar configuración"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:20
 #: ihtml/themes/default/setup_finish.tpl:20
+#: ihtml/themes/lhs/setup_finish.tpl:20
 msgid ""
 "After placing the file under /etc/gosa, place make sure that the webserver "
 "user is able to read gosa.conf, while other users shouldn't. You may want to "
@@ -12976,7 +13163,16 @@ msgstr ""
 "servidor web pueda leer gosa.conf y que los otros no deberían poder leerlo. "
 "Para cumplir con este requerimiento puede ejecutar estos comandos:"
 
+#: ihtml/themes/default/help.tpl:9 ihtml/themes/lhs/help.tpl:9
+msgid "GOsa help viewer"
+msgstr ""
+
+#: ihtml/themes/default/help.tpl:15 ihtml/themes/lhs/help.tpl:15
+msgid "Index"
+msgstr ""
+
 #: ihtml/themes/default/setup_introduction.tpl:4
+#: ihtml/themes/lhs/setup_introduction.tpl:4
 #, fuzzy
 msgid ""
 "It looks like you're calling GOsa for the first time - no configuration was "
@@ -12994,6 +13190,7 @@ msgstr ""
 "conectarse al servidor LDAP, vamos a comprobar la configuración de LDAP."
 
 #: ihtml/themes/default/setup_introduction.tpl:17
+#: ihtml/themes/lhs/setup_introduction.tpl:17
 msgid ""
 "You can also use the new and more-advanced way of inspecting your PHP-"
 "installation. It will give you information about the exact function that "
@@ -13002,17 +13199,26 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/setup_introduction.tpl:19
+#: ihtml/themes/lhs/setup_introduction.tpl:19
 msgid "Toggle Show/Hide"
 msgstr ""
 
-#: ihtml/themes/default/help.tpl:9
-msgid "GOsa help viewer"
+#: ihtml/themes/default/logout.tpl:5 ihtml/themes/lhs/logout.tpl:5
+msgid "Your GOsa session has expired!"
 msgstr ""
 
-#: ihtml/themes/default/help.tpl:15
-msgid "Index"
+#: ihtml/themes/default/logout.tpl:7 ihtml/themes/lhs/logout.tpl:7
+msgid ""
+"The last interaction with the GOsa web interface has been some time ago in "
+"the past. For security reasons, the session has been closed. To continue "
+"with administrative tasks, please sign in again."
 msgstr ""
 
+#: ihtml/themes/default/logout.tpl:10 ihtml/themes/lhs/logout.tpl:10
+#, fuzzy
+msgid "Sign in again"
+msgstr "Entrando"
+
 #: ihtml/themes/default/islocked.tpl:9
 #, fuzzy
 msgid ""
@@ -13029,28 +13235,6 @@ msgstr ""
 msgid "Edit anyway"
 msgstr "Editar entrada"
 
-#: ihtml/themes/default/setup_step4.tpl:100
-msgid ""
-"GOsa may cause PHP interpreter errors, particularly in case of Beta "
-"versions. In some cases it would be helpful to enable the error reporting."
-msgstr ""
-
-#: ihtml/themes/default/logout.tpl:5
-msgid "Your GOsa session has expired!"
-msgstr ""
-
-#: ihtml/themes/default/logout.tpl:7
-msgid ""
-"The last interaction with the GOsa web interface has been some time ago in "
-"the past. For security reasons, the session has been closed. To continue "
-"with administrative tasks, please sign in again."
-msgstr ""
-
-#: ihtml/themes/default/logout.tpl:10
-#, fuzzy
-msgid "Sign in again"
-msgstr "Entrando"
-
 #: ihtml/themes/default/copyPasteDialog.tpl:1
 msgid "Copy &amp; paste wizard"
 msgstr ""
@@ -13067,6 +13251,25 @@ msgstr ""
 msgid "Operation complete"
 msgstr "incompleto"
 
+#: ihtml/themes/default/setup_step4.tpl:100
+#: ihtml/themes/lhs/setup_step4.tpl:100
+msgid ""
+"GOsa may cause PHP interpreter errors, particularly in case of Beta "
+"versions. In some cases it would be helpful to enable the error reporting."
+msgstr ""
+
+#, fuzzy
+#~ msgid "DFS shares"
+#~ msgstr "Borrar"
+
+#, fuzzy
+#~ msgid "Complete"
+#~ msgstr "incompleto"
+
+#, fuzzy
+#~ msgid "Successfully finished"
+#~ msgstr "Configuración finalizada"
+
 #, fuzzy
 #~ msgid "Releases"
 #~ msgstr "Paquete de reglas"
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 762955a78..380815ba6 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -63,21 +63,19 @@ msgstr "Extensions"
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
-#: plugins/gofax/faxaccount/generic.tpl:6
+#: plugins/gofax/faxaccount/generic.tpl:6 plugins/admin/fai/faiVariable.tpl:4
 #: plugins/admin/fai/faiPartitionTable.tpl:4
-#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiScriptEntry.tpl:5
-#: plugins/admin/fai/faiPackage.tpl:4 plugins/admin/fai/faiProfile.tpl:4
-#: plugins/admin/fai/faiProfile.tpl:32
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
+#: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiPackage.tpl:4
+#: plugins/admin/fai/faiProfile.tpl:4 plugins/admin/fai/faiProfile.tpl:32
 #: plugins/admin/fai/faiScript.tpl:4 plugins/admin/fai/faiVariableEntry.tpl:5
 #: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3 plugins/admin/fai/faiHook.tpl:4
-#: plugins/admin/groups/mail.tpl:7
+#: plugins/admin/groups/mail.tpl:7 plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/glpiPrinter.tpl:6
+#: plugins/admin/systems/servdnseditzone.tpl:1
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
-#: plugins/admin/systems/glpi.tpl:6
-#: plugins/admin/systems/servdnseditzone.tpl:1
-#: plugins/admin/systems/glpiPrinter.tpl:6
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr "Informations"
@@ -88,25 +86,25 @@ msgstr "Unix"
 
 #: contrib/gosa.conf:76 contrib/gosa.conf:88
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:514
-#: plugins/admin/users/class_userManagement.inc:858
+#: plugins/admin/groups/class_groupManagement.inc:515
+#: plugins/admin/users/class_userManagement.inc:859
 msgid "Environment"
 msgstr "Environnement"
 
 #: contrib/gosa.conf:77 contrib/gosa.conf:90
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_groupManagement.inc:502
-#: plugins/admin/users/class_userManagement.inc:860
+#: plugins/admin/groups/class_groupManagement.inc:503
+#: plugins/admin/users/class_userManagement.inc:861
 #: plugins/admin/ogroups/tabs_ogroups.inc:72
 #: plugins/admin/ogroups/tabs_ogroups.inc:160
-#: plugins/admin/ogroups/class_ogroupManagement.inc:483
+#: plugins/admin/ogroups/class_ogroupManagement.inc:484
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Messagerie"
 
 #: contrib/gosa.conf:78 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:505
-#: plugins/admin/users/class_userManagement.inc:866
+#: plugins/admin/groups/class_groupManagement.inc:506
+#: plugins/admin/users/class_userManagement.inc:867
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -121,7 +119,7 @@ msgstr "Connectivité"
 #: plugins/personal/generic/generic.tpl:398
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:864
+#: plugins/admin/users/class_userManagement.inc:865
 #: plugins/admin/departments/generic.tpl:63
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
@@ -131,17 +129,17 @@ msgstr "Fax"
 #: contrib/gosa.conf:81 plugins/personal/generic/generic.tpl:250
 #: plugins/personal/generic/generic.tpl:388
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/address_info.tpl:37
-#: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
-#: plugins/admin/groups/class_groupManagement.inc:511
-#: plugins/admin/users/class_userManagement.inc:862
+#: plugins/addons/addressbook/address_info.tpl:37
+#: plugins/addons/addressbook/address_info.tpl:85
+#: plugins/admin/groups/class_groupManagement.inc:512
+#: plugins/admin/users/class_userManagement.inc:863
 #: plugins/admin/departments/generic.tpl:59
+#: plugins/admin/systems/class_systemManagement.inc:921
 #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/systems/class_systemManagement.inc:920
 #: plugins/admin/ogroups/class_ogroupManagement.inc:61
-#: plugins/admin/ogroups/class_ogroupManagement.inc:587
+#: plugins/admin/ogroups/class_ogroupManagement.inc:588
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
@@ -170,8 +168,8 @@ msgid "ACL"
 msgstr "ACL"
 
 #: contrib/gosa.conf:97 plugins/admin/applications/generic.tpl:66
-#: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/systems/class_servRepository.inc:244
+#: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/ogroups/phonequeue.tpl:31
 #: plugins/gofon/conference/generic.tpl:87
 msgid "Options"
@@ -193,9 +191,9 @@ msgstr "Périphériques"
 
 #: contrib/gosa.conf:116 contrib/gosa.conf:141
 #: plugins/personal/environment/environment.tpl:172
-#: plugins/admin/systems/class_systemManagement.inc:926
+#: plugins/admin/systems/class_systemManagement.inc:927
 #: plugins/admin/ogroups/class_ogroupManagement.inc:62
-#: plugins/admin/ogroups/class_ogroupManagement.inc:590
+#: plugins/admin/ogroups/class_ogroupManagement.inc:591
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Imprimante"
@@ -204,18 +202,19 @@ msgstr "Imprimante"
 #: plugins/gofax/blocklists/generic.tpl:70
 #: plugins/gofax/blocklists/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
+#: plugins/addons/godfs/contents.tpl:22
 #: plugins/admin/fai/faiProfileEntry.tpl:21
 #: plugins/admin/fai/faiPackageEntry.tpl:22 plugins/admin/fai/headpage.tpl:20
 #: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
 #: plugins/admin/applications/headpage.tpl:20
 #: plugins/admin/departments/headpage.tpl:20
-#: plugins/admin/systems/headpage.tpl:20
+#: plugins/admin/systems/glpiPrinter.tpl:104
+#: plugins/admin/systems/glpiDeviceManagement.tpl:20
 #: plugins/admin/systems/servRepository.tpl:24
 #: plugins/admin/systems/glpiSelectUser.tpl:20
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:20
+#: plugins/admin/systems/headpage.tpl:20
 #: plugins/admin/systems/glpiAttachmentPool.tpl:20
-#: plugins/admin/systems/glpiDeviceManagement.tpl:20
-#: plugins/admin/systems/glpiPrinter.tpl:104
 #: plugins/admin/ogroups/headpage.tpl:20 plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
@@ -278,18 +277,18 @@ msgstr "Partitions"
 msgid "Script"
 msgstr "Script"
 
-#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:759
-#: plugins/admin/fai/class_faiManagement.inc:760
+#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:767
+#: plugins/admin/fai/class_faiManagement.inc:768
 msgid "Hooks"
 msgstr "Connexions"
 
-#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:752
-#: plugins/admin/fai/class_faiManagement.inc:753
+#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:760
+#: plugins/admin/fai/class_faiManagement.inc:761
 msgid "Variables"
 msgstr "Variables"
 
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiManagement.inc:773
-#: plugins/admin/fai/class_faiManagement.inc:774
+#: contrib/gosa.conf:218 plugins/admin/fai/class_faiManagement.inc:781
+#: plugins/admin/fai/class_faiManagement.inc:782
 msgid "Templates"
 msgstr "Modèles"
 
@@ -333,89 +332,82 @@ msgstr "Anglais"
 msgid "Italian"
 msgstr "Italien"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:19
-#: plugins/personal/mail/class_mailAccount.inc:23
-#: plugins/personal/password/class_password.inc:6
-#: plugins/personal/posix/class_posixAccount.inc:17
-#: plugins/personal/samba/class_sambaAccount.inc:25
-#: plugins/personal/environment/class_environment.inc:13
-#: plugins/personal/generic/class_user.inc:17
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_proxyAccount.inc:6
-#: plugins/personal/connectivity/class_pptpAccount.inc:27
-#: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_phpgwAccount.inc:6
-#: plugins/personal/connectivity/class_kolabAccount.inc:6
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
-#: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/personal/connectivity/class_opengwAccount.inc:7
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
-#: plugins/gofax/faxreports/class_faxreport.inc:7
-#: plugins/addons/addressbook/class_addressbook.inc:7
-#: plugins/addons/mailqueue/class_mailqueue.inc:7
-#: plugins/addons/ldapmanager/class_csvimport.inc:7
-#: plugins/addons/ldapmanager/class_exportxls.inc:8
-#: plugins/addons/ldapmanager/class_import.inc:7
-#: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:7
-#: plugins/addons/logview/class_logview.inc:7
-#: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:26
-#: plugins/admin/applications/class_applicationManagement.inc:26
-#: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/systems/class_systemManagement.inc:33
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-#: plugins/gofon/fonreports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Ceci fait quelque chose"
+#: plugins/personal/nagios/nagios.tpl:4
+msgid "Nagios Account"
+msgstr "Compte Nagios"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:92
-msgid "This account has no nagios extensions."
-msgstr "Ce compte n'a pas d'extensions nagios."
+#: plugins/personal/nagios/nagios.tpl:7
+msgid "Alias"
+msgstr "Alias de l'utilisateur"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:101
-msgid "Remove nagios account"
-msgstr "Supprimer l'extension nagios"
+#: plugins/personal/nagios/nagios.tpl:12
+#: plugins/admin/systems/servdnseditzone.tpl:47 html/getxls.php:174
+msgid "Mail address"
+msgstr "Adresse de messagerie"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:102
-msgid ""
-"This account has nagios features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"L'extension nagios est activée pour ce compte, vous pouvez la désactiver en "
-"cliquant sur le bouton ci-dessous."
+#: plugins/personal/nagios/nagios.tpl:17
+msgid "Host notification period"
+msgstr "Période de notification pour les systèmes"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:104
-msgid "Create nagios account"
-msgstr "Créer un compte nagios"
+#: plugins/personal/nagios/nagios.tpl:25
+msgid "Service notification period"
+msgstr "Période de notification pour les services"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:104
-msgid ""
-"This account has nagios features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"L'extension nagios est désactivée pour ce compte, vous pouvez l'activer en "
-"cliquant sur le bouton ci-dessous."
+#: plugins/personal/nagios/nagios.tpl:32
+msgid "Service notification options"
+msgstr "Options pour la période de notification pour les services"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:165
-msgid "The required field 'NagiosAlias' is not set."
-msgstr "Le champ obligatoire 'Alias de l'utilisateur' n'est pas rempli."
+#: plugins/personal/nagios/nagios.tpl:41
+msgid "Host notification options"
+msgstr "Options pour la notification des systèmes"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:168
-msgid "The required field 'NagiosMail' is not set."
-msgstr "Le champ obligatoire 'adresse de messagerie' n'est pas rempli."
+#: plugins/personal/nagios/nagios.tpl:48
+#: plugins/personal/generic/generic.tpl:261
+#: plugins/addons/addressbook/address_edit.tpl:217
+#: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Pager"
+msgstr "Bip"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:172
-#: plugins/personal/nagios/class_nagiosAccount.inc:176
-msgid "Please enter a valid email address in 'NagiosMail' field."
-msgstr ""
-"Veuillez entrer une adresse de messagerie valide dans le champ 'Adresse de "
-"messagerie'."
+#: plugins/personal/nagios/nagios.tpl:53
+msgid "Service notification commands"
+msgstr "Commandes pour la notification des services"
+
+#: plugins/personal/nagios/nagios.tpl:57
+msgid "Host notification commands"
+msgstr "Commandes pour la notification des systèmes"
+
+#: plugins/personal/nagios/nagios.tpl:66
+msgid "Nagios authentification"
+msgstr "Authentification nagios"
+
+#: plugins/personal/nagios/nagios.tpl:69
+msgid "view system informations"
+msgstr "voir les informations sur le système"
+
+#: plugins/personal/nagios/nagios.tpl:72
+msgid "view configuration information"
+msgstr "voir les informations de configuration"
+
+#: plugins/personal/nagios/nagios.tpl:75
+msgid "trigger system commands"
+msgstr "Permettre les commandes systêmes"
+
+#: plugins/personal/nagios/nagios.tpl:78
+msgid "view all services"
+msgstr "Voir tout les services"
+
+#: plugins/personal/nagios/nagios.tpl:81
+msgid "view all hosts"
+msgstr "Voir tout les hôtes"
+
+#: plugins/personal/nagios/nagios.tpl:83
+msgid "trigger all service commands"
+msgstr "Permettre les commandes sur tout les services"
+
+#: plugins/personal/nagios/nagios.tpl:86
+msgid "trigger all host commands"
+msgstr "permettre les commandes sur tout les hôtes"
 
 #: plugins/personal/nagios/main.inc:104 plugins/personal/mail/main.inc:104
 #: plugins/personal/posix/main.inc:110 plugins/personal/samba/main.inc:104
@@ -425,11 +417,12 @@ msgstr ""
 #: plugins/personal/connectivity/main.inc:118
 #: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/fai/class_faiManagement.inc:599
+#: plugins/addons/godfs/class_dfsManagment.inc:217
+#: plugins/admin/fai/class_faiManagement.inc:605
 #: plugins/admin/groups/class_groupManagement.inc:412
 #: plugins/admin/users/class_userManagement.inc:720
-#: plugins/admin/applications/class_applicationManagement.inc:428
-#: plugins/admin/departments/class_departmentManagement.inc:366
+#: plugins/admin/applications/class_applicationManagement.inc:430
+#: plugins/admin/departments/class_departmentManagement.inc:367
 #: plugins/admin/systems/class_systemManagement.inc:720
 #: plugins/admin/ogroups/class_ogroupManagement.inc:400
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:300
@@ -441,16 +434,15 @@ msgstr "Terminé"
 
 #: plugins/personal/nagios/main.inc:106 plugins/personal/mail/main.inc:106
 #: plugins/personal/mail/mail_locals.tpl:43
-#: plugins/personal/posix/posix_groups.tpl:67
 #: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112
+#: plugins/personal/posix/posix_groups.tpl:67
+#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
 #: plugins/personal/samba/samba3_workstations.tpl:41
-#: plugins/personal/samba/main.inc:106
+#: plugins/personal/environment/main.inc:106
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
 #: plugins/personal/environment/hotplugDialogNew.tpl:39
-#: plugins/personal/environment/main.inc:106
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
 #: plugins/personal/generic/generic_certs.tpl:78
@@ -461,54 +453,55 @@ msgstr "Terminé"
 #: plugins/gofax/faxaccount/locals.tpl:62
 #: plugins/gofax/faxaccount/lists.tpl:33 plugins/gofax/faxaccount/main.inc:91
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
-#: plugins/admin/fai/class_faiManagement.inc:601
-#: plugins/admin/fai/class_faiManagement.inc:606
-#: plugins/admin/fai/faiProfileEntry.tpl:71
+#: plugins/addons/addressbook/remove.tpl:16
+#: plugins/addons/godfs/class_dfsManagment.inc:219
+#: plugins/admin/fai/class_faiManagement.inc:607
+#: plugins/admin/fai/class_faiManagement.inc:612
 #: plugins/admin/fai/faiPackageConfiguration.tpl:7
-#: plugins/admin/fai/faiScriptEntry.tpl:69
+#: plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
+#: plugins/admin/fai/faiScriptEntry.tpl:69 plugins/admin/fai/remove.tpl:17
 #: plugins/admin/fai/faiPackageNew.tpl:45
+#: plugins/admin/fai/faiNewBranch.tpl:20
 #: plugins/admin/fai/faiVariableEntry.tpl:49
-#: plugins/admin/fai/faiPackageEntry.tpl:57 plugins/admin/fai/remove.tpl:17
+#: plugins/admin/fai/faiPackageEntry.tpl:57
 #: plugins/admin/fai/faiHookEntry.tpl:71
-#: plugins/admin/fai/faiTemplateEntry.tpl:131
-#: plugins/admin/fai/faiNewBranch.tpl:20
 #: plugins/admin/fai/remove_branch.tpl:16
+#: plugins/admin/fai/faiTemplateEntry.tpl:131
 #: plugins/admin/groups/class_groupManagement.inc:414
 #: plugins/admin/groups/remove.tpl:16
+#: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/template.tpl:46
 #: plugins/admin/users/class_userManagement.inc:722
-#: plugins/admin/users/remove.tpl:16 plugins/admin/users/template.tpl:46
-#: plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:430
+#: plugins/admin/users/remove.tpl:16 plugins/admin/applications/remove.tpl:15
+#: plugins/admin/applications/class_applicationManagement.inc:432
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:368
-#: plugins/admin/systems/chooser.tpl:18
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
-#: plugins/admin/systems/printerPPDDialog.tpl:23
-#: plugins/admin/systems/class_systemManagement.inc:722
-#: plugins/admin/systems/servnfs.tpl:76 plugins/admin/systems/remove.tpl:16
-#: plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/servRepositorySetup.tpl:43
+#: plugins/admin/departments/class_departmentManagement.inc:369
 #: plugins/admin/systems/glpi_edit_type.tpl:29
-#: plugins/admin/systems/remove_glpi.tpl:16
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:30
+#: plugins/admin/systems/glpiDeviceManagement.tpl:52
+#: plugins/admin/systems/servnfs.tpl:76
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
+#: plugins/admin/systems/servdnseditzone.tpl:118
 #: plugins/admin/systems/glpiSelectUser.tpl:51
+#: plugins/admin/systems/glpi_devices.tpl:761
+#: plugins/admin/systems/servRepositorySetup.tpl:43
 #: plugins/admin/systems/glpi_edit_os.tpl:29
+#: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:52
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
+#: plugins/admin/systems/remove_glpi.tpl:16
+#: plugins/admin/systems/class_systemManagement.inc:722
+#: plugins/admin/systems/remove.tpl:16
 #: plugins/admin/systems/glpiAttachmentPool.tpl:52
-#: plugins/admin/systems/servdnseditzone.tpl:118
-#: plugins/admin/systems/glpiDeviceManagement.tpl:52
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:30
-#: plugins/admin/systems/glpi_devices.tpl:761
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
+#: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/SelectDeviceType.tpl:45
-#: plugins/admin/systems/class_baseSelectDialog.inc:40
+#: plugins/admin/systems/class_baseSelectDialog.inc:41
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:13
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:402
@@ -519,6 +512,7 @@ msgstr "Terminé"
 #: plugins/gofon/conference/remove.tpl:16
 #: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
 #: ihtml/themes/default/copyPasteDialog.tpl:13
+#: ihtml/themes/lhs/islocked.tpl:15
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -536,26 +530,27 @@ msgstr ""
 
 #: plugins/personal/nagios/main.inc:115 plugins/personal/mail/main.inc:115
 #: plugins/personal/posix/main.inc:122 plugins/personal/samba/main.inc:115
-#: plugins/personal/environment/environment.tpl:139
 #: plugins/personal/environment/main.inc:115
+#: plugins/personal/environment/environment.tpl:139
 #: plugins/personal/generic/main.inc:172
 #: plugins/personal/connectivity/main.inc:129
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
+#: plugins/admin/fai/faiVariable.tpl:45
 #: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/admin/fai/faiVariable.tpl:45 plugins/admin/fai/faiScript.tpl:45
-#: plugins/admin/fai/faiTemplate.tpl:42 plugins/admin/fai/faiHook.tpl:45
-#: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/printer.tpl:47 plugins/admin/systems/servdns.tpl:7
-#: plugins/admin/systems/glpiManufacturer.tpl:7
-#: plugins/admin/systems/glpi.tpl:48 plugins/admin/systems/glpi.tpl:56
-#: plugins/admin/systems/glpi.tpl:85
-#: plugins/admin/systems/servdnseditzone.tpl:27
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:191
+#: plugins/admin/fai/faiScript.tpl:45 plugins/admin/fai/faiTemplate.tpl:42
+#: plugins/admin/fai/faiHook.tpl:45 plugins/admin/systems/glpi.tpl:48
+#: plugins/admin/systems/glpi.tpl:56 plugins/admin/systems/glpi.tpl:85
 #: plugins/admin/systems/glpiPrinter.tpl:73
 #: plugins/admin/systems/glpiPrinter.tpl:82
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:167
+#: plugins/admin/systems/servdns.tpl:7
+#: plugins/admin/systems/glpiManufacturer.tpl:7
+#: plugins/admin/systems/servdnseditzone.tpl:27
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:191
+#: plugins/admin/systems/servservice.tpl:21
+#: plugins/admin/systems/printer.tpl:47
 #: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr "Editer"
@@ -564,82 +559,214 @@ msgstr "Editer"
 msgid "Nagios settings"
 msgstr "Paramètres Nagios"
 
-#: plugins/personal/nagios/nagios.tpl:4
-msgid "Nagios Account"
-msgstr "Compte Nagios"
-
-#: plugins/personal/nagios/nagios.tpl:7
-msgid "Alias"
-msgstr "Alias de l'utilisateur"
-
-#: plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:47 html/getxls.php:174
-msgid "Mail address"
-msgstr "Adresse de messagerie"
-
-#: plugins/personal/nagios/nagios.tpl:17
-msgid "Host notification period"
-msgstr "Période de notification pour les systèmes"
-
-#: plugins/personal/nagios/nagios.tpl:25
-msgid "Service notification period"
-msgstr "Période de notification pour les services"
-
-#: plugins/personal/nagios/nagios.tpl:32
-msgid "Service notification options"
-msgstr "Options pour la période de notification pour les services"
-
-#: plugins/personal/nagios/nagios.tpl:41
-msgid "Host notification options"
-msgstr "Options pour la notification des systèmes"
-
-#: plugins/personal/nagios/nagios.tpl:48
-#: plugins/personal/generic/generic.tpl:261
-#: plugins/addons/addressbook/address_info.tpl:91
-#: plugins/addons/addressbook/address_edit.tpl:217 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Pager"
-msgstr "Bip"
+#: plugins/personal/nagios/class_nagiosAccount.inc:19
+#: plugins/personal/mail/class_mailAccount.inc:23
+#: plugins/personal/password/class_password.inc:6
+#: plugins/personal/posix/class_posixAccount.inc:17
+#: plugins/personal/samba/class_sambaAccount.inc:25
+#: plugins/personal/environment/class_environment.inc:13
+#: plugins/personal/generic/class_user.inc:17
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_intranetAccount.inc:16
+#: plugins/personal/connectivity/class_pptpAccount.inc:27
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
+#: plugins/personal/connectivity/class_phpgwAccount.inc:6
+#: plugins/personal/connectivity/class_kolabAccount.inc:6
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
+#: plugins/personal/connectivity/class_opengwAccount.inc:7
+#: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
+#: plugins/gofax/faxreports/class_faxreport.inc:7
+#: plugins/addons/addressbook/class_addressbook.inc:7
+#: plugins/addons/mailqueue/class_mailqueue.inc:7
+#: plugins/addons/ldapmanager/class_csvimport.inc:7
+#: plugins/addons/ldapmanager/class_exportxls.inc:8
+#: plugins/addons/ldapmanager/class_import.inc:7
+#: plugins/addons/ldapmanager/class_ldif.inc:8
+#: plugins/addons/ldapmanager/class_export.inc:7
+#: plugins/addons/logview/class_logview.inc:7
+#: plugins/addons/godfs/class_dfsManagment.inc:17
+#: plugins/admin/groups/class_groupManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:26
+#: plugins/admin/applications/class_applicationManagement.inc:26
+#: plugins/admin/departments/class_departmentManagement.inc:26
+#: plugins/admin/systems/class_systemManagement.inc:33
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/gofon/fonreports/class_fonreport.inc:7
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
+msgid "This does something"
+msgstr "Ceci fait quelque chose"
 
-#: plugins/personal/nagios/nagios.tpl:53
-msgid "Service notification commands"
-msgstr "Commandes pour la notification des services"
+#: plugins/personal/nagios/class_nagiosAccount.inc:92
+msgid "This account has no nagios extensions."
+msgstr "Ce compte n'a pas d'extensions nagios."
 
-#: plugins/personal/nagios/nagios.tpl:57
-msgid "Host notification commands"
-msgstr "Commandes pour la notification des systèmes"
+#: plugins/personal/nagios/class_nagiosAccount.inc:101
+msgid "Remove nagios account"
+msgstr "Supprimer l'extension nagios"
 
-#: plugins/personal/nagios/nagios.tpl:66
-msgid "Nagios authentification"
-msgstr "Authentification nagios"
+#: plugins/personal/nagios/class_nagiosAccount.inc:102
+msgid ""
+"This account has nagios features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"L'extension nagios est activée pour ce compte, vous pouvez la désactiver en "
+"cliquant sur le bouton ci-dessous."
 
-#: plugins/personal/nagios/nagios.tpl:69
-msgid "view system informations"
-msgstr "voir les informations sur le système"
+#: plugins/personal/nagios/class_nagiosAccount.inc:104
+msgid "Create nagios account"
+msgstr "Créer un compte nagios"
 
-#: plugins/personal/nagios/nagios.tpl:72
-msgid "view configuration information"
-msgstr "voir les informations de configuration"
+#: plugins/personal/nagios/class_nagiosAccount.inc:104
+msgid ""
+"This account has nagios features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"L'extension nagios est désactivée pour ce compte, vous pouvez l'activer en "
+"cliquant sur le bouton ci-dessous."
 
-#: plugins/personal/nagios/nagios.tpl:75
-msgid "trigger system commands"
-msgstr "Permettre les commandes systêmes"
+#: plugins/personal/nagios/class_nagiosAccount.inc:165
+msgid "The required field 'NagiosAlias' is not set."
+msgstr "Le champ obligatoire 'Alias de l'utilisateur' n'est pas rempli."
 
-#: plugins/personal/nagios/nagios.tpl:78
-msgid "view all services"
-msgstr "Voir tout les services"
+#: plugins/personal/nagios/class_nagiosAccount.inc:168
+msgid "The required field 'NagiosMail' is not set."
+msgstr "Le champ obligatoire 'adresse de messagerie' n'est pas rempli."
 
-#: plugins/personal/nagios/nagios.tpl:81
-msgid "view all hosts"
-msgstr "Voir tout les hôtes"
+#: plugins/personal/nagios/class_nagiosAccount.inc:172
+#: plugins/personal/nagios/class_nagiosAccount.inc:176
+msgid "Please enter a valid email address in 'NagiosMail' field."
+msgstr ""
+"Veuillez entrer une adresse de messagerie valide dans le champ 'Adresse de "
+"messagerie'."
 
-#: plugins/personal/nagios/nagios.tpl:83
-msgid "trigger all service commands"
-msgstr "Permettre les commandes sur tout les services"
+#: plugins/personal/mail/class_mailAccount.inc:79
+#: plugins/admin/groups/class_groupMail.inc:75
+#, php-format
+msgid "There is no mail method '%s' specified in your gosa.conf available."
+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/nagios/nagios.tpl:86
-msgid "trigger all host commands"
-msgstr "permettre les commandes sur tout les hôtes"
+#: plugins/personal/mail/class_mailAccount.inc:176
+msgid "No DESC tag in vacation file:"
+msgstr "Pas de drapeau DESC dans le message d'absence:"
+
+#: plugins/personal/mail/class_mailAccount.inc:216
+msgid "This account has no mail extensions."
+msgstr "Ce compte n'a pas d'extensions de messagerie."
+
+#: plugins/personal/mail/class_mailAccount.inc:225
+#: plugins/admin/groups/class_groupMail.inc:314
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid "Remove mail account"
+msgstr "Supprimer le compte de messagerie"
+
+#: plugins/personal/mail/class_mailAccount.inc:226
+#: plugins/admin/groups/class_groupMail.inc:315
+msgid ""
+"This account has mail features enabled. You can disable them by clicking "
+"below."
+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:228
+#: plugins/admin/groups/class_groupMail.inc:317
+#: plugins/admin/ogroups/class_mailogroup.inc:43
+msgid "Create mail account"
+msgstr "Créer un compte de messagerie"
+
+#: plugins/personal/mail/class_mailAccount.inc:228
+#: plugins/admin/groups/class_groupMail.inc:318
+msgid ""
+"This account has mail features disabled. You can enable them by clicking "
+"below."
+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:276
+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:282
+#: plugins/admin/groups/class_groupMail.inc:377
+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:317
+#: plugins/personal/mail/class_mailAccount.inc:322
+#: plugins/admin/groups/class_groupMail.inc:405
+msgid ""
+"You're trying to add an invalid email address to the list of alternate "
+"addresses."
+msgstr ""
+"Vous essayez d'ajouter une adresse de messagerie non valide à la liste des "
+"adresses alternatives."
+
+#: plugins/personal/mail/class_mailAccount.inc:332
+#: plugins/admin/groups/class_groupMail.inc:410
+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:714
+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:719
+#: plugins/admin/groups/class_groupMail.inc:798
+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:723
+#: plugins/personal/mail/class_mailAccount.inc:727
+#: plugins/addons/addressbook/class_addressbook.inc:588
+#: plugins/admin/ogroups/class_mailogroup.inc:70
+msgid "Please enter a valid email address in 'Primary address' field."
+msgstr ""
+"Veuillez entrer une adresse de messagerie valide dans le champ 'Adresse "
+"Principale'."
+
+#: plugins/personal/mail/class_mailAccount.inc:733
+#: plugins/admin/groups/class_groupMail.inc:807
+#: plugins/admin/ogroups/class_mailogroup.inc:77
+msgid "The primary address you've entered is already in use."
+msgstr "L'adresse principale entrée est déjà utilisée."
+
+#: plugins/personal/mail/class_mailAccount.inc:739
+#: plugins/admin/groups/class_groupMail.inc:813
+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:748
+#: plugins/admin/groups/class_groupMail.inc:822
+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:758
+#: plugins/admin/groups/class_groupMail.inc:830
+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:762
+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/generic.tpl:7 plugins/personal/mail/copypaste.tpl:7
 #: plugins/admin/groups/mail.tpl:10 plugins/admin/groups/paste_mail.tpl:8
@@ -649,9 +776,9 @@ 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_systemManagement.inc:921
+#: plugins/admin/systems/class_systemManagement.inc:922
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:586
+#: plugins/admin/ogroups/class_ogroupManagement.inc:587
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
 msgstr "Serveur"
@@ -665,7 +792,7 @@ msgid "Quota usage"
 msgstr "Utilisation des Quota"
 
 #: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
-#: plugins/admin/systems/class_terminalInfo.inc:169
+#: plugins/admin/systems/class_terminalInfo.inc:170
 #: plugins/admin/systems/class_printGeneric.inc:424
 msgid "not defined"
 msgstr "non défini"
@@ -690,8 +817,8 @@ msgstr "Liste des adresses de messagerie alternatives"
 #: plugins/personal/mail/mail_locals.tpl:41
 #: plugins/personal/mail/copypaste.tpl:21
 #: plugins/personal/mail/copypaste.tpl:44
-#: plugins/personal/posix/posix_groups.tpl:65
 #: plugins/personal/posix/trust_machines.tpl:39
+#: plugins/personal/posix/posix_groups.tpl:65
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
 #: plugins/personal/samba/samba3.tpl:330
@@ -707,45 +834,44 @@ msgstr "Liste des adresses de messagerie alternatives"
 #: plugins/gofax/blocklists/generic.tpl:63
 #: plugins/gofax/faxaccount/generic.tpl:76
 #: plugins/gofax/faxaccount/locals.tpl:60
-#: plugins/gofax/faxaccount/lists.tpl:13
+#: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiPackage.tpl:71
-#: plugins/admin/fai/faiProfile.tpl:38 plugins/admin/fai/faiScript.tpl:48
-#: plugins/admin/fai/faiTemplate.tpl:41 plugins/admin/fai/faiHook.tpl:48
-#: plugins/admin/groups/mail.tpl:51 plugins/admin/groups/mail.tpl:95
+#: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
+#: plugins/admin/fai/faiScript.tpl:48 plugins/admin/fai/faiTemplate.tpl:41
+#: plugins/admin/fai/faiHook.tpl:48 plugins/admin/groups/mail.tpl:51
+#: plugins/admin/groups/mail.tpl:95
 #: plugins/admin/groups/class_groupMail.inc:533
 #: plugins/admin/groups/application.tpl:15
 #: plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/generic.tpl:104
 #: plugins/admin/groups/mail_locals.tpl:66
 #: plugins/admin/groups/paste_mail.tpl:30
-#: plugins/admin/groups/paste_mail.tpl:41
-#: plugins/admin/systems/servservice.tpl:20
-#: plugins/admin/systems/servservice.tpl:47
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
+#: plugins/admin/groups/paste_mail.tpl:41 plugins/admin/systems/glpi.tpl:100
+#: plugins/admin/systems/glpiPrinter.tpl:93
+#: plugins/admin/systems/glpiPrinter.tpl:121
+#: plugins/admin/systems/glpi_edit_type.tpl:8
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:7
 #: plugins/admin/systems/workstationStartup.tpl:61
 #: plugins/admin/systems/workstationStartup.tpl:81
 #: plugins/admin/systems/workstationStartup.tpl:100
 #: plugins/admin/systems/servdns.tpl:6
-#: plugins/admin/systems/phonesettings.tpl:176
-#: plugins/admin/systems/phonesettings.tpl:191
 #: plugins/admin/systems/terminalStartup.tpl:61
 #: plugins/admin/systems/terminalStartup.tpl:80
-#: plugins/admin/systems/servRepositorySetup.tpl:36
-#: plugins/admin/systems/glpi_edit_type.tpl:8
 #: plugins/admin/systems/glpiManufacturer.tpl:6
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
-#: plugins/admin/systems/glpi_edit_os.tpl:8
 #: plugins/admin/systems/class_termDNS.inc:461
 #: plugins/admin/systems/class_termDNS.inc:482
-#: plugins/admin/systems/glpi.tpl:100
 #: plugins/admin/systems/servdnseditzone.tpl:102
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/glpiPrinter.tpl:93
-#: plugins/admin/systems/glpiPrinter.tpl:121
-#: plugins/admin/systems/class_servDNSeditZone.inc:478
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:270
-#: plugins/admin/ogroups/ogroup_objects.tpl:50
+#: plugins/admin/systems/servRepositorySetup.tpl:36
+#: plugins/admin/systems/servservice.tpl:20
+#: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/glpi_edit_os.tpl:8
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
+#: plugins/admin/systems/class_servDNSeditZone.inc:478
+#: plugins/admin/systems/phonesettings.tpl:176
+#: plugins/admin/systems/phonesettings.tpl:191
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:270
+#: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/generic.tpl:39
 #: plugins/admin/ogroups/phonequeue.tpl:24
 #: plugins/gofon/phoneaccount/generic.tpl:13
@@ -768,38 +894,37 @@ msgstr "Ajouter"
 #: plugins/gofax/faxaccount/generic.tpl:78
 #: plugins/gofax/faxaccount/lists.tpl:14
 #: plugins/addons/addressbook/remove.tpl:14
-#: plugins/admin/fai/faiPartitionTable.tpl:45
-#: plugins/admin/fai/faiVariable.tpl:46 plugins/admin/fai/faiScript.tpl:46
-#: plugins/admin/fai/faiTemplate.tpl:43 plugins/admin/fai/remove.tpl:15
-#: plugins/admin/fai/faiHook.tpl:46 plugins/admin/fai/remove_branch.tpl:14
+#: plugins/admin/fai/faiVariable.tpl:46
+#: plugins/admin/fai/faiPartitionTable.tpl:45 plugins/admin/fai/remove.tpl:15
+#: plugins/admin/fai/faiScript.tpl:46 plugins/admin/fai/faiTemplate.tpl:43
+#: plugins/admin/fai/remove_branch.tpl:14 plugins/admin/fai/faiHook.tpl:46
 #: plugins/admin/groups/mail.tpl:52 plugins/admin/groups/mail.tpl:97
 #: plugins/admin/groups/remove.tpl:14 plugins/admin/groups/generic.tpl:106
 #: plugins/admin/groups/paste_mail.tpl:31
 #: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/users/remove.tpl:14
 #: plugins/admin/applications/remove.tpl:13
 #: plugins/admin/departments/remove.tpl:14
-#: plugins/admin/systems/servservice.tpl:22
-#: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/glpi_edit_type.tpl:10
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/workstationStartup.tpl:62
 #: plugins/admin/systems/workstationStartup.tpl:82
-#: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
-#: plugins/admin/systems/phonesettings.tpl:177
-#: plugins/admin/systems/phonesettings.tpl:192
-#: plugins/admin/systems/remove.tpl:14
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
 #: plugins/admin/systems/terminalStartup.tpl:62
-#: plugins/admin/systems/glpi_edit_type.tpl:10
-#: plugins/admin/systems/remove_glpi.tpl:14
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
-#: plugins/admin/systems/glpi_edit_os.tpl:10
 #: plugins/admin/systems/class_termDNS.inc:476
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:192
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
+#: plugins/admin/systems/servservice.tpl:22
+#: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/glpi_edit_os.tpl:10
+#: plugins/admin/systems/remove_glpi.tpl:14
+#: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
 #: plugins/admin/systems/class_servDNSeditZone.inc:279
 #: plugins/admin/systems/class_servDNSeditZone.inc:472
-#: plugins/admin/ogroups/generic.tpl:40 plugins/admin/ogroups/remove.tpl:14
-#: plugins/admin/ogroups/phonequeue.tpl:25 plugins/gofon/macro/remove.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:15
+#: plugins/admin/systems/phonesettings.tpl:177
+#: plugins/admin/systems/phonesettings.tpl:192
+#: plugins/admin/systems/remove.tpl:14 plugins/admin/ogroups/generic.tpl:40
+#: plugins/admin/ogroups/remove.tpl:14 plugins/admin/ogroups/phonequeue.tpl:25
+#: plugins/gofon/macro/remove.tpl:13 plugins/gofon/phoneaccount/generic.tpl:15
 #: plugins/gofon/phoneaccount/paste_generic.tpl:15
 #: plugins/gofon/conference/remove.tpl:14
 msgid "Delete"
@@ -917,6 +1042,7 @@ msgstr "Sélectionner les adresses à ajouter"
 #: plugins/gofax/blocklists/headpage.tpl:29
 #: plugins/gofax/faxaccount/locals.tpl:19
 #: plugins/addons/addressbook/contents.tpl:58
+#: plugins/addons/godfs/contents.tpl:31
 #: plugins/admin/fai/faiProfileEntry.tpl:31
 #: plugins/admin/fai/faiPackageEntry.tpl:32 plugins/admin/fai/headpage.tpl:64
 #: plugins/admin/groups/headpage.tpl:30
@@ -924,14 +1050,14 @@ msgstr "Sélectionner les adresses à ajouter"
 #: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
 #: plugins/admin/applications/headpage.tpl:47
 #: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
-#: plugins/admin/systems/headpage.tpl:29
+#: plugins/admin/systems/glpiDeviceManagement.tpl:27
 #: plugins/admin/systems/servRepository.tpl:36
 #: plugins/admin/systems/glpiSelectUser.tpl:27
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:27
+#: plugins/admin/systems/headpage.tpl:29
 #: plugins/admin/systems/glpiAttachmentPool.tpl:27
-#: plugins/admin/systems/glpiDeviceManagement.tpl:27
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/admin/ogroups/headpage.tpl:29 plugins/gofon/macro/headpage.tpl:29
 #: plugins/gofon/conference/headpage.tpl:29
@@ -941,8 +1067,8 @@ msgid "Filters"
 msgstr "Filtres"
 
 #: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:32
 #: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:32
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/personal/environment/selectPrinterDialog.tpl:34
 #: plugins/gofax/faxaccount/locals.tpl:29
@@ -971,151 +1097,28 @@ msgstr "Afficher les adresses de l'utilisateur"
 msgid "User name of which addresses are shown"
 msgstr "Utilisateur dont on montre les adresses"
 
-#: plugins/personal/mail/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:75
-#, php-format
-msgid "There is no mail method '%s' specified in your gosa.conf available."
-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:176
-msgid "No DESC tag in vacation file:"
-msgstr "Pas de drapeau DESC dans le message d'absence:"
-
-#: plugins/personal/mail/class_mailAccount.inc:216
-msgid "This account has no mail extensions."
-msgstr "Ce compte n'a pas d'extensions de messagerie."
-
-#: plugins/personal/mail/class_mailAccount.inc:225
-#: plugins/admin/groups/class_groupMail.inc:314
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid "Remove mail account"
-msgstr "Supprimer le compte de messagerie"
-
-#: plugins/personal/mail/class_mailAccount.inc:226
-#: plugins/admin/groups/class_groupMail.inc:315
-msgid ""
-"This account has mail features enabled. You can disable them by clicking "
-"below."
-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:228
-#: plugins/admin/groups/class_groupMail.inc:317
-#: plugins/admin/ogroups/class_mailogroup.inc:43
-msgid "Create mail account"
-msgstr "Créer un compte de messagerie"
-
-#: plugins/personal/mail/class_mailAccount.inc:228
-#: plugins/admin/groups/class_groupMail.inc:318
-msgid ""
-"This account has mail features disabled. You can enable them by clicking "
-"below."
-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:276
-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:282
-#: plugins/admin/groups/class_groupMail.inc:377
-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:317
-#: plugins/personal/mail/class_mailAccount.inc:322
-#: plugins/admin/groups/class_groupMail.inc:405
-msgid ""
-"You're trying to add an invalid email address to the list of alternate "
-"addresses."
-msgstr ""
-"Vous essayez d'ajouter une adresse de messagerie non valide à la liste des "
-"adresses alternatives."
-
-#: plugins/personal/mail/class_mailAccount.inc:332
-#: plugins/admin/groups/class_groupMail.inc:410
-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:714
-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:719
-#: plugins/admin/groups/class_groupMail.inc:798
-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:723
-#: plugins/personal/mail/class_mailAccount.inc:727
-#: plugins/addons/addressbook/class_addressbook.inc:588
-#: plugins/admin/ogroups/class_mailogroup.inc:70
-msgid "Please enter a valid email address in 'Primary address' field."
-msgstr ""
-"Veuillez entrer une adresse de messagerie valide dans le champ 'Adresse "
-"Principale'."
-
-#: plugins/personal/mail/class_mailAccount.inc:733
-#: plugins/admin/groups/class_groupMail.inc:807
-#: plugins/admin/ogroups/class_mailogroup.inc:77
-msgid "The primary address you've entered is already in use."
-msgstr "L'adresse principale entrée est déjà utilisée."
-
-#: plugins/personal/mail/class_mailAccount.inc:739
-#: plugins/admin/groups/class_groupMail.inc:813
-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:748
-#: plugins/admin/groups/class_groupMail.inc:822
-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:758
-#: plugins/admin/groups/class_groupMail.inc:830
-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:762
-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/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
 #, fuzzy
 msgid "Mail settings"
 msgstr "Paramètres Nagios"
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:871
+#: plugins/admin/systems/class_systemManagement.inc:872
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
-#: ihtml/themes/altlinux/setup_useradmin.tpl:30
 #: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/default/setup_useradmin.tpl:30
+#: ihtml/themes/altlinux/setup_useradmin.tpl:30
 #: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
+#: ihtml/themes/default/setup_useradmin.tpl:30 ihtml/themes/lhs/login.tpl:37
+#: ihtml/themes/lhs/login.tpl:41 ihtml/themes/lhs/setup_useradmin.tpl:30
 msgid "Password"
 msgstr "Mot de passe"
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:801
-#: plugins/admin/users/class_userManagement.inc:808
+#: plugins/admin/users/class_userManagement.inc:802
+#: plugins/admin/users/class_userManagement.inc:809
 msgid "Change password"
 msgstr "Modifier le mot de passe"
 
@@ -1179,9 +1182,8 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
 #: plugins/addons/ldapmanager/contentexport.tpl:66
-#: plugins/admin/fai/class_faiManagement.inc:441
-#: plugins/admin/fai/faiNewBranch.tpl:52
-#: plugins/admin/departments/recursive_moce.tpl:10 include/functions.inc:1382
+#: plugins/admin/fai/faiNewBranch.tpl:50
+#: plugins/admin/departments/recursive_move.tpl:18 include/functions.inc:1382
 #: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_step3.tpl:17
@@ -1192,6 +1194,9 @@ msgstr ""
 #: ihtml/themes/default/setup_step3.tpl:17
 #: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_finish.tpl:30
+#: ihtml/themes/lhs/setup_useradmin.tpl:40 ihtml/themes/lhs/setup_step2.tpl:12
+#: ihtml/themes/lhs/setup_step3.tpl:17 ihtml/themes/lhs/setup_step4.tpl:114
+#: ihtml/themes/lhs/setup_finish.tpl:30
 msgid "Back"
 msgstr "Retour"
 
@@ -1239,6 +1244,19 @@ msgid "External password changer reported a problem: "
 msgstr ""
 "Le programme externe pour changer votre mot de passe à renvoyé une erreur: "
 
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Sélectionner les hôtes à ajouter"
+
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr "Afficher les systèmes du département"
+
+#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/systems/headpage.tpl:50
+msgid "Display systems matching"
+msgstr "Afficher les systèmes correspondant"
+
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
 msgstr "Sélectionner les groupes à ajouter"
@@ -1277,19 +1295,6 @@ msgstr ""
 msgid "Password expires on"
 msgstr "Le mot de passe expirera le"
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
-msgstr "Sélectionner les hôtes à ajouter"
-
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
-msgstr "Afficher les systèmes du département"
-
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:50
-msgid "Display systems matching"
-msgstr "Afficher les systèmes correspondant"
-
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
@@ -1348,6 +1353,10 @@ msgstr "Système de Confiance"
 msgid "Trust mode"
 msgstr "Mode de confiance"
 
+#: plugins/personal/posix/main.inc:131
+msgid "Unix settings"
+msgstr "Paramètres unix"
+
 #: plugins/personal/posix/class_posixAccount.inc:16
 #: plugins/generic/references/class_reference.inc:22
 msgid "UNIX"
@@ -1363,9 +1372,9 @@ msgid "unconfigured"
 msgstr "non configuré"
 
 #: plugins/personal/posix/class_posixAccount.inc:195
-#: plugins/admin/systems/class_terminalService.inc:141
 #: plugins/admin/systems/class_workstationService.inc:134
 #: plugins/admin/systems/class_workstationStartup.inc:623
+#: plugins/admin/systems/class_terminalService.inc:141
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:211
 msgid "automatic"
 msgstr "automatique"
@@ -1567,7 +1576,7 @@ msgstr "Décembre"
 #: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/admin/systems/class_terminalGeneric.inc:60
 #: ihtml/themes/altlinux/setup_step4.tpl:91
-#: ihtml/themes/default/setup_step4.tpl:91
+#: ihtml/themes/default/setup_step4.tpl:91 ihtml/themes/lhs/setup_step4.tpl:91
 msgid "disabled"
 msgstr "désactivé"
 
@@ -1663,10 +1672,6 @@ msgstr ""
 msgid "Too many users, can't allocate a free ID!"
 msgstr "Trop d'utilisateurs, impossible d'assigner un ID libre!"
 
-#: plugins/personal/posix/main.inc:131
-msgid "Unix settings"
-msgstr "Paramètres unix"
-
 #: plugins/personal/posix/paste_generic.tpl:4
 #, fuzzy
 msgid "Posix settings"
@@ -1801,6 +1806,10 @@ msgstr "Le compte expire après"
 msgid "Allow connection from these workstations only"
 msgstr "Permet la connections depuis ces stations seulement"
 
+#: plugins/personal/samba/main.inc:123
+msgid "Samba settings"
+msgstr "Configuration Samba"
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "Sélectionner les stations à ajouter"
@@ -1809,10 +1818,6 @@ msgstr "Sélectionner les stations à ajouter"
 msgid "Display workstations of department"
 msgstr "Afficher les stations d'un département"
 
-#: plugins/personal/samba/main.inc:123
-msgid "Samba settings"
-msgstr "Configuration Samba"
-
 #: plugins/personal/samba/class_sambaAccount.inc:196
 msgid "This account has no samba extensions."
 msgstr "Aucune extension samba pour cet utilisateur."
@@ -1919,6 +1924,10 @@ msgstr ""
 "Erreur: Impossible d'identifier le groupe principal de l'utilisateur - la "
 "transformation vers un groupe samba est impossible!"
 
+#: plugins/personal/environment/main.inc:124
+msgid "User environment settings"
+msgstr "Utiliser les préférences d'environnement"
+
 #: plugins/personal/environment/class_hotplugDialog.inc:111
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr ""
@@ -1943,11 +1952,6 @@ msgstr "Une entrée avec ce nom existe déjà."
 msgid "Please select an entry or press cancel."
 msgstr "Veuillez sélectionner une entrée ou cliquez sur annuler."
 
-#: plugins/personal/environment/class_selectPrinterDialog.inc:67
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:99
-msgid "Please select a printer or press cancel."
-msgstr "Veuillez sélectionner une imprimante ou cliquez sur annuler."
-
 #: plugins/personal/environment/hotplugDialog.tpl:1
 msgid "Add hotplug devices"
 msgstr "Ajouter des périphériques hotplug"
@@ -1977,6 +1981,11 @@ msgid "Regular expression for        matching hotplugs"
 msgstr ""
 "Expression régulière concordant avec les noms des périphériques hotplug"
 
+#: plugins/personal/environment/class_selectPrinterDialog.inc:67
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:99
+msgid "Please select a printer or press cancel."
+msgstr "Veuillez sélectionner une imprimante ou cliquez sur annuler."
+
 #: plugins/personal/environment/class_environment.inc:253
 #: plugins/personal/environment/class_environment.inc:290
 msgid "Remove environment extension"
@@ -2024,8 +2033,8 @@ msgstr "Aucun"
 
 #: plugins/personal/environment/class_environment.inc:510
 #: plugins/personal/environment/class_environment.inc:521
-#: plugins/admin/systems/class_terminalStartup.inc:134
 #: plugins/admin/systems/class_workstationStartup.inc:503
+#: plugins/admin/systems/class_terminalStartup.inc:134
 msgid "You must specify a valid mount point."
 msgstr "Veuillez indiquer un point de montage valide."
 
@@ -2136,9 +2145,9 @@ msgid "Resolution"
 msgstr "Résolution"
 
 #: plugins/personal/environment/environment.tpl:105
-#: plugins/admin/systems/servservice.tpl:11
 #: plugins/admin/systems/workstationStartup.tpl:86
 #: plugins/admin/systems/terminalStartup.tpl:66
+#: plugins/admin/systems/servservice.tpl:11
 msgid "Shares"
 msgstr "Partages"
 
@@ -2152,13 +2161,14 @@ msgstr "Partages"
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:266
 #: plugins/admin/groups/class_groupMail.inc:537
 #: plugins/admin/applications/class_applicationParameters.inc:100
+#: plugins/admin/systems/glpiPrinter.tpl:122
 #: plugins/admin/systems/workstationStartup.tpl:101
-#: plugins/admin/systems/printer.tpl:48 plugins/admin/systems/servdns.tpl:8
+#: plugins/admin/systems/servdns.tpl:8
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/glpiManufacturer.tpl:8
-#: plugins/admin/systems/glpiPrinter.tpl:122
+#: plugins/admin/systems/printer.tpl:48
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:274
-#: ihtml/themes/altlinux/islocked.tpl:13
+#: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/lhs/islocked.tpl:13
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -2181,9 +2191,9 @@ msgid "Hotplug device settings"
 msgstr "Paramètre des périphériques Hotplug"
 
 #: plugins/personal/environment/environment.tpl:164
-#: plugins/admin/groups/class_groupManagement.inc:455
+#: plugins/admin/groups/class_groupManagement.inc:456
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:273
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
 msgid "New"
 msgstr "Nouveau"
 
@@ -2199,14 +2209,6 @@ msgstr "Paramètres de l'imprimante"
 msgid "Admin Toggle"
 msgstr "Mode Administrateur"
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:96
-msgid "Specified name is invalid."
-msgstr "Le nom spécifié est invalide."
-
-#: plugins/personal/environment/class_logonManagementDialog.inc:100
-msgid "Specified description contains invalid characters."
-msgstr "La description contient des caractères invalides."
-
 #: plugins/personal/environment/logonManagement.tpl:8
 msgid "Logon script settings"
 msgstr "Paramètres des scripts de démarrage"
@@ -2217,22 +2219,21 @@ msgstr "Nom du script"
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:41
+#: plugins/gofax/blocklists/generic.tpl:41 plugins/addons/godfs/generic.tpl:12
+#: plugins/addons/godfs/generic.tpl:38 plugins/admin/fai/faiVariable.tpl:19
 #: plugins/admin/fai/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiVariable.tpl:19
-#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
-#: plugins/admin/fai/faiProfile.tpl:19
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:11
-#: plugins/admin/fai/faiScript.tpl:19
+#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
+#: plugins/admin/fai/faiProfile.tpl:19 plugins/admin/fai/faiScript.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:17
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHookEntry.tpl:17
 #: plugins/admin/fai/faiTemplateEntry.tpl:11 plugins/admin/fai/faiHook.tpl:19
 #: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/component.tpl:25 plugins/admin/systems/server.tpl:25
-#: plugins/admin/systems/phone.tpl:25 plugins/admin/systems/printer.tpl:13
-#: plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/server.tpl:25 plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/component.tpl:25 plugins/admin/systems/phone.tpl:25
+#: plugins/admin/systems/printer.tpl:13
 #: plugins/admin/systems/wingeneric.tpl:25
 #: plugins/admin/ogroups/generic.tpl:13 plugins/gofon/macro/generic.tpl:36
 #: plugins/gofon/conference/generic.tpl:51
@@ -2264,46 +2265,28 @@ msgstr "Script de démarrage"
 
 #: plugins/personal/environment/logonManagement.tpl:75
 #: plugins/gofax/faxaccount/lists.tpl:31
-#: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiPackageConfiguration.tpl:6
+#: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiScriptEntry.tpl:68
+#: plugins/admin/fai/faiNewBranch.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:48
 #: plugins/admin/fai/faiPackageEntry.tpl:56
 #: plugins/admin/fai/faiHookEntry.tpl:70
 #: plugins/admin/fai/faiTemplateEntry.tpl:130
-#: plugins/admin/fai/faiNewBranch.tpl:19
-#: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/groups/application_options.tpl:8
-#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/systems/servRepositorySetup.tpl:41
+#: plugins/admin/systems/printerPPDDialog.tpl:22
 msgid "Apply"
 msgstr "Appliquer"
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:67
-#: plugins/personal/environment/class_kioskManagementDialog.inc:85
-#, php-format
-msgid "Can't delete '%s'. Error was: permission denied."
-msgstr "Impossible d'effacer '%s'. L'erreur est: permission interdite."
-
-#: plugins/personal/environment/class_kioskManagementDialog.inc:70
-#: plugins/personal/environment/class_kioskManagementDialog.inc:88
-#, php-format
-msgid "Can't delete '%s'. Errow was: file doesn't exist."
-msgstr "Impossible d'effacer '%s'. L'erreur est: le fichier n'existe pas."
-
-#: plugins/personal/environment/class_kioskManagementDialog.inc:130
-msgid ""
-"There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
-msgstr ""
-"La variable KIOSPATH n'est pas définie dans votre gosa.conf. Impossible de "
-"gérer des profiles kiosk!"
+#: plugins/personal/environment/class_logonManagementDialog.inc:96
+msgid "Specified name is invalid."
+msgstr "Le nom spécifié est invalide."
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:136
-#, php-format
-msgid "Kiosk path '%s' is not accessible. Please check the permissions."
-msgstr ""
-"Le chemin vers le répertoire kiosk '%s' n'est pas accessible. Veuillez "
-"vérifier les permissions."
+#: plugins/personal/environment/class_logonManagementDialog.inc:100
+msgid "Specified description contains invalid characters."
+msgstr "La description contient des caractères invalides."
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:1
 msgid "Create new hotplug entry"
@@ -2326,6 +2309,32 @@ msgstr "Identification du périphérique"
 msgid "save"
 msgstr "Sauvegarder"
 
+#: plugins/personal/environment/class_kioskManagementDialog.inc:67
+#: plugins/personal/environment/class_kioskManagementDialog.inc:85
+#, php-format
+msgid "Can't delete '%s'. Error was: permission denied."
+msgstr "Impossible d'effacer '%s'. L'erreur est: permission interdite."
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:70
+#: plugins/personal/environment/class_kioskManagementDialog.inc:88
+#, php-format
+msgid "Can't delete '%s'. Errow was: file doesn't exist."
+msgstr "Impossible d'effacer '%s'. L'erreur est: le fichier n'existe pas."
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:130
+msgid ""
+"There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
+msgstr ""
+"La variable KIOSPATH n'est pas définie dans votre gosa.conf. Impossible de "
+"gérer des profiles kiosk!"
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:136
+#, php-format
+msgid "Kiosk path '%s' is not accessible. Please check the permissions."
+msgstr ""
+"Le chemin vers le répertoire kiosk '%s' n'est pas accessible. Veuillez "
+"vérifier les permissions."
+
 #: plugins/personal/environment/kioskManagement.tpl:1
 #: plugins/personal/environment/kioskManagement.tpl:5
 msgid "Kiosk profile management"
@@ -2338,20 +2347,156 @@ msgid "Browse"
 msgstr "Parcourir"
 
 #: plugins/personal/environment/kioskManagement.tpl:25
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
 #: plugins/admin/systems/glpi_edit_type.tpl:15
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:14
 #: plugins/admin/systems/glpiManufacturer.tpl:13
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
 #: plugins/admin/systems/glpi_edit_os.tpl:15
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:14
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
 #: include/class_MultiSelectWindow.inc:45
 msgid "Close"
 msgstr "Fermer"
 
-#: plugins/personal/environment/main.inc:124
-msgid "User environment settings"
-msgstr "Utiliser les préférences d'environnement"
+#: plugins/personal/generic/class_user.inc:256
+msgid "female"
+msgstr "féminin"
+
+#: plugins/personal/generic/class_user.inc:256
+msgid "male"
+msgstr "masculin"
+
+#: plugins/personal/generic/class_user.inc:270
+msgid "This account has no valid GOsa extensions."
+msgstr "Ce compte n'a pas d'extensions GOsa valides."
+
+#: plugins/personal/generic/class_user.inc:324
+msgid "The specified file has not been uploaded via HTTP POST! Aborted."
+msgstr "Ce fichier n'a pas été téléchargé via la méthode HTTP POST! Abandon."
+
+#: plugins/personal/generic/class_user.inc:420
+msgid "Please enter a valid serial number"
+msgstr "Veuillez entrer un numéro de série valide"
+
+#: plugins/personal/generic/class_user.inc:457
+#, php-format
+msgid "Certificate is valid from %s to %s and is currently %s."
+msgstr "Le certificat est valide de %s à %s et est actuellement %s."
+
+#: plugins/personal/generic/class_user.inc:457
+msgid "valid"
+msgstr "valide"
+
+#: plugins/personal/generic/class_user.inc:457
+msgid "invalid"
+msgstr "invalide"
+
+#: plugins/personal/generic/class_user.inc:461
+msgid "No certificate installed"
+msgstr "Pas de certificat installé"
+
+#: plugins/personal/generic/class_user.inc:879
+msgid "Kerberos database communication failed"
+msgstr "La communication vers la base de données kerberos a échoué"
+
+#: plugins/personal/generic/class_user.inc:896
+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:907
+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:947
+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:952
+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:958
+#: plugins/addons/addressbook/class_addressbook.inc:545
+#: plugins/admin/users/class_userManagement.inc:634
+msgid "The required field 'Name' is not set."
+msgstr "Le champ obligatoire 'Nom' n'est pas rempli."
+
+#: plugins/personal/generic/class_user.inc:967
+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:973
+#: plugins/addons/addressbook/class_addressbook.inc:549
+#: plugins/admin/users/class_userManagement.inc:637
+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:976
+msgid "The required field 'Login' is not set."
+msgstr "Le champ obligatoire 'Identifiant' n'est pas renseigné."
+
+#: plugins/personal/generic/class_user.inc:983
+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:990
+msgid ""
+"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+"Le champ 'Identifiant' contient des caractères invalides. Les minuscules, "
+"chiffres et tirets sont autorisés."
+
+#: plugins/personal/generic/class_user.inc:993
+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:996
+#: plugins/personal/generic/class_user.inc:1021
+#: plugins/addons/addressbook/class_addressbook.inc:555
+#: plugins/addons/addressbook/class_addressbook.inc:583
+#: plugins/admin/departments/class_departmentGeneric.inc:211
+msgid "The field 'Name' contains invalid characters."
+msgstr "Le champ 'Nom' contient des caractères invalides."
+
+#: plugins/personal/generic/class_user.inc:999
+#: plugins/personal/generic/class_user.inc:1018
+#: plugins/addons/addressbook/class_addressbook.inc:558
+#: plugins/addons/addressbook/class_addressbook.inc:580
+msgid "The field 'Given name' contains invalid characters."
+msgstr "Le champ 'Nom complet' contient des caractères invalides."
+
+#: plugins/personal/generic/class_user.inc:1004
+#: plugins/addons/addressbook/class_addressbook.inc:563
+#: plugins/addons/addressbook/class_addressbook.inc:566
+#: plugins/admin/departments/class_departmentGeneric.inc:214
+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:1007
+#: plugins/addons/addressbook/class_addressbook.inc:569
+#: plugins/admin/departments/class_departmentGeneric.inc:217
+msgid "The field 'Fax' contains an invalid phone number."
+msgstr "Le champ 'Fax' contient un numéro invalide."
+
+#: plugins/personal/generic/class_user.inc:1010
+#: plugins/addons/addressbook/class_addressbook.inc:572
+msgid "The field 'Mobile' contains an invalid phone number."
+msgstr "Le champ 'GSM' contient un numéro invalide."
+
+#: plugins/personal/generic/class_user.inc:1013
+#: plugins/addons/addressbook/class_addressbook.inc:575
+msgid "The field 'Pager' contains an invalid phone number."
+msgstr "Le champ 'Bip' contient un numéro invalide."
+
+#: plugins/personal/generic/class_user.inc:1140
+msgid "Could not open specified certificate!"
+msgstr "Impossible d'ouvrir le certificat demandé!"
 
 #: plugins/personal/generic/password.tpl:2
 msgid ""
@@ -2363,38 +2508,18 @@ msgstr ""
 "cette raison vous devez ressaisir votre mot de passe afin que GOsa puisse le "
 "réencoder et l'enregistrer dans l'annuaire LDAP."
 
-#: plugins/personal/generic/generic_picture.tpl:5
-#: plugins/personal/generic/generic_picture.tpl:15
+#: 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_picture.tpl:5
+#: plugins/personal/generic/generic_picture.tpl:15
 #: plugins/personal/generic/paste_generic.tpl:41
 msgid "Personal picture"
 msgstr "Image personnelle"
 
-#: plugins/personal/generic/generic_picture.tpl:27
-#: plugins/personal/generic/paste_generic.tpl:27
-msgid "Remove picture"
-msgstr "Suppression de l'image personnelle"
-
-#: plugins/personal/generic/generic_picture.tpl:33
-#: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
-#: plugins/admin/systems/servnfs.tpl:75
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
-#: plugins/admin/systems/servdnseditzone.tpl:117
-#: plugins/admin/systems/glpi_devices.tpl:760
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
-#: include/class_MultiSelectWindow.inc:44
-#: ihtml/themes/default/copyPasteDialog.tpl:12
-msgid "Save"
-msgstr "Enregistrer"
-
-#: plugins/personal/generic/generic.tpl:6
-msgid "Personal information"
-msgstr "Informations personnelles"
-
 #: plugins/personal/generic/generic.tpl:24
 #: plugins/personal/generic/generic.tpl:34
 msgid "Change picture"
@@ -2425,8 +2550,8 @@ msgid "Login"
 msgstr "Identifiant"
 
 #: plugins/personal/generic/generic.tpl:67
-#: plugins/addons/addressbook/address_info.tpl:22
 #: plugins/addons/addressbook/address_edit.tpl:54
+#: plugins/addons/addressbook/address_info.tpl:22
 msgid "Personal title"
 msgstr "Titre Personnel"
 
@@ -2440,7 +2565,7 @@ msgstr "Date de naissance"
 
 #: plugins/personal/generic/generic.tpl:100
 #: ihtml/themes/altlinux/sizelimit.tpl:14
-#: ihtml/themes/default/sizelimit.tpl:14
+#: ihtml/themes/default/sizelimit.tpl:14 ihtml/themes/lhs/sizelimit.tpl:14
 msgid "Set"
 msgstr "Activer"
 
@@ -2454,30 +2579,31 @@ msgid "Preferred langage"
 msgstr "Langue préferée"
 
 #: plugins/personal/generic/generic.tpl:127
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
 #: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/admin/fai/class_faiManagement.inc:670
-#: plugins/admin/groups/class_groupManagement.inc:458
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
+#: plugins/addons/godfs/class_dfsManagment.inc:186
+#: plugins/admin/fai/class_faiManagement.inc:678
+#: plugins/admin/groups/class_groupManagement.inc:459
 #: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/users/class_userManagement.inc:786
+#: plugins/admin/users/class_userManagement.inc:787
 #: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_applicationManagement.inc:477
+#: plugins/admin/applications/class_applicationManagement.inc:480
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_departmentManagement.inc:302
-#: plugins/admin/systems/component.tpl:13 plugins/admin/systems/server.tpl:13
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/terminal.tpl:18
-#: plugins/admin/systems/class_systemManagement.inc:771
-#: plugins/admin/systems/printer.tpl:20
+#: plugins/admin/departments/class_departmentManagement.inc:303
+#: plugins/admin/systems/server.tpl:13 plugins/admin/systems/terminal.tpl:18
 #: plugins/admin/systems/workstation.tpl:27
+#: plugins/admin/systems/component.tpl:13
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/phone.tpl:13
+#: plugins/admin/systems/class_systemManagement.inc:772
+#: plugins/admin/systems/printer.tpl:20
 #: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:43
-#: plugins/admin/ogroups/class_ogroupManagement.inc:451
-#: plugins/admin/ogroups/generic.tpl:21
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:330
-#: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/ogroups/class_ogroupManagement.inc:452
+#: plugins/admin/ogroups/generic.tpl:21 plugins/gofon/macro/generic.tpl:20
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 #: plugins/gofon/conference/generic.tpl:33
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
 msgid "Base"
 msgstr "Base"
 
@@ -2488,10 +2614,10 @@ msgstr "Sélectionnez la branche où sera enregistrée l'utilisateur"
 #: plugins/personal/generic/generic.tpl:134
 #: plugins/admin/groups/generic.tpl:26
 #: plugins/admin/departments/generic.tpl:33
-#: plugins/admin/systems/component.tpl:18 plugins/admin/systems/server.tpl:18
-#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/terminal.tpl:23
-#: plugins/admin/systems/printer.tpl:25
+#: plugins/admin/systems/server.tpl:18 plugins/admin/systems/terminal.tpl:23
 #: plugins/admin/systems/workstation.tpl:32
+#: plugins/admin/systems/component.tpl:18 plugins/admin/systems/phone.tpl:18
+#: plugins/admin/systems/printer.tpl:25
 #: plugins/admin/systems/wingeneric.tpl:18
 #: plugins/admin/ogroups/generic.tpl:26
 #, fuzzy
@@ -2500,10 +2626,10 @@ msgstr "Sélectionnez un serveurs"
 
 #: plugins/personal/generic/generic.tpl:147
 #: plugins/personal/generic/generic.tpl:291
-#: plugins/addons/addressbook/address_info.tpl:33
-#: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/addons/addressbook/address_edit.tpl:72
 #: plugins/addons/addressbook/address_edit.tpl:182
+#: plugins/addons/addressbook/address_info.tpl:33
+#: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/admin/departments/generic.tpl:55
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
 msgid "Address"
@@ -2547,16 +2673,16 @@ msgid "Organization"
 msgstr "Entreprise"
 
 #: plugins/personal/generic/generic.tpl:213
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:323
-#: plugins/addons/addressbook/address_info.tpl:64
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
 #: plugins/addons/addressbook/address_edit.tpl:138
-#: plugins/admin/groups/class_groupManagement.inc:523
-#: plugins/admin/users/class_userManagement.inc:818
-#: plugins/admin/applications/class_applicationManagement.inc:518
-#: plugins/admin/systems/class_systemManagement.inc:791
-#: plugins/admin/ogroups/class_ogroupManagement.inc:517
-#: plugins/admin/ogroups/class_ogroupManagement.inc:585
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
+#: plugins/addons/addressbook/address_info.tpl:64
+#: plugins/admin/groups/class_groupManagement.inc:524
+#: plugins/admin/users/class_userManagement.inc:819
+#: plugins/admin/applications/class_applicationManagement.inc:521
+#: plugins/admin/systems/class_systemManagement.inc:792
+#: plugins/admin/ogroups/class_ogroupManagement.inc:518
+#: plugins/admin/ogroups/class_ogroupManagement.inc:586
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #: plugins/generic/references/class_reference.inc:38
 msgid "Department"
 msgstr "Département"
@@ -2580,12 +2706,13 @@ msgstr "No. de bureau."
 
 #: plugins/personal/generic/generic.tpl:257
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_info.tpl:40
-#: plugins/addons/addressbook/address_edit.tpl:95 html/getxls.php:236
+#: 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:283
+#: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:43
 #: plugins/admin/departments/generic.tpl:51
 #: plugins/admin/systems/workstation.tpl:18 html/getxls.php:174
@@ -2631,8 +2758,8 @@ msgid "Street"
 msgstr "Rue"
 
 #: plugins/personal/generic/generic.tpl:365
-#: plugins/addons/addressbook/address_info.tpl:70
-#: plugins/addons/addressbook/address_edit.tpl:158 html/getxls.php:174
+#: plugins/addons/addressbook/address_edit.tpl:158
+#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
 msgid "Postal code"
 msgstr "Code postal"
 
@@ -2652,6 +2779,26 @@ msgstr "Dernière distribution"
 msgid "Public visible"
 msgstr "Visible par tous"
 
+#: plugins/personal/generic/generic_picture.tpl:27
+#: plugins/personal/generic/paste_generic.tpl:27
+msgid "Remove picture"
+msgstr "Suppression de l'image personnelle"
+
+#: plugins/personal/generic/generic_picture.tpl:33
+#: plugins/addons/addressbook/address_edit.tpl:233
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
+#: plugins/admin/systems/servnfs.tpl:75
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
+#: plugins/admin/systems/servdnseditzone.tpl:117
+#: plugins/admin/systems/glpi_devices.tpl:760
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
+#: include/class_MultiSelectWindow.inc:44
+#: ihtml/themes/default/copyPasteDialog.tpl:12
+msgid "Save"
+msgstr "Enregistrer"
+
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr "Certificat standard"
@@ -2668,146 +2815,6 @@ msgstr "Certificat PKCS12"
 msgid "Certificate serial number"
 msgstr "Numéro de série du certificat"
 
-#: plugins/personal/generic/class_user.inc:256
-msgid "female"
-msgstr "féminin"
-
-#: plugins/personal/generic/class_user.inc:256
-msgid "male"
-msgstr "masculin"
-
-#: plugins/personal/generic/class_user.inc:270
-msgid "This account has no valid GOsa extensions."
-msgstr "Ce compte n'a pas d'extensions GOsa valides."
-
-#: plugins/personal/generic/class_user.inc:324
-msgid "The specified file has not been uploaded via HTTP POST! Aborted."
-msgstr "Ce fichier n'a pas été téléchargé via la méthode HTTP POST! Abandon."
-
-#: plugins/personal/generic/class_user.inc:420
-msgid "Please enter a valid serial number"
-msgstr "Veuillez entrer un numéro de série valide"
-
-#: plugins/personal/generic/class_user.inc:457
-#, php-format
-msgid "Certificate is valid from %s to %s and is currently %s."
-msgstr "Le certificat est valide de %s à %s et est actuellement %s."
-
-#: plugins/personal/generic/class_user.inc:457
-msgid "valid"
-msgstr "valide"
-
-#: plugins/personal/generic/class_user.inc:457
-msgid "invalid"
-msgstr "invalide"
-
-#: plugins/personal/generic/class_user.inc:461
-msgid "No certificate installed"
-msgstr "Pas de certificat installé"
-
-#: plugins/personal/generic/class_user.inc:879
-msgid "Kerberos database communication failed"
-msgstr "La communication vers la base de données kerberos a échoué"
-
-#: plugins/personal/generic/class_user.inc:896
-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:907
-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:947
-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:952
-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:958
-#: plugins/addons/addressbook/class_addressbook.inc:545
-#: plugins/admin/users/class_userManagement.inc:634
-msgid "The required field 'Name' is not set."
-msgstr "Le champ obligatoire 'Nom' n'est pas rempli."
-
-#: plugins/personal/generic/class_user.inc:967
-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:973
-#: plugins/addons/addressbook/class_addressbook.inc:549
-#: plugins/admin/users/class_userManagement.inc:637
-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:976
-msgid "The required field 'Login' is not set."
-msgstr "Le champ obligatoire 'Identifiant' n'est pas renseigné."
-
-#: plugins/personal/generic/class_user.inc:983
-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:990
-msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-"Le champ 'Identifiant' contient des caractères invalides. Les minuscules, "
-"chiffres et tirets sont autorisés."
-
-#: plugins/personal/generic/class_user.inc:993
-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:996
-#: plugins/personal/generic/class_user.inc:1021
-#: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/addons/addressbook/class_addressbook.inc:583
-#: plugins/admin/departments/class_departmentGeneric.inc:211
-msgid "The field 'Name' contains invalid characters."
-msgstr "Le champ 'Nom' contient des caractères invalides."
-
-#: plugins/personal/generic/class_user.inc:999
-#: plugins/personal/generic/class_user.inc:1018
-#: plugins/addons/addressbook/class_addressbook.inc:558
-#: plugins/addons/addressbook/class_addressbook.inc:580
-msgid "The field 'Given name' contains invalid characters."
-msgstr "Le champ 'Nom complet' contient des caractères invalides."
-
-#: plugins/personal/generic/class_user.inc:1004
-#: plugins/addons/addressbook/class_addressbook.inc:563
-#: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/admin/departments/class_departmentGeneric.inc:214
-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:1007
-#: plugins/addons/addressbook/class_addressbook.inc:569
-#: plugins/admin/departments/class_departmentGeneric.inc:217
-msgid "The field 'Fax' contains an invalid phone number."
-msgstr "Le champ 'Fax' contient un numéro invalide."
-
-#: plugins/personal/generic/class_user.inc:1010
-#: plugins/addons/addressbook/class_addressbook.inc:572
-msgid "The field 'Mobile' contains an invalid phone number."
-msgstr "Le champ 'GSM' contient un numéro invalide."
-
-#: plugins/personal/generic/class_user.inc:1013
-#: plugins/addons/addressbook/class_addressbook.inc:575
-msgid "The field 'Pager' contains an invalid phone number."
-msgstr "Le champ 'Bip' contient un numéro invalide."
-
-#: plugins/personal/generic/class_user.inc:1140
-msgid "Could not open specified certificate!"
-msgstr "Impossible d'ouvrir le certificat demandé!"
-
 #: plugins/personal/generic/main.inc:107
 msgid "You are not allowed to set your password!"
 msgstr "Vous n'êtes pas autorisé à modifier votre mot de passe!"
@@ -2854,14 +2861,18 @@ msgstr "Compte PPTP"
 msgid "Intranet account"
 msgstr "Créer un compte Intranet"
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:6
-msgid "WebDAV"
-msgstr "WebDAV"
-
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "Compte PHPGroupware"
 
+#: plugins/personal/connectivity/glpi.tpl:1
+msgid "GLPI account"
+msgstr "Compte GLPI"
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:6
+msgid "WebDAV"
+msgstr "WebDAV"
+
 #: plugins/personal/connectivity/kolab.tpl:1
 msgid "Kolab account"
 msgstr "Compte Kolab"
@@ -2963,10 +2974,6 @@ msgstr "Cliquez ici pour désactivez l'accès FTP"
 msgid "Temporary disable FTP access"
 msgstr "Désactiver temporairement l'accès FTP"
 
-#: plugins/personal/connectivity/glpi.tpl:1
-msgid "GLPI account"
-msgstr "Compte GLPI"
-
 #: plugins/personal/connectivity/oxchange.tpl:2
 msgid "Open-Xchange Account"
 msgstr "Compte Open-Xchange"
@@ -2999,6 +3006,27 @@ msgstr "Information Utilisateur"
 msgid "User Timezone"
 msgstr "Zone Horaire de l'utilisateur"
 
+#: plugins/personal/connectivity/opengw.tpl:1
+msgid "Opengroupware"
+msgstr "Compte PHPGroupware"
+
+#: plugins/personal/connectivity/opengw.tpl:8
+msgid "Location team"
+msgstr "Emplacement de l'équipe"
+
+#: plugins/personal/connectivity/opengw.tpl:21
+msgid "Template user"
+msgstr "Modèle d'utilisateur"
+
+#: plugins/personal/connectivity/opengw.tpl:34
+#: plugins/admin/systems/class_workstationGeneric.inc:71
+msgid "Locked"
+msgstr "Verrouillé"
+
+#: plugins/personal/connectivity/opengw.tpl:49
+msgid "Teams"
+msgstr "Equipes"
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
@@ -3037,13 +3065,42 @@ msgstr "La valeur pour le quota est vide."
 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_intranetAccount.inc:14
+msgid "Intranet"
+msgstr "Intranet"
+
 #: plugins/personal/connectivity/class_pptpAccount.inc:26
 msgid "PPTP"
 msgstr "Compte PPTP"
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:14
-msgid "Intranet"
-msgstr "Intranet"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
+msgstr "FTP"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+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:140
+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:143
+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:146
+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:149
+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_phpgwAccount.inc:5
 msgid "PHPGroupware"
@@ -3119,38 +3176,13 @@ msgstr ""
 "Il n'y a pas d'utilisateur avec l'adresse de messagerie '%s' pour votre "
 "politique d'invitation!"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
-#: plugins/generic/references/class_reference.inc:34
-msgid "FTP"
-msgstr "FTP"
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
+msgstr "Compte WebDAV"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
-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:140
-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:143
-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:146
-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:149
-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_oxchangeAccount.inc:24
-msgid "Open-Xchange"
-msgstr "Open-Xchange"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
+msgid "Open-Xchange"
+msgstr "Open-Xchange"
 
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:613
 #, php-format
@@ -3204,39 +3236,6 @@ msgstr ""
 msgid "you are not using any strange characters in the loginname."
 msgstr ""
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
-msgstr "Compte WebDAV"
-
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
-msgid "PHPscheduleit"
-msgstr "Compte PHPscheduleit"
-
-#: plugins/personal/connectivity/class_connectivity.inc:63
-msgid "This account has no connectivity extensions."
-msgstr "Ce compte n'as pas d'extension de connectivité."
-
-#: plugins/personal/connectivity/opengw.tpl:1
-msgid "Opengroupware"
-msgstr "Compte PHPGroupware"
-
-#: plugins/personal/connectivity/opengw.tpl:8
-msgid "Location team"
-msgstr "Emplacement de l'équipe"
-
-#: plugins/personal/connectivity/opengw.tpl:21
-msgid "Template user"
-msgstr "Modèle d'utilisateur"
-
-#: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:71
-msgid "Locked"
-msgstr "Verrouillé"
-
-#: plugins/personal/connectivity/opengw.tpl:49
-msgid "Teams"
-msgstr "Equipes"
-
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 msgid "Opengroupware account"
 msgstr "Compte Opengroupware"
@@ -3265,6 +3264,58 @@ msgstr ""
 "OpenGorupware: Impossible de se connecter à la base de données spécifiée. "
 "Veuillez vérifier la configuration."
 
+#: plugins/personal/connectivity/class_connectivity.inc:63
+msgid "This account has no connectivity extensions."
+msgstr "Ce compte n'as pas d'extension de connectivité."
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
+msgid "PHPscheduleit"
+msgstr "Compte PHPscheduleit"
+
+#: plugins/gofax/blocklists/generic.tpl:8
+msgid "List name"
+msgstr "Liste des noms"
+
+#: plugins/gofax/blocklists/generic.tpl:10
+msgid "Name of blocklist"
+msgstr "Nom de la liste rouge"
+
+#: plugins/gofax/blocklists/generic.tpl:16
+msgid "Select subtree to place blocklist in"
+msgstr "Sélectionnez la branche où sera situé la liste rouge"
+
+#: plugins/gofax/blocklists/generic.tpl:32
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/systems/workstationService.tpl:42
+#: plugins/admin/systems/workstationService.tpl:120
+#: plugins/admin/systems/servnfs.tpl:39
+#: plugins/admin/systems/terminalService.tpl:42
+#: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/systems/glpi_devices.tpl:427
+#: plugins/admin/systems/glpi_devices.tpl:492
+#: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
+#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
+msgid "Type"
+msgstr "Type"
+
+#: plugins/gofax/blocklists/generic.tpl:34
+msgid "Select wether to filter incoming or outgoing calls"
+msgstr ""
+"Veuillez sélectionner si il faut filtrer sur les appels entrants ou sortants"
+
+#: plugins/gofax/blocklists/generic.tpl:43
+msgid "Descriptive text for this blocklist"
+msgstr "Texte descriptif pour cette liste rouge"
+
+#: plugins/gofax/blocklists/generic.tpl:56
+msgid "Blocked numbers"
+msgstr "Numéros bloqués"
+
+#: plugins/gofax/blocklists/generic.tpl:72
+msgid "Numbers can also contain wild cards."
+msgstr "Les nombres peuvent aussi contenir des jokers."
+
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
 msgid "FAX Blocklists"
 msgstr "Liste Rouge des Fax"
@@ -3283,74 +3334,76 @@ msgid "Please specify a valid phone number."
 msgstr "Veuillez entrer un numéro de téléphone valide."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/admin/fai/class_faiManagement.inc:635
+#: plugins/admin/fai/class_faiManagement.inc:641
 #: plugins/admin/groups/class_groupManagement.inc:451
 #: plugins/admin/users/class_userManagement.inc:778
-#: plugins/admin/applications/class_applicationManagement.inc:470
+#: plugins/admin/applications/class_applicationManagement.inc:472
 #: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
 #: plugins/admin/ogroups/class_ogroupManagement.inc:442
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
-msgid "Go up one department"
-msgstr "Monter d'un département"
+msgid "Go to root department"
+msgstr "Aller au département de base"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/admin/fai/class_faiManagement.inc:635
-#: plugins/admin/fai/class_faiProfile.inc:303
+#: plugins/addons/godfs/class_dfsManagment.inc:183
+#: plugins/admin/fai/class_faiManagement.inc:641
 #: plugins/admin/groups/class_groupManagement.inc:451
 #: plugins/admin/users/class_userManagement.inc:778
-#: plugins/admin/applications/class_applicationManagement.inc:470
+#: plugins/admin/applications/class_applicationManagement.inc:472
 #: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
-#: plugins/admin/systems/class_servDNSeditZone.inc:276
+#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: plugins/admin/ogroups/class_ogroupManagement.inc:442
-#: plugins/admin/ogroups/phonequeue.tpl:17
+#: plugins/admin/ogroups/class_ogroupManagement.inc:443
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
-msgid "Up"
-msgstr "Au dessus"
+msgid "Root"
+msgstr "Racine"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
-#: plugins/admin/fai/class_faiManagement.inc:638
+#: plugins/admin/fai/class_faiManagement.inc:644
 #: plugins/admin/groups/class_groupManagement.inc:452
 #: plugins/admin/users/class_userManagement.inc:779
-#: plugins/admin/applications/class_applicationManagement.inc:471
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:297
-#: plugins/admin/systems/class_systemManagement.inc:755
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_systemManagement.inc:755
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/class_ogroupManagement.inc:443
+#: plugins/admin/ogroups/class_ogroupManagement.inc:444
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
-msgid "Go to root department"
-msgstr "Aller au département de base"
+msgid "Go up one department"
+msgstr "Monter d'un département"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
-#: plugins/admin/fai/class_faiManagement.inc:638
+#: plugins/addons/godfs/class_dfsManagment.inc:182
+#: plugins/admin/fai/class_faiManagement.inc:644
+#: plugins/admin/fai/class_faiProfile.inc:303
 #: plugins/admin/groups/class_groupManagement.inc:452
 #: plugins/admin/users/class_userManagement.inc:779
-#: plugins/admin/applications/class_applicationManagement.inc:471
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:297
-#: plugins/admin/systems/class_systemManagement.inc:755
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_systemManagement.inc:755
+#: plugins/admin/systems/class_servDNSeditZone.inc:276
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
 #: plugins/admin/ogroups/class_ogroupManagement.inc:444
+#: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
-msgid "Root"
-msgstr "Racine"
+msgid "Up"
+msgstr "Au dessus"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:309
 #: plugins/admin/groups/class_groupManagement.inc:453
 #: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:472
-#: plugins/admin/systems/class_systemManagement.inc:757
+#: plugins/admin/applications/class_applicationManagement.inc:474
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
 #: plugins/admin/ogroups/class_ogroupManagement.inc:445
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
@@ -3359,13 +3412,13 @@ msgid "Go to users department"
 msgstr "Aller au département des utilisateurs"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:309
-#: plugins/admin/fai/class_faiManagement.inc:641
+#: plugins/admin/fai/class_faiManagement.inc:647
 #: plugins/admin/groups/class_groupManagement.inc:453
 #: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:472
+#: plugins/admin/applications/class_applicationManagement.inc:474
 #: plugins/admin/departments/class_departmentManagement.inc:298
-#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
 #: plugins/admin/ogroups/class_ogroupManagement.inc:446
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
@@ -3373,237 +3426,224 @@ msgstr "Aller au département des utilisateurs"
 msgid "Home"
 msgstr "Acceuil"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
+#: plugins/admin/fai/class_faiManagement.inc:649
+#: plugins/admin/groups/class_groupManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:781
+#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/departments/class_departmentManagement.inc:299
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/ogroups/class_ogroupManagement.inc:447
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
+msgid "Reload list"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
+#: plugins/addons/godfs/class_dfsManagment.inc:187
+#: plugins/admin/fai/class_faiManagement.inc:649
+#: plugins/admin/fai/class_faiManagement.inc:679
+#: plugins/admin/groups/class_groupManagement.inc:454
+#: plugins/admin/groups/class_groupManagement.inc:460
+#: plugins/admin/users/class_userManagement.inc:781
+#: plugins/admin/users/class_userManagement.inc:788
+#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/applications/class_applicationManagement.inc:481
+#: plugins/admin/departments/class_departmentManagement.inc:299
+#: plugins/admin/departments/class_departmentManagement.inc:304
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/ogroups/class_ogroupManagement.inc:447
+#: plugins/admin/ogroups/class_ogroupManagement.inc:453
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:332
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
+msgid "Submit"
+msgstr "Soumettre"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
 msgid "Create new blocklist"
 msgstr "Création d'un nouvelle liste rouge"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
 msgid "New Blocklist"
 msgstr "Nouvelle liste rouge"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/fai/class_faiManagement.inc:671
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:787
-#: plugins/admin/applications/class_applicationManagement.inc:478
-#: plugins/admin/departments/class_departmentManagement.inc:303
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_glpiSelectUser.inc:168
-#: plugins/admin/ogroups/class_ogroupManagement.inc:452
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
+#: plugins/addons/godfs/class_dfsManagment.inc:187
+#: plugins/admin/fai/class_faiManagement.inc:679
+#: plugins/admin/groups/class_groupManagement.inc:460
+#: plugins/admin/users/class_userManagement.inc:788
+#: plugins/admin/applications/class_applicationManagement.inc:481
+#: plugins/admin/departments/class_departmentManagement.inc:304
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/ogroups/class_ogroupManagement.inc:453
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:332
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
 msgid "Submit department"
 msgstr "Soumettre le département"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/fai/class_faiManagement.inc:671
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:787
-#: plugins/admin/applications/class_applicationManagement.inc:478
-#: plugins/admin/departments/class_departmentManagement.inc:303
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_glpiSelectUser.inc:168
-#: plugins/admin/ogroups/class_ogroupManagement.inc:452
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
-msgid "Submit"
-msgstr "Soumettre"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
 #: plugins/admin/fai/class_faiScript.inc:227
 #: plugins/admin/fai/class_faiScript.inc:230
-#: plugins/admin/fai/class_faiManagement.inc:689
-#: plugins/admin/fai/class_faiManagement.inc:789
-#: plugins/admin/fai/class_faiManagement.inc:794
+#: plugins/admin/fai/class_faiManagement.inc:697
+#: plugins/admin/fai/class_faiManagement.inc:797
+#: plugins/admin/fai/class_faiManagement.inc:802
 #: plugins/admin/fai/class_faiHook.inc:251
 #: plugins/admin/fai/class_faiHook.inc:254
-#: plugins/admin/groups/class_groupManagement.inc:469
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/users/class_userManagement.inc:798
-#: plugins/admin/users/class_userManagement.inc:805
-#: plugins/admin/applications/class_applicationManagement.inc:489
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/departments/class_departmentManagement.inc:310
-#: plugins/admin/systems/class_systemManagement.inc:780
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/groups/class_groupManagement.inc:470
+#: plugins/admin/groups/class_groupManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:806
+#: plugins/admin/applications/class_applicationManagement.inc:492
+#: plugins/admin/applications/class_applicationManagement.inc:498
+#: plugins/admin/departments/class_departmentManagement.inc:311
 #: plugins/admin/systems/glpi.tpl:15 plugins/admin/systems/glpi.tpl:25
 #: plugins/admin/systems/glpi.tpl:35 plugins/admin/systems/glpiPrinter.tpl:15
 #: plugins/admin/systems/glpiPrinter.tpl:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:464
-#: plugins/admin/ogroups/class_ogroupManagement.inc:469
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/ogroups/class_ogroupManagement.inc:465
+#: plugins/admin/ogroups/class_ogroupManagement.inc:470
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
 msgid "edit"
 msgstr "éditer"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
-#: plugins/admin/users/class_userManagement.inc:799
-#: plugins/admin/users/class_userManagement.inc:806
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
+#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:807
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 msgid "Edit user"
 msgstr "Editer un utilisateur"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
 #: plugins/addons/mailqueue/contents.tpl:93
 #: plugins/admin/fai/class_faiScript.inc:231
-#: plugins/admin/fai/class_faiManagement.inc:690
-#: plugins/admin/fai/class_faiManagement.inc:796
+#: plugins/admin/fai/class_faiManagement.inc:698
+#: plugins/admin/fai/class_faiManagement.inc:804
 #: plugins/admin/fai/class_faiHook.inc:255
-#: plugins/admin/groups/class_groupManagement.inc:471
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/users/class_userManagement.inc:802
-#: plugins/admin/users/class_userManagement.inc:809
-#: plugins/admin/applications/class_applicationManagement.inc:491
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/departments/class_departmentManagement.inc:311
-#: plugins/admin/systems/class_systemManagement.inc:781
-#: plugins/admin/ogroups/class_ogroupManagement.inc:466
-#: plugins/admin/ogroups/class_ogroupManagement.inc:471
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
+#: plugins/admin/groups/class_groupManagement.inc:472
+#: plugins/admin/groups/class_groupManagement.inc:477
+#: plugins/admin/users/class_userManagement.inc:803
+#: plugins/admin/users/class_userManagement.inc:810
+#: plugins/admin/applications/class_applicationManagement.inc:494
+#: plugins/admin/applications/class_applicationManagement.inc:500
+#: plugins/admin/departments/class_departmentManagement.inc:312
+#: plugins/admin/systems/class_systemManagement.inc:782
+#: plugins/admin/ogroups/class_ogroupManagement.inc:467
+#: plugins/admin/ogroups/class_ogroupManagement.inc:472
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:338
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
 msgid "delete"
 msgstr "supprimer"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
-#: plugins/admin/users/class_userManagement.inc:803
-#: plugins/admin/users/class_userManagement.inc:810
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
+#: plugins/admin/users/class_userManagement.inc:804
+#: plugins/admin/users/class_userManagement.inc:811
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:338
 msgid "Delete user"
 msgstr "Supprimer un utilisateur"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:323
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
 msgid "Blocklist name"
 msgstr "Nom de la liste rouge"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:325
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/fai/class_faiManagement.inc:686
-#: plugins/admin/groups/class_groupManagement.inc:525
-#: plugins/admin/users/class_userManagement.inc:820
-#: plugins/admin/applications/class_applicationManagement.inc:519
-#: plugins/admin/departments/class_departmentManagement.inc:318
-#: plugins/admin/systems/class_systemManagement.inc:792
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/fai/class_faiManagement.inc:694
+#: plugins/admin/groups/class_groupManagement.inc:526
+#: plugins/admin/users/class_userManagement.inc:821
+#: plugins/admin/applications/class_applicationManagement.inc:522
+#: plugins/admin/departments/class_departmentManagement.inc:319
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
-#: plugins/admin/ogroups/class_ogroupManagement.inc:494
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
+#: plugins/admin/systems/class_systemManagement.inc:793
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/ogroups/class_ogroupManagement.inc:495
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:345
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:313
 msgid "Actions"
 msgstr "Actions"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:327
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:328
 msgid "This table displays faxblocklists for the selected tree."
 msgstr "Ce tableau montre toutes les listes rouges, dans l'arbre sélectionné."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:395
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:396
 msgid "send"
 msgstr "envoyer"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:395
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:396
 msgid "receive"
 msgstr "recevoir"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:543
 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:548
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:549
 #: plugins/admin/departments/class_departmentGeneric.inc:199
 msgid "Required field 'Name' is not set."
 msgstr "Le champ obligatoire 'Nom' n'est pas rempli."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:551
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:552
 msgid "Required field 'Name' contains invalid characters"
 msgstr "Le champ obligatoire 'Nom' contient des caractères invalides"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:558
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:559
 msgid "Specified name is already used."
 msgstr "Le nom spécifié est déjà utilisé."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:565
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:566
 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/generic.tpl:8
-msgid "List name"
-msgstr "Liste des noms"
+#: plugins/gofax/blocklists/remove.tpl:2
+#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/fai/remove.tpl:2
+#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/groups/remove.tpl:2
+#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2
+#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/ogroups/remove.tpl:2 plugins/gofon/macro/remove.tpl:2
+#: plugins/gofon/conference/remove.tpl:2 html/index.php:237 html/index.php:243
+#: html/index.php:301 ihtml/themes/altlinux/conflict.tpl:6
+#: ihtml/themes/altlinux/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
+#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/lhs/conflict.tpl:6
+#: ihtml/themes/lhs/islocked.tpl:6
+msgid "Warning"
+msgstr "Avertissement"
 
-#: plugins/gofax/blocklists/generic.tpl:10
-msgid "Name of blocklist"
-msgstr "Nom de la liste rouge"
+#: 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/generic.tpl:16
-msgid "Select subtree to place blocklist in"
-msgstr "Sélectionnez la branche où sera situé la liste rouge"
-
-#: plugins/gofax/blocklists/generic.tpl:32
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
-#: plugins/admin/systems/workstationService.tpl:42
-#: plugins/admin/systems/workstationService.tpl:120
-#: plugins/admin/systems/servnfs.tpl:39
-#: plugins/admin/systems/terminalService.tpl:42
-#: plugins/admin/systems/terminalService.tpl:120
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
-#: plugins/admin/systems/glpi_devices.tpl:427
-#: plugins/admin/systems/glpi_devices.tpl:492
-#: plugins/admin/systems/glpi_devices.tpl:542
-#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
-msgid "Type"
-msgstr "Type"
-
-#: plugins/gofax/blocklists/generic.tpl:34
-msgid "Select wether to filter incoming or outgoing calls"
-msgstr ""
-"Veuillez sélectionner si il faut filtrer sur les appels entrants ou sortants"
-
-#: plugins/gofax/blocklists/generic.tpl:43
-msgid "Descriptive text for this blocklist"
-msgstr "Texte descriptif pour cette liste rouge"
-
-#: plugins/gofax/blocklists/generic.tpl:56
-msgid "Blocked numbers"
-msgstr "Numéros bloqués"
-
-#: plugins/gofax/blocklists/generic.tpl:72
-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/fai/remove.tpl:2
-#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/groups/remove.tpl:2
-#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:237 html/index.php:243 html/index.php:301
-#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/altlinux/islocked.tpl:6
-#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
-msgid "Warning"
-msgstr "Avertissement"
-
-#: plugins/gofax/blocklists/remove.tpl:6
-#: plugins/admin/systems/remove_glpi.tpl:6
-msgid ""
-"Please double check if your really want to do this since there is no way for "
-"GOsa to get your data back."
-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/fai/remove_branch.tpl:10 plugins/admin/groups/remove.tpl:10
-#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
-#: plugins/admin/ogroups/remove.tpl:10 plugins/gofon/macro/remove.tpl:9
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"D'accord - si vous êtes sur - cliquez sur 'Supprimer' pour continuer ou sur "
-"'Annuler' pour abandonner."
+#: plugins/gofax/blocklists/remove.tpl:10
+#: plugins/addons/addressbook/remove.tpl:10
+#: plugins/admin/fai/remove_branch.tpl:10 plugins/admin/groups/remove.tpl:10
+#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
+#: plugins/admin/ogroups/remove.tpl:10 plugins/gofon/macro/remove.tpl:9
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"D'accord - si vous êtes sur - cliquez sur 'Supprimer' pour continuer ou sur "
+"'Annuler' pour abandonner."
 
 #: plugins/gofax/blocklists/headpage.tpl:6
 msgid "List of blocklists"
@@ -3750,8 +3790,8 @@ msgid "FAX settings"
 msgstr "Configuration du FAX"
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:6
-#: plugins/addons/addressbook/address_info.tpl:88
 #: plugins/addons/addressbook/address_edit.tpl:206
+#: plugins/addons/addressbook/address_info.tpl:88
 #: plugins/generic/references/class_reference.inc:30
 msgid "FAX"
 msgstr "FAX"
@@ -3837,7 +3877,7 @@ msgstr "FAX ID"
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 #: plugins/admin/systems/class_printGeneric.inc:677
-#: plugins/admin/ogroups/class_ogroupManagement.inc:582
+#: plugins/admin/ogroups/class_ogroupManagement.inc:583
 msgid "User"
 msgstr "Utilisateur"
 
@@ -3874,52 +3914,6 @@ msgstr "Temps de transfert"
 msgid "# pages"
 msgstr "# pages"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:6
-msgid "FAX Reports"
-msgstr "Rapports des Fax"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:109
-#: plugins/gofax/faxreports/class_faxreport.inc:119
-#: plugins/gofax/faxreports/class_faxreport.inc:165
-#: plugins/gofax/faxreports/class_faxreport.inc:274
-msgid "Can't connect to fax database, no reports can be shown!"
-msgstr ""
-"Impossible de se connecter à la base de données des fax, aucun rapport ne "
-"peut être affiché!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:112
-#: plugins/addons/logview/class_logview.inc:66
-#: plugins/gofon/fonreports/class_fonreport.inc:99
-msgid "There is no mysql extension available, please check your php setup."
-msgstr ""
-"Il n'y a pas d'extension msql disponible, vérifiez votre configuration php."
-
-#: plugins/gofax/faxreports/class_faxreport.inc:123
-#: plugins/gofax/faxreports/class_faxreport.inc:128
-#: plugins/gofax/faxreports/class_faxreport.inc:169
-#: plugins/gofax/faxreports/class_faxreport.inc:278
-msgid "Can't select fax database for report generation!"
-msgstr ""
-"Impossible de sélectionner la base de données fax pour la génération de "
-"rapports!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:177
-#: plugins/gofax/faxreports/class_faxreport.inc:286
-msgid "Query for fax database failed!"
-msgstr "La requête sur la base de données des fax a échoué!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:185
-msgid "You have no permission to retrieve informations about this fax id!"
-msgstr ""
-"Vous n'avez pas l'autorisation de récupérer les informations à propos de "
-"l'identifiant de ce fax!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:205
-#: plugins/gofax/faxreports/class_faxreport.inc:294
-#: plugins/gofon/fonreports/class_fonreport.inc:220
-msgid "Y-M-D"
-msgstr "A-M-J"
-
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/fonreports/contents.tpl:2
@@ -3961,6 +3955,7 @@ msgstr "pendant"
 #: plugins/addons/mailqueue/contents.tpl:26
 #: plugins/addons/logview/contents.tpl:67
 #: plugins/gofon/fonreports/contents.tpl:21 ihtml/themes/default/help.tpl:21
+#: ihtml/themes/lhs/help.tpl:21
 msgid "Search"
 msgstr "Recherche"
 
@@ -3985,36 +3980,69 @@ msgstr "Correspondant"
 msgid "Search returned no results..."
 msgstr "La recherche n'a renvoyé aucun résultat..."
 
-#: plugins/gofax/faxreports/main.inc:5
-msgid "FAX reports"
+#: plugins/gofax/faxreports/class_faxreport.inc:6
+msgid "FAX Reports"
 msgstr "Rapports des Fax"
 
-#: plugins/addons/addressbook/dial.tpl:3
-msgid "Dial connection..."
-msgstr "Appel en cours ..."
+#: plugins/gofax/faxreports/class_faxreport.inc:109
+#: plugins/gofax/faxreports/class_faxreport.inc:119
+#: plugins/gofax/faxreports/class_faxreport.inc:165
+#: plugins/gofax/faxreports/class_faxreport.inc:274
+msgid "Can't connect to fax database, no reports can be shown!"
+msgstr ""
+"Impossible de se connecter à la base de données des fax, aucun rapport ne "
+"peut être affiché!"
 
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:360
-#: plugins/addons/addressbook/class_addressbook.inc:367
-#: plugins/addons/addressbook/class_addressbook.inc:371
-#: plugins/addons/addressbook/class_addressbook.inc:453
-msgid "Dial"
-msgstr "Appeler"
+#: plugins/gofax/faxreports/class_faxreport.inc:112
+#: plugins/addons/logview/class_logview.inc:66
+#: plugins/gofon/fonreports/class_fonreport.inc:99
+msgid "There is no mysql extension available, please check your php setup."
+msgstr ""
+"Il n'y a pas d'extension msql disponible, vérifiez votre configuration php."
+
+#: plugins/gofax/faxreports/class_faxreport.inc:123
+#: plugins/gofax/faxreports/class_faxreport.inc:128
+#: plugins/gofax/faxreports/class_faxreport.inc:169
+#: plugins/gofax/faxreports/class_faxreport.inc:278
+msgid "Can't select fax database for report generation!"
+msgstr ""
+"Impossible de sélectionner la base de données fax pour la génération de "
+"rapports!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:177
+#: plugins/gofax/faxreports/class_faxreport.inc:286
+msgid "Query for fax database failed!"
+msgstr "La requête sur la base de données des fax a échoué!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:185
+msgid "You have no permission to retrieve informations about this fax id!"
+msgstr ""
+"Vous n'avez pas l'autorisation de récupérer les informations à propos de "
+"l'identifiant de ce fax!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:205
+#: plugins/gofax/faxreports/class_faxreport.inc:294
+#: plugins/gofon/fonreports/class_fonreport.inc:220
+msgid "Y-M-D"
+msgstr "A-M-J"
+
+#: plugins/gofax/faxreports/main.inc:5
+msgid "FAX reports"
+msgstr "Rapports des Fax"
 
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:513
 #: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/addons/addressbook/class_addressbook.inc:513
+#: plugins/admin/fai/faiVariable.tpl:9
 #: plugins/admin/fai/faiPartitionTable.tpl:9
-#: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiScriptEntry.tpl:9
-#: plugins/admin/fai/faiPackage.tpl:9 plugins/admin/fai/faiProfile.tpl:9
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiPackage.tpl:9
+#: plugins/admin/fai/faiProfile.tpl:9 plugins/admin/fai/faiScript.tpl:9
+#: plugins/admin/fai/faiVariableEntry.tpl:9
 #: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHookEntry.tpl:9
 #: plugins/admin/fai/faiTemplateEntry.tpl:7 plugins/admin/fai/faiHook.tpl:9
 #: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: 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
@@ -4028,14 +4056,16 @@ msgstr "Appeler"
 #: plugins/admin/systems/glpi_devices.tpl:615
 #: plugins/admin/systems/glpi_devices.tpl:669
 #: plugins/admin/systems/glpi_devices.tpl:715
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
 #: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
 msgid "Name"
 msgstr "Nom"
 
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_info.tpl:29
 #: plugins/addons/addressbook/address_edit.tpl:66
+#: plugins/addons/addressbook/address_info.tpl:29
 msgid "Private"
 msgstr "Privé"
 
@@ -4100,6 +4130,60 @@ msgstr "Indiquez l'objet dans lequel la recherche sera effectuée"
 msgid "Search string"
 msgstr "Phrase de recherche"
 
+#: plugins/addons/addressbook/dial.tpl:3
+msgid "Dial connection..."
+msgstr "Appel en cours ..."
+
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/class_addressbook.inc:360
+#: plugins/addons/addressbook/class_addressbook.inc:367
+#: plugins/addons/addressbook/class_addressbook.inc:371
+#: plugins/addons/addressbook/class_addressbook.inc:453
+msgid "Dial"
+msgstr "Appeler"
+
+#: plugins/addons/addressbook/address_edit.tpl:7
+msgid "Choose the department to store entry in"
+msgstr "Choisissez le département où l'entrée sera stockée"
+
+#: plugins/addons/addressbook/address_edit.tpl:24
+#: plugins/addons/addressbook/address_info.tpl:12
+msgid "Personal"
+msgstr "Personnel"
+
+#: plugins/addons/addressbook/address_edit.tpl:44
+#: plugins/addons/addressbook/address_info.tpl:19 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Initials"
+msgstr "Initiales"
+
+#: plugins/addons/addressbook/address_edit.tpl:105
+#: plugins/addons/addressbook/address_info.tpl:43
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:46
+msgid "Email"
+msgstr "Adresse de messagerie"
+
+#: plugins/addons/addressbook/address_edit.tpl:119
+#: plugins/addons/addressbook/address_info.tpl:53
+msgid "Organizational"
+msgstr "Organisation"
+
+#: plugins/addons/addressbook/address_edit.tpl:128
+#: plugins/addons/addressbook/address_info.tpl:61
+msgid "Company"
+msgstr "Société"
+
+#: plugins/addons/addressbook/address_edit.tpl:148
+#: plugins/addons/addressbook/address_info.tpl:67 html/getxls.php:174
+#: html/getxls.php:236
+msgid "City"
+msgstr "Ville"
+
+#: plugins/addons/addressbook/address_edit.tpl:168
+#: plugins/addons/addressbook/address_info.tpl:73
+msgid "Country"
+msgstr "Pays"
+
 #: plugins/addons/addressbook/remove.tpl:6
 msgid ""
 "This includes all addressbook data in this entry. Please double check if "
@@ -4214,60 +4298,18 @@ msgstr ""
 "Vous n'avez pas les droits nécessaires pour créer ou modifier une entrée "
 "dans le carnet d'adresse général."
 
-#: plugins/addons/addressbook/address_info.tpl:12
-#: plugins/addons/addressbook/address_edit.tpl:24
-msgid "Personal"
-msgstr "Personnel"
-
-#: plugins/addons/addressbook/address_info.tpl:19
-#: plugins/addons/addressbook/address_edit.tpl:44 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Initials"
-msgstr "Initiales"
-
-#: plugins/addons/addressbook/address_info.tpl:43
-#: plugins/addons/addressbook/address_edit.tpl:105
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:46
-msgid "Email"
-msgstr "Adresse de messagerie"
+#: plugins/addons/mailqueue/main.inc:23
+#: plugins/addons/mailqueue/class_mailqueue.inc:6
+msgid "Mail queue"
+msgstr "Queue du serveur de messagerie"
 
-#: plugins/addons/addressbook/address_info.tpl:53
-#: plugins/addons/addressbook/address_edit.tpl:119
-msgid "Organizational"
-msgstr "Organisation"
-
-#: plugins/addons/addressbook/address_info.tpl:61
-#: plugins/addons/addressbook/address_edit.tpl:128
-msgid "Company"
-msgstr "Société"
-
-#: plugins/addons/addressbook/address_info.tpl:67
-#: plugins/addons/addressbook/address_edit.tpl:148 html/getxls.php:174
-#: html/getxls.php:236
-msgid "City"
-msgstr "Ville"
-
-#: plugins/addons/addressbook/address_info.tpl:73
-#: plugins/addons/addressbook/address_edit.tpl:168
-msgid "Country"
-msgstr "Pays"
-
-#: plugins/addons/addressbook/address_edit.tpl:7
-msgid "Choose the department to store entry in"
-msgstr "Choisissez le département où l'entrée sera stockée"
-
-#: plugins/addons/mailqueue/class_mailqueue.inc:6
-#: plugins/addons/mailqueue/main.inc:23
-msgid "Mail queue"
-msgstr "Queue du serveur de messagerie"
-
-#: plugins/addons/mailqueue/class_mailqueue.inc:58
-#, fuzzy
-msgid ""
-"Please check your 'gosa.conf', there is no 'MAILQUEUESCRIPTPATH' specified."
-msgstr ""
-"Veuillez vérifier votre fichier 'gosa.conf' il n'y a pas de "
-"'MAILQUEUE_QUERY_COMMAND' spécifiée."
+#: plugins/addons/mailqueue/class_mailqueue.inc:58
+#, fuzzy
+msgid ""
+"Please check your 'gosa.conf', there is no 'MAILQUEUESCRIPTPATH' specified."
+msgstr ""
+"Veuillez vérifier votre fichier 'gosa.conf' il n'y a pas de "
+"'MAILQUEUE_QUERY_COMMAND' spécifiée."
 
 #: plugins/addons/mailqueue/class_mailqueue.inc:85
 #: plugins/addons/mailqueue/class_mailqueue.inc:93
@@ -4738,6 +4780,117 @@ msgstr "Message"
 msgid "System log view"
 msgstr "Affichage des logs système"
 
+#: plugins/addons/godfs/class_dfsManagment.inc:16
+#: plugins/addons/godfs/contents.tpl:8
+#, fuzzy
+msgid "DFS Shares"
+msgstr "Partages"
+
+#: plugins/addons/godfs/class_dfsManagment.inc:141
+msgid "No DFS entries found"
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsManagment.inc:182
+#, fuzzy
+msgid "Go up one dfsshare"
+msgstr "Monter d'un département"
+
+#: plugins/addons/godfs/class_dfsManagment.inc:183
+msgid "Go to dfs root"
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsManagment.inc:184
+#, fuzzy
+msgid "Create new dfsshare"
+msgstr "Création d'un nouvel utilisateur"
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:87
+#, fuzzy
+msgid "You have no premissions to create a dfs share."
+msgstr ""
+"Vous n'avez pas l'autorisation pour créer un utilisateur sur cette 'Base'."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:94
+#: plugins/addons/godfs/class_dfsgeneric.inc:96
+#, fuzzy
+msgid "Dfs share already exists."
+msgstr "Le catégorie indiquée existe déjà."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:101
+#, fuzzy
+msgid "Required Field \"Name of dfs Share\" is not set."
+msgstr "Le champ obligatoire 'Nom' n'est pas rempli."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:104
+#, fuzzy
+msgid "Required Field \"Description\" is not set."
+msgstr "Le champ obligatoire 'Description' n'est pas rempli."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:107
+#, fuzzy
+msgid "Required Field \"Fileserver\" is not set."
+msgstr "Le champ obligatoire 'Nom' n'est pas rempli."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:110
+#, fuzzy
+msgid "Required Field \"Share on fileserver\" is not set."
+msgstr "Le champ obligatoire 'Nom' n'est pas rempli."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:113
+#, fuzzy
+msgid "Required Field \"Location\" is not set."
+msgstr "Le champ obligatoire 'Description' n'est pas rempli."
+
+#: plugins/addons/godfs/contents.tpl:26
+#, fuzzy
+msgid ""
+"This menu allows you to create, delete and edit selected dfs shares. Having "
+"a large numbers of dfs shares, you might prefer the range selectors on top "
+"of the dfs share list."
+msgstr ""
+"Ce menu vous permet de d'ajouter, supprimer et éditer les départements "
+"sélectionnés. Si vous avez un grand nombre de départements il est conseillé "
+"d'utiliser les filtres."
+
+#: plugins/addons/godfs/contents.tpl:40
+#, fuzzy
+msgid "Display dfs shares matching"
+msgstr "Afficher les adresses correspondantes"
+
+#: plugins/addons/godfs/contents.tpl:44
+#, fuzzy
+msgid "Regular expression for matching dfs share names"
+msgstr "Expression régulière pour sélectionner les noms de systèmes"
+
+#: plugins/addons/godfs/generic.tpl:4
+#, fuzzy
+msgid "DFS Properties"
+msgstr "Propriétés"
+
+#: plugins/addons/godfs/generic.tpl:8
+#, fuzzy
+msgid "Name of dfs Share"
+msgstr "Nom du département"
+
+#: plugins/addons/godfs/generic.tpl:16
+#, fuzzy
+msgid "Fileserver"
+msgstr "Serveur de messagerie"
+
+#: plugins/addons/godfs/generic.tpl:20
+#, fuzzy
+msgid "Share on Fileserver"
+msgstr "Serveur Père"
+
+#: plugins/addons/godfs/generic.tpl:30
+#, fuzzy
+msgid "DFS Location"
+msgstr "Lieu"
+
+#: plugins/addons/godfs/main.inc:21 plugins/addons/godfs/main.inc:27
+msgid "Distributed Filesystem Administration"
+msgstr ""
+
 #: plugins/admin/fai/class_faiScript.inc:240
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
 #: plugins/admin/fai/class_faiHook.inc:264
@@ -4746,16 +4899,50 @@ msgstr "Affichage des logs système"
 msgid "Download"
 msgstr "En bas"
 
+#: plugins/admin/fai/faiVariable.tpl:32
+#: plugins/admin/fai/faiPartitionTable.tpl:32
+#: plugins/admin/fai/faiScript.tpl:32 plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/class_faiProfileEntry.inc:155
+#: plugins/admin/fai/faiHook.tpl:32
+msgid "Objects"
+msgstr "Objets"
+
+#: plugins/admin/fai/faiVariable.tpl:34
+msgid "List of assigned variables"
+msgstr "Liste des noms de variables déjà utilisées"
+
+#: plugins/admin/fai/faiVariable.tpl:40
+msgid "Choose a variable to delete or edit"
+msgstr "Choisissez une variable à effacer ou éditer"
+
 #: 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/tabsTemplate.inc:34 plugins/admin/fai/tabsProfile.inc:34
+#: plugins/admin/fai/tabsScript.inc:34
 #: plugins/admin/departments/tabs_department.inc:31
 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 "
 "l'arbre à bouger."
 
+#: plugins/admin/fai/class_faiPackageEntry.inc:35
+msgid "Please enter your search string here"
+msgstr "Veuillez indiquer une chaîne de caractères a chercher"
+
+#: plugins/admin/fai/class_faiPackageEntry.inc:48
+msgid ""
+"This list displays all assigned package names for this repository settings."
+msgstr "Cette liste affiche tout les paquets assigné à ce dépôt."
+
+#: plugins/admin/fai/class_faiPackageEntry.inc:124
+#, php-format
+msgid ""
+"Your specified search string '%s' returned too many results. Only the first "
+"200 entries are shown, to keep the memory usage low."
+msgstr ""
+"Votre recherche '%s' à retourné trop de résultat. Seulement les 200 "
+"premières entrées sont affichées pour éviter de surcharger la mémoire."
+
 #: plugins/admin/fai/class_faiManagement.inc:32
 msgid "FAI"
 msgstr "FAI"
@@ -4764,26 +4951,26 @@ msgstr "FAI"
 msgid "Fully Automatic Installation - management"
 msgstr "Gestion de - Fully Automatic Installation"
 
-#: plugins/admin/fai/class_faiManagement.inc:228
+#: plugins/admin/fai/class_faiManagement.inc:227
 #, php-format
 msgid "You're about to delete all information about the FAI class at '%s'."
 msgstr ""
 "Vous êtes sur le point de supprimer toute les informations relatives au "
 "composant FAI '%s'."
 
-#: plugins/admin/fai/class_faiManagement.inc:234
-#: plugins/admin/fai/class_faiManagement.inc:272
+#: plugins/admin/fai/class_faiManagement.inc:233
+#: plugins/admin/fai/class_faiManagement.inc:271
 #: plugins/admin/systems/class_systemManagement.inc:532
 #: plugins/admin/systems/class_systemManagement.inc:603
 msgid "You are not allowed to delete this component!"
 msgstr "Vous n'êtes pas autorisé à supprimer ce composant!"
 
-#: plugins/admin/fai/class_faiManagement.inc:324
+#: plugins/admin/fai/class_faiManagement.inc:323
 #, php-format
 msgid "You're about to delete a fai branch / freeze  '%s'."
 msgstr "Vous êtes sur le point d'effacer / vérouiller la branche fai '%s'."
 
-#: plugins/admin/fai/class_faiManagement.inc:327
+#: plugins/admin/fai/class_faiManagement.inc:326
 msgid "You are not allowed to delete this release!"
 msgstr "Vous n'êtes pas autorisé à supprimer cette version!"
 
@@ -4797,13 +4984,15 @@ msgid "Specified freeze name is invalid."
 msgstr "Le nom spécifié est invalide."
 
 #: plugins/admin/fai/class_faiManagement.inc:391
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:349
 #: plugins/admin/systems/class_servRepository.inc:208
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:349
 msgid "This name is already in use."
 msgstr "Le nom spécifié est déjà utilisé."
 
-#: plugins/admin/fai/class_faiManagement.inc:605
+#: plugins/admin/fai/class_faiManagement.inc:444
+#: plugins/admin/fai/class_faiManagement.inc:611
 #: plugins/admin/fai/faiPackageNew.tpl:44 plugins/admin/users/template.tpl:44
+#: plugins/admin/departments/class_departmentGeneric.inc:333
 #: ihtml/themes/altlinux/setup_introduction.tpl:12
 #: ihtml/themes/altlinux/setup_useradmin.tpl:41
 #: ihtml/themes/altlinux/setup_step2.tpl:13
@@ -4812,152 +5001,133 @@ msgstr "Le nom spécifié est déjà utilisé."
 #: ihtml/themes/default/setup_useradmin.tpl:41
 #: ihtml/themes/default/setup_step2.tpl:13
 #: ihtml/themes/default/setup_step3.tpl:18
+#: ihtml/themes/lhs/setup_introduction.tpl:12
+#: ihtml/themes/lhs/setup_useradmin.tpl:41 ihtml/themes/lhs/setup_step2.tpl:13
+#: ihtml/themes/lhs/setup_step3.tpl:18
 msgid "Continue"
 msgstr "Continuer"
 
-#: plugins/admin/fai/class_faiManagement.inc:641
+#: plugins/admin/fai/class_faiManagement.inc:647
 #: plugins/admin/departments/class_departmentManagement.inc:298
 msgid "Go to users home department"
 msgstr "Aller au département de base des utilisateurs"
 
-#: plugins/admin/fai/class_faiManagement.inc:646
+#: plugins/admin/fai/class_faiManagement.inc:654
 msgid "New profile"
 msgstr "Nouveau profil"
 
-#: plugins/admin/fai/class_faiManagement.inc:646
+#: plugins/admin/fai/class_faiManagement.inc:654
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
 msgid "P"
 msgstr "P"
 
-#: plugins/admin/fai/class_faiManagement.inc:651
+#: plugins/admin/fai/class_faiManagement.inc:659
 msgid "New partition table"
 msgstr "Nouvelle table des partitions"
 
-#: plugins/admin/fai/class_faiManagement.inc:651
+#: plugins/admin/fai/class_faiManagement.inc:659
 msgid "PT"
 msgstr "PT"
 
-#: plugins/admin/fai/class_faiManagement.inc:654
+#: plugins/admin/fai/class_faiManagement.inc:662
 msgid "New scripts"
 msgstr "Nouveau scripts"
 
-#: plugins/admin/fai/class_faiManagement.inc:654
+#: plugins/admin/fai/class_faiManagement.inc:662
 msgid "S"
 msgstr "S"
 
-#: plugins/admin/fai/class_faiManagement.inc:657
+#: plugins/admin/fai/class_faiManagement.inc:665
 msgid "New hooks"
 msgstr "Nouvelles connexions"
 
-#: plugins/admin/fai/class_faiManagement.inc:657
+#: plugins/admin/fai/class_faiManagement.inc:665
 msgid "H"
 msgstr "H"
 
-#: plugins/admin/fai/class_faiManagement.inc:660
+#: plugins/admin/fai/class_faiManagement.inc:668
 msgid "New variables"
 msgstr "Nouvelles variables"
 
-#: plugins/admin/fai/class_faiManagement.inc:660
+#: plugins/admin/fai/class_faiManagement.inc:668
 msgid "V"
 msgstr "V"
 
-#: plugins/admin/fai/class_faiManagement.inc:663
+#: plugins/admin/fai/class_faiManagement.inc:671
 msgid "New templates"
 msgstr "Nouveau modèles"
 
-#: plugins/admin/fai/class_faiManagement.inc:663
+#: plugins/admin/fai/class_faiManagement.inc:671
 msgid "T"
 msgstr "T"
 
-#: plugins/admin/fai/class_faiManagement.inc:666
+#: plugins/admin/fai/class_faiManagement.inc:674
 msgid "New package list"
 msgstr "Nouvelle liste des paquets"
 
-#: plugins/admin/fai/class_faiManagement.inc:666
+#: plugins/admin/fai/class_faiManagement.inc:674
 msgid "PK"
 msgstr "PK"
 
-#: plugins/admin/fai/class_faiManagement.inc:680
-#: plugins/admin/systems/class_systemManagement.inc:787
+#: plugins/admin/fai/class_faiManagement.inc:688
+#: plugins/admin/systems/class_systemManagement.inc:788
 msgid "This table displays all systems, in the selected tree."
 msgstr "Ce tableau montre toutes les systèmes, dans l'arbre sélectionné."
 
-#: plugins/admin/fai/class_faiManagement.inc:684
+#: plugins/admin/fai/class_faiManagement.inc:692
 msgid "Name of FAI class"
 msgstr "Nom de la classe FAI"
 
-#: plugins/admin/fai/class_faiManagement.inc:685
+#: plugins/admin/fai/class_faiManagement.inc:693
 msgid "Class type"
 msgstr "Type de la classe"
 
-#: plugins/admin/fai/class_faiManagement.inc:689
-#: plugins/admin/fai/class_faiManagement.inc:790
-#: plugins/admin/fai/class_faiManagement.inc:795
+#: plugins/admin/fai/class_faiManagement.inc:697
+#: plugins/admin/fai/class_faiManagement.inc:798
+#: plugins/admin/fai/class_faiManagement.inc:803
 msgid "Edit class"
 msgstr "Editer la classe"
 
-#: plugins/admin/fai/class_faiManagement.inc:690
-#: plugins/admin/fai/class_faiManagement.inc:797
+#: plugins/admin/fai/class_faiManagement.inc:698
+#: plugins/admin/fai/class_faiManagement.inc:805
 msgid "Delete class"
 msgstr "Effacer la classe"
 
-#: plugins/admin/fai/class_faiManagement.inc:710
+#: plugins/admin/fai/class_faiManagement.inc:718
 #: plugins/admin/groups/class_groupApplication.inc:521
-#: plugins/admin/departments/class_departmentManagement.inc:334
+#: plugins/admin/departments/class_departmentManagement.inc:335
 msgid "department"
 msgstr "département"
 
-#: plugins/admin/fai/class_faiManagement.inc:731
-#: plugins/admin/fai/class_faiManagement.inc:732
+#: plugins/admin/fai/class_faiManagement.inc:739
+#: plugins/admin/fai/class_faiManagement.inc:740
 #: plugins/admin/fai/class_faiProfile.inc:297
 #: plugins/admin/fai/class_faiProfileEntry.inc:124
 msgid "Partition table"
 msgstr "Table des partitions"
 
-#: plugins/admin/fai/class_faiManagement.inc:738
-#: plugins/admin/fai/class_faiManagement.inc:739
+#: plugins/admin/fai/class_faiManagement.inc:746
+#: plugins/admin/fai/class_faiManagement.inc:747
 msgid "Package list"
 msgstr "Liste des paquets"
 
-#: plugins/admin/fai/class_faiManagement.inc:745
-#: plugins/admin/fai/class_faiManagement.inc:746
+#: plugins/admin/fai/class_faiManagement.inc:753
+#: plugins/admin/fai/class_faiManagement.inc:754
 msgid "Scripts"
 msgstr "Scripts"
 
-#: plugins/admin/fai/class_faiManagement.inc:766
-#: plugins/admin/fai/class_faiManagement.inc:767
+#: plugins/admin/fai/class_faiManagement.inc:774
+#: plugins/admin/fai/class_faiManagement.inc:775
 msgid "Profile"
 msgstr "Profil"
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:35
-msgid "Please enter your search string here"
-msgstr "Veuillez indiquer une chaîne de caractères a chercher"
-
-#: plugins/admin/fai/class_faiPackageEntry.inc:48
-msgid ""
-"This list displays all assigned package names for this repository settings."
-msgstr "Cette liste affiche tout les paquets assigné à ce dépôt."
-
-#: plugins/admin/fai/class_faiPackageEntry.inc:124
-#, php-format
-msgid ""
-"Your specified search string '%s' returned too many results. Only the first "
-"200 entries are shown, to keep the memory usage low."
-msgstr ""
-"Votre recherche '%s' à retourné trop de résultat. Seulement les 200 "
-"premières entrées sont affichées pour éviter de surcharger la mémoire."
-
 #: plugins/admin/fai/main.inc:38 plugins/admin/fai/main.inc:40
 msgid "Fully Automatic Installation"
 msgstr "Installation entièrement automatique (FAI)"
 
-#: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiVariable.tpl:32 plugins/admin/fai/faiScript.tpl:32
-#: plugins/admin/fai/faiTemplate.tpl:29
-#: plugins/admin/fai/class_faiProfileEntry.inc:155
-#: plugins/admin/fai/faiHook.tpl:32
-msgid "Objects"
-msgstr "Objets"
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+msgid "Package"
+msgstr "Paquet"
 
 #: plugins/admin/fai/faiPartitionTable.tpl:34
 msgid "Discs"
@@ -5020,9 +5190,17 @@ msgstr "Afficher les objets correspondants"
 msgid "Regular expression for matching object names"
 msgstr "Expression régulière pour trouver les objets correspondants"
 
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
-msgid "Package"
-msgstr "Paquet"
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
+msgid "Device"
+msgstr "Périphérique"
+
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
+msgid "Partition entries"
+msgstr "Liste de partitions"
+
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
+msgid "Add partition"
+msgstr "Ajouter une partition"
 
 #: plugins/admin/fai/class_faiScriptEntry.inc:68
 #: plugins/admin/fai/class_faiHookEntry.inc:71
@@ -5045,21 +5223,13 @@ msgstr " Veuillez entrer un nom."
 msgid "Please enter a script."
 msgstr "Veuillez indiquer un script."
 
-#: plugins/admin/fai/faiVariable.tpl:34
-msgid "List of assigned variables"
-msgstr "Liste des noms de variables déjà utilisées"
-
-#: plugins/admin/fai/faiVariable.tpl:40
-msgid "Choose a variable to delete or edit"
-msgstr "Choisissez une variable à effacer ou éditer"
-
 #: plugins/admin/fai/faiScriptEntry.tpl:29
-#: plugins/admin/groups/class_groupManagement.inc:524
-#: plugins/admin/users/class_userManagement.inc:819
+#: plugins/admin/groups/class_groupManagement.inc:525
+#: plugins/admin/users/class_userManagement.inc:820
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
-#: plugins/admin/ogroups/class_ogroupManagement.inc:493
+#: plugins/admin/ogroups/class_ogroupManagement.inc:494
 #: plugins/gofon/conference/generic.tpl:4
 msgid "Properties"
 msgstr "Propriétés"
@@ -5099,8 +5269,8 @@ msgstr "Le paquets '%s' n'existe pas."
 
 #: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:24
 #: plugins/admin/systems/workstationStartup.tpl:39
-#: plugins/admin/systems/servRepositorySetup.tpl:8
 #: plugins/admin/systems/class_servRepository.inc:242
+#: plugins/admin/systems/servRepositorySetup.tpl:8
 msgid "Release"
 msgstr "Version"
 
@@ -5181,6 +5351,26 @@ msgstr "Il y a déjà un profil avec ce nom de classe."
 msgid "FAI classes"
 msgstr "Classes FAI"
 
+#: plugins/admin/fai/remove.tpl:7
+msgid ""
+"This includes 'all' object information. Please double check if your really "
+"want to do this since there is no way for GOsa to get your data back."
+msgstr ""
+"Ceci inclut toutes les informations sur les objets. Veuillez vérifier que "
+"vous voulez effectuer cette opération, étant donné qu'il est impossible pour "
+"GOsa de récupérer vos données."
+
+#: plugins/admin/fai/remove.tpl:11 plugins/admin/departments/remove.tpl:10
+#: plugins/admin/systems/remove.tpl:10 plugins/gofon/conference/remove.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your LDAP tree in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Il est conseillé de sauvegarder l'arbre de votre annuaire LDAP dans un "
+"fichier avant de réaliser cette action. Appuyez sur 'Supprimer' pour "
+"continuer ou 'Annuler' pour abandonner."
+
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
 msgid "FS type"
 msgstr "FS type"
@@ -5254,18 +5444,6 @@ msgid ""
 "please check your configuration twice."
 msgstr ""
 
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
-msgid "Device"
-msgstr "Périphérique"
-
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
-msgid "Partition entries"
-msgstr "Liste de partitions"
-
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
-msgid "Add partition"
-msgstr "Ajouter une partition"
-
 #: plugins/admin/fai/faiScript.tpl:34
 msgid "List of scripts"
 msgstr "Liste des scripts"
@@ -5328,19 +5506,62 @@ msgstr "activé"
 msgid "Please specify a value for the attribute 'content'."
 msgstr "Veuillez entrer une valeur pour l'attribut 'contenu'."
 
-#: plugins/admin/fai/faiVariableEntry.tpl:29
-msgid "Variable attributes"
-msgstr "Attributs des variables"
-
-#: plugins/admin/fai/faiVariableEntry.tpl:34
-msgid "Variable content"
-msgstr "Contenu de la variable"
+#: plugins/admin/fai/faiNewBranch.tpl:5
+msgid ""
+"You are now going to create a branch or locked branch. This action clones "
+"the existing release to another release name. Branches can be modified as "
+"usual. FAI classes of locked branches cannot be modified, just additional "
+"classes are possible. Branch names should be alphanumeric, excluding the "
+"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
+"and 'fai'."
+msgstr ""
 
-#: plugins/admin/fai/faiTemplate.tpl:31
-msgid "List of template files"
-msgstr "Liste des modèles"
+#: plugins/admin/fai/faiNewBranch.tpl:11
+msgid "Please enter a name for the branch"
+msgstr "Veuillez entrer un nom pour la branche."
 
-#: plugins/admin/fai/faiTemplate.tpl:38
+#: plugins/admin/fai/faiNewBranch.tpl:33
+#: plugins/admin/departments/recursive_move.tpl:1
+#, fuzzy
+msgid "Processing the requested operation"
+msgstr "Une erreur s'est produite lors de l'exportation!"
+
+#: plugins/admin/fai/faiNewBranch.tpl:34
+msgid ""
+"As soon as the copy operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the fai management "
+"dialog."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:40
+#: plugins/admin/departments/recursive_move.tpl:7
+msgid ""
+"Your browser doesn't support iframes, please use this link to perform the "
+"requested operation."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:42
+msgid "Perform requested operation."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:42
+#, fuzzy
+msgid "Initiate operation"
+msgstr "Créer des options"
+
+#: plugins/admin/fai/faiVariableEntry.tpl:29
+msgid "Variable attributes"
+msgstr "Attributs des variables"
+
+#: plugins/admin/fai/faiVariableEntry.tpl:34
+msgid "Variable content"
+msgstr "Contenu de la variable"
+
+#: plugins/admin/fai/faiTemplate.tpl:31
+msgid "List of template files"
+msgstr "Liste des modèles"
+
+#: plugins/admin/fai/faiTemplate.tpl:38
 msgid "Choose a template to delete or edit"
 msgstr "Choisissez le modèle à effacer où éditer"
 
@@ -5356,26 +5577,6 @@ msgstr ""
 "Ce menu vous permet de sélectionner de multiples paquets à ajouter a la "
 "liste en cours d'édition."
 
-#: plugins/admin/fai/remove.tpl:7
-msgid ""
-"This includes 'all' object information. Please double check if your really "
-"want to do this since there is no way for GOsa to get your data back."
-msgstr ""
-"Ceci inclut toutes les informations sur les objets. Veuillez vérifier que "
-"vous voulez effectuer cette opération, étant donné qu'il est impossible pour "
-"GOsa de récupérer vos données."
-
-#: plugins/admin/fai/remove.tpl:11 plugins/admin/departments/remove.tpl:10
-#: plugins/admin/systems/remove.tpl:10 plugins/gofon/conference/remove.tpl:10
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Il est conseillé de sauvegarder l'arbre de votre annuaire LDAP dans un "
-"fichier avant de réaliser cette action. Appuyez sur 'Supprimer' pour "
-"continuer ou 'Annuler' pour abandonner."
-
 #: plugins/admin/fai/headpage.tpl:6
 msgid "List of FAI classes"
 msgstr "Liste des classes FAI"
@@ -5395,12 +5596,14 @@ msgid "Current release"
 msgstr "Version actuelle"
 
 #: plugins/admin/fai/headpage.tpl:47
-msgid "Create new branch using the current release"
-msgstr "Créer une nouvelle branche en utilisant la version actuelle"
+#, fuzzy
+msgid "Create new branch"
+msgstr "Création d'un nouvel utilisateur"
 
 #: plugins/admin/fai/headpage.tpl:51
-msgid "Create a locked version of the current release"
-msgstr "Créer une version vérouillée de la version actuelle"
+#, fuzzy
+msgid "Create new locked branch"
+msgstr "Création d'une nouvelle conférence"
 
 #: plugins/admin/fai/headpage.tpl:56
 msgid "Delete current release"
@@ -5434,6 +5637,18 @@ msgstr "Afficher les paquets"
 msgid "Show partitions"
 msgstr "Afficher les partitions"
 
+#: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
+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"
+
 #: plugins/admin/fai/class_faiPartitionTable.inc:263
 #: plugins/admin/fai/class_faiPartitionTable.inc:269
 #, php-format
@@ -5459,18 +5674,6 @@ msgstr "Ensemble des paquets"
 msgid "Class name"
 msgstr "Nom de la classe"
 
-#: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
-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"
-
 #: plugins/admin/fai/class_faiPackageConfiguration.inc:45
 #, php-format
 msgid "Debconf information for package '%s'"
@@ -5551,13 +5754,13 @@ msgid "Choose class name"
 msgstr "Choisissez un nom de classe"
 
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
+#: plugins/admin/systems/glpiDeviceManagement.tpl:51
 #: plugins/admin/systems/class_glpiSelectUser.inc:113
 #: plugins/admin/systems/class_glpiSelectUser.inc:140
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:51
 #: plugins/admin/systems/glpiAttachmentPool.tpl:51
-#: plugins/admin/systems/glpiDeviceManagement.tpl:51
 #: plugins/admin/systems/SelectDeviceType.tpl:44
-#: plugins/admin/systems/class_baseSelectDialog.inc:39
+#: plugins/admin/systems/class_baseSelectDialog.inc:40
 msgid "Use"
 msgstr "Utiliser"
 
@@ -5565,6 +5768,17 @@ msgstr "Utiliser"
 msgid "A new class name."
 msgstr "Un nouveau nom de classe."
 
+#: plugins/admin/fai/remove_branch.tpl:6
+msgid ""
+"This includes all account data, system access, etc. for this branch. Please "
+"double check if your really want to do this since there is no way for GOsa "
+"to get your data back."
+msgstr ""
+"Cela inclut toutes les données des comptes, les droits d'accès, la "
+"configuration imap,etc. pour cette branche. Veuillez vous assurez que vous "
+"voulez effectuez cette opération. Toutes les données seront perdues étant "
+"donné qu'il est impossible pour GOsa de récupérer vos données."
+
 #: plugins/admin/fai/class_faiTemplateEntry.inc:81
 msgid "no file uploaded yet"
 msgstr "pas encore de fichier téléchargé"
@@ -5617,8 +5831,8 @@ msgstr "Sauver le modèle"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:40
 #: plugins/admin/applications/generic.tpl:95
-#: plugins/admin/systems/printerPPDDialog.tpl:11
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
+#: plugins/admin/systems/printerPPDDialog.tpl:11
 msgid "Upload"
 msgstr "Télécharger"
 
@@ -5627,7 +5841,7 @@ msgid "Destination path"
 msgstr "Répertoire de destination"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
 msgid "Owner"
 msgstr "Propriétaire"
 
@@ -5635,7 +5849,7 @@ msgstr "Propriétaire"
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
 #: plugins/admin/systems/class_printGeneric.inc:672
 #: plugins/admin/systems/class_printGeneric.inc:674
-#: plugins/admin/ogroups/class_ogroupManagement.inc:583
+#: plugins/admin/ogroups/class_ogroupManagement.inc:584
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr "Groupes"
@@ -5693,58 +5907,76 @@ msgstr "Liste des scripts de connexions"
 msgid "Choose a hook to delete or edit"
 msgstr "Choisissez une connexion à effacer ou éditer"
 
-#: plugins/admin/fai/faiNewBranch.tpl:5
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
+#: plugins/admin/groups/class_groupGeneric.inc:122
+msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
+"Impossible de trouver le SID de ce groupe dans l'annuaire LDAP ou dans le "
+"fichier de configuration!"
 
-#: plugins/admin/fai/faiNewBranch.tpl:11
-msgid "Please enter a name for the branch"
-msgstr "Veuillez entrer un nom pour la branche."
+#: plugins/admin/groups/class_groupGeneric.inc:179
+msgid "This 'dn' is no group."
+msgstr "Ce 'dn' n'est pas un groupe."
 
-#: plugins/admin/fai/faiNewBranch.tpl:33
-#: plugins/admin/departments/recursive_moce.tpl:1
-msgid ""
-"Processing requested operation, the status of this operation will be "
-"displayed in an iframe below."
-msgstr ""
+#: plugins/admin/groups/class_groupGeneric.inc:329
+msgid "Samba group"
+msgstr "Groupe Samba"
 
-#: plugins/admin/fai/faiNewBranch.tpl:34
+#: plugins/admin/groups/class_groupGeneric.inc:329
+msgid "Domain admins"
+msgstr "Administrateurs du domaine"
+
+#: plugins/admin/groups/class_groupGeneric.inc:329
+msgid "Domain users"
+msgstr "Utilisateurs du domaine"
+
+#: plugins/admin/groups/class_groupGeneric.inc:330
+msgid "Domain guests"
+msgstr "Invités du domaine"
+
+#: plugins/admin/groups/class_groupGeneric.inc:335
+#, php-format
+msgid "Special group (%d)"
+msgstr "Groupe spécial (%d)"
+
+#: plugins/admin/groups/class_groupGeneric.inc:445
+#, php-format
 msgid ""
-"As soon as the operation has finished, you can scroll down to end of the "
-"page and press the 'Back' button to return to the fai management dialog."
+"Your search method returned more than '%s' users, only '%s' users are shown."
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:42
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
+#: plugins/admin/groups/class_groupGeneric.inc:462
+#, fuzzy
+msgid "! unknown id"
+msgstr "inconnu"
+
+#: plugins/admin/groups/class_groupGeneric.inc:598
+#, php-format
+msgid "No configured SID found for '%s'."
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:44
-msgid "Perform requested operation."
+#: plugins/admin/groups/class_groupGeneric.inc:603
+#, php-format
+msgid "No configured RIDBASE found for '%s'."
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:44
-#, fuzzy
-msgid "Initiate operation"
-msgstr "Créer des options"
+#: plugins/admin/groups/class_groupGeneric.inc:716
+#: plugins/admin/ogroups/class_ogroup.inc:655
+msgid "You have no permissions to create a group on this 'Base'."
+msgstr "Vous n'avez pas l'autorisation de créer un groupe dans cette 'Base'."
 
-#: plugins/admin/fai/remove_branch.tpl:6
+#: plugins/admin/groups/class_groupGeneric.inc:726
 msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for GOsa "
-"to get your data back."
+"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
 msgstr ""
-"Cela inclut toutes les données des comptes, les droits d'accès, la "
-"configuration imap,etc. pour cette branche. Veuillez vous assurez que vous "
-"voulez effectuez cette opération. Toutes les données seront perdues étant "
-"donné qu'il est impossible pour GOsa de récupérer vos données."
+"Le champ 'Nom' contient des caractères invalides. Minuscule, chiffre et "
+"tirets sont valides."
+
+#: plugins/admin/groups/class_groupGeneric.inc:738
+#: plugins/admin/groups/class_groupGeneric.inc:752
+#: plugins/admin/groups/class_groupGeneric.inc:759
+msgid "Value specified as 'Name' is already used."
+msgstr "La valeur spécifiée dans le champs 'Nom' existe déjà."
 
 #: plugins/admin/groups/mail.tpl:11 plugins/admin/groups/paste_mail.tpl:12
 msgid "Primary mail address for this shared folder"
@@ -5771,6 +6003,69 @@ msgstr "Permission des membres"
 msgid "Forward messages to non group members"
 msgstr "Transférer les messages vers un membre n'appartenant pas au groupe"
 
+#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
+msgstr "Liste des groupes"
+
+#: plugins/admin/groups/headpage.tpl:25
+msgid ""
+"This menu allows you to add, edit and remove selected groups. You may want "
+"to use the range selector on top of the group listbox, when working with a "
+"large number of groups."
+msgstr ""
+"Ce menu permet d'ajouter, de modifier ou de supprimer les groupes "
+"sélectionnés. Vous pouvez utiliser les différents filtres lorsque vous "
+"travaillez avec un nombre élevé de groupes."
+
+#: plugins/admin/groups/headpage.tpl:41
+msgid "Select to see groups that are primary groups of users"
+msgstr ""
+"Sélectionnez afin d'afficher les groupes qui sont les groupes principaux "
+"d'utilisateurs"
+
+#: plugins/admin/groups/headpage.tpl:42
+msgid "Show primary groups"
+msgstr "Afficher les groupes de base"
+
+#: plugins/admin/groups/headpage.tpl:46
+msgid "Select to see groups that have samba groups mappings"
+msgstr "Sélectionnez afin d'afficher les groupes Samba"
+
+#: plugins/admin/groups/headpage.tpl:47
+msgid "Show samba groups"
+msgstr "Afficher les groupes Samba"
+
+#: plugins/admin/groups/headpage.tpl:50
+msgid "Select to see groups that have applications configured"
+msgstr ""
+"Sélectionnez afin d'afficher les groupes ayant des applications configurées"
+
+#: plugins/admin/groups/headpage.tpl:51
+msgid "Show application groups"
+msgstr "Afficher les groupes applications"
+
+#: plugins/admin/groups/headpage.tpl:54
+msgid "Select to see groups that have mail settings"
+msgstr "Sélectionnez afin d'afficher les groupes ayant la messagerie activée"
+
+#: plugins/admin/groups/headpage.tpl:55
+msgid "Show mail groups"
+msgstr "Afficher les groupes ayant la messagerie activé"
+
+#: plugins/admin/groups/headpage.tpl:58
+msgid "Select to see normal groups that have only functional aspects"
+msgstr ""
+"Sélectionnez afin d'afficher les groupes normaux ayant uniquement un aspect "
+"fonctionnel"
+
+#: plugins/admin/groups/headpage.tpl:59
+msgid "Show functional groups"
+msgstr "Afficher les groupes fonctionnels"
+
+#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
+msgid "Group administration"
+msgstr "Administration du groupe"
+
 #: plugins/admin/groups/class_groupManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:55 html/getxls.php:97
 #: html/getxls.php:99 html/getxls.php:244
@@ -5789,7 +6084,7 @@ msgstr "Vous n'êtes pas autorisé à supprimer ce groupe!"
 
 #: plugins/admin/groups/class_groupManagement.inc:441
 #: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/applications/class_applicationManagement.inc:460
+#: plugins/admin/applications/class_applicationManagement.inc:462
 #: plugins/admin/ogroups/class_ogroupManagement.inc:431
 #, fuzzy
 msgid "Paste"
@@ -5797,164 +6092,93 @@ msgstr "Chemin"
 
 #: plugins/admin/groups/class_groupManagement.inc:443
 #: plugins/admin/users/class_userManagement.inc:769
-#: plugins/admin/applications/class_applicationManagement.inc:462
+#: plugins/admin/applications/class_applicationManagement.inc:464
 #: plugins/admin/ogroups/class_ogroupManagement.inc:433
 #, fuzzy
 msgid "Can't paste"
 msgstr "Mise à jour immédiate"
 
-#: plugins/admin/groups/class_groupManagement.inc:455
+#: plugins/admin/groups/class_groupManagement.inc:456
 msgid "Create new group"
 msgstr "Créer un nouveau groupe"
 
-#: plugins/admin/groups/class_groupManagement.inc:465
-#: plugins/admin/users/class_userManagement.inc:795
-#: plugins/admin/applications/class_applicationManagement.inc:485
-#: plugins/admin/ogroups/class_ogroupManagement.inc:460
+#: plugins/admin/groups/class_groupManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/applications/class_applicationManagement.inc:488
+#: plugins/admin/ogroups/class_ogroupManagement.inc:461
 #, fuzzy
 msgid "cut"
 msgstr "Exécuter"
 
-#: plugins/admin/groups/class_groupManagement.inc:465
-#: plugins/admin/users/class_userManagement.inc:795
-#: plugins/admin/applications/class_applicationManagement.inc:485
-#: plugins/admin/ogroups/class_ogroupManagement.inc:460
+#: plugins/admin/groups/class_groupManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/applications/class_applicationManagement.inc:488
+#: plugins/admin/ogroups/class_ogroupManagement.inc:461
 #, fuzzy
 msgid "Cut this entry"
 msgstr "Modifier cette entrée"
 
-#: plugins/admin/groups/class_groupManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:797
-#: plugins/admin/applications/class_applicationManagement.inc:487
-#: plugins/admin/ogroups/class_ogroupManagement.inc:462
+#: plugins/admin/groups/class_groupManagement.inc:468
+#: plugins/admin/users/class_userManagement.inc:798
+#: plugins/admin/applications/class_applicationManagement.inc:490
+#: plugins/admin/ogroups/class_ogroupManagement.inc:463
 msgid "copy"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:797
-#: plugins/admin/applications/class_applicationManagement.inc:487
-#: plugins/admin/ogroups/class_ogroupManagement.inc:462
+#: plugins/admin/groups/class_groupManagement.inc:468
+#: plugins/admin/users/class_userManagement.inc:798
+#: plugins/admin/applications/class_applicationManagement.inc:490
+#: plugins/admin/ogroups/class_ogroupManagement.inc:463
 #, fuzzy
 msgid "Copy this entry"
 msgstr "Modifier cette entrée"
 
-#: plugins/admin/groups/class_groupManagement.inc:469
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/applications/class_applicationManagement.inc:489
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/departments/class_departmentManagement.inc:310
-#: plugins/admin/ogroups/class_ogroupManagement.inc:464
-#: plugins/admin/ogroups/class_ogroupManagement.inc:469
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
+#: plugins/admin/groups/class_groupManagement.inc:470
+#: plugins/admin/groups/class_groupManagement.inc:475
+#: plugins/admin/applications/class_applicationManagement.inc:492
+#: plugins/admin/applications/class_applicationManagement.inc:498
+#: plugins/admin/departments/class_departmentManagement.inc:311
+#: plugins/admin/ogroups/class_ogroupManagement.inc:465
+#: plugins/admin/ogroups/class_ogroupManagement.inc:470
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
 msgid "Edit this entry"
 msgstr "Modifier cette entrée"
 
-#: plugins/admin/groups/class_groupManagement.inc:471
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/applications/class_applicationManagement.inc:491
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/departments/class_departmentManagement.inc:311
-#: plugins/admin/ogroups/class_ogroupManagement.inc:466
-#: plugins/admin/ogroups/class_ogroupManagement.inc:471
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
+#: plugins/admin/groups/class_groupManagement.inc:472
+#: plugins/admin/groups/class_groupManagement.inc:477
+#: plugins/admin/applications/class_applicationManagement.inc:494
+#: plugins/admin/applications/class_applicationManagement.inc:500
+#: plugins/admin/departments/class_departmentManagement.inc:312
+#: plugins/admin/ogroups/class_ogroupManagement.inc:467
+#: plugins/admin/ogroups/class_ogroupManagement.inc:472
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
 msgid "Delete this entry"
 msgstr "Supprimer cette entrée"
 
-#: plugins/admin/groups/class_groupManagement.inc:499
-#: plugins/admin/users/class_userManagement.inc:856
+#: plugins/admin/groups/class_groupManagement.inc:500
+#: plugins/admin/users/class_userManagement.inc:857
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:508
-#: plugins/admin/applications/class_applicationManagement.inc:509
-#: plugins/admin/ogroups/class_ogroupManagement.inc:584
+#: plugins/admin/groups/class_groupManagement.inc:509
+#: plugins/admin/applications/class_applicationManagement.inc:512
+#: plugins/admin/ogroups/class_ogroupManagement.inc:585
 #: plugins/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
 msgid "Application"
 msgstr "Applications"
 
-#: plugins/admin/groups/class_groupManagement.inc:523
+#: plugins/admin/groups/class_groupManagement.inc:524
 msgid "Groupname"
 msgstr "Nom du groupe"
 
-#: plugins/admin/groups/class_groupManagement.inc:528
-#: plugins/admin/applications/class_applicationManagement.inc:523
-#: plugins/admin/ogroups/class_ogroupManagement.inc:498
+#: plugins/admin/groups/class_groupManagement.inc:529
+#: plugins/admin/applications/class_applicationManagement.inc:526
+#: plugins/admin/ogroups/class_ogroupManagement.inc:499
 msgid "This table displays all groups, in the selected tree."
 msgstr "Ce tableau montre tous les groupes, dans l'arbre sélectionné."
 
-#: plugins/admin/groups/class_groupGeneric.inc:122
-msgid "Can't find this groups SID in LDAP or in your configuration file!"
-msgstr ""
-"Impossible de trouver le SID de ce groupe dans l'annuaire LDAP ou dans le "
-"fichier de configuration!"
-
-#: plugins/admin/groups/class_groupGeneric.inc:179
-msgid "This 'dn' is no group."
-msgstr "Ce 'dn' n'est pas un groupe."
-
-#: plugins/admin/groups/class_groupGeneric.inc:329
-msgid "Samba group"
-msgstr "Groupe Samba"
-
-#: plugins/admin/groups/class_groupGeneric.inc:329
-msgid "Domain admins"
-msgstr "Administrateurs du domaine"
-
-#: plugins/admin/groups/class_groupGeneric.inc:329
-msgid "Domain users"
-msgstr "Utilisateurs du domaine"
-
-#: plugins/admin/groups/class_groupGeneric.inc:330
-msgid "Domain guests"
-msgstr "Invités du domaine"
-
-#: plugins/admin/groups/class_groupGeneric.inc:335
-#, php-format
-msgid "Special group (%d)"
-msgstr "Groupe spécial (%d)"
-
-#: plugins/admin/groups/class_groupGeneric.inc:445
-#, php-format
-msgid ""
-"Your search method returned more than '%s' users, only '%s' users are shown."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:462
-#, fuzzy
-msgid "! unknown id"
-msgstr "inconnu"
-
-#: plugins/admin/groups/class_groupGeneric.inc:598
-#, php-format
-msgid "No configured SID found for '%s'."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:603
-#, php-format
-msgid "No configured RIDBASE found for '%s'."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:716
-#: plugins/admin/ogroups/class_ogroup.inc:655
-msgid "You have no permissions to create a group on this 'Base'."
-msgstr "Vous n'avez pas l'autorisation de créer un groupe dans cette 'Base'."
-
-#: plugins/admin/groups/class_groupGeneric.inc:726
-msgid ""
-"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-"Le champ 'Nom' contient des caractères invalides. Minuscule, chiffre et "
-"tirets sont valides."
-
-#: plugins/admin/groups/class_groupGeneric.inc:738
-#: plugins/admin/groups/class_groupGeneric.inc:752
-#: plugins/admin/groups/class_groupGeneric.inc:759
-msgid "Value specified as 'Name' is already used."
-msgstr "La valeur spécifiée dans le champs 'Nom' existe déjà."
-
 #: plugins/admin/groups/remove.tpl:6
 msgid ""
 "This may be a primary user group. Please double check if you really want to "
@@ -5965,68 +6189,9 @@ msgstr ""
 "seront perdues étant donné qu'il est impossible pour GOsa de récupérer vos "
 "données."
 
-#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
-msgid "Group administration"
-msgstr "Administration du groupe"
-
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
-msgid "List of groups"
-msgstr "Liste des groupes"
-
-#: plugins/admin/groups/headpage.tpl:25
-msgid ""
-"This menu allows you to add, edit and remove selected groups. You may want "
-"to use the range selector on top of the group listbox, when working with a "
-"large number of groups."
-msgstr ""
-"Ce menu permet d'ajouter, de modifier ou de supprimer les groupes "
-"sélectionnés. Vous pouvez utiliser les différents filtres lorsque vous "
-"travaillez avec un nombre élevé de groupes."
-
-#: plugins/admin/groups/headpage.tpl:41
-msgid "Select to see groups that are primary groups of users"
-msgstr ""
-"Sélectionnez afin d'afficher les groupes qui sont les groupes principaux "
-"d'utilisateurs"
-
-#: plugins/admin/groups/headpage.tpl:42
-msgid "Show primary groups"
-msgstr "Afficher les groupes de base"
-
-#: plugins/admin/groups/headpage.tpl:46
-msgid "Select to see groups that have samba groups mappings"
-msgstr "Sélectionnez afin d'afficher les groupes Samba"
-
-#: plugins/admin/groups/headpage.tpl:47
-msgid "Show samba groups"
-msgstr "Afficher les groupes Samba"
-
-#: plugins/admin/groups/headpage.tpl:50
-msgid "Select to see groups that have applications configured"
-msgstr ""
-"Sélectionnez afin d'afficher les groupes ayant des applications configurées"
-
-#: plugins/admin/groups/headpage.tpl:51
-msgid "Show application groups"
-msgstr "Afficher les groupes applications"
-
-#: plugins/admin/groups/headpage.tpl:54
-msgid "Select to see groups that have mail settings"
-msgstr "Sélectionnez afin d'afficher les groupes ayant la messagerie activée"
-
-#: plugins/admin/groups/headpage.tpl:55
-msgid "Show mail groups"
-msgstr "Afficher les groupes ayant la messagerie activé"
-
-#: plugins/admin/groups/headpage.tpl:58
-msgid "Select to see normal groups that have only functional aspects"
-msgstr ""
-"Sélectionnez afin d'afficher les groupes normaux ayant uniquement un aspect "
-"fonctionnel"
-
-#: plugins/admin/groups/headpage.tpl:59
-msgid "Show functional groups"
-msgstr "Afficher les groupes fonctionnels"
+#: plugins/admin/groups/application_options.tpl:1
+msgid "Application options"
+msgstr "Options des applications"
 
 #: plugins/admin/groups/class_groupMail.inc:278
 msgid "read"
@@ -6078,6 +6243,8 @@ msgid "Please select a valid mail server."
 msgstr "Veuillez sélectionner un serveur de messagerie valide."
 
 #: plugins/admin/groups/acl.tpl:4
+#: plugins/admin/departments/class_departmentGeneric.inc:314
+#: include/class_ldap.inc:412
 msgid "Object"
 msgstr "Objet"
 
@@ -6198,9 +6365,10 @@ msgstr "Administrateurs du répertoire"
 msgid "Select a specific department"
 msgstr "Sélectionner un département"
 
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
-msgstr "Options des applications"
+#: plugins/admin/groups/paste_generic.tpl:1
+#, fuzzy
+msgid "Group settings"
+msgstr "Préférences des quotas"
 
 #: plugins/admin/groups/mail_locals.tpl:32
 msgid "Display addresses of department"
@@ -6278,11 +6446,6 @@ msgstr "En bas"
 msgid "Insert seperator"
 msgstr "Insérer un séparateur"
 
-#: plugins/admin/groups/paste_generic.tpl:1
-#, fuzzy
-msgid "Group settings"
-msgstr "Préférences des quotas"
-
 #: plugins/admin/users/password.tpl:2
 msgid ""
 "To change the user password use the fields below. The changes take effect "
@@ -6293,10 +6456,34 @@ msgstr ""
 "Les changements prennent effet immédiatement. Veuillez mémoriser le nouveau "
 "mot de passe sinon l'utilisateur ne pourra pas s'identifier sans celui-ci."
 
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr "Créer un nouvel utilisateur à partir d'un modèle"
+
+#: plugins/admin/users/template.tpl:6
+msgid ""
+"Creating a new user can be assisted by using templates. Many database "
+"records will be filled automatically. Choose 'none' to skip the usage of "
+"templates."
+msgstr ""
+"La création d'un nouvel utilisateur peut être facilité en utilisant les "
+"modèles. De nombreuses informations seront ainsi remplies automatiquement. "
+"Sélectionnez 'aucun' afin de ne pas utiliser les modèles."
+
+#: plugins/admin/users/template.tpl:11
+#: plugins/admin/users/class_userManagement.inc:1181
+#: plugins/admin/systems/class_systemManagement.inc:918
+msgid "Template"
+msgstr "Modèle"
+
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
+msgstr "Administration des utilisateurs"
+
 #: plugins/admin/users/class_userManagement.inc:25
-#: plugins/admin/systems/printer.tpl:66
-#: plugins/admin/systems/class_glpiSelectUser.inc:112 html/getxls.php:68
-#: html/getxls.php:70 html/getxls.php:243
+#: plugins/admin/systems/class_glpiSelectUser.inc:112
+#: plugins/admin/systems/printer.tpl:66 html/getxls.php:68 html/getxls.php:70
+#: html/getxls.php:243
 msgid "Users"
 msgstr "Utilisateurs"
 
@@ -6327,94 +6514,89 @@ msgstr "aucun"
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Une personne ayant ce nom existe déjà dans l'annuaire."
 
-#: plugins/admin/users/class_userManagement.inc:782
+#: plugins/admin/users/class_userManagement.inc:783
 msgid "Create new user"
 msgstr "Création d'un nouvel utilisateur"
 
-#: plugins/admin/users/class_userManagement.inc:782
+#: plugins/admin/users/class_userManagement.inc:783
 msgid "New user"
 msgstr "Nouvel utilisateur"
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:784
 msgid "Create new template"
 msgstr "Créer un nouveau modèle"
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:784
 msgid "New template"
 msgstr "Nouveau modèle"
 
-#: plugins/admin/users/class_userManagement.inc:800
-#: plugins/admin/users/class_userManagement.inc:807
+#: plugins/admin/users/class_userManagement.inc:801
+#: plugins/admin/users/class_userManagement.inc:808
 msgid "password"
 msgstr "mot de passe"
 
-#: plugins/admin/users/class_userManagement.inc:818
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
+#: plugins/admin/users/class_userManagement.inc:819
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
-#: ihtml/themes/default/setup_useradmin.tpl:22
+#: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/default/login.tpl:28 ihtml/themes/default/login.tpl:32
+#: ihtml/themes/default/setup_useradmin.tpl:22 ihtml/themes/lhs/login.tpl:28
+#: ihtml/themes/lhs/login.tpl:32 ihtml/themes/lhs/setup_useradmin.tpl:22
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: plugins/admin/users/class_userManagement.inc:823
+#: plugins/admin/users/class_userManagement.inc:824
 msgid "This table displays all users, in the selected tree."
 msgstr "Ce tableau montre toutes les utilisateurs, dans l'arbre sélectionné."
 
-#: plugins/admin/users/class_userManagement.inc:854
+#: plugins/admin/users/class_userManagement.inc:855
 msgid "GOsa"
 msgstr "GOsa"
 
-#: plugins/admin/users/class_userManagement.inc:855
+#: plugins/admin/users/class_userManagement.inc:856
 msgid "Edit generic properties"
 msgstr "Modifier les propriétés de base"
 
-#: plugins/admin/users/class_userManagement.inc:857
+#: plugins/admin/users/class_userManagement.inc:858
 msgid "Edit UNIX properties"
 msgstr "Modifier les propriétés UNIX"
 
-#: plugins/admin/users/class_userManagement.inc:859
+#: plugins/admin/users/class_userManagement.inc:860
 msgid "Edit environment properties"
 msgstr "Modifier les propriétés d'environnement"
 
-#: plugins/admin/users/class_userManagement.inc:861
+#: plugins/admin/users/class_userManagement.inc:862
 msgid "Edit mail properties"
 msgstr "Modifier les propriétés de messagerie"
 
-#: plugins/admin/users/class_userManagement.inc:863
+#: plugins/admin/users/class_userManagement.inc:864
 msgid "Edit phone properties"
 msgstr "Modifier les propriétés téléphoniques"
 
-#: plugins/admin/users/class_userManagement.inc:865
+#: plugins/admin/users/class_userManagement.inc:866
 msgid "Edit fax properies"
 msgstr "Modifier les propriétés fax"
 
-#: plugins/admin/users/class_userManagement.inc:867
+#: plugins/admin/users/class_userManagement.inc:868
 msgid "Edit samba properties"
 msgstr "Modifier les propriétés samba"
 
-#: plugins/admin/users/class_userManagement.inc:868
+#: plugins/admin/users/class_userManagement.inc:869
 msgid "Create user from template"
 msgstr "Créer un nouvel utilisateur depuis un modèle"
 
-#: plugins/admin/users/class_userManagement.inc:869
+#: plugins/admin/users/class_userManagement.inc:870
 msgid "Create user with this template"
 msgstr "Créer un nouvel utilisateur avec ce modèle"
 
-#: plugins/admin/users/class_userManagement.inc:928
+#: plugins/admin/users/class_userManagement.inc:929
 msgid "Online"
 msgstr "En ligne"
 
-#: plugins/admin/users/class_userManagement.inc:935
+#: plugins/admin/users/class_userManagement.inc:936
 msgid "Offline"
 msgstr "Hors-ligne"
 
-#: plugins/admin/users/class_userManagement.inc:1180
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/systems/class_systemManagement.inc:917
-msgid "Template"
-msgstr "Modèle"
-
 #: plugins/admin/users/remove.tpl:6
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -6487,86 +6669,29 @@ msgstr "Sélectionnez afin d'afficher les utilisateurs ayant un compte proxy"
 msgid "Show proxy users"
 msgstr "Afficher les utilisateurs proxy"
 
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
-msgstr "Administration des utilisateurs"
+#: plugins/admin/applications/generic.tpl:7
+#: plugins/admin/applications/generic.tpl:8
+#: plugins/admin/applications/class_applicationManagement.inc:521
+#: plugins/admin/applications/class_applicationGeneric.inc:379
+msgid "Application name"
+msgstr "Nom de l'application"
 
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
-msgstr "Créer un nouvel utilisateur à partir d'un modèle"
+#: plugins/admin/applications/generic.tpl:11
+#: plugins/gofon/macro/generic.tpl:10 html/getxls.php:174 html/getxls.php:236
+msgid "Display name"
+msgstr "Nom à afficher"
 
-#: plugins/admin/users/template.tpl:6
-msgid ""
-"Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose 'none' to skip the usage of "
-"templates."
-msgstr ""
-"La création d'un nouvel utilisateur peut être facilité en utilisant les "
-"modèles. De nombreuses informations seront ainsi remplies automatiquement. "
-"Sélectionnez 'aucun' afin de ne pas utiliser les modèles."
+#: plugins/admin/applications/generic.tpl:13
+#: plugins/admin/applications/class_applicationGeneric.inc:384
+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/class_applicationParameters.inc:52
-msgid "Remove options"
-msgstr "Supprimer les options"
+#: plugins/admin/applications/generic.tpl:19
+msgid "Path and/or binary name of application"
+msgstr "Chemin et/ou le nom de l'exécutable de l'application"
 
-#: plugins/admin/applications/class_applicationParameters.inc:53
-msgid "This application has options. You can disable them by clicking below."
-msgstr ""
-"Cette application a des options. Vous pouvez les désactiver en cliquant sur "
-"le bouton ci-dessous."
-
-#: plugins/admin/applications/class_applicationParameters.inc:55
-msgid "Create options"
-msgstr "Créer des options"
-
-#: plugins/admin/applications/class_applicationParameters.inc:56
-msgid ""
-"This application has options disabled. You can enable them by clicking below."
-msgstr ""
-"Cette application a des options désactivées. Vous pouvez les activer en "
-"cliquant en-dessous."
-
-#: plugins/admin/applications/class_applicationParameters.inc:93
-msgid "Variable"
-msgstr "Variable"
-
-#: plugins/admin/applications/class_applicationParameters.inc:93
-#: plugins/gofon/macro/parameter.tpl:9
-msgid "Default value"
-msgstr "Valeur par défaut"
-
-#: plugins/admin/applications/class_applicationParameters.inc:104
-msgid "Add option"
-msgstr "Ajouter une option"
-
-#: plugins/admin/applications/class_applicationParameters.inc:158
-#, php-format
-msgid "Value '%s' specified as option name is not valid."
-msgstr "La valeur '%s' spécifiée pour le nom de l'option est invalide."
-
-#: plugins/admin/applications/generic.tpl:7
-#: plugins/admin/applications/generic.tpl:8
-#: plugins/admin/applications/class_applicationGeneric.inc:379
-#: plugins/admin/applications/class_applicationManagement.inc:518
-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
-msgid "Display name"
-msgstr "Nom à afficher"
-
-#: plugins/admin/applications/generic.tpl:13
-#: plugins/admin/applications/class_applicationGeneric.inc:384
-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:19
-msgid "Path and/or binary name of application"
-msgstr "Chemin et/ou le nom de l'exécutable de l'application"
-
-#: plugins/admin/applications/generic.tpl:34
-msgid "Choose subtree to place application in"
+#: plugins/admin/applications/generic.tpl:34
+msgid "Choose subtree to place application in"
 msgstr ""
 "Sélectionner la branche de l'annuaire ou sera placée l'entrée de "
 "l'application"
@@ -6603,6 +6728,45 @@ msgstr "Placer une entrée dans le menu démarrage des membres"
 msgid "Place entry in members launch bar"
 msgstr "Placer une entrée dans le menu démarrage des membres"
 
+#: plugins/admin/applications/class_applicationParameters.inc:52
+msgid "Remove options"
+msgstr "Supprimer les options"
+
+#: plugins/admin/applications/class_applicationParameters.inc:53
+msgid "This application has options. You can disable them by clicking below."
+msgstr ""
+"Cette application a des options. Vous pouvez les désactiver en cliquant sur "
+"le bouton ci-dessous."
+
+#: plugins/admin/applications/class_applicationParameters.inc:55
+msgid "Create options"
+msgstr "Créer des options"
+
+#: plugins/admin/applications/class_applicationParameters.inc:56
+msgid ""
+"This application has options disabled. You can enable them by clicking below."
+msgstr ""
+"Cette application a des options désactivées. Vous pouvez les activer en "
+"cliquant en-dessous."
+
+#: plugins/admin/applications/class_applicationParameters.inc:93
+msgid "Variable"
+msgstr "Variable"
+
+#: plugins/admin/applications/class_applicationParameters.inc:93
+#: plugins/gofon/macro/parameter.tpl:9
+msgid "Default value"
+msgstr "Valeur par défaut"
+
+#: plugins/admin/applications/class_applicationParameters.inc:104
+msgid "Add option"
+msgstr "Ajouter une option"
+
+#: plugins/admin/applications/class_applicationParameters.inc:158
+#, php-format
+msgid "Value '%s' specified as option name is not valid."
+msgstr "La valeur '%s' spécifiée pour le nom de l'option est invalide."
+
 #: plugins/admin/applications/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -6639,6 +6803,25 @@ msgstr "Expression régulière pour faire correspondre le nom des applications"
 msgid "Application management"
 msgstr "Gestion des applications"
 
+#: plugins/admin/applications/class_applicationManagement.inc:376
+#, php-format
+msgid "You're about to delete the application '%s'."
+msgstr "Vous êtes sur le point de supprimer l'application '%s'."
+
+#: plugins/admin/applications/class_applicationManagement.inc:382
+#: plugins/admin/applications/class_applicationManagement.inc:408
+msgid "You are not allowed to delete this application!"
+msgstr "Vous n'êtes pas autorisé à supprimer cette application!"
+
+#: plugins/admin/applications/class_applicationManagement.inc:477
+#: plugins/admin/ogroups/class_ogroupManagement.inc:449
+msgid "new"
+msgstr "nouveau"
+
+#: plugins/admin/applications/class_applicationManagement.inc:477
+msgid "Create new application"
+msgstr "Créer une nouvelle application"
+
 #: plugins/admin/applications/class_applicationGeneric.inc:87
 msgid "no example"
 msgstr "pas d'exemple"
@@ -6680,25 +6863,6 @@ msgstr "Une application ayant le même 'Nom' existe déjà."
 msgid "Application settings"
 msgstr "Options des applications"
 
-#: plugins/admin/applications/class_applicationManagement.inc:374
-#, php-format
-msgid "You're about to delete the application '%s'."
-msgstr "Vous êtes sur le point de supprimer l'application '%s'."
-
-#: plugins/admin/applications/class_applicationManagement.inc:380
-#: plugins/admin/applications/class_applicationManagement.inc:406
-msgid "You are not allowed to delete this application!"
-msgstr "Vous n'êtes pas autorisé à supprimer cette application!"
-
-#: plugins/admin/applications/class_applicationManagement.inc:474
-#: plugins/admin/ogroups/class_ogroupManagement.inc:448
-msgid "new"
-msgstr "nouveau"
-
-#: plugins/admin/applications/class_applicationManagement.inc:474
-msgid "Create new application"
-msgstr "Créer une nouvelle application"
-
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr "Nom du département"
@@ -6784,47 +6948,10 @@ msgstr "Expression régulière pour faire correspondre le nom des applications"
 msgid "Department management"
 msgstr "Gestion des départements"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:185
-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:192
-#: plugins/admin/departments/class_departmentGeneric.inc:194
-msgid "Department with that 'Name' already exists."
-msgstr "Un département ayant ce 'Nom' existe déjà."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:202
-msgid "Required field 'Description' is not set."
-msgstr "Le champ obligatoire 'Description' n'est pas rempli."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:207
-msgid "The field 'Name' contains the reserved word 'incoming'."
-msgstr "Le champ 'Nom' contient le mot réservé 'incoming'."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:208
-msgid " Please choose another name."
-msgstr " Veuillez choisir un autre nom."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:274
-#, php-format
-msgid "Moving %s in %s"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:313
-#, php-format
-msgid "FAILED to copy %s, aborting operation"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:321
-#, fuzzy
-msgid "Complete"
-msgstr "incomplet"
-
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
 #: plugins/admin/ogroups/class_ogroupManagement.inc:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:492
+#: plugins/admin/ogroups/class_ogroupManagement.inc:493
 msgid "Departments"
 msgstr "Départements"
 
@@ -6841,68 +6968,102 @@ msgstr ""
 msgid "You have no permission to remove this department."
 msgstr "Vous n'avez pas les droits nécessaires pour supprimer ce département."
 
-#: plugins/admin/departments/class_departmentManagement.inc:300
+#: plugins/admin/departments/class_departmentManagement.inc:301
 msgid "Create new department"
 msgstr "Créer un nouveau département"
 
-#: plugins/admin/departments/class_departmentManagement.inc:308
+#: plugins/admin/departments/class_departmentManagement.inc:309
 msgid "This table displays all departments, in the selected tree."
 msgstr "Ce tableau montre tous les départements, dans l'arbre sélectionné."
 
-#: plugins/admin/departments/class_departmentManagement.inc:317
+#: plugins/admin/departments/class_departmentManagement.inc:318
 msgid "Department name"
 msgstr "Nom du département"
 
-#: plugins/admin/departments/class_departmentManagement.inc:411
+#: plugins/admin/departments/class_departmentManagement.inc:412
 msgid ".."
 msgstr ".."
 
-#: plugins/admin/departments/recursive_moce.tpl:3
+#: plugins/admin/departments/class_departmentGeneric.inc:185
+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:192
+#: plugins/admin/departments/class_departmentGeneric.inc:194
+msgid "Department with that 'Name' already exists."
+msgstr "Un département ayant ce 'Nom' existe déjà."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:202
+msgid "Required field 'Description' is not set."
+msgstr "Le champ obligatoire 'Description' n'est pas rempli."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:207
+msgid "The field 'Name' contains the reserved word 'incoming'."
+msgstr "Le champ 'Nom' contient le mot réservé 'incoming'."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:208
+msgid " Please choose another name."
+msgstr " Veuillez choisir un autre nom."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:278
+#, php-format
+msgid "Moving %s to %s"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:317
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
+msgstr ""
+
+#: plugins/admin/departments/recursive_move.tpl:2
 msgid ""
-"Your browser isn't able to display this iframe ... use the link below intead"
+"As soon as the move operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the department "
+"management dialog."
 msgstr ""
 
 #: plugins/admin/systems/class_terminalInfo.inc:54
-#: plugins/admin/systems/class_terminalInfo.inc:199
+#: plugins/admin/systems/class_terminalInfo.inc:200
 msgid "present"
 msgstr "présent"
 
-#: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_terminalService.inc:158
-#: plugins/admin/systems/class_terminalStartup.inc:99
+#: plugins/admin/systems/class_terminalInfo.inc:68
 #: plugins/admin/systems/class_workstationService.inc:151
 #: plugins/admin/systems/class_workstationStartup.inc:372
+#: plugins/admin/systems/class_terminalService.inc:158
+#: plugins/admin/systems/class_terminalStartup.inc:99
 #: plugins/admin/systems/class_terminalGeneric.inc:153
 msgid "This 'dn' has no terminal features."
 msgstr "Ce 'dn' n'a pas d'extension de terminaux."
 
-#: plugins/admin/systems/class_terminalInfo.inc:74
+#: plugins/admin/systems/class_terminalInfo.inc:75
 msgid "There is no php snmp module installed, can't gather any informations."
 msgstr ""
 "Le module php snmp n'est pas installé, impossible d'obtenir les informations."
 
-#: plugins/admin/systems/class_terminalInfo.inc:80
-#: plugins/admin/systems/class_terminalInfo.inc:174
+#: plugins/admin/systems/class_terminalInfo.inc:81
+#: plugins/admin/systems/class_terminalInfo.inc:175
 msgid "unknown status"
 msgstr "statut inconnu"
 
-#: plugins/admin/systems/class_terminalInfo.inc:89
+#: plugins/admin/systems/class_terminalInfo.inc:90
 msgid "This is a virtual terminal which has no properties to show here."
 msgstr "Ceci est un pseudo-terminal, aucune propriété ne peut être affichée."
 
-#: plugins/admin/systems/class_terminalInfo.inc:107
+#: plugins/admin/systems/class_terminalInfo.inc:108
 msgid "online"
 msgstr "en ligne"
 
-#: plugins/admin/systems/class_terminalInfo.inc:163
+#: plugins/admin/systems/class_terminalInfo.inc:164
 msgid "running"
 msgstr "en cours d'exécution"
 
-#: plugins/admin/systems/class_terminalInfo.inc:166
+#: plugins/admin/systems/class_terminalInfo.inc:167
 msgid "not running"
 msgstr "n'est pas en cours d'exécution"
 
-#: plugins/admin/systems/class_terminalInfo.inc:191
+#: plugins/admin/systems/class_terminalInfo.inc:192
 msgid "offline"
 msgstr "hors-ligne"
 
@@ -6934,8 +7095,8 @@ msgid "Zone"
 msgstr "Zone"
 
 #: plugins/admin/systems/network.tpl:42
-#: plugins/admin/systems/class_servDNS.inc:298
 #: plugins/admin/systems/servdnseditzone.tpl:81
+#: plugins/admin/systems/class_servDNS.inc:298
 msgid "TTL"
 msgstr "TTL"
 
@@ -6943,46 +7104,179 @@ msgstr "TTL"
 msgid "Dns records"
 msgstr "Enregistrement dns"
 
-#: plugins/admin/systems/class_winGeneric.inc:73
-#: plugins/admin/systems/class_componentGeneric.inc:50
-msgid "This 'dn' has no network features."
-msgstr "Ce 'dn' n'a pas d'extensions réseaux."
-
-#: plugins/admin/systems/class_winGeneric.inc:162
-#: plugins/admin/systems/class_componentGeneric.inc:145
-msgid "You have no permissions to create a component on this 'Base'."
-msgstr "Vous n'avez pas l'autorisation de créer un composant sur cette 'Base'."
+#: plugins/admin/systems/workstationService.tpl:4
+#: plugins/admin/systems/terminalService.tpl:4
+msgid "Keyboard"
+msgstr "Clavier"
 
-#: plugins/admin/systems/class_winGeneric.inc:172
-#: plugins/admin/systems/class_phoneGeneric.inc:314
-#: plugins/admin/systems/class_terminalGeneric.inc:286
-#: plugins/admin/systems/class_servGeneric.inc:209
-#: plugins/admin/systems/class_workstationGeneric.inc:245
-#: plugins/admin/systems/class_printGeneric.inc:529
-#: plugins/admin/systems/class_componentGeneric.inc:155
-#, php-format
-msgid "There is already an entry '%s' in the base choosen by you"
-msgstr "Une entrée '%s' existe déjà dans la base sélectionnée"
+#: plugins/admin/systems/workstationService.tpl:7
+#: plugins/admin/systems/terminalService.tpl:7
+#: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/printerPPDDialog.tpl:5
+msgid "Model"
+msgstr "Modèle"
 
-#: plugins/admin/systems/info.tpl:1
-msgid "System information"
-msgstr "Information sur le système"
+#: plugins/admin/systems/workstationService.tpl:9
+#: plugins/admin/systems/terminalService.tpl:9
+msgid "Choose keyboard model"
+msgstr "Sélectionnez le modèle du clavier"
 
-#: plugins/admin/systems/info.tpl:7
-msgid "CPU"
-msgstr "CPU"
+#: plugins/admin/systems/workstationService.tpl:15
+#: plugins/admin/systems/terminalService.tpl:15
+msgid "Layout"
+msgstr "Disposition"
 
-#: plugins/admin/systems/info.tpl:10
-msgid "Memory"
-msgstr "Mémoire"
+#: plugins/admin/systems/workstationService.tpl:17
+#: plugins/admin/systems/terminalService.tpl:17
+msgid "Choose keyboard layout"
+msgstr "Sélectionnez la disposition du clavier"
 
-#: plugins/admin/systems/info.tpl:13
-msgid "Boot MAC"
-msgstr "Adresse MAC de démarrage"
+#: plugins/admin/systems/workstationService.tpl:23
+#: plugins/admin/systems/terminalService.tpl:23
+msgid "Variant"
+msgstr "Variante"
 
-#: plugins/admin/systems/info.tpl:16
-msgid "USB support"
-msgstr "Support USB"
+#: plugins/admin/systems/workstationService.tpl:25
+#: plugins/admin/systems/terminalService.tpl:25
+msgid "Choose keyboard variant"
+msgstr "Sélectionnez la variante du clavier"
+
+#: plugins/admin/systems/workstationService.tpl:39
+#: plugins/admin/systems/terminalService.tpl:39
+msgid "Mouse"
+msgstr "Souris"
+
+#: plugins/admin/systems/workstationService.tpl:44
+#: plugins/admin/systems/terminalService.tpl:44
+msgid "Choose mouse type"
+msgstr "Sélectionnez le type de souris"
+
+#: plugins/admin/systems/workstationService.tpl:50
+#: plugins/admin/systems/terminalService.tpl:50
+msgid "Port"
+msgstr "Port"
+
+#: plugins/admin/systems/workstationService.tpl:52
+#: plugins/admin/systems/terminalService.tpl:52
+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:23
+msgid "Telephone hardware"
+msgstr "Matériel téléphonique"
+
+#: 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:25
+msgid "Telephone"
+msgstr "Téléphone"
+
+#: plugins/admin/systems/workstationService.tpl:83
+#: plugins/admin/systems/info.tpl:73
+#: plugins/admin/systems/terminalService.tpl:83
+msgid "Graphic device"
+msgstr "Carte écran"
+
+#: plugins/admin/systems/workstationService.tpl:86
+#: plugins/admin/systems/terminalService.tpl:86
+#: plugins/admin/systems/printer.tpl:46
+msgid "Driver"
+msgstr "Pilote"
+
+#: plugins/admin/systems/workstationService.tpl:88
+#: plugins/admin/systems/terminalService.tpl:88
+msgid "Choose graphic driver that is needed by the installed graphic board"
+msgstr ""
+"Sélectionnez le pilote de la carte vidéo correspondant à la carte graphique "
+"installée"
+
+#: plugins/admin/systems/workstationService.tpl:96
+#: plugins/admin/systems/terminalService.tpl:96
+msgid "Choose screen resolution used in graphic mode"
+msgstr "Sélectionnez la résolution utilisée en mode graphique"
+
+#: plugins/admin/systems/workstationService.tpl:102
+#: plugins/admin/systems/terminalService.tpl:102
+msgid "Color depth"
+msgstr "Profondeur des couleurs"
+
+#: plugins/admin/systems/workstationService.tpl:104
+#: plugins/admin/systems/terminalService.tpl:104
+msgid "Choose colordepth used in graphic mode"
+msgstr "Sélectionnez la profondeur des couleurs utilisée en mode graphique"
+
+#: plugins/admin/systems/workstationService.tpl:117
+#: plugins/admin/systems/terminalService.tpl:117
+msgid "Display device"
+msgstr "Écran"
+
+#: plugins/admin/systems/workstationService.tpl:121
+msgid "unknown"
+msgstr "inconnu"
+
+#: plugins/admin/systems/workstationService.tpl:126
+msgid "Automatic modelines"
+msgstr ""
+
+#: plugins/admin/systems/workstationService.tpl:130
+#: plugins/admin/systems/terminalService.tpl:124
+msgid "HSync"
+msgstr "Fréquence de synchronisation Horizontale"
+
+#: plugins/admin/systems/workstationService.tpl:132
+#: plugins/admin/systems/terminalService.tpl:126
+msgid "Horizontal refresh frequency for installed monitor"
+msgstr "Fréquence de rafraîchissement horizontal pour l'écran installé"
+
+#: plugins/admin/systems/workstationService.tpl:135
+#: plugins/admin/systems/terminalService.tpl:129
+msgid "VSync"
+msgstr "Fréquence de synchronisation verticale"
+
+#: plugins/admin/systems/workstationService.tpl:137
+#: plugins/admin/systems/terminalService.tpl:131
+msgid "Vertical refresh frequency for installed monitor"
+msgstr "Fréquence de rafraîchissement verticale pour l'écran installé"
+
+#: plugins/admin/systems/workstationService.tpl:149
+#: plugins/admin/systems/terminalService.tpl:203
+msgid "Scan device"
+msgstr "Scanner"
+
+#: plugins/admin/systems/workstationService.tpl:150
+#: plugins/admin/systems/terminalService.tpl:204
+msgid "Select to start SANE scan service on terminal"
+msgstr "Sélectionner afin de démarrer le service scanner SANE sur le terminal"
+
+#: plugins/admin/systems/workstationService.tpl:151
+#: plugins/admin/systems/terminalService.tpl:205
+msgid "Provide scan services"
+msgstr "Fournir des services de scanner"
+
+#: plugins/admin/systems/info.tpl:1
+msgid "System information"
+msgstr "Information sur le système"
+
+#: plugins/admin/systems/info.tpl:7
+msgid "CPU"
+msgstr "CPU"
+
+#: plugins/admin/systems/info.tpl:10
+msgid "Memory"
+msgstr "Mémoire"
+
+#: plugins/admin/systems/info.tpl:13
+msgid "Boot MAC"
+msgstr "Adresse MAC de démarrage"
+
+#: plugins/admin/systems/info.tpl:16
+msgid "USB support"
+msgstr "Support USB"
 
 #: plugins/admin/systems/info.tpl:19 plugins/admin/systems/info.tpl:87
 msgid "System status"
@@ -7016,12 +7310,6 @@ msgstr "Lecteur de disquette"
 msgid "CDROM device"
 msgstr "Lecteur CDROM"
 
-#: plugins/admin/systems/info.tpl:73
-#: plugins/admin/systems/workstationService.tpl:83
-#: plugins/admin/systems/terminalService.tpl:83
-msgid "Graphic device"
-msgstr "Carte écran"
-
 #: plugins/admin/systems/info.tpl:77
 msgid "Audio device"
 msgstr "Carte son"
@@ -7062,495 +7350,609 @@ msgstr "Service Son"
 msgid "GUI"
 msgstr "Interface graphique"
 
-#: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_workstationService.inc:89
-msgid "default"
-msgstr "défaut"
+#: plugins/admin/systems/glpi.tpl:9
+#: plugins/admin/systems/SelectDeviceType.tpl:20
+msgid "System type"
+msgstr "Type de système"
 
-#: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_workstationService.inc:90
-msgid "show chooser"
-msgstr "Afficher le sélecteur"
+#: plugins/admin/systems/glpi.tpl:19
+msgid "Operating system"
+msgstr "Système d'exploitation"
 
-#: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:91
-msgid "direct"
-msgstr "direct"
+#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
+#: plugins/admin/systems/glpi_devices.tpl:24
+#: plugins/admin/systems/glpi_devices.tpl:123
+#: plugins/admin/systems/glpi_devices.tpl:164
+#: plugins/admin/systems/glpi_devices.tpl:219
+#: plugins/admin/systems/glpi_devices.tpl:275
+#: plugins/admin/systems/glpi_devices.tpl:333
+#: plugins/admin/systems/glpi_devices.tpl:397
+#: plugins/admin/systems/glpi_devices.tpl:469
+#: plugins/admin/systems/glpi_devices.tpl:533
+#: plugins/admin/systems/glpi_devices.tpl:580
+#: plugins/admin/systems/glpi_devices.tpl:633
+#: plugins/admin/systems/glpi_devices.tpl:687
+#: plugins/admin/systems/glpi_devices.tpl:733
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
+msgid "Manufacturer"
+msgstr "Fabricant"
 
-#: plugins/admin/systems/class_terminalService.inc:107
-#: plugins/admin/systems/class_workstationService.inc:94
-msgid "load balanced"
-msgstr "répartition de charge"
+#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
+msgid "Contacts"
+msgstr "Contacts"
 
-#: plugins/admin/systems/class_terminalService.inc:110
-#: plugins/admin/systems/class_workstationService.inc:97
-msgid "Windows RDP"
-msgstr "Windows RDP"
+#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
+msgid "Contact person"
+msgstr "Personne de contact"
 
-#: plugins/admin/systems/class_terminalService.inc:111
-#: plugins/admin/systems/class_workstationService.inc:98
-msgid "ICA client"
-msgstr "Client ICA"
+#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
+msgid "Technical responsible"
+msgstr "Responsable technique"
 
-#: plugins/admin/systems/class_terminalService.inc:209
-#: plugins/admin/systems/class_workstationService.inc:201
-msgid "Choose the phone located at the current terminal"
-msgstr "Choisissez le téléphone situé à coté du terminal"
+#: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
+#: plugins/admin/systems/glpi_devices.tpl:112
+#: plugins/admin/systems/glpi_devices.tpl:153
+#: plugins/admin/systems/glpi_devices.tpl:208
+#: plugins/admin/systems/glpi_devices.tpl:264
+#: plugins/admin/systems/glpi_devices.tpl:322
+#: plugins/admin/systems/glpi_devices.tpl:386
+#: plugins/admin/systems/glpi_devices.tpl:458
+#: plugins/admin/systems/glpi_devices.tpl:522
+#: plugins/admin/systems/glpi_devices.tpl:569
+#: plugins/admin/systems/glpi_devices.tpl:622
+#: plugins/admin/systems/glpi_devices.tpl:676
+#: plugins/admin/systems/glpi_devices.tpl:722
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
+msgid "Comment"
+msgstr "Commentaires"
 
-#: plugins/admin/systems/class_terminalService.inc:270
-#: plugins/admin/systems/class_terminalService.inc:275
-#: plugins/admin/systems/class_workstationService.inc:263
-#: plugins/admin/systems/class_workstationService.inc:268
-msgid "Please specify a valid VSync range."
-msgstr ""
-"Veuillez spécifier une plage valide pour la fréquence de synchronisation "
-"verticale."
+#: plugins/admin/systems/glpi.tpl:78
+msgid "Installed devices"
+msgstr "Périphériques installés"
 
-#: plugins/admin/systems/class_terminalService.inc:285
-#: plugins/admin/systems/class_terminalService.inc:290
-#: plugins/admin/systems/class_workstationService.inc:278
-#: plugins/admin/systems/class_workstationService.inc:283
-msgid "Please specify a valid HSync range."
+#: plugins/admin/systems/glpi.tpl:90
+msgid "Trading"
 msgstr ""
-"Veuillez spécifier une plage valide pour la fréquence de synchronisation "
-"Horizontale."
+
+#: plugins/admin/systems/glpi.tpl:91
+msgid "Software"
+msgstr "Logiciel"
+
+#: plugins/admin/systems/glpi.tpl:92
+msgid "Contracts"
+msgstr "Contrats"
+
+#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
+msgid "Attachments"
+msgstr "Documents liés"
 
 #: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
 msgid "System management"
 msgstr "Administration du système"
 
-#: plugins/admin/systems/class_servService.inc:272
-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/glpiPrinter.tpl:9
+msgid "Printer type"
+msgstr "Type de l'imprimante"
 
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
-msgstr "Services de temps"
+#: plugins/admin/systems/glpiPrinter.tpl:31
+msgid "Supported interfaces"
+msgstr "Interfaces supportées"
 
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
-msgstr "Service LDAP"
+#: plugins/admin/systems/glpiPrinter.tpl:38
+msgid "Serial"
+msgstr "Série"
 
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
-msgstr "Services de terminaux"
+#: plugins/admin/systems/glpiPrinter.tpl:46
+msgid "Parallel"
+msgstr "Parallèle"
 
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
-msgstr "Désactiver temporairement le login"
+#: plugins/admin/systems/glpiPrinter.tpl:54
+msgid "USB"
+msgstr "USB"
 
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
-msgstr "Répertoire des polices de caractères"
+#: plugins/admin/systems/glpiPrinter.tpl:114
+msgid "Installed cartridges"
+msgstr "Cartouches installés"
 
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
-msgstr "Service de logs systèmes"
+#: plugins/admin/systems/glpi_edit_type.tpl:1
+#, fuzzy
+msgid "Manage System-types"
+msgstr "Type de système"
 
-#: plugins/admin/systems/servservice.tpl:101
-msgid "Print Service"
-msgstr "Services d'impression"
+#: plugins/admin/systems/glpi_edit_type.tpl:9
+#: plugins/admin/systems/glpi_edit_type.tpl:28
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:8
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:29
+#: plugins/admin/systems/glpi_edit_os.tpl:9
+#: plugins/admin/systems/glpi_edit_os.tpl:28
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
+msgid "Rename"
+msgstr "Renommer"
 
-#: plugins/admin/systems/servservice.tpl:109
-msgid "Mail server"
-msgstr "Serveur de messagerie"
+#: plugins/admin/systems/glpi_edit_type.tpl:24
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:25
+#: plugins/admin/systems/glpi_edit_os.tpl:24
+#, fuzzy
+msgid "Please enter a new name"
+msgstr " Veuillez entrer un nom."
 
-#: 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/printerPPDSelectionDialog.tpl:6
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr "Sélectionnez les objets à ajouter"
 
-#: 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/printerPPDSelectionDialog.tpl:44
+#: plugins/admin/systems/printerPPDDialog.tpl:6
+msgid "Select"
+msgstr "Sélectionner"
+
+#: plugins/admin/systems/class_workstationService.inc:89
+#: plugins/admin/systems/class_terminalService.inc:102
+msgid "default"
+msgstr "défaut"
+
+#: plugins/admin/systems/class_workstationService.inc:90
+#: plugins/admin/systems/class_terminalService.inc:103
+msgid "show chooser"
+msgstr "Afficher le sélecteur"
+
+#: plugins/admin/systems/class_workstationService.inc:91
+#: plugins/admin/systems/class_terminalService.inc:104
+msgid "direct"
+msgstr "direct"
+
+#: plugins/admin/systems/class_workstationService.inc:94
+#: plugins/admin/systems/class_terminalService.inc:107
+msgid "load balanced"
+msgstr "répartition de charge"
+
+#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_terminalService.inc:110
+msgid "Windows RDP"
+msgstr "Windows RDP"
+
+#: plugins/admin/systems/class_workstationService.inc:98
+#: plugins/admin/systems/class_terminalService.inc:111
+msgid "ICA client"
+msgstr "Client ICA"
+
+#: plugins/admin/systems/class_workstationService.inc:201
+#: plugins/admin/systems/class_terminalService.inc:209
+msgid "Choose the phone located at the current terminal"
+msgstr "Choisissez le téléphone situé à coté du terminal"
+
+#: plugins/admin/systems/class_workstationService.inc:263
+#: plugins/admin/systems/class_workstationService.inc:268
+#: plugins/admin/systems/class_terminalService.inc:270
+#: plugins/admin/systems/class_terminalService.inc:275
+msgid "Please specify a valid VSync range."
 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."
+"Veuillez spécifier une plage valide pour la fréquence de synchronisation "
+"verticale."
 
-#: plugins/admin/systems/chooser.tpl:7
-msgid "Linux thin client template"
-msgstr "Modèle de client léger Linux"
+#: plugins/admin/systems/class_workstationService.inc:278
+#: plugins/admin/systems/class_workstationService.inc:283
+#: plugins/admin/systems/class_terminalService.inc:285
+#: plugins/admin/systems/class_terminalService.inc:290
+msgid "Please specify a valid HSync range."
+msgstr ""
+"Veuillez spécifier une plage valide pour la fréquence de synchronisation "
+"Horizontale."
 
-#: plugins/admin/systems/chooser.tpl:8
-msgid "Linux workstation template"
-msgstr "Modèle de station de travail Linux"
+#: plugins/admin/systems/class_workstationStartup.inc:313
+msgid ""
+"There are packages in your configuration, which can't be resolved with "
+"current server/release settings."
+msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:9
-msgid "Linux Server"
-msgstr "Serveur Linux"
+#: plugins/admin/systems/class_workstationStartup.inc:354
+msgid "Please select a 'FAI server' or remove the 'FAI classes'."
+msgstr "Veuillez sélectionner un 'serveur FAI' ou effacer les 'Classes FAI'."
 
-#: plugins/admin/systems/chooser.tpl:10
-msgid "Windows workstation"
-msgstr "Station de travail Windows"
+#: plugins/admin/systems/class_workstationStartup.inc:410
+msgid ""
+"There is already a profile in your selection that contain partition table "
+"configurations."
+msgstr ""
+"Il y a déjà un profil dans votre sélection qui contient des configurations "
+"de table de partitions."
 
-#: plugins/admin/systems/chooser.tpl:11
-msgid "Network printer"
-msgstr "Imprimante réseau"
+#: plugins/admin/systems/class_workstationStartup.inc:691
+#, php-format
+msgid ""
+"Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
+"Server was reset to 'auto'."
+msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:13
-msgid "Other network component"
-msgstr "Autre composant réseau"
+#: plugins/admin/systems/class_workstationStartup.inc:702
+#, php-format
+msgid ""
+"Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
+"configurations, possibly some classes where deleted or renamed. !All classes "
+"have been removed from this account, press cancel if you don't want this to "
+"be saved."
+msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:16
-msgid "Create"
-msgstr "Créer"
+#: plugins/admin/systems/class_printerPPDDialog.inc:67
+#, php-format
+msgid "Can't open '%s', ppd settings resetted."
+msgstr ""
+"Impossible d'ouvrir '%s', les paramètres du fichier ppd on été réinitialisés."
 
-#: plugins/admin/systems/component.tpl:15 plugins/admin/systems/server.tpl:15
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/terminal.tpl:20
-#: plugins/admin/systems/printer.tpl:22
-#: plugins/admin/systems/workstation.tpl:29
-#: plugins/admin/systems/wingeneric.tpl:15
-msgid "Choose subtree to place terminal in"
-msgstr "Sélectionnez la branche où placer le terminal"
+#: plugins/admin/systems/class_printerPPDDialog.inc:108
+#, php-format
+msgid ""
+"The specified PPD_PATH='%s' in your gosa.conf is invalid, can't read any ppd "
+"informations."
+msgstr ""
+"Le chemin spécifié PPD_PATH='%s' dans votre fichier de configuration gosa."
+"conf est invalide, je ne peut lire aucune information des fichiers ppd."
 
-#: plugins/admin/systems/workstationService.tpl:4
-#: plugins/admin/systems/terminalService.tpl:4
-msgid "Keyboard"
-msgstr "Clavier"
+#: plugins/admin/systems/class_printerPPDDialog.inc:109
+msgid "Can't get ppd informations."
+msgstr "Impossible d'obtenir des informations sur les ppd."
 
-#: plugins/admin/systems/workstationService.tpl:7
-#: plugins/admin/systems/printerPPDDialog.tpl:5
-#: plugins/admin/systems/terminalService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:210
-msgid "Model"
-msgstr "Modèle"
+#: plugins/admin/systems/class_printerPPDDialog.inc:125
+#, php-format
+msgid "Can't create folder '%s' for the uploaded ppd file."
+msgstr ""
+"impossible de créer le répertoire '%s' pour sauvegarder le fichier ppd."
 
-#: plugins/admin/systems/workstationService.tpl:9
-#: plugins/admin/systems/terminalService.tpl:9
-msgid "Choose keyboard model"
-msgstr "Sélectionnez le modèle du clavier"
+#: plugins/admin/systems/class_printerPPDDialog.inc:138
+#, php-format
+msgid "There is already a ppd file for this kind of printer."
+msgstr "Il y a déjà un fichier ppd pour ce type d'imprimante."
 
-#: plugins/admin/systems/workstationService.tpl:15
-#: plugins/admin/systems/terminalService.tpl:15
-msgid "Layout"
-msgstr "Disposition"
+#: plugins/admin/systems/class_printerPPDDialog.inc:146
+#, php-format
+msgid "Can't save file '%s'."
+msgstr "Impossible de sauver le fichier '%s'."
 
-#: plugins/admin/systems/workstationService.tpl:17
-#: plugins/admin/systems/terminalService.tpl:17
-msgid "Choose keyboard layout"
-msgstr "Sélectionnez la disposition du clavier"
+#: plugins/admin/systems/class_printerPPDDialog.inc:163
+#: plugins/admin/systems/class_printerPPDDialog.inc:166
+msgid "Please specify a valid ppd file."
+msgstr "Veuillez indiquer un fichier ppd valide."
 
-#: plugins/admin/systems/workstationService.tpl:23
-#: plugins/admin/systems/terminalService.tpl:23
-msgid "Variant"
-msgstr "Variante"
+#: plugins/admin/systems/class_printerPPDDialog.inc:190
+msgid "Please select a valid ppd."
+msgstr "Veuillez sélectionner un fichier ppd valide."
 
-#: plugins/admin/systems/workstationService.tpl:25
-#: plugins/admin/systems/terminalService.tpl:25
-msgid "Choose keyboard variant"
-msgstr "Sélectionnez la variante du clavier"
+#: plugins/admin/systems/class_printerPPDDialog.inc:369
+#: plugins/admin/systems/class_printerPPDDialog.inc:372
+msgid "True"
+msgstr "Vrai"
 
-#: plugins/admin/systems/workstationService.tpl:39
-#: plugins/admin/systems/terminalService.tpl:39
-msgid "Mouse"
-msgstr "Souris"
+#: plugins/admin/systems/class_printerPPDDialog.inc:370
+#: plugins/admin/systems/class_printerPPDDialog.inc:373
+msgid "False"
+msgstr "Faux"
 
-#: plugins/admin/systems/workstationService.tpl:44
-#: plugins/admin/systems/terminalService.tpl:44
-msgid "Choose mouse type"
-msgstr "Sélectionnez le type de souris"
+#: plugins/admin/systems/class_printerPPDDialog.inc:378
+#, php-format
+msgid "Unsupported ppd type '%s' used for '%s' "
+msgstr "Type de PPD '%s' non supporté pour '%s' "
 
-#: plugins/admin/systems/workstationService.tpl:50
-#: plugins/admin/systems/terminalService.tpl:50
-msgid "Port"
-msgstr "Port"
+#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
+msgid "Server name"
+msgstr "Nom du serveur"
 
-#: plugins/admin/systems/workstationService.tpl:52
-#: plugins/admin/systems/terminalService.tpl:52
-msgid "Choose mouse port"
-msgstr "Sélectionnez le port de la souris"
+#: plugins/admin/systems/server.tpl:15 plugins/admin/systems/terminal.tpl:20
+#: plugins/admin/systems/workstation.tpl:29
+#: plugins/admin/systems/component.tpl:15 plugins/admin/systems/phone.tpl:15
+#: plugins/admin/systems/printer.tpl:22
+#: plugins/admin/systems/wingeneric.tpl:15
+msgid "Choose subtree to place terminal in"
+msgstr "Sélectionnez la branche où placer le terminal"
 
-#: plugins/admin/systems/workstationService.tpl:66
-#: plugins/admin/systems/terminalService.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:24
-#: plugins/gofon/phoneaccount/paste_generic.tpl:23
-msgid "Telephone hardware"
-msgstr "Matériel téléphonique"
+#: plugins/admin/systems/server.tpl:39 plugins/admin/systems/terminal.tpl:100
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
+#: plugins/admin/systems/workstation.tpl:79
+#: plugins/admin/systems/class_baseSelectDialog.inc:45
+#: plugins/admin/ogroups/termgroup.tpl:3
+msgid "Action"
+msgstr "Action"
 
-#: 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:25
-msgid "Telephone"
-msgstr "Téléphone"
+#: plugins/admin/systems/server.tpl:43
+msgid "Select action to execute for this server"
+msgstr "Sélectionnez l'opération à exécuter sur le serveur"
 
-#: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/printer.tpl:46
-#: plugins/admin/systems/terminalService.tpl:86
-msgid "Driver"
-msgstr "Pilote"
+#: plugins/admin/systems/workstationStartup.tpl:4
+#: plugins/admin/systems/terminalStartup.tpl:1
+msgid "Boot parameters"
+msgstr "Paramètre de démarrage"
 
-#: plugins/admin/systems/workstationService.tpl:88
-#: plugins/admin/systems/terminalService.tpl:88
-msgid "Choose graphic driver that is needed by the installed graphic board"
-msgstr ""
-"Sélectionnez le pilote de la carte vidéo correspondant à la carte graphique "
-"installée"
+#: plugins/admin/systems/workstationStartup.tpl:8
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "LDAP server"
+msgstr "Serveur LDAP"
 
-#: plugins/admin/systems/workstationService.tpl:96
-#: plugins/admin/systems/terminalService.tpl:96
-msgid "Choose screen resolution used in graphic mode"
-msgstr "Sélectionnez la résolution utilisée en mode graphique"
+#: plugins/admin/systems/workstationStartup.tpl:10
+#: plugins/admin/systems/terminalStartup.tpl:10
+msgid "Choose LDAP server to use for accounts and terminal management"
+msgstr ""
+"Sélectionnez le serveur LDAP à utiliser pour la gestion des comptes et des "
+"terminaux"
 
-#: plugins/admin/systems/workstationService.tpl:102
-#: plugins/admin/systems/terminalService.tpl:102
-msgid "Color depth"
-msgstr "Profondeur des couleurs"
+#: plugins/admin/systems/workstationStartup.tpl:17
+#: plugins/admin/systems/terminalStartup.tpl:17
+msgid "Boot kernel"
+msgstr "Kernel utilisé au démarrage"
 
-#: plugins/admin/systems/workstationService.tpl:104
-#: plugins/admin/systems/terminalService.tpl:104
-msgid "Choose colordepth used in graphic mode"
-msgstr "Sélectionnez la profondeur des couleurs utilisée en mode graphique"
+#: plugins/admin/systems/workstationStartup.tpl:19
+#: plugins/admin/systems/terminalStartup.tpl:19
+msgid "Enter the filename of the kernel to use"
+msgstr "Entrez le nom de fichier du kernel à utiliser"
 
-#: plugins/admin/systems/workstationService.tpl:117
-#: plugins/admin/systems/terminalService.tpl:117
-msgid "Display device"
-msgstr "Écran"
+#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/terminalStartup.tpl:22
+msgid "Custom options"
+msgstr "Options personnalisées"
 
-#: plugins/admin/systems/workstationService.tpl:121
-msgid "unknown"
-msgstr "inconnu"
+#: plugins/admin/systems/workstationStartup.tpl:24
+#: plugins/admin/systems/terminalStartup.tpl:24
+msgid ""
+"Enter any parameters that should be passed to the kernel as append line "
+"during bootup"
+msgstr "Entrez les paramètres qui seront passés au kernel lors du démarrage"
 
-#: plugins/admin/systems/workstationService.tpl:126
-msgid "Automatic modelines"
-msgstr ""
+#: plugins/admin/systems/workstationStartup.tpl:37
+msgid "FAI server"
+msgstr "Serveur FAI"
 
-#: plugins/admin/systems/workstationService.tpl:130
-#: plugins/admin/systems/terminalService.tpl:124
-msgid "HSync"
-msgstr "Fréquence de synchronisation Horizontale"
+#: plugins/admin/systems/workstationStartup.tpl:54
+msgid "Assigned FAI classes"
+msgstr "Liste des classes FAI utilisées"
 
-#: plugins/admin/systems/workstationService.tpl:132
-#: plugins/admin/systems/terminalService.tpl:126
-msgid "Horizontal refresh frequency for installed monitor"
-msgstr "Fréquence de rafraîchissement horizontal pour l'écran installé"
+#: plugins/admin/systems/workstationStartup.tpl:73
+#: plugins/admin/systems/terminalStartup.tpl:53
+msgid "Kernel modules (format: name parameters)"
+msgstr "Modules du kernel (format : nom paramètre)"
 
-#: plugins/admin/systems/workstationService.tpl:135
-#: plugins/admin/systems/terminalService.tpl:129
-msgid "VSync"
-msgstr "Fréquence de synchronisation verticale"
+#: plugins/admin/systems/workstationStartup.tpl:75
+#: plugins/admin/systems/terminalStartup.tpl:55
+msgid "Add additional modules to load on startup"
+msgstr "Ajouter des modules à charger au démarrage"
 
-#: plugins/admin/systems/workstationService.tpl:137
-#: plugins/admin/systems/terminalService.tpl:131
-msgid "Vertical refresh frequency for installed monitor"
-msgstr "Fréquence de rafraîchissement verticale pour l'écran installé"
+#: plugins/admin/systems/workstationStartup.tpl:99
+#: plugins/admin/systems/terminalStartup.tpl:79
+msgid "Mountpoint"
+msgstr "Point de montage"
 
-#: plugins/admin/systems/workstationService.tpl:149
-#: plugins/admin/systems/terminalService.tpl:203
-msgid "Scan device"
-msgstr "Scanner"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:6
+msgid "List of devices"
+msgstr "Liste des périphériques"
 
-#: plugins/admin/systems/workstationService.tpl:150
-#: plugins/admin/systems/terminalService.tpl:204
-msgid "Select to start SANE scan service on terminal"
-msgstr "Sélectionner afin de démarrer le service scanner SANE sur le terminal"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:23
+msgid ""
+"This dialog allows you to attach a device to your currently edited computer."
+msgstr ""
+"Ce menu vous permet d'attacher un périphérique à votre ordinateur en cours "
+"d'édition."
 
-#: plugins/admin/systems/workstationService.tpl:151
-#: plugins/admin/systems/terminalService.tpl:205
-msgid "Provide scan services"
-msgstr "Fournir des services de scanner"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:35
+msgid "Display devices matching"
+msgstr "Afficher les périphériques correspondants"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
-msgid "Select entries to add"
-msgstr "Sélectionnez les entrées à ajouter"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:37
+msgid "Regular expression for matching device names"
+msgstr "Expression régulière concordant avec les noms des périphériques"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
-msgid "Display members of department"
-msgstr "Afficher les membres du département"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
+#: plugins/admin/systems/class_glpiAccount.inc:144
+msgid "There is no server with valid glpi database service."
+msgstr "Il n'y a pas de serveur qui contient un service glpi valide."
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
-msgid "Display members matching"
-msgstr "Afficher les membres correspondants"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
+#: plugins/admin/systems/class_glpiAccount.inc:154
+msgid "Can't connect to glpi database, the php-mysql extension is missing."
+msgstr ""
+"Impossible de se connecter sur la base de données glpi, l'extension mysql "
+"n'est pas disponible."
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
-msgid "Regular expression for matching member names"
-msgstr "Expression régulière concordant avec les noms des membres"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
+#: plugins/admin/systems/class_glpiAccount.inc:164
+msgid "Can't connect to glpi database, check configuration twice."
+msgstr ""
+"Impossible de se connecter à la base de données glpi, veuillez vérifier la "
+"configuration."
 
-#: plugins/admin/systems/class_workstationStartup.inc:313
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
+#: plugins/admin/systems/class_glpiAccount.inc:564
+#, fuzzy
+msgid "Remove inventory"
+msgstr "Supprimer une entrée"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
 msgid ""
-"There are packages in your configuration, which can't be resolved with "
-"current server/release settings."
+"This server has inventory features enabled. You can disable them by clicking "
+"below."
 msgstr ""
+"Ce serveur à l'extension inventaire activée. Vous pouvez la désactiver en "
+"cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/systems/class_workstationStartup.inc:354
-msgid "Please select a 'FAI server' or remove the 'FAI classes'."
-msgstr "Veuillez sélectionner un 'serveur FAI' ou effacer les 'Classes FAI'."
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
+#: plugins/admin/systems/class_glpiAccount.inc:567
+#, fuzzy
+msgid "Add inventory"
+msgstr "Ajouter une entrée"
 
-#: plugins/admin/systems/class_workstationStartup.inc:410
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
 msgid ""
-"There is already a profile in your selection that contain partition table "
-"configurations."
+"This server has inventory features disabled. You can enable them by clicking "
+"below."
 msgstr ""
-"Il y a déjà un profil dans votre sélection qui contient des configurations "
-"de table de partitions."
+"Ce serveur à l'extension d'inventaire désactivé. Vous pouvez l'activer en "
+"cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/systems/class_workstationStartup.inc:691
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
 #, php-format
 msgid ""
-"Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
-"Server was reset to 'auto'."
+"Can't rename given printer type to '%s', because this type name already "
+"exists."
 msgstr ""
+"Impossible de renommer le type d'imprimante en '%s', ce type existe déjà."
 
-#: plugins/admin/systems/class_workstationStartup.inc:702
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
 #, php-format
-msgid ""
-"Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
-"configurations, possibly some classes where deleted or renamed. !All classes "
-"have been removed from this account, press cancel if you don't want this to "
-"be saved."
+msgid "Can't delete printer type, it is still in use by '%s'."
 msgstr ""
+"Impossible d'effacer ce type d'imprimante, il est encore utilisé par '%s'"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:105
-msgid "This 'dn' has no phone features."
-msgstr "Ce 'dn' n'a pas d'extensions téléphoniques."
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:609
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:623
+#: plugins/admin/systems/class_glpiAccount.inc:631
+#: plugins/admin/systems/class_glpiAccount.inc:645
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:288
+msgid "N/A"
+msgstr "N/A"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
-msgid "yes"
-msgstr "oui"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:750
+msgid "since"
+msgstr "depuis"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-msgid "no"
-msgstr "non"
+#: plugins/admin/systems/terminal.tpl:9
+msgid "Terminal template"
+msgstr "Modèle de terminaux"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:223
-msgid "dynamic"
-msgstr "dynamique"
+#: plugins/admin/systems/terminal.tpl:11
+msgid "Terminal name"
+msgstr "Nom du terminal"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:223
-msgid "Networksettings"
-msgstr "Configuration réseau"
+#: plugins/admin/systems/terminal.tpl:37
+#: plugins/admin/systems/workstation.tpl:46
+#: plugins/admin/systems/phonesettings.tpl:21
+msgid "Mode"
+msgstr "Mode"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:238
-#, php-format
-msgid ""
-"Can't delete because there are user which are depending on this phone. One "
-"of them is user '%s'."
-msgstr ""
-"Impossible d'effacer ce téléphone parce que certains utilisateurs "
-"l'utilisent. Un de ces utilisateur est '%s'."
+#: plugins/admin/systems/terminal.tpl:39
+#: plugins/admin/systems/workstation.tpl:48
+msgid "Select terminal mode"
+msgstr "Sélectionnez le mode du terminal"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:294
-msgid "The required field 'Phone name' is not set."
-msgstr "Le champ obligatoire 'Nom du téléphone' n'est pas rempli."
+#: plugins/admin/systems/terminal.tpl:53
+msgid "Root server"
+msgstr "Serveur Primaire"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:297
-msgid "The 'Phone name' '0' is reserved and cannot be used."
-msgstr "Le 'Nom du téléphone' '0' est réservé et ne peut pas être utilisé."
+#: plugins/admin/systems/terminal.tpl:55
+msgid "Select NFS root filesystem to use"
+msgstr "Sélectionnez le système de fichier root NFS à utiliser"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:304
-msgid "You have no permissions to create a phone on this 'Base'."
-msgstr "Vous n'avez pas l'autorisation de créer un téléphone sur cette 'Base'."
+#: plugins/admin/systems/terminal.tpl:61
+msgid "Swap server"
+msgstr "Serveur de Swap"
+
+#: plugins/admin/systems/terminal.tpl:63
+msgid "Choose NFS filesystem to place swap files on"
+msgstr "Sélectionnez le système de fichier NFS où sera placé le swap"
+
+#: plugins/admin/systems/terminal.tpl:75
+#: plugins/admin/systems/workstation.tpl:55
+msgid "Syslog server"
+msgstr "Serveur de logs systèmes"
+
+#: plugins/admin/systems/terminal.tpl:77
+#: plugins/admin/systems/workstation.tpl:57
+msgid "Choose server to use for logging"
+msgstr "Sélectionnez le serveur de logs à utiliser"
+
+#: plugins/admin/systems/terminal.tpl:83
+#: plugins/admin/systems/workstation.tpl:63
+msgid "NTP server"
+msgstr "Serveur NTP"
+
+#: plugins/admin/systems/terminal.tpl:85
+#: plugins/admin/systems/workstation.tpl:65
+msgid "Choose server to use for synchronizing time"
+msgstr "Sélectionnez le serveur pour la synchronisation du temps"
+
+#: plugins/admin/systems/terminal.tpl:104
+#: plugins/admin/systems/workstation.tpl:83
+msgid "Select action to execute for this terminal"
+msgstr "Sélectionnez l'opération à exécuter sur le terminal"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:67
+#: plugins/admin/systems/class_servDB.inc:135
+#: plugins/admin/systems/class_servDB.inc:144
+#: plugins/admin/systems/class_servDB.inc:161
+#: plugins/admin/systems/class_servDB.inc:171
+#: plugins/admin/systems/class_servDB.inc:176
+#: plugins/admin/systems/class_servDB.inc:182
 #, php-format
-msgid "Can't open '%s', ppd settings resetted."
-msgstr ""
-"Impossible d'ouvrir '%s', les paramètres du fichier ppd on été réinitialisés."
+msgid "The attribute '%s' is empty or contains invalid characters."
+msgstr "La valeur '%s' est vide ou contient des caractères invalides."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:108
+#: plugins/admin/systems/class_servDB.inc:151
 #, php-format
-msgid ""
-"The specified PPD_PATH='%s' in your gosa.conf is invalid, can't read any ppd "
-"informations."
-msgstr ""
-"Le chemin spécifié PPD_PATH='%s' dans votre fichier de configuration gosa."
-"conf est invalide, je ne peut lire aucune information des fichiers ppd."
+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_printerPPDDialog.inc:109
-msgid "Can't get ppd informations."
-msgstr "Impossible d'obtenir des informations sur les ppd."
+#: plugins/admin/systems/class_servDB.inc:155
+msgid "The sieve port needs to be numeric."
+msgstr "Le port sieve doit être numérique."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:125
+#: plugins/admin/systems/class_servDB.inc:166
 #, php-format
-msgid "Can't create folder '%s' for the uploaded ppd file."
-msgstr ""
-"impossible de créer le répertoire '%s' pour sauvegarder le fichier ppd."
+msgid "The specified kerberos password is empty."
+msgstr "Le mot de passe Kerberos est vide."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:138
+#: plugins/admin/systems/class_servDB.inc:190
 #, php-format
-msgid "There is already a ppd file for this kind of printer."
-msgstr "Il y a déjà un fichier ppd pour ce type d'imprimante."
+msgid "The imap name string needs to be a hostname or an IP-address."
+msgstr "La chaîne de connexion imap doit être un nom d'hôte ou une adresse IP."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:146
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
 #, php-format
-msgid "Can't save file '%s'."
-msgstr "Impossible de sauver le fichier '%s'."
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:163
-#: plugins/admin/systems/class_printerPPDDialog.inc:166
-msgid "Please specify a valid ppd file."
-msgstr "Veuillez indiquer un fichier ppd valide."
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:190
-msgid "Please select a valid ppd."
-msgstr "Veuillez sélectionner un fichier ppd valide."
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:369
-#: plugins/admin/systems/class_printerPPDDialog.inc:372
-msgid "True"
-msgstr "Vrai"
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:370
-#: plugins/admin/systems/class_printerPPDDialog.inc:373
-msgid "False"
-msgstr "Faux"
+msgid "You're about to delete the glpi cartridge type '%s'."
+msgstr "Vous êtes sur le point de supprimer le type de toner glpi '%s'."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:378
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:116
 #, php-format
-msgid "Unsupported ppd type '%s' used for '%s' "
-msgstr "Type de PPD '%s' non supporté pour '%s' "
+msgid ""
+"You can't delete this cartridge type, it is still in use by this printer(s) "
+"'%s'."
+msgstr ""
+"Vous ne pouvez pas effacer ce type de cartouche, il est utilisé actuellement "
+"par ce(s) imprimante(s) '%s'."
 
-#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
-msgid "Server name"
-msgstr "Nom du serveur"
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
+msgid "Cartridges"
+msgstr "Cartouches"
 
-#: plugins/admin/systems/server.tpl:39 plugins/admin/systems/terminal.tpl:100
-#: plugins/admin/systems/workstation.tpl:79
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:44
-#: plugins/admin/ogroups/termgroup.tpl:3
-msgid "Action"
-msgstr "Action"
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
+msgid "New monitor"
+msgstr "Nouvel écran"
 
-#: plugins/admin/systems/server.tpl:43
-msgid "Select action to execute for this server"
-msgstr "Sélectionnez l'opération à exécuter sur le serveur"
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
+msgid "M"
+msgstr "M"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:61
-msgid "text"
-msgstr "texte"
+#: plugins/admin/systems/class_workstationGeneric.inc:70
+msgid "Activated"
+msgstr "Activé"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:62
-msgid "graphic"
-msgstr "graphique"
+#: plugins/admin/systems/class_workstationGeneric.inc:72
+msgid "Memory test"
+msgstr "Test mémoire"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:90
-#: plugins/admin/systems/class_servGeneric.inc:62
-#: plugins/admin/ogroups/class_termgroup.inc:64
-msgid "No WAKECMD definition found in your gosa.conf"
-msgstr "Aucune définition de WAKECMD n'est présente dans gosa.conf"
+#: plugins/admin/systems/class_workstationGeneric.inc:73
+msgid "System analysis"
+msgstr "Analyse du système"
 
+#: plugins/admin/systems/class_workstationGeneric.inc:100
+msgid "No ACTIONCMD definition found in your gosa.conf"
+msgstr "Aucune définition de ACTIONCMD n'est présente dans gosa.conf"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:104
 #: plugins/admin/systems/class_terminalGeneric.inc:94
 #: plugins/admin/systems/class_terminalGeneric.inc:106
 #: plugins/admin/systems/class_terminalGeneric.inc:118
 #: plugins/admin/systems/class_servGeneric.inc:66
 #: plugins/admin/systems/class_servGeneric.inc:78
 #: plugins/admin/systems/class_servGeneric.inc:90
-#: plugins/admin/systems/class_workstationGeneric.inc:104
 #: plugins/admin/ogroups/class_termgroup.inc:68
 #: plugins/admin/ogroups/class_termgroup.inc:80
 #: plugins/admin/ogroups/class_termgroup.inc:92
@@ -7558,245 +7960,292 @@ msgstr "Aucune définition de WAKECMD n'est présente dans gosa.conf"
 msgid "Execution of '%s' failed!"
 msgstr "L'exécution de '%s' a échoué!"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:102
-#: plugins/admin/systems/class_servGeneric.inc:74
-#: plugins/admin/ogroups/class_termgroup.inc:76
-msgid "No REBOOTCMD definition found in your gosa.conf"
-msgstr "Aucune définition de REBOOTCMD n'est présente dans gosa.conf"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_servGeneric.inc:86
-#: plugins/admin/ogroups/class_termgroup.inc:88
-msgid "No HALTCMD definition found in your gosa.conf"
-msgstr "Aucune définition de HALTCMD n'est présente dans gosa.conf"
+#: plugins/admin/systems/class_workstationGeneric.inc:114
+msgid "This 'dn' has no workstation features."
+msgstr "Ce 'dn' ne comporte pas d'extensions stations de travail."
 
+#: plugins/admin/systems/class_workstationGeneric.inc:156
 #: plugins/admin/systems/class_terminalGeneric.inc:170
 #: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Switch off"
 msgstr "Eteindre"
 
+#: plugins/admin/systems/class_workstationGeneric.inc:156
 #: plugins/admin/systems/class_terminalGeneric.inc:170
 #: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Reboot"
 msgstr "Redémarrer"
 
+#: plugins/admin/systems/class_workstationGeneric.inc:157
+msgid "Instant update"
+msgstr "Mise à jour immédiate"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:158
+#: plugins/admin/systems/class_workstationGeneric.inc:164
+msgid "Scheduled update"
+msgstr "Mise à jour programmée"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:159
+#: plugins/admin/systems/class_workstationGeneric.inc:163
+msgid "Reinstall"
+msgstr "Reinstaller"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:160
+msgid "Rescan hardware"
+msgstr "Recherche du matériel"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:162
 #: plugins/admin/systems/class_terminalGeneric.inc:172
 #: plugins/admin/systems/class_servGeneric.inc:142
-#: plugins/admin/systems/class_workstationGeneric.inc:162
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Wake up"
 msgstr "Réveiller"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:269
-msgid "You have no permissions to create a terminal on this 'Base'."
-msgstr "Vous n'avez pas l'autorisation de créer un terminal dans cette 'Base'."
+#: plugins/admin/systems/class_workstationGeneric.inc:228
+msgid "You have no permissions to create a workstation on this 'Base'."
+msgstr ""
+"Vous n'avez pas les droits nécessaires pour créer une station de travail "
+"dans cette 'Base'."
 
-#: plugins/admin/systems/class_terminalGeneric.inc:273
-msgid "The required field 'Terminal name' is not set."
-msgstr "Le champ obligatoire 'Nom du terminal' n'est pas renseigné."
+#: plugins/admin/systems/class_workstationGeneric.inc:232
+msgid "The required field 'Workstation name' is not set."
+msgstr ""
+"Le champ obligatoire 'Nom de la station de travail' n'est pas renseigné."
 
-#: plugins/admin/systems/printerPPDDialog.tpl:1
-msgid "Printer driver"
-msgstr "Pilote d'Imprimante"
+#: plugins/admin/systems/class_workstationGeneric.inc:245
+#: plugins/admin/systems/class_componentGeneric.inc:155
+#: plugins/admin/systems/class_winGeneric.inc:172
+#: plugins/admin/systems/class_terminalGeneric.inc:286
+#: plugins/admin/systems/class_servGeneric.inc:209
+#: plugins/admin/systems/class_printGeneric.inc:529
+#: plugins/admin/systems/class_phoneGeneric.inc:314
+#, php-format
+msgid "There is already an entry '%s' in the base choosen by you"
+msgstr "Une entrée '%s' existe déjà dans la base sélectionnée"
 
-#: plugins/admin/systems/printerPPDDialog.tpl:6
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
-msgid "Select"
-msgstr "Sélectionner"
+#: plugins/admin/systems/servdns.tpl:1
+msgid "Zones"
+msgstr "Zones"
 
-#: plugins/admin/systems/printerPPDDialog.tpl:9
-msgid "New driver"
-msgstr "Nouveau pilote"
+#: plugins/admin/systems/workstation.tpl:9
+msgid "Workstation template"
+msgstr "Modèle de station de travail"
 
-#: plugins/admin/systems/workstationStartup.tpl:4
-#: plugins/admin/systems/terminalStartup.tpl:1
-msgid "Boot parameters"
-msgstr "Paramètre de démarrage"
+#: plugins/admin/systems/workstation.tpl:11
+msgid "Workstation name"
+msgstr "Nom de la station de travail"
 
-#: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "LDAP server"
-msgstr "Serveur LDAP"
+#: plugins/admin/systems/class_servNfs.inc:35
+msgid ""
+"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+msgstr ""
+"Le fichier '/etc/gosa/encodings' n'existe pas, impossible d'obtenir la liste "
+"des jeux de caractères supportés."
+
+#: plugins/admin/systems/class_servNfs.inc:38
+msgid "Can't read '/etc/gosa/encodings', please check permissions."
+msgstr ""
+"Impossible de lire '/etc/gosa/encodings', veuillez vérifier les permissions."
+
+#: plugins/admin/systems/class_servNfs.inc:125
+msgid "Please specify a valid path for your setup."
+msgstr "Veuillez entrer un chemin valide pour votre configuration."
+
+#: plugins/admin/systems/class_servNfs.inc:131
+msgid "Please specify a valid name for your setup."
+msgstr "Veuillez spécifier un nom valide pour votre configuration."
+
+#: plugins/admin/systems/class_servNfs.inc:134
+msgid "Please specify a name for your setup."
+msgstr "Veuillez spécifier un nom valide pour votre configuration."
+
+#: plugins/admin/systems/class_servNfs.inc:139
+msgid "Description contains invalid characters."
+msgstr "La description contient des caractères invalides."
+
+#: plugins/admin/systems/class_servNfs.inc:143
+msgid "Path contains invalid characters."
+msgstr "Le chemin contient des caractères invalides."
+
+#: plugins/admin/systems/class_servNfs.inc:147
+msgid "Option contains invalid characters."
+msgstr "L'option contient des caractères invalides."
+
+#: plugins/admin/systems/servnfs.tpl:1
+msgid "Edit share"
+msgstr "Editer un partage"
+
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
+msgstr "Préférences NFS"
 
-#: plugins/admin/systems/workstationStartup.tpl:10
-#: plugins/admin/systems/terminalStartup.tpl:10
-msgid "Choose LDAP server to use for accounts and terminal management"
-msgstr ""
-"Sélectionnez le serveur LDAP à utiliser pour la gestion des comptes et des "
-"terminaux"
+#: plugins/admin/systems/servnfs.tpl:25
+msgid "Path"
+msgstr "Chemin"
 
-#: plugins/admin/systems/workstationStartup.tpl:17
-#: plugins/admin/systems/terminalStartup.tpl:17
-msgid "Boot kernel"
-msgstr "Kernel utilisé au démarrage"
+#: plugins/admin/systems/servnfs.tpl:49
+msgid "Codepage"
+msgstr "Codage caractêres"
 
-#: plugins/admin/systems/workstationStartup.tpl:19
-#: plugins/admin/systems/terminalStartup.tpl:19
-msgid "Enter the filename of the kernel to use"
-msgstr "Entrez le nom de fichier du kernel à utiliser"
+#: plugins/admin/systems/servnfs.tpl:59
+msgid "Option"
+msgstr "Option"
 
-#: plugins/admin/systems/workstationStartup.tpl:22
-#: plugins/admin/systems/terminalStartup.tpl:22
-msgid "Custom options"
-msgstr "Options personnalisées"
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid "Remove Kolab extension"
+msgstr "Enlever l'extension Kolab"
 
-#: plugins/admin/systems/workstationStartup.tpl:24
-#: plugins/admin/systems/terminalStartup.tpl:24
+#: plugins/admin/systems/class_servKolab.inc:115
 msgid ""
-"Enter any parameters that should be passed to the kernel as append line "
-"during bootup"
-msgstr "Entrez les paramètres qui seront passés au kernel lors du démarrage"
+"This server has kolab features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Ce serveur à l'extension kolab activée. Vous pouvez la désactiver en "
+"cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/systems/workstationStartup.tpl:37
-msgid "FAI server"
-msgstr "Serveur FAI"
+#: plugins/admin/systems/class_servKolab.inc:118
+msgid "Add Kolab service"
+msgstr "Ajouter un service Kolab"
 
-#: plugins/admin/systems/workstationStartup.tpl:54
-msgid "Assigned FAI classes"
-msgstr "Liste des classes FAI utilisées"
+#: plugins/admin/systems/class_servKolab.inc:118
+msgid ""
+"This server has kolab features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Ce serveur à l'extension Kolab désactivé. Vous pouvez l'activer en cliquant "
+"sur le bouton ci-dessous."
 
-#: plugins/admin/systems/workstationStartup.tpl:73
-#: plugins/admin/systems/terminalStartup.tpl:53
-msgid "Kernel modules (format: name parameters)"
-msgstr "Modules du kernel (format : nom paramètre)"
+#: plugins/admin/systems/class_servKolab.inc:146
+#, php-format
+msgid "Include data from %s days in the past when creating free/busy lists"
+msgstr ""
+"Inclure les données des %s jours précédents lors de la création d'une liste "
+"de disponibilités"
 
-#: plugins/admin/systems/workstationStartup.tpl:75
-#: plugins/admin/systems/terminalStartup.tpl:55
-msgid "Add additional modules to load on startup"
-msgstr "Ajouter des modules à charger au démarrage"
+#: plugins/admin/systems/class_servKolab.inc:152
+#, php-format
+msgid "Warn users when using more than %s%% of their mail quota"
+msgstr ""
+"Avertissez les utilisateurs quand ils utilsent plus de %s%% de leur quota "
+"mail"
 
-#: plugins/admin/systems/workstationStartup.tpl:99
-#: plugins/admin/systems/terminalStartup.tpl:79
-msgid "Mountpoint"
-msgstr "Point de montage"
+#: plugins/admin/systems/class_servKolab.inc:227
+msgid "Future days in Free/Busy settings must be set."
+msgstr "Le paramètre journées futures doit être rempli."
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
-msgstr "Nom du téléphone"
+#: plugins/admin/systems/class_servKolab.inc:229
+msgid "Future days in Free/Busy settings must be a positive value."
+msgstr "Le nombre de journées dans le futur doit être nombre positif."
 
-#: plugins/admin/systems/class_servGeneric.inc:52
-msgid "This 'dn' has no server features."
-msgstr "Ce 'dn' n'a pas d'options serveur."
+#: plugins/admin/systems/class_servKolab.inc:233
+msgid "The given Quota settings value must be a number."
+msgstr "Les paramètres de Quota doivent être un nombre."
 
-#: plugins/admin/systems/class_servGeneric.inc:191
-msgid "The required field 'Server name' is not set."
-msgstr "Le champ obligatoire 'Nom du serveur' n'est pas rempli."
+#: plugins/admin/systems/class_servKolab.inc:235
+msgid "Please choose a value between 1 and 100 for Quota settings."
+msgstr "Veuillez choisir un nombre entre 1 et 100 pour les quotas."
 
-#: plugins/admin/systems/class_servGeneric.inc:198
-msgid "You have no permissions to create a server on this 'Base'."
-msgstr "Vous n'avez pas l'autorisation pour créer un serveur sur cette 'Base'."
+#: plugins/admin/systems/class_servKolab.inc:237
+msgid "Future days must be a value."
+msgstr "Le nombre de journées dans le futur doit être une valeur."
 
-#: plugins/admin/systems/terminal.tpl:9
-msgid "Terminal template"
-msgstr "Modèle de terminaux"
+#: plugins/admin/systems/class_servKolab.inc:241
+msgid "No SMTP privileged networks set."
+msgstr "pas de réseaux SMTP privilégiés indiqués."
 
-#: plugins/admin/systems/terminal.tpl:11
-msgid "Terminal name"
-msgstr "Nom du terminal"
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
+msgstr "Bureau distant"
 
-#: plugins/admin/systems/terminal.tpl:37
-#: plugins/admin/systems/workstation.tpl:46
-#: plugins/admin/systems/phonesettings.tpl:21
-msgid "Mode"
-msgstr "Mode"
+#: plugins/admin/systems/terminalService.tpl:145
+msgid "Connect method"
+msgstr "Méthode de connexion"
 
-#: plugins/admin/systems/terminal.tpl:39
-#: plugins/admin/systems/workstation.tpl:48
-msgid "Select terminal mode"
-msgstr "Sélectionnez le mode du terminal"
+#: plugins/admin/systems/terminalService.tpl:147
+msgid "Choose method to connect to terminal server"
+msgstr "Sélectionnez la méthode de connexion au terminal"
 
-#: plugins/admin/systems/terminal.tpl:53
-msgid "Root server"
-msgstr "Serveur Primaire"
+#: plugins/admin/systems/terminalService.tpl:154
+msgid "Terminal server"
+msgstr "Serveur de terminaux"
 
-#: plugins/admin/systems/terminal.tpl:55
-msgid "Select NFS root filesystem to use"
-msgstr "Sélectionnez le système de fichier root NFS à utiliser"
+#: plugins/admin/systems/terminalService.tpl:156
+msgid "Select specific terminal server to use"
+msgstr "Sélectionnez un serveur de terminaux à utiliser"
 
-#: plugins/admin/systems/terminal.tpl:61
-msgid "Swap server"
-msgstr "Serveur de Swap"
+#: plugins/admin/systems/terminalService.tpl:163
+msgid "Font server"
+msgstr "Serveur de Police de caractère"
 
-#: plugins/admin/systems/terminal.tpl:63
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "Sélectionnez le système de fichier NFS où sera placé le swap"
+#: plugins/admin/systems/terminalService.tpl:165
+msgid "Select specific font server to use"
+msgstr "Sélectionnez le serveur de polices de caractère à utiliser"
 
-#: plugins/admin/systems/terminal.tpl:75
-#: plugins/admin/systems/workstation.tpl:55
-msgid "Syslog server"
-msgstr "Serveur de logs systèmes"
+#: plugins/admin/systems/terminalService.tpl:181
+msgid "Print device"
+msgstr "Imprimante"
 
-#: plugins/admin/systems/terminal.tpl:77
-#: plugins/admin/systems/workstation.tpl:57
-msgid "Choose server to use for logging"
-msgstr "Sélectionnez le serveur de logs à utiliser"
+#: plugins/admin/systems/terminalService.tpl:182
+msgid "Select to start IPP based printing service on terminal"
+msgstr "Sélectionnez pour démarrer le service d'impression IPP sur le terminal"
 
-#: plugins/admin/systems/terminal.tpl:83
-#: plugins/admin/systems/workstation.tpl:63
-msgid "NTP server"
-msgstr "Serveur NTP"
+#: plugins/admin/systems/terminalService.tpl:183
+msgid "Provide print services"
+msgstr "Fournir des services d'impression"
 
-#: plugins/admin/systems/terminal.tpl:85
-#: plugins/admin/systems/workstation.tpl:65
-msgid "Choose server to use for synchronizing time"
-msgstr "Sélectionnez le serveur pour la synchronisation du temps"
+#: plugins/admin/systems/terminalService.tpl:189
+msgid "Spool server"
+msgstr "Serveur de file d'attente"
 
-#: plugins/admin/systems/terminal.tpl:104
-#: plugins/admin/systems/workstation.tpl:83
-msgid "Select action to execute for this terminal"
-msgstr "Sélectionnez l'opération à exécuter sur le terminal"
+#: plugins/admin/systems/terminalService.tpl:191
+msgid "Select NFS filesystem to place spool files on"
+msgstr "Sélectionnez le système de fichier NFS où sera placé la file d'attente"
 
-#: plugins/admin/systems/class_servDHCP.inc:36
-msgid "Remove DHCP service"
-msgstr "Suppression du service DHCP"
+#: plugins/admin/systems/terminalService.tpl:212
+msgid "Select scanner driver to use"
+msgstr "Sélectionnez le pilote du scanner"
 
-#: plugins/admin/systems/class_servDHCP.inc:37
-msgid ""
-"This server has DHCP features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Le service DHCP est activé pour ce serveur. Vous pouvez le désactiver en "
-"cliquant sur le bouton ci-dessous."
+#: plugins/admin/systems/class_componentGeneric.inc:50
+#: plugins/admin/systems/class_winGeneric.inc:73
+msgid "This 'dn' has no network features."
+msgstr "Ce 'dn' n'a pas d'extensions réseaux."
 
-#: plugins/admin/systems/class_servDHCP.inc:39
-msgid "Add DHCP service"
-msgstr "Ajouter un service DHCP"
+#: plugins/admin/systems/class_componentGeneric.inc:138
+msgid "The required field 'Component name' is not set."
+msgstr "Le champ obligatoire 'Nom du composant' n'est pas rempli."
 
-#: plugins/admin/systems/class_servDHCP.inc:40
-msgid ""
-"This server has DHCP features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Ce serveur à l'option DHCP désactivé. Vous pouvez l'activer en cliquant sur "
-"le bouton ci-dessous."
+#: plugins/admin/systems/class_componentGeneric.inc:145
+#: plugins/admin/systems/class_winGeneric.inc:162
+msgid "You have no permissions to create a component on this 'Base'."
+msgstr "Vous n'avez pas l'autorisation de créer un composant sur cette 'Base'."
 
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
-msgstr "Sélectionnez les objets à ajouter"
+#: plugins/admin/systems/terminalStartup.tpl:35
+msgid "Select if terminal supports graphical startup with progress bar"
+msgstr ""
+"Sélectionnez si le terminal supporte le démarrage graphique avec une barre "
+"de progression"
 
-#: plugins/admin/systems/class_glpiAccount.inc:144
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
-msgid "There is no server with valid glpi database service."
-msgstr "Il n'y a pas de serveur qui contient un service glpi valide."
+#: plugins/admin/systems/terminalStartup.tpl:36
+msgid "use graphical bootup"
+msgstr "utiliser un démarrage en mode graphique"
 
-#: plugins/admin/systems/class_glpiAccount.inc:154
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
-msgid "Can't connect to glpi database, the php-mysql extension is missing."
-msgstr ""
-"Impossible de se connecter sur la base de données glpi, l'extension mysql "
-"n'est pas disponible."
+#: plugins/admin/systems/terminalStartup.tpl:38
+msgid "Select if terminal should boot in text mode"
+msgstr "Indiquez si le terminal démarre en mode texte"
 
-#: plugins/admin/systems/class_glpiAccount.inc:164
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
-msgid "Can't connect to glpi database, check configuration twice."
-msgstr ""
-"Impossible de se connecter à la base de données glpi, veuillez vérifier la "
-"configuration."
+#: plugins/admin/systems/terminalStartup.tpl:39
+msgid "use standard linux textual bootup"
+msgstr "utiliser le démarrage texte standard de Linux"
+
+#: plugins/admin/systems/terminalStartup.tpl:41
+msgid "Select to get more verbose output during startup"
+msgstr "Sélectionnez afin d'avoir d'obtenir un démarrage plus verbeux"
+
+#: plugins/admin/systems/terminalStartup.tpl:42
+msgid "use debug mode for startup"
+msgstr "utilisez le mode de débogage pour le démarrage"
 
 #: plugins/admin/systems/class_glpiAccount.inc:178
 #: plugins/admin/systems/class_glpiAccount.inc:184
@@ -7842,12 +8291,6 @@ msgstr ""
 "Le changement de nom du système d'exploitation à échoué, le nom utilisé "
 "existe déjà."
 
-#: plugins/admin/systems/class_glpiAccount.inc:564
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
-#, fuzzy
-msgid "Remove inventory"
-msgstr "Supprimer une entrée"
-
 #: plugins/admin/systems/class_glpiAccount.inc:565
 msgid ""
 "This device has inventory informations enabled. You can disable them by "
@@ -7856,12 +8299,6 @@ msgstr ""
 "Ce périphérique à l'extension inventaire activée. Vous pouvez la désactiver "
 "en cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/systems/class_glpiAccount.inc:567
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
-#, fuzzy
-msgid "Add inventory"
-msgstr "Ajouter une entrée"
-
 #: plugins/admin/systems/class_glpiAccount.inc:568
 msgid ""
 "This device has inventory informations disabled. You can enable them by "
@@ -7870,1393 +8307,1320 @@ msgstr ""
 "Ce périphérique à l'extension d'inventaire désactivé. Vous pouvez l'activer "
 "en cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/systems/class_glpiAccount.inc:631
-#: plugins/admin/systems/class_glpiAccount.inc:645
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:609
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:623
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:288
-msgid "N/A"
-msgstr "N/A"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:70
-msgid "Activated"
-msgstr "Activé"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:72
-msgid "Memory test"
-msgstr "Test mémoire"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:73
-msgid "System analysis"
-msgstr "Analyse du système"
+#: plugins/admin/systems/glpiManufacturer.tpl:1
+#, fuzzy
+msgid "Manage manufacturers"
+msgstr "Fabricant"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:100
-msgid "No ACTIONCMD definition found in your gosa.conf"
-msgstr "Aucune définition de ACTIONCMD n'est présente dans gosa.conf"
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
+msgid "Attachment"
+msgstr "Document lié"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:114
-msgid "This 'dn' has no workstation features."
-msgstr "Ce 'dn' ne comporte pas d'extensions stations de travail."
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
+msgid "Filename"
+msgstr "Nom du fichier"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:157
-msgid "Instant update"
-msgstr "Mise à jour immédiate"
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
+msgid "Mime-type"
+msgstr "type mime"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:158
-#: plugins/admin/systems/class_workstationGeneric.inc:164
-msgid "Scheduled update"
-msgstr "Mise à jour programmée"
+#: plugins/admin/systems/class_termDNS.inc:313
+msgid "The required field 'IP-address' is not set."
+msgstr "Le champ obligatoire 'adresse IP' n'est pas rempli."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:159
-#: plugins/admin/systems/class_workstationGeneric.inc:163
-msgid "Reinstall"
-msgstr "Reinstaller"
+#: plugins/admin/systems/class_termDNS.inc:319
+msgid "Wrong IP format in field IP-address."
+msgstr "L'adresse ip dans le champ adresse IP n'est pas valide."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:160
-msgid "Rescan hardware"
-msgstr "Recherche du matériel"
+#: plugins/admin/systems/class_termDNS.inc:325
+msgid "The required field 'MAC-address' is not set."
+msgstr "Le champ obligatoire 'MAC-address' n'est pas rempli."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:228
-msgid "You have no permissions to create a workstation on this 'Base'."
+#: plugins/admin/systems/class_termDNS.inc:331
+msgid ""
+"The given macaddress is invalid. There must be 6 1byte segments seperated by "
+"':'."
 msgstr ""
-"Vous n'avez pas les droits nécessaires pour créer une station de travail "
-"dans cette 'Base'."
+"La mac adresse introduite est invalide. Il doit y avoir 6 fois un byte "
+"séparés par ':'."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:232
-msgid "The required field 'Workstation name' is not set."
+#: plugins/admin/systems/class_termDNS.inc:346
+#, php-format
+msgid "Found duplicate value for record type '%s'."
 msgstr ""
-"Le champ obligatoire 'Nom de la station de travail' n'est pas renseigné."
-
-#: plugins/admin/systems/class_systemManagement.inc:32
-msgid "Systems"
-msgstr "Systèmes"
-
-#: plugins/admin/systems/class_systemManagement.inc:429
-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:455
-msgid "Passwords entered as new and repeated do not match!"
+#: plugins/admin/systems/class_termDNS.inc:352
+#, php-format
+msgid "Found more than one entry for the uniqe record type '%s'."
 msgstr ""
-"Le mot de passe entré dans le champ nouveau et celui dans le champ "
-"vérification ne concordent pas!"
-
-#: plugins/admin/systems/class_systemManagement.inc:472
-msgid "You are not allowed to set this systems password!"
-msgstr "Vous n'êtes pas autorisé à modifier ce mot de passe de ce système!"
 
-#: plugins/admin/systems/class_systemManagement.inc:526
+#: plugins/admin/systems/class_termDNS.inc:360
 #, php-format
-msgid "You're about to delete all information about the component at '%s'."
+msgid ""
+"The device IP '%s' is added as 'A Record', this will be done automatically, "
+"please remove the record."
 msgstr ""
-"Vous êtes sur le point de supprimer toute les informations relatives aux "
-"composant '%s'."
 
-#: plugins/admin/systems/class_systemManagement.inc:760
-msgid "New Terminal template"
-msgstr "Nouveau modèle de terminal"
+#: plugins/admin/systems/class_termDNS.inc:366
+#: plugins/admin/systems/class_servDNSeditZone.inc:386
+#, php-format
+msgid "Only lowercase is allowed, please check your '%ss'."
+msgstr ""
+"Seulement les minuscules sont autorisée, veuillez vérifier votre '%ss'."
 
-#: plugins/admin/systems/class_systemManagement.inc:760
-#: plugins/admin/systems/class_systemManagement.inc:924
-msgid "New Terminal"
-msgstr "Nouveau terminal"
+#: plugins/admin/systems/class_servRepository.inc:97
+msgid "Remove FAI repository extension."
+msgstr "Enlever l'extension dépôts FAI."
 
-#: plugins/admin/systems/class_systemManagement.inc:762
-msgid "New Workstation template"
-msgstr "Nouveau modèle de station de travail"
+#: plugins/admin/systems/class_servRepository.inc:98
+msgid ""
+"This server has FAI repository features enabled. You can disable them by "
+"clicking below."
+msgstr ""
+"Ce serveur à l'extension dépôts FAI activée. Vous pouvez la désactiver en "
+"cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/systems/class_systemManagement.inc:762
-#: plugins/admin/systems/class_systemManagement.inc:925
-msgid "New Workstation"
-msgstr "Nouvelle station de travail"
+#: plugins/admin/systems/class_servRepository.inc:100
+msgid "Add FAI repository extension."
+msgstr "Ajouter une extension dépôts FAI."
 
-#: plugins/admin/systems/class_systemManagement.inc:763
-#: plugins/admin/systems/class_systemManagement.inc:764
-msgid "New Server"
-msgstr "Nouveau Serveur"
+#: plugins/admin/systems/class_servRepository.inc:101
+msgid ""
+"This server has FAI repository features disabled. You can enable them by "
+"clicking below."
+msgstr ""
+"Ce serveur à l'extension dépôts FAI désactivé. Vous pouvez l'activer en "
+"cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/systems/class_systemManagement.inc:765
-#: plugins/admin/systems/class_systemManagement.inc:766
-msgid "New Printer"
-msgstr "Nouvelle Imprimante"
+#: plugins/admin/systems/class_servRepository.inc:144
+#, php-format
+msgid ""
+"You can't delete this release, it is still used by these workstations [%s]. "
+"Please solve this dependencies first, to keep data base consistency."
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:767
-#: plugins/admin/systems/class_systemManagement.inc:768
-msgid "New Phone"
-msgstr "Nouveau Téléphone"
+#: plugins/admin/systems/class_servRepository.inc:176
+#, fuzzy, php-format
+msgid ""
+"Be careful editing this release, it is still used by these workstations [%s]."
+msgstr ""
+"Vous ne pouvez pas effacer ce périphérique, il est utilisé actuellement par "
+"ces système(s) '%s'"
 
-#: plugins/admin/systems/class_systemManagement.inc:769
-#: plugins/admin/systems/class_systemManagement.inc:770
-msgid "New Component"
-msgstr "Nouveau composant"
+#: plugins/admin/systems/class_servRepository.inc:243
+#: plugins/admin/systems/class_servRepository.inc:264
+#: plugins/admin/systems/servRepositorySetup.tpl:33
+msgid "Sections"
+msgstr "Sections"
 
-#: plugins/admin/systems/class_systemManagement.inc:780
-msgid "Edit system"
-msgstr "Editer un système"
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
+msgid "Can't delete this entry, it is still in use."
+msgstr "Impossible d'effacer cette entrée elle est encore utilisée"
 
-#: plugins/admin/systems/class_systemManagement.inc:781
-msgid "Delete system"
-msgstr "Effacer un système"
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:305
+msgid "The selected name is already in use."
+msgstr "Le nom spécifié est déjà utilisé."
 
-#: plugins/admin/systems/class_systemManagement.inc:791
-msgid "System"
-msgstr "Système"
+#: plugins/admin/systems/servRepository.tpl:6
+msgid "List of configured repositories."
+msgstr "Liste des dépôts configurés."
 
-#: plugins/admin/systems/class_systemManagement.inc:829
-msgid "Cups Server"
-msgstr "Serveur Cups"
+#: plugins/admin/systems/servRepository.tpl:11
+msgid "Add repository"
+msgstr "Ajouter un dépôt"
 
-#: plugins/admin/systems/class_systemManagement.inc:830
-msgid "Log Db"
-msgstr "Base de données de logs"
+#: plugins/admin/systems/servRepository.tpl:29
+msgid "This menu allows you to create, delete and edit repository settings."
+msgstr ""
+"Ce menu vous permet créer, effacer et éditer des classes des dépôts FAI."
 
-#: plugins/admin/systems/class_systemManagement.inc:831
-msgid "Syslog Server"
-msgstr "Serveur de logs systèmes"
+#: plugins/admin/systems/servdnseditzone.tpl:7
+msgid "Zone name"
+msgstr "Nom de la zone"
 
-#: plugins/admin/systems/class_systemManagement.inc:832
-msgid "Mail Server"
-msgstr "Serveur de messagerie"
+#: plugins/admin/systems/servdnseditzone.tpl:13
+#, fuzzy
+msgid "Network address"
+msgstr "Périphériques réseau"
 
-#: plugins/admin/systems/class_systemManagement.inc:833
-msgid "Imap Server"
-msgstr "Serveur Imap"
+#: plugins/admin/systems/servdnseditzone.tpl:24
+#, fuzzy
+msgid "Zone entries"
+msgstr "Configuration de la zone"
 
-#: plugins/admin/systems/class_systemManagement.inc:834
-msgid "Nfs Server"
-msgstr "Serveur NFS"
+#: plugins/admin/systems/servdnseditzone.tpl:35
+#, fuzzy
+msgid "SOA record"
+msgstr "Enregistrement dns"
 
-#: plugins/admin/systems/class_systemManagement.inc:835
-msgid "Kerberos Server"
-msgstr "Serveur Kerberos"
+#: plugins/admin/systems/servdnseditzone.tpl:41
+msgid "Primary dns server for this zone"
+msgstr "Serveur dns primaire pour cette zone"
 
-#: plugins/admin/systems/class_systemManagement.inc:836
-msgid "Asterisk Server"
-msgstr "Serveur Asterisk"
+#: plugins/admin/systems/servdnseditzone.tpl:53
+msgid "Serial number (automatically incremented)"
+msgstr "Numéro de série (incrémenté automatiquement)"
 
-#: plugins/admin/systems/class_systemManagement.inc:837
-msgid "Fax Server"
-msgstr "Serveur de Fax"
+#: plugins/admin/systems/servdnseditzone.tpl:69
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: ihtml/themes/altlinux/setup_finish.tpl:31
+#: ihtml/themes/default/setup_finish.tpl:31
+#: ihtml/themes/lhs/setup_finish.tpl:31
+msgid "Retry"
+msgstr "Réessayer"
 
-#: plugins/admin/systems/class_systemManagement.inc:838
-msgid "Ldap Server"
-msgstr "Serveur Ldap"
+#: plugins/admin/systems/servdnseditzone.tpl:75
+msgid "Expire"
+msgstr "Expire"
 
-#: plugins/admin/systems/class_systemManagement.inc:871
-msgid "Set root password"
-msgstr "Indiquez le mot de passe administrateur"
+#: plugins/admin/systems/servdnseditzone.tpl:96
+#, fuzzy
+msgid "MxRecords"
+msgstr "Enregistrements"
 
-#: plugins/admin/systems/class_systemManagement.inc:916
+#: plugins/admin/systems/servdnseditzone.tpl:108
 #, fuzzy
-msgid "New System from incoming"
-msgstr "Nouveau système depuis incomming"
+msgid "Zone records"
+msgstr "Enregistrement dns"
 
-#: plugins/admin/systems/class_systemManagement.inc:918
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:589
-msgid "Terminal"
-msgstr "Terminal"
+#: plugins/admin/systems/class_glpiSelectUser.inc:140
+msgid "use"
+msgstr "utiliser"
 
-#: plugins/admin/systems/class_systemManagement.inc:919
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:588
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
-msgstr "Stations de travail"
+#: plugins/admin/systems/glpiSelectUser.tpl:23
+msgid ""
+"This dialog allows you to select a user as technical responsible person."
+msgstr ""
+"Ce dialogue vous permet de désigner un utilisateur comme personne "
+"responsable."
 
-#: plugins/admin/systems/class_systemManagement.inc:922
-msgid "Winstation"
-msgstr "Stations Windows"
+#: plugins/admin/systems/glpi_devices.tpl:2
+#, fuzzy
+msgid "Add/Edit monitor"
+msgstr "Modifier une entrée"
 
-#: plugins/admin/systems/class_systemManagement.inc:923
-msgid "Network Device"
-msgstr "Périphérique réseau"
+#: plugins/admin/systems/glpi_devices.tpl:17
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+msgid "Comments"
+msgstr "Commentaires"
 
-#: plugins/admin/systems/class_systemManagement.inc:1146
-msgid "New terminal"
-msgstr "Nouveau terminal"
+#: plugins/admin/systems/glpi_devices.tpl:33
+msgid "Monitor size"
+msgstr "Taille écran"
 
-#: plugins/admin/systems/class_systemManagement.inc:1148
-msgid "New workstation"
-msgstr "Nouvelle station de travail"
+#: plugins/admin/systems/glpi_devices.tpl:36
+msgid "Inch"
+msgstr "Inch"
 
-#: plugins/admin/systems/class_systemManagement.inc:1150
-msgid "New Device"
-msgstr "Nouveau périphérique"
+#: plugins/admin/systems/glpi_devices.tpl:44
+msgid "Integrated microphone"
+msgstr "Micro intégré"
 
-#: plugins/admin/systems/class_systemManagement.inc:1167
-msgid "Terminal template for"
-msgstr "Modèle de terminal pour "
+#: plugins/admin/systems/glpi_devices.tpl:47
+#: plugins/admin/systems/glpi_devices.tpl:55
+#: plugins/admin/systems/glpi_devices.tpl:63
+#: plugins/admin/systems/glpi_devices.tpl:71
+#: plugins/admin/systems/glpi_devices.tpl:176
+#: plugins/admin/systems/glpi_devices.tpl:296
+#: plugins/admin/systems/glpi_devices.tpl:361
+msgid "Yes"
+msgstr "Oui"
 
-#: plugins/admin/systems/class_systemManagement.inc:1179
-msgid "Workstation template for"
-msgstr "Modèle de station de travail pour"
+#: plugins/admin/systems/glpi_devices.tpl:48
+#: plugins/admin/systems/glpi_devices.tpl:56
+#: plugins/admin/systems/glpi_devices.tpl:64
+#: plugins/admin/systems/glpi_devices.tpl:72
+#: plugins/admin/systems/glpi_devices.tpl:177
+#: plugins/admin/systems/glpi_devices.tpl:297
+#: plugins/admin/systems/glpi_devices.tpl:362
+msgid "No"
+msgstr "Non"
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "General"
-msgstr "Général"
+#: plugins/admin/systems/glpi_devices.tpl:52
+msgid "Integrated speakers"
+msgstr "Haut parleur intègré"
 
-#: plugins/admin/systems/printer.tpl:9
-msgid "Printer name"
-msgstr "Nom de l'imprimante"
+#: plugins/admin/systems/glpi_devices.tpl:60
+msgid "Sub-D"
+msgstr "Sub-D"
 
-#: plugins/admin/systems/printer.tpl:31
-msgid "Details"
-msgstr "Détails"
+#: plugins/admin/systems/glpi_devices.tpl:68
+msgid "BNC"
+msgstr "BNC"
 
-#: plugins/admin/systems/printer.tpl:34
-msgid "Printer location"
-msgstr "Localisation de l'imprimante"
+#: plugins/admin/systems/glpi_devices.tpl:76
+msgid "Serial number"
+msgstr "Numéro de série"
 
-#: plugins/admin/systems/printer.tpl:38
-msgid "Printer URL"
-msgstr "URL de l'imprimante"
+#: plugins/admin/systems/glpi_devices.tpl:83
+msgid "Additional serial number"
+msgstr "Numéro de série supplémentaire"
 
-#: plugins/admin/systems/printer.tpl:58
-msgid "Permissions"
-msgstr "Permissions"
+#: plugins/admin/systems/glpi_devices.tpl:97
+#, fuzzy
+msgid "Add/Edit other device"
+msgstr "Carte son"
 
-#: plugins/admin/systems/printer.tpl:65
-msgid "Users which are allowed to use this printer"
-msgstr "Utilisateurs qui sont autorisés à utiliser cette imprimante"
+#: plugins/admin/systems/glpi_devices.tpl:138
+#, fuzzy
+msgid "Add/Edit power supply"
+msgstr "Nouvelle alimentation"
 
-#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
-msgid "Add user"
-msgstr "Ajouter un utilisateur"
+#: plugins/admin/systems/glpi_devices.tpl:173
+msgid "Atx"
+msgstr "atx"
 
-#: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
-msgid "Add group"
-msgstr "Ajouter un groupe"
+#: plugins/admin/systems/glpi_devices.tpl:181
+msgid "Power"
+msgstr "Puissance électrique"
 
-#: plugins/admin/systems/printer.tpl:81
-msgid "Users which are allowed to administrate this printer"
-msgstr "Utilisateur qui sont autorisés à administrer cette imprimante"
+#: plugins/admin/systems/glpi_devices.tpl:193
+#, fuzzy
+msgid "Add/Edit graphic card"
+msgstr "Nouvelle carte graphique"
 
-#: plugins/admin/systems/printer.tpl:82
-msgid "Admins"
-msgstr "Administrateurs"
+#: plugins/admin/systems/glpi_devices.tpl:228
+#: plugins/admin/systems/glpi_devices.tpl:284
+#: plugins/admin/systems/glpi_devices.tpl:349
+msgid "Interface"
+msgstr "Interface"
 
-#: plugins/admin/systems/class_servDNS.inc:181
-#: plugins/admin/systems/class_inventory.inc:36
-msgid "Remove DNS service"
-msgstr "Suppression du service DNS"
+#: plugins/admin/systems/glpi_devices.tpl:237
+msgid "Ram"
+msgstr "Mémoire vive"
 
-#: plugins/admin/systems/class_servDNS.inc:182
-#: plugins/admin/systems/class_inventory.inc:37
-msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
+#: plugins/admin/systems/glpi_devices.tpl:249
+#, fuzzy
+msgid "Add/Edit controller"
+msgstr "Nouveau controlleur"
+
+#: plugins/admin/systems/glpi_devices.tpl:307
+msgid "Add/Edit drive"
 msgstr ""
-"Ce serveur à l'option DNS activée. Vous pouvez le désactiver en cliquant sur "
-"le bouton ci-dessous."
 
-#: plugins/admin/systems/class_servDNS.inc:184
-#: plugins/admin/systems/class_inventory.inc:39
-msgid "Add DNS service"
-msgstr "Ajouter un service DNS"
+#: plugins/admin/systems/glpi_devices.tpl:342
+msgid "Speed"
+msgstr "Vitesse"
 
-#: plugins/admin/systems/class_servDNS.inc:185
-#: plugins/admin/systems/class_inventory.inc:40
-msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
-msgstr ""
-"Ce serveur à l'option DNS désactivé. Vous pouvez l'activer en cliquant sur "
-"le bouton ci-dessous."
+#: plugins/admin/systems/glpi_devices.tpl:358
+msgid "Writeable"
+msgstr "Inscriptible"
 
-#: plugins/admin/systems/class_servDNS.inc:270
-#, php-format
-msgid ""
-"Can't delete the selected zone, because it is still in use by these entry/"
-"entries '%s'"
-msgstr ""
-"Vous ne pouvez pas effacer cette zone car elle est encore utilisée par ces "
-"éléments/ éléments '%s'"
+#: plugins/admin/systems/glpi_devices.tpl:371
+#, fuzzy
+msgid "Add/Edit harddisk"
+msgstr "Nouveau disque dur"
 
-#: plugins/admin/systems/class_servDNS.inc:297
-msgid "Reverse zone"
-msgstr "Zone inverse"
+#: plugins/admin/systems/glpi_devices.tpl:406
+msgid "Rpm"
+msgstr "Vitesse"
 
-#: plugins/admin/systems/class_servDB.inc:135
-#: plugins/admin/systems/class_servDB.inc:144
-#: plugins/admin/systems/class_servDB.inc:161
-#: plugins/admin/systems/class_servDB.inc:171
-#: plugins/admin/systems/class_servDB.inc:176
-#: plugins/admin/systems/class_servDB.inc:182
-#, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
-msgstr "La valeur '%s' est vide ou contient des caractères invalides."
+#: plugins/admin/systems/glpi_devices.tpl:413
+msgid "Cache"
+msgstr "Cache"
 
-#: plugins/admin/systems/class_servDB.inc:151
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
-msgstr "La chaîne de connexion imap doit être de la forme '%s'."
+#: plugins/admin/systems/glpi_devices.tpl:443
+#, fuzzy
+msgid "Add/Edit memory"
+msgstr "Modifier une entrée"
 
-#: plugins/admin/systems/class_servDB.inc:155
-msgid "The sieve port needs to be numeric."
-msgstr "Le port sieve doit être numérique."
+#: plugins/admin/systems/glpi_devices.tpl:478
+msgid "Frequenz"
+msgstr "Fréquence"
 
-#: plugins/admin/systems/class_servDB.inc:166
-#, php-format
-msgid "The specified kerberos password is empty."
-msgstr "Le mot de passe Kerberos est vide."
+#: plugins/admin/systems/glpi_devices.tpl:507
+#, fuzzy
+msgid "Add/Edit sound card"
+msgstr "Nouvelle carte son"
 
-#: plugins/admin/systems/class_servDB.inc:190
-#, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
-msgstr "La chaîne de connexion imap doit être un nom d'hôte ou une adresse IP."
+#: plugins/admin/systems/glpi_devices.tpl:553
+#, fuzzy
+msgid "Add/Edit network interface"
+msgstr "Nouvel carte réseau"
 
-#: plugins/admin/systems/servdns.tpl:1
-msgid "Zones"
-msgstr "Zones"
+#: plugins/admin/systems/glpi_devices.tpl:589
+msgid "MAC address"
+msgstr "Adresse MAC"
 
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
-msgstr "Modèle de station de travail"
+#: plugins/admin/systems/glpi_devices.tpl:607
+#, fuzzy
+msgid "Add/Edit processor"
+msgstr "Nouveau processeur"
 
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
-msgstr "Nom de la station de travail"
+#: plugins/admin/systems/glpi_devices.tpl:642
+msgid "Frequence"
+msgstr "Fréquence"
 
-#: plugins/admin/systems/class_servNfs.inc:35
-msgid ""
-"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
-msgstr ""
-"Le fichier '/etc/gosa/encodings' n'existe pas, impossible d'obtenir la liste "
-"des jeux de caractères supportés."
+#: plugins/admin/systems/glpi_devices.tpl:649
+msgid "Default frequence"
+msgstr "Fréquence par défaut"
 
-#: plugins/admin/systems/class_servNfs.inc:38
-msgid "Can't read '/etc/gosa/encodings', please check permissions."
-msgstr ""
-"Impossible de lire '/etc/gosa/encodings', veuillez vérifier les permissions."
+#: plugins/admin/systems/glpi_devices.tpl:661
+#, fuzzy
+msgid "Add/Edit motherboard"
+msgstr "Carte mère"
 
-#: plugins/admin/systems/class_servNfs.inc:125
-msgid "Please specify a valid path for your setup."
-msgstr "Veuillez entrer un chemin valide pour votre configuration."
+#: plugins/admin/systems/glpi_devices.tpl:696
+#, fuzzy
+msgid "Chipset"
+msgstr "Puces"
 
-#: plugins/admin/systems/class_servNfs.inc:131
-msgid "Please specify a valid name for your setup."
-msgstr "Veuillez spécifier un nom valide pour votre configuration."
+#: plugins/admin/systems/glpi_devices.tpl:707
+#, fuzzy
+msgid "Add/Edit computer case"
+msgstr "Boitier"
 
-#: plugins/admin/systems/class_servNfs.inc:134
-msgid "Please specify a name for your setup."
-msgstr "Veuillez spécifier un nom valide pour votre configuration."
+#: plugins/admin/systems/glpi_devices.tpl:742
+msgid "format"
+msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:139
-msgid "Description contains invalid characters."
-msgstr "La description contient des caractères invalides."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
+#, php-format
+msgid "Internal Error can't create device of type '%s'"
+msgstr "Erreur interne, impossible de créer le périphérique de type '%s'"
 
-#: plugins/admin/systems/class_servNfs.inc:143
-msgid "Path contains invalid characters."
-msgstr "Le chemin contient des caractères invalides."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
+#, php-format
+msgid "You're about to delete the glpi device '%s'."
+msgstr "Vous êtes sur le point de supprimer le périphérique glpi '%s'."
 
-#: plugins/admin/systems/class_servNfs.inc:147
-msgid "Option contains invalid characters."
-msgstr "L'option contient des caractères invalides."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
+msgid "Can't detect object name."
+msgstr "Impossible de détecter le nom de l'objet."
 
-#: plugins/admin/systems/servdb.tpl:6
-msgid "Kerberos kadmin access"
-msgstr "Accès kadmin Kerberos"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
+#, php-format
+msgid ""
+"You can't delete this device, it is still in use by these system(s) '%s'"
+msgstr ""
+"Vous ne pouvez pas effacer ce périphérique, il est utilisé actuellement par "
+"ces système(s) '%s'"
 
-#: plugins/admin/systems/servdb.tpl:10
-msgid "Kerberos Realm"
-msgstr "Realm Kerberos"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
+msgid "devices"
+msgstr "périphériques"
 
-#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
-msgid "Admin user"
-msgstr "Administrateur"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
+msgid "New mainbord"
+msgstr "Nouvel carte mère"
 
-#: plugins/admin/systems/servdb.tpl:26
-msgid "FAX database"
-msgstr "Base de données des FAX"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
+msgid "New processor"
+msgstr "Nouveau processeur"
 
-#: plugins/admin/systems/servdb.tpl:30
-msgid "FAX DB user"
-msgstr "utilisateur de la base de données du FAX"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+msgid "New case"
+msgstr "Nouveau boitier"
 
-#: plugins/admin/systems/servdb.tpl:42
-msgid "Asterisk management"
-msgstr "Administration d'Asterisk"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+msgid "C"
+msgstr "C"
 
-#: plugins/admin/systems/servdb.tpl:46
-msgid "Asterisk DB user"
-msgstr "Utilisateur de la base de données Asterisk"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+msgid "New network interface"
+msgstr "Nouvel carte réseau"
 
-#: plugins/admin/systems/servdb.tpl:54
-msgid "Country dial prefix"
-msgstr "Préfixe du pays"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+msgid "NI"
+msgstr "NI"
 
-#: plugins/admin/systems/servdb.tpl:58
-msgid "Local dial prefix"
-msgstr "Préfixe local"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+msgid "New ram"
+msgstr "Nouvelle mémoire vive"
 
-#: plugins/admin/systems/servdb.tpl:70
-msgid "IMAP admin access"
-msgstr "Accès administrateur IMAP"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+msgid "R"
+msgstr "R"
 
-#: plugins/admin/systems/servdb.tpl:74
-msgid "Server identifier"
-msgstr "Identifiant du serveur"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+msgid "New hard disk"
+msgstr "Nouveau disque dur"
 
-#: plugins/admin/systems/servdb.tpl:78
-msgid "Connect URL"
-msgstr "URL de connexion"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+msgid "HDD"
+msgstr "Disque dur"
 
-#: plugins/admin/systems/servdb.tpl:91
-msgid "Sieve port"
-msgstr "port Sieve"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+msgid "New drive"
+msgstr "Nouveau lecteur"
 
-#: plugins/admin/systems/servdb.tpl:100
-msgid "Logging database"
-msgstr "Base de données des logs"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+msgid "D"
+msgstr "D"
 
-#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
-msgid "Logging DB user"
-msgstr "Utilisateur de la base de données de log"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+msgid "New controller"
+msgstr "Nouveau controlleur"
 
-#: plugins/admin/systems/servdb.tpl:119
-msgid "Glpi database"
-msgstr "Base de données GLPI"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+msgid "CS"
+msgstr "CS"
 
-#: plugins/admin/systems/servdb.tpl:133
-msgid "Database"
-msgstr "Base de données"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "New graphics card"
+msgstr "Nouvelle carte graphique"
 
-#: plugins/admin/systems/servnfs.tpl:1
-msgid "Edit share"
-msgstr "Editer un partage"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "GC"
+msgstr "GC"
 
-#: plugins/admin/systems/servnfs.tpl:2
-msgid "NFS setup"
-msgstr "Préférences NFS"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+msgid "New sound card"
+msgstr "Nouvelle carte son"
 
-#: plugins/admin/systems/servnfs.tpl:25
-msgid "Path"
-msgstr "Chemin"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+msgid "SC"
+msgstr "SC"
 
-#: plugins/admin/systems/servnfs.tpl:49
-msgid "Codepage"
-msgstr "Codage caractêres"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "New power supply"
+msgstr "Nouvelle alimentation"
 
-#: plugins/admin/systems/servnfs.tpl:59
-msgid "Option"
-msgstr "Option"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "PS"
+msgstr "PS"
 
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid "Remove Kolab extension"
-msgstr "Enlever l'extension Kolab"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+msgid "New misc device"
+msgstr "Nouveau périphérique"
 
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid ""
-"This server has kolab features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Ce serveur à l'extension kolab activée. Vous pouvez la désactiver en "
-"cliquant sur le bouton ci-dessous."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+msgid "OC"
+msgstr "OC"
 
-#: plugins/admin/systems/class_servKolab.inc:118
-msgid "Add Kolab service"
-msgstr "Ajouter un service Kolab"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:346
+msgid "You have to specify a valid name for this device."
+msgstr "Veuillez spécifier un nom valide pour ce périphérique."
 
-#: plugins/admin/systems/class_servKolab.inc:118
-msgid ""
-"This server has kolab features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Ce serveur à l'extension Kolab désactivé. Vous pouvez l'activer en cliquant "
-"sur le bouton ci-dessous."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:366
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:369
+msgid "This device name is already in use."
+msgstr "Le nom de ce périphérique est déjà utilisé."
 
-#: plugins/admin/systems/class_servKolab.inc:146
-#, php-format
-msgid "Include data from %s days in the past when creating free/busy lists"
-msgstr ""
-"Inclure les données des %s jours précédents lors de la création d'une liste "
-"de disponibilités"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
+msgid "Other"
+msgstr "Autres"
 
-#: plugins/admin/systems/class_servKolab.inc:152
-#, php-format
-msgid "Warn users when using more than %s%% of their mail quota"
+#: plugins/admin/systems/class_servService.inc:272
+msgid "Terminal server, must have fontpath specified."
 msgstr ""
-"Avertissez les utilisateurs quand ils utilsent plus de %s%% de leur quota "
-"mail"
+"Serveur de terminaux, le chemin vers les polices de caractère doit être "
+"spécifié."
 
-#: plugins/admin/systems/class_servKolab.inc:227
-msgid "Future days in Free/Busy settings must be set."
-msgstr "Le paramètre journées futures doit être rempli."
+#: plugins/admin/systems/servRepositorySetup.tpl:15
+msgid "Parent server"
+msgstr "Serveur Père"
 
-#: plugins/admin/systems/class_servKolab.inc:229
-msgid "Future days in Free/Busy settings must be a positive value."
-msgstr "Le nombre de journées dans le futur doit être nombre positif."
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
+msgstr "Services de temps"
 
-#: plugins/admin/systems/class_servKolab.inc:233
-msgid "The given Quota settings value must be a number."
-msgstr "Les paramètres de Quota doivent être un nombre."
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
+msgstr "Service LDAP"
 
-#: plugins/admin/systems/class_servKolab.inc:235
-msgid "Please choose a value between 1 and 100 for Quota settings."
-msgstr "Veuillez choisir un nombre entre 1 et 100 pour les quotas."
+#: plugins/admin/systems/servservice.tpl:72
+msgid "Terminal Service"
+msgstr "Services de terminaux"
 
-#: plugins/admin/systems/class_servKolab.inc:237
-msgid "Future days must be a value."
-msgstr "Le nombre de journées dans le futur doit être une valeur."
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
+msgstr "Désactiver temporairement le login"
 
-#: plugins/admin/systems/class_servKolab.inc:241
-msgid "No SMTP privileged networks set."
-msgstr "pas de réseaux SMTP privilégiés indiqués."
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
+msgstr "Répertoire des polices de caractères"
 
-#: plugins/admin/systems/class_printGeneric.inc:177
-#: plugins/admin/systems/class_printGeneric.inc:184
-#: plugins/admin/systems/class_printGeneric.inc:219
-#: plugins/admin/systems/class_printGeneric.inc:240
-#: plugins/admin/systems/class_printGeneric.inc:243
-msgid "Add printer extension"
-msgstr "Ajouter une extension d'imprimante"
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
+msgstr "Service de logs systèmes"
 
-#: plugins/admin/systems/class_printGeneric.inc:178
-msgid "This is a workstation template, printer tab is disabled."
-msgstr ""
-"Ceci est un modèle de station de travail, l'onglet imprimante est désactivé."
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
+msgstr "Services d'impression"
 
-#: plugins/admin/systems/class_printGeneric.inc:185
-msgid "This is a terminal template, printer tab is disabled."
-msgstr "Ceci est un modèle de terminal, l'onglet imprimante est désactivé."
+#: plugins/admin/systems/servservice.tpl:109
+msgid "Mail server"
+msgstr "Serveur de messagerie"
 
-#: plugins/admin/systems/class_printGeneric.inc:220
-msgid ""
-"This workstation has printer extension disabled. You can't enable it while "
-"'cn' is not present in entry. Possibly you are currently creating a new "
-"terminal template"
+#: plugins/admin/systems/glpi_edit_os.tpl:1
+msgid "Manage OS-types"
 msgstr ""
-"Ce serveur à l'extension d'imprimante désactivé. Vous ne pourrez l'activer "
-"tant qu'un 'cn' n'est pas présent dans l'entrée. Vous êtes probablement "
-"occupé à créer un nouveau modèle de terminal"
 
-#: plugins/admin/systems/class_printGeneric.inc:232
-#: plugins/admin/systems/class_printGeneric.inc:235
-msgid "Remove printer extension"
-msgstr "Enlever l'extension d'impression"
+#: plugins/admin/systems/printerPPDDialog.tpl:1
+msgid "Printer driver"
+msgstr "Pilote d'Imprimante"
 
-#: plugins/admin/systems/class_printGeneric.inc:233
-msgid ""
-"This workstation has printer extension enabled.You can disable it by "
-"clicking below."
-msgstr ""
-"Ce stations de travail à l'extension d'imprimante activée. Vous pouvez la "
-"désactiver en cliquant sur le bouton ci-dessous."
+#: plugins/admin/systems/printerPPDDialog.tpl:9
+msgid "New driver"
+msgstr "Nouveau pilote"
 
-#: plugins/admin/systems/class_printGeneric.inc:236
-msgid ""
-"This terminal has printer extension enabled. You can disable it by clicking "
-"below."
-msgstr ""
-"Ce serveur à l'extension d'imprimante activée. Vous pouvez la désactiver en "
-"cliquant sur le bouton ci-dessous."
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
+msgstr "Nom du téléphone"
 
-#: plugins/admin/systems/class_printGeneric.inc:241
-msgid ""
-"This workstation has printer extension disabled. You can enable it by "
-"clicking below."
-msgstr ""
-"Ce serveur à l'extension d'imprimante désactivé. Vous pouvez l'activer en "
-"cliquant sur le bouton ci-dessous."
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
+msgid "List of available cartridge type for this type of printer"
+msgstr "Liste des types de cartouches disponibles pour ce type d'imprimante"
 
-#: plugins/admin/systems/class_printGeneric.inc:244
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
 msgid ""
-"This terminal has printer extension disabled. You can enable it by clicking "
-"below."
+"This dialog allows you to create new types of cartridges, and select one or "
+"more types for your printer. Cartridge types depends on the printer type you "
+"have selected. For each selected cartridge type there will be a new "
+"cartridge created, this allows you to select the same cartridge type for "
+"more then one printer."
 msgstr ""
-"Ce serveur à l'extension d'imprimante désactivé. Vous pouvez l'activer en "
-"cliquant sur le bouton ci-dessous."
-
-#: plugins/admin/systems/class_printGeneric.inc:283
-msgid "This 'dn' has no printer features."
-msgstr "Ce 'dn' n'a pas d'extensions d'impression."
 
-#: plugins/admin/systems/class_printGeneric.inc:419
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr "Le fichier PPD sélectionné '%s' n'existe pas."
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
+msgid "Display cartridge types matching"
+msgstr "Afficher les types de cartouches correspondantes"
 
-#: plugins/admin/systems/class_printGeneric.inc:427
-msgid "can't get ppd informations."
-msgstr "Impossible d'obtenir les informations sur le fichier ppd."
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
+msgid "Regular expression for matching cartridge types"
+msgstr "Expression régulière pour sélectionner les cartouches correspondantes"
 
-#: plugins/admin/systems/class_printGeneric.inc:439
-#, php-format
-msgid "This printer belongs to terminal %s. You can't rename this printer."
-msgstr ""
-"Cette imprimante appartient au terminal %s. Vous ne pouvez pas changer son "
-"nom."
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
+msgid "Reference"
+msgstr "Référence"
 
-#: plugins/admin/systems/class_printGeneric.inc:441
-#, php-format
-msgid "This printer belongs to workstation %s. You can't rename this printer."
-msgstr ""
-"Cette imprimante appartient à la station de travail %s. Vous ne pouvez pas "
-"changer son nom."
+#: plugins/admin/systems/class_terminalGeneric.inc:61
+msgid "text"
+msgstr "texte"
 
-#: plugins/admin/systems/class_printGeneric.inc:519
-msgid "You have no permissions to create a printer on this 'Base'."
-msgstr ""
-"Vous n'avez pas l'autorisation de créer une imprimante sur cette 'Base'."
+#: plugins/admin/systems/class_terminalGeneric.inc:62
+msgid "graphic"
+msgstr "graphique"
 
-#: plugins/admin/systems/servkolab.tpl:14
-msgid "POP3 service"
-msgstr "Service POP3"
+#: plugins/admin/systems/class_terminalGeneric.inc:90
+#: plugins/admin/systems/class_servGeneric.inc:62
+#: plugins/admin/ogroups/class_termgroup.inc:64
+msgid "No WAKECMD definition found in your gosa.conf"
+msgstr "Aucune définition de WAKECMD n'est présente dans gosa.conf"
 
-#: plugins/admin/systems/servkolab.tpl:22
-msgid "POP3/SSL service"
-msgstr "Service POP3/SSL"
+#: plugins/admin/systems/class_terminalGeneric.inc:102
+#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/ogroups/class_termgroup.inc:76
+msgid "No REBOOTCMD definition found in your gosa.conf"
+msgstr "Aucune définition de REBOOTCMD n'est présente dans gosa.conf"
 
-#: plugins/admin/systems/servkolab.tpl:30
-msgid "IMAP service"
-msgstr "Service IMAP"
+#: plugins/admin/systems/class_terminalGeneric.inc:114
+#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/ogroups/class_termgroup.inc:88
+msgid "No HALTCMD definition found in your gosa.conf"
+msgstr "Aucune définition de HALTCMD n'est présente dans gosa.conf"
 
-#: plugins/admin/systems/servkolab.tpl:38
-msgid "IMAP/SSL service"
-msgstr "Service IMAP/SSL"
+#: plugins/admin/systems/class_terminalGeneric.inc:269
+msgid "You have no permissions to create a terminal on this 'Base'."
+msgstr "Vous n'avez pas l'autorisation de créer un terminal dans cette 'Base'."
 
-#: plugins/admin/systems/servkolab.tpl:46
-msgid "Sieve service"
-msgstr "Service sieve"
+#: plugins/admin/systems/class_terminalGeneric.inc:273
+msgid "The required field 'Terminal name' is not set."
+msgstr "Le champ obligatoire 'Nom du terminal' n'est pas renseigné."
 
-#: plugins/admin/systems/servkolab.tpl:54
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+#: plugins/admin/systems/remove_glpi.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your MySql database in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
 msgstr ""
-"service des options de disponibilités par FTP (ancien, pas compatible avec "
-"les options de disponibilités de Kolab2)"
-
-#: plugins/admin/systems/servkolab.tpl:62
-msgid "HTTP FreeBusy service (legacy)"
-msgstr "Service d'option de disponibilité par HTTP (ancien)"
-
-#: plugins/admin/systems/servkolab.tpl:70
-msgid "Amavis email scanning (virus/spam)"
-msgstr "Scan des messages par Amavis (antivirus/antispam)"
-
-#: plugins/admin/systems/servkolab.tpl:81
-msgid "Quota settings"
-msgstr "Préférences des quotas"
+"Il est conseillé de sauvegarder le contenu de votre base de données MySql "
+"dans un fichier avant de réaliser cette action. Appuyez sur 'Supprimer' pour "
+"continuer ou 'Annuler' pour abandonner."
 
-#: plugins/admin/systems/servkolab.tpl:97
-msgid "Free/Busy settings"
-msgstr "Préférences des options de disponibilités"
+#: plugins/admin/systems/class_servGeneric.inc:52
+msgid "This 'dn' has no server features."
+msgstr "Ce 'dn' n'a pas d'options serveur."
 
-#: plugins/admin/systems/servkolab.tpl:102
-msgid "Allow unauthenticated downloading of Free/Busy information"
-msgstr ""
-"Permettre le téléchargement des informations de disponibilités de manière "
-"anonyme"
+#: plugins/admin/systems/class_servGeneric.inc:191
+msgid "The required field 'Server name' is not set."
+msgstr "Le champ obligatoire 'Nom du serveur' n'est pas rempli."
 
-#: plugins/admin/systems/servkolab.tpl:117
-msgid "SMTP privileged networks"
-msgstr "Réseaux SMTP privilègiés"
+#: plugins/admin/systems/class_servGeneric.inc:198
+msgid "You have no permissions to create a server on this 'Base'."
+msgstr "Vous n'avez pas l'autorisation pour créer un serveur sur cette 'Base'."
 
-#: plugins/admin/systems/servkolab.tpl:122
-msgid "Hosts/networks allowed to relay"
-msgstr "Machines/Réseaux qui peuvent relayer du mail"
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
+#, fuzzy
+msgid "Add/Edit manufacturer"
+msgstr "Modifier une entrée"
 
-#: plugins/admin/systems/servkolab.tpl:125
-msgid "Enter multiple values, seperated with"
-msgstr "Entrez des valeurs multiples, séparés avec"
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
+msgid "Website"
+msgstr "Site web"
 
-#: plugins/admin/systems/servkolab.tpl:138
-msgid "SMTP smarthost/relayhost"
-msgstr "Relais SMTP"
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
+#: plugins/admin/ogroups/class_mailogroup.inc:137
+#: plugins/admin/ogroups/class_phonequeue.inc:690
+#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Phone number"
+msgstr "Numéro de téléphone"
 
-#: plugins/admin/systems/servkolab.tpl:144
-msgid "Enable MX lookup for relayhost"
-msgstr "Vérification de l'enregistrement MX pour le serveur relais"
+#: plugins/admin/systems/class_servDHCP.inc:36
+msgid "Remove DHCP service"
+msgstr "Suppression du service DHCP"
 
-#: plugins/admin/systems/servkolab.tpl:149
-msgid "Host used to relay mails"
-msgstr "Machine utilisée pour relayer les mails"
+#: plugins/admin/systems/class_servDHCP.inc:37
+msgid ""
+"This server has DHCP features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Le service DHCP est activé pour ce serveur. Vous pouvez le désactiver en "
+"cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/systems/servkolab.tpl:163
-msgid "Accept Internet Mail"
-msgstr "Accepter le courrier électronique venant d'internet"
+#: plugins/admin/systems/class_servDHCP.inc:39
+msgid "Add DHCP service"
+msgstr "Ajouter un service DHCP"
 
-#: plugins/admin/systems/servkolab.tpl:169
-msgid "Accept mail from other domains over non-authenticated SMTP"
+#: plugins/admin/systems/class_servDHCP.inc:40
+msgid ""
+"This server has DHCP features disabled. You can enable them by clicking "
+"below."
 msgstr ""
-"Accepter les messages sur du SMTP non authentifié venant d'autre domaines"
+"Ce serveur à l'option DHCP désactivé. Vous pouvez l'activer en cliquant sur "
+"le bouton ci-dessous."
 
-#: plugins/admin/systems/phonesettings.tpl:1
-msgid "Advanced phone settings"
-msgstr "Configuration avancée du téléphone"
+#: plugins/admin/systems/class_systemManagement.inc:32
+msgid "Systems"
+msgstr "Systèmes"
 
-#: plugins/admin/systems/phonesettings.tpl:6
-msgid "Phone type"
-msgstr "Type de téléphone"
+#: plugins/admin/systems/class_systemManagement.inc:429
+msgid "You can't edit this object type yet!"
+msgstr "Impossible d'éditer ce type d'objet pour le moment!"
 
-#: plugins/admin/systems/phonesettings.tpl:7
-#: plugins/admin/systems/phonesettings.tpl:25
-#: plugins/admin/systems/phonesettings.tpl:35
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:78
-#: plugins/admin/systems/phonesettings.tpl:109
-#: plugins/admin/systems/phonesettings.tpl:156
-msgid "Choose a phone type"
-msgstr "Sélectionnez un type de téléphone"
+#: plugins/admin/systems/class_systemManagement.inc:455
+msgid "Passwords entered as new and repeated do not match!"
+msgstr ""
+"Le mot de passe entré dans le champ nouveau et celui dans le champ "
+"vérification ne concordent pas!"
 
-#: plugins/admin/systems/phonesettings.tpl:10
-msgid "refresh"
-msgstr "Rafraichir"
+#: plugins/admin/systems/class_systemManagement.inc:472
+msgid "You are not allowed to set this systems password!"
+msgstr "Vous n'êtes pas autorisé à modifier ce mot de passe de ce système!"
 
-#: plugins/admin/systems/phonesettings.tpl:32
-msgid "DTMF mode"
-msgstr "Mode DTMF"
+#: plugins/admin/systems/class_systemManagement.inc:526
+#, php-format
+msgid "You're about to delete all information about the component at '%s'."
+msgstr ""
+"Vous êtes sur le point de supprimer toute les informations relatives aux "
+"composant '%s'."
 
-#: plugins/admin/systems/phonesettings.tpl:46
-#: plugins/admin/systems/phonesettings.tpl:85
-msgid "Default IP"
-msgstr "Adresse ip par défaut"
+#: plugins/admin/systems/class_systemManagement.inc:761
+msgid "New Terminal template"
+msgstr "Nouveau modèle de terminal"
 
-#: plugins/admin/systems/phonesettings.tpl:56
-#: plugins/admin/systems/phonesettings.tpl:93
-msgid "Response timeout"
-msgstr "Temps de réponse maximum"
+#: plugins/admin/systems/class_systemManagement.inc:761
+#: plugins/admin/systems/class_systemManagement.inc:925
+msgid "New Terminal"
+msgstr "Nouveau terminal"
 
-#: plugins/admin/systems/phonesettings.tpl:75
-msgid "Modus"
-msgstr "Mode"
+#: plugins/admin/systems/class_systemManagement.inc:763
+msgid "New Workstation template"
+msgstr "Nouveau modèle de station de travail"
 
-#: plugins/admin/systems/phonesettings.tpl:106
-msgid "Authtype"
-msgstr "Type d'authentification"
+#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/systems/class_systemManagement.inc:926
+msgid "New Workstation"
+msgstr "Nouvelle station de travail"
 
-#: plugins/admin/systems/phonesettings.tpl:116
-msgid "Secret"
-msgstr "Secret"
+#: plugins/admin/systems/class_systemManagement.inc:764
+#: plugins/admin/systems/class_systemManagement.inc:765
+msgid "New Server"
+msgstr "Nouveau Serveur"
 
-#: plugins/admin/systems/phonesettings.tpl:124
-msgid "GoFonInkeys"
-msgstr "Mot de passe utilisé pour l'authentification rsa"
+#: plugins/admin/systems/class_systemManagement.inc:766
+#: plugins/admin/systems/class_systemManagement.inc:767
+msgid "New Printer"
+msgstr "Nouvelle Imprimante"
 
-#: plugins/admin/systems/phonesettings.tpl:132
-msgid "GoFonOutKeys"
-msgstr "Mot de passe utilisé pour l'authentification rsa"
+#: plugins/admin/systems/class_systemManagement.inc:768
+#: plugins/admin/systems/class_systemManagement.inc:769
+msgid "New Phone"
+msgstr "Nouveau Téléphone"
 
-#: plugins/admin/systems/phonesettings.tpl:145
-msgid "Account code"
-msgstr "Code du compte téléphonique"
+#: plugins/admin/systems/class_systemManagement.inc:770
+#: plugins/admin/systems/class_systemManagement.inc:771
+msgid "New Component"
+msgstr "Nouveau composant"
 
-#: plugins/admin/systems/phonesettings.tpl:153
-msgid "Trunk lines"
-msgstr "Regrouper des lignes"
+#: plugins/admin/systems/class_systemManagement.inc:781
+msgid "Edit system"
+msgstr "Editer un système"
 
-#: plugins/admin/systems/phonesettings.tpl:168
-msgid "Hosts that are allowed to connect"
-msgstr "Machines qui peuvent se connecter"
+#: plugins/admin/systems/class_systemManagement.inc:782
+msgid "Delete system"
+msgstr "Effacer un système"
 
-#: plugins/admin/systems/phonesettings.tpl:183
-msgid "Hosts that are not allowed to connect"
-msgstr "Machines qui ne peuvent pas se connecter"
+#: plugins/admin/systems/class_systemManagement.inc:792
+msgid "System"
+msgstr "Système"
 
-#: plugins/admin/systems/phonesettings.tpl:205
-msgid "MSN"
-msgstr "MSN"
+#: plugins/admin/systems/class_systemManagement.inc:830
+msgid "Cups Server"
+msgstr "Serveur Cups"
 
-#: plugins/admin/systems/wingeneric.tpl:6
-msgid "Machine name"
-msgstr "Nom de la machine"
+#: plugins/admin/systems/class_systemManagement.inc:831
+msgid "Log Db"
+msgstr "Base de données de logs"
 
-#: plugins/admin/systems/terminalService.tpl:141
-msgid "Remote desktop"
-msgstr "Bureau distant"
+#: plugins/admin/systems/class_systemManagement.inc:832
+msgid "Syslog Server"
+msgstr "Serveur de logs systèmes"
 
-#: plugins/admin/systems/terminalService.tpl:145
-msgid "Connect method"
-msgstr "Méthode de connexion"
+#: plugins/admin/systems/class_systemManagement.inc:833
+msgid "Mail Server"
+msgstr "Serveur de messagerie"
 
-#: plugins/admin/systems/terminalService.tpl:147
-msgid "Choose method to connect to terminal server"
-msgstr "Sélectionnez la méthode de connexion au terminal"
+#: plugins/admin/systems/class_systemManagement.inc:834
+msgid "Imap Server"
+msgstr "Serveur Imap"
 
-#: plugins/admin/systems/terminalService.tpl:154
-msgid "Terminal server"
-msgstr "Serveur de terminaux"
+#: plugins/admin/systems/class_systemManagement.inc:835
+msgid "Nfs Server"
+msgstr "Serveur NFS"
 
-#: plugins/admin/systems/terminalService.tpl:156
-msgid "Select specific terminal server to use"
-msgstr "Sélectionnez un serveur de terminaux à utiliser"
+#: plugins/admin/systems/class_systemManagement.inc:836
+msgid "Kerberos Server"
+msgstr "Serveur Kerberos"
 
-#: plugins/admin/systems/terminalService.tpl:163
-msgid "Font server"
-msgstr "Serveur de Police de caractère"
+#: plugins/admin/systems/class_systemManagement.inc:837
+msgid "Asterisk Server"
+msgstr "Serveur Asterisk"
 
-#: plugins/admin/systems/terminalService.tpl:165
-msgid "Select specific font server to use"
-msgstr "Sélectionnez le serveur de polices de caractère à utiliser"
+#: plugins/admin/systems/class_systemManagement.inc:838
+msgid "Fax Server"
+msgstr "Serveur de Fax"
 
-#: plugins/admin/systems/terminalService.tpl:181
-msgid "Print device"
-msgstr "Imprimante"
+#: plugins/admin/systems/class_systemManagement.inc:839
+msgid "Ldap Server"
+msgstr "Serveur Ldap"
 
-#: plugins/admin/systems/terminalService.tpl:182
-msgid "Select to start IPP based printing service on terminal"
-msgstr "Sélectionnez pour démarrer le service d'impression IPP sur le terminal"
+#: plugins/admin/systems/class_systemManagement.inc:872
+msgid "Set root password"
+msgstr "Indiquez le mot de passe administrateur"
+
+#: plugins/admin/systems/class_systemManagement.inc:917
+#, fuzzy
+msgid "New System from incoming"
+msgstr "Nouveau système depuis incomming"
+
+#: plugins/admin/systems/class_systemManagement.inc:919
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:590
+msgid "Terminal"
+msgstr "Terminal"
 
-#: plugins/admin/systems/terminalService.tpl:183
-msgid "Provide print services"
-msgstr "Fournir des services d'impression"
+#: plugins/admin/systems/class_systemManagement.inc:920
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:589
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr "Stations de travail"
 
-#: plugins/admin/systems/terminalService.tpl:189
-msgid "Spool server"
-msgstr "Serveur de file d'attente"
+#: plugins/admin/systems/class_systemManagement.inc:923
+msgid "Winstation"
+msgstr "Stations Windows"
 
-#: plugins/admin/systems/terminalService.tpl:191
-msgid "Select NFS filesystem to place spool files on"
-msgstr "Sélectionnez le système de fichier NFS où sera placé la file d'attente"
+#: plugins/admin/systems/class_systemManagement.inc:924
+msgid "Network Device"
+msgstr "Périphérique réseau"
 
-#: plugins/admin/systems/terminalService.tpl:212
-msgid "Select scanner driver to use"
-msgstr "Sélectionnez le pilote du scanner"
+#: plugins/admin/systems/class_systemManagement.inc:1147
+msgid "New terminal"
+msgstr "Nouveau terminal"
 
-#: plugins/admin/systems/remove.tpl:6
-msgid ""
-"This includes <b>all</b> system and setup informations. Please double check "
-"if your really want to do this since there is no way for GOsa to get your "
-"data back."
-msgstr ""
-"Cela inclut <b>tout</b> les systèmes et les informations de configuration. "
-"Veuillez vérifier que vous voulez effectuer cette opération, il est "
-"impossible de revenir en arrière. Toutes les données seront perdues étant "
-"donné qu'il est impossible pour GOsa de récupérer vos données."
+#: plugins/admin/systems/class_systemManagement.inc:1149
+msgid "New workstation"
+msgstr "Nouvelle station de travail"
 
-#: plugins/admin/systems/headpage.tpl:6
-msgid "List of systems"
-msgstr "Liste des systèmes"
+#: plugins/admin/systems/class_systemManagement.inc:1151
+msgid "New Device"
+msgstr "Nouveau périphérique"
 
-#: plugins/admin/systems/headpage.tpl:24
-msgid ""
-"This menu allows you to add, remove and change the properties of specific "
-"systems. You can only add systems which have already been started once."
-msgstr ""
-"Ce menu permet d'ajouter, de supprimer ou de changer les propriétés des "
-"systèmes. Vous pouvez seulement ajouter un système qui à déjà été démarré "
-"une fois."
+#: plugins/admin/systems/class_systemManagement.inc:1168
+msgid "Terminal template for"
+msgstr "Modèle de terminal pour "
 
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
-msgstr "Afficher les serveurs"
+#: plugins/admin/systems/class_systemManagement.inc:1180
+msgid "Workstation template for"
+msgstr "Modèle de station de travail pour"
 
-#: plugins/admin/systems/headpage.tpl:39
-msgid "Select to see Linux terminals"
-msgstr "Sélectionnez pour afficher les terminaux Linux"
+#: plugins/admin/systems/class_servRepositorySetup.inc:117
+msgid "Please enter a value for 'release'."
+msgstr "Veuillez entrer une valeur pour 'la version'"
 
-#: plugins/admin/systems/headpage.tpl:39
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
-msgstr "Afficher les terminaux"
+#: plugins/admin/systems/class_servRepositorySetup.inc:121
+msgid "Please specify a valid value for 'url'."
+msgstr "Veuillez spécifier un nom valide pour 'url'."
 
-#: plugins/admin/systems/headpage.tpl:40
-msgid "Select to see Linux workstations"
-msgstr "Sélectionnez pour voir les stations de travail Linux"
+#: plugins/admin/systems/printer.tpl:6
+msgid "General"
+msgstr "Général"
 
-#: plugins/admin/systems/headpage.tpl:40
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
-msgstr "Afficher les stations de travail"
+#: plugins/admin/systems/printer.tpl:9
+msgid "Printer name"
+msgstr "Nom de l'imprimante"
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Select to see MicroSoft Windows based workstations"
-msgstr "Sélectionnez afin de voir les stations de travail Microsoft Windows"
+#: plugins/admin/systems/printer.tpl:31
+msgid "Details"
+msgstr "Détails"
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Show windows based workstations"
-msgstr "Afficher les stations de travail Windows"
+#: plugins/admin/systems/printer.tpl:34
+msgid "Printer location"
+msgstr "Localisation de l'imprimante"
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Select to see network printers"
-msgstr "Sélectionnez pour afficher les imprimantes réseaux"
+#: plugins/admin/systems/printer.tpl:38
+msgid "Printer URL"
+msgstr "URL de l'imprimante"
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Show network printers"
-msgstr "Afficher les imprimantes réseaux"
+#: plugins/admin/systems/printer.tpl:58
+msgid "Permissions"
+msgstr "Permissions"
 
-#: plugins/admin/systems/headpage.tpl:43
-msgid "Select to see VOIP phones"
-msgstr "Sélectionnez pour afficher les téléphones IP"
+#: plugins/admin/systems/printer.tpl:65
+msgid "Users which are allowed to use this printer"
+msgstr "Utilisateurs qui sont autorisés à utiliser cette imprimante"
 
-#: plugins/admin/systems/headpage.tpl:43
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
-msgstr "Afficher les téléphones"
+#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
+msgid "Add user"
+msgstr "Ajouter un utilisateur"
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Select to see network devices"
-msgstr "Sélectionnez pour afficher les périphériques réseaux"
+#: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
+msgid "Add group"
+msgstr "Ajouter un groupe"
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Show network devices"
-msgstr "Montrer les périphériques réseau"
+#: plugins/admin/systems/printer.tpl:81
+msgid "Users which are allowed to administrate this printer"
+msgstr "Utilisateur qui sont autorisés à administrer cette imprimante"
 
-#: plugins/admin/systems/headpage.tpl:52
-msgid "Regular expression for matching system names"
-msgstr "Expression régulière pour sélectionner les noms de systèmes"
+#: plugins/admin/systems/printer.tpl:82
+msgid "Admins"
+msgstr "Administrateurs"
 
-#: plugins/admin/systems/headpage.tpl:59
-msgid "Display systems of user"
-msgstr "Afficher les systèmes de l'utilisateur"
+#: plugins/admin/systems/class_servDNS.inc:181
+#: plugins/admin/systems/class_inventory.inc:36
+msgid "Remove DNS service"
+msgstr "Suppression du service DNS"
 
-#: plugins/admin/systems/headpage.tpl:62
-msgid "User name of which terminal(s) are shown"
-msgstr "Le nom de l'utilisateur duquel les terminaux sont affichés"
+#: plugins/admin/systems/class_servDNS.inc:182
+#: plugins/admin/systems/class_inventory.inc:37
+msgid ""
+"This server has DNS features enabled. You can disable them by clicking below."
+msgstr ""
+"Ce serveur à l'option DNS activée. Vous pouvez le désactiver en cliquant sur "
+"le bouton ci-dessous."
 
-#: plugins/admin/systems/class_componentGeneric.inc:138
-msgid "The required field 'Component name' is not set."
-msgstr "Le champ obligatoire 'Nom du composant' n'est pas rempli."
+#: plugins/admin/systems/class_servDNS.inc:184
+#: plugins/admin/systems/class_inventory.inc:39
+msgid "Add DNS service"
+msgstr "Ajouter un service DNS"
 
-#: plugins/admin/systems/terminalStartup.tpl:35
-msgid "Select if terminal supports graphical startup with progress bar"
+#: plugins/admin/systems/class_servDNS.inc:185
+#: plugins/admin/systems/class_inventory.inc:40
+msgid ""
+"This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
-"Sélectionnez si le terminal supporte le démarrage graphique avec une barre "
-"de progression"
-
-#: plugins/admin/systems/terminalStartup.tpl:36
-msgid "use graphical bootup"
-msgstr "utiliser un démarrage en mode graphique"
+"Ce serveur à l'option DNS désactivé. Vous pouvez l'activer en cliquant sur "
+"le bouton ci-dessous."
 
-#: plugins/admin/systems/terminalStartup.tpl:38
-msgid "Select if terminal should boot in text mode"
-msgstr "Indiquez si le terminal démarre en mode texte"
+#: plugins/admin/systems/class_servDNS.inc:270
+#, php-format
+msgid ""
+"Can't delete the selected zone, because it is still in use by these entry/"
+"entries '%s'"
+msgstr ""
+"Vous ne pouvez pas effacer cette zone car elle est encore utilisée par ces "
+"éléments/ éléments '%s'"
 
-#: plugins/admin/systems/terminalStartup.tpl:39
-msgid "use standard linux textual bootup"
-msgstr "utiliser le démarrage texte standard de Linux"
+#: plugins/admin/systems/class_servDNS.inc:297
+msgid "Reverse zone"
+msgstr "Zone inverse"
 
-#: plugins/admin/systems/terminalStartup.tpl:41
-msgid "Select to get more verbose output during startup"
-msgstr "Sélectionnez afin d'avoir d'obtenir un démarrage plus verbeux"
+#: plugins/admin/systems/class_servDNSeditZone.inc:336
+msgid "This zoneName is already in use"
+msgstr "Le nom de la zone spécifiée est déjà utilisé."
 
-#: plugins/admin/systems/terminalStartup.tpl:42
-msgid "use debug mode for startup"
-msgstr "utilisez le mode de débogage pour le démarrage"
+#: plugins/admin/systems/class_servDNSeditZone.inc:339
+msgid "This reverse zone is already in use"
+msgstr "Le nom de la zone inverse est déjà utilisé."
 
-#: plugins/admin/systems/password.tpl:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you "
-"wouldn't be able to log in."
+#: plugins/admin/systems/class_servDNSeditZone.inc:344
+msgid "Primary dns server must end with '.' to be a valid entry."
 msgstr ""
-"Pour changer le mot de passe root du terminal, utilisez le champ ci-dessous. "
-"Les changements prennent effet immédiatement. Veuillez mémoriser le nouveau "
-"mot de passe sinon vous ne pourrez pas vous identifier sans celui-ci."
 
-#: plugins/admin/systems/password.tpl:5
-msgid "Leave fields blank for password inheritance from default entries."
+#: plugins/admin/systems/class_servDNSeditZone.inc:348
+msgid "Your specified mail address must end with '.' to be a valid record."
 msgstr ""
-"Laissez le champ vide pour le mot de passe afin de l'obtenir depuis l'entrée "
-"par défaut."
-
-#: plugins/admin/systems/password.tpl:9
-msgid "Changing the password impinges on authentification only."
-msgstr "Changer le mot de passe influe seulement sur l'authentification."
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
-msgid "Printer ppd selection."
-msgstr "Sélection du ppd de votre imprimante."
+#: plugins/admin/systems/class_servDNSeditZone.inc:352
+#: plugins/admin/systems/class_servDNSeditZone.inc:356
+msgid ""
+"Your mail address contains '@' replace this with '.' to enable GOsa to "
+"create a valid SOA record."
+msgstr ""
 
-#: plugins/admin/systems/servRepositorySetup.tpl:15
-msgid "Parent server"
-msgstr "Serveur Père"
+#: plugins/admin/systems/class_servDNSeditZone.inc:360
+msgid "Only lowercase strings are allowed as zone name."
+msgstr "Seule les minuscules sont autorisées dans le nom de la zone."
 
-#: plugins/admin/systems/servRepositorySetup.tpl:33
-#: plugins/admin/systems/class_servRepository.inc:243
-#: plugins/admin/systems/class_servRepository.inc:264
-msgid "Sections"
-msgstr "Sections"
+#: plugins/admin/systems/class_servDNSeditZone.inc:364
+msgid "Please specify a numeric value for serial number."
+msgstr "Veuillez entrer un nombre comme numéro de série."
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:117
-msgid "Please enter a value for 'release'."
-msgstr "Veuillez entrer une valeur pour 'la version'"
+#: plugins/admin/systems/class_servDNSeditZone.inc:368
+msgid "Please specify a numeric value for refresh."
+msgstr "Veuillez spécifier un nombre pour le délai de rafraîchissement."
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:121
-msgid "Please specify a valid value for 'url'."
-msgstr "Veuillez spécifier un nom valide pour 'url'."
+#: plugins/admin/systems/class_servDNSeditZone.inc:372
+msgid "Please specify a numeric value for ttl."
+msgstr "Veuillez spécifier un nombre pour la durée du ttl."
 
-#: plugins/admin/systems/servRepository.tpl:6
-msgid "List of configured repositories."
-msgstr "Liste des dépôts configurés."
+#: plugins/admin/systems/class_servDNSeditZone.inc:376
+msgid "Please specify a numeric value for expire."
+msgstr "Veuillez spécifier un nombre pour la durée d'expiration."
 
-#: plugins/admin/systems/servRepository.tpl:11
-msgid "Add repository"
-msgstr "Ajouter un dépôt"
+#: plugins/admin/systems/class_servDNSeditZone.inc:380
+msgid "Please specify a numeric value for retry."
+msgstr "Veuillez spécifier un nombre pour la durée entre chaque essai."
 
-#: plugins/admin/systems/servRepository.tpl:29
-msgid "This menu allows you to create, delete and edit repository settings."
-msgstr ""
-"Ce menu vous permet créer, effacer et éditer des classes des dépôts FAI."
+#: plugins/admin/systems/servdb.tpl:6
+msgid "Kerberos kadmin access"
+msgstr "Accès kadmin Kerberos"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
-msgid ""
-"This server has inventory features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Ce serveur à l'extension inventaire activée. Vous pouvez la désactiver en "
-"cliquant sur le bouton ci-dessous."
+#: plugins/admin/systems/servdb.tpl:10
+msgid "Kerberos Realm"
+msgstr "Realm Kerberos"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
-msgid ""
-"This server has inventory features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Ce serveur à l'extension d'inventaire désactivé. Vous pouvez l'activer en "
-"cliquant sur le bouton ci-dessous."
+#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
+msgid "Admin user"
+msgstr "Administrateur"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
-#, php-format
-msgid ""
-"Can't rename given printer type to '%s', because this type name already "
-"exists."
-msgstr ""
-"Impossible de renommer le type d'imprimante en '%s', ce type existe déjà."
+#: plugins/admin/systems/servdb.tpl:26
+msgid "FAX database"
+msgstr "Base de données des FAX"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
-#, php-format
-msgid "Can't delete printer type, it is still in use by '%s'."
-msgstr ""
-"Impossible d'effacer ce type d'imprimante, il est encore utilisé par '%s'"
+#: plugins/admin/systems/servdb.tpl:30
+msgid "FAX DB user"
+msgstr "utilisateur de la base de données du FAX"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:750
-msgid "since"
-msgstr "depuis"
+#: plugins/admin/systems/servdb.tpl:42
+msgid "Asterisk management"
+msgstr "Administration d'Asterisk"
 
-#: plugins/admin/systems/glpi_edit_type.tpl:1
-#, fuzzy
-msgid "Manage System-types"
-msgstr "Type de système"
+#: plugins/admin/systems/servdb.tpl:46
+msgid "Asterisk DB user"
+msgstr "Utilisateur de la base de données Asterisk"
 
-#: plugins/admin/systems/glpi_edit_type.tpl:9
-#: plugins/admin/systems/glpi_edit_type.tpl:28
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
-#: plugins/admin/systems/glpi_edit_os.tpl:9
-#: plugins/admin/systems/glpi_edit_os.tpl:28
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:8
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:29
-msgid "Rename"
-msgstr "Renommer"
+#: plugins/admin/systems/servdb.tpl:54
+msgid "Country dial prefix"
+msgstr "Préfixe du pays"
 
-#: plugins/admin/systems/glpi_edit_type.tpl:24
-#: plugins/admin/systems/glpi_edit_os.tpl:24
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:25
-#, fuzzy
-msgid "Please enter a new name"
-msgstr " Veuillez entrer un nom."
+#: plugins/admin/systems/servdb.tpl:58
+msgid "Local dial prefix"
+msgstr "Préfixe local"
 
-#: plugins/admin/systems/remove_glpi.tpl:10
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your MySql database in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Il est conseillé de sauvegarder le contenu de votre base de données MySql "
-"dans un fichier avant de réaliser cette action. Appuyez sur 'Supprimer' pour "
-"continuer ou 'Annuler' pour abandonner."
+#: plugins/admin/systems/servdb.tpl:70
+msgid "IMAP admin access"
+msgstr "Accès administrateur IMAP"
 
-#: plugins/admin/systems/glpiManufacturer.tpl:1
-#, fuzzy
-msgid "Manage manufacturers"
-msgstr "Fabricant"
+#: plugins/admin/systems/servdb.tpl:74
+msgid "Server identifier"
+msgstr "Identifiant du serveur"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
-msgid "Reference"
-msgstr "Référence"
+#: plugins/admin/systems/servdb.tpl:78
+msgid "Connect URL"
+msgstr "URL de connexion"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
-#: plugins/admin/systems/glpi_devices.tpl:17
-msgid "Comments"
-msgstr "Commentaires"
+#: plugins/admin/systems/servdb.tpl:91
+msgid "Sieve port"
+msgstr "port Sieve"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
-#: plugins/admin/systems/glpi.tpl:63
-#: plugins/admin/systems/glpi_devices.tpl:112
-#: plugins/admin/systems/glpi_devices.tpl:153
-#: plugins/admin/systems/glpi_devices.tpl:208
-#: plugins/admin/systems/glpi_devices.tpl:264
-#: plugins/admin/systems/glpi_devices.tpl:322
-#: plugins/admin/systems/glpi_devices.tpl:386
-#: plugins/admin/systems/glpi_devices.tpl:458
-#: plugins/admin/systems/glpi_devices.tpl:522
-#: plugins/admin/systems/glpi_devices.tpl:569
-#: plugins/admin/systems/glpi_devices.tpl:622
-#: plugins/admin/systems/glpi_devices.tpl:676
-#: plugins/admin/systems/glpi_devices.tpl:722
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
-msgid "Comment"
-msgstr "Commentaires"
+#: plugins/admin/systems/servdb.tpl:100
+msgid "Logging database"
+msgstr "Base de données des logs"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
-#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
-#: plugins/admin/systems/glpi_devices.tpl:24
-#: plugins/admin/systems/glpi_devices.tpl:123
-#: plugins/admin/systems/glpi_devices.tpl:164
-#: plugins/admin/systems/glpi_devices.tpl:219
-#: plugins/admin/systems/glpi_devices.tpl:275
-#: plugins/admin/systems/glpi_devices.tpl:333
-#: plugins/admin/systems/glpi_devices.tpl:397
-#: plugins/admin/systems/glpi_devices.tpl:469
-#: plugins/admin/systems/glpi_devices.tpl:533
-#: plugins/admin/systems/glpi_devices.tpl:580
-#: plugins/admin/systems/glpi_devices.tpl:633
-#: plugins/admin/systems/glpi_devices.tpl:687
-#: plugins/admin/systems/glpi_devices.tpl:733
-msgid "Manufacturer"
-msgstr "Fabricant"
+#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
+msgid "Logging DB user"
+msgstr "Utilisateur de la base de données de log"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
-#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
-msgid "Technical responsible"
-msgstr "Responsable technique"
+#: plugins/admin/systems/servdb.tpl:119
+msgid "Glpi database"
+msgstr "Base de données GLPI"
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:140
-msgid "use"
-msgstr "utiliser"
+#: plugins/admin/systems/servdb.tpl:133
+msgid "Database"
+msgstr "Base de données"
 
-#: plugins/admin/systems/glpiSelectUser.tpl:23
-msgid ""
-"This dialog allows you to select a user as technical responsible person."
+#: plugins/admin/systems/class_printGeneric.inc:177
+#: plugins/admin/systems/class_printGeneric.inc:184
+#: plugins/admin/systems/class_printGeneric.inc:219
+#: plugins/admin/systems/class_printGeneric.inc:240
+#: plugins/admin/systems/class_printGeneric.inc:243
+msgid "Add printer extension"
+msgstr "Ajouter une extension d'imprimante"
+
+#: plugins/admin/systems/class_printGeneric.inc:178
+msgid "This is a workstation template, printer tab is disabled."
 msgstr ""
-"Ce dialogue vous permet de désigner un utilisateur comme personne "
-"responsable."
+"Ceci est un modèle de station de travail, l'onglet imprimante est désactivé."
 
-#: plugins/admin/systems/glpi_edit_os.tpl:1
-msgid "Manage OS-types"
+#: plugins/admin/systems/class_printGeneric.inc:185
+msgid "This is a terminal template, printer tab is disabled."
+msgstr "Ceci est un modèle de terminal, l'onglet imprimante est désactivé."
+
+#: plugins/admin/systems/class_printGeneric.inc:220
+msgid ""
+"This workstation has printer extension disabled. You can't enable it while "
+"'cn' is not present in entry. Possibly you are currently creating a new "
+"terminal template"
 msgstr ""
+"Ce serveur à l'extension d'imprimante désactivé. Vous ne pourrez l'activer "
+"tant qu'un 'cn' n'est pas présent dans l'entrée. Vous êtes probablement "
+"occupé à créer un nouveau modèle de terminal"
 
-#: plugins/admin/systems/class_termDNS.inc:313
-msgid "The required field 'IP-address' is not set."
-msgstr "Le champ obligatoire 'adresse IP' n'est pas rempli."
+#: plugins/admin/systems/class_printGeneric.inc:232
+#: plugins/admin/systems/class_printGeneric.inc:235
+msgid "Remove printer extension"
+msgstr "Enlever l'extension d'impression"
 
-#: plugins/admin/systems/class_termDNS.inc:319
-msgid "Wrong IP format in field IP-address."
-msgstr "L'adresse ip dans le champ adresse IP n'est pas valide."
+#: plugins/admin/systems/class_printGeneric.inc:233
+msgid ""
+"This workstation has printer extension enabled.You can disable it by "
+"clicking below."
+msgstr ""
+"Ce stations de travail à l'extension d'imprimante activée. Vous pouvez la "
+"désactiver en cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/systems/class_termDNS.inc:325
-msgid "The required field 'MAC-address' is not set."
-msgstr "Le champ obligatoire 'MAC-address' n'est pas rempli."
+#: plugins/admin/systems/class_printGeneric.inc:236
+msgid ""
+"This terminal has printer extension enabled. You can disable it by clicking "
+"below."
+msgstr ""
+"Ce serveur à l'extension d'imprimante activée. Vous pouvez la désactiver en "
+"cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/systems/class_termDNS.inc:331
+#: plugins/admin/systems/class_printGeneric.inc:241
 msgid ""
-"The given macaddress is invalid. There must be 6 1byte segments seperated by "
-"':'."
+"This workstation has printer extension disabled. You can enable it by "
+"clicking below."
 msgstr ""
-"La mac adresse introduite est invalide. Il doit y avoir 6 fois un byte "
-"séparés par ':'."
+"Ce serveur à l'extension d'imprimante désactivé. Vous pouvez l'activer en "
+"cliquant sur le bouton ci-dessous."
+
+#: plugins/admin/systems/class_printGeneric.inc:244
+msgid ""
+"This terminal has printer extension disabled. You can enable it by clicking "
+"below."
+msgstr ""
+"Ce serveur à l'extension d'imprimante désactivé. Vous pouvez l'activer en "
+"cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/systems/class_termDNS.inc:346
+#: plugins/admin/systems/class_printGeneric.inc:283
+msgid "This 'dn' has no printer features."
+msgstr "Ce 'dn' n'a pas d'extensions d'impression."
+
+#: plugins/admin/systems/class_printGeneric.inc:419
 #, php-format
-msgid "Found duplicate value for record type '%s'."
-msgstr ""
+msgid "Your currently selected PPD file '%s' doesn't exist."
+msgstr "Le fichier PPD sélectionné '%s' n'existe pas."
 
-#: plugins/admin/systems/class_termDNS.inc:352
+#: plugins/admin/systems/class_printGeneric.inc:427
+msgid "can't get ppd informations."
+msgstr "Impossible d'obtenir les informations sur le fichier ppd."
+
+#: plugins/admin/systems/class_printGeneric.inc:439
 #, php-format
-msgid "Found more than one entry for the uniqe record type '%s'."
+msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
+"Cette imprimante appartient au terminal %s. Vous ne pouvez pas changer son "
+"nom."
 
-#: plugins/admin/systems/class_termDNS.inc:360
+#: plugins/admin/systems/class_printGeneric.inc:441
 #, php-format
-msgid ""
-"The device IP '%s' is added as 'A Record', this will be done automatically, "
-"please remove the record."
+msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
+"Cette imprimante appartient à la station de travail %s. Vous ne pouvez pas "
+"changer son nom."
 
-#: plugins/admin/systems/class_termDNS.inc:366
-#: plugins/admin/systems/class_servDNSeditZone.inc:386
-#, php-format
-msgid "Only lowercase is allowed, please check your '%ss'."
+#: plugins/admin/systems/class_printGeneric.inc:519
+msgid "You have no permissions to create a printer on this 'Base'."
 msgstr ""
-"Seulement les minuscules sont autorisée, veuillez vérifier votre '%ss'."
+"Vous n'avez pas l'autorisation de créer une imprimante sur cette 'Base'."
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
-#, fuzzy
-msgid "Add/Edit manufacturer"
-msgstr "Modifier une entrée"
+#: plugins/admin/systems/servkolab.tpl:14
+msgid "POP3 service"
+msgstr "Service POP3"
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
-msgid "Website"
-msgstr "Site web"
+#: plugins/admin/systems/servkolab.tpl:22
+msgid "POP3/SSL service"
+msgstr "Service POP3/SSL"
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
-#: plugins/admin/ogroups/class_mailogroup.inc:137
-#: plugins/admin/ogroups/class_phonequeue.inc:690
-#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Phone number"
-msgstr "Numéro de téléphone"
+#: plugins/admin/systems/servkolab.tpl:30
+msgid "IMAP service"
+msgstr "Service IMAP"
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
-msgid "List of available cartridge type for this type of printer"
-msgstr "Liste des types de cartouches disponibles pour ce type d'imprimante"
+#: plugins/admin/systems/servkolab.tpl:38
+msgid "IMAP/SSL service"
+msgstr "Service IMAP/SSL"
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
-msgid ""
-"This dialog allows you to create new types of cartridges, and select one or "
-"more types for your printer. Cartridge types depends on the printer type you "
-"have selected. For each selected cartridge type there will be a new "
-"cartridge created, this allows you to select the same cartridge type for "
-"more then one printer."
+#: plugins/admin/systems/servkolab.tpl:46
+msgid "Sieve service"
+msgstr "Service sieve"
+
+#: plugins/admin/systems/servkolab.tpl:54
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
 msgstr ""
+"service des options de disponibilités par FTP (ancien, pas compatible avec "
+"les options de disponibilités de Kolab2)"
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
-msgid "Display cartridge types matching"
-msgstr "Afficher les types de cartouches correspondantes"
+#: plugins/admin/systems/servkolab.tpl:62
+msgid "HTTP FreeBusy service (legacy)"
+msgstr "Service d'option de disponibilité par HTTP (ancien)"
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
-msgid "Regular expression for matching cartridge types"
-msgstr "Expression régulière pour sélectionner les cartouches correspondantes"
+#: plugins/admin/systems/servkolab.tpl:70
+msgid "Amavis email scanning (virus/spam)"
+msgstr "Scan des messages par Amavis (antivirus/antispam)"
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:58
-#, php-format
-msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
-msgstr ""
-"Vous ne pouvez pas effacer ce fournisseur, il est utilisé actuellement par ce"
-"(s) système(s) '%s'"
+#: plugins/admin/systems/servkolab.tpl:81
+msgid "Quota settings"
+msgstr "Préférences des quotas"
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:104
-msgid "Please specify a name."
-msgstr "Veuillez indiquer un nom."
+#: plugins/admin/systems/servkolab.tpl:97
+msgid "Free/Busy settings"
+msgstr "Préférences des options de disponibilités"
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:113
-#: plugins/admin/systems/class_glpiManufacturer.inc:119
-msgid "Specified name is already in use, please choose another one."
-msgstr "Le nom indiqué est déjà utilisé, veuillez en choisir un autre."
+#: plugins/admin/systems/servkolab.tpl:102
+msgid "Allow unauthenticated downloading of Free/Busy information"
+msgstr ""
+"Permettre le téléchargement des informations de disponibilités de manière "
+"anonyme"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:6
-msgid "List of attachments"
-msgstr "Liste des documents liés"
+#: plugins/admin/systems/servkolab.tpl:117
+msgid "SMTP privileged networks"
+msgstr "Réseaux SMTP privilègiés"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:23
-msgid ""
-"This dialog allow you to attach additional objects (like manuals, guides, "
-"etc.)  to your currently edited computer."
-msgstr ""
-"Ce menu vous permet d'attacher des objets supplémentaires ( comme des "
-"manuels, guides, etc..) à l'ordinateur que vous être en train d'éditer."
+#: plugins/admin/systems/servkolab.tpl:122
+msgid "Hosts/networks allowed to relay"
+msgstr "Machines/Réseaux qui peuvent relayer du mail"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:35
-msgid "Display attachments matching"
-msgstr "Afficher les documents liées correspondants"
+#: plugins/admin/systems/servkolab.tpl:125
+msgid "Enter multiple values, seperated with"
+msgstr "Entrez des valeurs multiples, séparés avec"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:37
-msgid "Regular expression for matching attachment names"
-msgstr "Expression régulière pour faire correspondre le nom des documents liés"
+#: plugins/admin/systems/servkolab.tpl:138
+msgid "SMTP smarthost/relayhost"
+msgstr "Relais SMTP"
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
-msgid "Can't delete this entry, it is still in use."
-msgstr "Impossible d'effacer cette entrée elle est encore utilisée"
+#: plugins/admin/systems/servkolab.tpl:144
+msgid "Enable MX lookup for relayhost"
+msgstr "Vérification de l'enregistrement MX pour le serveur relais"
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:305
-msgid "The selected name is already in use."
-msgstr "Le nom spécifié est déjà utilisé."
+#: plugins/admin/systems/servkolab.tpl:149
+msgid "Host used to relay mails"
+msgstr "Machine utilisée pour relayer les mails"
 
-#: plugins/admin/systems/glpi.tpl:9
-#: plugins/admin/systems/SelectDeviceType.tpl:20
-msgid "System type"
-msgstr "Type de système"
+#: plugins/admin/systems/servkolab.tpl:163
+msgid "Accept Internet Mail"
+msgstr "Accepter le courrier électronique venant d'internet"
 
-#: plugins/admin/systems/glpi.tpl:19
-msgid "Operating system"
-msgstr "Système d'exploitation"
+#: plugins/admin/systems/servkolab.tpl:169
+msgid "Accept mail from other domains over non-authenticated SMTP"
+msgstr ""
+"Accepter les messages sur du SMTP non authentifié venant d'autre domaines"
 
-#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
-msgid "Contacts"
-msgstr "Contacts"
+#: plugins/admin/systems/phonesettings.tpl:1
+msgid "Advanced phone settings"
+msgstr "Configuration avancée du téléphone"
 
-#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
-msgid "Contact person"
-msgstr "Personne de contact"
+#: plugins/admin/systems/phonesettings.tpl:6
+msgid "Phone type"
+msgstr "Type de téléphone"
 
-#: plugins/admin/systems/glpi.tpl:78
-msgid "Installed devices"
-msgstr "Périphériques installés"
+#: plugins/admin/systems/phonesettings.tpl:7
+#: plugins/admin/systems/phonesettings.tpl:25
+#: plugins/admin/systems/phonesettings.tpl:35
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:78
+#: plugins/admin/systems/phonesettings.tpl:109
+#: plugins/admin/systems/phonesettings.tpl:156
+msgid "Choose a phone type"
+msgstr "Sélectionnez un type de téléphone"
 
-#: plugins/admin/systems/glpi.tpl:90
-msgid "Trading"
-msgstr ""
+#: plugins/admin/systems/phonesettings.tpl:10
+msgid "refresh"
+msgstr "Rafraichir"
 
-#: plugins/admin/systems/glpi.tpl:91
-msgid "Software"
-msgstr "Logiciel"
+#: plugins/admin/systems/phonesettings.tpl:32
+msgid "DTMF mode"
+msgstr "Mode DTMF"
 
-#: plugins/admin/systems/glpi.tpl:92
-msgid "Contracts"
-msgstr "Contrats"
+#: plugins/admin/systems/phonesettings.tpl:46
+#: plugins/admin/systems/phonesettings.tpl:85
+msgid "Default IP"
+msgstr "Adresse ip par défaut"
 
-#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
-msgid "Attachments"
-msgstr "Documents liés"
+#: plugins/admin/systems/phonesettings.tpl:56
+#: plugins/admin/systems/phonesettings.tpl:93
+msgid "Response timeout"
+msgstr "Temps de réponse maximum"
 
-#: plugins/admin/systems/servdnseditzone.tpl:7
-msgid "Zone name"
-msgstr "Nom de la zone"
+#: plugins/admin/systems/phonesettings.tpl:75
+msgid "Modus"
+msgstr "Mode"
 
-#: plugins/admin/systems/servdnseditzone.tpl:13
-#, fuzzy
-msgid "Network address"
-msgstr "Périphériques réseau"
+#: plugins/admin/systems/phonesettings.tpl:106
+msgid "Authtype"
+msgstr "Type d'authentification"
 
-#: plugins/admin/systems/servdnseditzone.tpl:24
-#, fuzzy
-msgid "Zone entries"
-msgstr "Configuration de la zone"
+#: plugins/admin/systems/phonesettings.tpl:116
+msgid "Secret"
+msgstr "Secret"
 
-#: plugins/admin/systems/servdnseditzone.tpl:35
-#, fuzzy
-msgid "SOA record"
-msgstr "Enregistrement dns"
+#: plugins/admin/systems/phonesettings.tpl:124
+msgid "GoFonInkeys"
+msgstr "Mot de passe utilisé pour l'authentification rsa"
 
-#: plugins/admin/systems/servdnseditzone.tpl:41
-msgid "Primary dns server for this zone"
-msgstr "Serveur dns primaire pour cette zone"
+#: plugins/admin/systems/phonesettings.tpl:132
+msgid "GoFonOutKeys"
+msgstr "Mot de passe utilisé pour l'authentification rsa"
 
-#: plugins/admin/systems/servdnseditzone.tpl:53
-msgid "Serial number (automatically incremented)"
-msgstr "Numéro de série (incrémenté automatiquement)"
+#: plugins/admin/systems/phonesettings.tpl:145
+msgid "Account code"
+msgstr "Code du compte téléphonique"
 
-#: plugins/admin/systems/servdnseditzone.tpl:69
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/altlinux/setup_finish.tpl:31
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr "Réessayer"
+#: plugins/admin/systems/phonesettings.tpl:153
+msgid "Trunk lines"
+msgstr "Regrouper des lignes"
 
-#: plugins/admin/systems/servdnseditzone.tpl:75
-msgid "Expire"
-msgstr "Expire"
+#: plugins/admin/systems/phonesettings.tpl:168
+msgid "Hosts that are allowed to connect"
+msgstr "Machines qui peuvent se connecter"
 
-#: plugins/admin/systems/servdnseditzone.tpl:96
-#, fuzzy
-msgid "MxRecords"
-msgstr "Enregistrements"
+#: plugins/admin/systems/phonesettings.tpl:183
+msgid "Hosts that are not allowed to connect"
+msgstr "Machines qui ne peuvent pas se connecter"
 
-#: plugins/admin/systems/servdnseditzone.tpl:108
-#, fuzzy
-msgid "Zone records"
-msgstr "Enregistrement dns"
+#: plugins/admin/systems/phonesettings.tpl:205
+msgid "MSN"
+msgstr "MSN"
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:6
-msgid "List of devices"
-msgstr "Liste des périphériques"
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
+msgstr "Nom de la machine"
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:23
+#: plugins/admin/systems/remove.tpl:6
 msgid ""
-"This dialog allows you to attach a device to your currently edited computer."
+"This includes <b>all</b> system and setup informations. Please double check "
+"if your really want to do this since there is no way for GOsa to get your "
+"data back."
 msgstr ""
-"Ce menu vous permet d'attacher un périphérique à votre ordinateur en cours "
-"d'édition."
-
-#: plugins/admin/systems/glpiDeviceManagement.tpl:35
-msgid "Display devices matching"
-msgstr "Afficher les périphériques correspondants"
-
-#: plugins/admin/systems/glpiDeviceManagement.tpl:37
-msgid "Regular expression for matching device names"
-msgstr "Expression régulière concordant avec les noms des périphériques"
+"Cela inclut <b>tout</b> les systèmes et les informations de configuration. "
+"Veuillez vérifier que vous voulez effectuer cette opération, il est "
+"impossible de revenir en arrière. Toutes les données seront perdues étant "
+"donné qu'il est impossible pour GOsa de récupérer vos données."
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:73
 #, php-format
@@ -9316,433 +9680,270 @@ msgstr "Ce tableau montre tout les fichiers attachés disponibles."
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:222
 msgid "empty"
-msgstr "vide"
-
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
-msgid "Create new attachment"
-msgstr "Créer un nouveau fichier attaché"
-
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
-msgid "New Attachment"
-msgstr "Nouveau document lié"
-
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:352
-msgid "Please specify a valid name for this attachment."
-msgstr "Veuillez spécifier un nom valide pour ce document lié."
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
-#, php-format
-msgid "Internal Error can't create device of type '%s'"
-msgstr "Erreur interne, impossible de créer le périphérique de type '%s'"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
-#, php-format
-msgid "You're about to delete the glpi device '%s'."
-msgstr "Vous êtes sur le point de supprimer le périphérique glpi '%s'."
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
-msgid "Can't detect object name."
-msgstr "Impossible de détecter le nom de l'objet."
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
-#, php-format
-msgid ""
-"You can't delete this device, it is still in use by these system(s) '%s'"
-msgstr ""
-"Vous ne pouvez pas effacer ce périphérique, il est utilisé actuellement par "
-"ces système(s) '%s'"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
-msgid "devices"
-msgstr "périphériques"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-msgid "New monitor"
-msgstr "Nouvel écran"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-msgid "M"
-msgstr "M"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
-msgid "New mainbord"
-msgstr "Nouvel carte mère"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-msgid "New processor"
-msgstr "Nouveau processeur"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
-msgid "New case"
-msgstr "Nouveau boitier"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
-msgid "C"
-msgstr "C"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
-msgid "New network interface"
-msgstr "Nouvel carte réseau"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
-msgid "NI"
-msgstr "NI"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
-msgid "New ram"
-msgstr "Nouvelle mémoire vive"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
-msgid "R"
-msgstr "R"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
-msgid "New hard disk"
-msgstr "Nouveau disque dur"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
-msgid "HDD"
-msgstr "Disque dur"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
-msgid "New drive"
-msgstr "Nouveau lecteur"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
-msgid "D"
-msgstr "D"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
-msgid "New controller"
-msgstr "Nouveau controlleur"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
-msgid "CS"
-msgstr "CS"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
-msgid "New graphics card"
-msgstr "Nouvelle carte graphique"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
-msgid "GC"
-msgstr "GC"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
-msgid "New sound card"
-msgstr "Nouvelle carte son"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
-msgid "SC"
-msgstr "SC"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
-msgid "New power supply"
-msgstr "Nouvelle alimentation"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
-msgid "PS"
-msgstr "PS"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
-msgid "New misc device"
-msgstr "Nouveau périphérique"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
-msgid "OC"
-msgstr "OC"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:346
-msgid "You have to specify a valid name for this device."
-msgstr "Veuillez spécifier un nom valide pour ce périphérique."
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:366
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:369
-msgid "This device name is already in use."
-msgstr "Le nom de ce périphérique est déjà utilisé."
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
-msgid "Other"
-msgstr "Autres"
-
-#: plugins/admin/systems/glpiPrinter.tpl:9
-msgid "Printer type"
-msgstr "Type de l'imprimante"
-
-#: plugins/admin/systems/glpiPrinter.tpl:31
-msgid "Supported interfaces"
-msgstr "Interfaces supportées"
-
-#: plugins/admin/systems/glpiPrinter.tpl:38
-msgid "Serial"
-msgstr "Série"
-
-#: plugins/admin/systems/glpiPrinter.tpl:46
-msgid "Parallel"
-msgstr "Parallèle"
-
-#: plugins/admin/systems/glpiPrinter.tpl:54
-msgid "USB"
-msgstr "USB"
-
-#: plugins/admin/systems/glpiPrinter.tpl:114
-msgid "Installed cartridges"
-msgstr "Cartouches installés"
-
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
-#, php-format
-msgid "You're about to delete the glpi cartridge type '%s'."
-msgstr "Vous êtes sur le point de supprimer le type de toner glpi '%s'."
-
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:116
-#, php-format
-msgid ""
-"You can't delete this cartridge type, it is still in use by this printer(s) "
-"'%s'."
-msgstr ""
-"Vous ne pouvez pas effacer ce type de cartouche, il est utilisé actuellement "
-"par ce(s) imprimante(s) '%s'."
-
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
-msgid "Cartridges"
-msgstr "Cartouches"
+msgstr "vide"
 
-#: plugins/admin/systems/glpi_devices.tpl:2
-#, fuzzy
-msgid "Add/Edit monitor"
-msgstr "Modifier une entrée"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
+msgid "Create new attachment"
+msgstr "Créer un nouveau fichier attaché"
 
-#: plugins/admin/systems/glpi_devices.tpl:33
-msgid "Monitor size"
-msgstr "Taille écran"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
+msgid "New Attachment"
+msgstr "Nouveau document lié"
 
-#: plugins/admin/systems/glpi_devices.tpl:36
-msgid "Inch"
-msgstr "Inch"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:352
+msgid "Please specify a valid name for this attachment."
+msgstr "Veuillez spécifier un nom valide pour ce document lié."
 
-#: plugins/admin/systems/glpi_devices.tpl:44
-msgid "Integrated microphone"
-msgstr "Micro intégré"
+#: plugins/admin/systems/headpage.tpl:6
+msgid "List of systems"
+msgstr "Liste des systèmes"
 
-#: plugins/admin/systems/glpi_devices.tpl:47
-#: plugins/admin/systems/glpi_devices.tpl:55
-#: plugins/admin/systems/glpi_devices.tpl:63
-#: plugins/admin/systems/glpi_devices.tpl:71
-#: plugins/admin/systems/glpi_devices.tpl:176
-#: plugins/admin/systems/glpi_devices.tpl:296
-#: plugins/admin/systems/glpi_devices.tpl:361
-msgid "Yes"
-msgstr "Oui"
+#: plugins/admin/systems/headpage.tpl:24
+msgid ""
+"This menu allows you to add, remove and change the properties of specific "
+"systems. You can only add systems which have already been started once."
+msgstr ""
+"Ce menu permet d'ajouter, de supprimer ou de changer les propriétés des "
+"systèmes. Vous pouvez seulement ajouter un système qui à déjà été démarré "
+"une fois."
 
-#: plugins/admin/systems/glpi_devices.tpl:48
-#: plugins/admin/systems/glpi_devices.tpl:56
-#: plugins/admin/systems/glpi_devices.tpl:64
-#: plugins/admin/systems/glpi_devices.tpl:72
-#: plugins/admin/systems/glpi_devices.tpl:177
-#: plugins/admin/systems/glpi_devices.tpl:297
-#: plugins/admin/systems/glpi_devices.tpl:362
-msgid "No"
-msgstr "Non"
+#: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
+msgstr "Afficher les serveurs"
 
-#: plugins/admin/systems/glpi_devices.tpl:52
-msgid "Integrated speakers"
-msgstr "Haut parleur intègré"
+#: plugins/admin/systems/headpage.tpl:39
+msgid "Select to see Linux terminals"
+msgstr "Sélectionnez pour afficher les terminaux Linux"
 
-#: plugins/admin/systems/glpi_devices.tpl:60
-msgid "Sub-D"
-msgstr "Sub-D"
+#: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
+msgstr "Afficher les terminaux"
 
-#: plugins/admin/systems/glpi_devices.tpl:68
-msgid "BNC"
-msgstr "BNC"
+#: plugins/admin/systems/headpage.tpl:40
+msgid "Select to see Linux workstations"
+msgstr "Sélectionnez pour voir les stations de travail Linux"
 
-#: plugins/admin/systems/glpi_devices.tpl:76
-msgid "Serial number"
-msgstr "Numéro de série"
+#: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
+msgstr "Afficher les stations de travail"
 
-#: plugins/admin/systems/glpi_devices.tpl:83
-msgid "Additional serial number"
-msgstr "Numéro de série supplémentaire"
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Select to see MicroSoft Windows based workstations"
+msgstr "Sélectionnez afin de voir les stations de travail Microsoft Windows"
 
-#: plugins/admin/systems/glpi_devices.tpl:97
-#, fuzzy
-msgid "Add/Edit other device"
-msgstr "Carte son"
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Show windows based workstations"
+msgstr "Afficher les stations de travail Windows"
 
-#: plugins/admin/systems/glpi_devices.tpl:138
-#, fuzzy
-msgid "Add/Edit power supply"
-msgstr "Nouvelle alimentation"
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Select to see network printers"
+msgstr "Sélectionnez pour afficher les imprimantes réseaux"
 
-#: plugins/admin/systems/glpi_devices.tpl:173
-msgid "Atx"
-msgstr "atx"
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Show network printers"
+msgstr "Afficher les imprimantes réseaux"
 
-#: plugins/admin/systems/glpi_devices.tpl:181
-msgid "Power"
-msgstr "Puissance électrique"
+#: plugins/admin/systems/headpage.tpl:43
+msgid "Select to see VOIP phones"
+msgstr "Sélectionnez pour afficher les téléphones IP"
 
-#: plugins/admin/systems/glpi_devices.tpl:193
-#, fuzzy
-msgid "Add/Edit graphic card"
-msgstr "Nouvelle carte graphique"
+#: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
+msgstr "Afficher les téléphones"
 
-#: plugins/admin/systems/glpi_devices.tpl:228
-#: plugins/admin/systems/glpi_devices.tpl:284
-#: plugins/admin/systems/glpi_devices.tpl:349
-msgid "Interface"
-msgstr "Interface"
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Select to see network devices"
+msgstr "Sélectionnez pour afficher les périphériques réseaux"
 
-#: plugins/admin/systems/glpi_devices.tpl:237
-msgid "Ram"
-msgstr "Mémoire vive"
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Show network devices"
+msgstr "Montrer les périphériques réseau"
 
-#: plugins/admin/systems/glpi_devices.tpl:249
-#, fuzzy
-msgid "Add/Edit controller"
-msgstr "Nouveau controlleur"
+#: plugins/admin/systems/headpage.tpl:52
+msgid "Regular expression for matching system names"
+msgstr "Expression régulière pour sélectionner les noms de systèmes"
 
-#: plugins/admin/systems/glpi_devices.tpl:307
-msgid "Add/Edit drive"
-msgstr ""
+#: plugins/admin/systems/headpage.tpl:59
+msgid "Display systems of user"
+msgstr "Afficher les systèmes de l'utilisateur"
 
-#: plugins/admin/systems/glpi_devices.tpl:342
-msgid "Speed"
-msgstr "Vitesse"
+#: plugins/admin/systems/headpage.tpl:62
+msgid "User name of which terminal(s) are shown"
+msgstr "Le nom de l'utilisateur duquel les terminaux sont affichés"
 
-#: plugins/admin/systems/glpi_devices.tpl:358
-msgid "Writeable"
-msgstr "Inscriptible"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:6
+msgid "List of attachments"
+msgstr "Liste des documents liés"
 
-#: plugins/admin/systems/glpi_devices.tpl:371
-#, fuzzy
-msgid "Add/Edit harddisk"
-msgstr "Nouveau disque dur"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:23
+msgid ""
+"This dialog allow you to attach additional objects (like manuals, guides, "
+"etc.)  to your currently edited computer."
+msgstr ""
+"Ce menu vous permet d'attacher des objets supplémentaires ( comme des "
+"manuels, guides, etc..) à l'ordinateur que vous être en train d'éditer."
 
-#: plugins/admin/systems/glpi_devices.tpl:406
-msgid "Rpm"
-msgstr "Vitesse"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:35
+msgid "Display attachments matching"
+msgstr "Afficher les documents liées correspondants"
 
-#: plugins/admin/systems/glpi_devices.tpl:413
-msgid "Cache"
-msgstr "Cache"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:37
+msgid "Regular expression for matching attachment names"
+msgstr "Expression régulière pour faire correspondre le nom des documents liés"
 
-#: plugins/admin/systems/glpi_devices.tpl:443
-#, fuzzy
-msgid "Add/Edit memory"
-msgstr "Modifier une entrée"
+#: plugins/admin/systems/password.tpl:2
+msgid ""
+"To change the terminal root password use the fields below. The changes take "
+"effect during the next reboot. Please memorize the new password, because you "
+"wouldn't be able to log in."
+msgstr ""
+"Pour changer le mot de passe root du terminal, utilisez le champ ci-dessous. "
+"Les changements prennent effet immédiatement. Veuillez mémoriser le nouveau "
+"mot de passe sinon vous ne pourrez pas vous identifier sans celui-ci."
 
-#: plugins/admin/systems/glpi_devices.tpl:478
-msgid "Frequenz"
-msgstr "Fréquence"
+#: plugins/admin/systems/password.tpl:5
+msgid "Leave fields blank for password inheritance from default entries."
+msgstr ""
+"Laissez le champ vide pour le mot de passe afin de l'obtenir depuis l'entrée "
+"par défaut."
 
-#: plugins/admin/systems/glpi_devices.tpl:507
-#, fuzzy
-msgid "Add/Edit sound card"
-msgstr "Nouvelle carte son"
+#: plugins/admin/systems/password.tpl:9
+msgid "Changing the password impinges on authentification only."
+msgstr "Changer le mot de passe influe seulement sur l'authentification."
 
-#: plugins/admin/systems/glpi_devices.tpl:553
-#, fuzzy
-msgid "Add/Edit network interface"
-msgstr "Nouvel carte 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/glpi_devices.tpl:589
-msgid "MAC address"
-msgstr "Adresse MAC"
+#: 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/glpi_devices.tpl:607
-#, fuzzy
-msgid "Add/Edit processor"
-msgstr "Nouveau processeur"
+#: plugins/admin/systems/chooser.tpl:7
+msgid "Linux thin client template"
+msgstr "Modèle de client léger Linux"
 
-#: plugins/admin/systems/glpi_devices.tpl:642
-msgid "Frequence"
-msgstr "Fréquence"
+#: plugins/admin/systems/chooser.tpl:8
+msgid "Linux workstation template"
+msgstr "Modèle de station de travail Linux"
 
-#: plugins/admin/systems/glpi_devices.tpl:649
-msgid "Default frequence"
-msgstr "Fréquence par défaut"
+#: plugins/admin/systems/chooser.tpl:9
+msgid "Linux Server"
+msgstr "Serveur Linux"
 
-#: plugins/admin/systems/glpi_devices.tpl:661
-#, fuzzy
-msgid "Add/Edit motherboard"
-msgstr "Carte mère"
+#: plugins/admin/systems/chooser.tpl:10
+msgid "Windows workstation"
+msgstr "Station de travail Windows"
 
-#: plugins/admin/systems/glpi_devices.tpl:696
-#, fuzzy
-msgid "Chipset"
-msgstr "Puces"
+#: plugins/admin/systems/chooser.tpl:11
+msgid "Network printer"
+msgstr "Imprimante réseau"
 
-#: plugins/admin/systems/glpi_devices.tpl:707
-#, fuzzy
-msgid "Add/Edit computer case"
-msgstr "Boitier"
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
+msgstr "Autre composant réseau"
 
-#: plugins/admin/systems/glpi_devices.tpl:742
-msgid "format"
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
+msgstr "Créer"
+
+#: plugins/admin/systems/class_glpiManufacturer.inc:58
+#, php-format
+msgid ""
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
 msgstr ""
+"Vous ne pouvez pas effacer ce fournisseur, il est utilisé actuellement par ce"
+"(s) système(s) '%s'"
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
-msgid "Attachment"
-msgstr "Document lié"
+#: plugins/admin/systems/class_glpiManufacturer.inc:104
+msgid "Please specify a name."
+msgstr "Veuillez indiquer un nom."
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
-msgid "Filename"
-msgstr "Nom du fichier"
+#: plugins/admin/systems/class_glpiManufacturer.inc:113
+#: plugins/admin/systems/class_glpiManufacturer.inc:119
+msgid "Specified name is already in use, please choose another one."
+msgstr "Le nom indiqué est déjà utilisé, veuillez en choisir un autre."
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
-msgid "Mime-type"
-msgstr "type mime"
+#: plugins/admin/systems/class_phoneGeneric.inc:105
+msgid "This 'dn' has no phone features."
+msgstr "Ce 'dn' n'a pas d'extensions téléphoniques."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:336
-msgid "This zoneName is already in use"
-msgstr "Le nom de la zone spécifiée est déjà utilisé."
+#: plugins/admin/systems/class_phoneGeneric.inc:202
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+msgid "yes"
+msgstr "oui"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:339
-msgid "This reverse zone is already in use"
-msgstr "Le nom de la zone inverse est déjà utilisé."
+#: plugins/admin/systems/class_phoneGeneric.inc:202
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
+msgid "no"
+msgstr "non"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:344
-msgid "Primary dns server must end with '.' to be a valid entry."
-msgstr ""
+#: plugins/admin/systems/class_phoneGeneric.inc:223
+msgid "dynamic"
+msgstr "dynamique"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:348
-msgid "Your specified mail address must end with '.' to be a valid record."
-msgstr ""
+#: plugins/admin/systems/class_phoneGeneric.inc:223
+msgid "Networksettings"
+msgstr "Configuration réseau"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:352
-#: plugins/admin/systems/class_servDNSeditZone.inc:356
+#: plugins/admin/systems/class_phoneGeneric.inc:238
+#, php-format
 msgid ""
-"Your mail address contains '@' replace this with '.' to enable GOsa to "
-"create a valid SOA record."
+"Can't delete because there are user which are depending on this phone. One "
+"of them is user '%s'."
 msgstr ""
+"Impossible d'effacer ce téléphone parce que certains utilisateurs "
+"l'utilisent. Un de ces utilisateur est '%s'."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:360
-msgid "Only lowercase strings are allowed as zone name."
-msgstr "Seule les minuscules sont autorisées dans le nom de la zone."
+#: plugins/admin/systems/class_phoneGeneric.inc:294
+msgid "The required field 'Phone name' is not set."
+msgstr "Le champ obligatoire 'Nom du téléphone' n'est pas rempli."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:364
-msgid "Please specify a numeric value for serial number."
-msgstr "Veuillez entrer un nombre comme numéro de série."
+#: plugins/admin/systems/class_phoneGeneric.inc:297
+msgid "The 'Phone name' '0' is reserved and cannot be used."
+msgstr "Le 'Nom du téléphone' '0' est réservé et ne peut pas être utilisé."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:368
-msgid "Please specify a numeric value for refresh."
-msgstr "Veuillez spécifier un nombre pour le délai de rafraîchissement."
+#: plugins/admin/systems/class_phoneGeneric.inc:304
+msgid "You have no permissions to create a phone on this 'Base'."
+msgstr "Vous n'avez pas l'autorisation de créer un téléphone sur cette 'Base'."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:372
-msgid "Please specify a numeric value for ttl."
-msgstr "Veuillez spécifier un nombre pour la durée du ttl."
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
+msgid "Printer ppd selection."
+msgstr "Sélection du ppd de votre imprimante."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:376
-msgid "Please specify a numeric value for expire."
-msgstr "Veuillez spécifier un nombre pour la durée d'expiration."
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
+msgid "Select entries to add"
+msgstr "Sélectionnez les entrées à ajouter"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:380
-msgid "Please specify a numeric value for retry."
-msgstr "Veuillez spécifier un nombre pour la durée entre chaque essai."
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
+msgid "Display members of department"
+msgstr "Afficher les membres du département"
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
+msgid "Display members matching"
+msgstr "Afficher les membres correspondants"
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
+msgid "Regular expression for matching member names"
+msgstr "Expression régulière concordant avec les noms des membres"
 
 #: plugins/admin/systems/SelectDeviceType.tpl:3
 msgid ""
@@ -9822,61 +10023,22 @@ msgstr "Il n'y a pas de fichier d'aide spécifiée pour cette classe."
 msgid "There is a duplicate entry in '%s' for '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:97
-msgid "Remove FAI repository extension."
-msgstr "Enlever l'extension dépôts FAI."
-
-#: plugins/admin/systems/class_servRepository.inc:98
-msgid ""
-"This server has FAI repository features enabled. You can disable them by "
-"clicking below."
-msgstr ""
-"Ce serveur à l'extension dépôts FAI activée. Vous pouvez la désactiver en "
-"cliquant sur le bouton ci-dessous."
-
-#: plugins/admin/systems/class_servRepository.inc:100
-msgid "Add FAI repository extension."
-msgstr "Ajouter une extension dépôts FAI."
-
-#: plugins/admin/systems/class_servRepository.inc:101
-msgid ""
-"This server has FAI repository features disabled. You can enable them by "
-"clicking below."
-msgstr ""
-"Ce serveur à l'extension dépôts FAI désactivé. Vous pouvez l'activer en "
-"cliquant sur le bouton ci-dessous."
-
-#: plugins/admin/systems/class_servRepository.inc:144
-#, php-format
-msgid ""
-"You can't delete this release, it is still used by these workstations [%s]. "
-"Please solve this dependencies first, to keep data base consistency."
-msgstr ""
-
-#: plugins/admin/systems/class_servRepository.inc:176
-#, fuzzy, php-format
-msgid ""
-"Be careful editing this release, it is still used by these workstations [%s]."
-msgstr ""
-"Vous ne pouvez pas effacer ce périphérique, il est utilisé actuellement par "
-"ces système(s) '%s'"
-
 #: plugins/admin/systems/class_baseSelectDialog.inc:23
 #, fuzzy
 msgid "Choose a base"
 msgstr "Choisissez un nom de classe"
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:33
+#: plugins/admin/systems/class_baseSelectDialog.inc:34
 msgid ""
 "Step in the prefered tree and click save to use the current subtree as base. "
 "Or click the image at the end of each entry."
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:50
+#: plugins/admin/systems/class_baseSelectDialog.inc:51
 msgid "Filter entries with this syntax"
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:114
+#: plugins/admin/systems/class_baseSelectDialog.inc:115
 #, fuzzy, php-format
 msgid "Select this base"
 msgstr "Supprimer ce message"
@@ -9981,52 +10143,6 @@ msgstr ""
 msgid "Select action to execute for this   group of terminals"
 msgstr "Sélectionnez l'opération à exécuter pour ce groupe de terminaux"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
-msgid "Object groups"
-msgstr "Groupes d'objets"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:54
-msgid "UNIX accounts"
-msgstr "Comptes UNIX"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:58 html/getxls.php:149
-#: html/getxls.php:151 html/getxls.php:158 html/getxls.php:179
-#: html/getxls.php:245 html/getxls.php:316
-msgid "Servers"
-msgstr "Serveurs"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:59
-msgid "Thin Clients"
-msgstr "Clients légers"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:60
-msgid "Workstations"
-msgstr "Stations de travail"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:279
-#, php-format
-msgid "You're about to delete the object group '%s'."
-msgstr "Vous êtes sur le point de supprimer le groupe objet '%s'."
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:285
-#: plugins/admin/ogroups/class_ogroupManagement.inc:311
-msgid "You are not allowed to delete this object group!"
-msgstr "Vous n'êtes pas autorisé à supprimer le groupe objet!"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:448
-msgid "Create new object group"
-msgstr "Créer un nouveau groupe d'objets"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:492
-msgid "Name of object groups"
-msgstr "Nom du groupe d'objets"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:541
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
-msgstr "Groupes d'objets"
-
 #: plugins/admin/ogroups/class_ogroup.inc:144
 msgid "This 'dn' is no object group."
 msgstr "Ce 'dn' n'est pas un groupe objet."
@@ -10067,25 +10183,71 @@ msgstr "terminaux"
 msgid "phones"
 msgstr "téléphones"
 
-#: plugins/admin/ogroups/class_ogroup.inc:289
-msgid "printers"
-msgstr "imprimantes"
+#: plugins/admin/ogroups/class_ogroup.inc:289
+msgid "printers"
+msgstr "imprimantes"
+
+#: plugins/admin/ogroups/class_ogroup.inc:296
+msgid "and"
+msgstr "et"
+
+#: plugins/admin/ogroups/class_ogroup.inc:508
+msgid "Non existing dn: "
+msgstr "le dn suivant n'existe pas : "
+
+#: plugins/admin/ogroups/class_ogroup.inc:648
+msgid "There is already an object with this cn."
+msgstr "Il y a déjà un objet avec ce cn."
+
+#: plugins/admin/ogroups/class_ogroup.inc:665
+msgid "You can combine two different object types at maximum only!"
+msgstr "Vous pouvez combiner au maximum deux objets différents !"
+
+#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+msgid "Object groups"
+msgstr "Groupes d'objets"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:54
+msgid "UNIX accounts"
+msgstr "Comptes UNIX"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:58 html/getxls.php:149
+#: html/getxls.php:151 html/getxls.php:158 html/getxls.php:179
+#: html/getxls.php:245 html/getxls.php:316
+msgid "Servers"
+msgstr "Serveurs"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:59
+msgid "Thin Clients"
+msgstr "Clients légers"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:60
+msgid "Workstations"
+msgstr "Stations de travail"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:279
+#, php-format
+msgid "You're about to delete the object group '%s'."
+msgstr "Vous êtes sur le point de supprimer le groupe objet '%s'."
 
-#: plugins/admin/ogroups/class_ogroup.inc:296
-msgid "and"
-msgstr "et"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:285
+#: plugins/admin/ogroups/class_ogroupManagement.inc:311
+msgid "You are not allowed to delete this object group!"
+msgstr "Vous n'êtes pas autorisé à supprimer le groupe objet!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:508
-msgid "Non existing dn: "
-msgstr "le dn suivant n'existe pas : "
+#: plugins/admin/ogroups/class_ogroupManagement.inc:449
+msgid "Create new object group"
+msgstr "Créer un nouveau groupe d'objets"
 
-#: plugins/admin/ogroups/class_ogroup.inc:648
-msgid "There is already an object with this cn."
-msgstr "Il y a déjà un objet avec ce cn."
+#: plugins/admin/ogroups/class_ogroupManagement.inc:493
+msgid "Name of object groups"
+msgstr "Nom du groupe d'objets"
 
-#: plugins/admin/ogroups/class_ogroup.inc:665
-msgid "You can combine two different object types at maximum only!"
-msgstr "Vous pouvez combiner au maximum deux objets différents !"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:542
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
+msgstr "Groupes d'objets"
 
 #: plugins/admin/ogroups/generic.tpl:9
 msgid "Name of the group"
@@ -10409,6 +10571,75 @@ msgstr "Permettre à la personne qui appelle de raccrocher en appuyant sur *"
 msgid "Ring instead of playing background music"
 msgstr "Sonner au lieu de mettre un musique d'ambiance"
 
+#: plugins/gofon/fonreports/class_fonreport.inc:6
+msgid "Phone Reports"
+msgstr "Rapports téléphoniques"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:96
+#: plugins/gofon/fonreports/class_fonreport.inc:106
+msgid "Can't connect to phone database, no reports can be shown!"
+msgstr ""
+"Impossible de se connecter à la base de données des téléphones, aucun "
+"rapport ne peut être affiché!"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:110
+msgid "Can't select phone database for report generation!"
+msgstr ""
+"Impossible de sélectionner la base de données des téléphones pour la "
+"génération de rapports!"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:212
+msgid "Query for phone database failed!"
+msgstr "La requête sur la base de données des téléphones a échoué!"
+
+#: plugins/gofon/fonreports/contents.tpl:31
+msgid "Source"
+msgstr "Emetteur"
+
+#: plugins/gofon/fonreports/contents.tpl:32
+msgid "Destination"
+msgstr "Destinataire"
+
+#: plugins/gofon/fonreports/contents.tpl:33
+msgid "Channel"
+msgstr "Canal"
+
+#: plugins/gofon/fonreports/contents.tpl:36
+msgid "Duration"
+msgstr "Durée"
+
+#: plugins/gofon/fonreports/main.inc:5
+msgid "Phone reports"
+msgstr "Rapports téléphoniques"
+
+#: plugins/gofon/macro/parameter.tpl:3
+msgid "Argument"
+msgstr "Argument"
+
+#: plugins/gofon/macro/parameter.tpl:7
+msgid "type"
+msgstr "type"
+
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+msgid "Macro name"
+msgstr "Nom de la macro"
+
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
+msgstr "Nom d'affichage de la macro"
+
+#: plugins/gofon/macro/generic.tpl:22
+msgid "Choose subtree to place macro in"
+msgstr "Sélectionnez la branche où sera placée la macro"
+
+#: plugins/gofon/macro/generic.tpl:43
+msgid "Visible for user"
+msgstr "Visible pour l'utilisateur"
+
+#: plugins/gofon/macro/generic.tpl:52
+msgid "Macro text"
+msgstr "Texte de la macro"
+
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:25
 msgid "Phone macros"
 msgstr "Macros téléphoniques"
@@ -10423,28 +10654,28 @@ msgstr "Vous êtes sur le point de supprimer la macro '%s'."
 msgid "You are not allowed to delete this macro!"
 msgstr "Vous n'êtes pas autorisé à supprimer cette macro!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
 msgid "Create new phone macro"
 msgstr "Créer une nouvelle macro téléphonique"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
 msgid "Visible"
 msgstr "Visible"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:348
 msgid "This table displays all phone macros, in the selected tree."
 msgstr ""
 "Ce tableau montre toutes les macros téléphoniques, dans l'arbre sélectionné."
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
 msgid "Macro"
 msgstr "Macro"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
 msgid "visible"
 msgstr "visible"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
 msgid "invisible"
 msgstr "invisible"
 
@@ -10534,25 +10765,31 @@ msgstr "La longueur de la macro doit être plus petite que 100 lignes"
 msgid "Please choose a valid  base."
 msgstr "Veuillez choisir une base valide."
 
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
-msgid "Macro name"
-msgstr "Nom de la macro"
+#: plugins/gofon/macro/headpage.tpl:6
+msgid "List of macros"
+msgstr "Liste des macros"
 
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
-msgstr "Nom d'affichage de la macro"
+#: plugins/gofon/macro/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit and remove selected macros. You may want "
+"to use the range selector on top of the macro listbox, when working with a "
+"large number of macros."
+msgstr ""
+"Ce menu permet d'ajouter, de modifier ou de supprimer les macros "
+"sélectionnés. Vous pouvez utiliser les différents filtres lorsque vous "
+"travaillez avec un nombre élevé de macros."
 
-#: plugins/gofon/macro/generic.tpl:22
-msgid "Choose subtree to place macro in"
-msgstr "Sélectionnez la branche où sera placée la macro"
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros matching"
+msgstr "Afficher les macros correspondant à"
 
-#: plugins/gofon/macro/generic.tpl:43
-msgid "Visible for user"
-msgstr "Visible pour l'utilisateur"
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros  matching"
+msgstr "Afficher les macros correspondantes"
 
-#: plugins/gofon/macro/generic.tpl:52
-msgid "Macro text"
-msgstr "Texte de la macro"
+#: plugins/gofon/macro/headpage.tpl:41
+msgid "Regular expression for matching macro names"
+msgstr "Expression régulière correspondant à des noms de macro"
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:245
 msgid "String"
@@ -10599,43 +10836,14 @@ msgstr ""
 "Le nombre de paramètres de la macro à change, vous devez mettre à jour "
 "chaque utilisateur qui utilise la macro '%s'."
 
-#: plugins/gofon/macro/headpage.tpl:6
-msgid "List of macros"
-msgstr "Liste des macros"
-
-#: plugins/gofon/macro/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit and remove selected macros. You may want "
-"to use the range selector on top of the macro listbox, when working with a "
-"large number of macros."
-msgstr ""
-"Ce menu permet d'ajouter, de modifier ou de supprimer les macros "
-"sélectionnés. Vous pouvez utiliser les différents filtres lorsque vous "
-"travaillez avec un nombre élevé de macros."
-
-#: plugins/gofon/macro/headpage.tpl:38
-msgid "Display macros matching"
-msgstr "Afficher les macros correspondant à"
-
-#: plugins/gofon/macro/headpage.tpl:38
-msgid "Display macros  matching"
-msgstr "Afficher les macros correspondantes"
-
-#: plugins/gofon/macro/headpage.tpl:41
-msgid "Regular expression for matching macro names"
-msgstr "Expression régulière correspondant à des noms de macro"
-
 #: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
 msgid "Phone macro management"
 msgstr "Administration des macros téléphoniques"
 
-#: plugins/gofon/macro/parameter.tpl:3
-msgid "Argument"
-msgstr "Argument"
-
-#: plugins/gofon/macro/parameter.tpl:7
-msgid "type"
-msgstr "type"
+#: plugins/gofon/phoneaccount/main.inc:122
+#: plugins/gofon/phoneaccount/paste_generic.tpl:1
+msgid "Phone settings"
+msgstr "Configuration du téléphone"
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:118
 msgid "no macro"
@@ -10764,44 +10972,6 @@ msgstr "Code PIN du téléphone"
 msgid "Phone macro"
 msgstr "Macro téléphoniques"
 
-#: plugins/gofon/phoneaccount/main.inc:122
-#: plugins/gofon/phoneaccount/paste_generic.tpl:1
-msgid "Phone settings"
-msgstr "Configuration du téléphone"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
-msgid "Phone conferences"
-msgstr "Conférences téléphoniques"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-msgid "Management"
-msgstr "Gestion"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
-msgid "Create new conference"
-msgstr "Création d'une nouvelle conférence"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
-msgid "New conference"
-msgstr "Nouvelle conférence"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
-msgid "This table displays all available conference rooms."
-msgstr "Ce tableau montre toutes les salles de conférence disponibles."
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:309
-msgid "Name - Number"
-msgstr "Nom - numéro"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
-#: plugins/gofon/conference/generic.tpl:107
-msgid "PIN"
-msgstr "Code PIN"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:365
-msgid "Conference"
-msgstr "Conférence"
-
 #: plugins/gofon/conference/generic.tpl:13
 msgid "Conference name"
 msgstr "Nom de la conférence"
@@ -10823,6 +10993,11 @@ msgstr "Durée (en jours)"
 msgid "Preset PIN"
 msgstr "Code PIN préselectionné"
 
+#: plugins/gofon/conference/generic.tpl:107
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
+msgid "PIN"
+msgstr "Code PIN"
+
 #: plugins/gofon/conference/generic.tpl:113
 msgid "Record conference"
 msgstr "Enregistrer la conférence"
@@ -10843,9 +11018,55 @@ msgstr "Activer le menu de session"
 msgid "Announce users joining or leaving the conference"
 msgstr "Annoncer les nouveaux utilisateurs et ceux qui quittent"
 
-#: plugins/gofon/conference/generic.tpl:156
-msgid "Count users"
-msgstr "Compter les utilisateurs"
+#: plugins/gofon/conference/generic.tpl:156
+msgid "Count users"
+msgstr "Compter les utilisateurs"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+msgid "Phone conferences"
+msgstr "Conférences téléphoniques"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Management"
+msgstr "Gestion"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
+msgid "Create new conference"
+msgstr "Création d'une nouvelle conférence"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
+msgid "New conference"
+msgstr "Nouvelle conférence"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:306
+msgid "This table displays all available conference rooms."
+msgstr "Ce tableau montre toutes les salles de conférence disponibles."
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
+msgid "Name - Number"
+msgstr "Nom - numéro"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:366
+msgid "Conference"
+msgstr "Conférence"
+
+#: plugins/gofon/conference/headpage.tpl:6
+msgid "List of conference rooms"
+msgstr "Liste des salles de conférence"
+
+#: plugins/gofon/conference/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected phone conferences. "
+"Having a large number of phone conferences, you might prefer the range "
+"selectors on top of the conferences list."
+msgstr ""
+"Ce menu vous permet de d'ajouter, supprimer et éditer les conférences "
+"sélectionnés. Si vous avez un grand nombre de conférences il est conseillé "
+"d'utiliser les filtres."
+
+#: plugins/gofon/conference/headpage.tpl:36
+msgid "Regular expression for        matching user names"
+msgstr "Expression régulière concordant avec les noms des utilisateurs"
 
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
 msgid ""
@@ -10880,69 +11101,10 @@ msgstr ""
 "Impossible de sauver les changement dans votre base de données asterisk, il "
 "n'y a pas d'extension mysql disponible dans votre configuration php."
 
-#: plugins/gofon/conference/headpage.tpl:6
-msgid "List of conference rooms"
-msgstr "Liste des salles de conférence"
-
-#: plugins/gofon/conference/headpage.tpl:24
-msgid ""
-"This menu allows you to create, delete and edit selected phone conferences. "
-"Having a large number of phone conferences, you might prefer the range "
-"selectors on top of the conferences list."
-msgstr ""
-"Ce menu vous permet de d'ajouter, supprimer et éditer les conférences "
-"sélectionnés. Si vous avez un grand nombre de conférences il est conseillé "
-"d'utiliser les filtres."
-
-#: plugins/gofon/conference/headpage.tpl:36
-msgid "Regular expression for        matching user names"
-msgstr "Expression régulière concordant avec les noms des utilisateurs"
-
 #: plugins/gofon/conference/main.inc:38 plugins/gofon/conference/main.inc:40
 msgid "Conference management"
 msgstr "Gestion des conférences"
 
-#: plugins/gofon/fonreports/class_fonreport.inc:6
-msgid "Phone Reports"
-msgstr "Rapports téléphoniques"
-
-#: plugins/gofon/fonreports/class_fonreport.inc:96
-#: plugins/gofon/fonreports/class_fonreport.inc:106
-msgid "Can't connect to phone database, no reports can be shown!"
-msgstr ""
-"Impossible de se connecter à la base de données des téléphones, aucun "
-"rapport ne peut être affiché!"
-
-#: plugins/gofon/fonreports/class_fonreport.inc:110
-msgid "Can't select phone database for report generation!"
-msgstr ""
-"Impossible de sélectionner la base de données des téléphones pour la "
-"génération de rapports!"
-
-#: plugins/gofon/fonreports/class_fonreport.inc:212
-msgid "Query for phone database failed!"
-msgstr "La requête sur la base de données des téléphones a échoué!"
-
-#: plugins/gofon/fonreports/contents.tpl:31
-msgid "Source"
-msgstr "Emetteur"
-
-#: plugins/gofon/fonreports/contents.tpl:32
-msgid "Destination"
-msgstr "Destinataire"
-
-#: plugins/gofon/fonreports/contents.tpl:33
-msgid "Channel"
-msgstr "Canal"
-
-#: plugins/gofon/fonreports/contents.tpl:36
-msgid "Duration"
-msgstr "Durée"
-
-#: plugins/gofon/fonreports/main.inc:5
-msgid "Phone reports"
-msgstr "Rapports téléphoniques"
-
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
 msgstr "Clients légers"
@@ -10987,29 +11149,77 @@ msgstr "L'équipe de GOsa"
 msgid "Welcome %s!"
 msgstr "Bienvenue %s!"
 
-#: include/class_plugin.inc:465
-#, php-format
+#: include/class_mail-methods-cyrus.inc:39
 msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+"Warning: Account has an invalid mailserver string! Please check the mail "
+"server settings in the mail tab."
 msgstr ""
-"La commande '%s', utilisée dans le POSTCREATE de l'extension '%s' n'existe "
-"pas."
+"Attention: Le compte à un chaîne de connexion au serveur de messagerie "
+"invalide! Veuillez vérifier les paramètres du serveur de messagerie dans "
+"l'onglet messagerie."
 
-#: include/class_plugin.inc:493 include/class_password-methods.inc:181
-#, php-format
+#: include/class_mail-methods-cyrus.inc:52
 msgid ""
-"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+"Warning: IMAP Server cannot be reached! If you save this account, some mail "
+"settings will not be stored on your server!"
 msgstr ""
-"La commande '%s', utilisée dans le POSTMODIFY de l'extension '%s' n'existe "
-"pas."
+"Erreur: Impossible de contacter le serveur IMAP. Si vous sauvez ce compte, "
+"certains paramètres ne seront pas stockés sur votre serveur!"
 
-#: include/class_plugin.inc:521
+#: include/class_mail-methods-cyrus.inc:115
 #, php-format
-msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgid "Can't create IMAP mailbox. Server says '%s'."
 msgstr ""
-"La commande '%s', utilisée dans le POSTREMOVE de l'extension '%s' n'existe "
-"pas."
+"Impossible de créer la boite de messagerie IMAP. Le serveur indique '%s'."
+
+#: include/class_mail-methods-cyrus.inc:131
+#, php-format
+msgid "Can't write IMAP quota. Server says '%s'."
+msgstr "Impossible de créer les quotas IMAP. Le serveur indique'%s'."
+
+#: include/class_mail-methods-cyrus.inc:155
+msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
+msgstr ""
+"Erreur: imap_getacl n'est pas implémenté, il est impossible de supprimer les "
+"informations à propos des acls."
+
+#: include/class_mail-methods-cyrus.inc:173
+msgid "Warning: imap_getacl is not available, can't get imap permissions!"
+msgstr ""
+"Erreur: imap_getacl n'est pas disponible, impossible d'obtenir les "
+"permissions imap!"
+
+#: include/class_mail-methods-cyrus.inc:195
+#, php-format
+msgid "Can't remove IMAP mailbox. Server says '%s'."
+msgstr ""
+"Impossible de supprimer les boites de messagerie IMAP. Le serveur répond '%"
+"s'."
+
+#: include/class_mail-methods-cyrus.inc:223
+#, php-format
+msgid "Can't log into SIEVE server. Server says '%s'."
+msgstr "Impossible de se connecter au serveur SIEVE. Le serveur répond '%s'."
+
+#: include/class_mail-methods-cyrus.inc:236
+#, php-format
+msgid "Can't get sieve script. Server says '%s'."
+msgstr "Impossible de récupérer le script sieve. Le serveur répond '%s'."
+
+#: include/class_mail-methods-cyrus.inc:307
+#, php-format
+msgid "Can't send sieve script. Server says '%s'."
+msgstr "Impossible d'envoyer un script à sieve. Le serveur répond '%s'."
+
+#: include/class_mail-methods-cyrus.inc:311
+#, php-format
+msgid "Can't activate GOsa sieve script. Server says '%s'."
+msgstr ""
+"Impossible d'activer les scripts sieve de GOsa. Le serveur répond '%s'."
+
+#: include/class_debconfTemplate.inc:250
+msgid "This package has no debconf options."
+msgstr "Ce paquet n'a pas d'options debconf."
 
 #: include/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
@@ -11503,6 +11713,7 @@ msgstr "Impossible de se connecter au serveur LDAP. Le serveur répond '%s'."
 #: include/functions_setup.inc:1082 html/index.php:181
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
+#: ihtml/themes/lhs/setup_useradmin.tpl:6
 msgid ""
 "You're missing an administrative account for GOsa, you'll not be able to "
 "administrate anything!"
@@ -11517,6 +11728,14 @@ msgstr ""
 "La modification a échoué du mot de passe à échoué. Le serveur LDAP répond '%"
 "s'."
 
+#: include/class_password-methods.inc:181 include/class_plugin.inc:493
+#, php-format
+msgid ""
+"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+msgstr ""
+"La commande '%s', utilisée dans le POSTMODIFY de l'extension '%s' n'existe "
+"pas."
+
 #: include/class_password-methods.inc:202
 msgid ""
 "Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
@@ -11557,22 +11776,6 @@ msgstr "%s résultats de votre recherche avec le mot %s interprété comme %s"
 msgid "%s%% hit rate in file %s"
 msgstr "%s%% trouvés dans le fichier %s"
 
-#: include/class_password-methods-kerberos.inc:43
-msgid ""
-"Warning: Can't set kerberos password. Your PHP version has no kerberos "
-"support, password has not been changed."
-msgstr ""
-"Attention : Impossible de modifier les mots de passe kerberos. Votre version "
-"de PHP n'a pas le support de kerberos. Votre mot de passe reste inchangé."
-
-#: include/class_password-methods-kerberos.inc:52
-msgid "Kerberos database communication failed!"
-msgstr "La connexion avec Kerberos a échoué!"
-
-#: include/class_password-methods-kerberos.inc:59
-msgid "Changing password in kerberos database failed!"
-msgstr "La modification du mot de passe dans la base Kerberos a échoué!"
-
 #: include/class_ppdManager.inc:13
 #, php-format
 msgid "PPD manager : The specified path '%s' doesn't exists."
@@ -11612,6 +11815,22 @@ msgstr "La sélection multiple n'est pas encore supportée!"
 msgid "Parsing PPD file %s failed - no information found."
 msgstr "La lecture du fichier PPD %s à échoué - pas de données."
 
+#: include/class_password-methods-kerberos.inc:43
+msgid ""
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
+msgstr ""
+"Attention : Impossible de modifier les mots de passe kerberos. Votre version "
+"de PHP n'a pas le support de kerberos. Votre mot de passe reste inchangé."
+
+#: include/class_password-methods-kerberos.inc:52
+msgid "Kerberos database communication failed!"
+msgstr "La connexion avec Kerberos a échoué!"
+
+#: include/class_password-methods-kerberos.inc:59
+msgid "Changing password in kerberos database failed!"
+msgstr "La modification du mot de passe dans la base Kerberos a échoué!"
+
 #: include/class_certificate.inc:35
 msgid "Can't open specified file, check accessibility and or existence"
 msgstr ""
@@ -11820,6 +12039,7 @@ msgstr ""
 #: include/class_pluglist.inc:130 ihtml/themes/altlinux/framework.tpl:14
 #: ihtml/themes/altlinux/framework.tpl:24
 #: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
+#: ihtml/themes/lhs/framework.tpl:14 ihtml/themes/lhs/framework.tpl:24
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
 "changes?"
@@ -11842,27 +12062,27 @@ msgstr ""
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr "SID et/ou RIDBASE absents du fichier de configuration!"
 
-#: include/class_ldap.inc:406
+#: include/class_ldap.inc:405
 #, fuzzy, php-format
-msgid "Creating duplicate of %s in %s"
+msgid "Creating copy of %s"
 msgstr "Liste des utilisateurs de %s on %s"
 
-#: include/class_ldap.inc:409
+#: include/class_ldap.inc:408
 #, fuzzy
 msgid "Processing"
 msgstr "Processeur"
 
-#: include/class_ldap.inc:515
+#: include/class_ldap.inc:448
+#, fuzzy
+msgid "Error while fetching source dn - aborted!"
+msgstr "Une erreur s'est produite lors de la sauvegarde de l'imprimante"
+
+#: include/class_ldap.inc:511
 #, php-format
 msgid "Unknown FAIstate %s"
 msgstr "Statut FAI inconnu %s"
 
-#: include/class_ldap.inc:558
-#, fuzzy
-msgid "Successfully finished"
-msgstr "Configuration terminée"
-
-#: include/class_ldap.inc:635
+#: include/class_ldap.inc:632
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -11871,7 +12091,7 @@ msgstr ""
 "La création automatique du type '%s' n'est pas supportée. Veuillez faire un "
 "rapport à l'équipe de GOsa."
 
-#: include/class_ldap.inc:897
+#: include/class_ldap.inc:894
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -11880,95 +12100,50 @@ msgstr ""
 "Ceci n'est pas un DN valide: '%s'. Le fichier d'importation doit commencer "
 "avec 'dn: ...' à la ligne %s"
 
-#: include/class_ldap.inc:910
+#: include/class_ldap.inc:907
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr "Le dn : '%s' (de la ligne %s) existe déjà dans l'arbre LDAP."
 
-#: include/class_ldap.inc:926
+#: include/class_ldap.inc:923
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
-msgstr ""
-"Erreur lors de l'importation du dn: '%s', veuillez vérifier votre fichier "
-"votre fichier LDIF à partir de la ligne %s!"
-
-#: include/class_debconfTemplate.inc:250
-msgid "This package has no debconf options."
-msgstr "Ce paquet n'a pas d'options debconf."
-
-#: include/class_mail-methods-cyrus.inc:39
-msgid ""
-"Warning: Account has an invalid mailserver string! Please check the mail "
-"server settings in the mail tab."
-msgstr ""
-"Attention: Le compte à un chaîne de connexion au serveur de messagerie "
-"invalide! Veuillez vérifier les paramètres du serveur de messagerie dans "
-"l'onglet messagerie."
-
-#: include/class_mail-methods-cyrus.inc:52
-msgid ""
-"Warning: IMAP Server cannot be reached! If you save this account, some mail "
-"settings will not be stored on your server!"
-msgstr ""
-"Erreur: Impossible de contacter le serveur IMAP. Si vous sauvez ce compte, "
-"certains paramètres ne seront pas stockés sur votre serveur!"
-
-#: include/class_mail-methods-cyrus.inc:115
-#, php-format
-msgid "Can't create IMAP mailbox. Server says '%s'."
-msgstr ""
-"Impossible de créer la boite de messagerie IMAP. Le serveur indique '%s'."
-
-#: include/class_mail-methods-cyrus.inc:131
-#, php-format
-msgid "Can't write IMAP quota. Server says '%s'."
-msgstr "Impossible de créer les quotas IMAP. Le serveur indique'%s'."
-
-#: include/class_mail-methods-cyrus.inc:155
-msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
-msgstr ""
-"Erreur: imap_getacl n'est pas implémenté, il est impossible de supprimer les "
-"informations à propos des acls."
-
-#: include/class_mail-methods-cyrus.inc:173
-msgid "Warning: imap_getacl is not available, can't get imap permissions!"
-msgstr ""
-"Erreur: imap_getacl n'est pas disponible, impossible d'obtenir les "
-"permissions imap!"
-
-#: include/class_mail-methods-cyrus.inc:195
-#, php-format
-msgid "Can't remove IMAP mailbox. Server says '%s'."
-msgstr ""
-"Impossible de supprimer les boites de messagerie IMAP. Le serveur répond '%"
-"s'."
-
-#: include/class_mail-methods-cyrus.inc:223
-#, php-format
-msgid "Can't log into SIEVE server. Server says '%s'."
-msgstr "Impossible de se connecter au serveur SIEVE. Le serveur répond '%s'."
-
-#: include/class_mail-methods-cyrus.inc:236
-#, php-format
-msgid "Can't get sieve script. Server says '%s'."
-msgstr "Impossible de récupérer le script sieve. Le serveur répond '%s'."
+msgstr ""
+"Erreur lors de l'importation du dn: '%s', veuillez vérifier votre fichier "
+"votre fichier LDIF à partir de la ligne %s!"
 
-#: include/class_mail-methods-cyrus.inc:307
+#: include/class_plugin.inc:465
 #, php-format
-msgid "Can't send sieve script. Server says '%s'."
-msgstr "Impossible d'envoyer un script à sieve. Le serveur répond '%s'."
+msgid ""
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+msgstr ""
+"La commande '%s', utilisée dans le POSTCREATE de l'extension '%s' n'existe "
+"pas."
 
-#: include/class_mail-methods-cyrus.inc:311
+#: include/class_plugin.inc:521
 #, php-format
-msgid "Can't activate GOsa sieve script. Server says '%s'."
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
-"Impossible d'activer les scripts sieve de GOsa. Le serveur répond '%s'."
+"La commande '%s', utilisée dans le POSTREMOVE de l'extension '%s' n'existe "
+"pas."
 
 #: include/class_CopyPasteHandler.inc:172
 #, fuzzy, php-format
 msgid "You are going to copy the entry '%s'."
 msgstr "Vous êtes sur le point de supprimer l'entrée %s."
 
+#: html/helpviewer.php:116
+msgid "There is no helpfile specified for this class."
+msgstr "Il n'y a pas de fichier d'aide spécifiée pour cette classe."
+
+#: html/helpviewer.php:226
+#, php-format
+msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
+msgstr ""
+"Le répertoire d'aide '%s' n'est pas accessible, impossible de lire les "
+"fichiers d'aide."
+
 #: html/getvcard.php:36
 msgid "Error: getcvard.php needs a parameter to export a vcard!"
 msgstr ""
@@ -12140,17 +12315,6 @@ msgid ""
 "page before logging in!"
 msgstr ""
 
-#: html/helpviewer.php:116
-msgid "There is no helpfile specified for this class."
-msgstr "Il n'y a pas de fichier d'aide spécifiée pour cette classe."
-
-#: html/helpviewer.php:226
-#, php-format
-msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
-msgstr ""
-"Le répertoire d'aide '%s' n'est pas accessible, impossible de lire les "
-"fichiers d'aide."
-
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
 msgstr "Impossible de se connecter au serveur de base de données!"
@@ -12163,6 +12327,16 @@ msgstr "Impossible de sélectionner la base de données!"
 msgid "Database query failed!"
 msgstr "Echec des requêtes sur la base de données!"
 
+#: html/getkiosk.php:25
+#, php-format
+msgid "Can't open file '%s', possibly the file does not exist."
+msgstr "Impossible d'ouvrir '%s', le fichier n'existe probablement pas."
+
+#: html/getkiosk.php:30
+#, php-format
+msgid "Can't read file '%s', check permissions."
+msgstr "Impossible de lire le fichier '%s', vérifiez les permissions"
+
 #: html/main.php:151
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
@@ -12190,16 +12364,6 @@ msgstr ""
 "La création de cette page à occasionné des erreurs d'après le vérificateur "
 "du W3C!"
 
-#: html/getkiosk.php:25
-#, php-format
-msgid "Can't open file '%s', possibly the file does not exist."
-msgstr "Impossible d'ouvrir '%s', le fichier n'existe probablement pas."
-
-#: html/getkiosk.php:30
-#, php-format
-msgid "Can't read file '%s', check permissions."
-msgstr "Impossible de lire le fichier '%s', vérifiez les permissions"
-
 #: html/get_attachment.php:47
 msgid ""
 "Can't connect to glpi database, there is no mysl extension available in your "
@@ -12226,11 +12390,49 @@ msgstr ""
 msgid "Can't open file '%s'."
 msgstr "Impossible de lire le fichier '%s'."
 
+#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
+#: ihtml/themes/lhs/sizelimit.tpl:3
+msgid ""
+"The size limit option makes LDAP operations faster and saves the LDAP server "
+"from getting too much load. The easiest way to handle big databases without "
+"long timeouts would be to limit your search to smaller values and use "
+"filters to get the entries you are looking for."
+msgstr ""
+"L'option size limit rend les opérations LDAP plus rapides et permet au "
+"serveur LDAP d'avoir un niveau de charge plus léger. La façon la plus facile "
+"de gérer des grandes bases de données sans de longs temps d'attentes, serait "
+"de limiter la recherche à des valeurs plus petites et d'utiliser les filtres "
+"pour obtenir les valeurs que vous recherchez."
+
+#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
+#: ihtml/themes/lhs/sizelimit.tpl:6
+msgid "Please choose the way to react for this session"
+msgstr "Veuillez choisir la façon de réagir pour cette session"
+
+#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
+#: ihtml/themes/lhs/sizelimit.tpl:9
+msgid "ignore this error and show all entries the LDAP server returns"
+msgstr ""
+"ignorer cette erreur et montrer toutes les entrées retournées par le serveur "
+"LDAP"
+
+#: ihtml/themes/altlinux/sizelimit.tpl:10
+#: ihtml/themes/default/sizelimit.tpl:10 ihtml/themes/lhs/sizelimit.tpl:10
+msgid ""
+"ignore this error and show all entries that fit into the defined sizelimit "
+"and let me use filters instead"
+msgstr ""
+"ignorer cette erreur et montrer toutes les entrées qui sont récupérées grâce "
+"au paramètre sizelimit défini et laissez moi utiliser les filtres pour "
+"restreindre les données a visualiser"
+
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
+#: ihtml/themes/lhs/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr "Conflit détecté entre différentes sessions"
 
 #: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/default/conflict.tpl:6
+#: ihtml/themes/lhs/conflict.tpl:6
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
@@ -12243,6 +12445,7 @@ msgstr ""
 "possible. Cliquer sur le bouton <b>Déconnexion</b> fermera cette session."
 
 #: ihtml/themes/altlinux/conflict.tpl:10 ihtml/themes/default/conflict.tpl:10
+#: ihtml/themes/lhs/conflict.tpl:10
 msgid ""
 "Ignoring this message will change/destroy the data you're currently editing, "
 "so please close multiple windows and log in again."
@@ -12252,11 +12455,36 @@ msgstr ""
 "de se reconnecter."
 
 #: ihtml/themes/altlinux/conflict.tpl:14 ihtml/themes/default/conflict.tpl:14
+#: ihtml/themes/lhs/conflict.tpl:14
 msgid "Logout"
 msgstr "Déconnexion"
 
+#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
+#: ihtml/themes/lhs/login.tpl:17
+msgid "Please use your <i>username</i> and <i>password</i> to log in"
+msgstr ""
+"Veuillez utiliser votre <i>nom d'utilisateur</i> et votre <i>mot de passe</"
+"i> afin de vous connecter"
+
+#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
+#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
+#: ihtml/themes/lhs/login.tpl:46 ihtml/themes/lhs/login.tpl:49
+msgid "Directory"
+msgstr "Répertoire"
+
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:57
+#: ihtml/themes/lhs/login.tpl:57
+msgid "Sign in"
+msgstr "Connexion"
+
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:58
+#: ihtml/themes/lhs/login.tpl:58
+msgid "Click here to log in"
+msgstr "Cliquez ici pour vous connecter"
+
 #: ihtml/themes/altlinux/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
+#: ihtml/themes/lhs/setup_introduction.tpl:1
 msgid "Welcome to the GOsa setup!"
 msgstr "Bienvenue dans le menu de configuration de GOsa!"
 
@@ -12278,11 +12506,13 @@ msgstr ""
 
 #: ihtml/themes/altlinux/setup_useradmin.tpl:3
 #: ihtml/themes/default/setup_useradmin.tpl:3
+#: ihtml/themes/lhs/setup_useradmin.tpl:3
 msgid "You already have an Administrative Account and a Group."
 msgstr "Vous avez déjà un compte Administrateur et un groupe."
 
 #: ihtml/themes/altlinux/setup_useradmin.tpl:10
 #: ihtml/themes/default/setup_useradmin.tpl:10
+#: ihtml/themes/lhs/setup_useradmin.tpl:10
 msgid ""
 "To provide full administrative access to GOsa, you need to create a special "
 "group which contains the administrative user. The setup program can assist "
@@ -12294,104 +12524,38 @@ msgstr ""
 "d'installation peut vous aider à réaliser cela. Entrer le nom désiré et le "
 "mot de passe ci dessous pour créer les entrées manquantes."
 
-#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
-msgid "Please use your <i>username</i> and <i>password</i> to log in"
-msgstr ""
-"Veuillez utiliser votre <i>nom d'utilisateur</i> et votre <i>mot de passe</"
-"i> afin de vous connecter"
-
-#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
-#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
-msgid "Directory"
-msgstr "Répertoire"
-
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:57
-msgid "Sign in"
-msgstr "Connexion"
-
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:58
-msgid "Click here to log in"
-msgstr "Cliquez ici pour vous connecter"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
-msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
-"filters to get the entries you are looking for."
-msgstr ""
-"L'option size limit rend les opérations LDAP plus rapides et permet au "
-"serveur LDAP d'avoir un niveau de charge plus léger. La façon la plus facile "
-"de gérer des grandes bases de données sans de longs temps d'attentes, serait "
-"de limiter la recherche à des valeurs plus petites et d'utiliser les filtres "
-"pour obtenir les valeurs que vous recherchez."
-
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
-msgid "Please choose the way to react for this session"
-msgstr "Veuillez choisir la façon de réagir pour cette session"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
-msgid "ignore this error and show all entries the LDAP server returns"
-msgstr ""
-"ignorer cette erreur et montrer toutes les entrées retournées par le serveur "
-"LDAP"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:10
-#: ihtml/themes/default/sizelimit.tpl:10
-msgid ""
-"ignore this error and show all entries that fit into the defined sizelimit "
-"and let me use filters instead"
-msgstr ""
-"ignorer cette erreur et montrer toutes les entrées qui sont récupérées grâce "
-"au paramètre sizelimit défini et laissez moi utiliser les filtres pour "
-"restreindre les données a visualiser"
-
 #: ihtml/themes/altlinux/framework.tpl:15
-#: ihtml/themes/default/framework.tpl:15
+#: ihtml/themes/default/framework.tpl:15 ihtml/themes/lhs/framework.tpl:15
 msgid "Main"
 msgstr "Accueil"
 
 #: ihtml/themes/altlinux/framework.tpl:20
-#: ihtml/themes/default/framework.tpl:20
+#: ihtml/themes/default/framework.tpl:20 ihtml/themes/lhs/framework.tpl:20
 msgid "Help"
 msgstr "Aide"
 
 #: ihtml/themes/altlinux/framework.tpl:25
-#: ihtml/themes/default/framework.tpl:25
+#: ihtml/themes/default/framework.tpl:25 ihtml/themes/lhs/framework.tpl:25
 msgid "Sign out"
 msgstr "Déconnexion"
 
 #: ihtml/themes/altlinux/framework.tpl:33
-#: ihtml/themes/default/framework.tpl:33
+#: ihtml/themes/default/framework.tpl:33 ihtml/themes/lhs/framework.tpl:33
 msgid "Signed in:"
 msgstr "Connecté:"
 
-#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
-msgid "Locking conflict detected"
-msgstr "Conflit de verrou détecté"
-
-#: ihtml/themes/altlinux/islocked.tpl:9
-msgid ""
-"If this lock detection is false, the other person has obviously closed the "
-"webbrowser during the edit operation. You may delete the lockfile in this "
-"case by pressing the <i>Remove</i> button."
-msgstr ""
-"Si la détection de ce verrou est fausse, une autre personne a manifestement "
-"fermé la fenêtre de son navigateur durant une opération de modification "
-"d'une entrée. Dans ce cas, vous pouvez supprimez le verrou en cliquant sur "
-"le bouton <i>Remove</i>."
-
 #: ihtml/themes/altlinux/setup_step2.tpl:1
 #: ihtml/themes/altlinux/setup_step3.tpl:1
 #: ihtml/themes/altlinux/setup_step4.tpl:1
 #: ihtml/themes/default/setup_step2.tpl:1
 #: ihtml/themes/default/setup_step3.tpl:1
-#: ihtml/themes/default/setup_step4.tpl:1
+#: ihtml/themes/default/setup_step4.tpl:1 ihtml/themes/lhs/setup_step2.tpl:1
+#: ihtml/themes/lhs/setup_step3.tpl:1 ihtml/themes/lhs/setup_step4.tpl:1
 msgid "Setup continued..."
 msgstr "Suite de la configuration..."
 
 #: ihtml/themes/altlinux/setup_step2.tpl:4
-#: ihtml/themes/default/setup_step2.tpl:4
+#: ihtml/themes/default/setup_step2.tpl:4 ihtml/themes/lhs/setup_step2.tpl:4
 msgid ""
 "Step two looks for a set of helper programms and checks if they have the "
 "correct minimum version."
@@ -12399,8 +12563,24 @@ msgstr ""
 "La seconde étape vérifie la présence de programmes complémentaires ainsi que "
 "la version minimale nécessaire."
 
+#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
+#: ihtml/themes/lhs/islocked.tpl:2
+msgid "Locking conflict detected"
+msgstr "Conflit de verrou détecté"
+
+#: ihtml/themes/altlinux/islocked.tpl:9 ihtml/themes/lhs/islocked.tpl:9
+msgid ""
+"If this lock detection is false, the other person has obviously closed the "
+"webbrowser during the edit operation. You may delete the lockfile in this "
+"case by pressing the <i>Remove</i> button."
+msgstr ""
+"Si la détection de ce verrou est fausse, une autre personne a manifestement "
+"fermé la fenêtre de son navigateur durant une opération de modification "
+"d'une entrée. Dans ce cas, vous pouvez supprimez le verrou en cliquant sur "
+"le bouton <i>Remove</i>."
+
 #: ihtml/themes/altlinux/setup_step3.tpl:4
-#: ihtml/themes/default/setup_step3.tpl:4
+#: ihtml/themes/default/setup_step3.tpl:4 ihtml/themes/lhs/setup_step3.tpl:4
 msgid ""
 "Now we're going include your LDAP server and create an initial "
 "configuration. After you've entered the server URI below, a quick check is "
@@ -12415,7 +12595,7 @@ msgstr ""
 "de nom seront demandés ultérieurement."
 
 #: ihtml/themes/altlinux/setup_step3.tpl:10
-#: ihtml/themes/default/setup_step3.tpl:10
+#: ihtml/themes/default/setup_step3.tpl:10 ihtml/themes/lhs/setup_step3.tpl:10
 msgid ""
 "Please enter the server URI to allow the setup to connect your LDAP server "
 "<i>(Example: ldap://your.server:389).</i>"
@@ -12424,7 +12604,7 @@ msgstr ""
 "connecter a votre serveur LDAP <i>(Example: ldap://your.server:389).</i>"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:2
-#: ihtml/themes/default/setup_step4.tpl:2
+#: ihtml/themes/default/setup_step4.tpl:2 ihtml/themes/lhs/setup_step4.tpl:2
 msgid ""
 "The following fields allow the basic configuration of GOsa's behaviour and "
 "affect various properties in your main configuration."
@@ -12434,17 +12614,17 @@ msgstr ""
 "propriétés de votre configuration."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:7
-#: ihtml/themes/default/setup_step4.tpl:7
+#: ihtml/themes/default/setup_step4.tpl:7 ihtml/themes/lhs/setup_step4.tpl:7
 msgid "Enter a description for the location you're configuring here"
 msgstr "Entrez une description de l'emplacement que vous configurez"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:11
-#: ihtml/themes/default/setup_step4.tpl:11
+#: ihtml/themes/default/setup_step4.tpl:11 ihtml/themes/lhs/setup_step4.tpl:11
 msgid "Location name"
 msgstr "Nom de l'emplacement"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:18
-#: ihtml/themes/default/setup_step4.tpl:18
+#: ihtml/themes/default/setup_step4.tpl:18 ihtml/themes/lhs/setup_step4.tpl:18
 msgid ""
 "GOsa always acts as admin and manages access rights internally. This is a "
 "workaround till OpenLDAP's in directory ACI's are fully implemented. For "
@@ -12456,17 +12636,17 @@ msgstr ""
 "l'administrateur et son mot de passe."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:23
-#: ihtml/themes/default/setup_step4.tpl:23
+#: ihtml/themes/default/setup_step4.tpl:23 ihtml/themes/lhs/setup_step4.tpl:23
 msgid "Admin DN"
 msgstr "DN de l'administrateur"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:27
-#: ihtml/themes/default/setup_step4.tpl:27
+#: ihtml/themes/default/setup_step4.tpl:27 ihtml/themes/lhs/setup_step4.tpl:27
 msgid "Admin password"
 msgstr "Mot de passe administrateur"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:34
-#: ihtml/themes/default/setup_step4.tpl:34
+#: ihtml/themes/default/setup_step4.tpl:34 ihtml/themes/lhs/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
 "saves people and groups, including the way accounts get created. Check the "
@@ -12478,32 +12658,32 @@ msgstr ""
 "afin quelles correspondent à vos besoins."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:39
-#: ihtml/themes/default/setup_step4.tpl:39
+#: ihtml/themes/default/setup_step4.tpl:39 ihtml/themes/lhs/setup_step4.tpl:39
 msgid "Base "
 msgstr "Base"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:43
-#: ihtml/themes/default/setup_step4.tpl:43
+#: ihtml/themes/default/setup_step4.tpl:43 ihtml/themes/lhs/setup_step4.tpl:43
 msgid "People storage ou"
 msgstr "Branches de l'arbre ldap ou sont stockes les utilisateurs"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:47
-#: ihtml/themes/default/setup_step4.tpl:47
+#: ihtml/themes/default/setup_step4.tpl:47 ihtml/themes/lhs/setup_step4.tpl:47
 msgid "People dn attribute"
 msgstr "Type d'attribut pour le DN des utilisateurs"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:55
-#: ihtml/themes/default/setup_step4.tpl:55
+#: ihtml/themes/default/setup_step4.tpl:55 ihtml/themes/lhs/setup_step4.tpl:55
 msgid "Group storage ou"
 msgstr "Branches de l'arbre ldap ou sont stockes les groupes"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:59
-#: ihtml/themes/default/setup_step4.tpl:59
+#: ihtml/themes/default/setup_step4.tpl:59 ihtml/themes/lhs/setup_step4.tpl:59
 msgid "ID base for users/groups"
 msgstr "ID de départ pour les utilisateurs/groupes"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:67
-#: ihtml/themes/default/setup_step4.tpl:67
+#: ihtml/themes/default/setup_step4.tpl:67 ihtml/themes/lhs/setup_step4.tpl:67
 msgid ""
 "GOsa supports several encryption types for your passwords. Normally this is "
 "adjustable via user templates, but you can specify a default method to be "
@@ -12514,12 +12694,12 @@ msgstr ""
 "pouvez spécifier ici une méthode qui sera utilisée par défaut."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:72
-#: ihtml/themes/default/setup_step4.tpl:72
+#: ihtml/themes/default/setup_step4.tpl:72 ihtml/themes/lhs/setup_step4.tpl:72
 msgid "Encryption algorithm"
 msgstr "Algorithme de cryptage"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:83
-#: ihtml/themes/default/setup_step4.tpl:83
+#: ihtml/themes/default/setup_step4.tpl:83 ihtml/themes/lhs/setup_step4.tpl:83
 msgid ""
 "GOsa has modular support for several mail methods. These methods provide "
 "interfaces to users mailboxes and general handling for quotas. You can "
@@ -12531,7 +12711,7 @@ msgstr ""
 "que GOsa ne touche a rien."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:88
-#: ihtml/themes/default/setup_step4.tpl:88
+#: ihtml/themes/default/setup_step4.tpl:88 ihtml/themes/lhs/setup_step4.tpl:88
 msgid "Mail method"
 msgstr "Méthode de messagerie"
 
@@ -12547,31 +12727,35 @@ msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:103
 #: ihtml/themes/default/setup_step4.tpl:104
+#: ihtml/themes/lhs/setup_step4.tpl:104
 msgid "Display PHP errors"
 msgstr "Afficher les erreurs PHP"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:106
 #: ihtml/themes/default/setup_step4.tpl:107
+#: ihtml/themes/lhs/setup_step4.tpl:107
 msgid "true"
 msgstr "vrai"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:107
 #: ihtml/themes/default/setup_step4.tpl:108
+#: ihtml/themes/lhs/setup_step4.tpl:108
 msgid "false"
 msgstr "faux"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:115
 #: ihtml/themes/default/setup_step4.tpl:115
+#: ihtml/themes/lhs/setup_step4.tpl:115
 msgid "Check"
 msgstr "Vérification"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:1
-#: ihtml/themes/default/setup_finish.tpl:1
+#: ihtml/themes/default/setup_finish.tpl:1 ihtml/themes/lhs/setup_finish.tpl:1
 msgid "Setup finished"
 msgstr "Configuration terminée"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:3
-#: ihtml/themes/default/setup_finish.tpl:3
+#: ihtml/themes/default/setup_finish.tpl:3 ihtml/themes/lhs/setup_finish.tpl:3
 msgid ""
 "Basically the setup is finished. You can check the result of the schema "
 "check here and download the autogenerated gosa.conf below."
@@ -12580,17 +12764,19 @@ msgstr ""
 "schémas ici et télécharger le fichier de configuration gosa.conf ci dessous."
 
 #: ihtml/themes/altlinux/setup_finish.tpl:7
-#: ihtml/themes/default/setup_finish.tpl:7
+#: ihtml/themes/default/setup_finish.tpl:7 ihtml/themes/lhs/setup_finish.tpl:7
 msgid "Schema Configuration"
 msgstr "Configuration des schémas"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:12
 #: ihtml/themes/default/setup_finish.tpl:12
+#: ihtml/themes/lhs/setup_finish.tpl:12
 msgid "Configuration File"
 msgstr "Fichier de configuration"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:14
 #: ihtml/themes/default/setup_finish.tpl:14
+#: ihtml/themes/lhs/setup_finish.tpl:14
 msgid ""
 "GOsa setup has collected all data needed to create an initial configuration "
 "file. Save the the link below as your gosa.conf and place that file in /etc/"
@@ -12602,11 +12788,13 @@ msgstr ""
 
 #: ihtml/themes/altlinux/setup_finish.tpl:17
 #: ihtml/themes/default/setup_finish.tpl:17
+#: ihtml/themes/lhs/setup_finish.tpl:17
 msgid "Download configuration"
 msgstr "Télécharger la configuration"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:20
 #: ihtml/themes/default/setup_finish.tpl:20
+#: ihtml/themes/lhs/setup_finish.tpl:20
 msgid ""
 "After placing the file under /etc/gosa, place make sure that the webserver "
 "user is able to read gosa.conf, while other users shouldn't. You may want to "
@@ -12616,7 +12804,16 @@ msgstr ""
 "seul le serveur web puisse lire gosa.conf. Vous pouvez exécuter les "
 "commandes suivantes pour réaliser cette opération:"
 
+#: ihtml/themes/default/help.tpl:9 ihtml/themes/lhs/help.tpl:9
+msgid "GOsa help viewer"
+msgstr "Aide en ligne de GOsa"
+
+#: ihtml/themes/default/help.tpl:15 ihtml/themes/lhs/help.tpl:15
+msgid "Index"
+msgstr "Index"
+
 #: ihtml/themes/default/setup_introduction.tpl:4
+#: ihtml/themes/lhs/setup_introduction.tpl:4
 msgid ""
 "It looks like you're calling GOsa for the first time - no configuration was "
 "found. This setup like script will try to aid you in creating a working "
@@ -12633,6 +12830,7 @@ msgstr ""
 "LDAP."
 
 #: ihtml/themes/default/setup_introduction.tpl:17
+#: ihtml/themes/lhs/setup_introduction.tpl:17
 msgid ""
 "You can also use the new and more-advanced way of inspecting your PHP-"
 "installation. It will give you information about the exact function that "
@@ -12645,16 +12843,27 @@ msgstr ""
 "mentionnées). Ceci est utile si vous savez ce que vous faites."
 
 #: ihtml/themes/default/setup_introduction.tpl:19
+#: ihtml/themes/lhs/setup_introduction.tpl:19
 msgid "Toggle Show/Hide"
 msgstr "Voir/Cacher"
 
-#: ihtml/themes/default/help.tpl:9
-msgid "GOsa help viewer"
-msgstr "Aide en ligne de GOsa"
+#: ihtml/themes/default/logout.tpl:5 ihtml/themes/lhs/logout.tpl:5
+msgid "Your GOsa session has expired!"
+msgstr "Votre session GOsa à expiré!"
 
-#: ihtml/themes/default/help.tpl:15
-msgid "Index"
-msgstr "Index"
+#: ihtml/themes/default/logout.tpl:7 ihtml/themes/lhs/logout.tpl:7
+msgid ""
+"The last interaction with the GOsa web interface has been some time ago in "
+"the past. For security reasons, the session has been closed. To continue "
+"with administrative tasks, please sign in again."
+msgstr ""
+"Votre dernière interaction avec GOsa était il y a un certain temps. Pour des "
+"raisons de sécurité, la session à été fermée. Pour continuer à administrer, "
+"veuillez vous reconnecter."
+
+#: ihtml/themes/default/logout.tpl:10 ihtml/themes/lhs/logout.tpl:10
+msgid "Sign in again"
+msgstr "Reconnexion"
 
 #: ihtml/themes/default/islocked.tpl:9
 #, fuzzy
@@ -12673,33 +12882,6 @@ msgstr ""
 msgid "Edit anyway"
 msgstr "Modifier une entrée"
 
-#: ihtml/themes/default/setup_step4.tpl:100
-msgid ""
-"GOsa may cause PHP interpreter errors, particularly in case of Beta "
-"versions. In some cases it would be helpful to enable the error reporting."
-msgstr ""
-"GOsa peut provoquer des erreurs PHP, particulièrement dans le cas des "
-"versions Beta. Dans certains cas il peut être intéressant d'activer "
-"l'affichage des erreurs."
-
-#: ihtml/themes/default/logout.tpl:5
-msgid "Your GOsa session has expired!"
-msgstr "Votre session GOsa à expiré!"
-
-#: ihtml/themes/default/logout.tpl:7
-msgid ""
-"The last interaction with the GOsa web interface has been some time ago in "
-"the past. For security reasons, the session has been closed. To continue "
-"with administrative tasks, please sign in again."
-msgstr ""
-"Votre dernière interaction avec GOsa était il y a un certain temps. Pour des "
-"raisons de sécurité, la session à été fermée. Pour continuer à administrer, "
-"veuillez vous reconnecter."
-
-#: ihtml/themes/default/logout.tpl:10
-msgid "Sign in again"
-msgstr "Reconnexion"
-
 #: ihtml/themes/default/copyPasteDialog.tpl:1
 msgid "Copy &amp; paste wizard"
 msgstr ""
@@ -12716,6 +12898,34 @@ msgstr ""
 msgid "Operation complete"
 msgstr "incomplet"
 
+#: ihtml/themes/default/setup_step4.tpl:100
+#: ihtml/themes/lhs/setup_step4.tpl:100
+msgid ""
+"GOsa may cause PHP interpreter errors, particularly in case of Beta "
+"versions. In some cases it would be helpful to enable the error reporting."
+msgstr ""
+"GOsa peut provoquer des erreurs PHP, particulièrement dans le cas des "
+"versions Beta. Dans certains cas il peut être intéressant d'activer "
+"l'affichage des erreurs."
+
+#, fuzzy
+#~ msgid "DFS shares"
+#~ msgstr "Partages"
+
+#, fuzzy
+#~ msgid "Complete"
+#~ msgstr "incomplet"
+
+#, fuzzy
+#~ msgid "Successfully finished"
+#~ msgstr "Configuration terminée"
+
+#~ msgid "Create new branch using the current release"
+#~ msgstr "Créer une nouvelle branche en utilisant la version actuelle"
+
+#~ msgid "Create a locked version of the current release"
+#~ msgstr "Créer une version vérouillée de la version actuelle"
+
 #, fuzzy
 #~ msgid "Releases"
 #~ msgstr "Version"
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index e79ae77bf..f5d5a1ce6 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -36,21 +36,19 @@ msgstr "Extra"
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
-#: plugins/gofax/faxaccount/generic.tpl:6
+#: plugins/gofax/faxaccount/generic.tpl:6 plugins/admin/fai/faiVariable.tpl:4
 #: plugins/admin/fai/faiPartitionTable.tpl:4
-#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiScriptEntry.tpl:5
-#: plugins/admin/fai/faiPackage.tpl:4 plugins/admin/fai/faiProfile.tpl:4
-#: plugins/admin/fai/faiProfile.tpl:32
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
+#: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiPackage.tpl:4
+#: plugins/admin/fai/faiProfile.tpl:4 plugins/admin/fai/faiProfile.tpl:32
 #: plugins/admin/fai/faiScript.tpl:4 plugins/admin/fai/faiVariableEntry.tpl:5
 #: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3 plugins/admin/fai/faiHook.tpl:4
-#: plugins/admin/groups/mail.tpl:7
+#: plugins/admin/groups/mail.tpl:7 plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/glpiPrinter.tpl:6
+#: plugins/admin/systems/servdnseditzone.tpl:1
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
-#: plugins/admin/systems/glpi.tpl:6
-#: plugins/admin/systems/servdnseditzone.tpl:1
-#: plugins/admin/systems/glpiPrinter.tpl:6
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr "Generale"
@@ -61,25 +59,25 @@ msgstr "Unix"
 
 #: contrib/gosa.conf:76 contrib/gosa.conf:88
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:514
-#: plugins/admin/users/class_userManagement.inc:858
+#: plugins/admin/groups/class_groupManagement.inc:515
+#: plugins/admin/users/class_userManagement.inc:859
 msgid "Environment"
 msgstr "Ambiente"
 
 #: contrib/gosa.conf:77 contrib/gosa.conf:90
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_groupManagement.inc:502
-#: plugins/admin/users/class_userManagement.inc:860
+#: plugins/admin/groups/class_groupManagement.inc:503
+#: plugins/admin/users/class_userManagement.inc:861
 #: plugins/admin/ogroups/tabs_ogroups.inc:72
 #: plugins/admin/ogroups/tabs_ogroups.inc:160
-#: plugins/admin/ogroups/class_ogroupManagement.inc:483
+#: plugins/admin/ogroups/class_ogroupManagement.inc:484
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Posta"
 
 #: contrib/gosa.conf:78 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:505
-#: plugins/admin/users/class_userManagement.inc:866
+#: plugins/admin/groups/class_groupManagement.inc:506
+#: plugins/admin/users/class_userManagement.inc:867
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -94,7 +92,7 @@ msgstr "Connettività"
 #: plugins/personal/generic/generic.tpl:398
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:864
+#: plugins/admin/users/class_userManagement.inc:865
 #: plugins/admin/departments/generic.tpl:63
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
@@ -104,17 +102,17 @@ msgstr "Fax"
 #: contrib/gosa.conf:81 plugins/personal/generic/generic.tpl:250
 #: plugins/personal/generic/generic.tpl:388
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/address_info.tpl:37
-#: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
-#: plugins/admin/groups/class_groupManagement.inc:511
-#: plugins/admin/users/class_userManagement.inc:862
+#: plugins/addons/addressbook/address_info.tpl:37
+#: plugins/addons/addressbook/address_info.tpl:85
+#: plugins/admin/groups/class_groupManagement.inc:512
+#: plugins/admin/users/class_userManagement.inc:863
 #: plugins/admin/departments/generic.tpl:59
+#: plugins/admin/systems/class_systemManagement.inc:921
 #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/systems/class_systemManagement.inc:920
 #: plugins/admin/ogroups/class_ogroupManagement.inc:61
-#: plugins/admin/ogroups/class_ogroupManagement.inc:587
+#: plugins/admin/ogroups/class_ogroupManagement.inc:588
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
@@ -143,8 +141,8 @@ msgid "ACL"
 msgstr "ACL"
 
 #: contrib/gosa.conf:97 plugins/admin/applications/generic.tpl:66
-#: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/systems/class_servRepository.inc:244
+#: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/ogroups/phonequeue.tpl:31
 #: plugins/gofon/conference/generic.tpl:87
 msgid "Options"
@@ -166,9 +164,9 @@ msgstr "Dispositivi"
 
 #: contrib/gosa.conf:116 contrib/gosa.conf:141
 #: plugins/personal/environment/environment.tpl:172
-#: plugins/admin/systems/class_systemManagement.inc:926
+#: plugins/admin/systems/class_systemManagement.inc:927
 #: plugins/admin/ogroups/class_ogroupManagement.inc:62
-#: plugins/admin/ogroups/class_ogroupManagement.inc:590
+#: plugins/admin/ogroups/class_ogroupManagement.inc:591
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Stampante"
@@ -177,18 +175,19 @@ msgstr "Stampante"
 #: plugins/gofax/blocklists/generic.tpl:70
 #: plugins/gofax/blocklists/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
+#: plugins/addons/godfs/contents.tpl:22
 #: plugins/admin/fai/faiProfileEntry.tpl:21
 #: plugins/admin/fai/faiPackageEntry.tpl:22 plugins/admin/fai/headpage.tpl:20
 #: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
 #: plugins/admin/applications/headpage.tpl:20
 #: plugins/admin/departments/headpage.tpl:20
-#: plugins/admin/systems/headpage.tpl:20
+#: plugins/admin/systems/glpiPrinter.tpl:104
+#: plugins/admin/systems/glpiDeviceManagement.tpl:20
 #: plugins/admin/systems/servRepository.tpl:24
 #: plugins/admin/systems/glpiSelectUser.tpl:20
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:20
+#: plugins/admin/systems/headpage.tpl:20
 #: plugins/admin/systems/glpiAttachmentPool.tpl:20
-#: plugins/admin/systems/glpiDeviceManagement.tpl:20
-#: plugins/admin/systems/glpiPrinter.tpl:104
 #: plugins/admin/ogroups/headpage.tpl:20 plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
@@ -252,18 +251,18 @@ msgstr "Partizioni"
 msgid "Script"
 msgstr "Script"
 
-#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:759
-#: plugins/admin/fai/class_faiManagement.inc:760
+#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:767
+#: plugins/admin/fai/class_faiManagement.inc:768
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:752
-#: plugins/admin/fai/class_faiManagement.inc:753
+#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:760
+#: plugins/admin/fai/class_faiManagement.inc:761
 msgid "Variables"
 msgstr "Variabili"
 
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiManagement.inc:773
-#: plugins/admin/fai/class_faiManagement.inc:774
+#: contrib/gosa.conf:218 plugins/admin/fai/class_faiManagement.inc:781
+#: plugins/admin/fai/class_faiManagement.inc:782
 msgid "Templates"
 msgstr "Template"
 
@@ -307,92 +306,92 @@ msgstr "Inglese"
 msgid "Italian"
 msgstr "Italiano"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:19
-#: plugins/personal/mail/class_mailAccount.inc:23
-#: plugins/personal/password/class_password.inc:6
-#: plugins/personal/posix/class_posixAccount.inc:17
-#: plugins/personal/samba/class_sambaAccount.inc:25
-#: plugins/personal/environment/class_environment.inc:13
-#: plugins/personal/generic/class_user.inc:17
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_proxyAccount.inc:6
-#: plugins/personal/connectivity/class_pptpAccount.inc:27
-#: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_phpgwAccount.inc:6
-#: plugins/personal/connectivity/class_kolabAccount.inc:6
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
-#: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/personal/connectivity/class_opengwAccount.inc:7
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
-#: plugins/gofax/faxreports/class_faxreport.inc:7
-#: plugins/addons/addressbook/class_addressbook.inc:7
-#: plugins/addons/mailqueue/class_mailqueue.inc:7
-#: plugins/addons/ldapmanager/class_csvimport.inc:7
-#: plugins/addons/ldapmanager/class_exportxls.inc:8
-#: plugins/addons/ldapmanager/class_import.inc:7
-#: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:7
-#: plugins/addons/logview/class_logview.inc:7
-#: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:26
-#: plugins/admin/applications/class_applicationManagement.inc:26
-#: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/systems/class_systemManagement.inc:33
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-#: plugins/gofon/fonreports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Questo fa qualcosa"
+#: plugins/personal/nagios/nagios.tpl:4
+#, fuzzy
+msgid "Nagios Account"
+msgstr "Contatto"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:92
+#: plugins/personal/nagios/nagios.tpl:7
 #, fuzzy
-msgid "This account has no nagios extensions."
-msgstr "Questa identità non ha le estensioni per la posta"
+msgid "Alias"
+msgstr "Italiano"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:101
+#: plugins/personal/nagios/nagios.tpl:12
+#: plugins/admin/systems/servdnseditzone.tpl:47 html/getxls.php:174
+msgid "Mail address"
+msgstr "Indirizzo principale"
+
+#: plugins/personal/nagios/nagios.tpl:17
 #, fuzzy
-msgid "Remove nagios account"
-msgstr "Rimuovi le estensioni di posta"
+msgid "Host notification period"
+msgstr "Opzioni applicazione"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:102
+#: plugins/personal/nagios/nagios.tpl:25
 #, fuzzy
-msgid ""
-"This account has nagios features enabled. You can disable them by clicking "
-"below."
-msgstr "Questa identià possiede estensioni di posta."
+msgid "Service notification period"
+msgstr "Opzioni applicazione"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:104
+#: plugins/personal/nagios/nagios.tpl:32
 #, fuzzy
-msgid "Create nagios account"
-msgstr "Crea estensioni di posta"
+msgid "Service notification options"
+msgstr "Opzioni applicazione"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:104
+#: plugins/personal/nagios/nagios.tpl:41
 #, fuzzy
-msgid ""
-"This account has nagios features disabled. You can enable them by clicking "
-"below."
-msgstr "Questa identità non possiede estensioni di posta."
+msgid "Host notification options"
+msgstr "Opzioni applicazione"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:165
+#: plugins/personal/nagios/nagios.tpl:48
+#: plugins/personal/generic/generic.tpl:261
+#: plugins/addons/addressbook/address_edit.tpl:217
+#: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Pager"
+msgstr "Pager"
+
+#: plugins/personal/nagios/nagios.tpl:53
 #, fuzzy
-msgid "The required field 'NagiosAlias' is not set."
-msgstr "Il campo 'Indirizzo principale' non è stao inserito"
+msgid "Service notification commands"
+msgstr "Opzioni applicazione"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:168
+#: plugins/personal/nagios/nagios.tpl:57
 #, fuzzy
-msgid "The required field 'NagiosMail' is not set."
-msgstr "Il campo 'Indirizzo principale' non è stao inserito"
+msgid "Host notification commands"
+msgstr "Opzioni applicazione"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:172
-#: plugins/personal/nagios/class_nagiosAccount.inc:176
+#: plugins/personal/nagios/nagios.tpl:66
+msgid "Nagios authentification"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:69
 #, fuzzy
-msgid "Please enter a valid email address in 'NagiosMail' field."
+msgid "view system informations"
+msgstr "Informazioni organizzazione"
+
+#: plugins/personal/nagios/nagios.tpl:72
+#, fuzzy
+msgid "view configuration information"
+msgstr "Informazioni organizzazione"
+
+#: plugins/personal/nagios/nagios.tpl:75
+msgid "trigger system commands"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:78
+msgid "view all services"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:81
+msgid "view all hosts"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:83
+msgid "trigger all service commands"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:86
+msgid "trigger all host commands"
 msgstr ""
-"Inserire un indirizzo di posta valido nel campo 'Indirizzo principale'."
 
 #: plugins/personal/nagios/main.inc:104 plugins/personal/mail/main.inc:104
 #: plugins/personal/posix/main.inc:110 plugins/personal/samba/main.inc:104
@@ -402,11 +401,12 @@ msgstr ""
 #: plugins/personal/connectivity/main.inc:118
 #: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/fai/class_faiManagement.inc:599
+#: plugins/addons/godfs/class_dfsManagment.inc:217
+#: plugins/admin/fai/class_faiManagement.inc:605
 #: plugins/admin/groups/class_groupManagement.inc:412
 #: plugins/admin/users/class_userManagement.inc:720
-#: plugins/admin/applications/class_applicationManagement.inc:428
-#: plugins/admin/departments/class_departmentManagement.inc:366
+#: plugins/admin/applications/class_applicationManagement.inc:430
+#: plugins/admin/departments/class_departmentManagement.inc:367
 #: plugins/admin/systems/class_systemManagement.inc:720
 #: plugins/admin/ogroups/class_ogroupManagement.inc:400
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:300
@@ -418,16 +418,15 @@ msgstr "Esegui"
 
 #: plugins/personal/nagios/main.inc:106 plugins/personal/mail/main.inc:106
 #: plugins/personal/mail/mail_locals.tpl:43
-#: plugins/personal/posix/posix_groups.tpl:67
 #: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112
+#: plugins/personal/posix/posix_groups.tpl:67
+#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
 #: plugins/personal/samba/samba3_workstations.tpl:41
-#: plugins/personal/samba/main.inc:106
+#: plugins/personal/environment/main.inc:106
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
 #: plugins/personal/environment/hotplugDialogNew.tpl:39
-#: plugins/personal/environment/main.inc:106
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
 #: plugins/personal/generic/generic_certs.tpl:78
@@ -438,54 +437,55 @@ msgstr "Esegui"
 #: plugins/gofax/faxaccount/locals.tpl:62
 #: plugins/gofax/faxaccount/lists.tpl:33 plugins/gofax/faxaccount/main.inc:91
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
-#: plugins/admin/fai/class_faiManagement.inc:601
-#: plugins/admin/fai/class_faiManagement.inc:606
-#: plugins/admin/fai/faiProfileEntry.tpl:71
+#: plugins/addons/addressbook/remove.tpl:16
+#: plugins/addons/godfs/class_dfsManagment.inc:219
+#: plugins/admin/fai/class_faiManagement.inc:607
+#: plugins/admin/fai/class_faiManagement.inc:612
 #: plugins/admin/fai/faiPackageConfiguration.tpl:7
-#: plugins/admin/fai/faiScriptEntry.tpl:69
+#: plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
+#: plugins/admin/fai/faiScriptEntry.tpl:69 plugins/admin/fai/remove.tpl:17
 #: plugins/admin/fai/faiPackageNew.tpl:45
+#: plugins/admin/fai/faiNewBranch.tpl:20
 #: plugins/admin/fai/faiVariableEntry.tpl:49
-#: plugins/admin/fai/faiPackageEntry.tpl:57 plugins/admin/fai/remove.tpl:17
+#: plugins/admin/fai/faiPackageEntry.tpl:57
 #: plugins/admin/fai/faiHookEntry.tpl:71
-#: plugins/admin/fai/faiTemplateEntry.tpl:131
-#: plugins/admin/fai/faiNewBranch.tpl:20
 #: plugins/admin/fai/remove_branch.tpl:16
+#: plugins/admin/fai/faiTemplateEntry.tpl:131
 #: plugins/admin/groups/class_groupManagement.inc:414
 #: plugins/admin/groups/remove.tpl:16
+#: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/template.tpl:46
 #: plugins/admin/users/class_userManagement.inc:722
-#: plugins/admin/users/remove.tpl:16 plugins/admin/users/template.tpl:46
-#: plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:430
+#: plugins/admin/users/remove.tpl:16 plugins/admin/applications/remove.tpl:15
+#: plugins/admin/applications/class_applicationManagement.inc:432
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:368
-#: plugins/admin/systems/chooser.tpl:18
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
-#: plugins/admin/systems/printerPPDDialog.tpl:23
-#: plugins/admin/systems/class_systemManagement.inc:722
-#: plugins/admin/systems/servnfs.tpl:76 plugins/admin/systems/remove.tpl:16
-#: plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/servRepositorySetup.tpl:43
+#: plugins/admin/departments/class_departmentManagement.inc:369
 #: plugins/admin/systems/glpi_edit_type.tpl:29
-#: plugins/admin/systems/remove_glpi.tpl:16
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:30
+#: plugins/admin/systems/glpiDeviceManagement.tpl:52
+#: plugins/admin/systems/servnfs.tpl:76
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
+#: plugins/admin/systems/servdnseditzone.tpl:118
 #: plugins/admin/systems/glpiSelectUser.tpl:51
+#: plugins/admin/systems/glpi_devices.tpl:761
+#: plugins/admin/systems/servRepositorySetup.tpl:43
 #: plugins/admin/systems/glpi_edit_os.tpl:29
+#: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:52
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
+#: plugins/admin/systems/remove_glpi.tpl:16
+#: plugins/admin/systems/class_systemManagement.inc:722
+#: plugins/admin/systems/remove.tpl:16
 #: plugins/admin/systems/glpiAttachmentPool.tpl:52
-#: plugins/admin/systems/servdnseditzone.tpl:118
-#: plugins/admin/systems/glpiDeviceManagement.tpl:52
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:30
-#: plugins/admin/systems/glpi_devices.tpl:761
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
+#: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/SelectDeviceType.tpl:45
-#: plugins/admin/systems/class_baseSelectDialog.inc:40
+#: plugins/admin/systems/class_baseSelectDialog.inc:41
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:13
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:402
@@ -496,6 +496,7 @@ msgstr "Esegui"
 #: plugins/gofon/conference/remove.tpl:16
 #: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
 #: ihtml/themes/default/copyPasteDialog.tpl:13
+#: ihtml/themes/lhs/islocked.tpl:15
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -513,26 +514,27 @@ msgstr ""
 
 #: plugins/personal/nagios/main.inc:115 plugins/personal/mail/main.inc:115
 #: plugins/personal/posix/main.inc:122 plugins/personal/samba/main.inc:115
-#: plugins/personal/environment/environment.tpl:139
 #: plugins/personal/environment/main.inc:115
+#: plugins/personal/environment/environment.tpl:139
 #: plugins/personal/generic/main.inc:172
 #: plugins/personal/connectivity/main.inc:129
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
+#: plugins/admin/fai/faiVariable.tpl:45
 #: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/admin/fai/faiVariable.tpl:45 plugins/admin/fai/faiScript.tpl:45
-#: plugins/admin/fai/faiTemplate.tpl:42 plugins/admin/fai/faiHook.tpl:45
-#: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/printer.tpl:47 plugins/admin/systems/servdns.tpl:7
-#: plugins/admin/systems/glpiManufacturer.tpl:7
-#: plugins/admin/systems/glpi.tpl:48 plugins/admin/systems/glpi.tpl:56
-#: plugins/admin/systems/glpi.tpl:85
-#: plugins/admin/systems/servdnseditzone.tpl:27
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:191
+#: plugins/admin/fai/faiScript.tpl:45 plugins/admin/fai/faiTemplate.tpl:42
+#: plugins/admin/fai/faiHook.tpl:45 plugins/admin/systems/glpi.tpl:48
+#: plugins/admin/systems/glpi.tpl:56 plugins/admin/systems/glpi.tpl:85
 #: plugins/admin/systems/glpiPrinter.tpl:73
 #: plugins/admin/systems/glpiPrinter.tpl:82
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:167
+#: plugins/admin/systems/servdns.tpl:7
+#: plugins/admin/systems/glpiManufacturer.tpl:7
+#: plugins/admin/systems/servdnseditzone.tpl:27
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:191
+#: plugins/admin/systems/servservice.tpl:21
+#: plugins/admin/systems/printer.tpl:47
 #: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr "Modifica"
@@ -542,91 +544,202 @@ msgstr "Modifica"
 msgid "Nagios settings"
 msgstr "Opzioni di posta dell'identità"
 
-#: plugins/personal/nagios/nagios.tpl:4
-#, fuzzy
-msgid "Nagios Account"
-msgstr "Contatto"
-
-#: plugins/personal/nagios/nagios.tpl:7
-#, fuzzy
-msgid "Alias"
-msgstr "Italiano"
-
-#: plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:47 html/getxls.php:174
-msgid "Mail address"
-msgstr "Indirizzo principale"
-
-#: plugins/personal/nagios/nagios.tpl:17
-#, fuzzy
-msgid "Host notification period"
-msgstr "Opzioni applicazione"
-
-#: plugins/personal/nagios/nagios.tpl:25
-#, fuzzy
-msgid "Service notification period"
-msgstr "Opzioni applicazione"
-
-#: plugins/personal/nagios/nagios.tpl:32
-#, fuzzy
-msgid "Service notification options"
-msgstr "Opzioni applicazione"
-
-#: plugins/personal/nagios/nagios.tpl:41
-#, fuzzy
-msgid "Host notification options"
-msgstr "Opzioni applicazione"
-
-#: plugins/personal/nagios/nagios.tpl:48
-#: plugins/personal/generic/generic.tpl:261
-#: plugins/addons/addressbook/address_info.tpl:91
-#: plugins/addons/addressbook/address_edit.tpl:217 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Pager"
-msgstr "Pager"
+#: plugins/personal/nagios/class_nagiosAccount.inc:19
+#: plugins/personal/mail/class_mailAccount.inc:23
+#: plugins/personal/password/class_password.inc:6
+#: plugins/personal/posix/class_posixAccount.inc:17
+#: plugins/personal/samba/class_sambaAccount.inc:25
+#: plugins/personal/environment/class_environment.inc:13
+#: plugins/personal/generic/class_user.inc:17
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_intranetAccount.inc:16
+#: plugins/personal/connectivity/class_pptpAccount.inc:27
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
+#: plugins/personal/connectivity/class_phpgwAccount.inc:6
+#: plugins/personal/connectivity/class_kolabAccount.inc:6
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
+#: plugins/personal/connectivity/class_opengwAccount.inc:7
+#: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
+#: plugins/gofax/faxreports/class_faxreport.inc:7
+#: plugins/addons/addressbook/class_addressbook.inc:7
+#: plugins/addons/mailqueue/class_mailqueue.inc:7
+#: plugins/addons/ldapmanager/class_csvimport.inc:7
+#: plugins/addons/ldapmanager/class_exportxls.inc:8
+#: plugins/addons/ldapmanager/class_import.inc:7
+#: plugins/addons/ldapmanager/class_ldif.inc:8
+#: plugins/addons/ldapmanager/class_export.inc:7
+#: plugins/addons/logview/class_logview.inc:7
+#: plugins/addons/godfs/class_dfsManagment.inc:17
+#: plugins/admin/groups/class_groupManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:26
+#: plugins/admin/applications/class_applicationManagement.inc:26
+#: plugins/admin/departments/class_departmentManagement.inc:26
+#: plugins/admin/systems/class_systemManagement.inc:33
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/gofon/fonreports/class_fonreport.inc:7
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
+msgid "This does something"
+msgstr "Questo fa qualcosa"
 
-#: plugins/personal/nagios/nagios.tpl:53
+#: plugins/personal/nagios/class_nagiosAccount.inc:92
 #, fuzzy
-msgid "Service notification commands"
-msgstr "Opzioni applicazione"
+msgid "This account has no nagios extensions."
+msgstr "Questa identità non ha le estensioni per la posta"
 
-#: plugins/personal/nagios/nagios.tpl:57
+#: plugins/personal/nagios/class_nagiosAccount.inc:101
 #, fuzzy
-msgid "Host notification commands"
-msgstr "Opzioni applicazione"
+msgid "Remove nagios account"
+msgstr "Rimuovi le estensioni di posta"
 
-#: plugins/personal/nagios/nagios.tpl:66
-msgid "Nagios authentification"
-msgstr ""
+#: plugins/personal/nagios/class_nagiosAccount.inc:102
+#, fuzzy
+msgid ""
+"This account has nagios features enabled. You can disable them by clicking "
+"below."
+msgstr "Questa identià possiede estensioni di posta."
 
-#: plugins/personal/nagios/nagios.tpl:69
+#: plugins/personal/nagios/class_nagiosAccount.inc:104
 #, fuzzy
-msgid "view system informations"
-msgstr "Informazioni organizzazione"
+msgid "Create nagios account"
+msgstr "Crea estensioni di posta"
 
-#: plugins/personal/nagios/nagios.tpl:72
+#: plugins/personal/nagios/class_nagiosAccount.inc:104
 #, fuzzy
-msgid "view configuration information"
-msgstr "Informazioni organizzazione"
+msgid ""
+"This account has nagios features disabled. You can enable them by clicking "
+"below."
+msgstr "Questa identità non possiede estensioni di posta."
 
-#: plugins/personal/nagios/nagios.tpl:75
-msgid "trigger system commands"
+#: plugins/personal/nagios/class_nagiosAccount.inc:165
+#, fuzzy
+msgid "The required field 'NagiosAlias' is not set."
+msgstr "Il campo 'Indirizzo principale' non è stao inserito"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:168
+#, fuzzy
+msgid "The required field 'NagiosMail' is not set."
+msgstr "Il campo 'Indirizzo principale' non è stao inserito"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:172
+#: plugins/personal/nagios/class_nagiosAccount.inc:176
+#, fuzzy
+msgid "Please enter a valid email address in 'NagiosMail' field."
 msgstr ""
+"Inserire un indirizzo di posta valido nel campo 'Indirizzo principale'."
 
-#: plugins/personal/nagios/nagios.tpl:78
-msgid "view all services"
+#: plugins/personal/mail/class_mailAccount.inc:79
+#: plugins/admin/groups/class_groupMail.inc:75
+#, php-format
+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:176
+msgid "No DESC tag in vacation file:"
+msgstr "Manca il DESC tag nel messaggio di risposta automatica:"
+
+#: plugins/personal/mail/class_mailAccount.inc:216
+msgid "This account has no mail extensions."
+msgstr "Questa identità non ha le estensioni per la posta"
+
+#: plugins/personal/mail/class_mailAccount.inc:225
+#: plugins/admin/groups/class_groupMail.inc:314
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid "Remove mail account"
+msgstr "Rimuovi le estensioni di posta"
+
+#: plugins/personal/mail/class_mailAccount.inc:226
+#: plugins/admin/groups/class_groupMail.inc:315
+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:228
+#: plugins/admin/groups/class_groupMail.inc:317
+#: plugins/admin/ogroups/class_mailogroup.inc:43
+msgid "Create mail account"
+msgstr "Crea estensioni di posta"
+
+#: plugins/personal/mail/class_mailAccount.inc:228
+#: plugins/admin/groups/class_groupMail.inc:318
+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:276
+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/nagios/nagios.tpl:81
-msgid "view all hosts"
+#: plugins/personal/mail/class_mailAccount.inc:282
+#: plugins/admin/groups/class_groupMail.inc:377
+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:317
+#: plugins/personal/mail/class_mailAccount.inc:322
+#: plugins/admin/groups/class_groupMail.inc:405
+msgid ""
+"You're trying to add an invalid email address to the list of alternate "
+"addresses."
 msgstr ""
+"Stai cercando di aggungere un indirizzo di posta non valido alla lista degli "
+"indirizzi alternativi."
 
-#: plugins/personal/nagios/nagios.tpl:83
-msgid "trigger all service commands"
+#: plugins/personal/mail/class_mailAccount.inc:332
+#: plugins/admin/groups/class_groupMail.inc:410
+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:714
+msgid ""
+"There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:86
-msgid "trigger all host commands"
+#: plugins/personal/mail/class_mailAccount.inc:719
+#: plugins/admin/groups/class_groupMail.inc:798
+msgid "The required field 'Primary address' is not set."
+msgstr "Il campo 'Indirizzo principale' non è stao inserito"
+
+#: plugins/personal/mail/class_mailAccount.inc:723
+#: plugins/personal/mail/class_mailAccount.inc:727
+#: plugins/addons/addressbook/class_addressbook.inc:588
+#: plugins/admin/ogroups/class_mailogroup.inc:70
+msgid "Please enter a valid email address in 'Primary address' field."
+msgstr ""
+"Inserire un indirizzo di posta valido nel campo 'Indirizzo principale'."
+
+#: plugins/personal/mail/class_mailAccount.inc:733
+#: plugins/admin/groups/class_groupMail.inc:807
+#: plugins/admin/ogroups/class_mailogroup.inc:77
+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:739
+#: plugins/admin/groups/class_groupMail.inc:813
+msgid "Value in 'Quota size' is not valid."
+msgstr "Il valore di 'Dimensione quota' non è valido"
+
+#: plugins/personal/mail/class_mailAccount.inc:748
+#: plugins/admin/groups/class_groupMail.inc:822
+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:758
+#: plugins/admin/groups/class_groupMail.inc:830
+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:762
+msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:7 plugins/personal/mail/copypaste.tpl:7
@@ -637,9 +750,9 @@ 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_systemManagement.inc:921
+#: plugins/admin/systems/class_systemManagement.inc:922
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:586
+#: plugins/admin/ogroups/class_ogroupManagement.inc:587
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
 msgstr "Server"
@@ -653,7 +766,7 @@ msgid "Quota usage"
 msgstr "Utilizzo quota"
 
 #: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
-#: plugins/admin/systems/class_terminalInfo.inc:169
+#: plugins/admin/systems/class_terminalInfo.inc:170
 #: plugins/admin/systems/class_printGeneric.inc:424
 msgid "not defined"
 msgstr "non definito"
@@ -678,8 +791,8 @@ msgstr "Lista degli indirizzi alternativi"
 #: plugins/personal/mail/mail_locals.tpl:41
 #: plugins/personal/mail/copypaste.tpl:21
 #: plugins/personal/mail/copypaste.tpl:44
-#: plugins/personal/posix/posix_groups.tpl:65
 #: plugins/personal/posix/trust_machines.tpl:39
+#: plugins/personal/posix/posix_groups.tpl:65
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
 #: plugins/personal/samba/samba3.tpl:330
@@ -695,43 +808,42 @@ msgstr "Lista degli indirizzi alternativi"
 #: plugins/gofax/blocklists/generic.tpl:63
 #: plugins/gofax/faxaccount/generic.tpl:76
 #: plugins/gofax/faxaccount/locals.tpl:60
-#: plugins/gofax/faxaccount/lists.tpl:13
+#: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiPackage.tpl:71
-#: plugins/admin/fai/faiProfile.tpl:38 plugins/admin/fai/faiScript.tpl:48
-#: plugins/admin/fai/faiTemplate.tpl:41 plugins/admin/fai/faiHook.tpl:48
-#: plugins/admin/groups/mail.tpl:51 plugins/admin/groups/mail.tpl:95
+#: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
+#: plugins/admin/fai/faiScript.tpl:48 plugins/admin/fai/faiTemplate.tpl:41
+#: plugins/admin/fai/faiHook.tpl:48 plugins/admin/groups/mail.tpl:51
+#: plugins/admin/groups/mail.tpl:95
 #: plugins/admin/groups/class_groupMail.inc:533
 #: plugins/admin/groups/application.tpl:15
 #: plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/generic.tpl:104
 #: plugins/admin/groups/mail_locals.tpl:66
 #: plugins/admin/groups/paste_mail.tpl:30
-#: plugins/admin/groups/paste_mail.tpl:41
-#: plugins/admin/systems/servservice.tpl:20
-#: plugins/admin/systems/servservice.tpl:47
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
+#: plugins/admin/groups/paste_mail.tpl:41 plugins/admin/systems/glpi.tpl:100
+#: plugins/admin/systems/glpiPrinter.tpl:93
+#: plugins/admin/systems/glpiPrinter.tpl:121
+#: plugins/admin/systems/glpi_edit_type.tpl:8
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:7
 #: plugins/admin/systems/workstationStartup.tpl:61
 #: plugins/admin/systems/workstationStartup.tpl:81
 #: plugins/admin/systems/workstationStartup.tpl:100
 #: plugins/admin/systems/servdns.tpl:6
-#: plugins/admin/systems/phonesettings.tpl:176
-#: plugins/admin/systems/phonesettings.tpl:191
 #: plugins/admin/systems/terminalStartup.tpl:61
 #: plugins/admin/systems/terminalStartup.tpl:80
-#: plugins/admin/systems/servRepositorySetup.tpl:36
-#: plugins/admin/systems/glpi_edit_type.tpl:8
 #: plugins/admin/systems/glpiManufacturer.tpl:6
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
-#: plugins/admin/systems/glpi_edit_os.tpl:8
 #: plugins/admin/systems/class_termDNS.inc:461
 #: plugins/admin/systems/class_termDNS.inc:482
-#: plugins/admin/systems/glpi.tpl:100
 #: plugins/admin/systems/servdnseditzone.tpl:102
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/glpiPrinter.tpl:93
-#: plugins/admin/systems/glpiPrinter.tpl:121
+#: plugins/admin/systems/servRepositorySetup.tpl:36
+#: plugins/admin/systems/servservice.tpl:20
+#: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/glpi_edit_os.tpl:8
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
 #: plugins/admin/systems/class_servDNSeditZone.inc:478
+#: plugins/admin/systems/phonesettings.tpl:176
+#: plugins/admin/systems/phonesettings.tpl:191
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:270
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/generic.tpl:39
@@ -756,41 +868,40 @@ msgstr "Aggiungi"
 #: plugins/gofax/faxaccount/generic.tpl:78
 #: plugins/gofax/faxaccount/lists.tpl:14
 #: plugins/addons/addressbook/remove.tpl:14
-#: plugins/admin/fai/faiPartitionTable.tpl:45
-#: plugins/admin/fai/faiVariable.tpl:46 plugins/admin/fai/faiScript.tpl:46
-#: plugins/admin/fai/faiTemplate.tpl:43 plugins/admin/fai/remove.tpl:15
-#: plugins/admin/fai/faiHook.tpl:46 plugins/admin/fai/remove_branch.tpl:14
+#: plugins/admin/fai/faiVariable.tpl:46
+#: plugins/admin/fai/faiPartitionTable.tpl:45 plugins/admin/fai/remove.tpl:15
+#: plugins/admin/fai/faiScript.tpl:46 plugins/admin/fai/faiTemplate.tpl:43
+#: plugins/admin/fai/remove_branch.tpl:14 plugins/admin/fai/faiHook.tpl:46
 #: plugins/admin/groups/mail.tpl:52 plugins/admin/groups/mail.tpl:97
 #: plugins/admin/groups/remove.tpl:14 plugins/admin/groups/generic.tpl:106
 #: plugins/admin/groups/paste_mail.tpl:31
 #: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/users/remove.tpl:14
 #: plugins/admin/applications/remove.tpl:13
 #: plugins/admin/departments/remove.tpl:14
-#: plugins/admin/systems/servservice.tpl:22
-#: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/glpi_edit_type.tpl:10
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/workstationStartup.tpl:62
 #: plugins/admin/systems/workstationStartup.tpl:82
-#: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
-#: plugins/admin/systems/phonesettings.tpl:177
-#: plugins/admin/systems/phonesettings.tpl:192
-#: plugins/admin/systems/remove.tpl:14
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
 #: plugins/admin/systems/terminalStartup.tpl:62
-#: plugins/admin/systems/glpi_edit_type.tpl:10
-#: plugins/admin/systems/remove_glpi.tpl:14
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
-#: plugins/admin/systems/glpi_edit_os.tpl:10
 #: plugins/admin/systems/class_termDNS.inc:476
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:192
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
-#: plugins/admin/systems/class_servDNSeditZone.inc:279
-#: plugins/admin/systems/class_servDNSeditZone.inc:472
-#: plugins/admin/ogroups/generic.tpl:40 plugins/admin/ogroups/remove.tpl:14
-#: plugins/admin/ogroups/phonequeue.tpl:25 plugins/gofon/macro/remove.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:15
-#: plugins/gofon/phoneaccount/paste_generic.tpl:15
-#: plugins/gofon/conference/remove.tpl:14
-msgid "Delete"
+#: plugins/admin/systems/servservice.tpl:22
+#: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/glpi_edit_os.tpl:10
+#: plugins/admin/systems/remove_glpi.tpl:14
+#: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
+#: plugins/admin/systems/class_servDNSeditZone.inc:279
+#: plugins/admin/systems/class_servDNSeditZone.inc:472
+#: plugins/admin/systems/phonesettings.tpl:177
+#: plugins/admin/systems/phonesettings.tpl:192
+#: plugins/admin/systems/remove.tpl:14 plugins/admin/ogroups/generic.tpl:40
+#: plugins/admin/ogroups/remove.tpl:14 plugins/admin/ogroups/phonequeue.tpl:25
+#: plugins/gofon/macro/remove.tpl:13 plugins/gofon/phoneaccount/generic.tpl:15
+#: plugins/gofon/phoneaccount/paste_generic.tpl:15
+#: plugins/gofon/conference/remove.tpl:14
+msgid "Delete"
 msgstr "Rimuovi"
 
 #: plugins/personal/mail/generic.tpl:67
@@ -899,6 +1010,7 @@ msgstr "Seleziona gli indirizzi da aggiungere"
 #: plugins/gofax/blocklists/headpage.tpl:29
 #: plugins/gofax/faxaccount/locals.tpl:19
 #: plugins/addons/addressbook/contents.tpl:58
+#: plugins/addons/godfs/contents.tpl:31
 #: plugins/admin/fai/faiProfileEntry.tpl:31
 #: plugins/admin/fai/faiPackageEntry.tpl:32 plugins/admin/fai/headpage.tpl:64
 #: plugins/admin/groups/headpage.tpl:30
@@ -906,14 +1018,14 @@ msgstr "Seleziona gli indirizzi da aggiungere"
 #: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
 #: plugins/admin/applications/headpage.tpl:47
 #: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
-#: plugins/admin/systems/headpage.tpl:29
+#: plugins/admin/systems/glpiDeviceManagement.tpl:27
 #: plugins/admin/systems/servRepository.tpl:36
 #: plugins/admin/systems/glpiSelectUser.tpl:27
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:27
+#: plugins/admin/systems/headpage.tpl:29
 #: plugins/admin/systems/glpiAttachmentPool.tpl:27
-#: plugins/admin/systems/glpiDeviceManagement.tpl:27
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/admin/ogroups/headpage.tpl:29 plugins/gofon/macro/headpage.tpl:29
 #: plugins/gofon/conference/headpage.tpl:29
@@ -923,8 +1035,8 @@ msgid "Filters"
 msgstr "Filtri"
 
 #: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:32
 #: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:32
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/personal/environment/selectPrinterDialog.tpl:34
 #: plugins/gofax/faxaccount/locals.tpl:29
@@ -953,137 +1065,28 @@ msgstr "Mostra l'indirizzo dell'utente"
 msgid "User name of which addresses are shown"
 msgstr "Nome dell'utente del quale mostrare gli indirizzi"
 
-#: plugins/personal/mail/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:75
-#, php-format
-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:176
-msgid "No DESC tag in vacation file:"
-msgstr "Manca il DESC tag nel messaggio di risposta automatica:"
-
-#: plugins/personal/mail/class_mailAccount.inc:216
-msgid "This account has no mail extensions."
-msgstr "Questa identità non ha le estensioni per la posta"
-
-#: plugins/personal/mail/class_mailAccount.inc:225
-#: plugins/admin/groups/class_groupMail.inc:314
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid "Remove mail account"
-msgstr "Rimuovi le estensioni di posta"
-
-#: plugins/personal/mail/class_mailAccount.inc:226
-#: plugins/admin/groups/class_groupMail.inc:315
-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:228
-#: plugins/admin/groups/class_groupMail.inc:317
-#: plugins/admin/ogroups/class_mailogroup.inc:43
-msgid "Create mail account"
-msgstr "Crea estensioni di posta"
-
-#: plugins/personal/mail/class_mailAccount.inc:228
-#: plugins/admin/groups/class_groupMail.inc:318
-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:276
-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:282
-#: plugins/admin/groups/class_groupMail.inc:377
-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:317
-#: plugins/personal/mail/class_mailAccount.inc:322
-#: plugins/admin/groups/class_groupMail.inc:405
-msgid ""
-"You're trying to add an invalid email address to the list of alternate "
-"addresses."
-msgstr ""
-"Stai cercando di aggungere un indirizzo di posta non valido alla lista degli "
-"indirizzi alternativi."
-
-#: plugins/personal/mail/class_mailAccount.inc:332
-#: plugins/admin/groups/class_groupMail.inc:410
-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:714
-msgid ""
-"There is no valid mailserver specified, please add one in the system setup."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:719
-#: plugins/admin/groups/class_groupMail.inc:798
-msgid "The required field 'Primary address' is not set."
-msgstr "Il campo 'Indirizzo principale' non è stao inserito"
-
-#: plugins/personal/mail/class_mailAccount.inc:723
-#: plugins/personal/mail/class_mailAccount.inc:727
-#: plugins/addons/addressbook/class_addressbook.inc:588
-#: plugins/admin/ogroups/class_mailogroup.inc:70
-msgid "Please enter a valid email address in 'Primary address' field."
-msgstr ""
-"Inserire un indirizzo di posta valido nel campo 'Indirizzo principale'."
-
-#: plugins/personal/mail/class_mailAccount.inc:733
-#: plugins/admin/groups/class_groupMail.inc:807
-#: plugins/admin/ogroups/class_mailogroup.inc:77
-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:739
-#: plugins/admin/groups/class_groupMail.inc:813
-msgid "Value in 'Quota size' is not valid."
-msgstr "Il valore di 'Dimensione quota' non è valido"
-
-#: plugins/personal/mail/class_mailAccount.inc:748
-#: plugins/admin/groups/class_groupMail.inc:822
-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:758
-#: plugins/admin/groups/class_groupMail.inc:830
-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:762
-msgid "You specified Spam settings, but there is no Folder specified."
-msgstr ""
-
 #: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
 #, fuzzy
 msgid "Mail settings"
 msgstr "Opzioni di posta dell'identità"
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:871
+#: plugins/admin/systems/class_systemManagement.inc:872
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
-#: ihtml/themes/altlinux/setup_useradmin.tpl:30
 #: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/default/setup_useradmin.tpl:30
+#: ihtml/themes/altlinux/setup_useradmin.tpl:30
 #: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
+#: ihtml/themes/default/setup_useradmin.tpl:30 ihtml/themes/lhs/login.tpl:37
+#: ihtml/themes/lhs/login.tpl:41 ihtml/themes/lhs/setup_useradmin.tpl:30
 msgid "Password"
 msgstr "Password"
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:801
-#: plugins/admin/users/class_userManagement.inc:808
+#: plugins/admin/users/class_userManagement.inc:802
+#: plugins/admin/users/class_userManagement.inc:809
 msgid "Change password"
 msgstr "Cambia la password"
 
@@ -1147,9 +1150,8 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
 #: plugins/addons/ldapmanager/contentexport.tpl:66
-#: plugins/admin/fai/class_faiManagement.inc:441
-#: plugins/admin/fai/faiNewBranch.tpl:52
-#: plugins/admin/departments/recursive_moce.tpl:10 include/functions.inc:1382
+#: plugins/admin/fai/faiNewBranch.tpl:50
+#: plugins/admin/departments/recursive_move.tpl:18 include/functions.inc:1382
 #: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_step3.tpl:17
@@ -1160,6 +1162,9 @@ msgstr ""
 #: ihtml/themes/default/setup_step3.tpl:17
 #: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_finish.tpl:30
+#: ihtml/themes/lhs/setup_useradmin.tpl:40 ihtml/themes/lhs/setup_step2.tpl:12
+#: ihtml/themes/lhs/setup_step3.tpl:17 ihtml/themes/lhs/setup_step4.tpl:114
+#: ihtml/themes/lhs/setup_finish.tpl:30
 msgid "Back"
 msgstr "Indietro"
 
@@ -1202,6 +1207,19 @@ msgstr "Non hai il permesso di cambiare la tua password."
 msgid "External password changer reported a problem: "
 msgstr "Il programma esterno per cambiare la password ha avuto un problema:"
 
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Seleziona un sistema da aggiungere"
+
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr "Mostra i sistemi del dipartimento"
+
+#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/systems/headpage.tpl:50
+msgid "Display systems matching"
+msgstr "Mostra i sistemi che corrispondono a:"
+
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
 msgstr "Seleziona un gruppo da aggiungere"
@@ -1239,19 +1257,6 @@ msgstr "L'utente deve cambiare la password alla prima connessione"
 msgid "Password expires on"
 msgstr "La password spira il"
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
-msgstr "Seleziona un sistema da aggiungere"
-
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
-msgstr "Mostra i sistemi del dipartimento"
-
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:50
-msgid "Display systems matching"
-msgstr "Mostra i sistemi che corrispondono a:"
-
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
@@ -1310,6 +1315,10 @@ msgstr "Accesso ai sistemi"
 msgid "Trust mode"
 msgstr ""
 
+#: plugins/personal/posix/main.inc:131
+msgid "Unix settings"
+msgstr "Impostazioni Unix"
+
 #: plugins/personal/posix/class_posixAccount.inc:16
 #: plugins/generic/references/class_reference.inc:22
 msgid "UNIX"
@@ -1325,9 +1334,9 @@ msgid "unconfigured"
 msgstr "non configurata"
 
 #: plugins/personal/posix/class_posixAccount.inc:195
-#: plugins/admin/systems/class_terminalService.inc:141
 #: plugins/admin/systems/class_workstationService.inc:134
 #: plugins/admin/systems/class_workstationStartup.inc:623
+#: plugins/admin/systems/class_terminalService.inc:141
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:211
 msgid "automatic"
 msgstr "automatico"
@@ -1524,7 +1533,7 @@ msgstr "Dicembre"
 #: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/admin/systems/class_terminalGeneric.inc:60
 #: ihtml/themes/altlinux/setup_step4.tpl:91
-#: ihtml/themes/default/setup_step4.tpl:91
+#: ihtml/themes/default/setup_step4.tpl:91 ihtml/themes/lhs/setup_step4.tpl:91
 msgid "disabled"
 msgstr "disabilitato"
 
@@ -1607,10 +1616,6 @@ msgstr ""
 msgid "Too many users, can't allocate a free ID!"
 msgstr "Troppi utenti non posso allocare un ID libero!"
 
-#: plugins/personal/posix/main.inc:131
-msgid "Unix settings"
-msgstr "Impostazioni Unix"
-
 #: plugins/personal/posix/paste_generic.tpl:4
 #, fuzzy
 msgid "Posix settings"
@@ -1742,6 +1747,10 @@ msgstr "L'account spira dopo"
 msgid "Allow connection from these workstations only"
 msgstr "Permetti la connessione solo da queste workstation"
 
+#: plugins/personal/samba/main.inc:123
+msgid "Samba settings"
+msgstr "Impostazioni Samba"
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "Selezione le workstation da aggiungere"
@@ -1750,10 +1759,6 @@ msgstr "Selezione le workstation da aggiungere"
 msgid "Display workstations of department"
 msgstr "Mostra le workstation del dipartimento"
 
-#: plugins/personal/samba/main.inc:123
-msgid "Samba settings"
-msgstr "Impostazioni Samba"
-
 #: plugins/personal/samba/class_sambaAccount.inc:196
 msgid "This account has no samba extensions."
 msgstr "Questa identità non possiede estensioni Samba."
@@ -1848,6 +1853,11 @@ msgid ""
 "possible!"
 msgstr ""
 
+#: plugins/personal/environment/main.inc:124
+#, fuzzy
+msgid "User environment settings"
+msgstr "Opzioni di posta dell'identità"
+
 #: plugins/personal/environment/class_hotplugDialog.inc:111
 #, fuzzy
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
@@ -1872,12 +1882,6 @@ msgstr ""
 msgid "Please select an entry or press cancel."
 msgstr "Prego inserire un numero di telefono valido!"
 
-#: plugins/personal/environment/class_selectPrinterDialog.inc:67
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:99
-#, fuzzy
-msgid "Please select a printer or press cancel."
-msgstr "Prego inserire un numero di telefono valido!"
-
 #: plugins/personal/environment/hotplugDialog.tpl:1
 #, fuzzy
 msgid "Add hotplug devices"
@@ -1911,6 +1915,12 @@ msgstr "Mostra utenti che corrispondono a"
 msgid "Regular expression for        matching hotplugs"
 msgstr "Espressioni regolare per selezionare il nome del gruppo"
 
+#: plugins/personal/environment/class_selectPrinterDialog.inc:67
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:99
+#, fuzzy
+msgid "Please select a printer or press cancel."
+msgstr "Prego inserire un numero di telefono valido!"
+
 #: plugins/personal/environment/class_environment.inc:253
 #: plugins/personal/environment/class_environment.inc:290
 msgid "Remove environment extension"
@@ -1956,8 +1966,8 @@ msgstr "nessuno"
 
 #: plugins/personal/environment/class_environment.inc:510
 #: plugins/personal/environment/class_environment.inc:521
-#: plugins/admin/systems/class_terminalStartup.inc:134
 #: plugins/admin/systems/class_workstationStartup.inc:503
+#: plugins/admin/systems/class_terminalStartup.inc:134
 #, fuzzy
 msgid "You must specify a valid mount point."
 msgstr "Prego inserire un numero di telefono valido!"
@@ -2077,9 +2087,9 @@ msgid "Resolution"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:105
-#: plugins/admin/systems/servservice.tpl:11
 #: plugins/admin/systems/workstationStartup.tpl:86
 #: plugins/admin/systems/terminalStartup.tpl:66
+#: plugins/admin/systems/servservice.tpl:11
 #, fuzzy
 msgid "Shares"
 msgstr "reset"
@@ -2094,13 +2104,14 @@ msgstr "reset"
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:266
 #: plugins/admin/groups/class_groupMail.inc:537
 #: plugins/admin/applications/class_applicationParameters.inc:100
+#: plugins/admin/systems/glpiPrinter.tpl:122
 #: plugins/admin/systems/workstationStartup.tpl:101
-#: plugins/admin/systems/printer.tpl:48 plugins/admin/systems/servdns.tpl:8
+#: plugins/admin/systems/servdns.tpl:8
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/glpiManufacturer.tpl:8
-#: plugins/admin/systems/glpiPrinter.tpl:122
+#: plugins/admin/systems/printer.tpl:48
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:274
-#: ihtml/themes/altlinux/islocked.tpl:13
+#: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/lhs/islocked.tpl:13
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -2126,9 +2137,9 @@ msgid "Hotplug device settings"
 msgstr "Dispositivi del client"
 
 #: plugins/personal/environment/environment.tpl:164
-#: plugins/admin/groups/class_groupManagement.inc:455
+#: plugins/admin/groups/class_groupManagement.inc:456
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:273
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
 msgid "New"
 msgstr "Nuovo"
 
@@ -2146,16 +2157,6 @@ msgstr "Impostazioni Unix"
 msgid "Admin Toggle"
 msgstr "DN dell'amministratore"
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:96
-#, fuzzy
-msgid "Specified name is invalid."
-msgstr "Il valore specificato per l'UID non è valido."
-
-#: plugins/personal/environment/class_logonManagementDialog.inc:100
-#, fuzzy
-msgid "Specified description contains invalid characters."
-msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
-
 #: plugins/personal/environment/logonManagement.tpl:8
 #, fuzzy
 msgid "Logon script settings"
@@ -2168,22 +2169,21 @@ msgstr "Script path"
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:41
+#: plugins/gofax/blocklists/generic.tpl:41 plugins/addons/godfs/generic.tpl:12
+#: plugins/addons/godfs/generic.tpl:38 plugins/admin/fai/faiVariable.tpl:19
 #: plugins/admin/fai/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiVariable.tpl:19
-#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
-#: plugins/admin/fai/faiProfile.tpl:19
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:11
-#: plugins/admin/fai/faiScript.tpl:19
+#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
+#: plugins/admin/fai/faiProfile.tpl:19 plugins/admin/fai/faiScript.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:17
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHookEntry.tpl:17
 #: plugins/admin/fai/faiTemplateEntry.tpl:11 plugins/admin/fai/faiHook.tpl:19
 #: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/component.tpl:25 plugins/admin/systems/server.tpl:25
-#: plugins/admin/systems/phone.tpl:25 plugins/admin/systems/printer.tpl:13
-#: plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/server.tpl:25 plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/component.tpl:25 plugins/admin/systems/phone.tpl:25
+#: plugins/admin/systems/printer.tpl:13
 #: plugins/admin/systems/wingeneric.tpl:25
 #: plugins/admin/ogroups/generic.tpl:13 plugins/gofon/macro/generic.tpl:36
 #: plugins/gofon/conference/generic.tpl:51
@@ -2216,42 +2216,30 @@ msgstr ""
 
 #: plugins/personal/environment/logonManagement.tpl:75
 #: plugins/gofax/faxaccount/lists.tpl:31
-#: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiPackageConfiguration.tpl:6
+#: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiScriptEntry.tpl:68
+#: plugins/admin/fai/faiNewBranch.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:48
 #: plugins/admin/fai/faiPackageEntry.tpl:56
 #: plugins/admin/fai/faiHookEntry.tpl:70
 #: plugins/admin/fai/faiTemplateEntry.tpl:130
-#: plugins/admin/fai/faiNewBranch.tpl:19
-#: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/groups/application_options.tpl:8
-#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/systems/servRepositorySetup.tpl:41
+#: plugins/admin/systems/printerPPDDialog.tpl:22
 msgid "Apply"
 msgstr "Applica"
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:67
-#: plugins/personal/environment/class_kioskManagementDialog.inc:85
-#, php-format
-msgid "Can't delete '%s'. Error was: permission denied."
-msgstr ""
-
-#: plugins/personal/environment/class_kioskManagementDialog.inc:70
-#: plugins/personal/environment/class_kioskManagementDialog.inc:88
-#, php-format
-msgid "Can't delete '%s'. Errow was: file doesn't exist."
-msgstr ""
-
-#: plugins/personal/environment/class_kioskManagementDialog.inc:130
-msgid ""
-"There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
-msgstr ""
+#: plugins/personal/environment/class_logonManagementDialog.inc:96
+#, fuzzy
+msgid "Specified name is invalid."
+msgstr "Il valore specificato per l'UID non è valido."
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:136
-#, php-format
-msgid "Kiosk path '%s' is not accessible. Please check the permissions."
-msgstr ""
+#: plugins/personal/environment/class_logonManagementDialog.inc:100
+#, fuzzy
+msgid "Specified description contains invalid characters."
+msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:1
 #, fuzzy
@@ -2278,10 +2266,32 @@ msgstr "Dispositivi"
 msgid "save"
 msgstr "Salva"
 
-#: plugins/personal/environment/kioskManagement.tpl:1
-#: plugins/personal/environment/kioskManagement.tpl:5
-#, fuzzy
-msgid "Kiosk profile management"
+#: plugins/personal/environment/class_kioskManagementDialog.inc:67
+#: plugins/personal/environment/class_kioskManagementDialog.inc:85
+#, php-format
+msgid "Can't delete '%s'. Error was: permission denied."
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:70
+#: plugins/personal/environment/class_kioskManagementDialog.inc:88
+#, php-format
+msgid "Can't delete '%s'. Errow was: file doesn't exist."
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:130
+msgid ""
+"There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:136
+#, php-format
+msgid "Kiosk path '%s' is not accessible. Please check the permissions."
+msgstr ""
+
+#: plugins/personal/environment/kioskManagement.tpl:1
+#: plugins/personal/environment/kioskManagement.tpl:5
+#, fuzzy
+msgid "Kiosk profile management"
 msgstr "Riferimenti"
 
 #: plugins/personal/environment/kioskManagement.tpl:13
@@ -2291,22 +2301,152 @@ msgid "Browse"
 msgstr ""
 
 #: plugins/personal/environment/kioskManagement.tpl:25
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
 #: plugins/admin/systems/glpi_edit_type.tpl:15
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:14
 #: plugins/admin/systems/glpiManufacturer.tpl:13
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
 #: plugins/admin/systems/glpi_edit_os.tpl:15
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:14
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
 #: include/class_MultiSelectWindow.inc:45
 #, fuzzy
 msgid "Close"
 msgstr "Scegli"
 
-#: plugins/personal/environment/main.inc:124
-#, fuzzy
-msgid "User environment settings"
-msgstr "Opzioni di posta dell'identità"
+#: plugins/personal/generic/class_user.inc:256
+msgid "female"
+msgstr "femmina"
+
+#: plugins/personal/generic/class_user.inc:256
+msgid "male"
+msgstr "maschio"
+
+#: plugins/personal/generic/class_user.inc:270
+msgid "This account has no valid GOsa extensions."
+msgstr "Questa identità non possiede estensioni GOsa."
+
+#: plugins/personal/generic/class_user.inc:324
+msgid "The specified file has not been uploaded via HTTP POST! Aborted."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:420
+msgid "Please enter a valid serial number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:457
+#, php-format
+msgid "Certificate is valid from %s to %s and is currently %s."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:457
+msgid "valid"
+msgstr "valido"
+
+#: plugins/personal/generic/class_user.inc:457
+msgid "invalid"
+msgstr "invalido"
+
+#: plugins/personal/generic/class_user.inc:461
+msgid "No certificate installed"
+msgstr "Non ci sono certificati installati"
+
+#: plugins/personal/generic/class_user.inc:879
+msgid "Kerberos database communication failed"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:896
+msgid "Can't remove user from kerberos database."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:907
+msgid "Can't add user to kerberos database."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:947
+msgid "You have no permissions to create a user on this 'Base'."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:952
+msgid "You have no permissions to move a user from the original 'Base'."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:958
+#: plugins/addons/addressbook/class_addressbook.inc:545
+#: plugins/admin/users/class_userManagement.inc:634
+msgid "The required field 'Name' is not set."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:967
+msgid "There's already a person with this 'Login' in the database."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:973
+#: plugins/addons/addressbook/class_addressbook.inc:549
+#: plugins/admin/users/class_userManagement.inc:637
+msgid "The required field 'Given name' is not set."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:976
+msgid "The required field 'Login' is not set."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:983
+msgid ""
+"There's already a person with this 'Name'/'Given name' combination in the "
+"database."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:990
+msgid ""
+"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:993
+msgid "The field 'Homepage' contains an invalid URL definition."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:996
+#: plugins/personal/generic/class_user.inc:1021
+#: plugins/addons/addressbook/class_addressbook.inc:555
+#: plugins/addons/addressbook/class_addressbook.inc:583
+#: plugins/admin/departments/class_departmentGeneric.inc:211
+msgid "The field 'Name' contains invalid characters."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:999
+#: plugins/personal/generic/class_user.inc:1018
+#: plugins/addons/addressbook/class_addressbook.inc:558
+#: plugins/addons/addressbook/class_addressbook.inc:580
+msgid "The field 'Given name' contains invalid characters."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1004
+#: plugins/addons/addressbook/class_addressbook.inc:563
+#: plugins/addons/addressbook/class_addressbook.inc:566
+#: plugins/admin/departments/class_departmentGeneric.inc:214
+msgid "The field 'Phone' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1007
+#: plugins/addons/addressbook/class_addressbook.inc:569
+#: plugins/admin/departments/class_departmentGeneric.inc:217
+msgid "The field 'Fax' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1010
+#: plugins/addons/addressbook/class_addressbook.inc:572
+msgid "The field 'Mobile' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1013
+#: plugins/addons/addressbook/class_addressbook.inc:575
+msgid "The field 'Pager' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1140
+msgid "Could not open specified certificate!"
+msgstr "Impossibile aprite il certificato selezionato!"
 
 #: plugins/personal/generic/password.tpl:2
 msgid ""
@@ -2317,38 +2457,18 @@ msgstr ""
 "Hai modificato il metodo con cui la tua password è immagazzinata nel "
 "database LDAP. Per questo motivo devi inserire nuovamnete la tua password."
 
-#: plugins/personal/generic/generic_picture.tpl:5
-#: plugins/personal/generic/generic_picture.tpl:15
+#: 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_picture.tpl:5
+#: plugins/personal/generic/generic_picture.tpl:15
 #: plugins/personal/generic/paste_generic.tpl:41
 msgid "Personal picture"
 msgstr "Foto personale"
 
-#: plugins/personal/generic/generic_picture.tpl:27
-#: plugins/personal/generic/paste_generic.tpl:27
-msgid "Remove picture"
-msgstr "Elimina foto"
-
-#: plugins/personal/generic/generic_picture.tpl:33
-#: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
-#: plugins/admin/systems/servnfs.tpl:75
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
-#: plugins/admin/systems/servdnseditzone.tpl:117
-#: plugins/admin/systems/glpi_devices.tpl:760
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
-#: include/class_MultiSelectWindow.inc:44
-#: ihtml/themes/default/copyPasteDialog.tpl:12
-msgid "Save"
-msgstr "Salva"
-
-#: plugins/personal/generic/generic.tpl:6
-msgid "Personal information"
-msgstr "Informazioni personali"
-
 #: plugins/personal/generic/generic.tpl:24
 #: plugins/personal/generic/generic.tpl:34
 msgid "Change picture"
@@ -2382,8 +2502,8 @@ msgid "Login"
 msgstr "Nome utente"
 
 #: plugins/personal/generic/generic.tpl:67
-#: plugins/addons/addressbook/address_info.tpl:22
 #: plugins/addons/addressbook/address_edit.tpl:54
+#: plugins/addons/addressbook/address_info.tpl:22
 msgid "Personal title"
 msgstr "Titolo onorifico"
 
@@ -2397,7 +2517,7 @@ msgstr "Data di nascita"
 
 #: plugins/personal/generic/generic.tpl:100
 #: ihtml/themes/altlinux/sizelimit.tpl:14
-#: ihtml/themes/default/sizelimit.tpl:14
+#: ihtml/themes/default/sizelimit.tpl:14 ihtml/themes/lhs/sizelimit.tpl:14
 msgid "Set"
 msgstr "Imposta"
 
@@ -2411,30 +2531,31 @@ msgid "Preferred langage"
 msgstr "Lingua preferita"
 
 #: plugins/personal/generic/generic.tpl:127
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
 #: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/admin/fai/class_faiManagement.inc:670
-#: plugins/admin/groups/class_groupManagement.inc:458
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
+#: plugins/addons/godfs/class_dfsManagment.inc:186
+#: plugins/admin/fai/class_faiManagement.inc:678
+#: plugins/admin/groups/class_groupManagement.inc:459
 #: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/users/class_userManagement.inc:786
+#: plugins/admin/users/class_userManagement.inc:787
 #: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_applicationManagement.inc:477
+#: plugins/admin/applications/class_applicationManagement.inc:480
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_departmentManagement.inc:302
-#: plugins/admin/systems/component.tpl:13 plugins/admin/systems/server.tpl:13
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/terminal.tpl:18
-#: plugins/admin/systems/class_systemManagement.inc:771
-#: plugins/admin/systems/printer.tpl:20
+#: plugins/admin/departments/class_departmentManagement.inc:303
+#: plugins/admin/systems/server.tpl:13 plugins/admin/systems/terminal.tpl:18
 #: plugins/admin/systems/workstation.tpl:27
+#: plugins/admin/systems/component.tpl:13
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/phone.tpl:13
+#: plugins/admin/systems/class_systemManagement.inc:772
+#: plugins/admin/systems/printer.tpl:20
 #: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:43
-#: plugins/admin/ogroups/class_ogroupManagement.inc:451
-#: plugins/admin/ogroups/generic.tpl:21
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:330
-#: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/ogroups/class_ogroupManagement.inc:452
+#: plugins/admin/ogroups/generic.tpl:21 plugins/gofon/macro/generic.tpl:20
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 #: plugins/gofon/conference/generic.tpl:33
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
 msgid "Base"
 msgstr "Base"
 
@@ -2445,10 +2566,10 @@ msgstr "Scegli il subtree per l'utente"
 #: plugins/personal/generic/generic.tpl:134
 #: plugins/admin/groups/generic.tpl:26
 #: plugins/admin/departments/generic.tpl:33
-#: plugins/admin/systems/component.tpl:18 plugins/admin/systems/server.tpl:18
-#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/terminal.tpl:23
-#: plugins/admin/systems/printer.tpl:25
+#: plugins/admin/systems/server.tpl:18 plugins/admin/systems/terminal.tpl:23
 #: plugins/admin/systems/workstation.tpl:32
+#: plugins/admin/systems/component.tpl:18 plugins/admin/systems/phone.tpl:18
+#: plugins/admin/systems/printer.tpl:25
 #: plugins/admin/systems/wingeneric.tpl:18
 #: plugins/admin/ogroups/generic.tpl:26
 #, fuzzy
@@ -2457,10 +2578,10 @@ msgstr "Rimuovi"
 
 #: plugins/personal/generic/generic.tpl:147
 #: plugins/personal/generic/generic.tpl:291
-#: plugins/addons/addressbook/address_info.tpl:33
-#: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/addons/addressbook/address_edit.tpl:72
 #: plugins/addons/addressbook/address_edit.tpl:182
+#: plugins/addons/addressbook/address_info.tpl:33
+#: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/admin/departments/generic.tpl:55
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
 msgid "Address"
@@ -2504,16 +2625,16 @@ msgid "Organization"
 msgstr "Organizzazione"
 
 #: plugins/personal/generic/generic.tpl:213
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:323
-#: plugins/addons/addressbook/address_info.tpl:64
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
 #: plugins/addons/addressbook/address_edit.tpl:138
-#: plugins/admin/groups/class_groupManagement.inc:523
-#: plugins/admin/users/class_userManagement.inc:818
-#: plugins/admin/applications/class_applicationManagement.inc:518
-#: plugins/admin/systems/class_systemManagement.inc:791
-#: plugins/admin/ogroups/class_ogroupManagement.inc:517
-#: plugins/admin/ogroups/class_ogroupManagement.inc:585
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
+#: plugins/addons/addressbook/address_info.tpl:64
+#: plugins/admin/groups/class_groupManagement.inc:524
+#: plugins/admin/users/class_userManagement.inc:819
+#: plugins/admin/applications/class_applicationManagement.inc:521
+#: plugins/admin/systems/class_systemManagement.inc:792
+#: plugins/admin/ogroups/class_ogroupManagement.inc:518
+#: plugins/admin/ogroups/class_ogroupManagement.inc:586
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #: plugins/generic/references/class_reference.inc:38
 msgid "Department"
 msgstr "Dipartimento"
@@ -2537,12 +2658,13 @@ msgstr "Stanza No."
 
 #: plugins/personal/generic/generic.tpl:257
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_info.tpl:40
-#: plugins/addons/addressbook/address_edit.tpl:95 html/getxls.php:236
+#: 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:283
+#: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:43
 #: plugins/admin/departments/generic.tpl:51
 #: plugins/admin/systems/workstation.tpl:18 html/getxls.php:174
@@ -2588,8 +2710,8 @@ msgid "Street"
 msgstr "Strada"
 
 #: plugins/personal/generic/generic.tpl:365
-#: plugins/addons/addressbook/address_info.tpl:70
-#: plugins/addons/addressbook/address_edit.tpl:158 html/getxls.php:174
+#: plugins/addons/addressbook/address_edit.tpl:158
+#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
 msgid "Postal code"
 msgstr "CAP"
 
@@ -2609,6 +2731,26 @@ msgstr "Ultimo recapito"
 msgid "Public visible"
 msgstr "Pubblico"
 
+#: plugins/personal/generic/generic_picture.tpl:27
+#: plugins/personal/generic/paste_generic.tpl:27
+msgid "Remove picture"
+msgstr "Elimina foto"
+
+#: plugins/personal/generic/generic_picture.tpl:33
+#: plugins/addons/addressbook/address_edit.tpl:233
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
+#: plugins/admin/systems/servnfs.tpl:75
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
+#: plugins/admin/systems/servdnseditzone.tpl:117
+#: plugins/admin/systems/glpi_devices.tpl:760
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
+#: include/class_MultiSelectWindow.inc:44
+#: ihtml/themes/default/copyPasteDialog.tpl:12
+msgid "Save"
+msgstr "Salva"
+
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr "Certificato standard"
@@ -2625,141 +2767,6 @@ msgstr "Certificato PKCS12"
 msgid "Certificate serial number"
 msgstr "Numero seriale del certificato"
 
-#: plugins/personal/generic/class_user.inc:256
-msgid "female"
-msgstr "femmina"
-
-#: plugins/personal/generic/class_user.inc:256
-msgid "male"
-msgstr "maschio"
-
-#: plugins/personal/generic/class_user.inc:270
-msgid "This account has no valid GOsa extensions."
-msgstr "Questa identità non possiede estensioni GOsa."
-
-#: plugins/personal/generic/class_user.inc:324
-msgid "The specified file has not been uploaded via HTTP POST! Aborted."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:420
-msgid "Please enter a valid serial number"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:457
-#, php-format
-msgid "Certificate is valid from %s to %s and is currently %s."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:457
-msgid "valid"
-msgstr "valido"
-
-#: plugins/personal/generic/class_user.inc:457
-msgid "invalid"
-msgstr "invalido"
-
-#: plugins/personal/generic/class_user.inc:461
-msgid "No certificate installed"
-msgstr "Non ci sono certificati installati"
-
-#: plugins/personal/generic/class_user.inc:879
-msgid "Kerberos database communication failed"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:896
-msgid "Can't remove user from kerberos database."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:907
-msgid "Can't add user to kerberos database."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:947
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:952
-msgid "You have no permissions to move a user from the original 'Base'."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:958
-#: plugins/addons/addressbook/class_addressbook.inc:545
-#: plugins/admin/users/class_userManagement.inc:634
-msgid "The required field 'Name' is not set."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:967
-msgid "There's already a person with this 'Login' in the database."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:973
-#: plugins/addons/addressbook/class_addressbook.inc:549
-#: plugins/admin/users/class_userManagement.inc:637
-msgid "The required field 'Given name' is not set."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:976
-msgid "The required field 'Login' is not set."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:983
-msgid ""
-"There's already a person with this 'Name'/'Given name' combination in the "
-"database."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:990
-msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:993
-msgid "The field 'Homepage' contains an invalid URL definition."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:996
-#: plugins/personal/generic/class_user.inc:1021
-#: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/addons/addressbook/class_addressbook.inc:583
-#: plugins/admin/departments/class_departmentGeneric.inc:211
-msgid "The field 'Name' contains invalid characters."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:999
-#: plugins/personal/generic/class_user.inc:1018
-#: plugins/addons/addressbook/class_addressbook.inc:558
-#: plugins/addons/addressbook/class_addressbook.inc:580
-msgid "The field 'Given name' contains invalid characters."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1004
-#: plugins/addons/addressbook/class_addressbook.inc:563
-#: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/admin/departments/class_departmentGeneric.inc:214
-msgid "The field 'Phone' contains an invalid phone number."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1007
-#: plugins/addons/addressbook/class_addressbook.inc:569
-#: plugins/admin/departments/class_departmentGeneric.inc:217
-msgid "The field 'Fax' contains an invalid phone number."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1010
-#: plugins/addons/addressbook/class_addressbook.inc:572
-msgid "The field 'Mobile' contains an invalid phone number."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1013
-#: plugins/addons/addressbook/class_addressbook.inc:575
-msgid "The field 'Pager' contains an invalid phone number."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1140
-msgid "Could not open specified certificate!"
-msgstr "Impossibile aprite il certificato selezionato!"
-
 #: plugins/personal/generic/main.inc:107
 msgid "You are not allowed to set your password!"
 msgstr "Non hai il permesso di cambiare la tua password."
@@ -2808,14 +2815,19 @@ msgstr "Estenzioni FTP"
 msgid "Intranet account"
 msgstr "Crea estensioni telefoniche"
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:6
-msgid "WebDAV"
-msgstr "WebDAV"
-
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "Estenzioni PHPGroupware"
 
+#: plugins/personal/connectivity/glpi.tpl:1
+#, fuzzy
+msgid "GLPI account"
+msgstr "Estenzioni FTP"
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:6
+msgid "WebDAV"
+msgstr "WebDAV"
+
 #: plugins/personal/connectivity/kolab.tpl:1
 msgid "Kolab account"
 msgstr "Account Kolab"
@@ -2915,11 +2927,6 @@ msgstr "Seleziona per disabilitale l'accesso FTP"
 msgid "Temporary disable FTP access"
 msgstr "Disabilita temporaneamente l'accesso FTP"
 
-#: plugins/personal/connectivity/glpi.tpl:1
-#, fuzzy
-msgid "GLPI account"
-msgstr "Estenzioni FTP"
-
 #: plugins/personal/connectivity/oxchange.tpl:2
 msgid "Open-Xchange Account"
 msgstr ""
@@ -2952,6 +2959,30 @@ msgstr ""
 msgid "User Timezone"
 msgstr ""
 
+#: plugins/personal/connectivity/opengw.tpl:1
+#, fuzzy
+msgid "Opengroupware"
+msgstr "Estenzioni PHPGroupware"
+
+#: plugins/personal/connectivity/opengw.tpl:8
+#, fuzzy
+msgid "Location team"
+msgstr "Nome locazione"
+
+#: plugins/personal/connectivity/opengw.tpl:21
+#, fuzzy
+msgid "Template user"
+msgstr "Template"
+
+#: plugins/personal/connectivity/opengw.tpl:34
+#: plugins/admin/systems/class_workstationGeneric.inc:71
+msgid "Locked"
+msgstr ""
+
+#: plugins/personal/connectivity/opengw.tpl:49
+msgid "Teams"
+msgstr ""
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
@@ -2991,12 +3022,37 @@ msgstr ""
 msgid "Numerical value for Quota Setting is not valid."
 msgstr "Il valore di 'Dimensione quota' non è valido"
 
+#: plugins/personal/connectivity/class_intranetAccount.inc:14
+msgid "Intranet"
+msgstr ""
+
 #: plugins/personal/connectivity/class_pptpAccount.inc:26
 msgid "PPTP"
 msgstr ""
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:14
-msgid "Intranet"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
+msgstr "FTP"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+msgid "Value specified as 'Upload bandwidth' is not valid."
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:140
+msgid "Value specified as 'Download bandwidth' is not valid."
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:143
+msgid "Value specified as 'Files' is not valid."
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:146
+msgid "Value specified as 'Size' is not valid."
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:149
+msgid "Value specified as 'Ratio' is not valid."
 msgstr ""
 
 #: plugins/personal/connectivity/class_phpgwAccount.inc:5
@@ -3065,30 +3121,9 @@ msgstr ""
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
-#: plugins/generic/references/class_reference.inc:34
-msgid "FTP"
-msgstr "FTP"
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
-msgid "Value specified as 'Upload bandwidth' is not valid."
-msgstr ""
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:140
-msgid "Value specified as 'Download bandwidth' is not valid."
-msgstr ""
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:143
-msgid "Value specified as 'Files' is not valid."
-msgstr ""
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:146
-msgid "Value specified as 'Size' is not valid."
-msgstr ""
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:149
-msgid "Value specified as 'Ratio' is not valid."
-msgstr ""
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
+msgstr "Estenzioni WebDAV"
 
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:24
 msgid "Open-Xchange"
@@ -3144,64 +3179,79 @@ msgstr ""
 msgid "you are not using any strange characters in the loginname."
 msgstr ""
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
-msgstr "Estenzioni WebDAV"
-
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
+#: plugins/personal/connectivity/class_opengwAccount.inc:6
 #, fuzzy
-msgid "PHPscheduleit"
+msgid "Opengroupware account"
 msgstr "Estenzioni PHPGroupware"
 
+#: plugins/personal/connectivity/class_opengwAccount.inc:139
+msgid ""
+"OpenGroupware: Your configuration is missing a postgresql extension. Can't "
+"perform any database queries."
+msgstr ""
+
+#: plugins/personal/connectivity/class_opengwAccount.inc:144
+msgid ""
+"OpenGroupware: Missing database configuration for opengroupware. Can't get "
+"or set any informations."
+msgstr ""
+
+#: plugins/personal/connectivity/class_opengwAccount.inc:152
+msgid ""
+"OpenGroupware: Can't connect to specified database. Please check given "
+"configuration twice."
+msgstr ""
+
 #: plugins/personal/connectivity/class_connectivity.inc:63
 msgid "This account has no connectivity extensions."
 msgstr "Questa identità non possiede estensioni di connettività"
 
-#: plugins/personal/connectivity/opengw.tpl:1
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
 #, fuzzy
-msgid "Opengroupware"
+msgid "PHPscheduleit"
 msgstr "Estenzioni PHPGroupware"
 
-#: plugins/personal/connectivity/opengw.tpl:8
-#, fuzzy
-msgid "Location team"
-msgstr "Nome locazione"
-
-#: plugins/personal/connectivity/opengw.tpl:21
-#, fuzzy
-msgid "Template user"
-msgstr "Template"
+#: plugins/gofax/blocklists/generic.tpl:8
+msgid "List name"
+msgstr ""
 
-#: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:71
-msgid "Locked"
+#: plugins/gofax/blocklists/generic.tpl:10
+msgid "Name of blocklist"
 msgstr ""
 
-#: plugins/personal/connectivity/opengw.tpl:49
-msgid "Teams"
+#: plugins/gofax/blocklists/generic.tpl:16
+msgid "Select subtree to place blocklist in"
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:6
-#, fuzzy
-msgid "Opengroupware account"
-msgstr "Estenzioni PHPGroupware"
+#: plugins/gofax/blocklists/generic.tpl:32
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/systems/workstationService.tpl:42
+#: plugins/admin/systems/workstationService.tpl:120
+#: plugins/admin/systems/servnfs.tpl:39
+#: plugins/admin/systems/terminalService.tpl:42
+#: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/systems/glpi_devices.tpl:427
+#: plugins/admin/systems/glpi_devices.tpl:492
+#: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
+#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
+msgid "Type"
+msgstr "Tipo"
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:139
-msgid ""
-"OpenGroupware: Your configuration is missing a postgresql extension. Can't "
-"perform any database queries."
+#: plugins/gofax/blocklists/generic.tpl:34
+msgid "Select wether to filter incoming or outgoing calls"
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:144
-msgid ""
-"OpenGroupware: Missing database configuration for opengroupware. Can't get "
-"or set any informations."
+#: plugins/gofax/blocklists/generic.tpl:43
+msgid "Descriptive text for this blocklist"
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:152
-msgid ""
-"OpenGroupware: Can't connect to specified database. Please check given "
-"configuration twice."
+#: plugins/gofax/blocklists/generic.tpl:56
+msgid "Blocked numbers"
+msgstr ""
+
+#: plugins/gofax/blocklists/generic.tpl:72
+msgid "Numbers can also contain wild cards."
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
@@ -3222,74 +3272,76 @@ msgid "Please specify a valid phone number."
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/admin/fai/class_faiManagement.inc:635
+#: plugins/admin/fai/class_faiManagement.inc:641
 #: plugins/admin/groups/class_groupManagement.inc:451
 #: plugins/admin/users/class_userManagement.inc:778
-#: plugins/admin/applications/class_applicationManagement.inc:470
+#: plugins/admin/applications/class_applicationManagement.inc:472
 #: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
 #: plugins/admin/ogroups/class_ogroupManagement.inc:442
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
-msgid "Go up one department"
-msgstr "Sali di dipartimento"
+msgid "Go to root department"
+msgstr "Vai al dipartimento base"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/admin/fai/class_faiManagement.inc:635
-#: plugins/admin/fai/class_faiProfile.inc:303
+#: plugins/addons/godfs/class_dfsManagment.inc:183
+#: plugins/admin/fai/class_faiManagement.inc:641
 #: plugins/admin/groups/class_groupManagement.inc:451
 #: plugins/admin/users/class_userManagement.inc:778
-#: plugins/admin/applications/class_applicationManagement.inc:470
+#: plugins/admin/applications/class_applicationManagement.inc:472
 #: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
-#: plugins/admin/systems/class_servDNSeditZone.inc:276
+#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: plugins/admin/ogroups/class_ogroupManagement.inc:442
-#: plugins/admin/ogroups/phonequeue.tpl:17
+#: plugins/admin/ogroups/class_ogroupManagement.inc:443
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
-msgid "Up"
-msgstr ""
+msgid "Root"
+msgstr "Root"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
-#: plugins/admin/fai/class_faiManagement.inc:638
+#: plugins/admin/fai/class_faiManagement.inc:644
 #: plugins/admin/groups/class_groupManagement.inc:452
 #: plugins/admin/users/class_userManagement.inc:779
-#: plugins/admin/applications/class_applicationManagement.inc:471
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:297
-#: plugins/admin/systems/class_systemManagement.inc:755
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_systemManagement.inc:755
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/class_ogroupManagement.inc:443
+#: plugins/admin/ogroups/class_ogroupManagement.inc:444
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
-msgid "Go to root department"
-msgstr "Vai al dipartimento base"
+msgid "Go up one department"
+msgstr "Sali di dipartimento"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
-#: plugins/admin/fai/class_faiManagement.inc:638
+#: plugins/addons/godfs/class_dfsManagment.inc:182
+#: plugins/admin/fai/class_faiManagement.inc:644
+#: plugins/admin/fai/class_faiProfile.inc:303
 #: plugins/admin/groups/class_groupManagement.inc:452
 #: plugins/admin/users/class_userManagement.inc:779
-#: plugins/admin/applications/class_applicationManagement.inc:471
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:297
-#: plugins/admin/systems/class_systemManagement.inc:755
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_systemManagement.inc:755
+#: plugins/admin/systems/class_servDNSeditZone.inc:276
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
 #: plugins/admin/ogroups/class_ogroupManagement.inc:444
+#: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
-msgid "Root"
-msgstr "Root"
+msgid "Up"
+msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:309
 #: plugins/admin/groups/class_groupManagement.inc:453
 #: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:472
-#: plugins/admin/systems/class_systemManagement.inc:757
+#: plugins/admin/applications/class_applicationManagement.inc:474
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
 #: plugins/admin/ogroups/class_ogroupManagement.inc:445
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
@@ -3298,13 +3350,13 @@ msgid "Go to users department"
 msgstr "Vai agli utenti del dipartimento"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:309
-#: plugins/admin/fai/class_faiManagement.inc:641
+#: plugins/admin/fai/class_faiManagement.inc:647
 #: plugins/admin/groups/class_groupManagement.inc:453
 #: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:472
+#: plugins/admin/applications/class_applicationManagement.inc:474
 #: plugins/admin/departments/class_departmentManagement.inc:298
-#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
 #: plugins/admin/ogroups/class_ogroupManagement.inc:446
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
@@ -3312,217 +3364,205 @@ msgstr "Vai agli utenti del dipartimento"
 msgid "Home"
 msgstr "Home"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
+#: plugins/admin/fai/class_faiManagement.inc:649
+#: plugins/admin/groups/class_groupManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:781
+#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/departments/class_departmentManagement.inc:299
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/ogroups/class_ogroupManagement.inc:447
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
+msgid "Reload list"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
+#: plugins/addons/godfs/class_dfsManagment.inc:187
+#: plugins/admin/fai/class_faiManagement.inc:649
+#: plugins/admin/fai/class_faiManagement.inc:679
+#: plugins/admin/groups/class_groupManagement.inc:454
+#: plugins/admin/groups/class_groupManagement.inc:460
+#: plugins/admin/users/class_userManagement.inc:781
+#: plugins/admin/users/class_userManagement.inc:788
+#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/applications/class_applicationManagement.inc:481
+#: plugins/admin/departments/class_departmentManagement.inc:299
+#: plugins/admin/departments/class_departmentManagement.inc:304
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/ogroups/class_ogroupManagement.inc:447
+#: plugins/admin/ogroups/class_ogroupManagement.inc:453
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:332
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
+msgid "Submit"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
 #, fuzzy
 msgid "Create new blocklist"
 msgstr "Lista delle liste di blocchi"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
 #, fuzzy
 msgid "New Blocklist"
 msgstr "Liste di blocco"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/fai/class_faiManagement.inc:671
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:787
-#: plugins/admin/applications/class_applicationManagement.inc:478
-#: plugins/admin/departments/class_departmentManagement.inc:303
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_glpiSelectUser.inc:168
-#: plugins/admin/ogroups/class_ogroupManagement.inc:452
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
+#: plugins/addons/godfs/class_dfsManagment.inc:187
+#: plugins/admin/fai/class_faiManagement.inc:679
+#: plugins/admin/groups/class_groupManagement.inc:460
+#: plugins/admin/users/class_userManagement.inc:788
+#: plugins/admin/applications/class_applicationManagement.inc:481
+#: plugins/admin/departments/class_departmentManagement.inc:304
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/ogroups/class_ogroupManagement.inc:453
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:332
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
 msgid "Submit department"
 msgstr "Imposta dipartimento"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/fai/class_faiManagement.inc:671
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:787
-#: plugins/admin/applications/class_applicationManagement.inc:478
-#: plugins/admin/departments/class_departmentManagement.inc:303
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_glpiSelectUser.inc:168
-#: plugins/admin/ogroups/class_ogroupManagement.inc:452
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
-msgid "Submit"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
 #: plugins/admin/fai/class_faiScript.inc:227
 #: plugins/admin/fai/class_faiScript.inc:230
-#: plugins/admin/fai/class_faiManagement.inc:689
-#: plugins/admin/fai/class_faiManagement.inc:789
-#: plugins/admin/fai/class_faiManagement.inc:794
+#: plugins/admin/fai/class_faiManagement.inc:697
+#: plugins/admin/fai/class_faiManagement.inc:797
+#: plugins/admin/fai/class_faiManagement.inc:802
 #: plugins/admin/fai/class_faiHook.inc:251
 #: plugins/admin/fai/class_faiHook.inc:254
-#: plugins/admin/groups/class_groupManagement.inc:469
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/users/class_userManagement.inc:798
-#: plugins/admin/users/class_userManagement.inc:805
-#: plugins/admin/applications/class_applicationManagement.inc:489
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/departments/class_departmentManagement.inc:310
-#: plugins/admin/systems/class_systemManagement.inc:780
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/groups/class_groupManagement.inc:470
+#: plugins/admin/groups/class_groupManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:806
+#: plugins/admin/applications/class_applicationManagement.inc:492
+#: plugins/admin/applications/class_applicationManagement.inc:498
+#: plugins/admin/departments/class_departmentManagement.inc:311
 #: plugins/admin/systems/glpi.tpl:15 plugins/admin/systems/glpi.tpl:25
 #: plugins/admin/systems/glpi.tpl:35 plugins/admin/systems/glpiPrinter.tpl:15
 #: plugins/admin/systems/glpiPrinter.tpl:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:464
-#: plugins/admin/ogroups/class_ogroupManagement.inc:469
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/ogroups/class_ogroupManagement.inc:465
+#: plugins/admin/ogroups/class_ogroupManagement.inc:470
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
 msgid "edit"
 msgstr "modifica"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
-#: plugins/admin/users/class_userManagement.inc:799
-#: plugins/admin/users/class_userManagement.inc:806
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
+#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:807
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 #, fuzzy
 msgid "Edit user"
 msgstr "Modifica contatto"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
 #: plugins/addons/mailqueue/contents.tpl:93
 #: plugins/admin/fai/class_faiScript.inc:231
-#: plugins/admin/fai/class_faiManagement.inc:690
-#: plugins/admin/fai/class_faiManagement.inc:796
+#: plugins/admin/fai/class_faiManagement.inc:698
+#: plugins/admin/fai/class_faiManagement.inc:804
 #: plugins/admin/fai/class_faiHook.inc:255
-#: plugins/admin/groups/class_groupManagement.inc:471
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/users/class_userManagement.inc:802
-#: plugins/admin/users/class_userManagement.inc:809
-#: plugins/admin/applications/class_applicationManagement.inc:491
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/departments/class_departmentManagement.inc:311
-#: plugins/admin/systems/class_systemManagement.inc:781
-#: plugins/admin/ogroups/class_ogroupManagement.inc:466
-#: plugins/admin/ogroups/class_ogroupManagement.inc:471
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
+#: plugins/admin/groups/class_groupManagement.inc:472
+#: plugins/admin/groups/class_groupManagement.inc:477
+#: plugins/admin/users/class_userManagement.inc:803
+#: plugins/admin/users/class_userManagement.inc:810
+#: plugins/admin/applications/class_applicationManagement.inc:494
+#: plugins/admin/applications/class_applicationManagement.inc:500
+#: plugins/admin/departments/class_departmentManagement.inc:312
+#: plugins/admin/systems/class_systemManagement.inc:782
+#: plugins/admin/ogroups/class_ogroupManagement.inc:467
+#: plugins/admin/ogroups/class_ogroupManagement.inc:472
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:338
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
 msgid "delete"
 msgstr "elimina"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
-#: plugins/admin/users/class_userManagement.inc:803
-#: plugins/admin/users/class_userManagement.inc:810
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
+#: plugins/admin/users/class_userManagement.inc:804
+#: plugins/admin/users/class_userManagement.inc:811
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:338
 #, fuzzy
 msgid "Delete user"
 msgstr "Rimuovi"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:323
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
 #, fuzzy
 msgid "Blocklist name"
 msgstr "Liste di blocco"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:325
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/fai/class_faiManagement.inc:686
-#: plugins/admin/groups/class_groupManagement.inc:525
-#: plugins/admin/users/class_userManagement.inc:820
-#: plugins/admin/applications/class_applicationManagement.inc:519
-#: plugins/admin/departments/class_departmentManagement.inc:318
-#: plugins/admin/systems/class_systemManagement.inc:792
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/fai/class_faiManagement.inc:694
+#: plugins/admin/groups/class_groupManagement.inc:526
+#: plugins/admin/users/class_userManagement.inc:821
+#: plugins/admin/applications/class_applicationManagement.inc:522
+#: plugins/admin/departments/class_departmentManagement.inc:319
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
-#: plugins/admin/ogroups/class_ogroupManagement.inc:494
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
+#: plugins/admin/systems/class_systemManagement.inc:793
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/ogroups/class_ogroupManagement.inc:495
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:345
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:313
 msgid "Actions"
 msgstr "Azioni"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:327
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:328
 msgid "This table displays faxblocklists for the selected tree."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:395
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:396
 msgid "send"
 msgstr "invia"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:395
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:396
 msgid "receive"
 msgstr "ricevi"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:543
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:548
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:549
 #: plugins/admin/departments/class_departmentGeneric.inc:199
 msgid "Required field 'Name' is not set."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:551
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:552
 msgid "Required field 'Name' contains invalid characters"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:558
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:559
 msgid "Specified name is already used."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:565
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:566
 msgid "No permission to create a blocklist on this base."
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:8
-msgid "List name"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:10
-msgid "Name of blocklist"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:16
-msgid "Select subtree to place blocklist in"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:32
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
-#: plugins/admin/systems/workstationService.tpl:42
-#: plugins/admin/systems/workstationService.tpl:120
-#: plugins/admin/systems/servnfs.tpl:39
-#: plugins/admin/systems/terminalService.tpl:42
-#: plugins/admin/systems/terminalService.tpl:120
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
-#: plugins/admin/systems/glpi_devices.tpl:427
-#: plugins/admin/systems/glpi_devices.tpl:492
-#: plugins/admin/systems/glpi_devices.tpl:542
-#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
-msgid "Type"
-msgstr "Tipo"
-
-#: plugins/gofax/blocklists/generic.tpl:34
-msgid "Select wether to filter incoming or outgoing calls"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:43
-msgid "Descriptive text for this blocklist"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:56
-msgid "Blocked numbers"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:72
-msgid "Numbers can also contain wild cards."
-msgstr ""
-
 #: plugins/gofax/blocklists/remove.tpl:2
 #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/fai/remove.tpl:2
 #: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:237 html/index.php:243 html/index.php:301
-#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/altlinux/islocked.tpl:6
-#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
+#: plugins/admin/departments/remove.tpl:2
+#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/ogroups/remove.tpl:2 plugins/gofon/macro/remove.tpl:2
+#: plugins/gofon/conference/remove.tpl:2 html/index.php:237 html/index.php:243
+#: html/index.php:301 ihtml/themes/altlinux/conflict.tpl:6
+#: ihtml/themes/altlinux/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
+#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/lhs/conflict.tpl:6
+#: ihtml/themes/lhs/islocked.tpl:6
 msgid "Warning"
 msgstr "Attenzione"
 
@@ -3683,8 +3723,8 @@ msgid "FAX settings"
 msgstr "Impostazioni FAX"
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:6
-#: plugins/addons/addressbook/address_info.tpl:88
 #: plugins/addons/addressbook/address_edit.tpl:206
+#: plugins/addons/addressbook/address_info.tpl:88
 #: plugins/generic/references/class_reference.inc:30
 msgid "FAX"
 msgstr "FAX"
@@ -3764,7 +3804,7 @@ msgstr ""
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 #: plugins/admin/systems/class_printGeneric.inc:677
-#: plugins/admin/ogroups/class_ogroupManagement.inc:582
+#: plugins/admin/ogroups/class_ogroupManagement.inc:583
 msgid "User"
 msgstr ""
 
@@ -3801,62 +3841,23 @@ msgstr ""
 msgid "# pages"
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:6
-msgid "FAX Reports"
-msgstr "Rapporti FAX"
+#: plugins/gofax/faxreports/contents.tpl:2
+#: plugins/addons/logview/contents.tpl:2
+#: plugins/gofon/fonreports/contents.tpl:2
+msgid "Filter"
+msgstr "Filtro"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:109
-#: plugins/gofax/faxreports/class_faxreport.inc:119
-#: plugins/gofax/faxreports/class_faxreport.inc:165
-#: plugins/gofax/faxreports/class_faxreport.inc:274
-msgid "Can't connect to fax database, no reports can be shown!"
-msgstr ""
+#: plugins/gofax/faxreports/contents.tpl:6
+#: plugins/addons/addressbook/contents.tpl:102
+#: plugins/addons/mailqueue/contents.tpl:11
+#: plugins/addons/logview/contents.tpl:47
+#: plugins/gofon/fonreports/contents.tpl:6
+msgid "Search for"
+msgstr "Cerca"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:112
-#: plugins/addons/logview/class_logview.inc:66
-#: plugins/gofon/fonreports/class_fonreport.inc:99
-msgid "There is no mysql extension available, please check your php setup."
-msgstr ""
-
-#: plugins/gofax/faxreports/class_faxreport.inc:123
-#: plugins/gofax/faxreports/class_faxreport.inc:128
-#: plugins/gofax/faxreports/class_faxreport.inc:169
-#: plugins/gofax/faxreports/class_faxreport.inc:278
-msgid "Can't select fax database for report generation!"
-msgstr ""
-
-#: plugins/gofax/faxreports/class_faxreport.inc:177
-#: plugins/gofax/faxreports/class_faxreport.inc:286
-msgid "Query for fax database failed!"
-msgstr ""
-
-#: plugins/gofax/faxreports/class_faxreport.inc:185
-msgid "You have no permission to retrieve informations about this fax id!"
-msgstr ""
-
-#: plugins/gofax/faxreports/class_faxreport.inc:205
-#: plugins/gofax/faxreports/class_faxreport.inc:294
-#: plugins/gofon/fonreports/class_fonreport.inc:220
-msgid "Y-M-D"
-msgstr ""
-
-#: plugins/gofax/faxreports/contents.tpl:2
-#: plugins/addons/logview/contents.tpl:2
-#: plugins/gofon/fonreports/contents.tpl:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: plugins/gofax/faxreports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:102
-#: plugins/addons/mailqueue/contents.tpl:11
-#: plugins/addons/logview/contents.tpl:47
-#: plugins/gofon/fonreports/contents.tpl:6
-msgid "Search for"
-msgstr "Cerca"
-
-#: plugins/gofax/faxreports/contents.tpl:7
-#: plugins/gofon/fonreports/contents.tpl:7
-msgid "Enter user name to search for"
+#: plugins/gofax/faxreports/contents.tpl:7
+#: plugins/gofon/fonreports/contents.tpl:7
+msgid "Enter user name to search for"
 msgstr ""
 
 #: plugins/gofax/faxreports/contents.tpl:8
@@ -3881,6 +3882,7 @@ msgstr ""
 #: plugins/addons/mailqueue/contents.tpl:26
 #: plugins/addons/logview/contents.tpl:67
 #: plugins/gofon/fonreports/contents.tpl:21 ihtml/themes/default/help.tpl:21
+#: ihtml/themes/lhs/help.tpl:21
 msgid "Search"
 msgstr "Cerca"
 
@@ -3905,36 +3907,62 @@ msgstr ""
 msgid "Search returned no results..."
 msgstr ""
 
-#: plugins/gofax/faxreports/main.inc:5
-msgid "FAX reports"
+#: plugins/gofax/faxreports/class_faxreport.inc:6
+msgid "FAX Reports"
 msgstr "Rapporti FAX"
 
-#: plugins/addons/addressbook/dial.tpl:3
-msgid "Dial connection..."
+#: plugins/gofax/faxreports/class_faxreport.inc:109
+#: plugins/gofax/faxreports/class_faxreport.inc:119
+#: plugins/gofax/faxreports/class_faxreport.inc:165
+#: plugins/gofax/faxreports/class_faxreport.inc:274
+msgid "Can't connect to fax database, no reports can be shown!"
 msgstr ""
 
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:360
-#: plugins/addons/addressbook/class_addressbook.inc:367
-#: plugins/addons/addressbook/class_addressbook.inc:371
-#: plugins/addons/addressbook/class_addressbook.inc:453
-msgid "Dial"
+#: plugins/gofax/faxreports/class_faxreport.inc:112
+#: plugins/addons/logview/class_logview.inc:66
+#: plugins/gofon/fonreports/class_fonreport.inc:99
+msgid "There is no mysql extension available, please check your php setup."
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:123
+#: plugins/gofax/faxreports/class_faxreport.inc:128
+#: plugins/gofax/faxreports/class_faxreport.inc:169
+#: plugins/gofax/faxreports/class_faxreport.inc:278
+msgid "Can't select fax database for report generation!"
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:177
+#: plugins/gofax/faxreports/class_faxreport.inc:286
+msgid "Query for fax database failed!"
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:185
+msgid "You have no permission to retrieve informations about this fax id!"
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:205
+#: plugins/gofax/faxreports/class_faxreport.inc:294
+#: plugins/gofon/fonreports/class_fonreport.inc:220
+msgid "Y-M-D"
 msgstr ""
 
+#: plugins/gofax/faxreports/main.inc:5
+msgid "FAX reports"
+msgstr "Rapporti FAX"
+
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:513
 #: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/addons/addressbook/class_addressbook.inc:513
+#: plugins/admin/fai/faiVariable.tpl:9
 #: plugins/admin/fai/faiPartitionTable.tpl:9
-#: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiScriptEntry.tpl:9
-#: plugins/admin/fai/faiPackage.tpl:9 plugins/admin/fai/faiProfile.tpl:9
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiPackage.tpl:9
+#: plugins/admin/fai/faiProfile.tpl:9 plugins/admin/fai/faiScript.tpl:9
+#: plugins/admin/fai/faiVariableEntry.tpl:9
 #: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHookEntry.tpl:9
 #: plugins/admin/fai/faiTemplateEntry.tpl:7 plugins/admin/fai/faiHook.tpl:9
 #: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: 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
@@ -3948,14 +3976,16 @@ msgstr ""
 #: plugins/admin/systems/glpi_devices.tpl:615
 #: plugins/admin/systems/glpi_devices.tpl:669
 #: plugins/admin/systems/glpi_devices.tpl:715
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
 #: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
 msgid "Name"
 msgstr "Cognome"
 
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_info.tpl:29
 #: plugins/addons/addressbook/address_edit.tpl:66
+#: plugins/addons/addressbook/address_info.tpl:29
 msgid "Private"
 msgstr "Privato"
 
@@ -4018,6 +4048,60 @@ msgstr ""
 msgid "Search string"
 msgstr "Ricerca"
 
+#: plugins/addons/addressbook/dial.tpl:3
+msgid "Dial connection..."
+msgstr ""
+
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/class_addressbook.inc:360
+#: plugins/addons/addressbook/class_addressbook.inc:367
+#: plugins/addons/addressbook/class_addressbook.inc:371
+#: plugins/addons/addressbook/class_addressbook.inc:453
+msgid "Dial"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:7
+msgid "Choose the department to store entry in"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:24
+#: plugins/addons/addressbook/address_info.tpl:12
+msgid "Personal"
+msgstr "Personale"
+
+#: plugins/addons/addressbook/address_edit.tpl:44
+#: plugins/addons/addressbook/address_info.tpl:19 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Initials"
+msgstr "Iniziali"
+
+#: plugins/addons/addressbook/address_edit.tpl:105
+#: plugins/addons/addressbook/address_info.tpl:43
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:46
+msgid "Email"
+msgstr "Indirizzo email"
+
+#: plugins/addons/addressbook/address_edit.tpl:119
+#: plugins/addons/addressbook/address_info.tpl:53
+msgid "Organizational"
+msgstr "Organizzazione"
+
+#: plugins/addons/addressbook/address_edit.tpl:128
+#: plugins/addons/addressbook/address_info.tpl:61
+msgid "Company"
+msgstr "Azienda"
+
+#: plugins/addons/addressbook/address_edit.tpl:148
+#: plugins/addons/addressbook/address_info.tpl:67 html/getxls.php:174
+#: html/getxls.php:236
+msgid "City"
+msgstr "Città"
+
+#: plugins/addons/addressbook/address_edit.tpl:168
+#: plugins/addons/addressbook/address_info.tpl:73
+msgid "Country"
+msgstr "Paese"
+
 #: plugins/addons/addressbook/remove.tpl:6
 msgid ""
 "This includes all addressbook data in this entry. Please double check if "
@@ -4123,50 +4207,8 @@ msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
 
-#: plugins/addons/addressbook/address_info.tpl:12
-#: plugins/addons/addressbook/address_edit.tpl:24
-msgid "Personal"
-msgstr "Personale"
-
-#: plugins/addons/addressbook/address_info.tpl:19
-#: plugins/addons/addressbook/address_edit.tpl:44 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Initials"
-msgstr "Iniziali"
-
-#: plugins/addons/addressbook/address_info.tpl:43
-#: plugins/addons/addressbook/address_edit.tpl:105
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:46
-msgid "Email"
-msgstr "Indirizzo email"
-
-#: plugins/addons/addressbook/address_info.tpl:53
-#: plugins/addons/addressbook/address_edit.tpl:119
-msgid "Organizational"
-msgstr "Organizzazione"
-
-#: plugins/addons/addressbook/address_info.tpl:61
-#: plugins/addons/addressbook/address_edit.tpl:128
-msgid "Company"
-msgstr "Azienda"
-
-#: plugins/addons/addressbook/address_info.tpl:67
-#: plugins/addons/addressbook/address_edit.tpl:148 html/getxls.php:174
-#: html/getxls.php:236
-msgid "City"
-msgstr "Città"
-
-#: plugins/addons/addressbook/address_info.tpl:73
-#: plugins/addons/addressbook/address_edit.tpl:168
-msgid "Country"
-msgstr "Paese"
-
-#: plugins/addons/addressbook/address_edit.tpl:7
-msgid "Choose the department to store entry in"
-msgstr ""
-
-#: plugins/addons/mailqueue/class_mailqueue.inc:6
 #: plugins/addons/mailqueue/main.inc:23
+#: plugins/addons/mailqueue/class_mailqueue.inc:6
 msgid "Mail queue"
 msgstr "Coda della posta"
 
@@ -4632,239 +4674,367 @@ msgstr ""
 msgid "System log view"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:240
-#: plugins/admin/fai/class_faiScriptEntry.inc:89
-#: plugins/admin/fai/class_faiHook.inc:264
-#: plugins/admin/fai/class_faiHookEntry.inc:84
+#: plugins/addons/godfs/class_dfsManagment.inc:16
+#: plugins/addons/godfs/contents.tpl:8
 #, fuzzy
-msgid "Download"
-msgstr "Dominio"
+msgid "DFS Shares"
+msgstr "reset"
 
-#: plugins/admin/fai/tabsHook.inc:34 plugins/admin/fai/tabsPartition.inc:34
-#: plugins/admin/fai/tabsVariable.inc:34 plugins/admin/fai/tabsPackage.inc:33
-#: plugins/admin/fai/tabsProfile.inc:34 plugins/admin/fai/tabsScript.inc:34
-#: plugins/admin/fai/tabsTemplate.inc:34
-#: plugins/admin/departments/tabs_department.inc:31
-msgid "Try to move tree failed. Destination tree is subtree of source tree."
+#: plugins/addons/godfs/class_dfsManagment.inc:141
+msgid "No DFS entries found"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:32
+#: plugins/addons/godfs/class_dfsManagment.inc:182
 #, fuzzy
-msgid "FAI"
-msgstr "FAX"
-
-#: plugins/admin/fai/class_faiManagement.inc:33
-msgid "Fully Automatic Installation - management"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:228
-#, php-format
-msgid "You're about to delete all information about the FAI class at '%s'."
-msgstr ""
+msgid "Go up one dfsshare"
+msgstr "Sali di dipartimento"
 
-#: plugins/admin/fai/class_faiManagement.inc:234
-#: plugins/admin/fai/class_faiManagement.inc:272
-#: plugins/admin/systems/class_systemManagement.inc:532
-#: plugins/admin/systems/class_systemManagement.inc:603
-msgid "You are not allowed to delete this component!"
+#: plugins/addons/godfs/class_dfsManagment.inc:183
+msgid "Go to dfs root"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:324
-#, php-format
-msgid "You're about to delete a fai branch / freeze  '%s'."
-msgstr ""
+#: plugins/addons/godfs/class_dfsManagment.inc:184
+#, fuzzy
+msgid "Create new dfsshare"
+msgstr "Crea in"
 
-#: plugins/admin/fai/class_faiManagement.inc:327
+#: plugins/addons/godfs/class_dfsgeneric.inc:87
 #, fuzzy
-msgid "You are not allowed to delete this release!"
+msgid "You have no premissions to create a dfs share."
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: plugins/admin/fai/class_faiManagement.inc:382
+#: plugins/addons/godfs/class_dfsgeneric.inc:94
+#: plugins/addons/godfs/class_dfsgeneric.inc:96
 #, fuzzy
-msgid "Specified branch name is invalid."
-msgstr "Il valore specificato per l'UID non è valido."
+msgid "Dfs share already exists."
+msgstr "La password immessa come 'Nuova password' è vuota"
 
-#: plugins/admin/fai/class_faiManagement.inc:384
+#: plugins/addons/godfs/class_dfsgeneric.inc:101
 #, fuzzy
-msgid "Specified freeze name is invalid."
-msgstr "Il valore specificato per l'UID non è valido."
+msgid "Required Field \"Name of dfs Share\" is not set."
+msgstr "Il campo 'Indirizzo principale' non è stao inserito"
 
-#: plugins/admin/fai/class_faiManagement.inc:391
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:349
-#: plugins/admin/systems/class_servRepository.inc:208
+#: plugins/addons/godfs/class_dfsgeneric.inc:104
 #, fuzzy
-msgid "This name is already in use."
-msgstr "L'indirizzo principale inserito è già in uso."
-
-#: plugins/admin/fai/class_faiManagement.inc:605
-#: plugins/admin/fai/faiPackageNew.tpl:44 plugins/admin/users/template.tpl:44
-#: ihtml/themes/altlinux/setup_introduction.tpl:12
-#: ihtml/themes/altlinux/setup_useradmin.tpl:41
-#: ihtml/themes/altlinux/setup_step2.tpl:13
-#: ihtml/themes/altlinux/setup_step3.tpl:18
-#: ihtml/themes/default/setup_introduction.tpl:12
-#: ihtml/themes/default/setup_useradmin.tpl:41
-#: ihtml/themes/default/setup_step2.tpl:13
-#: ihtml/themes/default/setup_step3.tpl:18
-msgid "Continue"
-msgstr "Continua"
+msgid "Required Field \"Description\" is not set."
+msgstr "Il campo 'Indirizzo principale' non è stao inserito"
 
-#: plugins/admin/fai/class_faiManagement.inc:641
-#: plugins/admin/departments/class_departmentManagement.inc:298
+#: plugins/addons/godfs/class_dfsgeneric.inc:107
 #, fuzzy
-msgid "Go to users home department"
-msgstr "Mostra utenti del dipartimento"
+msgid "Required Field \"Fileserver\" is not set."
+msgstr "Il campo 'Indirizzo principale' non è stao inserito"
 
-#: plugins/admin/fai/class_faiManagement.inc:646
+#: plugins/addons/godfs/class_dfsgeneric.inc:110
 #, fuzzy
-msgid "New profile"
-msgstr "Riferimenti"
+msgid "Required Field \"Share on fileserver\" is not set."
+msgstr "Il campo 'Indirizzo principale' non è stao inserito"
 
-#: plugins/admin/fai/class_faiManagement.inc:646
+#: plugins/addons/godfs/class_dfsgeneric.inc:113
+#, fuzzy
+msgid "Required Field \"Location\" is not set."
+msgstr "Il campo 'Indirizzo principale' non è stao inserito"
+
+#: plugins/addons/godfs/contents.tpl:26
+#, fuzzy
+msgid ""
+"This menu allows you to create, delete and edit selected dfs shares. Having "
+"a large numbers of dfs shares, you might prefer the range selectors on top "
+"of the dfs share list."
+msgstr ""
+"Questo menù permette di creare, modificare e cancellare gli utenti "
+"selezionati. Avendo un gran numero di utenti, puoi usare i selettori di "
+"intervalli in cima alla lista degli utenti."
+
+#: plugins/addons/godfs/contents.tpl:40
+#, fuzzy
+msgid "Display dfs shares matching"
+msgstr "Mostra gli indirizzi che corrispondono"
+
+#: plugins/addons/godfs/contents.tpl:44
+#, fuzzy
+msgid "Regular expression for matching dfs share names"
+msgstr "Espressioni regolare per selezionare il nome del gruppo"
+
+#: plugins/addons/godfs/generic.tpl:4
+#, fuzzy
+msgid "DFS Properties"
+msgstr "Modifica proprietà"
+
+#: plugins/addons/godfs/generic.tpl:8
+msgid "Name of dfs Share"
+msgstr ""
+
+#: plugins/addons/godfs/generic.tpl:16
+#, fuzzy
+msgid "Fileserver"
+msgstr "Server"
+
+#: plugins/addons/godfs/generic.tpl:20
+#, fuzzy
+msgid "Share on Fileserver"
+msgstr "server"
+
+#: plugins/addons/godfs/generic.tpl:30
+#, fuzzy
+msgid "DFS Location"
+msgstr "Località"
+
+#: plugins/addons/godfs/main.inc:21 plugins/addons/godfs/main.inc:27
+msgid "Distributed Filesystem Administration"
+msgstr ""
+
+#: plugins/admin/fai/class_faiScript.inc:240
+#: plugins/admin/fai/class_faiScriptEntry.inc:89
+#: plugins/admin/fai/class_faiHook.inc:264
+#: plugins/admin/fai/class_faiHookEntry.inc:84
+#, fuzzy
+msgid "Download"
+msgstr "Dominio"
+
+#: plugins/admin/fai/faiVariable.tpl:32
+#: plugins/admin/fai/faiPartitionTable.tpl:32
+#: plugins/admin/fai/faiScript.tpl:32 plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/class_faiProfileEntry.inc:155
+#: plugins/admin/fai/faiHook.tpl:32
+#, fuzzy
+msgid "Objects"
+msgstr "Oggetto"
+
+#: plugins/admin/fai/faiVariable.tpl:34
+#, fuzzy
+msgid "List of assigned variables"
+msgstr "Scegli il tuo numero di telefono personale"
+
+#: plugins/admin/fai/faiVariable.tpl:40
+msgid "Choose a variable to delete or edit"
+msgstr ""
+
+#: 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/tabsTemplate.inc:34 plugins/admin/fai/tabsProfile.inc:34
+#: plugins/admin/fai/tabsScript.inc:34
+#: plugins/admin/departments/tabs_department.inc:31
+msgid "Try to move tree failed. Destination tree is subtree of source tree."
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackageEntry.inc:35
+#, fuzzy
+msgid "Please enter your search string here"
+msgstr "Prego inserire un numero di telefono valido!"
+
+#: plugins/admin/fai/class_faiPackageEntry.inc:48
+msgid ""
+"This list displays all assigned package names for this repository settings."
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackageEntry.inc:124
+#, php-format
+msgid ""
+"Your specified search string '%s' returned too many results. Only the first "
+"200 entries are shown, to keep the memory usage low."
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:32
+#, fuzzy
+msgid "FAI"
+msgstr "FAX"
+
+#: plugins/admin/fai/class_faiManagement.inc:33
+msgid "Fully Automatic Installation - management"
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:227
+#, php-format
+msgid "You're about to delete all information about the FAI class at '%s'."
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:233
+#: plugins/admin/fai/class_faiManagement.inc:271
+#: plugins/admin/systems/class_systemManagement.inc:532
+#: plugins/admin/systems/class_systemManagement.inc:603
+msgid "You are not allowed to delete this component!"
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:323
+#, php-format
+msgid "You're about to delete a fai branch / freeze  '%s'."
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:326
+#, fuzzy
+msgid "You are not allowed to delete this release!"
+msgstr "Non hai il permesso di cambiare la tua password."
+
+#: plugins/admin/fai/class_faiManagement.inc:382
+#, fuzzy
+msgid "Specified branch name is invalid."
+msgstr "Il valore specificato per l'UID non è valido."
+
+#: plugins/admin/fai/class_faiManagement.inc:384
+#, fuzzy
+msgid "Specified freeze name is invalid."
+msgstr "Il valore specificato per l'UID non è valido."
+
+#: plugins/admin/fai/class_faiManagement.inc:391
+#: plugins/admin/systems/class_servRepository.inc:208
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:349
+#, fuzzy
+msgid "This name is already in use."
+msgstr "L'indirizzo principale inserito è già in uso."
+
+#: plugins/admin/fai/class_faiManagement.inc:444
+#: plugins/admin/fai/class_faiManagement.inc:611
+#: plugins/admin/fai/faiPackageNew.tpl:44 plugins/admin/users/template.tpl:44
+#: plugins/admin/departments/class_departmentGeneric.inc:333
+#: ihtml/themes/altlinux/setup_introduction.tpl:12
+#: ihtml/themes/altlinux/setup_useradmin.tpl:41
+#: ihtml/themes/altlinux/setup_step2.tpl:13
+#: ihtml/themes/altlinux/setup_step3.tpl:18
+#: ihtml/themes/default/setup_introduction.tpl:12
+#: ihtml/themes/default/setup_useradmin.tpl:41
+#: ihtml/themes/default/setup_step2.tpl:13
+#: ihtml/themes/default/setup_step3.tpl:18
+#: ihtml/themes/lhs/setup_introduction.tpl:12
+#: ihtml/themes/lhs/setup_useradmin.tpl:41 ihtml/themes/lhs/setup_step2.tpl:13
+#: ihtml/themes/lhs/setup_step3.tpl:18
+msgid "Continue"
+msgstr "Continua"
+
+#: plugins/admin/fai/class_faiManagement.inc:647
+#: plugins/admin/departments/class_departmentManagement.inc:298
+#, fuzzy
+msgid "Go to users home department"
+msgstr "Mostra utenti del dipartimento"
+
+#: plugins/admin/fai/class_faiManagement.inc:654
+#, fuzzy
+msgid "New profile"
+msgstr "Riferimenti"
+
+#: plugins/admin/fai/class_faiManagement.inc:654
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
 msgid "P"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:651
+#: plugins/admin/fai/class_faiManagement.inc:659
 #, fuzzy
 msgid "New partition table"
 msgstr "Stampante"
 
-#: plugins/admin/fai/class_faiManagement.inc:651
+#: plugins/admin/fai/class_faiManagement.inc:659
 msgid "PT"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:654
+#: plugins/admin/fai/class_faiManagement.inc:662
 #, fuzzy
 msgid "New scripts"
 msgstr "Mostra stampanti"
 
-#: plugins/admin/fai/class_faiManagement.inc:654
+#: plugins/admin/fai/class_faiManagement.inc:662
 msgid "S"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:657
+#: plugins/admin/fai/class_faiManagement.inc:665
 #, fuzzy
 msgid "New hooks"
 msgstr "Mostra telefoni"
 
-#: plugins/admin/fai/class_faiManagement.inc:657
+#: plugins/admin/fai/class_faiManagement.inc:665
 msgid "H"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:660
+#: plugins/admin/fai/class_faiManagement.inc:668
 #, fuzzy
 msgid "New variables"
 msgstr "Mostra terminali"
 
-#: plugins/admin/fai/class_faiManagement.inc:660
+#: plugins/admin/fai/class_faiManagement.inc:668
 msgid "V"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:663
+#: plugins/admin/fai/class_faiManagement.inc:671
 #, fuzzy
 msgid "New templates"
 msgstr "Nuovo template"
 
-#: plugins/admin/fai/class_faiManagement.inc:663
+#: plugins/admin/fai/class_faiManagement.inc:671
 msgid "T"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:666
+#: plugins/admin/fai/class_faiManagement.inc:674
 #, fuzzy
 msgid "New package list"
 msgstr "Liste di blocco"
 
-#: plugins/admin/fai/class_faiManagement.inc:666
+#: plugins/admin/fai/class_faiManagement.inc:674
 msgid "PK"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:680
-#: plugins/admin/systems/class_systemManagement.inc:787
+#: plugins/admin/fai/class_faiManagement.inc:688
+#: plugins/admin/systems/class_systemManagement.inc:788
 msgid "This table displays all systems, in the selected tree."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:684
+#: plugins/admin/fai/class_faiManagement.inc:692
 msgid "Name of FAI class"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:685
+#: plugins/admin/fai/class_faiManagement.inc:693
 msgid "Class type"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:689
-#: plugins/admin/fai/class_faiManagement.inc:790
-#: plugins/admin/fai/class_faiManagement.inc:795
+#: plugins/admin/fai/class_faiManagement.inc:697
+#: plugins/admin/fai/class_faiManagement.inc:798
+#: plugins/admin/fai/class_faiManagement.inc:803
 #, fuzzy
 msgid "Edit class"
 msgstr "classe"
 
-#: plugins/admin/fai/class_faiManagement.inc:690
-#: plugins/admin/fai/class_faiManagement.inc:797
+#: plugins/admin/fai/class_faiManagement.inc:698
+#: plugins/admin/fai/class_faiManagement.inc:805
 #, fuzzy
 msgid "Delete class"
 msgstr "Rimuovi"
 
-#: plugins/admin/fai/class_faiManagement.inc:710
+#: plugins/admin/fai/class_faiManagement.inc:718
 #: plugins/admin/groups/class_groupApplication.inc:521
-#: plugins/admin/departments/class_departmentManagement.inc:334
+#: plugins/admin/departments/class_departmentManagement.inc:335
 #, fuzzy
 msgid "department"
 msgstr "dipartimenti"
 
-#: plugins/admin/fai/class_faiManagement.inc:731
-#: plugins/admin/fai/class_faiManagement.inc:732
+#: plugins/admin/fai/class_faiManagement.inc:739
+#: plugins/admin/fai/class_faiManagement.inc:740
 #: plugins/admin/fai/class_faiProfile.inc:297
 #: plugins/admin/fai/class_faiProfileEntry.inc:124
 msgid "Partition table"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:738
-#: plugins/admin/fai/class_faiManagement.inc:739
+#: plugins/admin/fai/class_faiManagement.inc:746
+#: plugins/admin/fai/class_faiManagement.inc:747
 msgid "Package list"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:745
-#: plugins/admin/fai/class_faiManagement.inc:746
+#: plugins/admin/fai/class_faiManagement.inc:753
+#: plugins/admin/fai/class_faiManagement.inc:754
 #, fuzzy
 msgid "Scripts"
 msgstr "Script path"
 
-#: plugins/admin/fai/class_faiManagement.inc:766
-#: plugins/admin/fai/class_faiManagement.inc:767
+#: plugins/admin/fai/class_faiManagement.inc:774
+#: plugins/admin/fai/class_faiManagement.inc:775
 #, fuzzy
 msgid "Profile"
 msgstr "Path del profilo"
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:35
-#, fuzzy
-msgid "Please enter your search string here"
-msgstr "Prego inserire un numero di telefono valido!"
-
-#: plugins/admin/fai/class_faiPackageEntry.inc:48
-msgid ""
-"This list displays all assigned package names for this repository settings."
-msgstr ""
-
-#: plugins/admin/fai/class_faiPackageEntry.inc:124
-#, php-format
-msgid ""
-"Your specified search string '%s' returned too many results. Only the first "
-"200 entries are shown, to keep the memory usage low."
-msgstr ""
-
 #: plugins/admin/fai/main.inc:38 plugins/admin/fai/main.inc:40
 msgid "Fully Automatic Installation"
 msgstr ""
 
-#: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiVariable.tpl:32 plugins/admin/fai/faiScript.tpl:32
-#: plugins/admin/fai/faiTemplate.tpl:29
-#: plugins/admin/fai/class_faiProfileEntry.inc:155
-#: plugins/admin/fai/faiHook.tpl:32
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
 #, fuzzy
-msgid "Objects"
-msgstr "Oggetto"
+msgid "Package"
+msgstr "Pacchetti"
 
 #: plugins/admin/fai/faiPartitionTable.tpl:34
 #, fuzzy
@@ -4929,10 +5099,19 @@ msgstr ""
 msgid "Regular expression for matching object names"
 msgstr ""
 
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
 #, fuzzy
-msgid "Package"
-msgstr "Pacchetti"
+msgid "Device"
+msgstr "Dispositivi"
+
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
+#, fuzzy
+msgid "Partition entries"
+msgstr "Destinazione"
+
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
+msgid "Add partition"
+msgstr ""
 
 #: plugins/admin/fai/class_faiScriptEntry.inc:68
 #: plugins/admin/fai/class_faiHookEntry.inc:71
@@ -4959,22 +5138,13 @@ msgstr "Inserisci la URI del server LDAP"
 msgid "Please enter a script."
 msgstr "Prego inserire un numero di telefono valido!"
 
-#: plugins/admin/fai/faiVariable.tpl:34
-#, fuzzy
-msgid "List of assigned variables"
-msgstr "Scegli il tuo numero di telefono personale"
-
-#: plugins/admin/fai/faiVariable.tpl:40
-msgid "Choose a variable to delete or edit"
-msgstr ""
-
 #: plugins/admin/fai/faiScriptEntry.tpl:29
-#: plugins/admin/groups/class_groupManagement.inc:524
-#: plugins/admin/users/class_userManagement.inc:819
+#: plugins/admin/groups/class_groupManagement.inc:525
+#: plugins/admin/users/class_userManagement.inc:820
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
-#: plugins/admin/ogroups/class_ogroupManagement.inc:493
+#: plugins/admin/ogroups/class_ogroupManagement.inc:494
 #: plugins/gofon/conference/generic.tpl:4
 msgid "Properties"
 msgstr ""
@@ -5018,8 +5188,8 @@ msgstr ""
 
 #: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:24
 #: plugins/admin/systems/workstationStartup.tpl:39
-#: plugins/admin/systems/servRepositorySetup.tpl:8
 #: plugins/admin/systems/class_servRepository.inc:242
+#: plugins/admin/systems/servRepositorySetup.tpl:8
 #, fuzzy
 msgid "Release"
 msgstr "Rimuovi"
@@ -5108,6 +5278,20 @@ msgstr ""
 msgid "FAI classes"
 msgstr "Scegli il tuo numero di telefono personale"
 
+#: plugins/admin/fai/remove.tpl:7
+msgid ""
+"This includes 'all' object information. Please double check if your really "
+"want to do this since there is no way for GOsa to get your data back."
+msgstr ""
+
+#: plugins/admin/fai/remove.tpl:11 plugins/admin/departments/remove.tpl:10
+#: plugins/admin/systems/remove.tpl:10 plugins/gofon/conference/remove.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your LDAP tree in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
 #, fuzzy
 msgid "FS type"
@@ -5182,20 +5366,6 @@ msgid ""
 "please check your configuration twice."
 msgstr ""
 
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
-#, fuzzy
-msgid "Device"
-msgstr "Dispositivi"
-
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
-#, fuzzy
-msgid "Partition entries"
-msgstr "Destinazione"
-
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
-msgid "Add partition"
-msgstr ""
-
 #: plugins/admin/fai/faiScript.tpl:34
 #, fuzzy
 msgid "List of scripts"
@@ -5253,12 +5423,55 @@ msgstr "reset"
 msgid "Please specify a value for the attribute 'content'."
 msgstr "Specificare una dimenzione valida per le mail da rigettare."
 
-#: plugins/admin/fai/faiVariableEntry.tpl:29
-#, fuzzy
-msgid "Variable attributes"
-msgstr "Attributo DN delle persone"
+#: plugins/admin/fai/faiNewBranch.tpl:5
+msgid ""
+"You are now going to create a branch or locked branch. This action clones "
+"the existing release to another release name. Branches can be modified as "
+"usual. FAI classes of locked branches cannot be modified, just additional "
+"classes are possible. Branch names should be alphanumeric, excluding the "
+"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
+"and 'fai'."
+msgstr ""
 
-#: plugins/admin/fai/faiVariableEntry.tpl:34
+#: plugins/admin/fai/faiNewBranch.tpl:11
+#, fuzzy
+msgid "Please enter a name for the branch"
+msgstr "Prego inserire un numero di telefono valido!"
+
+#: plugins/admin/fai/faiNewBranch.tpl:33
+#: plugins/admin/departments/recursive_move.tpl:1
+msgid "Processing the requested operation"
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:34
+msgid ""
+"As soon as the copy operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the fai management "
+"dialog."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:40
+#: plugins/admin/departments/recursive_move.tpl:7
+msgid ""
+"Your browser doesn't support iframes, please use this link to perform the "
+"requested operation."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:42
+msgid "Perform requested operation."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:42
+#, fuzzy
+msgid "Initiate operation"
+msgstr "Contatto"
+
+#: plugins/admin/fai/faiVariableEntry.tpl:29
+#, fuzzy
+msgid "Variable attributes"
+msgstr "Attributo DN delle persone"
+
+#: plugins/admin/fai/faiVariableEntry.tpl:34
 #, fuzzy
 msgid "Variable content"
 msgstr "Mostra terminali"
@@ -5284,20 +5497,6 @@ msgid ""
 "currently edited package list."
 msgstr ""
 
-#: plugins/admin/fai/remove.tpl:7
-msgid ""
-"This includes 'all' object information. Please double check if your really "
-"want to do this since there is no way for GOsa to get your data back."
-msgstr ""
-
-#: plugins/admin/fai/remove.tpl:11 plugins/admin/departments/remove.tpl:10
-#: plugins/admin/systems/remove.tpl:10 plugins/gofon/conference/remove.tpl:10
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
 #: plugins/admin/fai/headpage.tpl:6
 #, fuzzy
 msgid "List of FAI classes"
@@ -5320,12 +5519,14 @@ msgid "Current release"
 msgstr "Password attuale"
 
 #: plugins/admin/fai/headpage.tpl:47
-msgid "Create new branch using the current release"
-msgstr ""
+#, fuzzy
+msgid "Create new branch"
+msgstr "Crea in"
 
 #: plugins/admin/fai/headpage.tpl:51
-msgid "Create a locked version of the current release"
-msgstr ""
+#, fuzzy
+msgid "Create new locked branch"
+msgstr "Crea nuova conferenza"
 
 #: plugins/admin/fai/headpage.tpl:56
 #, fuzzy
@@ -5366,6 +5567,19 @@ msgstr "Mostra telefoni"
 msgid "Show partitions"
 msgstr "Mostra workstation"
 
+#: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
+#, fuzzy
+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 ""
+
 #: plugins/admin/fai/class_faiPartitionTable.inc:263
 #: plugins/admin/fai/class_faiPartitionTable.inc:269
 #, fuzzy, php-format
@@ -5393,19 +5607,6 @@ msgstr ""
 msgid "Class name"
 msgstr "Scegli il tuo numero di telefono personale"
 
-#: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
-#, fuzzy
-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 ""
-
 #: plugins/admin/fai/class_faiPackageConfiguration.inc:45
 #, php-format
 msgid "Debconf information for package '%s'"
@@ -5488,13 +5689,13 @@ msgid "Choose class name"
 msgstr "Scegli il tuo numero di telefono personale"
 
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
+#: plugins/admin/systems/glpiDeviceManagement.tpl:51
 #: plugins/admin/systems/class_glpiSelectUser.inc:113
 #: plugins/admin/systems/class_glpiSelectUser.inc:140
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:51
 #: plugins/admin/systems/glpiAttachmentPool.tpl:51
-#: plugins/admin/systems/glpiDeviceManagement.tpl:51
 #: plugins/admin/systems/SelectDeviceType.tpl:44
-#: plugins/admin/systems/class_baseSelectDialog.inc:39
+#: plugins/admin/systems/class_baseSelectDialog.inc:40
 #, fuzzy
 msgid "Use"
 msgstr "Utenti"
@@ -5504,6 +5705,13 @@ msgstr "Utenti"
 msgid "A new class name."
 msgstr "Applicazioni disponibili"
 
+#: plugins/admin/fai/remove_branch.tpl:6
+msgid ""
+"This includes all account data, system access, etc. for this branch. Please "
+"double check if your really want to do this since there is no way for GOsa "
+"to get your data back."
+msgstr ""
+
 #: plugins/admin/fai/class_faiTemplateEntry.inc:81
 msgid "no file uploaded yet"
 msgstr ""
@@ -5560,8 +5768,8 @@ msgstr "Nuovo template"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:40
 #: plugins/admin/applications/generic.tpl:95
-#: plugins/admin/systems/printerPPDDialog.tpl:11
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
+#: plugins/admin/systems/printerPPDDialog.tpl:11
 msgid "Upload"
 msgstr ""
 
@@ -5571,7 +5779,7 @@ msgid "Destination path"
 msgstr "Destinazione"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
 msgid "Owner"
 msgstr ""
 
@@ -5579,7 +5787,7 @@ msgstr ""
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
 #: plugins/admin/systems/class_printGeneric.inc:672
 #: plugins/admin/systems/class_printGeneric.inc:674
-#: plugins/admin/ogroups/class_ogroupManagement.inc:583
+#: plugins/admin/ogroups/class_ogroupManagement.inc:584
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr "Gruppo"
@@ -5647,54 +5855,70 @@ msgstr "Lista delle liste di blocchi"
 msgid "Choose a hook to delete or edit"
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:5
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
+#: plugins/admin/groups/class_groupGeneric.inc:122
+msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:11
-#, fuzzy
-msgid "Please enter a name for the branch"
-msgstr "Prego inserire un numero di telefono valido!"
+#: plugins/admin/groups/class_groupGeneric.inc:179
+msgid "This 'dn' is no group."
+msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:33
-#: plugins/admin/departments/recursive_moce.tpl:1
+#: plugins/admin/groups/class_groupGeneric.inc:329
+msgid "Samba group"
+msgstr "Gruppo Samba"
+
+#: plugins/admin/groups/class_groupGeneric.inc:329
+msgid "Domain admins"
+msgstr "Amministratori di Dominio"
+
+#: plugins/admin/groups/class_groupGeneric.inc:329
+msgid "Domain users"
+msgstr "Utenti di Dominio"
+
+#: plugins/admin/groups/class_groupGeneric.inc:330
+msgid "Domain guests"
+msgstr "Ospiti di Dominio"
+
+#: plugins/admin/groups/class_groupGeneric.inc:335
+#, php-format
+msgid "Special group (%d)"
+msgstr "Gruppo speciale (%d)"
+
+#: plugins/admin/groups/class_groupGeneric.inc:445
+#, php-format
 msgid ""
-"Processing requested operation, the status of this operation will be "
-"displayed in an iframe below."
+"Your search method returned more than '%s' users, only '%s' users are shown."
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:34
-msgid ""
-"As soon as the operation has finished, you can scroll down to end of the "
-"page and press the 'Back' button to return to the fai management dialog."
+#: plugins/admin/groups/class_groupGeneric.inc:462
+msgid "! unknown id"
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:42
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
+#: plugins/admin/groups/class_groupGeneric.inc:598
+#, php-format
+msgid "No configured SID found for '%s'."
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:44
-msgid "Perform requested operation."
+#: plugins/admin/groups/class_groupGeneric.inc:603
+#, php-format
+msgid "No configured RIDBASE found for '%s'."
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:44
-#, fuzzy
-msgid "Initiate operation"
-msgstr "Contatto"
+#: plugins/admin/groups/class_groupGeneric.inc:716
+#: plugins/admin/ogroups/class_ogroup.inc:655
+msgid "You have no permissions to create a group on this 'Base'."
+msgstr ""
 
-#: plugins/admin/fai/remove_branch.tpl:6
+#: plugins/admin/groups/class_groupGeneric.inc:726
 msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for GOsa "
-"to get your data back."
+"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:738
+#: plugins/admin/groups/class_groupGeneric.inc:752
+#: plugins/admin/groups/class_groupGeneric.inc:759
+msgid "Value specified as 'Name' is already used."
 msgstr ""
 
 #: plugins/admin/groups/mail.tpl:11 plugins/admin/groups/paste_mail.tpl:12
@@ -5721,6 +5945,65 @@ msgstr "Permessi dei membri"
 msgid "Forward messages to non group members"
 msgstr "Inoltra i messaggi ai membri esterni al gruppo"
 
+#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
+msgstr "Lista dei gruppi"
+
+#: plugins/admin/groups/headpage.tpl:25
+msgid ""
+"This menu allows you to add, edit and remove selected groups. You may want "
+"to use the range selector on top of the group listbox, when working with a "
+"large number of groups."
+msgstr ""
+"Questo menù permette di creare, modificare e cancellare i gruppi "
+"selezionati. Avendo un gran numero di gruppi, puoi usare i selettori di "
+"intervalli in cima alla lista dei gruppi."
+
+#: plugins/admin/groups/headpage.tpl:41
+msgid "Select to see groups that are primary groups of users"
+msgstr "Selezione per mostrare i gruppi che sono gruppi primari per gli utenti"
+
+#: plugins/admin/groups/headpage.tpl:42
+msgid "Show primary groups"
+msgstr "Mostra gruppi principali"
+
+#: plugins/admin/groups/headpage.tpl:46
+msgid "Select to see groups that have samba groups mappings"
+msgstr "Seleziona per mostrare i gruppi che sono gruppi samba per gli utenti"
+
+#: plugins/admin/groups/headpage.tpl:47
+msgid "Show samba groups"
+msgstr "Mostra gruppi samba"
+
+#: plugins/admin/groups/headpage.tpl:50
+msgid "Select to see groups that have applications configured"
+msgstr ""
+"Seleziona per mostrare i gruppi che hanno configurate delle applicazioni"
+
+#: plugins/admin/groups/headpage.tpl:51
+msgid "Show application groups"
+msgstr "Mostra gruppi di applicazioni"
+
+#: plugins/admin/groups/headpage.tpl:54
+msgid "Select to see groups that have mail settings"
+msgstr "Seleziona per mostrare i gruppi che hanno configurata la posta"
+
+#: plugins/admin/groups/headpage.tpl:55
+msgid "Show mail groups"
+msgstr "Mostra gruppi di posta"
+
+#: plugins/admin/groups/headpage.tpl:58
+msgid "Select to see normal groups that have only functional aspects"
+msgstr "Seleziona per mostrare i gruppi che hanno solo aspetti funzionali"
+
+#: plugins/admin/groups/headpage.tpl:59
+msgid "Show functional groups"
+msgstr "Mostra gruppi funzionali"
+
+#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
+msgid "Group administration"
+msgstr "Amministrazione dei gruppi di utenti"
+
 #: plugins/admin/groups/class_groupManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:55 html/getxls.php:97
 #: html/getxls.php:99 html/getxls.php:244
@@ -5739,7 +6022,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:441
 #: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/applications/class_applicationManagement.inc:460
+#: plugins/admin/applications/class_applicationManagement.inc:462
 #: plugins/admin/ogroups/class_ogroupManagement.inc:431
 #, fuzzy
 msgid "Paste"
@@ -5747,226 +6030,105 @@ msgstr "Data"
 
 #: plugins/admin/groups/class_groupManagement.inc:443
 #: plugins/admin/users/class_userManagement.inc:769
-#: plugins/admin/applications/class_applicationManagement.inc:462
+#: plugins/admin/applications/class_applicationManagement.inc:464
 #: plugins/admin/ogroups/class_ogroupManagement.inc:433
 #, fuzzy
 msgid "Can't paste"
 msgstr "Crea estensioni telefoniche"
 
-#: plugins/admin/groups/class_groupManagement.inc:455
+#: plugins/admin/groups/class_groupManagement.inc:456
 #, fuzzy
 msgid "Create new group"
 msgstr "Crea estensioni telefoniche"
 
-#: plugins/admin/groups/class_groupManagement.inc:465
-#: plugins/admin/users/class_userManagement.inc:795
-#: plugins/admin/applications/class_applicationManagement.inc:485
-#: plugins/admin/ogroups/class_ogroupManagement.inc:460
+#: plugins/admin/groups/class_groupManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/applications/class_applicationManagement.inc:488
+#: plugins/admin/ogroups/class_ogroupManagement.inc:461
 #, fuzzy
 msgid "cut"
 msgstr "Esegui"
 
-#: plugins/admin/groups/class_groupManagement.inc:465
-#: plugins/admin/users/class_userManagement.inc:795
-#: plugins/admin/applications/class_applicationManagement.inc:485
-#: plugins/admin/ogroups/class_ogroupManagement.inc:460
+#: plugins/admin/groups/class_groupManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/applications/class_applicationManagement.inc:488
+#: plugins/admin/ogroups/class_ogroupManagement.inc:461
 #, fuzzy
 msgid "Cut this entry"
 msgstr "Modifica questo record"
 
-#: plugins/admin/groups/class_groupManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:797
-#: plugins/admin/applications/class_applicationManagement.inc:487
-#: plugins/admin/ogroups/class_ogroupManagement.inc:462
+#: plugins/admin/groups/class_groupManagement.inc:468
+#: plugins/admin/users/class_userManagement.inc:798
+#: plugins/admin/applications/class_applicationManagement.inc:490
+#: plugins/admin/ogroups/class_ogroupManagement.inc:463
 msgid "copy"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:797
-#: plugins/admin/applications/class_applicationManagement.inc:487
-#: plugins/admin/ogroups/class_ogroupManagement.inc:462
+#: plugins/admin/groups/class_groupManagement.inc:468
+#: plugins/admin/users/class_userManagement.inc:798
+#: plugins/admin/applications/class_applicationManagement.inc:490
+#: plugins/admin/ogroups/class_ogroupManagement.inc:463
 #, fuzzy
 msgid "Copy this entry"
 msgstr "Modifica questo record"
 
-#: plugins/admin/groups/class_groupManagement.inc:469
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/applications/class_applicationManagement.inc:489
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/departments/class_departmentManagement.inc:310
-#: plugins/admin/ogroups/class_ogroupManagement.inc:464
-#: plugins/admin/ogroups/class_ogroupManagement.inc:469
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
+#: plugins/admin/groups/class_groupManagement.inc:470
+#: plugins/admin/groups/class_groupManagement.inc:475
+#: plugins/admin/applications/class_applicationManagement.inc:492
+#: plugins/admin/applications/class_applicationManagement.inc:498
+#: plugins/admin/departments/class_departmentManagement.inc:311
+#: plugins/admin/ogroups/class_ogroupManagement.inc:465
+#: plugins/admin/ogroups/class_ogroupManagement.inc:470
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
 msgid "Edit this entry"
 msgstr "Modifica questo record"
 
-#: plugins/admin/groups/class_groupManagement.inc:471
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/applications/class_applicationManagement.inc:491
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/departments/class_departmentManagement.inc:311
-#: plugins/admin/ogroups/class_ogroupManagement.inc:466
-#: plugins/admin/ogroups/class_ogroupManagement.inc:471
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
+#: plugins/admin/groups/class_groupManagement.inc:472
+#: plugins/admin/groups/class_groupManagement.inc:477
+#: plugins/admin/applications/class_applicationManagement.inc:494
+#: plugins/admin/applications/class_applicationManagement.inc:500
+#: plugins/admin/departments/class_departmentManagement.inc:312
+#: plugins/admin/ogroups/class_ogroupManagement.inc:467
+#: plugins/admin/ogroups/class_ogroupManagement.inc:472
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
 msgid "Delete this entry"
 msgstr "Elimina questo record"
 
-#: plugins/admin/groups/class_groupManagement.inc:499
-#: plugins/admin/users/class_userManagement.inc:856
+#: plugins/admin/groups/class_groupManagement.inc:500
+#: plugins/admin/users/class_userManagement.inc:857
 #, fuzzy
 msgid "Posix"
 msgstr "Proxy"
 
-#: plugins/admin/groups/class_groupManagement.inc:508
-#: plugins/admin/applications/class_applicationManagement.inc:509
-#: plugins/admin/ogroups/class_ogroupManagement.inc:584
+#: plugins/admin/groups/class_groupManagement.inc:509
+#: plugins/admin/applications/class_applicationManagement.inc:512
+#: plugins/admin/ogroups/class_ogroupManagement.inc:585
 #: plugins/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
 msgid "Application"
 msgstr "Applicazione"
 
-#: plugins/admin/groups/class_groupManagement.inc:523
+#: plugins/admin/groups/class_groupManagement.inc:524
 #, fuzzy
 msgid "Groupname"
 msgstr "Nome gruppo"
 
-#: plugins/admin/groups/class_groupManagement.inc:528
-#: plugins/admin/applications/class_applicationManagement.inc:523
-#: plugins/admin/ogroups/class_ogroupManagement.inc:498
+#: plugins/admin/groups/class_groupManagement.inc:529
+#: plugins/admin/applications/class_applicationManagement.inc:526
+#: plugins/admin/ogroups/class_ogroupManagement.inc:499
 msgid "This table displays all groups, in the selected tree."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:122
-msgid "Can't find this groups SID in LDAP or in your configuration file!"
+#: plugins/admin/groups/remove.tpl:6
+msgid ""
+"This may be a primary user group. Please double check if you really want to "
+"do this since there is no way for GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:179
-msgid "This 'dn' is no group."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:329
-msgid "Samba group"
-msgstr "Gruppo Samba"
-
-#: plugins/admin/groups/class_groupGeneric.inc:329
-msgid "Domain admins"
-msgstr "Amministratori di Dominio"
-
-#: plugins/admin/groups/class_groupGeneric.inc:329
-msgid "Domain users"
-msgstr "Utenti di Dominio"
-
-#: plugins/admin/groups/class_groupGeneric.inc:330
-msgid "Domain guests"
-msgstr "Ospiti di Dominio"
-
-#: plugins/admin/groups/class_groupGeneric.inc:335
-#, php-format
-msgid "Special group (%d)"
-msgstr "Gruppo speciale (%d)"
-
-#: plugins/admin/groups/class_groupGeneric.inc:445
-#, php-format
-msgid ""
-"Your search method returned more than '%s' users, only '%s' users are shown."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:462
-msgid "! unknown id"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:598
-#, php-format
-msgid "No configured SID found for '%s'."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:603
-#, php-format
-msgid "No configured RIDBASE found for '%s'."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:716
-#: plugins/admin/ogroups/class_ogroup.inc:655
-msgid "You have no permissions to create a group on this 'Base'."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:726
-msgid ""
-"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:738
-#: plugins/admin/groups/class_groupGeneric.inc:752
-#: plugins/admin/groups/class_groupGeneric.inc:759
-msgid "Value specified as 'Name' is already used."
-msgstr ""
-
-#: plugins/admin/groups/remove.tpl:6
-msgid ""
-"This may be a primary user group. Please double check if you really want to "
-"do this since there is no way for GOsa to get your data back."
-msgstr ""
-
-#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
-msgid "Group administration"
-msgstr "Amministrazione dei gruppi di utenti"
-
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
-msgid "List of groups"
-msgstr "Lista dei gruppi"
-
-#: plugins/admin/groups/headpage.tpl:25
-msgid ""
-"This menu allows you to add, edit and remove selected groups. You may want "
-"to use the range selector on top of the group listbox, when working with a "
-"large number of groups."
-msgstr ""
-"Questo menù permette di creare, modificare e cancellare i gruppi "
-"selezionati. Avendo un gran numero di gruppi, puoi usare i selettori di "
-"intervalli in cima alla lista dei gruppi."
-
-#: plugins/admin/groups/headpage.tpl:41
-msgid "Select to see groups that are primary groups of users"
-msgstr "Selezione per mostrare i gruppi che sono gruppi primari per gli utenti"
-
-#: plugins/admin/groups/headpage.tpl:42
-msgid "Show primary groups"
-msgstr "Mostra gruppi principali"
-
-#: plugins/admin/groups/headpage.tpl:46
-msgid "Select to see groups that have samba groups mappings"
-msgstr "Seleziona per mostrare i gruppi che sono gruppi samba per gli utenti"
-
-#: plugins/admin/groups/headpage.tpl:47
-msgid "Show samba groups"
-msgstr "Mostra gruppi samba"
-
-#: plugins/admin/groups/headpage.tpl:50
-msgid "Select to see groups that have applications configured"
-msgstr ""
-"Seleziona per mostrare i gruppi che hanno configurate delle applicazioni"
-
-#: plugins/admin/groups/headpage.tpl:51
-msgid "Show application groups"
-msgstr "Mostra gruppi di applicazioni"
-
-#: plugins/admin/groups/headpage.tpl:54
-msgid "Select to see groups that have mail settings"
-msgstr "Seleziona per mostrare i gruppi che hanno configurata la posta"
-
-#: plugins/admin/groups/headpage.tpl:55
-msgid "Show mail groups"
-msgstr "Mostra gruppi di posta"
-
-#: plugins/admin/groups/headpage.tpl:58
-msgid "Select to see normal groups that have only functional aspects"
-msgstr "Seleziona per mostrare i gruppi che hanno solo aspetti funzionali"
-
-#: plugins/admin/groups/headpage.tpl:59
-msgid "Show functional groups"
-msgstr "Mostra gruppi funzionali"
+#: plugins/admin/groups/application_options.tpl:1
+msgid "Application options"
+msgstr "Opzioni applicazione"
 
 #: plugins/admin/groups/class_groupMail.inc:278
 msgid "read"
@@ -6016,6 +6178,8 @@ msgid "Please select a valid mail server."
 msgstr "Prego inserire un numero di telefono valido!"
 
 #: plugins/admin/groups/acl.tpl:4
+#: plugins/admin/departments/class_departmentGeneric.inc:314
+#: include/class_ldap.inc:412
 msgid "Object"
 msgstr "Oggetto"
 
@@ -6137,9 +6301,10 @@ msgstr "Amministratori cartella"
 msgid "Select a specific department"
 msgstr "Selezione un dipartimento"
 
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
-msgstr "Opzioni applicazione"
+#: plugins/admin/groups/paste_generic.tpl:1
+#, fuzzy
+msgid "Group settings"
+msgstr "Impostazioni FAX"
 
 #: plugins/admin/groups/mail_locals.tpl:32
 msgid "Display addresses of department"
@@ -6217,11 +6382,6 @@ msgstr "Dominio"
 msgid "Insert seperator"
 msgstr ""
 
-#: plugins/admin/groups/paste_generic.tpl:1
-#, fuzzy
-msgid "Group settings"
-msgstr "Impostazioni FAX"
-
 #: plugins/admin/users/password.tpl:2
 msgid ""
 "To change the user password use the fields below. The changes take effect "
@@ -6229,10 +6389,31 @@ msgid ""
 "able to login without it."
 msgstr ""
 
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr "Crea un nuovo utente usando i template"
+
+#: plugins/admin/users/template.tpl:6
+msgid ""
+"Creating a new user can be assisted by using templates. Many database "
+"records will be filled automatically. Choose 'none' to skip the usage of "
+"templates."
+msgstr ""
+
+#: plugins/admin/users/template.tpl:11
+#: plugins/admin/users/class_userManagement.inc:1181
+#: plugins/admin/systems/class_systemManagement.inc:918
+msgid "Template"
+msgstr ""
+
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
+msgstr "Amministrazione utenti"
+
 #: plugins/admin/users/class_userManagement.inc:25
-#: plugins/admin/systems/printer.tpl:66
-#: plugins/admin/systems/class_glpiSelectUser.inc:112 html/getxls.php:68
-#: html/getxls.php:70 html/getxls.php:243
+#: plugins/admin/systems/class_glpiSelectUser.inc:112
+#: plugins/admin/systems/printer.tpl:66 html/getxls.php:68 html/getxls.php:70
+#: html/getxls.php:243
 msgid "Users"
 msgstr "Utenti"
 
@@ -6262,108 +6443,103 @@ msgstr "nessuno"
 msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:782
+#: plugins/admin/users/class_userManagement.inc:783
 #, fuzzy
 msgid "Create new user"
 msgstr "Crea in"
 
-#: plugins/admin/users/class_userManagement.inc:782
+#: plugins/admin/users/class_userManagement.inc:783
 #, fuzzy
 msgid "New user"
 msgstr "utenti"
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:784
 #, fuzzy
 msgid "Create new template"
 msgstr "Nuovo template"
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:784
 msgid "New template"
 msgstr "Nuovo template"
 
-#: plugins/admin/users/class_userManagement.inc:800
-#: plugins/admin/users/class_userManagement.inc:807
+#: plugins/admin/users/class_userManagement.inc:801
+#: plugins/admin/users/class_userManagement.inc:808
 #, fuzzy
 msgid "password"
 msgstr "Password"
 
-#: plugins/admin/users/class_userManagement.inc:818
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
+#: plugins/admin/users/class_userManagement.inc:819
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
-#: ihtml/themes/default/setup_useradmin.tpl:22
+#: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/default/login.tpl:28 ihtml/themes/default/login.tpl:32
+#: ihtml/themes/default/setup_useradmin.tpl:22 ihtml/themes/lhs/login.tpl:28
+#: ihtml/themes/lhs/login.tpl:32 ihtml/themes/lhs/setup_useradmin.tpl:22
 msgid "Username"
 msgstr "Nome utente"
 
-#: plugins/admin/users/class_userManagement.inc:823
+#: plugins/admin/users/class_userManagement.inc:824
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:854
+#: plugins/admin/users/class_userManagement.inc:855
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:855
+#: plugins/admin/users/class_userManagement.inc:856
 #, fuzzy
 msgid "Edit generic properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:857
+#: plugins/admin/users/class_userManagement.inc:858
 #, fuzzy
 msgid "Edit UNIX properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:859
+#: plugins/admin/users/class_userManagement.inc:860
 #, fuzzy
 msgid "Edit environment properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:861
+#: plugins/admin/users/class_userManagement.inc:862
 #, fuzzy
 msgid "Edit mail properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:863
+#: plugins/admin/users/class_userManagement.inc:864
 #, fuzzy
 msgid "Edit phone properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:865
+#: plugins/admin/users/class_userManagement.inc:866
 #, fuzzy
 msgid "Edit fax properies"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:867
+#: plugins/admin/users/class_userManagement.inc:868
 #, fuzzy
 msgid "Edit samba properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:868
+#: plugins/admin/users/class_userManagement.inc:869
 #, fuzzy
 msgid "Create user from template"
 msgstr "Nuovo template"
 
-#: plugins/admin/users/class_userManagement.inc:869
+#: plugins/admin/users/class_userManagement.inc:870
 #, fuzzy
 msgid "Create user with this template"
 msgstr "Nuovo template"
 
-#: plugins/admin/users/class_userManagement.inc:928
+#: plugins/admin/users/class_userManagement.inc:929
 #, fuzzy
 msgid "Online"
 msgstr "nessuno"
 
-#: plugins/admin/users/class_userManagement.inc:935
+#: plugins/admin/users/class_userManagement.inc:936
 msgid "Offline"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:1180
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/systems/class_systemManagement.inc:917
-msgid "Template"
-msgstr ""
-
 #: plugins/admin/users/remove.tpl:6
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -6430,60 +6606,10 @@ msgstr "Seleziona per vedere gli utenti proxy"
 msgid "Show proxy users"
 msgstr "Mostra utenti proxy"
 
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
-msgstr "Amministrazione utenti"
-
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
-msgstr "Crea un nuovo utente usando i template"
-
-#: plugins/admin/users/template.tpl:6
-msgid ""
-"Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose 'none' to skip the usage of "
-"templates."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:52
-msgid "Remove options"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:53
-msgid "This application has options. You can disable them by clicking below."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:55
-msgid "Create options"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:56
-msgid ""
-"This application has options disabled. You can enable them by clicking below."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:93
-msgid "Variable"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:93
-#: plugins/gofon/macro/parameter.tpl:9
-msgid "Default value"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:104
-msgid "Add option"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:158
-#, php-format
-msgid "Value '%s' specified as option name is not valid."
-msgstr ""
-
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
+#: plugins/admin/applications/class_applicationManagement.inc:521
 #: plugins/admin/applications/class_applicationGeneric.inc:379
-#: plugins/admin/applications/class_applicationManagement.inc:518
 msgid "Application name"
 msgstr "Nome applicazione"
 
@@ -6537,21 +6663,56 @@ msgstr ""
 msgid "Place entry in members launch bar"
 msgstr ""
 
-#: plugins/admin/applications/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
-msgid ""
-"This may be used by several groups. Please double check if your really want "
-"to do this since there is no way for GOsa to get your data back."
+#: plugins/admin/applications/class_applicationParameters.inc:52
+msgid "Remove options"
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:6
-msgid "List of applications"
-msgstr "Lista delle applicazioni"
-
-#: plugins/admin/applications/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit and remove selected applications. You may "
-"want to use the range selector on top of the application listbox, when "
-"working with a large number of applications."
+#: plugins/admin/applications/class_applicationParameters.inc:53
+msgid "This application has options. You can disable them by clicking below."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:55
+msgid "Create options"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:56
+msgid ""
+"This application has options disabled. You can enable them by clicking below."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:93
+msgid "Variable"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:93
+#: plugins/gofon/macro/parameter.tpl:9
+msgid "Default value"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:104
+msgid "Add option"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:158
+#, php-format
+msgid "Value '%s' specified as option name is not valid."
+msgstr ""
+
+#: plugins/admin/applications/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
+msgid ""
+"This may be used by several groups. Please double check if your really want "
+"to do this since there is no way for GOsa to get your data back."
+msgstr ""
+
+#: plugins/admin/applications/headpage.tpl:6
+msgid "List of applications"
+msgstr "Lista delle applicazioni"
+
+#: plugins/admin/applications/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit and remove selected applications. You may "
+"want to use the range selector on top of the application listbox, when "
+"working with a large number of applications."
 msgstr ""
 
 #: plugins/admin/applications/headpage.tpl:56
@@ -6567,6 +6728,27 @@ msgstr ""
 msgid "Application management"
 msgstr ""
 
+#: plugins/admin/applications/class_applicationManagement.inc:376
+#, php-format
+msgid "You're about to delete the application '%s'."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationManagement.inc:382
+#: plugins/admin/applications/class_applicationManagement.inc:408
+msgid "You are not allowed to delete this application!"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationManagement.inc:477
+#: plugins/admin/ogroups/class_ogroupManagement.inc:449
+#, fuzzy
+msgid "new"
+msgstr "Nuovo"
+
+#: plugins/admin/applications/class_applicationManagement.inc:477
+#, fuzzy
+msgid "Create new application"
+msgstr "Crea estensioni per le applicazioni"
+
 #: plugins/admin/applications/class_applicationGeneric.inc:87
 #, fuzzy
 msgid "no example"
@@ -6605,27 +6787,6 @@ msgstr ""
 msgid "Application settings"
 msgstr "Opzioni applicazione"
 
-#: plugins/admin/applications/class_applicationManagement.inc:374
-#, php-format
-msgid "You're about to delete the application '%s'."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationManagement.inc:380
-#: plugins/admin/applications/class_applicationManagement.inc:406
-msgid "You are not allowed to delete this application!"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationManagement.inc:474
-#: plugins/admin/ogroups/class_ogroupManagement.inc:448
-#, fuzzy
-msgid "new"
-msgstr "Nuovo"
-
-#: plugins/admin/applications/class_applicationManagement.inc:474
-#, fuzzy
-msgid "Create new application"
-msgstr "Crea estensioni per le applicazioni"
-
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr ""
@@ -6703,46 +6864,10 @@ msgstr ""
 msgid "Department management"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:185
-msgid "You have no permissions to create a department on this 'Base'."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:192
-#: plugins/admin/departments/class_departmentGeneric.inc:194
-msgid "Department with that 'Name' already exists."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:202
-msgid "Required field 'Description' is not set."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:207
-msgid "The field 'Name' contains the reserved word 'incoming'."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:208
-msgid " Please choose another name."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:274
-#, php-format
-msgid "Moving %s in %s"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:313
-#, php-format
-msgid "FAILED to copy %s, aborting operation"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:321
-#, fuzzy
-msgid "Complete"
-msgstr "incompleto"
-
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
 #: plugins/admin/ogroups/class_ogroupManagement.inc:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:492
+#: plugins/admin/ogroups/class_ogroupManagement.inc:493
 msgid "Departments"
 msgstr "Dipartimenti"
 
@@ -6757,69 +6882,102 @@ msgstr ""
 msgid "You have no permission to remove this department."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:300
+#: plugins/admin/departments/class_departmentManagement.inc:301
 #, fuzzy
 msgid "Create new department"
 msgstr "Lista dei dipartimenti"
 
-#: plugins/admin/departments/class_departmentManagement.inc:308
+#: plugins/admin/departments/class_departmentManagement.inc:309
 msgid "This table displays all departments, in the selected tree."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:317
+#: plugins/admin/departments/class_departmentManagement.inc:318
 #, fuzzy
 msgid "Department name"
 msgstr "Dipartimento"
 
-#: plugins/admin/departments/class_departmentManagement.inc:411
+#: plugins/admin/departments/class_departmentManagement.inc:412
 msgid ".."
 msgstr ""
 
-#: plugins/admin/departments/recursive_moce.tpl:3
+#: plugins/admin/departments/class_departmentGeneric.inc:185
+msgid "You have no permissions to create a department on this 'Base'."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:192
+#: plugins/admin/departments/class_departmentGeneric.inc:194
+msgid "Department with that 'Name' already exists."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:202
+msgid "Required field 'Description' is not set."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:207
+msgid "The field 'Name' contains the reserved word 'incoming'."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:208
+msgid " Please choose another name."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:278
+#, php-format
+msgid "Moving %s to %s"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:317
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
+msgstr ""
+
+#: plugins/admin/departments/recursive_move.tpl:2
 msgid ""
-"Your browser isn't able to display this iframe ... use the link below intead"
+"As soon as the move operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the department "
+"management dialog."
 msgstr ""
 
 #: plugins/admin/systems/class_terminalInfo.inc:54
-#: plugins/admin/systems/class_terminalInfo.inc:199
+#: plugins/admin/systems/class_terminalInfo.inc:200
 msgid "present"
 msgstr "presente"
 
-#: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_terminalService.inc:158
-#: plugins/admin/systems/class_terminalStartup.inc:99
+#: plugins/admin/systems/class_terminalInfo.inc:68
 #: plugins/admin/systems/class_workstationService.inc:151
 #: plugins/admin/systems/class_workstationStartup.inc:372
+#: plugins/admin/systems/class_terminalService.inc:158
+#: plugins/admin/systems/class_terminalStartup.inc:99
 #: plugins/admin/systems/class_terminalGeneric.inc:153
 msgid "This 'dn' has no terminal features."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:74
+#: plugins/admin/systems/class_terminalInfo.inc:75
 msgid "There is no php snmp module installed, can't gather any informations."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:80
-#: plugins/admin/systems/class_terminalInfo.inc:174
+#: plugins/admin/systems/class_terminalInfo.inc:81
+#: plugins/admin/systems/class_terminalInfo.inc:175
 msgid "unknown status"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:89
+#: plugins/admin/systems/class_terminalInfo.inc:90
 msgid "This is a virtual terminal which has no properties to show here."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:107
+#: plugins/admin/systems/class_terminalInfo.inc:108
 msgid "online"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:163
+#: plugins/admin/systems/class_terminalInfo.inc:164
 msgid "running"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:166
+#: plugins/admin/systems/class_terminalInfo.inc:167
 msgid "not running"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:191
+#: plugins/admin/systems/class_terminalInfo.inc:192
 msgid "offline"
 msgstr ""
 
@@ -6853,8 +7011,8 @@ msgid "Zone"
 msgstr "telefoni"
 
 #: plugins/admin/systems/network.tpl:42
-#: plugins/admin/systems/class_servDNS.inc:298
 #: plugins/admin/systems/servdnseditzone.tpl:81
+#: plugins/admin/systems/class_servDNS.inc:298
 msgid "TTL"
 msgstr ""
 
@@ -6863,430 +7021,452 @@ msgstr ""
 msgid "Dns records"
 msgstr "Directory"
 
-#: plugins/admin/systems/class_winGeneric.inc:73
-#: plugins/admin/systems/class_componentGeneric.inc:50
-msgid "This 'dn' has no network features."
-msgstr ""
-
-#: plugins/admin/systems/class_winGeneric.inc:162
-#: plugins/admin/systems/class_componentGeneric.inc:145
-msgid "You have no permissions to create a component on this 'Base'."
-msgstr ""
-
-#: plugins/admin/systems/class_winGeneric.inc:172
-#: plugins/admin/systems/class_phoneGeneric.inc:314
-#: plugins/admin/systems/class_terminalGeneric.inc:286
-#: plugins/admin/systems/class_servGeneric.inc:209
-#: plugins/admin/systems/class_workstationGeneric.inc:245
-#: plugins/admin/systems/class_printGeneric.inc:529
-#: plugins/admin/systems/class_componentGeneric.inc:155
-#, php-format
-msgid "There is already an entry '%s' in the base choosen by you"
-msgstr ""
-
-#: plugins/admin/systems/info.tpl:1
-msgid "System information"
+#: plugins/admin/systems/workstationService.tpl:4
+#: plugins/admin/systems/terminalService.tpl:4
+msgid "Keyboard"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:7
-msgid "CPU"
+#: plugins/admin/systems/workstationService.tpl:7
+#: plugins/admin/systems/terminalService.tpl:7
+#: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/printerPPDDialog.tpl:5
+msgid "Model"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:10
-msgid "Memory"
+#: plugins/admin/systems/workstationService.tpl:9
+#: plugins/admin/systems/terminalService.tpl:9
+msgid "Choose keyboard model"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:13
-msgid "Boot MAC"
+#: plugins/admin/systems/workstationService.tpl:15
+#: plugins/admin/systems/terminalService.tpl:15
+msgid "Layout"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:16
-msgid "USB support"
+#: plugins/admin/systems/workstationService.tpl:17
+#: plugins/admin/systems/terminalService.tpl:17
+msgid "Choose keyboard layout"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:19 plugins/admin/systems/info.tpl:87
-msgid "System status"
+#: plugins/admin/systems/workstationService.tpl:23
+#: plugins/admin/systems/terminalService.tpl:23
+msgid "Variant"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:23
-msgid "Inventory number"
+#: plugins/admin/systems/workstationService.tpl:25
+#: plugins/admin/systems/terminalService.tpl:25
+msgid "Choose keyboard variant"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:27
-msgid "Last login"
+#: plugins/admin/systems/workstationService.tpl:39
+#: plugins/admin/systems/terminalService.tpl:39
+msgid "Mouse"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:38
-msgid "Network devices"
+#: plugins/admin/systems/workstationService.tpl:44
+#: plugins/admin/systems/terminalService.tpl:44
+msgid "Choose mouse type"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:47
-msgid "IDE devices"
+#: plugins/admin/systems/workstationService.tpl:50
+#: plugins/admin/systems/terminalService.tpl:50
+msgid "Port"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:56
-msgid "SCSI devices"
+#: plugins/admin/systems/workstationService.tpl:52
+#: plugins/admin/systems/terminalService.tpl:52
+msgid "Choose mouse port"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:64
-msgid "Floppy device"
-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:23
+msgid "Telephone hardware"
+msgstr "Dispositivo telefonico"
 
-#: plugins/admin/systems/info.tpl:68
-msgid "CDROM device"
-msgstr ""
+#: plugins/admin/systems/workstationService.tpl:69
+#: plugins/admin/systems/terminalService.tpl:69
+#: plugins/gofon/phoneaccount/generic.tpl:26
+#: plugins/gofon/phoneaccount/generic.tpl:28
+#: plugins/gofon/phoneaccount/paste_generic.tpl:25
+msgid "Telephone"
+msgstr "Telefono"
 
-#: plugins/admin/systems/info.tpl:73
 #: plugins/admin/systems/workstationService.tpl:83
+#: plugins/admin/systems/info.tpl:73
 #: plugins/admin/systems/terminalService.tpl:83
 msgid "Graphic device"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:77
-msgid "Audio device"
+#: plugins/admin/systems/workstationService.tpl:86
+#: plugins/admin/systems/terminalService.tpl:86
+#: plugins/admin/systems/printer.tpl:46
+msgid "Driver"
+msgstr "Driver"
+
+#: plugins/admin/systems/workstationService.tpl:88
+#: plugins/admin/systems/terminalService.tpl:88
+msgid "Choose graphic driver that is needed by the installed graphic board"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:93
-msgid "Up since"
+#: plugins/admin/systems/workstationService.tpl:96
+#: plugins/admin/systems/terminalService.tpl:96
+msgid "Choose screen resolution used in graphic mode"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:96
-msgid "CPU load"
+#: plugins/admin/systems/workstationService.tpl:102
+#: plugins/admin/systems/terminalService.tpl:102
+msgid "Color depth"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:99
-msgid "Memory usage"
+#: plugins/admin/systems/workstationService.tpl:104
+#: plugins/admin/systems/terminalService.tpl:104
+msgid "Choose colordepth used in graphic mode"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:102
-msgid "Swap usage"
+#: plugins/admin/systems/workstationService.tpl:117
+#: plugins/admin/systems/terminalService.tpl:117
+msgid "Display device"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:116
-msgid "SSH service"
+#: plugins/admin/systems/workstationService.tpl:121
+msgid "unknown"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:119
-msgid "Print service"
+#: plugins/admin/systems/workstationService.tpl:126
+msgid "Automatic modelines"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:122
-msgid "Scan service"
+#: plugins/admin/systems/workstationService.tpl:130
+#: plugins/admin/systems/terminalService.tpl:124
+msgid "HSync"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:125
-msgid "Sound service"
+#: plugins/admin/systems/workstationService.tpl:132
+#: plugins/admin/systems/terminalService.tpl:126
+msgid "Horizontal refresh frequency for installed monitor"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:128
-msgid "GUI"
+#: plugins/admin/systems/workstationService.tpl:135
+#: plugins/admin/systems/terminalService.tpl:129
+msgid "VSync"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_workstationService.inc:89
-msgid "default"
+#: plugins/admin/systems/workstationService.tpl:137
+#: plugins/admin/systems/terminalService.tpl:131
+msgid "Vertical refresh frequency for installed monitor"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_workstationService.inc:90
-msgid "show chooser"
+#: plugins/admin/systems/workstationService.tpl:149
+#: plugins/admin/systems/terminalService.tpl:203
+msgid "Scan device"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:91
-msgid "direct"
+#: plugins/admin/systems/workstationService.tpl:150
+#: plugins/admin/systems/terminalService.tpl:204
+msgid "Select to start SANE scan service on terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:107
-#: plugins/admin/systems/class_workstationService.inc:94
-msgid "load balanced"
+#: plugins/admin/systems/workstationService.tpl:151
+#: plugins/admin/systems/terminalService.tpl:205
+msgid "Provide scan services"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:110
-#: plugins/admin/systems/class_workstationService.inc:97
-msgid "Windows RDP"
+#: plugins/admin/systems/info.tpl:1
+msgid "System information"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:111
-#: plugins/admin/systems/class_workstationService.inc:98
-msgid "ICA client"
+#: plugins/admin/systems/info.tpl:7
+msgid "CPU"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:209
-#: plugins/admin/systems/class_workstationService.inc:201
-msgid "Choose the phone located at the current terminal"
+#: plugins/admin/systems/info.tpl:10
+msgid "Memory"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:270
-#: plugins/admin/systems/class_terminalService.inc:275
-#: plugins/admin/systems/class_workstationService.inc:263
-#: plugins/admin/systems/class_workstationService.inc:268
-msgid "Please specify a valid VSync range."
+#: plugins/admin/systems/info.tpl:13
+msgid "Boot MAC"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:285
-#: plugins/admin/systems/class_terminalService.inc:290
-#: plugins/admin/systems/class_workstationService.inc:278
-#: plugins/admin/systems/class_workstationService.inc:283
-msgid "Please specify a valid HSync range."
+#: plugins/admin/systems/info.tpl:16
+msgid "USB support"
 msgstr ""
 
-#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
-msgid "System management"
+#: plugins/admin/systems/info.tpl:19 plugins/admin/systems/info.tpl:87
+msgid "System status"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:272
-msgid "Terminal server, must have fontpath specified."
+#: plugins/admin/systems/info.tpl:23
+msgid "Inventory number"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
+#: plugins/admin/systems/info.tpl:27
+msgid "Last login"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
+#: plugins/admin/systems/info.tpl:38
+msgid "Network devices"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
+#: plugins/admin/systems/info.tpl:47
+msgid "IDE devices"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
+#: plugins/admin/systems/info.tpl:56
+msgid "SCSI devices"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
+#: plugins/admin/systems/info.tpl:64
+msgid "Floppy device"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
+#: plugins/admin/systems/info.tpl:68
+msgid "CDROM device"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:101
-msgid "Print Service"
+#: plugins/admin/systems/info.tpl:77
+msgid "Audio device"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:109
-#, fuzzy
-msgid "Mail server"
-msgstr "Server"
-
-#: plugins/admin/systems/chooser.tpl:1
-msgid "Choose the kind of system component you want to create"
+#: plugins/admin/systems/info.tpl:93
+msgid "Up since"
 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/info.tpl:96
+msgid "CPU load"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:7
-msgid "Linux thin client template"
+#: plugins/admin/systems/info.tpl:99
+msgid "Memory usage"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:8
-msgid "Linux workstation template"
+#: plugins/admin/systems/info.tpl:102
+msgid "Swap usage"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:9
-msgid "Linux Server"
-msgstr "Server Linux"
-
-#: plugins/admin/systems/chooser.tpl:10
-msgid "Windows workstation"
+#: plugins/admin/systems/info.tpl:116
+msgid "SSH service"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:11
-msgid "Network printer"
+#: plugins/admin/systems/info.tpl:119
+msgid "Print service"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:13
-msgid "Other network component"
+#: plugins/admin/systems/info.tpl:122
+msgid "Scan service"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:16
-msgid "Create"
-msgstr "Creare"
-
-#: plugins/admin/systems/component.tpl:15 plugins/admin/systems/server.tpl:15
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/terminal.tpl:20
-#: plugins/admin/systems/printer.tpl:22
-#: plugins/admin/systems/workstation.tpl:29
-#: plugins/admin/systems/wingeneric.tpl:15
-msgid "Choose subtree to place terminal in"
-msgstr "Scegli il subtree dove mettere i terminali"
-
-#: plugins/admin/systems/workstationService.tpl:4
-#: plugins/admin/systems/terminalService.tpl:4
-msgid "Keyboard"
+#: plugins/admin/systems/info.tpl:125
+msgid "Sound service"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:7
-#: plugins/admin/systems/printerPPDDialog.tpl:5
-#: plugins/admin/systems/terminalService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:210
-msgid "Model"
+#: plugins/admin/systems/info.tpl:128
+msgid "GUI"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:9
-#: plugins/admin/systems/terminalService.tpl:9
-msgid "Choose keyboard model"
-msgstr ""
+#: plugins/admin/systems/glpi.tpl:9
+#: plugins/admin/systems/SelectDeviceType.tpl:20
+#, fuzzy
+msgid "System type"
+msgstr "Sistemi"
 
-#: plugins/admin/systems/workstationService.tpl:15
-#: plugins/admin/systems/terminalService.tpl:15
-msgid "Layout"
-msgstr ""
+#: plugins/admin/systems/glpi.tpl:19
+#, fuzzy
+msgid "Operating system"
+msgstr "Rimuovi"
 
-#: plugins/admin/systems/workstationService.tpl:17
-#: plugins/admin/systems/terminalService.tpl:17
-msgid "Choose keyboard layout"
+#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
+#: plugins/admin/systems/glpi_devices.tpl:24
+#: plugins/admin/systems/glpi_devices.tpl:123
+#: plugins/admin/systems/glpi_devices.tpl:164
+#: plugins/admin/systems/glpi_devices.tpl:219
+#: plugins/admin/systems/glpi_devices.tpl:275
+#: plugins/admin/systems/glpi_devices.tpl:333
+#: plugins/admin/systems/glpi_devices.tpl:397
+#: plugins/admin/systems/glpi_devices.tpl:469
+#: plugins/admin/systems/glpi_devices.tpl:533
+#: plugins/admin/systems/glpi_devices.tpl:580
+#: plugins/admin/systems/glpi_devices.tpl:633
+#: plugins/admin/systems/glpi_devices.tpl:687
+#: plugins/admin/systems/glpi_devices.tpl:733
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
+msgid "Manufacturer"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:23
-#: plugins/admin/systems/terminalService.tpl:23
-msgid "Variant"
-msgstr ""
+#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
+#, fuzzy
+msgid "Contacts"
+msgstr "Contatto"
 
-#: plugins/admin/systems/workstationService.tpl:25
-#: plugins/admin/systems/terminalService.tpl:25
-msgid "Choose keyboard variant"
-msgstr ""
+#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
+#, fuzzy
+msgid "Contact person"
+msgstr "Contatto"
 
-#: plugins/admin/systems/workstationService.tpl:39
-#: plugins/admin/systems/terminalService.tpl:39
-msgid "Mouse"
+#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
+msgid "Technical responsible"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:44
-#: plugins/admin/systems/terminalService.tpl:44
-msgid "Choose mouse type"
-msgstr ""
+#: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
+#: plugins/admin/systems/glpi_devices.tpl:112
+#: plugins/admin/systems/glpi_devices.tpl:153
+#: plugins/admin/systems/glpi_devices.tpl:208
+#: plugins/admin/systems/glpi_devices.tpl:264
+#: plugins/admin/systems/glpi_devices.tpl:322
+#: plugins/admin/systems/glpi_devices.tpl:386
+#: plugins/admin/systems/glpi_devices.tpl:458
+#: plugins/admin/systems/glpi_devices.tpl:522
+#: plugins/admin/systems/glpi_devices.tpl:569
+#: plugins/admin/systems/glpi_devices.tpl:622
+#: plugins/admin/systems/glpi_devices.tpl:676
+#: plugins/admin/systems/glpi_devices.tpl:722
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
+#, fuzzy
+msgid "Comment"
+msgstr "Contenuti"
 
-#: plugins/admin/systems/workstationService.tpl:50
-#: plugins/admin/systems/terminalService.tpl:50
-msgid "Port"
-msgstr ""
+#: plugins/admin/systems/glpi.tpl:78
+#, fuzzy
+msgid "Installed devices"
+msgstr "Dispositivi del client"
 
-#: plugins/admin/systems/workstationService.tpl:52
-#: plugins/admin/systems/terminalService.tpl:52
-msgid "Choose mouse port"
-msgstr ""
+#: plugins/admin/systems/glpi.tpl:90
+#, fuzzy
+msgid "Trading"
+msgstr "Ricerca"
 
-#: plugins/admin/systems/workstationService.tpl:66
-#: plugins/admin/systems/terminalService.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:24
-#: plugins/gofon/phoneaccount/paste_generic.tpl:23
-msgid "Telephone hardware"
-msgstr "Dispositivo telefonico"
+#: plugins/admin/systems/glpi.tpl:91
+#, fuzzy
+msgid "Software"
+msgstr "Stato"
 
-#: 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:25
-msgid "Telephone"
-msgstr "Telefono"
+#: plugins/admin/systems/glpi.tpl:92
+#, fuzzy
+msgid "Contracts"
+msgstr "Contatto"
 
-#: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/printer.tpl:46
-#: plugins/admin/systems/terminalService.tpl:86
-msgid "Driver"
-msgstr "Driver"
+#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
+#, fuzzy
+msgid "Attachments"
+msgstr "Argomenti"
 
-#: plugins/admin/systems/workstationService.tpl:88
-#: plugins/admin/systems/terminalService.tpl:88
-msgid "Choose graphic driver that is needed by the installed graphic board"
+#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:96
-#: plugins/admin/systems/terminalService.tpl:96
-msgid "Choose screen resolution used in graphic mode"
-msgstr ""
+#: plugins/admin/systems/glpiPrinter.tpl:9
+#, fuzzy
+msgid "Printer type"
+msgstr "Nome della stampante"
 
-#: plugins/admin/systems/workstationService.tpl:102
-#: plugins/admin/systems/terminalService.tpl:102
-msgid "Color depth"
-msgstr ""
+#: plugins/admin/systems/glpiPrinter.tpl:31
+#, fuzzy
+msgid "Supported interfaces"
+msgstr "Mostra dispositiva di rete"
 
-#: plugins/admin/systems/workstationService.tpl:104
-#: plugins/admin/systems/terminalService.tpl:104
-msgid "Choose colordepth used in graphic mode"
-msgstr ""
+#: plugins/admin/systems/glpiPrinter.tpl:38
+#, fuzzy
+msgid "Serial"
+msgstr "Terminali"
 
-#: plugins/admin/systems/workstationService.tpl:117
-#: plugins/admin/systems/terminalService.tpl:117
-msgid "Display device"
+#: plugins/admin/systems/glpiPrinter.tpl:46
+msgid "Parallel"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:121
-msgid "unknown"
+#: plugins/admin/systems/glpiPrinter.tpl:54
+msgid "USB"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:126
-msgid "Automatic modelines"
-msgstr ""
+#: plugins/admin/systems/glpiPrinter.tpl:114
+#, fuzzy
+msgid "Installed cartridges"
+msgstr "Dispositivi del client"
 
-#: plugins/admin/systems/workstationService.tpl:130
-#: plugins/admin/systems/terminalService.tpl:124
-msgid "HSync"
-msgstr ""
+#: plugins/admin/systems/glpi_edit_type.tpl:1
+#, fuzzy
+msgid "Manage System-types"
+msgstr "Sistemi"
 
-#: plugins/admin/systems/workstationService.tpl:132
-#: plugins/admin/systems/terminalService.tpl:126
-msgid "Horizontal refresh frequency for installed monitor"
+#: plugins/admin/systems/glpi_edit_type.tpl:9
+#: plugins/admin/systems/glpi_edit_type.tpl:28
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:8
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:29
+#: plugins/admin/systems/glpi_edit_os.tpl:9
+#: plugins/admin/systems/glpi_edit_os.tpl:28
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
+#, fuzzy
+msgid "Rename"
+msgstr "Cognome"
+
+#: plugins/admin/systems/glpi_edit_type.tpl:24
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:25
+#: plugins/admin/systems/glpi_edit_os.tpl:24
+#, fuzzy
+msgid "Please enter a new name"
+msgstr "Inserisci la URI del server LDAP"
+
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:135
-#: plugins/admin/systems/terminalService.tpl:129
-msgid "VSync"
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
+#: plugins/admin/systems/printerPPDDialog.tpl:6
+#, fuzzy
+msgid "Select"
+msgstr "Rimuovi"
+
+#: plugins/admin/systems/class_workstationService.inc:89
+#: plugins/admin/systems/class_terminalService.inc:102
+msgid "default"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:137
-#: plugins/admin/systems/terminalService.tpl:131
-msgid "Vertical refresh frequency for installed monitor"
+#: plugins/admin/systems/class_workstationService.inc:90
+#: plugins/admin/systems/class_terminalService.inc:103
+msgid "show chooser"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:149
-#: plugins/admin/systems/terminalService.tpl:203
-msgid "Scan device"
+#: plugins/admin/systems/class_workstationService.inc:91
+#: plugins/admin/systems/class_terminalService.inc:104
+msgid "direct"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:150
-#: plugins/admin/systems/terminalService.tpl:204
-msgid "Select to start SANE scan service on terminal"
+#: plugins/admin/systems/class_workstationService.inc:94
+#: plugins/admin/systems/class_terminalService.inc:107
+msgid "load balanced"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:151
-#: plugins/admin/systems/terminalService.tpl:205
-msgid "Provide scan services"
+#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_terminalService.inc:110
+msgid "Windows RDP"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
-#, fuzzy
-msgid "Select entries to add"
-msgstr "Selezioni utenti da aggiungere"
+#: plugins/admin/systems/class_workstationService.inc:98
+#: plugins/admin/systems/class_terminalService.inc:111
+msgid "ICA client"
+msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
-#, fuzzy
-msgid "Display members of department"
-msgstr "Mostra utenti del dipartimento"
+#: plugins/admin/systems/class_workstationService.inc:201
+#: plugins/admin/systems/class_terminalService.inc:209
+msgid "Choose the phone located at the current terminal"
+msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
-#, fuzzy
-msgid "Display members matching"
-msgstr "Mostra utenti che corrispondono a"
+#: plugins/admin/systems/class_workstationService.inc:263
+#: plugins/admin/systems/class_workstationService.inc:268
+#: plugins/admin/systems/class_terminalService.inc:270
+#: plugins/admin/systems/class_terminalService.inc:275
+msgid "Please specify a valid VSync range."
+msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
-#, fuzzy
-msgid "Regular expression for matching member names"
-msgstr "Espressioni regolare per selezionare il nome del gruppo"
+#: plugins/admin/systems/class_workstationService.inc:278
+#: plugins/admin/systems/class_workstationService.inc:283
+#: plugins/admin/systems/class_terminalService.inc:285
+#: plugins/admin/systems/class_terminalService.inc:290
+msgid "Please specify a valid HSync range."
+msgstr ""
 
 #: plugins/admin/systems/class_workstationStartup.inc:313
 msgid ""
@@ -7321,75 +7501,30 @@ msgid ""
 "be saved."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:105
-msgid "This 'dn' has no phone features."
+#: plugins/admin/systems/class_printerPPDDialog.inc:67
+#, php-format
+msgid "Can't open '%s', ppd settings resetted."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
-#, fuzzy
-msgid "yes"
-msgstr "Sistemi"
-
-#: plugins/admin/systems/class_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-#, fuzzy
-msgid "no"
-msgstr "nessuno"
+#: plugins/admin/systems/class_printerPPDDialog.inc:108
+#, php-format
+msgid ""
+"The specified PPD_PATH='%s' in your gosa.conf is invalid, can't read any ppd "
+"informations."
+msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:223
-msgid "dynamic"
+#: plugins/admin/systems/class_printerPPDDialog.inc:109
+msgid "Can't get ppd informations."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:223
-#, fuzzy
-msgid "Networksettings"
-msgstr "Mostra workstation"
+#: plugins/admin/systems/class_printerPPDDialog.inc:125
+#, php-format
+msgid "Can't create folder '%s' for the uploaded ppd file."
+msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:238
+#: plugins/admin/systems/class_printerPPDDialog.inc:138
 #, php-format
-msgid ""
-"Can't delete because there are user which are depending on this phone. One "
-"of them is user '%s'."
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:294
-#, fuzzy
-msgid "The required field 'Phone name' is not set."
-msgstr "Il campo necessario 'Home directory' non è vuoto"
-
-#: plugins/admin/systems/class_phoneGeneric.inc:297
-msgid "The 'Phone name' '0' is reserved and cannot be used."
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:304
-msgid "You have no permissions to create a phone on this 'Base'."
-msgstr ""
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:67
-#, php-format
-msgid "Can't open '%s', ppd settings resetted."
-msgstr ""
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:108
-#, php-format
-msgid ""
-"The specified PPD_PATH='%s' in your gosa.conf is invalid, can't read any ppd "
-"informations."
-msgstr ""
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:109
-msgid "Can't get ppd informations."
-msgstr ""
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:125
-#, php-format
-msgid "Can't create folder '%s' for the uploaded ppd file."
-msgstr ""
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:138
-#, php-format
-msgid "There is already a ppd file for this kind of printer."
+msgid "There is already a ppd file for this kind of printer."
 msgstr ""
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:146
@@ -7429,10 +7564,18 @@ msgstr ""
 msgid "Server name"
 msgstr ""
 
+#: plugins/admin/systems/server.tpl:15 plugins/admin/systems/terminal.tpl:20
+#: plugins/admin/systems/workstation.tpl:29
+#: plugins/admin/systems/component.tpl:15 plugins/admin/systems/phone.tpl:15
+#: plugins/admin/systems/printer.tpl:22
+#: plugins/admin/systems/wingeneric.tpl:15
+msgid "Choose subtree to place terminal in"
+msgstr "Scegli il subtree dove mettere i terminali"
+
 #: plugins/admin/systems/server.tpl:39 plugins/admin/systems/terminal.tpl:100
-#: plugins/admin/systems/workstation.tpl:79
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/workstation.tpl:79
+#: plugins/admin/systems/class_baseSelectDialog.inc:45
 #: plugins/admin/ogroups/termgroup.tpl:3
 msgid "Action"
 msgstr "Azione"
@@ -7441,91 +7584,6 @@ msgstr "Azione"
 msgid "Select action to execute for this server"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:61
-msgid "text"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalGeneric.inc:62
-msgid "graphic"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalGeneric.inc:90
-#: plugins/admin/systems/class_servGeneric.inc:62
-#: plugins/admin/ogroups/class_termgroup.inc:64
-msgid "No WAKECMD definition found in your gosa.conf"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalGeneric.inc:94
-#: plugins/admin/systems/class_terminalGeneric.inc:106
-#: plugins/admin/systems/class_terminalGeneric.inc:118
-#: plugins/admin/systems/class_servGeneric.inc:66
-#: plugins/admin/systems/class_servGeneric.inc:78
-#: plugins/admin/systems/class_servGeneric.inc:90
-#: plugins/admin/systems/class_workstationGeneric.inc:104
-#: plugins/admin/ogroups/class_termgroup.inc:68
-#: plugins/admin/ogroups/class_termgroup.inc:80
-#: plugins/admin/ogroups/class_termgroup.inc:92
-#, php-format
-msgid "Execution of '%s' failed!"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalGeneric.inc:102
-#: plugins/admin/systems/class_servGeneric.inc:74
-#: plugins/admin/ogroups/class_termgroup.inc:76
-msgid "No REBOOTCMD definition found in your gosa.conf"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_servGeneric.inc:86
-#: plugins/admin/ogroups/class_termgroup.inc:88
-msgid "No HALTCMD definition found in your gosa.conf"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
-#: plugins/admin/ogroups/class_termgroup.inc:104
-msgid "Switch off"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
-#: plugins/admin/ogroups/class_termgroup.inc:104
-msgid "Reboot"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalGeneric.inc:172
-#: plugins/admin/systems/class_servGeneric.inc:142
-#: plugins/admin/systems/class_workstationGeneric.inc:162
-#: plugins/admin/ogroups/class_termgroup.inc:104
-msgid "Wake up"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalGeneric.inc:269
-msgid "You have no permissions to create a terminal on this 'Base'."
-msgstr ""
-
-#: plugins/admin/systems/class_terminalGeneric.inc:273
-msgid "The required field 'Terminal name' is not set."
-msgstr ""
-
-#: plugins/admin/systems/printerPPDDialog.tpl:1
-#, fuzzy
-msgid "Printer driver"
-msgstr "Stampante"
-
-#: plugins/admin/systems/printerPPDDialog.tpl:6
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
-#, fuzzy
-msgid "Select"
-msgstr "Rimuovi"
-
-#: plugins/admin/systems/printerPPDDialog.tpl:9
-#, fuzzy
-msgid "New driver"
-msgstr "Server"
-
 #: plugins/admin/systems/workstationStartup.tpl:4
 #: plugins/admin/systems/terminalStartup.tpl:1
 msgid "Boot parameters"
@@ -7589,21 +7647,91 @@ msgstr ""
 msgid "Mountpoint"
 msgstr "Monitoraggio"
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:6
+#, fuzzy
+msgid "List of devices"
+msgstr "Lista degli utenti"
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:23
+msgid ""
+"This dialog allows you to attach a device to your currently edited computer."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:52
-msgid "This 'dn' has no server features."
+#: plugins/admin/systems/glpiDeviceManagement.tpl:35
+#, fuzzy
+msgid "Display devices matching"
+msgstr "Mostra gli indirizzi che corrispondono"
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:37
+#, fuzzy
+msgid "Regular expression for matching device names"
+msgstr "Espressioni regolare per selezionare il nome del gruppo"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
+#: plugins/admin/systems/class_glpiAccount.inc:144
+msgid "There is no server with valid glpi database service."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:191
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
+#: plugins/admin/systems/class_glpiAccount.inc:154
+msgid "Can't connect to glpi database, the php-mysql extension is missing."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
+#: plugins/admin/systems/class_glpiAccount.inc:164
 #, fuzzy
-msgid "The required field 'Server name' is not set."
-msgstr "Il campo 'Indirizzo principale' non è stao inserito"
+msgid "Can't connect to glpi database, check configuration twice."
+msgstr "Impossibile connettersi al server del database!"
 
-#: plugins/admin/systems/class_servGeneric.inc:198
-msgid "You have no permissions to create a server on this 'Base'."
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
+#: plugins/admin/systems/class_glpiAccount.inc:564
+#, fuzzy
+msgid "Remove inventory"
+msgstr "Elimina contatto"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
+#, fuzzy
+msgid ""
+"This server has inventory features enabled. You can disable them by clicking "
+"below."
+msgstr "Questa identià possiede estensioni Unix."
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
+#: plugins/admin/systems/class_glpiAccount.inc:567
+#, fuzzy
+msgid "Add inventory"
+msgstr "Aggiungi contatto"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
+#, fuzzy
+msgid ""
+"This server has inventory features disabled. You can enable them by clicking "
+"below."
+msgstr "Questa identità non possiede estensioni Unix"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
+#, php-format
+msgid ""
+"Can't rename given printer type to '%s', because this type name already "
+"exists."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
+#, php-format
+msgid "Can't delete printer type, it is still in use by '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:609
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:623
+#: plugins/admin/systems/class_glpiAccount.inc:631
+#: plugins/admin/systems/class_glpiAccount.inc:645
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:288
+msgid "N/A"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:750
+msgid "since"
 msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:9
@@ -7666,117 +7794,62 @@ msgstr ""
 msgid "Select action to execute for this terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:36
-msgid "Remove DHCP service"
+#: plugins/admin/systems/class_servDB.inc:135
+#: plugins/admin/systems/class_servDB.inc:144
+#: plugins/admin/systems/class_servDB.inc:161
+#: plugins/admin/systems/class_servDB.inc:171
+#: plugins/admin/systems/class_servDB.inc:176
+#: plugins/admin/systems/class_servDB.inc:182
+#, php-format
+msgid "The attribute '%s' is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:37
-msgid ""
-"This server has DHCP features enabled. You can disable them by clicking "
-"below."
+#: plugins/admin/systems/class_servDB.inc:151
+#, php-format
+msgid "The imap connect string needs to be in the form '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:39
-msgid "Add DHCP service"
+#: plugins/admin/systems/class_servDB.inc:155
+msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:40
-msgid ""
-"This server has DHCP features disabled. You can enable them by clicking "
-"below."
-msgstr ""
+#: plugins/admin/systems/class_servDB.inc:166
+#, fuzzy, php-format
+msgid "The specified kerberos password is empty."
+msgstr "La password immessa come 'Nuova password' è vuota"
 
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
+#: plugins/admin/systems/class_servDB.inc:190
+#, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:144
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
-msgid "There is no server with valid glpi database service."
-msgstr ""
-
-#: plugins/admin/systems/class_glpiAccount.inc:154
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
-msgid "Can't connect to glpi database, the php-mysql extension is missing."
-msgstr ""
-
-#: plugins/admin/systems/class_glpiAccount.inc:164
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
-#, fuzzy
-msgid "Can't connect to glpi database, check configuration twice."
-msgstr "Impossibile connettersi al server del database!"
-
-#: plugins/admin/systems/class_glpiAccount.inc:178
-#: plugins/admin/systems/class_glpiAccount.inc:184
-#: plugins/admin/systems/class_glpiAccount.inc:190
-msgid "This feature is not implemented yet."
-msgstr ""
-
-#: plugins/admin/systems/class_glpiAccount.inc:292
-msgid "Adding new sytem type failed, this system type name is already used."
-msgstr ""
-
-#: plugins/admin/systems/class_glpiAccount.inc:312
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
 #, php-format
-msgid ""
-"You can't delete this system type, it is still in use by these system(s) '%s'"
-msgstr ""
-
-#: plugins/admin/systems/class_glpiAccount.inc:323
-#, fuzzy
-msgid "Rename failed, this system type name is already used."
-msgstr "L'indirizzo principale inserito è già in uso."
-
-#: plugins/admin/systems/class_glpiAccount.inc:379
-msgid "Adding new operating system failed, specifed name is already used."
+msgid "You're about to delete the glpi cartridge type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:401
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:116
 #, php-format
 msgid ""
-"You can't delete this operating system, it is still in use by these system"
-"(s) '%s'"
+"You can't delete this cartridge type, it is still in use by this printer(s) "
+"'%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:413
-#, fuzzy
-msgid "Updating operating system failed, specifed name is already used."
-msgstr "L'indirizzo principale inserito è già in uso."
-
-#: plugins/admin/systems/class_glpiAccount.inc:564
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
-#, fuzzy
-msgid "Remove inventory"
-msgstr "Elimina contatto"
-
-#: plugins/admin/systems/class_glpiAccount.inc:565
-#, fuzzy
-msgid ""
-"This device has inventory informations enabled. You can disable them by "
-"clicking below."
-msgstr "Questa identià possiede estensioni Unix."
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
+msgid "Cartridges"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:567
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
 #, fuzzy
-msgid "Add inventory"
-msgstr "Aggiungi contatto"
+msgid "New monitor"
+msgstr "Nuova password"
 
-#: plugins/admin/systems/class_glpiAccount.inc:568
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
 #, fuzzy
-msgid ""
-"This device has inventory informations disabled. You can enable them by "
-"clicking below."
-msgstr "Questa identità non possiede estensioni Unix"
-
-#: plugins/admin/systems/class_glpiAccount.inc:631
-#: plugins/admin/systems/class_glpiAccount.inc:645
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:609
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:623
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:288
-msgid "N/A"
-msgstr ""
+msgid "M"
+msgstr "Mb"
 
 #: plugins/admin/systems/class_workstationGeneric.inc:70
 #, fuzzy
@@ -7796,10 +7869,38 @@ msgstr "Log di sitema"
 msgid "No ACTIONCMD definition found in your gosa.conf"
 msgstr ""
 
+#: plugins/admin/systems/class_workstationGeneric.inc:104
+#: plugins/admin/systems/class_terminalGeneric.inc:94
+#: plugins/admin/systems/class_terminalGeneric.inc:106
+#: plugins/admin/systems/class_terminalGeneric.inc:118
+#: plugins/admin/systems/class_servGeneric.inc:66
+#: plugins/admin/systems/class_servGeneric.inc:78
+#: plugins/admin/systems/class_servGeneric.inc:90
+#: plugins/admin/ogroups/class_termgroup.inc:68
+#: plugins/admin/ogroups/class_termgroup.inc:80
+#: plugins/admin/ogroups/class_termgroup.inc:92
+#, php-format
+msgid "Execution of '%s' failed!"
+msgstr ""
+
 #: plugins/admin/systems/class_workstationGeneric.inc:114
 msgid "This 'dn' has no workstation features."
 msgstr ""
 
+#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/systems/class_terminalGeneric.inc:170
+#: plugins/admin/systems/class_servGeneric.inc:140
+#: plugins/admin/ogroups/class_termgroup.inc:104
+msgid "Switch off"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/systems/class_terminalGeneric.inc:170
+#: plugins/admin/systems/class_servGeneric.inc:140
+#: plugins/admin/ogroups/class_termgroup.inc:104
+msgid "Reboot"
+msgstr ""
+
 #: plugins/admin/systems/class_workstationGeneric.inc:157
 #, fuzzy
 msgid "Instant update"
@@ -7820,6 +7921,13 @@ msgstr ""
 msgid "Rescan hardware"
 msgstr "Dispositivo telefonico"
 
+#: plugins/admin/systems/class_workstationGeneric.inc:162
+#: plugins/admin/systems/class_terminalGeneric.inc:172
+#: plugins/admin/systems/class_servGeneric.inc:142
+#: plugins/admin/ogroups/class_termgroup.inc:104
+msgid "Wake up"
+msgstr ""
+
 #: plugins/admin/systems/class_workstationGeneric.inc:228
 msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr ""
@@ -7828,1888 +7936,1975 @@ msgstr ""
 msgid "The required field 'Workstation name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:32
-msgid "Systems"
-msgstr "Sistemi"
-
-#: plugins/admin/systems/class_systemManagement.inc:429
-msgid "You can't edit this object type yet!"
+#: plugins/admin/systems/class_workstationGeneric.inc:245
+#: plugins/admin/systems/class_componentGeneric.inc:155
+#: plugins/admin/systems/class_winGeneric.inc:172
+#: plugins/admin/systems/class_terminalGeneric.inc:286
+#: plugins/admin/systems/class_servGeneric.inc:209
+#: plugins/admin/systems/class_printGeneric.inc:529
+#: plugins/admin/systems/class_phoneGeneric.inc:314
+#, php-format
+msgid "There is already an entry '%s' in the base choosen by you"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:455
-msgid "Passwords entered as new and repeated do not match!"
-msgstr "Le password nuova e ripetuta non corrispondono"
+#: plugins/admin/systems/servdns.tpl:1
+#, fuzzy
+msgid "Zones"
+msgstr "telefoni"
 
-#: plugins/admin/systems/class_systemManagement.inc:472
-msgid "You are not allowed to set this systems password!"
+#: plugins/admin/systems/workstation.tpl:9
+msgid "Workstation template"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:526
-#, php-format
-msgid "You're about to delete all information about the component at '%s'."
+#: plugins/admin/systems/workstation.tpl:11
+msgid "Workstation name"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:760
-#, fuzzy
-msgid "New Terminal template"
-msgstr "Terminal Server"
-
-#: plugins/admin/systems/class_systemManagement.inc:760
-#: plugins/admin/systems/class_systemManagement.inc:924
-#, fuzzy
-msgid "New Terminal"
-msgstr "Terminali"
-
-#: plugins/admin/systems/class_systemManagement.inc:762
-#, fuzzy
-msgid "New Workstation template"
-msgstr "Mostra workstation"
+#: plugins/admin/systems/class_servNfs.inc:35
+msgid ""
+"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:762
-#: plugins/admin/systems/class_systemManagement.inc:925
+#: plugins/admin/systems/class_servNfs.inc:38
 #, fuzzy
-msgid "New Workstation"
-msgstr "Mostra workstation"
+msgid "Can't read '/etc/gosa/encodings', please check permissions."
+msgstr "Rimuovi"
 
-#: plugins/admin/systems/class_systemManagement.inc:763
-#: plugins/admin/systems/class_systemManagement.inc:764
+#: plugins/admin/systems/class_servNfs.inc:125
 #, fuzzy
-msgid "New Server"
-msgstr "Server"
+msgid "Please specify a valid path for your setup."
+msgstr "Specificare una dimenzione valida per le mail da rigettare."
 
-#: plugins/admin/systems/class_systemManagement.inc:765
-#: plugins/admin/systems/class_systemManagement.inc:766
+#: plugins/admin/systems/class_servNfs.inc:131
 #, fuzzy
-msgid "New Printer"
-msgstr "Stampante"
+msgid "Please specify a valid name for your setup."
+msgstr "Specificare una dimenzione valida per le mail da rigettare."
 
-#: plugins/admin/systems/class_systemManagement.inc:767
-#: plugins/admin/systems/class_systemManagement.inc:768
+#: plugins/admin/systems/class_servNfs.inc:134
 #, fuzzy
-msgid "New Phone"
-msgstr "Telefono"
-
-#: plugins/admin/systems/class_systemManagement.inc:769
-#: plugins/admin/systems/class_systemManagement.inc:770
-msgid "New Component"
-msgstr ""
+msgid "Please specify a name for your setup."
+msgstr "Prego inserire un numero di telefono valido!"
 
-#: plugins/admin/systems/class_systemManagement.inc:780
+#: plugins/admin/systems/class_servNfs.inc:139
 #, fuzzy
-msgid "Edit system"
-msgstr "Lista dei sistemi"
+msgid "Description contains invalid characters."
+msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
 
-#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/systems/class_servNfs.inc:143
 #, fuzzy
-msgid "Delete system"
-msgstr "Rimuovi"
+msgid "Path contains invalid characters."
+msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
 
-#: plugins/admin/systems/class_systemManagement.inc:791
+#: plugins/admin/systems/class_servNfs.inc:147
 #, fuzzy
-msgid "System"
-msgstr "Sistemi"
+msgid "Option contains invalid characters."
+msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
 
-#: plugins/admin/systems/class_systemManagement.inc:829
+#: plugins/admin/systems/servnfs.tpl:1
 #, fuzzy
-msgid "Cups Server"
-msgstr "Server"
+msgid "Edit share"
+msgstr "Modifica contatto"
 
-#: plugins/admin/systems/class_systemManagement.inc:830
-msgid "Log Db"
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:831
-#, fuzzy
-msgid "Syslog Server"
-msgstr "Mostra server"
+#: plugins/admin/systems/servnfs.tpl:25
+msgid "Path"
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:832
+#: plugins/admin/systems/servnfs.tpl:49
 #, fuzzy
-msgid "Mail Server"
-msgstr "Server"
+msgid "Codepage"
+msgstr "Home Page"
 
-#: plugins/admin/systems/class_systemManagement.inc:833
+#: plugins/admin/systems/servnfs.tpl:59
 #, fuzzy
-msgid "Imap Server"
-msgstr "Server"
+msgid "Option"
+msgstr "Opzioni"
 
-#: plugins/admin/systems/class_systemManagement.inc:834
-#, fuzzy
-msgid "Nfs Server"
-msgstr "Server"
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid "Remove Kolab extension"
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:835
-#, fuzzy
-msgid "Kerberos Server"
-msgstr "Kerberos"
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid ""
+"This server has kolab features enabled. You can disable them by clicking "
+"below."
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:836
-#, fuzzy
-msgid "Asterisk Server"
-msgstr "Terminal Server"
+#: plugins/admin/systems/class_servKolab.inc:118
+msgid "Add Kolab service"
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:837
-#, fuzzy
-msgid "Fax Server"
-msgstr "Server"
+#: plugins/admin/systems/class_servKolab.inc:118
+msgid ""
+"This server has kolab features disabled. You can enable them by clicking "
+"below."
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:838
-#, fuzzy
-msgid "Ldap Server"
-msgstr "Server"
+#: plugins/admin/systems/class_servKolab.inc:146
+#, php-format
+msgid "Include data from %s days in the past when creating free/busy lists"
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:871
-#, fuzzy
-msgid "Set root password"
-msgstr "Cambia password"
+#: plugins/admin/systems/class_servKolab.inc:152
+#, php-format
+msgid "Warn users when using more than %s%% of their mail quota"
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:916
-#, fuzzy
-msgid "New System from incoming"
-msgstr "Informazioni organizzazione"
+#: plugins/admin/systems/class_servKolab.inc:227
+msgid "Future days in Free/Busy settings must be set."
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:918
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:589
-#, fuzzy
-msgid "Terminal"
-msgstr "Terminali"
+#: plugins/admin/systems/class_servKolab.inc:229
+msgid "Future days in Free/Busy settings must be a positive value."
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:919
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:588
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
+#: plugins/admin/systems/class_servKolab.inc:233
+msgid "The given Quota settings value must be a number."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:922
-#, fuzzy
-msgid "Winstation"
-msgstr "Amministrazione"
+#: plugins/admin/systems/class_servKolab.inc:235
+msgid "Please choose a value between 1 and 100 for Quota settings."
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:923
-#, fuzzy
-msgid "Network Device"
-msgstr "Mostra dispositiva di rete"
+#: plugins/admin/systems/class_servKolab.inc:237
+msgid "Future days must be a value."
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1146
-msgid "New terminal"
+#: plugins/admin/systems/class_servKolab.inc:241
+msgid "No SMTP privileged networks set."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1148
-msgid "New workstation"
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1150
-#, fuzzy
-msgid "New Device"
-msgstr "Mostra dispositiva di rete"
+#: plugins/admin/systems/terminalService.tpl:145
+msgid "Connect method"
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1167
-#, fuzzy
-msgid "Terminal template for"
-msgstr "Terminal Server"
+#: plugins/admin/systems/terminalService.tpl:147
+msgid "Choose method to connect to terminal server"
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1179
-msgid "Workstation template for"
+#: plugins/admin/systems/terminalService.tpl:154
+msgid "Terminal server"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "General"
-msgstr "Generale"
+#: plugins/admin/systems/terminalService.tpl:156
+msgid "Select specific terminal server to use"
+msgstr ""
 
-#: plugins/admin/systems/printer.tpl:9
-msgid "Printer name"
-msgstr "Nome della stampante"
+#: plugins/admin/systems/terminalService.tpl:163
+msgid "Font server"
+msgstr ""
 
-#: plugins/admin/systems/printer.tpl:31
-msgid "Details"
-msgstr "Dettagli"
+#: plugins/admin/systems/terminalService.tpl:165
+msgid "Select specific font server to use"
+msgstr ""
 
-#: plugins/admin/systems/printer.tpl:34
-#, fuzzy
-msgid "Printer location"
-msgstr "Impostazioni Unix"
+#: plugins/admin/systems/terminalService.tpl:181
+msgid "Print device"
+msgstr ""
 
-#: plugins/admin/systems/printer.tpl:38
-msgid "Printer URL"
-msgstr "URL della stampante"
+#: plugins/admin/systems/terminalService.tpl:182
+msgid "Select to start IPP based printing service on terminal"
+msgstr ""
 
-#: plugins/admin/systems/printer.tpl:58
-msgid "Permissions"
-msgstr "Permessi"
+#: plugins/admin/systems/terminalService.tpl:183
+msgid "Provide print services"
+msgstr ""
 
-#: plugins/admin/systems/printer.tpl:65
-msgid "Users which are allowed to use this printer"
+#: plugins/admin/systems/terminalService.tpl:189
+msgid "Spool server"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
-#, fuzzy
-msgid "Add user"
-msgstr "Modifica contatto"
+#: plugins/admin/systems/terminalService.tpl:191
+msgid "Select NFS filesystem to place spool files on"
+msgstr ""
 
-#: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
-#, fuzzy
-msgid "Add group"
-msgstr "gruppi"
+#: plugins/admin/systems/terminalService.tpl:212
+msgid "Select scanner driver to use"
+msgstr ""
 
-#: plugins/admin/systems/printer.tpl:81
-msgid "Users which are allowed to administrate this printer"
+#: plugins/admin/systems/class_componentGeneric.inc:50
+#: plugins/admin/systems/class_winGeneric.inc:73
+msgid "This 'dn' has no network features."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:82
+#: plugins/admin/systems/class_componentGeneric.inc:138
 #, fuzzy
-msgid "Admins"
-msgstr "DN dell'amministratore"
+msgid "The required field 'Component name' is not set."
+msgstr "Il campo necessario 'Home directory' non è vuoto"
 
-#: plugins/admin/systems/class_servDNS.inc:181
-#: plugins/admin/systems/class_inventory.inc:36
-msgid "Remove DNS service"
+#: plugins/admin/systems/class_componentGeneric.inc:145
+#: plugins/admin/systems/class_winGeneric.inc:162
+msgid "You have no permissions to create a component on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:182
-#: plugins/admin/systems/class_inventory.inc:37
-msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
+#: plugins/admin/systems/terminalStartup.tpl:35
+msgid "Select if terminal supports graphical startup with progress bar"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:184
-#: plugins/admin/systems/class_inventory.inc:39
-msgid "Add DNS service"
+#: plugins/admin/systems/terminalStartup.tpl:36
+msgid "use graphical bootup"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:185
-#: plugins/admin/systems/class_inventory.inc:40
-msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
+#: plugins/admin/systems/terminalStartup.tpl:38
+msgid "Select if terminal should boot in text mode"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:270
-#, php-format
-msgid ""
-"Can't delete the selected zone, because it is still in use by these entry/"
-"entries '%s'"
+#: plugins/admin/systems/terminalStartup.tpl:39
+msgid "use standard linux textual bootup"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:297
-#, fuzzy
-msgid "Reverse zone"
-msgstr "Riferimenti"
-
-#: plugins/admin/systems/class_servDB.inc:135
-#: plugins/admin/systems/class_servDB.inc:144
-#: plugins/admin/systems/class_servDB.inc:161
-#: plugins/admin/systems/class_servDB.inc:171
-#: plugins/admin/systems/class_servDB.inc:176
-#: plugins/admin/systems/class_servDB.inc:182
-#, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
+#: plugins/admin/systems/terminalStartup.tpl:41
+msgid "Select to get more verbose output during startup"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:151
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
+#: plugins/admin/systems/terminalStartup.tpl:42
+msgid "use debug mode for startup"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:155
-msgid "The sieve port needs to be numeric."
+#: plugins/admin/systems/class_glpiAccount.inc:178
+#: plugins/admin/systems/class_glpiAccount.inc:184
+#: plugins/admin/systems/class_glpiAccount.inc:190
+msgid "This feature is not implemented yet."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:166
-#, fuzzy, php-format
-msgid "The specified kerberos password is empty."
-msgstr "La password immessa come 'Nuova password' è vuota"
+#: plugins/admin/systems/class_glpiAccount.inc:292
+msgid "Adding new sytem type failed, this system type name is already used."
+msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:190
+#: plugins/admin/systems/class_glpiAccount.inc:312
 #, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
+msgid ""
+"You can't delete this system type, it is still in use by these system(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/servdns.tpl:1
+#: plugins/admin/systems/class_glpiAccount.inc:323
 #, fuzzy
-msgid "Zones"
-msgstr "telefoni"
-
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
-msgstr ""
+msgid "Rename failed, this system type name is already used."
+msgstr "L'indirizzo principale inserito è già in uso."
 
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
+#: plugins/admin/systems/class_glpiAccount.inc:379
+msgid "Adding new operating system failed, specifed name is already used."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:35
+#: plugins/admin/systems/class_glpiAccount.inc:401
+#, php-format
 msgid ""
-"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+"You can't delete this operating system, it is still in use by these system"
+"(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:38
+#: plugins/admin/systems/class_glpiAccount.inc:413
 #, fuzzy
-msgid "Can't read '/etc/gosa/encodings', please check permissions."
-msgstr "Rimuovi"
-
-#: plugins/admin/systems/class_servNfs.inc:125
+msgid "Updating operating system failed, specifed name is already used."
+msgstr "L'indirizzo principale inserito è già in uso."
+
+#: plugins/admin/systems/class_glpiAccount.inc:565
 #, fuzzy
-msgid "Please specify a valid path for your setup."
-msgstr "Specificare una dimenzione valida per le mail da rigettare."
+msgid ""
+"This device has inventory informations enabled. You can disable them by "
+"clicking below."
+msgstr "Questa identià possiede estensioni Unix."
 
-#: plugins/admin/systems/class_servNfs.inc:131
+#: plugins/admin/systems/class_glpiAccount.inc:568
 #, fuzzy
-msgid "Please specify a valid name for your setup."
-msgstr "Specificare una dimenzione valida per le mail da rigettare."
+msgid ""
+"This device has inventory informations disabled. You can enable them by "
+"clicking below."
+msgstr "Questa identità non possiede estensioni Unix"
 
-#: plugins/admin/systems/class_servNfs.inc:134
+#: plugins/admin/systems/glpiManufacturer.tpl:1
 #, fuzzy
-msgid "Please specify a name for your setup."
-msgstr "Prego inserire un numero di telefono valido!"
+msgid "Manage manufacturers"
+msgstr "Modifica contatto"
 
-#: plugins/admin/systems/class_servNfs.inc:139
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
 #, fuzzy
-msgid "Description contains invalid characters."
-msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
+msgid "Attachment"
+msgstr "Argomenti"
 
-#: plugins/admin/systems/class_servNfs.inc:143
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
 #, fuzzy
-msgid "Path contains invalid characters."
-msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
+msgid "Filename"
+msgstr "Cognome"
 
-#: plugins/admin/systems/class_servNfs.inc:147
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
 #, fuzzy
-msgid "Option contains invalid characters."
-msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
+msgid "Mime-type"
+msgstr "Tipo"
 
-#: plugins/admin/systems/servdb.tpl:6
-msgid "Kerberos kadmin access"
-msgstr ""
+#: plugins/admin/systems/class_termDNS.inc:313
+#, fuzzy
+msgid "The required field 'IP-address' is not set."
+msgstr "Il campo 'Indirizzo principale' non è stao inserito"
 
-#: plugins/admin/systems/servdb.tpl:10
-msgid "Kerberos Realm"
+#: plugins/admin/systems/class_termDNS.inc:319
+msgid "Wrong IP format in field IP-address."
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
-msgid "Admin user"
-msgstr ""
+#: plugins/admin/systems/class_termDNS.inc:325
+#, fuzzy
+msgid "The required field 'MAC-address' is not set."
+msgstr "Il campo 'Indirizzo principale' non è stao inserito"
 
-#: plugins/admin/systems/servdb.tpl:26
-msgid "FAX database"
+#: plugins/admin/systems/class_termDNS.inc:331
+msgid ""
+"The given macaddress is invalid. There must be 6 1byte segments seperated by "
+"':'."
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:30
-msgid "FAX DB user"
+#: plugins/admin/systems/class_termDNS.inc:346
+#, php-format
+msgid "Found duplicate value for record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:42
-msgid "Asterisk management"
+#: plugins/admin/systems/class_termDNS.inc:352
+#, php-format
+msgid "Found more than one entry for the uniqe record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:46
-msgid "Asterisk DB user"
+#: plugins/admin/systems/class_termDNS.inc:360
+#, php-format
+msgid ""
+"The device IP '%s' is added as 'A Record', this will be done automatically, "
+"please remove the record."
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:54
-msgid "Country dial prefix"
+#: plugins/admin/systems/class_termDNS.inc:366
+#: plugins/admin/systems/class_servDNSeditZone.inc:386
+#, php-format
+msgid "Only lowercase is allowed, please check your '%ss'."
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:58
-msgid "Local dial prefix"
-msgstr ""
+#: plugins/admin/systems/class_servRepository.inc:97
+#, fuzzy
+msgid "Remove FAI repository extension."
+msgstr "Elimina foto"
 
-#: plugins/admin/systems/servdb.tpl:70
-msgid "IMAP admin access"
-msgstr ""
+#: plugins/admin/systems/class_servRepository.inc:98
+#, fuzzy
+msgid ""
+"This server has FAI repository features enabled. You can disable them by "
+"clicking below."
+msgstr "Questa identià possiede estensioni Unix."
 
-#: plugins/admin/systems/servdb.tpl:74
-msgid "Server identifier"
+#: plugins/admin/systems/class_servRepository.inc:100
+msgid "Add FAI repository extension."
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:78
-msgid "Connect URL"
-msgstr ""
+#: plugins/admin/systems/class_servRepository.inc:101
+#, fuzzy
+msgid ""
+"This server has FAI repository features disabled. You can enable them by "
+"clicking below."
+msgstr "Questa identità non possiede estensioni Unix"
 
-#: plugins/admin/systems/servdb.tpl:91
-msgid "Sieve port"
+#: plugins/admin/systems/class_servRepository.inc:144
+#, php-format
+msgid ""
+"You can't delete this release, it is still used by these workstations [%s]. "
+"Please solve this dependencies first, to keep data base consistency."
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:100
-msgid "Logging database"
+#: plugins/admin/systems/class_servRepository.inc:176
+#, php-format
+msgid ""
+"Be careful editing this release, it is still used by these workstations [%s]."
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
-msgid "Logging DB user"
+#: plugins/admin/systems/class_servRepository.inc:243
+#: plugins/admin/systems/class_servRepository.inc:264
+#: plugins/admin/systems/servRepositorySetup.tpl:33
+#, fuzzy
+msgid "Sections"
+msgstr "Azione"
+
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
+msgid "Can't delete this entry, it is still in use."
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:119
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:305
 #, fuzzy
-msgid "Glpi database"
-msgstr "Database"
+msgid "The selected name is already in use."
+msgstr "L'indirizzo principale inserito è già in uso."
 
-#: plugins/admin/systems/servdb.tpl:133
+#: plugins/admin/systems/servRepository.tpl:6
 #, fuzzy
-msgid "Database"
-msgstr "Database"
+msgid "List of configured repositories."
+msgstr "Lista dei gruppi"
 
-#: plugins/admin/systems/servnfs.tpl:1
+#: plugins/admin/systems/servRepository.tpl:11
 #, fuzzy
-msgid "Edit share"
-msgstr "Modifica contatto"
+msgid "Add repository"
+msgstr "Riprova"
 
-#: plugins/admin/systems/servnfs.tpl:2
-msgid "NFS setup"
+#: plugins/admin/systems/servRepository.tpl:29
+msgid "This menu allows you to create, delete and edit repository settings."
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:25
-msgid "Path"
-msgstr ""
+#: plugins/admin/systems/servdnseditzone.tpl:7
+#, fuzzy
+msgid "Zone name"
+msgstr "Nome comune"
 
-#: plugins/admin/systems/servnfs.tpl:49
+#: plugins/admin/systems/servdnseditzone.tpl:13
 #, fuzzy
-msgid "Codepage"
-msgstr "Home Page"
+msgid "Network address"
+msgstr "Mostra dispositiva di rete"
 
-#: plugins/admin/systems/servnfs.tpl:59
+#: plugins/admin/systems/servdnseditzone.tpl:24
 #, fuzzy
-msgid "Option"
-msgstr "Opzioni"
+msgid "Zone entries"
+msgstr "Impostazioni Unix"
 
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid "Remove Kolab extension"
-msgstr ""
+#: plugins/admin/systems/servdnseditzone.tpl:35
+#, fuzzy
+msgid "SOA record"
+msgstr "Directory"
 
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid ""
-"This server has kolab features enabled. You can disable them by clicking "
-"below."
+#: plugins/admin/systems/servdnseditzone.tpl:41
+msgid "Primary dns server for this zone"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:118
-msgid "Add Kolab service"
+#: plugins/admin/systems/servdnseditzone.tpl:53
+msgid "Serial number (automatically incremented)"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:118
-msgid ""
-"This server has kolab features disabled. You can enable them by clicking "
-"below."
-msgstr ""
+#: plugins/admin/systems/servdnseditzone.tpl:69
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: ihtml/themes/altlinux/setup_finish.tpl:31
+#: ihtml/themes/default/setup_finish.tpl:31
+#: ihtml/themes/lhs/setup_finish.tpl:31
+msgid "Retry"
+msgstr "Riprova"
 
-#: plugins/admin/systems/class_servKolab.inc:146
-#, php-format
-msgid "Include data from %s days in the past when creating free/busy lists"
-msgstr ""
+#: plugins/admin/systems/servdnseditzone.tpl:75
+#, fuzzy
+msgid "Expire"
+msgstr "Esporta"
 
-#: plugins/admin/systems/class_servKolab.inc:152
-#, php-format
-msgid "Warn users when using more than %s%% of their mail quota"
-msgstr ""
+#: plugins/admin/systems/servdnseditzone.tpl:96
+#, fuzzy
+msgid "MxRecords"
+msgstr "Directory"
 
-#: plugins/admin/systems/class_servKolab.inc:227
-msgid "Future days in Free/Busy settings must be set."
-msgstr ""
+#: plugins/admin/systems/servdnseditzone.tpl:108
+#, fuzzy
+msgid "Zone records"
+msgstr "Directory"
 
-#: plugins/admin/systems/class_servKolab.inc:229
-msgid "Future days in Free/Busy settings must be a positive value."
-msgstr ""
+#: plugins/admin/systems/class_glpiSelectUser.inc:140
+#, fuzzy
+msgid "use"
+msgstr "utenti"
 
-#: plugins/admin/systems/class_servKolab.inc:233
-msgid "The given Quota settings value must be a number."
+#: plugins/admin/systems/glpiSelectUser.tpl:23
+msgid ""
+"This dialog allows you to select a user as technical responsible person."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:235
-msgid "Please choose a value between 1 and 100 for Quota settings."
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:2
+#, fuzzy
+msgid "Add/Edit monitor"
+msgstr "Modifica contatto"
 
-#: plugins/admin/systems/class_servKolab.inc:237
-msgid "Future days must be a value."
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:17
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+#, fuzzy
+msgid "Comments"
+msgstr "Contenuti"
 
-#: plugins/admin/systems/class_servKolab.inc:241
-msgid "No SMTP privileged networks set."
+#: plugins/admin/systems/glpi_devices.tpl:33
+#, fuzzy
+msgid "Monitor size"
+msgstr "Dimensione quota"
+
+#: plugins/admin/systems/glpi_devices.tpl:36
+#, fuzzy
+msgid "Inch"
+msgstr "Francese"
+
+#: plugins/admin/systems/glpi_devices.tpl:44
+msgid "Integrated microphone"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:177
-#: plugins/admin/systems/class_printGeneric.inc:184
-#: plugins/admin/systems/class_printGeneric.inc:219
-#: plugins/admin/systems/class_printGeneric.inc:240
-#: plugins/admin/systems/class_printGeneric.inc:243
-msgid "Add printer extension"
+#: plugins/admin/systems/glpi_devices.tpl:47
+#: plugins/admin/systems/glpi_devices.tpl:55
+#: plugins/admin/systems/glpi_devices.tpl:63
+#: plugins/admin/systems/glpi_devices.tpl:71
+#: plugins/admin/systems/glpi_devices.tpl:176
+#: plugins/admin/systems/glpi_devices.tpl:296
+#: plugins/admin/systems/glpi_devices.tpl:361
+#, fuzzy
+msgid "Yes"
+msgstr "Sistemi"
+
+#: plugins/admin/systems/glpi_devices.tpl:48
+#: plugins/admin/systems/glpi_devices.tpl:56
+#: plugins/admin/systems/glpi_devices.tpl:64
+#: plugins/admin/systems/glpi_devices.tpl:72
+#: plugins/admin/systems/glpi_devices.tpl:177
+#: plugins/admin/systems/glpi_devices.tpl:297
+#: plugins/admin/systems/glpi_devices.tpl:362
+#, fuzzy
+msgid "No"
+msgstr "nessuno"
+
+#: plugins/admin/systems/glpi_devices.tpl:52
+msgid "Integrated speakers"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:178
-msgid "This is a workstation template, printer tab is disabled."
+#: plugins/admin/systems/glpi_devices.tpl:60
+msgid "Sub-D"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:185
-msgid "This is a terminal template, printer tab is disabled."
+#: plugins/admin/systems/glpi_devices.tpl:68
+msgid "BNC"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:220
+#: plugins/admin/systems/glpi_devices.tpl:76
 #, fuzzy
-msgid ""
-"This workstation has printer extension disabled. You can't enable it while "
-"'cn' is not present in entry. Possibly you are currently creating a new "
-"terminal template"
-msgstr "Questa identità non possiede estensioni di posta."
+msgid "Serial number"
+msgstr "Numero di telefono"
 
-#: plugins/admin/systems/class_printGeneric.inc:232
-#: plugins/admin/systems/class_printGeneric.inc:235
+#: plugins/admin/systems/glpi_devices.tpl:83
 #, fuzzy
-msgid "Remove printer extension"
-msgstr "Elimina foto"
+msgid "Additional serial number"
+msgstr "Numero seriale del certificato"
 
-#: plugins/admin/systems/class_printGeneric.inc:233
+#: plugins/admin/systems/glpi_devices.tpl:97
 #, fuzzy
-msgid ""
-"This workstation has printer extension enabled.You can disable it by "
-"clicking below."
-msgstr "Questa identià possiede estensioni di posta."
+msgid "Add/Edit other device"
+msgstr "Dispositivi del client"
 
-#: plugins/admin/systems/class_printGeneric.inc:236
-#, fuzzy
-msgid ""
-"This terminal has printer extension enabled. You can disable it by clicking "
-"below."
-msgstr "Questa identià possiede estensioni di posta."
+#: plugins/admin/systems/glpi_devices.tpl:138
+msgid "Add/Edit power supply"
+msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:241
-#, fuzzy
-msgid ""
-"This workstation has printer extension disabled. You can enable it by "
-"clicking below."
-msgstr "Questa identità non possiede estensioni di posta."
+#: plugins/admin/systems/glpi_devices.tpl:173
+msgid "Atx"
+msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:244
+#: plugins/admin/systems/glpi_devices.tpl:181
 #, fuzzy
-msgid ""
-"This terminal has printer extension disabled. You can enable it by clicking "
-"below."
-msgstr "Questa identità non possiede estensioni di posta."
+msgid "Power"
+msgstr "Pager"
 
-#: plugins/admin/systems/class_printGeneric.inc:283
-msgid "This 'dn' has no printer features."
+#: plugins/admin/systems/glpi_devices.tpl:193
+msgid "Add/Edit graphic card"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:419
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
+#: plugins/admin/systems/glpi_devices.tpl:228
+#: plugins/admin/systems/glpi_devices.tpl:284
+#: plugins/admin/systems/glpi_devices.tpl:349
+msgid "Interface"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:427
+#: plugins/admin/systems/glpi_devices.tpl:237
 #, fuzzy
-msgid "can't get ppd informations."
-msgstr "Informazioni organizzazione"
+msgid "Ram"
+msgstr "Cognome"
 
-#: plugins/admin/systems/class_printGeneric.inc:439
-#, php-format
-msgid "This printer belongs to terminal %s. You can't rename this printer."
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:249
+#, fuzzy
+msgid "Add/Edit controller"
+msgstr "Nuova conferenza"
 
-#: plugins/admin/systems/class_printGeneric.inc:441
-#, php-format
-msgid "This printer belongs to workstation %s. You can't rename this printer."
+#: plugins/admin/systems/glpi_devices.tpl:307
+msgid "Add/Edit drive"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:519
-msgid "You have no permissions to create a printer on this 'Base'."
+#: plugins/admin/systems/glpi_devices.tpl:342
+msgid "Speed"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:14
-msgid "POP3 service"
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:358
+#, fuzzy
+msgid "Writeable"
+msgstr "scrivere"
 
-#: plugins/admin/systems/servkolab.tpl:22
-msgid "POP3/SSL service"
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:371
+#, fuzzy
+msgid "Add/Edit harddisk"
+msgstr "Server"
 
-#: plugins/admin/systems/servkolab.tpl:30
-msgid "IMAP service"
+#: plugins/admin/systems/glpi_devices.tpl:406
+msgid "Rpm"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:38
-msgid "IMAP/SSL service"
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:413
+#, fuzzy
+msgid "Cache"
+msgstr "Annulla"
 
-#: plugins/admin/systems/servkolab.tpl:46
-msgid "Sieve service"
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:443
+#, fuzzy
+msgid "Add/Edit memory"
+msgstr "Modifica contatto"
 
-#: plugins/admin/systems/servkolab.tpl:54
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+#: plugins/admin/systems/glpi_devices.tpl:478
+#, fuzzy
+msgid "Frequenz"
+msgstr "Numero di telefono"
+
+#: plugins/admin/systems/glpi_devices.tpl:507
+#, fuzzy
+msgid "Add/Edit sound card"
+msgstr "Nuova password"
+
+#: plugins/admin/systems/glpi_devices.tpl:553
+#, fuzzy
+msgid "Add/Edit network interface"
+msgstr "Mostra stampanti di rete"
+
+#: plugins/admin/systems/glpi_devices.tpl:589
+#, fuzzy
+msgid "MAC address"
+msgstr "Indirizzo principale"
+
+#: plugins/admin/systems/glpi_devices.tpl:607
+#, fuzzy
+msgid "Add/Edit processor"
+msgstr "Nuova password"
+
+#: plugins/admin/systems/glpi_devices.tpl:642
+#, fuzzy
+msgid "Frequence"
+msgstr "Numero di telefono"
+
+#: plugins/admin/systems/glpi_devices.tpl:649
+#, fuzzy
+msgid "Default frequence"
+msgstr "Stampante predefinita"
+
+#: plugins/admin/systems/glpi_devices.tpl:661
+msgid "Add/Edit motherboard"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:62
-msgid "HTTP FreeBusy service (legacy)"
+#: plugins/admin/systems/glpi_devices.tpl:696
+#, fuzzy
+msgid "Chipset"
+msgstr "reset"
+
+#: plugins/admin/systems/glpi_devices.tpl:707
+#, fuzzy
+msgid "Add/Edit computer case"
+msgstr "Computer"
+
+#: plugins/admin/systems/glpi_devices.tpl:742
+#, fuzzy
+msgid "format"
+msgstr "Informazioni"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
+#, php-format
+msgid "Internal Error can't create device of type '%s'"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:70
-msgid "Amavis email scanning (virus/spam)"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
+#, php-format
+msgid "You're about to delete the glpi device '%s'."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:81
-msgid "Quota settings"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
+msgid "Can't detect object name."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:97
-msgid "Free/Busy settings"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
+#, php-format
+msgid ""
+"You can't delete this device, it is still in use by these system(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:102
-msgid "Allow unauthenticated downloading of Free/Busy information"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
+#, fuzzy
+msgid "devices"
+msgstr "Dispositivi"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
+#, fuzzy
+msgid "New mainbord"
+msgstr "Nuova password"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
+#, fuzzy
+msgid "New processor"
+msgstr "Nuova password"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+#, fuzzy
+msgid "New case"
+msgstr "utenti"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+msgid "C"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:117
-msgid "SMTP privileged networks"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+#, fuzzy
+msgid "New network interface"
+msgstr "Mostra stampanti di rete"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+#, fuzzy
+msgid "NI"
+msgstr "Unix"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+#, fuzzy
+msgid "New ram"
+msgstr "utenti"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+msgid "R"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:122
-msgid "Hosts/networks allowed to relay"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+#, fuzzy
+msgid "New hard disk"
+msgstr "Server"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+msgid "HDD"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:125
-msgid "Enter multiple values, seperated with"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+#, fuzzy
+msgid "New drive"
+msgstr "Server"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+#, fuzzy
+msgid "D"
+msgstr "UID"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+#, fuzzy
+msgid "New controller"
+msgstr "Nuova conferenza"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+msgid "CS"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:138
-msgid "SMTP smarthost/relayhost"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "New graphics card"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:144
-msgid "Enable MX lookup for relayhost"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "GC"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:149
-msgid "Host used to relay mails"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+#, fuzzy
+msgid "New sound card"
+msgstr "Nuova password"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+msgid "SC"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:163
-msgid "Accept Internet Mail"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "New power supply"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:169
-msgid "Accept mail from other domains over non-authenticated SMTP"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "PS"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:1
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
 #, fuzzy
-msgid "Advanced phone settings"
-msgstr "Opzioni di posta avanzate"
+msgid "New misc device"
+msgstr "Mostra dispositiva di rete"
 
-#: plugins/admin/systems/phonesettings.tpl:6
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+msgid "OC"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:346
 #, fuzzy
-msgid "Phone type"
-msgstr "Telefono"
+msgid "You have to specify a valid name for this device."
+msgstr "Specificare una dimenzione valida per le mail da rigettare."
 
-#: plugins/admin/systems/phonesettings.tpl:7
-#: plugins/admin/systems/phonesettings.tpl:25
-#: plugins/admin/systems/phonesettings.tpl:35
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:78
-#: plugins/admin/systems/phonesettings.tpl:109
-#: plugins/admin/systems/phonesettings.tpl:156
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:366
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:369
 #, fuzzy
-msgid "Choose a phone type"
-msgstr "Scegli il tuo numero di telefono personale"
+msgid "This device name is already in use."
+msgstr "L'indirizzo principale inserito è già in uso."
 
-#: plugins/admin/systems/phonesettings.tpl:10
-msgid "refresh"
-msgstr ""
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
+#, fuzzy
+msgid "Other"
+msgstr "Filtri"
 
-#: plugins/admin/systems/phonesettings.tpl:32
-msgid "DTMF mode"
+#: plugins/admin/systems/class_servService.inc:272
+msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:46
-#: plugins/admin/systems/phonesettings.tpl:85
+#: plugins/admin/systems/servRepositorySetup.tpl:15
 #, fuzzy
-msgid "Default IP"
-msgstr "Stampante predefinita"
+msgid "Parent server"
+msgstr "server"
 
-#: plugins/admin/systems/phonesettings.tpl:56
-#: plugins/admin/systems/phonesettings.tpl:93
-msgid "Response timeout"
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:75
-msgid "Modus"
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:106
-msgid "Authtype"
+#: plugins/admin/systems/servservice.tpl:72
+msgid "Terminal Service"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:116
-#, fuzzy
-msgid "Secret"
-msgstr "Strada"
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
+msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:124
-msgid "GoFonInkeys"
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:132
-msgid "GoFonOutKeys"
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:145
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:109
 #, fuzzy
-msgid "Account code"
-msgstr "Sicurezza"
+msgid "Mail server"
+msgstr "Server"
 
-#: plugins/admin/systems/phonesettings.tpl:153
-msgid "Trunk lines"
+#: plugins/admin/systems/glpi_edit_os.tpl:1
+msgid "Manage OS-types"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:168
-msgid "Hosts that are allowed to connect"
-msgstr ""
+#: plugins/admin/systems/printerPPDDialog.tpl:1
+#, fuzzy
+msgid "Printer driver"
+msgstr "Stampante"
 
-#: plugins/admin/systems/phonesettings.tpl:183
-msgid "Hosts that are not allowed to connect"
-msgstr ""
+#: plugins/admin/systems/printerPPDDialog.tpl:9
+#, fuzzy
+msgid "New driver"
+msgstr "Server"
 
-#: plugins/admin/systems/phonesettings.tpl:205
-msgid "MSN"
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
 msgstr ""
 
-#: plugins/admin/systems/wingeneric.tpl:6
-msgid "Machine name"
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
+msgid "List of available cartridge type for this type of printer"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:141
-msgid "Remote desktop"
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
+msgid ""
+"This dialog allows you to create new types of cartridges, and select one or "
+"more types for your printer. Cartridge types depends on the printer type you "
+"have selected. For each selected cartridge type there will be a new "
+"cartridge created, this allows you to select the same cartridge type for "
+"more then one printer."
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:145
-msgid "Connect method"
-msgstr ""
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
+#, fuzzy
+msgid "Display cartridge types matching"
+msgstr "Mostra utenti che corrispondono a"
 
-#: plugins/admin/systems/terminalService.tpl:147
-msgid "Choose method to connect to terminal server"
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
+#, fuzzy
+msgid "Regular expression for matching cartridge types"
+msgstr "Espressione regolare per selezionare l'indirizzo"
+
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
+#, fuzzy
+msgid "Reference"
+msgstr "Riferimenti"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:61
+msgid "text"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:154
-msgid "Terminal server"
+#: plugins/admin/systems/class_terminalGeneric.inc:62
+msgid "graphic"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:156
-msgid "Select specific terminal server to use"
+#: plugins/admin/systems/class_terminalGeneric.inc:90
+#: plugins/admin/systems/class_servGeneric.inc:62
+#: plugins/admin/ogroups/class_termgroup.inc:64
+msgid "No WAKECMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:163
-msgid "Font server"
+#: plugins/admin/systems/class_terminalGeneric.inc:102
+#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/ogroups/class_termgroup.inc:76
+msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:165
-msgid "Select specific font server to use"
+#: plugins/admin/systems/class_terminalGeneric.inc:114
+#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/ogroups/class_termgroup.inc:88
+msgid "No HALTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:181
-msgid "Print device"
+#: plugins/admin/systems/class_terminalGeneric.inc:269
+msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:182
-msgid "Select to start IPP based printing service on terminal"
+#: plugins/admin/systems/class_terminalGeneric.inc:273
+msgid "The required field 'Terminal name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:183
-msgid "Provide print services"
+#: plugins/admin/systems/remove_glpi.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your MySql database in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:189
-msgid "Spool server"
+#: plugins/admin/systems/class_servGeneric.inc:52
+msgid "This 'dn' has no server features."
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:191
-msgid "Select NFS filesystem to place spool files on"
-msgstr ""
+#: plugins/admin/systems/class_servGeneric.inc:191
+#, fuzzy
+msgid "The required field 'Server name' is not set."
+msgstr "Il campo 'Indirizzo principale' non è stao inserito"
 
-#: plugins/admin/systems/terminalService.tpl:212
-msgid "Select scanner driver to use"
+#: plugins/admin/systems/class_servGeneric.inc:198
+msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/remove.tpl:6
-msgid ""
-"This includes <b>all</b> system and setup informations. Please double check "
-"if your really want to do this since there is no way for GOsa to get your "
-"data back."
-msgstr ""
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
+#, fuzzy
+msgid "Add/Edit manufacturer"
+msgstr "Modifica contatto"
 
-#: plugins/admin/systems/headpage.tpl:6
-msgid "List of systems"
-msgstr "Lista dei sistemi"
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
+#, fuzzy
+msgid "Website"
+msgstr "scrivere"
 
-#: plugins/admin/systems/headpage.tpl:24
-msgid ""
-"This menu allows you to add, remove and change the properties of specific "
-"systems. You can only add systems which have already been started once."
-msgstr ""
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
+#: plugins/admin/ogroups/class_mailogroup.inc:137
+#: plugins/admin/ogroups/class_phonequeue.inc:690
+#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Phone number"
+msgstr "Numero di telefono"
 
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
-msgstr "Mostra server"
+#: plugins/admin/systems/class_servDHCP.inc:36
+msgid "Remove DHCP service"
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:39
-msgid "Select to see Linux terminals"
+#: plugins/admin/systems/class_servDHCP.inc:37
+msgid ""
+"This server has DHCP features enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:39
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
-msgstr "Mostra terminali"
+#: plugins/admin/systems/class_servDHCP.inc:39
+msgid "Add DHCP service"
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:40
-msgid "Select to see Linux workstations"
+#: plugins/admin/systems/class_servDHCP.inc:40
+msgid ""
+"This server has DHCP features disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:40
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
-msgstr "Mostra workstation"
+#: plugins/admin/systems/class_systemManagement.inc:32
+msgid "Systems"
+msgstr "Sistemi"
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Select to see MicroSoft Windows based workstations"
+#: plugins/admin/systems/class_systemManagement.inc:429
+msgid "You can't edit this object type yet!"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Show windows based workstations"
-msgstr "Mostra workstation Windows"
+#: plugins/admin/systems/class_systemManagement.inc:455
+msgid "Passwords entered as new and repeated do not match!"
+msgstr "Le password nuova e ripetuta non corrispondono"
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Select to see network printers"
+#: plugins/admin/systems/class_systemManagement.inc:472
+msgid "You are not allowed to set this systems password!"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Show network printers"
-msgstr "Mostra stampanti di rete"
-
-#: plugins/admin/systems/headpage.tpl:43
-msgid "Select to see VOIP phones"
+#: plugins/admin/systems/class_systemManagement.inc:526
+#, php-format
+msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:43
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
-msgstr "Mostra telefoni"
+#: plugins/admin/systems/class_systemManagement.inc:761
+#, fuzzy
+msgid "New Terminal template"
+msgstr "Terminal Server"
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Select to see network devices"
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:761
+#: plugins/admin/systems/class_systemManagement.inc:925
+#, fuzzy
+msgid "New Terminal"
+msgstr "Terminali"
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Show network devices"
-msgstr "Mostra dispositiva di rete"
+#: plugins/admin/systems/class_systemManagement.inc:763
+#, fuzzy
+msgid "New Workstation template"
+msgstr "Mostra workstation"
 
-#: plugins/admin/systems/headpage.tpl:52
-msgid "Regular expression for matching system names"
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/systems/class_systemManagement.inc:926
+#, fuzzy
+msgid "New Workstation"
+msgstr "Mostra workstation"
 
-#: plugins/admin/systems/headpage.tpl:59
+#: plugins/admin/systems/class_systemManagement.inc:764
+#: plugins/admin/systems/class_systemManagement.inc:765
 #, fuzzy
-msgid "Display systems of user"
-msgstr "Mostra l'indirizzo dell'utente"
+msgid "New Server"
+msgstr "Server"
 
-#: plugins/admin/systems/headpage.tpl:62
-msgid "User name of which terminal(s) are shown"
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:766
+#: plugins/admin/systems/class_systemManagement.inc:767
+#, fuzzy
+msgid "New Printer"
+msgstr "Stampante"
 
-#: plugins/admin/systems/class_componentGeneric.inc:138
+#: plugins/admin/systems/class_systemManagement.inc:768
+#: plugins/admin/systems/class_systemManagement.inc:769
 #, fuzzy
-msgid "The required field 'Component name' is not set."
-msgstr "Il campo necessario 'Home directory' non è vuoto"
+msgid "New Phone"
+msgstr "Telefono"
 
-#: plugins/admin/systems/terminalStartup.tpl:35
-msgid "Select if terminal supports graphical startup with progress bar"
+#: plugins/admin/systems/class_systemManagement.inc:770
+#: plugins/admin/systems/class_systemManagement.inc:771
+msgid "New Component"
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:36
-msgid "use graphical bootup"
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:781
+#, fuzzy
+msgid "Edit system"
+msgstr "Lista dei sistemi"
 
-#: plugins/admin/systems/terminalStartup.tpl:38
-msgid "Select if terminal should boot in text mode"
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:782
+#, fuzzy
+msgid "Delete system"
+msgstr "Rimuovi"
 
-#: plugins/admin/systems/terminalStartup.tpl:39
-msgid "use standard linux textual bootup"
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:792
+#, fuzzy
+msgid "System"
+msgstr "Sistemi"
 
-#: plugins/admin/systems/terminalStartup.tpl:41
-msgid "Select to get more verbose output during startup"
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:830
+#, fuzzy
+msgid "Cups Server"
+msgstr "Server"
 
-#: plugins/admin/systems/terminalStartup.tpl:42
-msgid "use debug mode for startup"
+#: plugins/admin/systems/class_systemManagement.inc:831
+msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/password.tpl:2
+#: plugins/admin/systems/class_systemManagement.inc:832
 #, fuzzy
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you "
-"wouldn't be able to log in."
-msgstr ""
-"Per cambiare la tua password usa i campi qui sotto. I cambiamenti avrenno "
-"effetto immediatamente. Memorizza la nuova password perché non sarai in "
-"grado di connetterti senza di essa."
+msgid "Syslog Server"
+msgstr "Mostra server"
 
-#: plugins/admin/systems/password.tpl:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:833
+#, fuzzy
+msgid "Mail Server"
+msgstr "Server"
 
-#: plugins/admin/systems/password.tpl:9
-msgid "Changing the password impinges on authentification only."
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:834
+#, fuzzy
+msgid "Imap Server"
+msgstr "Server"
+
+#: plugins/admin/systems/class_systemManagement.inc:835
+#, fuzzy
+msgid "Nfs Server"
+msgstr "Server"
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
+#: plugins/admin/systems/class_systemManagement.inc:836
 #, fuzzy
-msgid "Printer ppd selection."
-msgstr "Impostazioni Unix"
+msgid "Kerberos Server"
+msgstr "Kerberos"
 
-#: plugins/admin/systems/servRepositorySetup.tpl:15
+#: plugins/admin/systems/class_systemManagement.inc:837
 #, fuzzy
-msgid "Parent server"
-msgstr "server"
+msgid "Asterisk Server"
+msgstr "Terminal Server"
 
-#: plugins/admin/systems/servRepositorySetup.tpl:33
-#: plugins/admin/systems/class_servRepository.inc:243
-#: plugins/admin/systems/class_servRepository.inc:264
+#: plugins/admin/systems/class_systemManagement.inc:838
 #, fuzzy
-msgid "Sections"
-msgstr "Azione"
+msgid "Fax Server"
+msgstr "Server"
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:117
+#: plugins/admin/systems/class_systemManagement.inc:839
 #, fuzzy
-msgid "Please enter a value for 'release'."
-msgstr "Prego inserire un numero di telefono valido!"
+msgid "Ldap Server"
+msgstr "Server"
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:121
+#: plugins/admin/systems/class_systemManagement.inc:872
 #, fuzzy
-msgid "Please specify a valid value for 'url'."
-msgstr "Specificare una dimenzione valida per le mail da rigettare."
+msgid "Set root password"
+msgstr "Cambia password"
 
-#: plugins/admin/systems/servRepository.tpl:6
+#: plugins/admin/systems/class_systemManagement.inc:917
 #, fuzzy
-msgid "List of configured repositories."
-msgstr "Lista dei gruppi"
+msgid "New System from incoming"
+msgstr "Informazioni organizzazione"
 
-#: plugins/admin/systems/servRepository.tpl:11
+#: plugins/admin/systems/class_systemManagement.inc:919
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:590
 #, fuzzy
-msgid "Add repository"
-msgstr "Riprova"
+msgid "Terminal"
+msgstr "Terminali"
 
-#: plugins/admin/systems/servRepository.tpl:29
-msgid "This menu allows you to create, delete and edit repository settings."
+#: plugins/admin/systems/class_systemManagement.inc:920
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:589
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
+#: plugins/admin/systems/class_systemManagement.inc:923
 #, fuzzy
-msgid ""
-"This server has inventory features enabled. You can disable them by clicking "
-"below."
-msgstr "Questa identià possiede estensioni Unix."
+msgid "Winstation"
+msgstr "Amministrazione"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
+#: plugins/admin/systems/class_systemManagement.inc:924
 #, fuzzy
-msgid ""
-"This server has inventory features disabled. You can enable them by clicking "
-"below."
-msgstr "Questa identità non possiede estensioni Unix"
-
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
-#, php-format
-msgid ""
-"Can't rename given printer type to '%s', because this type name already "
-"exists."
-msgstr ""
+msgid "Network Device"
+msgstr "Mostra dispositiva di rete"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
-#, php-format
-msgid "Can't delete printer type, it is still in use by '%s'."
+#: plugins/admin/systems/class_systemManagement.inc:1147
+msgid "New terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:750
-msgid "since"
+#: plugins/admin/systems/class_systemManagement.inc:1149
+msgid "New workstation"
 msgstr ""
 
-#: plugins/admin/systems/glpi_edit_type.tpl:1
-#, fuzzy
-msgid "Manage System-types"
-msgstr "Sistemi"
-
-#: plugins/admin/systems/glpi_edit_type.tpl:9
-#: plugins/admin/systems/glpi_edit_type.tpl:28
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
-#: plugins/admin/systems/glpi_edit_os.tpl:9
-#: plugins/admin/systems/glpi_edit_os.tpl:28
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:8
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:29
+#: plugins/admin/systems/class_systemManagement.inc:1151
 #, fuzzy
-msgid "Rename"
-msgstr "Cognome"
+msgid "New Device"
+msgstr "Mostra dispositiva di rete"
 
-#: plugins/admin/systems/glpi_edit_type.tpl:24
-#: plugins/admin/systems/glpi_edit_os.tpl:24
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:25
+#: plugins/admin/systems/class_systemManagement.inc:1168
 #, fuzzy
-msgid "Please enter a new name"
-msgstr "Inserisci la URI del server LDAP"
+msgid "Terminal template for"
+msgstr "Terminal Server"
 
-#: plugins/admin/systems/remove_glpi.tpl:10
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your MySql database in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
+#: plugins/admin/systems/class_systemManagement.inc:1180
+msgid "Workstation template for"
 msgstr ""
 
-#: plugins/admin/systems/glpiManufacturer.tpl:1
+#: plugins/admin/systems/class_servRepositorySetup.inc:117
 #, fuzzy
-msgid "Manage manufacturers"
-msgstr "Modifica contatto"
+msgid "Please enter a value for 'release'."
+msgstr "Prego inserire un numero di telefono valido!"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
+#: plugins/admin/systems/class_servRepositorySetup.inc:121
 #, fuzzy
-msgid "Reference"
-msgstr "Riferimenti"
+msgid "Please specify a valid value for 'url'."
+msgstr "Specificare una dimenzione valida per le mail da rigettare."
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
-#: plugins/admin/systems/glpi_devices.tpl:17
-#, fuzzy
-msgid "Comments"
-msgstr "Contenuti"
+#: plugins/admin/systems/printer.tpl:6
+msgid "General"
+msgstr "Generale"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
-#: plugins/admin/systems/glpi.tpl:63
-#: plugins/admin/systems/glpi_devices.tpl:112
-#: plugins/admin/systems/glpi_devices.tpl:153
-#: plugins/admin/systems/glpi_devices.tpl:208
-#: plugins/admin/systems/glpi_devices.tpl:264
-#: plugins/admin/systems/glpi_devices.tpl:322
-#: plugins/admin/systems/glpi_devices.tpl:386
-#: plugins/admin/systems/glpi_devices.tpl:458
-#: plugins/admin/systems/glpi_devices.tpl:522
-#: plugins/admin/systems/glpi_devices.tpl:569
-#: plugins/admin/systems/glpi_devices.tpl:622
-#: plugins/admin/systems/glpi_devices.tpl:676
-#: plugins/admin/systems/glpi_devices.tpl:722
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
+#: plugins/admin/systems/printer.tpl:9
+msgid "Printer name"
+msgstr "Nome della stampante"
+
+#: plugins/admin/systems/printer.tpl:31
+msgid "Details"
+msgstr "Dettagli"
+
+#: plugins/admin/systems/printer.tpl:34
 #, fuzzy
-msgid "Comment"
-msgstr "Contenuti"
+msgid "Printer location"
+msgstr "Impostazioni Unix"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
-#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
-#: plugins/admin/systems/glpi_devices.tpl:24
-#: plugins/admin/systems/glpi_devices.tpl:123
-#: plugins/admin/systems/glpi_devices.tpl:164
-#: plugins/admin/systems/glpi_devices.tpl:219
-#: plugins/admin/systems/glpi_devices.tpl:275
-#: plugins/admin/systems/glpi_devices.tpl:333
-#: plugins/admin/systems/glpi_devices.tpl:397
-#: plugins/admin/systems/glpi_devices.tpl:469
-#: plugins/admin/systems/glpi_devices.tpl:533
-#: plugins/admin/systems/glpi_devices.tpl:580
-#: plugins/admin/systems/glpi_devices.tpl:633
-#: plugins/admin/systems/glpi_devices.tpl:687
-#: plugins/admin/systems/glpi_devices.tpl:733
-msgid "Manufacturer"
-msgstr ""
+#: plugins/admin/systems/printer.tpl:38
+msgid "Printer URL"
+msgstr "URL della stampante"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
-#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
-msgid "Technical responsible"
+#: plugins/admin/systems/printer.tpl:58
+msgid "Permissions"
+msgstr "Permessi"
+
+#: plugins/admin/systems/printer.tpl:65
+msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:140
+#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
 #, fuzzy
-msgid "use"
-msgstr "utenti"
+msgid "Add user"
+msgstr "Modifica contatto"
 
-#: plugins/admin/systems/glpiSelectUser.tpl:23
-msgid ""
-"This dialog allows you to select a user as technical responsible person."
-msgstr ""
+#: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
+#, fuzzy
+msgid "Add group"
+msgstr "gruppi"
 
-#: plugins/admin/systems/glpi_edit_os.tpl:1
-msgid "Manage OS-types"
+#: plugins/admin/systems/printer.tpl:81
+msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:313
+#: plugins/admin/systems/printer.tpl:82
 #, fuzzy
-msgid "The required field 'IP-address' is not set."
-msgstr "Il campo 'Indirizzo principale' non è stao inserito"
+msgid "Admins"
+msgstr "DN dell'amministratore"
 
-#: plugins/admin/systems/class_termDNS.inc:319
-msgid "Wrong IP format in field IP-address."
+#: plugins/admin/systems/class_servDNS.inc:181
+#: plugins/admin/systems/class_inventory.inc:36
+msgid "Remove DNS service"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:325
-#, fuzzy
-msgid "The required field 'MAC-address' is not set."
-msgstr "Il campo 'Indirizzo principale' non è stao inserito"
-
-#: plugins/admin/systems/class_termDNS.inc:331
+#: plugins/admin/systems/class_servDNS.inc:182
+#: plugins/admin/systems/class_inventory.inc:37
 msgid ""
-"The given macaddress is invalid. There must be 6 1byte segments seperated by "
-"':'."
+"This server has DNS features enabled. You can disable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:346
-#, php-format
-msgid "Found duplicate value for record type '%s'."
+#: plugins/admin/systems/class_servDNS.inc:184
+#: plugins/admin/systems/class_inventory.inc:39
+msgid "Add DNS service"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:352
-#, php-format
-msgid "Found more than one entry for the uniqe record type '%s'."
+#: plugins/admin/systems/class_servDNS.inc:185
+#: plugins/admin/systems/class_inventory.inc:40
+msgid ""
+"This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:360
+#: plugins/admin/systems/class_servDNS.inc:270
 #, php-format
 msgid ""
-"The device IP '%s' is added as 'A Record', this will be done automatically, "
-"please remove the record."
+"Can't delete the selected zone, because it is still in use by these entry/"
+"entries '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:366
-#: plugins/admin/systems/class_servDNSeditZone.inc:386
-#, php-format
-msgid "Only lowercase is allowed, please check your '%ss'."
-msgstr ""
+#: plugins/admin/systems/class_servDNS.inc:297
+#, fuzzy
+msgid "Reverse zone"
+msgstr "Riferimenti"
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
+#: plugins/admin/systems/class_servDNSeditZone.inc:336
 #, fuzzy
-msgid "Add/Edit manufacturer"
-msgstr "Modifica contatto"
+msgid "This zoneName is already in use"
+msgstr "L'indirizzo principale inserito è già in uso."
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
+#: plugins/admin/systems/class_servDNSeditZone.inc:339
 #, fuzzy
-msgid "Website"
-msgstr "scrivere"
+msgid "This reverse zone is already in use"
+msgstr "L'indirizzo principale inserito è già in uso."
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
-#: plugins/admin/ogroups/class_mailogroup.inc:137
-#: plugins/admin/ogroups/class_phonequeue.inc:690
-#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Phone number"
-msgstr "Numero di telefono"
+#: plugins/admin/systems/class_servDNSeditZone.inc:344
+msgid "Primary dns server must end with '.' to be a valid entry."
+msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
-msgid "List of available cartridge type for this type of printer"
+#: plugins/admin/systems/class_servDNSeditZone.inc:348
+msgid "Your specified mail address must end with '.' to be a valid record."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
+#: plugins/admin/systems/class_servDNSeditZone.inc:352
+#: plugins/admin/systems/class_servDNSeditZone.inc:356
 msgid ""
-"This dialog allows you to create new types of cartridges, and select one or "
-"more types for your printer. Cartridge types depends on the printer type you "
-"have selected. For each selected cartridge type there will be a new "
-"cartridge created, this allows you to select the same cartridge type for "
-"more then one printer."
+"Your mail address contains '@' replace this with '.' to enable GOsa to "
+"create a valid SOA record."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
-#, fuzzy
-msgid "Display cartridge types matching"
-msgstr "Mostra utenti che corrispondono a"
+#: plugins/admin/systems/class_servDNSeditZone.inc:360
+msgid "Only lowercase strings are allowed as zone name."
+msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
+#: plugins/admin/systems/class_servDNSeditZone.inc:364
 #, fuzzy
-msgid "Regular expression for matching cartridge types"
-msgstr "Espressione regolare per selezionare l'indirizzo"
+msgid "Please specify a numeric value for serial number."
+msgstr "Specificare una dimenzione valida per le mail da rigettare."
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:58
-#, php-format
-msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
-msgstr ""
+#: plugins/admin/systems/class_servDNSeditZone.inc:368
+#, fuzzy
+msgid "Please specify a numeric value for refresh."
+msgstr "Specificare una dimenzione valida per le mail da rigettare."
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:104
+#: plugins/admin/systems/class_servDNSeditZone.inc:372
 #, fuzzy
-msgid "Please specify a name."
-msgstr "Prego inserire un numero di telefono valido!"
+msgid "Please specify a numeric value for ttl."
+msgstr "Specificare una dimenzione valida per le mail da rigettare."
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:113
-#: plugins/admin/systems/class_glpiManufacturer.inc:119
-msgid "Specified name is already in use, please choose another one."
-msgstr ""
+#: plugins/admin/systems/class_servDNSeditZone.inc:376
+#, fuzzy
+msgid "Please specify a numeric value for expire."
+msgstr "Specificare una dimenzione valida per le mail da rigettare."
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:6
+#: plugins/admin/systems/class_servDNSeditZone.inc:380
 #, fuzzy
-msgid "List of attachments"
-msgstr "Lista dei dipartimenti"
+msgid "Please specify a numeric value for retry."
+msgstr "Specificare una dimenzione valida per le mail da rigettare."
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:23
-msgid ""
-"This dialog allow you to attach additional objects (like manuals, guides, "
-"etc.)  to your currently edited computer."
+#: plugins/admin/systems/servdb.tpl:6
+msgid "Kerberos kadmin access"
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:35
-#, fuzzy
-msgid "Display attachments matching"
-msgstr "Mosra gruppi corrispondenti a"
+#: plugins/admin/systems/servdb.tpl:10
+msgid "Kerberos Realm"
+msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:37
-#, fuzzy
-msgid "Regular expression for matching attachment names"
-msgstr "Espressioni regolare per selezionare il nome del gruppo"
+#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
+msgid "Admin user"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
-msgid "Can't delete this entry, it is still in use."
+#: plugins/admin/systems/servdb.tpl:26
+msgid "FAX database"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:305
-#, fuzzy
-msgid "The selected name is already in use."
-msgstr "L'indirizzo principale inserito è già in uso."
+#: plugins/admin/systems/servdb.tpl:30
+msgid "FAX DB user"
+msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:9
-#: plugins/admin/systems/SelectDeviceType.tpl:20
-#, fuzzy
-msgid "System type"
-msgstr "Sistemi"
+#: plugins/admin/systems/servdb.tpl:42
+msgid "Asterisk management"
+msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:19
-#, fuzzy
-msgid "Operating system"
-msgstr "Rimuovi"
+#: plugins/admin/systems/servdb.tpl:46
+msgid "Asterisk DB user"
+msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
-#, fuzzy
-msgid "Contacts"
-msgstr "Contatto"
+#: plugins/admin/systems/servdb.tpl:54
+msgid "Country dial prefix"
+msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
-#, fuzzy
-msgid "Contact person"
-msgstr "Contatto"
+#: plugins/admin/systems/servdb.tpl:58
+msgid "Local dial prefix"
+msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:78
-#, fuzzy
-msgid "Installed devices"
-msgstr "Dispositivi del client"
+#: plugins/admin/systems/servdb.tpl:70
+msgid "IMAP admin access"
+msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:90
-#, fuzzy
-msgid "Trading"
-msgstr "Ricerca"
+#: plugins/admin/systems/servdb.tpl:74
+msgid "Server identifier"
+msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:91
-#, fuzzy
-msgid "Software"
-msgstr "Stato"
+#: plugins/admin/systems/servdb.tpl:78
+msgid "Connect URL"
+msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:92
-#, fuzzy
-msgid "Contracts"
-msgstr "Contatto"
+#: plugins/admin/systems/servdb.tpl:91
+msgid "Sieve port"
+msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
-#, fuzzy
-msgid "Attachments"
-msgstr "Argomenti"
+#: plugins/admin/systems/servdb.tpl:100
+msgid "Logging database"
+msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:7
-#, fuzzy
-msgid "Zone name"
-msgstr "Nome comune"
+#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
+msgid "Logging DB user"
+msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:13
+#: plugins/admin/systems/servdb.tpl:119
 #, fuzzy
-msgid "Network address"
-msgstr "Mostra dispositiva di rete"
+msgid "Glpi database"
+msgstr "Database"
 
-#: plugins/admin/systems/servdnseditzone.tpl:24
+#: plugins/admin/systems/servdb.tpl:133
 #, fuzzy
-msgid "Zone entries"
-msgstr "Impostazioni Unix"
+msgid "Database"
+msgstr "Database"
 
-#: plugins/admin/systems/servdnseditzone.tpl:35
-#, fuzzy
-msgid "SOA record"
-msgstr "Directory"
+#: plugins/admin/systems/class_printGeneric.inc:177
+#: plugins/admin/systems/class_printGeneric.inc:184
+#: plugins/admin/systems/class_printGeneric.inc:219
+#: plugins/admin/systems/class_printGeneric.inc:240
+#: plugins/admin/systems/class_printGeneric.inc:243
+msgid "Add printer extension"
+msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:41
-msgid "Primary dns server for this zone"
+#: plugins/admin/systems/class_printGeneric.inc:178
+msgid "This is a workstation template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:53
-msgid "Serial number (automatically incremented)"
+#: plugins/admin/systems/class_printGeneric.inc:185
+msgid "This is a terminal template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:69
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/altlinux/setup_finish.tpl:31
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr "Riprova"
+#: plugins/admin/systems/class_printGeneric.inc:220
+#, fuzzy
+msgid ""
+"This workstation has printer extension disabled. You can't enable it while "
+"'cn' is not present in entry. Possibly you are currently creating a new "
+"terminal template"
+msgstr "Questa identità non possiede estensioni di posta."
 
-#: plugins/admin/systems/servdnseditzone.tpl:75
+#: plugins/admin/systems/class_printGeneric.inc:232
+#: plugins/admin/systems/class_printGeneric.inc:235
 #, fuzzy
-msgid "Expire"
-msgstr "Esporta"
+msgid "Remove printer extension"
+msgstr "Elimina foto"
 
-#: plugins/admin/systems/servdnseditzone.tpl:96
+#: plugins/admin/systems/class_printGeneric.inc:233
 #, fuzzy
-msgid "MxRecords"
-msgstr "Directory"
+msgid ""
+"This workstation has printer extension enabled.You can disable it by "
+"clicking below."
+msgstr "Questa identià possiede estensioni di posta."
 
-#: plugins/admin/systems/servdnseditzone.tpl:108
+#: plugins/admin/systems/class_printGeneric.inc:236
 #, fuzzy
-msgid "Zone records"
-msgstr "Directory"
+msgid ""
+"This terminal has printer extension enabled. You can disable it by clicking "
+"below."
+msgstr "Questa identià possiede estensioni di posta."
+
+#: plugins/admin/systems/class_printGeneric.inc:241
+#, fuzzy
+msgid ""
+"This workstation has printer extension disabled. You can enable it by "
+"clicking below."
+msgstr "Questa identità non possiede estensioni di posta."
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:6
+#: plugins/admin/systems/class_printGeneric.inc:244
 #, fuzzy
-msgid "List of devices"
-msgstr "Lista degli utenti"
-
-#: plugins/admin/systems/glpiDeviceManagement.tpl:23
 msgid ""
-"This dialog allows you to attach a device to your currently edited computer."
+"This terminal has printer extension disabled. You can enable it by clicking "
+"below."
+msgstr "Questa identità non possiede estensioni di posta."
+
+#: plugins/admin/systems/class_printGeneric.inc:283
+msgid "This 'dn' has no printer features."
 msgstr ""
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:35
-#, fuzzy
-msgid "Display devices matching"
-msgstr "Mostra gli indirizzi che corrispondono"
+#: plugins/admin/systems/class_printGeneric.inc:419
+#, php-format
+msgid "Your currently selected PPD file '%s' doesn't exist."
+msgstr ""
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:37
+#: plugins/admin/systems/class_printGeneric.inc:427
 #, fuzzy
-msgid "Regular expression for matching device names"
-msgstr "Espressioni regolare per selezionare il nome del gruppo"
+msgid "can't get ppd informations."
+msgstr "Informazioni organizzazione"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:73
+#: plugins/admin/systems/class_printGeneric.inc:439
 #, php-format
-msgid "You're about to delete the glpi attachment component '%s'."
+msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:112
+#: plugins/admin/systems/class_printGeneric.inc:441
 #, php-format
-msgid ""
-"You can't delete this attachment, it is still in use by these system(s) '%s'"
+msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:124
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:128
-#, fuzzy
-msgid "There is no valid file uploaded."
-msgstr "Prego inserire un numero di telefono valido!"
-
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:131
-msgid "Upload wasn't successfull."
+#: plugins/admin/systems/class_printGeneric.inc:519
+msgid "You have no permissions to create a printer on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:134
-msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
+#: plugins/admin/systems/servkolab.tpl:14
+msgid "POP3 service"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:138
-#, fuzzy
-msgid "There is already a file with the same name uploaded."
-msgstr "Prego inserire un numero di telefono valido!"
+#: plugins/admin/systems/servkolab.tpl:22
+msgid "POP3/SSL service"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:142
-#, fuzzy, php-format
-msgid "Can't create file '%s'."
-msgstr "Rimuovi"
+#: plugins/admin/systems/servkolab.tpl:30
+msgid "IMAP service"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:186
-msgid "File is available."
+#: plugins/admin/systems/servkolab.tpl:38
+msgid "IMAP/SSL service"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:188
-msgid "File is not readable, possibly the file is missing."
+#: plugins/admin/systems/servkolab.tpl:46
+msgid "Sieve service"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:191
-msgid "Currently no file uploaded."
+#: plugins/admin/systems/servkolab.tpl:54
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:202
-#, fuzzy
-msgid "Mime"
-msgstr "Cellulare"
+#: plugins/admin/systems/servkolab.tpl:62
+msgid "HTTP FreeBusy service (legacy)"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:205
-msgid "This table displays all available attachments."
+#: plugins/admin/systems/servkolab.tpl:70
+msgid "Amavis email scanning (virus/spam)"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:222
-#, fuzzy
-msgid "empty"
-msgstr "Riprova"
+#: plugins/admin/systems/servkolab.tpl:81
+msgid "Quota settings"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
-#, fuzzy
-msgid "Create new attachment"
-msgstr "Lista dei dipartimenti"
+#: plugins/admin/systems/servkolab.tpl:97
+msgid "Free/Busy settings"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
-#, fuzzy
-msgid "New Attachment"
-msgstr "Argomenti"
+#: plugins/admin/systems/servkolab.tpl:102
+msgid "Allow unauthenticated downloading of Free/Busy information"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:352
-#, fuzzy
-msgid "Please specify a valid name for this attachment."
-msgstr "Specificare una dimenzione valida per le mail da rigettare."
+#: plugins/admin/systems/servkolab.tpl:117
+msgid "SMTP privileged networks"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
-#, php-format
-msgid "Internal Error can't create device of type '%s'"
+#: plugins/admin/systems/servkolab.tpl:122
+msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
-#, php-format
-msgid "You're about to delete the glpi device '%s'."
+#: plugins/admin/systems/servkolab.tpl:125
+msgid "Enter multiple values, seperated with"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
-msgid "Can't detect object name."
+#: plugins/admin/systems/servkolab.tpl:138
+msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
-#, php-format
-msgid ""
-"You can't delete this device, it is still in use by these system(s) '%s'"
+#: plugins/admin/systems/servkolab.tpl:144
+msgid "Enable MX lookup for relayhost"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
-#, fuzzy
-msgid "devices"
-msgstr "Dispositivi"
+#: plugins/admin/systems/servkolab.tpl:149
+msgid "Host used to relay mails"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-#, fuzzy
-msgid "New monitor"
-msgstr "Nuova password"
+#: plugins/admin/systems/servkolab.tpl:163
+msgid "Accept Internet Mail"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-#, fuzzy
-msgid "M"
-msgstr "Mb"
+#: plugins/admin/systems/servkolab.tpl:169
+msgid "Accept mail from other domains over non-authenticated SMTP"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
+#: plugins/admin/systems/phonesettings.tpl:1
 #, fuzzy
-msgid "New mainbord"
-msgstr "Nuova password"
+msgid "Advanced phone settings"
+msgstr "Opzioni di posta avanzate"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
+#: plugins/admin/systems/phonesettings.tpl:6
 #, fuzzy
-msgid "New processor"
-msgstr "Nuova password"
+msgid "Phone type"
+msgstr "Telefono"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+#: plugins/admin/systems/phonesettings.tpl:7
+#: plugins/admin/systems/phonesettings.tpl:25
+#: plugins/admin/systems/phonesettings.tpl:35
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:78
+#: plugins/admin/systems/phonesettings.tpl:109
+#: plugins/admin/systems/phonesettings.tpl:156
 #, fuzzy
-msgid "New case"
-msgstr "utenti"
+msgid "Choose a phone type"
+msgstr "Scegli il tuo numero di telefono personale"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
-msgid "C"
+#: plugins/admin/systems/phonesettings.tpl:10
+msgid "refresh"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
-#, fuzzy
-msgid "New network interface"
-msgstr "Mostra stampanti di rete"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
-#, fuzzy
-msgid "NI"
-msgstr "Unix"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
-#, fuzzy
-msgid "New ram"
-msgstr "utenti"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
-msgid "R"
+#: plugins/admin/systems/phonesettings.tpl:32
+msgid "DTMF mode"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+#: plugins/admin/systems/phonesettings.tpl:46
+#: plugins/admin/systems/phonesettings.tpl:85
 #, fuzzy
-msgid "New hard disk"
-msgstr "Server"
+msgid "Default IP"
+msgstr "Stampante predefinita"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
-msgid "HDD"
+#: plugins/admin/systems/phonesettings.tpl:56
+#: plugins/admin/systems/phonesettings.tpl:93
+msgid "Response timeout"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
-#, fuzzy
-msgid "New drive"
-msgstr "Server"
+#: plugins/admin/systems/phonesettings.tpl:75
+msgid "Modus"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
-#, fuzzy
-msgid "D"
-msgstr "UID"
+#: plugins/admin/systems/phonesettings.tpl:106
+msgid "Authtype"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+#: plugins/admin/systems/phonesettings.tpl:116
 #, fuzzy
-msgid "New controller"
-msgstr "Nuova conferenza"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
-msgid "CS"
-msgstr ""
+msgid "Secret"
+msgstr "Strada"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
-msgid "New graphics card"
+#: plugins/admin/systems/phonesettings.tpl:124
+msgid "GoFonInkeys"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
-msgid "GC"
+#: plugins/admin/systems/phonesettings.tpl:132
+msgid "GoFonOutKeys"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+#: plugins/admin/systems/phonesettings.tpl:145
 #, fuzzy
-msgid "New sound card"
-msgstr "Nuova password"
+msgid "Account code"
+msgstr "Sicurezza"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
-msgid "SC"
+#: plugins/admin/systems/phonesettings.tpl:153
+msgid "Trunk lines"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
-msgid "New power supply"
+#: plugins/admin/systems/phonesettings.tpl:168
+msgid "Hosts that are allowed to connect"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
-msgid "PS"
+#: plugins/admin/systems/phonesettings.tpl:183
+msgid "Hosts that are not allowed to connect"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
-#, fuzzy
-msgid "New misc device"
-msgstr "Mostra dispositiva di rete"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
-msgid "OC"
+#: plugins/admin/systems/phonesettings.tpl:205
+msgid "MSN"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:346
-#, fuzzy
-msgid "You have to specify a valid name for this device."
-msgstr "Specificare una dimenzione valida per le mail da rigettare."
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:366
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:369
-#, fuzzy
-msgid "This device name is already in use."
-msgstr "L'indirizzo principale inserito è già in uso."
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
-#, fuzzy
-msgid "Other"
-msgstr "Filtri"
+#: plugins/admin/systems/remove.tpl:6
+msgid ""
+"This includes <b>all</b> system and setup informations. Please double check "
+"if your really want to do this since there is no way for GOsa to get your "
+"data back."
+msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:9
-#, fuzzy
-msgid "Printer type"
-msgstr "Nome della stampante"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:73
+#, php-format
+msgid "You're about to delete the glpi attachment component '%s'."
+msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:31
-#, fuzzy
-msgid "Supported interfaces"
-msgstr "Mostra dispositiva di rete"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:112
+#, php-format
+msgid ""
+"You can't delete this attachment, it is still in use by these system(s) '%s'"
+msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:38
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:124
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:128
 #, fuzzy
-msgid "Serial"
-msgstr "Terminali"
+msgid "There is no valid file uploaded."
+msgstr "Prego inserire un numero di telefono valido!"
 
-#: plugins/admin/systems/glpiPrinter.tpl:46
-msgid "Parallel"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:131
+msgid "Upload wasn't successfull."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:54
-msgid "USB"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:134
+msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:114
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:138
 #, fuzzy
-msgid "Installed cartridges"
-msgstr "Dispositivi del client"
+msgid "There is already a file with the same name uploaded."
+msgstr "Prego inserire un numero di telefono valido!"
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
-#, php-format
-msgid "You're about to delete the glpi cartridge type '%s'."
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:142
+#, fuzzy, php-format
+msgid "Can't create file '%s'."
+msgstr "Rimuovi"
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:186
+msgid "File is available."
 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_glpiAttachmentPool.inc:188
+msgid "File is not readable, possibly the file is missing."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
-msgid "Cartridges"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:191
+msgid "Currently no file uploaded."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:2
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:202
 #, fuzzy
-msgid "Add/Edit monitor"
-msgstr "Modifica contatto"
+msgid "Mime"
+msgstr "Cellulare"
 
-#: plugins/admin/systems/glpi_devices.tpl:33
-#, fuzzy
-msgid "Monitor size"
-msgstr "Dimensione quota"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:205
+msgid "This table displays all available attachments."
+msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:36
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:222
 #, fuzzy
-msgid "Inch"
-msgstr "Francese"
+msgid "empty"
+msgstr "Riprova"
 
-#: plugins/admin/systems/glpi_devices.tpl:44
-msgid "Integrated microphone"
-msgstr ""
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
+#, fuzzy
+msgid "Create new attachment"
+msgstr "Lista dei dipartimenti"
 
-#: plugins/admin/systems/glpi_devices.tpl:47
-#: plugins/admin/systems/glpi_devices.tpl:55
-#: plugins/admin/systems/glpi_devices.tpl:63
-#: plugins/admin/systems/glpi_devices.tpl:71
-#: plugins/admin/systems/glpi_devices.tpl:176
-#: plugins/admin/systems/glpi_devices.tpl:296
-#: plugins/admin/systems/glpi_devices.tpl:361
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
 #, fuzzy
-msgid "Yes"
-msgstr "Sistemi"
+msgid "New Attachment"
+msgstr "Argomenti"
 
-#: plugins/admin/systems/glpi_devices.tpl:48
-#: plugins/admin/systems/glpi_devices.tpl:56
-#: plugins/admin/systems/glpi_devices.tpl:64
-#: plugins/admin/systems/glpi_devices.tpl:72
-#: plugins/admin/systems/glpi_devices.tpl:177
-#: plugins/admin/systems/glpi_devices.tpl:297
-#: plugins/admin/systems/glpi_devices.tpl:362
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:352
 #, fuzzy
-msgid "No"
-msgstr "nessuno"
+msgid "Please specify a valid name for this attachment."
+msgstr "Specificare una dimenzione valida per le mail da rigettare."
 
-#: plugins/admin/systems/glpi_devices.tpl:52
-msgid "Integrated speakers"
-msgstr ""
+#: plugins/admin/systems/headpage.tpl:6
+msgid "List of systems"
+msgstr "Lista dei sistemi"
 
-#: plugins/admin/systems/glpi_devices.tpl:60
-msgid "Sub-D"
+#: plugins/admin/systems/headpage.tpl:24
+msgid ""
+"This menu allows you to add, remove and change the properties of specific "
+"systems. You can only add systems which have already been started once."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:68
-msgid "BNC"
+#: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
+msgstr "Mostra server"
+
+#: plugins/admin/systems/headpage.tpl:39
+msgid "Select to see Linux terminals"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:76
-#, fuzzy
-msgid "Serial number"
-msgstr "Numero di telefono"
+#: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
+msgstr "Mostra terminali"
 
-#: plugins/admin/systems/glpi_devices.tpl:83
-#, fuzzy
-msgid "Additional serial number"
-msgstr "Numero seriale del certificato"
+#: plugins/admin/systems/headpage.tpl:40
+msgid "Select to see Linux workstations"
+msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:97
-#, fuzzy
-msgid "Add/Edit other device"
-msgstr "Dispositivi del client"
+#: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
+msgstr "Mostra workstation"
 
-#: plugins/admin/systems/glpi_devices.tpl:138
-msgid "Add/Edit power supply"
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Select to see MicroSoft Windows based workstations"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:173
-msgid "Atx"
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Show windows based workstations"
+msgstr "Mostra workstation Windows"
+
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Select to see network printers"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:181
-#, fuzzy
-msgid "Power"
-msgstr "Pager"
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Show network printers"
+msgstr "Mostra stampanti di rete"
 
-#: plugins/admin/systems/glpi_devices.tpl:193
-msgid "Add/Edit graphic card"
+#: plugins/admin/systems/headpage.tpl:43
+msgid "Select to see VOIP phones"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:228
-#: plugins/admin/systems/glpi_devices.tpl:284
-#: plugins/admin/systems/glpi_devices.tpl:349
-msgid "Interface"
-msgstr ""
+#: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
+msgstr "Mostra telefoni"
 
-#: plugins/admin/systems/glpi_devices.tpl:237
-#, fuzzy
-msgid "Ram"
-msgstr "Cognome"
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Select to see network devices"
+msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:249
-#, fuzzy
-msgid "Add/Edit controller"
-msgstr "Nuova conferenza"
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Show network devices"
+msgstr "Mostra dispositiva di rete"
 
-#: plugins/admin/systems/glpi_devices.tpl:307
-msgid "Add/Edit drive"
+#: plugins/admin/systems/headpage.tpl:52
+msgid "Regular expression for matching system names"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:342
-msgid "Speed"
+#: plugins/admin/systems/headpage.tpl:59
+#, fuzzy
+msgid "Display systems of user"
+msgstr "Mostra l'indirizzo dell'utente"
+
+#: plugins/admin/systems/headpage.tpl:62
+msgid "User name of which terminal(s) are shown"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:358
-#, fuzzy
-msgid "Writeable"
-msgstr "scrivere"
-
-#: plugins/admin/systems/glpi_devices.tpl:371
+#: plugins/admin/systems/glpiAttachmentPool.tpl:6
 #, fuzzy
-msgid "Add/Edit harddisk"
-msgstr "Server"
+msgid "List of attachments"
+msgstr "Lista dei dipartimenti"
 
-#: plugins/admin/systems/glpi_devices.tpl:406
-msgid "Rpm"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:23
+msgid ""
+"This dialog allow you to attach additional objects (like manuals, guides, "
+"etc.)  to your currently edited computer."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:413
+#: plugins/admin/systems/glpiAttachmentPool.tpl:35
 #, fuzzy
-msgid "Cache"
-msgstr "Annulla"
+msgid "Display attachments matching"
+msgstr "Mosra gruppi corrispondenti a"
 
-#: plugins/admin/systems/glpi_devices.tpl:443
+#: plugins/admin/systems/glpiAttachmentPool.tpl:37
 #, fuzzy
-msgid "Add/Edit memory"
-msgstr "Modifica contatto"
+msgid "Regular expression for matching attachment names"
+msgstr "Espressioni regolare per selezionare il nome del gruppo"
 
-#: plugins/admin/systems/glpi_devices.tpl:478
+#: plugins/admin/systems/password.tpl:2
 #, fuzzy
-msgid "Frequenz"
-msgstr "Numero di telefono"
+msgid ""
+"To change the terminal root password use the fields below. The changes take "
+"effect during the next reboot. Please memorize the new password, because you "
+"wouldn't be able to log in."
+msgstr ""
+"Per cambiare la tua password usa i campi qui sotto. I cambiamenti avrenno "
+"effetto immediatamente. Memorizza la nuova password perché non sarai in "
+"grado di connetterti senza di essa."
 
-#: plugins/admin/systems/glpi_devices.tpl:507
-#, fuzzy
-msgid "Add/Edit sound card"
-msgstr "Nuova password"
+#: plugins/admin/systems/password.tpl:5
+msgid "Leave fields blank for password inheritance from default entries."
+msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:553
-#, fuzzy
-msgid "Add/Edit network interface"
-msgstr "Mostra stampanti di rete"
+#: plugins/admin/systems/password.tpl:9
+msgid "Changing the password impinges on authentification only."
+msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:589
-#, fuzzy
-msgid "MAC address"
-msgstr "Indirizzo principale"
+#: plugins/admin/systems/chooser.tpl:1
+msgid "Choose the kind of system component you want to create"
+msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:607
-#, fuzzy
-msgid "Add/Edit processor"
-msgstr "Nuova password"
+#: 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/glpi_devices.tpl:642
-#, fuzzy
-msgid "Frequence"
-msgstr "Numero di telefono"
+#: plugins/admin/systems/chooser.tpl:7
+msgid "Linux thin client template"
+msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:649
-#, fuzzy
-msgid "Default frequence"
-msgstr "Stampante predefinita"
+#: plugins/admin/systems/chooser.tpl:8
+msgid "Linux workstation template"
+msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:661
-msgid "Add/Edit motherboard"
+#: 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/glpi_devices.tpl:696
-#, fuzzy
-msgid "Chipset"
-msgstr "reset"
+#: plugins/admin/systems/chooser.tpl:11
+msgid "Network printer"
+msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:707
-#, fuzzy
-msgid "Add/Edit computer case"
-msgstr "Computer"
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
+msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:742
-#, fuzzy
-msgid "format"
-msgstr "Informazioni"
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
+msgstr "Creare"
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
-#, fuzzy
-msgid "Attachment"
-msgstr "Argomenti"
+#: plugins/admin/systems/class_glpiManufacturer.inc:58
+#, php-format
+msgid ""
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
+msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
+#: plugins/admin/systems/class_glpiManufacturer.inc:104
 #, fuzzy
-msgid "Filename"
-msgstr "Cognome"
+msgid "Please specify a name."
+msgstr "Prego inserire un numero di telefono valido!"
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
-#, fuzzy
-msgid "Mime-type"
-msgstr "Tipo"
+#: plugins/admin/systems/class_glpiManufacturer.inc:113
+#: plugins/admin/systems/class_glpiManufacturer.inc:119
+msgid "Specified name is already in use, please choose another one."
+msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:336
+#: plugins/admin/systems/class_phoneGeneric.inc:105
+msgid "This 'dn' has no phone features."
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:202
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
 #, fuzzy
-msgid "This zoneName is already in use"
-msgstr "L'indirizzo principale inserito è già in uso."
+msgid "yes"
+msgstr "Sistemi"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:339
+#: plugins/admin/systems/class_phoneGeneric.inc:202
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
 #, fuzzy
-msgid "This reverse zone is already in use"
-msgstr "L'indirizzo principale inserito è già in uso."
+msgid "no"
+msgstr "nessuno"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:344
-msgid "Primary dns server must end with '.' to be a valid entry."
+#: plugins/admin/systems/class_phoneGeneric.inc:223
+msgid "dynamic"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:348
-msgid "Your specified mail address must end with '.' to be a valid record."
-msgstr ""
+#: plugins/admin/systems/class_phoneGeneric.inc:223
+#, fuzzy
+msgid "Networksettings"
+msgstr "Mostra workstation"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:352
-#: plugins/admin/systems/class_servDNSeditZone.inc:356
+#: plugins/admin/systems/class_phoneGeneric.inc:238
+#, php-format
 msgid ""
-"Your mail address contains '@' replace this with '.' to enable GOsa to "
-"create a valid SOA record."
+"Can't delete because there are user which are depending on this phone. One "
+"of them is user '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:360
-msgid "Only lowercase strings are allowed as zone name."
+#: plugins/admin/systems/class_phoneGeneric.inc:294
+#, fuzzy
+msgid "The required field 'Phone name' is not set."
+msgstr "Il campo necessario 'Home directory' non è vuoto"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:297
+msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:364
+#: plugins/admin/systems/class_phoneGeneric.inc:304
+msgid "You have no permissions to create a phone on this 'Base'."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
 #, fuzzy
-msgid "Please specify a numeric value for serial number."
-msgstr "Specificare una dimenzione valida per le mail da rigettare."
+msgid "Printer ppd selection."
+msgstr "Impostazioni Unix"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:368
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
 #, fuzzy
-msgid "Please specify a numeric value for refresh."
-msgstr "Specificare una dimenzione valida per le mail da rigettare."
+msgid "Select entries to add"
+msgstr "Selezioni utenti da aggiungere"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:372
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
 #, fuzzy
-msgid "Please specify a numeric value for ttl."
-msgstr "Specificare una dimenzione valida per le mail da rigettare."
+msgid "Display members of department"
+msgstr "Mostra utenti del dipartimento"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:376
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
 #, fuzzy
-msgid "Please specify a numeric value for expire."
-msgstr "Specificare una dimenzione valida per le mail da rigettare."
+msgid "Display members matching"
+msgstr "Mostra utenti che corrispondono a"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:380
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
 #, fuzzy
-msgid "Please specify a numeric value for retry."
-msgstr "Specificare una dimenzione valida per le mail da rigettare."
+msgid "Regular expression for matching member names"
+msgstr "Espressioni regolare per selezionare il nome del gruppo"
 
 #: plugins/admin/systems/SelectDeviceType.tpl:3
 msgid ""
@@ -9777,53 +9972,17 @@ msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
 
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:450
 #, php-format
-msgid "The record type '%s' is a unique type and can't be defined twice."
-msgstr ""
-
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:461
-#, php-format
-msgid "There is an empty '%s' for host '%s'."
-msgstr ""
-
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:469
-#, php-format
-msgid "There is a duplicate entry in '%s' for '%s'."
-msgstr ""
-
-#: plugins/admin/systems/class_servRepository.inc:97
-#, fuzzy
-msgid "Remove FAI repository extension."
-msgstr "Elimina foto"
-
-#: plugins/admin/systems/class_servRepository.inc:98
-#, fuzzy
-msgid ""
-"This server has FAI repository features enabled. You can disable them by "
-"clicking below."
-msgstr "Questa identià possiede estensioni Unix."
-
-#: plugins/admin/systems/class_servRepository.inc:100
-msgid "Add FAI repository extension."
-msgstr ""
-
-#: plugins/admin/systems/class_servRepository.inc:101
-#, fuzzy
-msgid ""
-"This server has FAI repository features disabled. You can enable them by "
-"clicking below."
-msgstr "Questa identità non possiede estensioni Unix"
+msgid "The record type '%s' is a unique type and can't be defined twice."
+msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:144
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:461
 #, php-format
-msgid ""
-"You can't delete this release, it is still used by these workstations [%s]. "
-"Please solve this dependencies first, to keep data base consistency."
+msgid "There is an empty '%s' for host '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:176
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:469
 #, php-format
-msgid ""
-"Be careful editing this release, it is still used by these workstations [%s]."
+msgid "There is a duplicate entry in '%s' for '%s'."
 msgstr ""
 
 #: plugins/admin/systems/class_baseSelectDialog.inc:23
@@ -9831,17 +9990,17 @@ msgstr ""
 msgid "Choose a base"
 msgstr "Scegli il tuo numero di telefono personale"
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:33
+#: plugins/admin/systems/class_baseSelectDialog.inc:34
 msgid ""
 "Step in the prefered tree and click save to use the current subtree as base. "
 "Or click the image at the end of each entry."
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:50
+#: plugins/admin/systems/class_baseSelectDialog.inc:51
 msgid "Filter entries with this syntax"
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:114
+#: plugins/admin/systems/class_baseSelectDialog.inc:115
 #, fuzzy, php-format
 msgid "Select this base"
 msgstr "Elimina questo record"
@@ -9944,54 +10103,6 @@ msgstr ""
 msgid "Select action to execute for this   group of terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
-msgid "Object groups"
-msgstr "Gruppi di oggetti"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:54
-msgid "UNIX accounts"
-msgstr "Account Unix"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:58 html/getxls.php:149
-#: html/getxls.php:151 html/getxls.php:158 html/getxls.php:179
-#: html/getxls.php:245 html/getxls.php:316
-msgid "Servers"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:59
-msgid "Thin Clients"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:60
-msgid "Workstations"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:279
-#, php-format
-msgid "You're about to delete the object group '%s'."
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:285
-#: plugins/admin/ogroups/class_ogroupManagement.inc:311
-msgid "You are not allowed to delete this object group!"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:448
-#, fuzzy
-msgid "Create new object group"
-msgstr "Gruppo di oggetti"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:492
-#, fuzzy
-msgid "Name of object groups"
-msgstr "Nome del gruppo"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:541
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
-msgstr "Gruppo di oggetti"
-
 #: plugins/admin/ogroups/class_ogroup.inc:144
 msgid "This 'dn' is no object group."
 msgstr ""
@@ -10052,6 +10163,54 @@ msgstr ""
 msgid "You can combine two different object types at maximum only!"
 msgstr ""
 
+#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+msgid "Object groups"
+msgstr "Gruppi di oggetti"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:54
+msgid "UNIX accounts"
+msgstr "Account Unix"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:58 html/getxls.php:149
+#: html/getxls.php:151 html/getxls.php:158 html/getxls.php:179
+#: html/getxls.php:245 html/getxls.php:316
+msgid "Servers"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:59
+msgid "Thin Clients"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:60
+msgid "Workstations"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:279
+#, php-format
+msgid "You're about to delete the object group '%s'."
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:285
+#: plugins/admin/ogroups/class_ogroupManagement.inc:311
+msgid "You are not allowed to delete this object group!"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:449
+#, fuzzy
+msgid "Create new object group"
+msgstr "Gruppo di oggetti"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:493
+#, fuzzy
+msgid "Name of object groups"
+msgstr "Nome del gruppo"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:542
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
+msgstr "Gruppo di oggetti"
+
 #: plugins/admin/ogroups/generic.tpl:9
 msgid "Name of the group"
 msgstr "Nome del gruppo"
@@ -10373,6 +10532,78 @@ msgstr ""
 msgid "Ring instead of playing background music"
 msgstr ""
 
+#: plugins/gofon/fonreports/class_fonreport.inc:6
+msgid "Phone Reports"
+msgstr "Rapporti telefono"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:96
+#: plugins/gofon/fonreports/class_fonreport.inc:106
+msgid "Can't connect to phone database, no reports can be shown!"
+msgstr ""
+
+#: plugins/gofon/fonreports/class_fonreport.inc:110
+#, fuzzy
+msgid "Can't select phone database for report generation!"
+msgstr "Impossibile selezionare il database!"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:212
+msgid "Query for phone database failed!"
+msgstr ""
+
+#: plugins/gofon/fonreports/contents.tpl:31
+msgid "Source"
+msgstr "Sorgente"
+
+#: plugins/gofon/fonreports/contents.tpl:32
+msgid "Destination"
+msgstr "Destinazione"
+
+#: plugins/gofon/fonreports/contents.tpl:33
+msgid "Channel"
+msgstr ""
+
+#: plugins/gofon/fonreports/contents.tpl:36
+msgid "Duration"
+msgstr "Durata"
+
+#: plugins/gofon/fonreports/main.inc:5
+msgid "Phone reports"
+msgstr "Rapporti telefono"
+
+#: plugins/gofon/macro/parameter.tpl:3
+#, fuzzy
+msgid "Argument"
+msgstr "Argomenti"
+
+#: plugins/gofon/macro/parameter.tpl:7
+#, fuzzy
+msgid "type"
+msgstr "Tipo"
+
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+#, fuzzy
+msgid "Macro name"
+msgstr "Nome gruppo"
+
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
+msgstr ""
+
+#: plugins/gofon/macro/generic.tpl:22
+#, fuzzy
+msgid "Choose subtree to place macro in"
+msgstr "Scegli il subtree dove mettere il gruppo"
+
+#: plugins/gofon/macro/generic.tpl:43
+#, fuzzy
+msgid "Visible for user"
+msgstr "Lista degli utenti"
+
+#: plugins/gofon/macro/generic.tpl:52
+#, fuzzy
+msgid "Macro text"
+msgstr "Nome gruppo"
+
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:25
 msgid "Phone macros"
 msgstr "Macro telefiche"
@@ -10388,31 +10619,31 @@ msgstr ""
 msgid "You are not allowed to delete this macro!"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
 #, fuzzy
 msgid "Create new phone macro"
 msgstr "Crea estensioni telefoniche"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
 #, fuzzy
 msgid "Visible"
 msgstr "disabilitato"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:348
 msgid "This table displays all phone macros, in the selected tree."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
 #, fuzzy
 msgid "Macro"
 msgstr "Nome gruppo"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
 #, fuzzy
 msgid "visible"
 msgstr "Pubblico"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
 #, fuzzy
 msgid "invisible"
 msgstr "Pubblico"
@@ -10493,29 +10724,36 @@ msgstr ""
 msgid "Please choose a valid  base."
 msgstr "Prego inserire un numero di telefono valido!"
 
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+#: plugins/gofon/macro/headpage.tpl:6
 #, fuzzy
-msgid "Macro name"
-msgstr "Nome gruppo"
+msgid "List of macros"
+msgstr "Lista dei gruppi"
 
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
+#: plugins/gofon/macro/headpage.tpl:24
+#, fuzzy
+msgid ""
+"This menu allows you to add, edit and remove selected macros. You may want "
+"to use the range selector on top of the macro listbox, when working with a "
+"large number of macros."
 msgstr ""
+"Questo menù permette di creare, modificare e cancellare i gruppi "
+"selezionati. Avendo un gran numero di gruppi, puoi usare i selettori di "
+"intervalli in cima alla lista dei gruppi."
 
-#: plugins/gofon/macro/generic.tpl:22
+#: plugins/gofon/macro/headpage.tpl:38
 #, fuzzy
-msgid "Choose subtree to place macro in"
-msgstr "Scegli il subtree dove mettere il gruppo"
+msgid "Display macros matching"
+msgstr "Mosra gruppi corrispondenti a"
 
-#: plugins/gofon/macro/generic.tpl:43
+#: plugins/gofon/macro/headpage.tpl:38
 #, fuzzy
-msgid "Visible for user"
-msgstr "Lista degli utenti"
+msgid "Display macros  matching"
+msgstr "Mosra gruppi corrispondenti a"
 
-#: plugins/gofon/macro/generic.tpl:52
+#: plugins/gofon/macro/headpage.tpl:41
 #, fuzzy
-msgid "Macro text"
-msgstr "Nome gruppo"
+msgid "Regular expression for matching macro names"
+msgstr "Espressioni regolare per selezionare il nome del gruppo"
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:245
 #, fuzzy
@@ -10544,64 +10782,28 @@ msgstr ""
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:915
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:340
-#, php-format
-msgid "The parameter %s has incorrect value for type bool."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:369
-#, php-format
-msgid ""
-"Parameter count of the macro changed, you must update each user which are "
-"using this macro '%s'."
-msgstr ""
-
-#: plugins/gofon/macro/headpage.tpl:6
-#, fuzzy
-msgid "List of macros"
-msgstr "Lista dei gruppi"
-
-#: plugins/gofon/macro/headpage.tpl:24
-#, fuzzy
-msgid ""
-"This menu allows you to add, edit and remove selected macros. You may want "
-"to use the range selector on top of the macro listbox, when working with a "
-"large number of macros."
-msgstr ""
-"Questo menù permette di creare, modificare e cancellare i gruppi "
-"selezionati. Avendo un gran numero di gruppi, puoi usare i selettori di "
-"intervalli in cima alla lista dei gruppi."
-
-#: plugins/gofon/macro/headpage.tpl:38
-#, fuzzy
-msgid "Display macros matching"
-msgstr "Mosra gruppi corrispondenti a"
-
-#: plugins/gofon/macro/headpage.tpl:38
-#, fuzzy
-msgid "Display macros  matching"
-msgstr "Mosra gruppi corrispondenti a"
+msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:41
-#, fuzzy
-msgid "Regular expression for matching macro names"
-msgstr "Espressioni regolare per selezionare il nome del gruppo"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:340
+#, php-format
+msgid "The parameter %s has incorrect value for type bool."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:369
+#, php-format
+msgid ""
+"Parameter count of the macro changed, you must update each user which are "
+"using this macro '%s'."
+msgstr ""
 
 #: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
 msgid "Phone macro management"
 msgstr ""
 
-#: plugins/gofon/macro/parameter.tpl:3
-#, fuzzy
-msgid "Argument"
-msgstr "Argomenti"
-
-#: plugins/gofon/macro/parameter.tpl:7
-#, fuzzy
-msgid "type"
-msgstr "Tipo"
+#: plugins/gofon/phoneaccount/main.inc:122
+#: plugins/gofon/phoneaccount/paste_generic.tpl:1
+msgid "Phone settings"
+msgstr ""
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:118
 #, fuzzy
@@ -10720,44 +10922,6 @@ msgstr "Telefono"
 msgid "Phone macro"
 msgstr "Macro telefonica"
 
-#: plugins/gofon/phoneaccount/main.inc:122
-#: plugins/gofon/phoneaccount/paste_generic.tpl:1
-msgid "Phone settings"
-msgstr ""
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
-msgid "Phone conferences"
-msgstr "Conferenze telefoniche"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-msgid "Management"
-msgstr "Dirigenza"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
-msgid "Create new conference"
-msgstr "Crea nuova conferenza"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
-msgid "New conference"
-msgstr "Nuova conferenza"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
-msgid "This table displays all available conference rooms."
-msgstr ""
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:309
-msgid "Name - Number"
-msgstr "Nome - Numero"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
-#: plugins/gofon/conference/generic.tpl:107
-msgid "PIN"
-msgstr ""
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:365
-msgid "Conference"
-msgstr "Conferenza"
-
 #: plugins/gofon/conference/generic.tpl:13
 #, fuzzy
 msgid "Conference name"
@@ -10783,6 +10947,11 @@ msgstr ""
 msgid "Preset PIN"
 msgstr "presente"
 
+#: plugins/gofon/conference/generic.tpl:107
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
+msgid "PIN"
+msgstr ""
+
 #: plugins/gofon/conference/generic.tpl:113
 #, fuzzy
 msgid "Record conference"
@@ -10810,36 +10979,33 @@ msgstr ""
 msgid "Count users"
 msgstr "Paese"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
-msgid ""
-"You have specified a conference 'without PIN' ... please leave the PIN "
-"fields empty."
-msgstr ""
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+msgid "Phone conferences"
+msgstr "Conferenze telefoniche"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:194
-#, fuzzy
-msgid "Please enter a PIN."
-msgstr "Inserisci la URI del server LDAP"
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Management"
+msgstr "Dirigenza"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:198
-#, fuzzy
-msgid "Please enter a name for the conference."
-msgstr "Prego inserire un numero di telefono valido!"
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
+msgid "Create new conference"
+msgstr "Crea nuova conferenza"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:202
-msgid "Only numeric chars are allowed in Number field."
-msgstr ""
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
+msgid "New conference"
+msgstr "Nuova conferenza"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:206
-msgid "Only numbers are allowed in Lifetime."
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:306
+msgid "This table displays all available conference rooms."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:236
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:346
-msgid ""
-"Can't save any changes to asterisk database, there is currently no mysql "
-"extension available in your php setup."
-msgstr ""
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
+msgid "Name - Number"
+msgstr "Nome - Numero"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:366
+msgid "Conference"
+msgstr "Conferenza"
 
 #: plugins/gofon/conference/headpage.tpl:6
 #, fuzzy
@@ -10862,48 +11028,41 @@ msgstr ""
 msgid "Regular expression for        matching user names"
 msgstr "Espressioni regolare per selezionare il nome del gruppo"
 
-#: plugins/gofon/conference/main.inc:38 plugins/gofon/conference/main.inc:40
-#, fuzzy
-msgid "Conference management"
-msgstr "Riferimenti"
-
-#: plugins/gofon/fonreports/class_fonreport.inc:6
-msgid "Phone Reports"
-msgstr "Rapporti telefono"
-
-#: plugins/gofon/fonreports/class_fonreport.inc:96
-#: plugins/gofon/fonreports/class_fonreport.inc:106
-msgid "Can't connect to phone database, no reports can be shown!"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
+msgid ""
+"You have specified a conference 'without PIN' ... please leave the PIN "
+"fields empty."
 msgstr ""
 
-#: plugins/gofon/fonreports/class_fonreport.inc:110
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:194
 #, fuzzy
-msgid "Can't select phone database for report generation!"
-msgstr "Impossibile selezionare il database!"
-
-#: plugins/gofon/fonreports/class_fonreport.inc:212
-msgid "Query for phone database failed!"
-msgstr ""
+msgid "Please enter a PIN."
+msgstr "Inserisci la URI del server LDAP"
 
-#: plugins/gofon/fonreports/contents.tpl:31
-msgid "Source"
-msgstr "Sorgente"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:198
+#, fuzzy
+msgid "Please enter a name for the conference."
+msgstr "Prego inserire un numero di telefono valido!"
 
-#: plugins/gofon/fonreports/contents.tpl:32
-msgid "Destination"
-msgstr "Destinazione"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:202
+msgid "Only numeric chars are allowed in Number field."
+msgstr ""
 
-#: plugins/gofon/fonreports/contents.tpl:33
-msgid "Channel"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:206
+msgid "Only numbers are allowed in Lifetime."
 msgstr ""
 
-#: plugins/gofon/fonreports/contents.tpl:36
-msgid "Duration"
-msgstr "Durata"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:236
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:346
+msgid ""
+"Can't save any changes to asterisk database, there is currently no mysql "
+"extension available in your php setup."
+msgstr ""
 
-#: plugins/gofon/fonreports/main.inc:5
-msgid "Phone reports"
-msgstr "Rapporti telefono"
+#: plugins/gofon/conference/main.inc:38 plugins/gofon/conference/main.inc:40
+#, fuzzy
+msgid "Conference management"
+msgstr "Riferimenti"
 
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
@@ -10948,24 +11107,66 @@ msgstr "Il team di GOsa"
 msgid "Welcome %s!"
 msgstr "Benvenuto %s!"
 
-#: include/class_plugin.inc:465
-#, php-format
+#: include/class_mail-methods-cyrus.inc:39
 msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+"Warning: Account has an invalid mailserver string! Please check the mail "
+"server settings in the mail tab."
 msgstr ""
 
-#: include/class_plugin.inc:493 include/class_password-methods.inc:181
-#, php-format
+#: include/class_mail-methods-cyrus.inc:52
 msgid ""
-"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+"Warning: IMAP Server cannot be reached! If you save this account, some mail "
+"settings will not be stored on your server!"
 msgstr ""
 
-#: include/class_plugin.inc:521
+#: include/class_mail-methods-cyrus.inc:115
 #, php-format
-msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgid "Can't create IMAP mailbox. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:131
+#, php-format
+msgid "Can't write IMAP quota. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:155
+msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
 msgstr ""
 
+#: include/class_mail-methods-cyrus.inc:173
+msgid "Warning: imap_getacl is not available, can't get imap permissions!"
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:195
+#, php-format
+msgid "Can't remove IMAP mailbox. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:223
+#, php-format
+msgid "Can't log into SIEVE server. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:236
+#, php-format
+msgid "Can't get sieve script. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:307
+#, php-format
+msgid "Can't send sieve script. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:311
+#, php-format
+msgid "Can't activate GOsa sieve script. Server says '%s'."
+msgstr ""
+
+#: include/class_debconfTemplate.inc:250
+#, fuzzy
+msgid "This package has no debconf options."
+msgstr "Questa identità non possiede estensioni telefoniche"
+
 #: include/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
 msgstr ""
@@ -11420,6 +11621,7 @@ msgstr "Accesso al server LDAP fallito. La ragione è: %s."
 #: include/functions_setup.inc:1082 html/index.php:181
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
+#: ihtml/themes/lhs/setup_useradmin.tpl:6
 msgid ""
 "You're missing an administrative account for GOsa, you'll not be able to "
 "administrate anything!"
@@ -11432,6 +11634,12 @@ msgstr ""
 msgid "Setting the password failed. LDAP server says '%s'."
 msgstr ""
 
+#: include/class_password-methods.inc:181 include/class_plugin.inc:493
+#, php-format
+msgid ""
+"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+msgstr ""
+
 #: include/class_password-methods.inc:202
 msgid ""
 "Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
@@ -11468,20 +11676,6 @@ msgstr ""
 msgid "%s%% hit rate in file %s"
 msgstr ""
 
-#: include/class_password-methods-kerberos.inc:43
-msgid ""
-"Warning: Can't set kerberos password. Your PHP version has no kerberos "
-"support, password has not been changed."
-msgstr ""
-
-#: include/class_password-methods-kerberos.inc:52
-msgid "Kerberos database communication failed!"
-msgstr ""
-
-#: include/class_password-methods-kerberos.inc:59
-msgid "Changing password in kerberos database failed!"
-msgstr ""
-
 #: include/class_ppdManager.inc:13
 #, php-format
 msgid "PPD manager : The specified path '%s' doesn't exists."
@@ -11510,13 +11704,27 @@ msgstr ""
 msgid "Nested options are not supported!"
 msgstr ""
 
-#: include/class_ppdManager.inc:196
-msgid "PickMany is not supported yet!"
+#: include/class_ppdManager.inc:196
+msgid "PickMany is not supported yet!"
+msgstr ""
+
+#: include/class_ppdManager.inc:268
+#, php-format
+msgid "Parsing PPD file %s failed - no information found."
+msgstr ""
+
+#: include/class_password-methods-kerberos.inc:43
+msgid ""
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
+msgstr ""
+
+#: include/class_password-methods-kerberos.inc:52
+msgid "Kerberos database communication failed!"
 msgstr ""
 
-#: include/class_ppdManager.inc:268
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
+#: include/class_password-methods-kerberos.inc:59
+msgid "Changing password in kerberos database failed!"
 msgstr ""
 
 #: include/class_certificate.inc:35
@@ -11702,6 +11910,7 @@ msgstr ""
 #: include/class_pluglist.inc:130 ihtml/themes/altlinux/framework.tpl:14
 #: ihtml/themes/altlinux/framework.tpl:24
 #: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
+#: ihtml/themes/lhs/framework.tpl:14 ihtml/themes/lhs/framework.tpl:24
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
 "changes?"
@@ -11722,112 +11931,72 @@ msgstr ""
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr ""
 
-#: include/class_ldap.inc:406
+#: include/class_ldap.inc:405
 #, fuzzy, php-format
-msgid "Creating duplicate of %s in %s"
+msgid "Creating copy of %s"
 msgstr "Lista degli utenti di %s su %s"
 
-#: include/class_ldap.inc:409
+#: include/class_ldap.inc:408
 msgid "Processing"
 msgstr ""
 
-#: include/class_ldap.inc:515
+#: include/class_ldap.inc:448
+msgid "Error while fetching source dn - aborted!"
+msgstr ""
+
+#: include/class_ldap.inc:511
 #, php-format
 msgid "Unknown FAIstate %s"
 msgstr ""
 
-#: include/class_ldap.inc:558
-#, fuzzy
-msgid "Successfully finished"
-msgstr "Setup completato"
-
-#: include/class_ldap.inc:635
+#: include/class_ldap.inc:632
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
 "GOsa team."
 msgstr ""
 
-#: include/class_ldap.inc:897
+#: include/class_ldap.inc:894
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:910
+#: include/class_ldap.inc:907
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr ""
 
-#: include/class_ldap.inc:926
+#: include/class_ldap.inc:923
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_debconfTemplate.inc:250
-#, fuzzy
-msgid "This package has no debconf options."
-msgstr "Questa identità non possiede estensioni telefoniche"
-
-#: include/class_mail-methods-cyrus.inc:39
-msgid ""
-"Warning: Account has an invalid mailserver string! Please check the mail "
-"server settings in the mail tab."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:52
-msgid ""
-"Warning: IMAP Server cannot be reached! If you save this account, some mail "
-"settings will not be stored on your server!"
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:115
-#, php-format
-msgid "Can't create IMAP mailbox. Server says '%s'."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:131
-#, php-format
-msgid "Can't write IMAP quota. Server says '%s'."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:155
-msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:173
-msgid "Warning: imap_getacl is not available, can't get imap permissions!"
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:195
-#, php-format
-msgid "Can't remove IMAP mailbox. Server says '%s'."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:223
+#: include/class_plugin.inc:465
 #, php-format
-msgid "Can't log into SIEVE server. Server says '%s'."
+msgid ""
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:236
+#: include/class_plugin.inc:521
 #, php-format
-msgid "Can't get sieve script. Server says '%s'."
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:307
+#: include/class_CopyPasteHandler.inc:172
 #, php-format
-msgid "Can't send sieve script. Server says '%s'."
+msgid "You are going to copy the entry '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:311
-#, php-format
-msgid "Can't activate GOsa sieve script. Server says '%s'."
+#: html/helpviewer.php:116
+msgid "There is no helpfile specified for this class."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:172
+#: html/helpviewer.php:226
 #, php-format
-msgid "You are going to copy the entry '%s'."
+msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
 msgstr ""
 
 #: html/getvcard.php:36
@@ -11992,15 +12161,6 @@ msgid ""
 "page before logging in!"
 msgstr ""
 
-#: html/helpviewer.php:116
-msgid "There is no helpfile specified for this class."
-msgstr ""
-
-#: html/helpviewer.php:226
-#, php-format
-msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
-msgstr ""
-
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
 msgstr "Impossibile connettersi al server del database!"
@@ -12013,6 +12173,16 @@ msgstr "Impossibile selezionare il database!"
 msgid "Database query failed!"
 msgstr "La query al database è fallita!"
 
+#: html/getkiosk.php:25
+#, php-format
+msgid "Can't open file '%s', possibly the file does not exist."
+msgstr ""
+
+#: html/getkiosk.php:30
+#, fuzzy, php-format
+msgid "Can't read file '%s', check permissions."
+msgstr "Rimuovi"
+
 #: html/main.php:151
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
@@ -12034,16 +12204,6 @@ msgid ""
 "some errors!"
 msgstr ""
 
-#: html/getkiosk.php:25
-#, php-format
-msgid "Can't open file '%s', possibly the file does not exist."
-msgstr ""
-
-#: html/getkiosk.php:30
-#, fuzzy, php-format
-msgid "Can't read file '%s', check permissions."
-msgstr "Rimuovi"
-
 #: html/get_attachment.php:47
 #, fuzzy
 msgid ""
@@ -12066,11 +12226,39 @@ msgstr ""
 msgid "Can't open file '%s'."
 msgstr "Rimuovi"
 
+#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
+#: ihtml/themes/lhs/sizelimit.tpl:3
+msgid ""
+"The size limit option makes LDAP operations faster and saves the LDAP server "
+"from getting too much load. The easiest way to handle big databases without "
+"long timeouts would be to limit your search to smaller values and use "
+"filters to get the entries you are looking for."
+msgstr ""
+
+#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
+#: ihtml/themes/lhs/sizelimit.tpl:6
+msgid "Please choose the way to react for this session"
+msgstr ""
+
+#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
+#: ihtml/themes/lhs/sizelimit.tpl:9
+msgid "ignore this error and show all entries the LDAP server returns"
+msgstr ""
+
+#: ihtml/themes/altlinux/sizelimit.tpl:10
+#: ihtml/themes/default/sizelimit.tpl:10 ihtml/themes/lhs/sizelimit.tpl:10
+msgid ""
+"ignore this error and show all entries that fit into the defined sizelimit "
+"and let me use filters instead"
+msgstr ""
+
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
+#: ihtml/themes/lhs/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr "Rilevato un conflitto di sessione"
 
 #: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/default/conflict.tpl:6
+#: ihtml/themes/lhs/conflict.tpl:6
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
@@ -12079,17 +12267,41 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/altlinux/conflict.tpl:10 ihtml/themes/default/conflict.tpl:10
+#: ihtml/themes/lhs/conflict.tpl:10
 msgid ""
 "Ignoring this message will change/destroy the data you're currently editing, "
 "so please close multiple windows and log in again."
 msgstr ""
 
 #: ihtml/themes/altlinux/conflict.tpl:14 ihtml/themes/default/conflict.tpl:14
+#: ihtml/themes/lhs/conflict.tpl:14
 msgid "Logout"
 msgstr "Termina sessione"
 
+#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
+#: ihtml/themes/lhs/login.tpl:17
+msgid "Please use your <i>username</i> and <i>password</i> to log in"
+msgstr "Usa il tuo <i>nome utente</i> e <i>password</i> per connetterti"
+
+#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
+#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
+#: ihtml/themes/lhs/login.tpl:46 ihtml/themes/lhs/login.tpl:49
+msgid "Directory"
+msgstr "Directory"
+
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:57
+#: ihtml/themes/lhs/login.tpl:57
+msgid "Sign in"
+msgstr "Entra"
+
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:58
+#: ihtml/themes/lhs/login.tpl:58
+msgid "Click here to log in"
+msgstr "Clicca qui per connetterti"
+
 #: ihtml/themes/altlinux/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
+#: ihtml/themes/lhs/setup_introduction.tpl:1
 msgid "Welcome to the GOsa setup!"
 msgstr "Benvenuto nel setup di GOsa!"
 
@@ -12111,11 +12323,13 @@ msgstr ""
 
 #: ihtml/themes/altlinux/setup_useradmin.tpl:3
 #: ihtml/themes/default/setup_useradmin.tpl:3
+#: ihtml/themes/lhs/setup_useradmin.tpl:3
 msgid "You already have an Administrative Account and a Group."
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_useradmin.tpl:10
 #: ihtml/themes/default/setup_useradmin.tpl:10
+#: ihtml/themes/lhs/setup_useradmin.tpl:10
 msgid ""
 "To provide full administrative access to GOsa, you need to create a special "
 "group which contains the administrative user. The setup program can assist "
@@ -12126,95 +12340,57 @@ msgstr ""
 "aministrativo. La procedura di setup ti aiuterà nel compito.Immetti il nome "
 "utente e la password per creare le entrate mancanti."
 
-#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
-msgid "Please use your <i>username</i> and <i>password</i> to log in"
-msgstr "Usa il tuo <i>nome utente</i> e <i>password</i> per connetterti"
-
-#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
-#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
-msgid "Directory"
-msgstr "Directory"
-
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:57
-msgid "Sign in"
-msgstr "Entra"
-
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:58
-msgid "Click here to log in"
-msgstr "Clicca qui per connetterti"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
-msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
-"filters to get the entries you are looking for."
-msgstr ""
-
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
-msgid "Please choose the way to react for this session"
-msgstr ""
-
-#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
-msgid "ignore this error and show all entries the LDAP server returns"
-msgstr ""
-
-#: ihtml/themes/altlinux/sizelimit.tpl:10
-#: ihtml/themes/default/sizelimit.tpl:10
-msgid ""
-"ignore this error and show all entries that fit into the defined sizelimit "
-"and let me use filters instead"
-msgstr ""
-
 #: ihtml/themes/altlinux/framework.tpl:15
-#: ihtml/themes/default/framework.tpl:15
+#: ihtml/themes/default/framework.tpl:15 ihtml/themes/lhs/framework.tpl:15
 msgid "Main"
 msgstr "Principale"
 
 #: ihtml/themes/altlinux/framework.tpl:20
-#: ihtml/themes/default/framework.tpl:20
+#: ihtml/themes/default/framework.tpl:20 ihtml/themes/lhs/framework.tpl:20
 msgid "Help"
 msgstr "Aiuto"
 
 #: ihtml/themes/altlinux/framework.tpl:25
-#: ihtml/themes/default/framework.tpl:25
+#: ihtml/themes/default/framework.tpl:25 ihtml/themes/lhs/framework.tpl:25
 msgid "Sign out"
 msgstr "Termina la sessione"
 
 #: ihtml/themes/altlinux/framework.tpl:33
-#: ihtml/themes/default/framework.tpl:33
+#: ihtml/themes/default/framework.tpl:33 ihtml/themes/lhs/framework.tpl:33
 msgid "Signed in:"
 msgstr "Connesso:"
 
-#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
-msgid "Locking conflict detected"
-msgstr "Rilevato un conflitto di accesso"
-
-#: ihtml/themes/altlinux/islocked.tpl:9
-msgid ""
-"If this lock detection is false, the other person has obviously closed the "
-"webbrowser during the edit operation. You may delete the lockfile in this "
-"case by pressing the <i>Remove</i> button."
-msgstr ""
-
 #: ihtml/themes/altlinux/setup_step2.tpl:1
 #: ihtml/themes/altlinux/setup_step3.tpl:1
 #: ihtml/themes/altlinux/setup_step4.tpl:1
 #: ihtml/themes/default/setup_step2.tpl:1
 #: ihtml/themes/default/setup_step3.tpl:1
-#: ihtml/themes/default/setup_step4.tpl:1
+#: ihtml/themes/default/setup_step4.tpl:1 ihtml/themes/lhs/setup_step2.tpl:1
+#: ihtml/themes/lhs/setup_step3.tpl:1 ihtml/themes/lhs/setup_step4.tpl:1
 msgid "Setup continued..."
 msgstr "Configurazione continua..."
 
 #: ihtml/themes/altlinux/setup_step2.tpl:4
-#: ihtml/themes/default/setup_step2.tpl:4
+#: ihtml/themes/default/setup_step2.tpl:4 ihtml/themes/lhs/setup_step2.tpl:4
 msgid ""
 "Step two looks for a set of helper programms and checks if they have the "
 "correct minimum version."
 msgstr "In questo secondo passo cercheremo i programmi necessari e opzionali."
 
+#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
+#: ihtml/themes/lhs/islocked.tpl:2
+msgid "Locking conflict detected"
+msgstr "Rilevato un conflitto di accesso"
+
+#: ihtml/themes/altlinux/islocked.tpl:9 ihtml/themes/lhs/islocked.tpl:9
+msgid ""
+"If this lock detection is false, the other person has obviously closed the "
+"webbrowser during the edit operation. You may delete the lockfile in this "
+"case by pressing the <i>Remove</i> button."
+msgstr ""
+
 #: ihtml/themes/altlinux/setup_step3.tpl:4
-#: ihtml/themes/default/setup_step3.tpl:4
+#: ihtml/themes/default/setup_step3.tpl:4 ihtml/themes/lhs/setup_step3.tpl:4
 msgid ""
 "Now we're going include your LDAP server and create an initial "
 "configuration. After you've entered the server URI below, a quick check is "
@@ -12229,7 +12405,7 @@ msgstr ""
 "organizzazione sarammo chiesti in seguito."
 
 #: ihtml/themes/altlinux/setup_step3.tpl:10
-#: ihtml/themes/default/setup_step3.tpl:10
+#: ihtml/themes/default/setup_step3.tpl:10 ihtml/themes/lhs/setup_step3.tpl:10
 msgid ""
 "Please enter the server URI to allow the setup to connect your LDAP server "
 "<i>(Example: ldap://your.server:389).</i>"
@@ -12237,24 +12413,24 @@ msgstr ""
 "Inserisci la URI del server LDAP <i>(Per esempio: ldap://mio.server:389).</i>"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:2
-#: ihtml/themes/default/setup_step4.tpl:2
+#: ihtml/themes/default/setup_step4.tpl:2 ihtml/themes/lhs/setup_step4.tpl:2
 msgid ""
 "The following fields allow the basic configuration of GOsa's behaviour and "
 "affect various properties in your main configuration."
 msgstr "I campi seguenti permettono una configurazione base di GOsa."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:7
-#: ihtml/themes/default/setup_step4.tpl:7
+#: ihtml/themes/default/setup_step4.tpl:7 ihtml/themes/lhs/setup_step4.tpl:7
 msgid "Enter a description for the location you're configuring here"
 msgstr "Inserisci una descrizione della locazione che vuoi configurare"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:11
-#: ihtml/themes/default/setup_step4.tpl:11
+#: ihtml/themes/default/setup_step4.tpl:11 ihtml/themes/lhs/setup_step4.tpl:11
 msgid "Location name"
 msgstr "Nome locazione"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:18
-#: ihtml/themes/default/setup_step4.tpl:18
+#: ihtml/themes/default/setup_step4.tpl:18 ihtml/themes/lhs/setup_step4.tpl:18
 msgid ""
 "GOsa always acts as admin and manages access rights internally. This is a "
 "workaround till OpenLDAP's in directory ACI's are fully implemented. For "
@@ -12265,17 +12441,17 @@ msgstr ""
 "completato il supportp per le ACL all'interno del DIT in OpenLDAP."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:23
-#: ihtml/themes/default/setup_step4.tpl:23
+#: ihtml/themes/default/setup_step4.tpl:23 ihtml/themes/lhs/setup_step4.tpl:23
 msgid "Admin DN"
 msgstr "DN dell'amministratore"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:27
-#: ihtml/themes/default/setup_step4.tpl:27
+#: ihtml/themes/default/setup_step4.tpl:27 ihtml/themes/lhs/setup_step4.tpl:27
 msgid "Admin password"
 msgstr "Password dell'amministratore"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:34
-#: ihtml/themes/default/setup_step4.tpl:34
+#: ihtml/themes/default/setup_step4.tpl:34 ihtml/themes/lhs/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
 "saves people and groups, including the way accounts get created. Check the "
@@ -12286,32 +12462,32 @@ msgstr ""
 "corrispondano alle impostaioni del tuo DIT."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:39
-#: ihtml/themes/default/setup_step4.tpl:39
+#: ihtml/themes/default/setup_step4.tpl:39 ihtml/themes/lhs/setup_step4.tpl:39
 msgid "Base "
 msgstr "Base "
 
 #: ihtml/themes/altlinux/setup_step4.tpl:43
-#: ihtml/themes/default/setup_step4.tpl:43
+#: ihtml/themes/default/setup_step4.tpl:43 ihtml/themes/lhs/setup_step4.tpl:43
 msgid "People storage ou"
 msgstr "Ou delle persone"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:47
-#: ihtml/themes/default/setup_step4.tpl:47
+#: ihtml/themes/default/setup_step4.tpl:47 ihtml/themes/lhs/setup_step4.tpl:47
 msgid "People dn attribute"
 msgstr "Attributo DN delle persone"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:55
-#: ihtml/themes/default/setup_step4.tpl:55
+#: ihtml/themes/default/setup_step4.tpl:55 ihtml/themes/lhs/setup_step4.tpl:55
 msgid "Group storage ou"
 msgstr "Ou dei gruppi"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:59
-#: ihtml/themes/default/setup_step4.tpl:59
+#: ihtml/themes/default/setup_step4.tpl:59 ihtml/themes/lhs/setup_step4.tpl:59
 msgid "ID base for users/groups"
 msgstr "UID di base per utenti/gruppi"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:67
-#: ihtml/themes/default/setup_step4.tpl:67
+#: ihtml/themes/default/setup_step4.tpl:67 ihtml/themes/lhs/setup_step4.tpl:67
 msgid ""
 "GOsa supports several encryption types for your passwords. Normally this is "
 "adjustable via user templates, but you can specify a default method to be "
@@ -12321,12 +12497,12 @@ msgstr ""
 "quello di default."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:72
-#: ihtml/themes/default/setup_step4.tpl:72
+#: ihtml/themes/default/setup_step4.tpl:72 ihtml/themes/lhs/setup_step4.tpl:72
 msgid "Encryption algorithm"
 msgstr "Algoritmo di criptaggio"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:83
-#: ihtml/themes/default/setup_step4.tpl:83
+#: ihtml/themes/default/setup_step4.tpl:83 ihtml/themes/lhs/setup_step4.tpl:83
 msgid ""
 "GOsa has modular support for several mail methods. These methods provide "
 "interfaces to users mailboxes and general handling for quotas. You can "
@@ -12337,7 +12513,7 @@ msgstr ""
 "impostare il metodo 'dummy' per mantenere tutte le impostazioni."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:88
-#: ihtml/themes/default/setup_step4.tpl:88
+#: ihtml/themes/default/setup_step4.tpl:88 ihtml/themes/lhs/setup_step4.tpl:88
 msgid "Mail method"
 msgstr "Metodo di amministrazione della posta"
 
@@ -12350,31 +12526,35 @@ msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:103
 #: ihtml/themes/default/setup_step4.tpl:104
+#: ihtml/themes/lhs/setup_step4.tpl:104
 msgid "Display PHP errors"
 msgstr "Mostra errori PHP"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:106
 #: ihtml/themes/default/setup_step4.tpl:107
+#: ihtml/themes/lhs/setup_step4.tpl:107
 msgid "true"
 msgstr "vero"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:107
 #: ihtml/themes/default/setup_step4.tpl:108
+#: ihtml/themes/lhs/setup_step4.tpl:108
 msgid "false"
 msgstr "falso"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:115
 #: ihtml/themes/default/setup_step4.tpl:115
+#: ihtml/themes/lhs/setup_step4.tpl:115
 msgid "Check"
 msgstr "Continua"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:1
-#: ihtml/themes/default/setup_finish.tpl:1
+#: ihtml/themes/default/setup_finish.tpl:1 ihtml/themes/lhs/setup_finish.tpl:1
 msgid "Setup finished"
 msgstr "Setup completato"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:3
-#: ihtml/themes/default/setup_finish.tpl:3
+#: ihtml/themes/default/setup_finish.tpl:3 ihtml/themes/lhs/setup_finish.tpl:3
 msgid ""
 "Basically the setup is finished. You can check the result of the schema "
 "check here and download the autogenerated gosa.conf below."
@@ -12383,17 +12563,19 @@ msgstr ""
 "controllo degli schemi e scaricare il file di configurazione autogenerto."
 
 #: ihtml/themes/altlinux/setup_finish.tpl:7
-#: ihtml/themes/default/setup_finish.tpl:7
+#: ihtml/themes/default/setup_finish.tpl:7 ihtml/themes/lhs/setup_finish.tpl:7
 msgid "Schema Configuration"
 msgstr "Configurazione delgi schemi"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:12
 #: ihtml/themes/default/setup_finish.tpl:12
+#: ihtml/themes/lhs/setup_finish.tpl:12
 msgid "Configuration File"
 msgstr "File di configurazione"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:14
 #: ihtml/themes/default/setup_finish.tpl:14
+#: ihtml/themes/lhs/setup_finish.tpl:14
 msgid ""
 "GOsa setup has collected all data needed to create an initial configuration "
 "file. Save the the link below as your gosa.conf and place that file in /etc/"
@@ -12405,11 +12587,13 @@ msgstr ""
 
 #: ihtml/themes/altlinux/setup_finish.tpl:17
 #: ihtml/themes/default/setup_finish.tpl:17
+#: ihtml/themes/lhs/setup_finish.tpl:17
 msgid "Download configuration"
 msgstr "Scarica il file di  configurazione"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:20
 #: ihtml/themes/default/setup_finish.tpl:20
+#: ihtml/themes/lhs/setup_finish.tpl:20
 msgid ""
 "After placing the file under /etc/gosa, place make sure that the webserver "
 "user is able to read gosa.conf, while other users shouldn't. You may want to "
@@ -12419,7 +12603,16 @@ msgstr ""
 "webserver sia in grado di leggerlo mentre tutti gli altri utenti non "
 "possono. In molti casi è sufficiente eseguire i comandi seguenti."
 
+#: ihtml/themes/default/help.tpl:9 ihtml/themes/lhs/help.tpl:9
+msgid "GOsa help viewer"
+msgstr ""
+
+#: ihtml/themes/default/help.tpl:15 ihtml/themes/lhs/help.tpl:15
+msgid "Index"
+msgstr ""
+
 #: ihtml/themes/default/setup_introduction.tpl:4
+#: ihtml/themes/lhs/setup_introduction.tpl:4
 #, fuzzy
 msgid ""
 "It looks like you're calling GOsa for the first time - no configuration was "
@@ -12437,6 +12630,7 @@ msgstr ""
 "server LDAP."
 
 #: ihtml/themes/default/setup_introduction.tpl:17
+#: ihtml/themes/lhs/setup_introduction.tpl:17
 msgid ""
 "You can also use the new and more-advanced way of inspecting your PHP-"
 "installation. It will give you information about the exact function that "
@@ -12445,17 +12639,26 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/setup_introduction.tpl:19
+#: ihtml/themes/lhs/setup_introduction.tpl:19
 msgid "Toggle Show/Hide"
 msgstr ""
 
-#: ihtml/themes/default/help.tpl:9
-msgid "GOsa help viewer"
+#: ihtml/themes/default/logout.tpl:5 ihtml/themes/lhs/logout.tpl:5
+msgid "Your GOsa session has expired!"
 msgstr ""
 
-#: ihtml/themes/default/help.tpl:15
-msgid "Index"
+#: ihtml/themes/default/logout.tpl:7 ihtml/themes/lhs/logout.tpl:7
+msgid ""
+"The last interaction with the GOsa web interface has been some time ago in "
+"the past. For security reasons, the session has been closed. To continue "
+"with administrative tasks, please sign in again."
 msgstr ""
 
+#: ihtml/themes/default/logout.tpl:10 ihtml/themes/lhs/logout.tpl:10
+#, fuzzy
+msgid "Sign in again"
+msgstr "Entra"
+
 #: ihtml/themes/default/islocked.tpl:9
 msgid ""
 "If this lock detection is false, the other person has obviously closed the "
@@ -12468,28 +12671,6 @@ msgstr ""
 msgid "Edit anyway"
 msgstr "Modifica contatto"
 
-#: ihtml/themes/default/setup_step4.tpl:100
-msgid ""
-"GOsa may cause PHP interpreter errors, particularly in case of Beta "
-"versions. In some cases it would be helpful to enable the error reporting."
-msgstr ""
-
-#: ihtml/themes/default/logout.tpl:5
-msgid "Your GOsa session has expired!"
-msgstr ""
-
-#: ihtml/themes/default/logout.tpl:7
-msgid ""
-"The last interaction with the GOsa web interface has been some time ago in "
-"the past. For security reasons, the session has been closed. To continue "
-"with administrative tasks, please sign in again."
-msgstr ""
-
-#: ihtml/themes/default/logout.tpl:10
-#, fuzzy
-msgid "Sign in again"
-msgstr "Entra"
-
 #: ihtml/themes/default/copyPasteDialog.tpl:1
 msgid "Copy &amp; paste wizard"
 msgstr ""
@@ -12506,6 +12687,25 @@ msgstr ""
 msgid "Operation complete"
 msgstr "incompleto"
 
+#: ihtml/themes/default/setup_step4.tpl:100
+#: ihtml/themes/lhs/setup_step4.tpl:100
+msgid ""
+"GOsa may cause PHP interpreter errors, particularly in case of Beta "
+"versions. In some cases it would be helpful to enable the error reporting."
+msgstr ""
+
+#, fuzzy
+#~ msgid "DFS shares"
+#~ msgstr "reset"
+
+#, fuzzy
+#~ msgid "Complete"
+#~ msgstr "incompleto"
+
+#, fuzzy
+#~ msgid "Successfully finished"
+#~ msgstr "Setup completato"
+
 #, fuzzy
 #~ msgid "Releases"
 #~ msgstr "Rimuovi"
diff --git a/locale/messages.po b/locale/messages.po
index 66c45d8c1..56d5c37fb 100644
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -19,21 +19,19 @@ msgstr ""
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
-#: plugins/gofax/faxaccount/generic.tpl:6
+#: plugins/gofax/faxaccount/generic.tpl:6 plugins/admin/fai/faiVariable.tpl:4
 #: plugins/admin/fai/faiPartitionTable.tpl:4
-#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiScriptEntry.tpl:5
-#: plugins/admin/fai/faiPackage.tpl:4 plugins/admin/fai/faiProfile.tpl:4
-#: plugins/admin/fai/faiProfile.tpl:32
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
+#: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiPackage.tpl:4
+#: plugins/admin/fai/faiProfile.tpl:4 plugins/admin/fai/faiProfile.tpl:32
 #: plugins/admin/fai/faiScript.tpl:4 plugins/admin/fai/faiVariableEntry.tpl:5
 #: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3 plugins/admin/fai/faiHook.tpl:4
-#: plugins/admin/groups/mail.tpl:7
+#: plugins/admin/groups/mail.tpl:7 plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/glpiPrinter.tpl:6
+#: plugins/admin/systems/servdnseditzone.tpl:1
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
-#: plugins/admin/systems/glpi.tpl:6
-#: plugins/admin/systems/servdnseditzone.tpl:1
-#: plugins/admin/systems/glpiPrinter.tpl:6
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr ""
@@ -44,25 +42,25 @@ msgstr ""
 
 #: contrib/gosa.conf:76 contrib/gosa.conf:88
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:514
-#: plugins/admin/users/class_userManagement.inc:858
+#: plugins/admin/groups/class_groupManagement.inc:515
+#: plugins/admin/users/class_userManagement.inc:859
 msgid "Environment"
 msgstr ""
 
 #: contrib/gosa.conf:77 contrib/gosa.conf:90
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_groupManagement.inc:502
-#: plugins/admin/users/class_userManagement.inc:860
+#: plugins/admin/groups/class_groupManagement.inc:503
+#: plugins/admin/users/class_userManagement.inc:861
 #: plugins/admin/ogroups/tabs_ogroups.inc:72
 #: plugins/admin/ogroups/tabs_ogroups.inc:160
-#: plugins/admin/ogroups/class_ogroupManagement.inc:483
+#: plugins/admin/ogroups/class_ogroupManagement.inc:484
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr ""
 
 #: contrib/gosa.conf:78 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:505
-#: plugins/admin/users/class_userManagement.inc:866
+#: plugins/admin/groups/class_groupManagement.inc:506
+#: plugins/admin/users/class_userManagement.inc:867
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -77,7 +75,7 @@ msgstr ""
 #: plugins/personal/generic/generic.tpl:398
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:864
+#: plugins/admin/users/class_userManagement.inc:865
 #: plugins/admin/departments/generic.tpl:63
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
@@ -87,17 +85,17 @@ msgstr ""
 #: contrib/gosa.conf:81 plugins/personal/generic/generic.tpl:250
 #: plugins/personal/generic/generic.tpl:388
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/address_info.tpl:37
-#: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
-#: plugins/admin/groups/class_groupManagement.inc:511
-#: plugins/admin/users/class_userManagement.inc:862
+#: plugins/addons/addressbook/address_info.tpl:37
+#: plugins/addons/addressbook/address_info.tpl:85
+#: plugins/admin/groups/class_groupManagement.inc:512
+#: plugins/admin/users/class_userManagement.inc:863
 #: plugins/admin/departments/generic.tpl:59
+#: plugins/admin/systems/class_systemManagement.inc:921
 #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/systems/class_systemManagement.inc:920
 #: plugins/admin/ogroups/class_ogroupManagement.inc:61
-#: plugins/admin/ogroups/class_ogroupManagement.inc:587
+#: plugins/admin/ogroups/class_ogroupManagement.inc:588
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
@@ -126,8 +124,8 @@ msgid "ACL"
 msgstr ""
 
 #: contrib/gosa.conf:97 plugins/admin/applications/generic.tpl:66
-#: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/systems/class_servRepository.inc:244
+#: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/ogroups/phonequeue.tpl:31
 #: plugins/gofon/conference/generic.tpl:87
 msgid "Options"
@@ -149,9 +147,9 @@ msgstr ""
 
 #: contrib/gosa.conf:116 contrib/gosa.conf:141
 #: plugins/personal/environment/environment.tpl:172
-#: plugins/admin/systems/class_systemManagement.inc:926
+#: plugins/admin/systems/class_systemManagement.inc:927
 #: plugins/admin/ogroups/class_ogroupManagement.inc:62
-#: plugins/admin/ogroups/class_ogroupManagement.inc:590
+#: plugins/admin/ogroups/class_ogroupManagement.inc:591
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr ""
@@ -160,18 +158,19 @@ msgstr ""
 #: plugins/gofax/blocklists/generic.tpl:70
 #: plugins/gofax/blocklists/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
+#: plugins/addons/godfs/contents.tpl:22
 #: plugins/admin/fai/faiProfileEntry.tpl:21
 #: plugins/admin/fai/faiPackageEntry.tpl:22 plugins/admin/fai/headpage.tpl:20
 #: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
 #: plugins/admin/applications/headpage.tpl:20
 #: plugins/admin/departments/headpage.tpl:20
-#: plugins/admin/systems/headpage.tpl:20
+#: plugins/admin/systems/glpiPrinter.tpl:104
+#: plugins/admin/systems/glpiDeviceManagement.tpl:20
 #: plugins/admin/systems/servRepository.tpl:24
 #: plugins/admin/systems/glpiSelectUser.tpl:20
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:20
+#: plugins/admin/systems/headpage.tpl:20
 #: plugins/admin/systems/glpiAttachmentPool.tpl:20
-#: plugins/admin/systems/glpiDeviceManagement.tpl:20
-#: plugins/admin/systems/glpiPrinter.tpl:104
 #: plugins/admin/ogroups/headpage.tpl:20 plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
@@ -234,18 +233,18 @@ msgstr ""
 msgid "Script"
 msgstr ""
 
-#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:759
-#: plugins/admin/fai/class_faiManagement.inc:760
+#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:767
+#: plugins/admin/fai/class_faiManagement.inc:768
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:752
-#: plugins/admin/fai/class_faiManagement.inc:753
+#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:760
+#: plugins/admin/fai/class_faiManagement.inc:761
 msgid "Variables"
 msgstr ""
 
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiManagement.inc:773
-#: plugins/admin/fai/class_faiManagement.inc:774
+#: contrib/gosa.conf:218 plugins/admin/fai/class_faiManagement.inc:781
+#: plugins/admin/fai/class_faiManagement.inc:782
 msgid "Templates"
 msgstr ""
 
@@ -289,82 +288,81 @@ msgstr ""
 msgid "Italian"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:19
-#: plugins/personal/mail/class_mailAccount.inc:23
-#: plugins/personal/password/class_password.inc:6
-#: plugins/personal/posix/class_posixAccount.inc:17
-#: plugins/personal/samba/class_sambaAccount.inc:25
-#: plugins/personal/environment/class_environment.inc:13
-#: plugins/personal/generic/class_user.inc:17
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_proxyAccount.inc:6
-#: plugins/personal/connectivity/class_pptpAccount.inc:27
-#: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_phpgwAccount.inc:6
-#: plugins/personal/connectivity/class_kolabAccount.inc:6
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
-#: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/personal/connectivity/class_opengwAccount.inc:7
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
-#: plugins/gofax/faxreports/class_faxreport.inc:7
-#: plugins/addons/addressbook/class_addressbook.inc:7
-#: plugins/addons/mailqueue/class_mailqueue.inc:7
-#: plugins/addons/ldapmanager/class_csvimport.inc:7
-#: plugins/addons/ldapmanager/class_exportxls.inc:8
-#: plugins/addons/ldapmanager/class_import.inc:7
-#: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:7
-#: plugins/addons/logview/class_logview.inc:7
-#: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:26
-#: plugins/admin/applications/class_applicationManagement.inc:26
-#: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/systems/class_systemManagement.inc:33
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-#: plugins/gofon/fonreports/class_fonreport.inc:7
-msgid "This does something"
+#: plugins/personal/nagios/nagios.tpl:4
+msgid "Nagios Account"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:92
-msgid "This account has no nagios extensions."
+#: plugins/personal/nagios/nagios.tpl:7
+msgid "Alias"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:101
-msgid "Remove nagios account"
+#: plugins/personal/nagios/nagios.tpl:12
+#: plugins/admin/systems/servdnseditzone.tpl:47 html/getxls.php:174
+msgid "Mail address"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:102
-msgid ""
-"This account has nagios features enabled. You can disable them by clicking "
-"below."
+#: plugins/personal/nagios/nagios.tpl:17
+msgid "Host notification period"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:104
-msgid "Create nagios account"
+#: plugins/personal/nagios/nagios.tpl:25
+msgid "Service notification period"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:104
-msgid ""
-"This account has nagios features disabled. You can enable them by clicking "
-"below."
+#: plugins/personal/nagios/nagios.tpl:32
+msgid "Service notification options"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:165
-msgid "The required field 'NagiosAlias' is not set."
+#: plugins/personal/nagios/nagios.tpl:41
+msgid "Host notification options"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:168
-msgid "The required field 'NagiosMail' is not set."
+#: plugins/personal/nagios/nagios.tpl:48
+#: plugins/personal/generic/generic.tpl:261
+#: plugins/addons/addressbook/address_edit.tpl:217
+#: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Pager"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:172
-#: plugins/personal/nagios/class_nagiosAccount.inc:176
-msgid "Please enter a valid email address in 'NagiosMail' field."
+#: plugins/personal/nagios/nagios.tpl:53
+msgid "Service notification commands"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:57
+msgid "Host notification commands"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:66
+msgid "Nagios authentification"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:69
+msgid "view system informations"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:72
+msgid "view configuration information"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:75
+msgid "trigger system commands"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:78
+msgid "view all services"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:81
+msgid "view all hosts"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:83
+msgid "trigger all service commands"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:86
+msgid "trigger all host commands"
 msgstr ""
 
 #: plugins/personal/nagios/main.inc:104 plugins/personal/mail/main.inc:104
@@ -375,11 +373,12 @@ msgstr ""
 #: plugins/personal/connectivity/main.inc:118
 #: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/fai/class_faiManagement.inc:599
+#: plugins/addons/godfs/class_dfsManagment.inc:217
+#: plugins/admin/fai/class_faiManagement.inc:605
 #: plugins/admin/groups/class_groupManagement.inc:412
 #: plugins/admin/users/class_userManagement.inc:720
-#: plugins/admin/applications/class_applicationManagement.inc:428
-#: plugins/admin/departments/class_departmentManagement.inc:366
+#: plugins/admin/applications/class_applicationManagement.inc:430
+#: plugins/admin/departments/class_departmentManagement.inc:367
 #: plugins/admin/systems/class_systemManagement.inc:720
 #: plugins/admin/ogroups/class_ogroupManagement.inc:400
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:300
@@ -391,16 +390,15 @@ msgstr ""
 
 #: plugins/personal/nagios/main.inc:106 plugins/personal/mail/main.inc:106
 #: plugins/personal/mail/mail_locals.tpl:43
-#: plugins/personal/posix/posix_groups.tpl:67
 #: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112
+#: plugins/personal/posix/posix_groups.tpl:67
+#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
 #: plugins/personal/samba/samba3_workstations.tpl:41
-#: plugins/personal/samba/main.inc:106
+#: plugins/personal/environment/main.inc:106
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
 #: plugins/personal/environment/hotplugDialogNew.tpl:39
-#: plugins/personal/environment/main.inc:106
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
 #: plugins/personal/generic/generic_certs.tpl:78
@@ -411,54 +409,55 @@ msgstr ""
 #: plugins/gofax/faxaccount/locals.tpl:62
 #: plugins/gofax/faxaccount/lists.tpl:33 plugins/gofax/faxaccount/main.inc:91
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
-#: plugins/admin/fai/class_faiManagement.inc:601
-#: plugins/admin/fai/class_faiManagement.inc:606
-#: plugins/admin/fai/faiProfileEntry.tpl:71
+#: plugins/addons/addressbook/remove.tpl:16
+#: plugins/addons/godfs/class_dfsManagment.inc:219
+#: plugins/admin/fai/class_faiManagement.inc:607
+#: plugins/admin/fai/class_faiManagement.inc:612
 #: plugins/admin/fai/faiPackageConfiguration.tpl:7
-#: plugins/admin/fai/faiScriptEntry.tpl:69
+#: plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
+#: plugins/admin/fai/faiScriptEntry.tpl:69 plugins/admin/fai/remove.tpl:17
 #: plugins/admin/fai/faiPackageNew.tpl:45
+#: plugins/admin/fai/faiNewBranch.tpl:20
 #: plugins/admin/fai/faiVariableEntry.tpl:49
-#: plugins/admin/fai/faiPackageEntry.tpl:57 plugins/admin/fai/remove.tpl:17
+#: plugins/admin/fai/faiPackageEntry.tpl:57
 #: plugins/admin/fai/faiHookEntry.tpl:71
-#: plugins/admin/fai/faiTemplateEntry.tpl:131
-#: plugins/admin/fai/faiNewBranch.tpl:20
 #: plugins/admin/fai/remove_branch.tpl:16
+#: plugins/admin/fai/faiTemplateEntry.tpl:131
 #: plugins/admin/groups/class_groupManagement.inc:414
 #: plugins/admin/groups/remove.tpl:16
+#: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/template.tpl:46
 #: plugins/admin/users/class_userManagement.inc:722
-#: plugins/admin/users/remove.tpl:16 plugins/admin/users/template.tpl:46
-#: plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:430
+#: plugins/admin/users/remove.tpl:16 plugins/admin/applications/remove.tpl:15
+#: plugins/admin/applications/class_applicationManagement.inc:432
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:368
-#: plugins/admin/systems/chooser.tpl:18
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
-#: plugins/admin/systems/printerPPDDialog.tpl:23
-#: plugins/admin/systems/class_systemManagement.inc:722
-#: plugins/admin/systems/servnfs.tpl:76 plugins/admin/systems/remove.tpl:16
-#: plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/servRepositorySetup.tpl:43
+#: plugins/admin/departments/class_departmentManagement.inc:369
 #: plugins/admin/systems/glpi_edit_type.tpl:29
-#: plugins/admin/systems/remove_glpi.tpl:16
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:30
+#: plugins/admin/systems/glpiDeviceManagement.tpl:52
+#: plugins/admin/systems/servnfs.tpl:76
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
+#: plugins/admin/systems/servdnseditzone.tpl:118
 #: plugins/admin/systems/glpiSelectUser.tpl:51
+#: plugins/admin/systems/glpi_devices.tpl:761
+#: plugins/admin/systems/servRepositorySetup.tpl:43
 #: plugins/admin/systems/glpi_edit_os.tpl:29
+#: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:52
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
+#: plugins/admin/systems/remove_glpi.tpl:16
+#: plugins/admin/systems/class_systemManagement.inc:722
+#: plugins/admin/systems/remove.tpl:16
 #: plugins/admin/systems/glpiAttachmentPool.tpl:52
-#: plugins/admin/systems/servdnseditzone.tpl:118
-#: plugins/admin/systems/glpiDeviceManagement.tpl:52
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:30
-#: plugins/admin/systems/glpi_devices.tpl:761
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
+#: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/SelectDeviceType.tpl:45
-#: plugins/admin/systems/class_baseSelectDialog.inc:40
+#: plugins/admin/systems/class_baseSelectDialog.inc:41
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:13
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:402
@@ -469,6 +468,7 @@ msgstr ""
 #: plugins/gofon/conference/remove.tpl:16
 #: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
 #: ihtml/themes/default/copyPasteDialog.tpl:13
+#: ihtml/themes/lhs/islocked.tpl:15
 msgid "Cancel"
 msgstr ""
 
@@ -484,26 +484,27 @@ msgstr ""
 
 #: plugins/personal/nagios/main.inc:115 plugins/personal/mail/main.inc:115
 #: plugins/personal/posix/main.inc:122 plugins/personal/samba/main.inc:115
-#: plugins/personal/environment/environment.tpl:139
 #: plugins/personal/environment/main.inc:115
+#: plugins/personal/environment/environment.tpl:139
 #: plugins/personal/generic/main.inc:172
 #: plugins/personal/connectivity/main.inc:129
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
+#: plugins/admin/fai/faiVariable.tpl:45
 #: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/admin/fai/faiVariable.tpl:45 plugins/admin/fai/faiScript.tpl:45
-#: plugins/admin/fai/faiTemplate.tpl:42 plugins/admin/fai/faiHook.tpl:45
-#: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/printer.tpl:47 plugins/admin/systems/servdns.tpl:7
-#: plugins/admin/systems/glpiManufacturer.tpl:7
-#: plugins/admin/systems/glpi.tpl:48 plugins/admin/systems/glpi.tpl:56
-#: plugins/admin/systems/glpi.tpl:85
-#: plugins/admin/systems/servdnseditzone.tpl:27
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:191
+#: plugins/admin/fai/faiScript.tpl:45 plugins/admin/fai/faiTemplate.tpl:42
+#: plugins/admin/fai/faiHook.tpl:45 plugins/admin/systems/glpi.tpl:48
+#: plugins/admin/systems/glpi.tpl:56 plugins/admin/systems/glpi.tpl:85
 #: plugins/admin/systems/glpiPrinter.tpl:73
 #: plugins/admin/systems/glpiPrinter.tpl:82
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:167
+#: plugins/admin/systems/servdns.tpl:7
+#: plugins/admin/systems/glpiManufacturer.tpl:7
+#: plugins/admin/systems/servdnseditzone.tpl:27
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:191
+#: plugins/admin/systems/servservice.tpl:21
+#: plugins/admin/systems/printer.tpl:47
 #: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr ""
@@ -512,81 +513,188 @@ msgstr ""
 msgid "Nagios settings"
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:4
-msgid "Nagios Account"
-msgstr ""
-
-#: plugins/personal/nagios/nagios.tpl:7
-msgid "Alias"
+#: plugins/personal/nagios/class_nagiosAccount.inc:19
+#: plugins/personal/mail/class_mailAccount.inc:23
+#: plugins/personal/password/class_password.inc:6
+#: plugins/personal/posix/class_posixAccount.inc:17
+#: plugins/personal/samba/class_sambaAccount.inc:25
+#: plugins/personal/environment/class_environment.inc:13
+#: plugins/personal/generic/class_user.inc:17
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_intranetAccount.inc:16
+#: plugins/personal/connectivity/class_pptpAccount.inc:27
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
+#: plugins/personal/connectivity/class_phpgwAccount.inc:6
+#: plugins/personal/connectivity/class_kolabAccount.inc:6
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
+#: plugins/personal/connectivity/class_opengwAccount.inc:7
+#: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
+#: plugins/gofax/faxreports/class_faxreport.inc:7
+#: plugins/addons/addressbook/class_addressbook.inc:7
+#: plugins/addons/mailqueue/class_mailqueue.inc:7
+#: plugins/addons/ldapmanager/class_csvimport.inc:7
+#: plugins/addons/ldapmanager/class_exportxls.inc:8
+#: plugins/addons/ldapmanager/class_import.inc:7
+#: plugins/addons/ldapmanager/class_ldif.inc:8
+#: plugins/addons/ldapmanager/class_export.inc:7
+#: plugins/addons/logview/class_logview.inc:7
+#: plugins/addons/godfs/class_dfsManagment.inc:17
+#: plugins/admin/groups/class_groupManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:26
+#: plugins/admin/applications/class_applicationManagement.inc:26
+#: plugins/admin/departments/class_departmentManagement.inc:26
+#: plugins/admin/systems/class_systemManagement.inc:33
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/gofon/fonreports/class_fonreport.inc:7
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
+msgid "This does something"
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:47 html/getxls.php:174
-msgid "Mail address"
+#: plugins/personal/nagios/class_nagiosAccount.inc:92
+msgid "This account has no nagios extensions."
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:17
-msgid "Host notification period"
+#: plugins/personal/nagios/class_nagiosAccount.inc:101
+msgid "Remove nagios account"
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:25
-msgid "Service notification period"
+#: plugins/personal/nagios/class_nagiosAccount.inc:102
+msgid ""
+"This account has nagios features enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:32
-msgid "Service notification options"
+#: plugins/personal/nagios/class_nagiosAccount.inc:104
+msgid "Create nagios account"
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:41
-msgid "Host notification options"
+#: plugins/personal/nagios/class_nagiosAccount.inc:104
+msgid ""
+"This account has nagios features disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:48
-#: plugins/personal/generic/generic.tpl:261
-#: plugins/addons/addressbook/address_info.tpl:91
-#: plugins/addons/addressbook/address_edit.tpl:217 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Pager"
+#: plugins/personal/nagios/class_nagiosAccount.inc:165
+msgid "The required field 'NagiosAlias' is not set."
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:53
-msgid "Service notification commands"
+#: plugins/personal/nagios/class_nagiosAccount.inc:168
+msgid "The required field 'NagiosMail' is not set."
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:57
-msgid "Host notification commands"
+#: plugins/personal/nagios/class_nagiosAccount.inc:172
+#: plugins/personal/nagios/class_nagiosAccount.inc:176
+msgid "Please enter a valid email address in 'NagiosMail' field."
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:66
-msgid "Nagios authentification"
+#: plugins/personal/mail/class_mailAccount.inc:79
+#: plugins/admin/groups/class_groupMail.inc:75
+#, php-format
+msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:69
-msgid "view system informations"
+#: plugins/personal/mail/class_mailAccount.inc:176
+msgid "No DESC tag in vacation file:"
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:72
-msgid "view configuration information"
+#: plugins/personal/mail/class_mailAccount.inc:216
+msgid "This account has no mail extensions."
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:75
-msgid "trigger system commands"
+#: plugins/personal/mail/class_mailAccount.inc:225
+#: plugins/admin/groups/class_groupMail.inc:314
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid "Remove mail account"
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:78
-msgid "view all services"
+#: plugins/personal/mail/class_mailAccount.inc:226
+#: plugins/admin/groups/class_groupMail.inc:315
+msgid ""
+"This account has mail features enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:81
-msgid "view all hosts"
+#: plugins/personal/mail/class_mailAccount.inc:228
+#: plugins/admin/groups/class_groupMail.inc:317
+#: plugins/admin/ogroups/class_mailogroup.inc:43
+msgid "Create mail account"
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:83
-msgid "trigger all service commands"
+#: plugins/personal/mail/class_mailAccount.inc:228
+#: plugins/admin/groups/class_groupMail.inc:318
+msgid ""
+"This account has mail features disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:86
-msgid "trigger all host commands"
+#: plugins/personal/mail/class_mailAccount.inc:276
+msgid ""
+"You're trying to add an invalid email address to the list of forwarders."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:282
+#: plugins/admin/groups/class_groupMail.inc:377
+msgid "Adding your one of your own addresses to the forwarders makes no sense."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:317
+#: plugins/personal/mail/class_mailAccount.inc:322
+#: plugins/admin/groups/class_groupMail.inc:405
+msgid ""
+"You're trying to add an invalid email address to the list of alternate "
+"addresses."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:332
+#: plugins/admin/groups/class_groupMail.inc:410
+msgid "The address you're trying to add is already used by user"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:714
+msgid ""
+"There is no valid mailserver specified, please add one in the system setup."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:719
+#: plugins/admin/groups/class_groupMail.inc:798
+msgid "The required field 'Primary address' is not set."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:723
+#: plugins/personal/mail/class_mailAccount.inc:727
+#: plugins/addons/addressbook/class_addressbook.inc:588
+#: plugins/admin/ogroups/class_mailogroup.inc:70
+msgid "Please enter a valid email address in 'Primary address' field."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:733
+#: plugins/admin/groups/class_groupMail.inc:807
+#: plugins/admin/ogroups/class_mailogroup.inc:77
+msgid "The primary address you've entered is already in use."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:739
+#: plugins/admin/groups/class_groupMail.inc:813
+msgid "Value in 'Quota size' is not valid."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:748
+#: plugins/admin/groups/class_groupMail.inc:822
+msgid "Please specify a vaild mail size for mails to be rejected."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:758
+#: plugins/admin/groups/class_groupMail.inc:830
+msgid "You need to set the maximum mail size in order to reject anything."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:762
+msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:7 plugins/personal/mail/copypaste.tpl:7
@@ -597,9 +705,9 @@ msgstr ""
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:921
+#: plugins/admin/systems/class_systemManagement.inc:922
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:586
+#: plugins/admin/ogroups/class_ogroupManagement.inc:587
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
 msgstr ""
@@ -613,7 +721,7 @@ msgid "Quota usage"
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
-#: plugins/admin/systems/class_terminalInfo.inc:169
+#: plugins/admin/systems/class_terminalInfo.inc:170
 #: plugins/admin/systems/class_printGeneric.inc:424
 msgid "not defined"
 msgstr ""
@@ -638,8 +746,8 @@ msgstr ""
 #: plugins/personal/mail/mail_locals.tpl:41
 #: plugins/personal/mail/copypaste.tpl:21
 #: plugins/personal/mail/copypaste.tpl:44
-#: plugins/personal/posix/posix_groups.tpl:65
 #: plugins/personal/posix/trust_machines.tpl:39
+#: plugins/personal/posix/posix_groups.tpl:65
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
 #: plugins/personal/samba/samba3.tpl:330
@@ -655,43 +763,42 @@ msgstr ""
 #: plugins/gofax/blocklists/generic.tpl:63
 #: plugins/gofax/faxaccount/generic.tpl:76
 #: plugins/gofax/faxaccount/locals.tpl:60
-#: plugins/gofax/faxaccount/lists.tpl:13
+#: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiPackage.tpl:71
-#: plugins/admin/fai/faiProfile.tpl:38 plugins/admin/fai/faiScript.tpl:48
-#: plugins/admin/fai/faiTemplate.tpl:41 plugins/admin/fai/faiHook.tpl:48
-#: plugins/admin/groups/mail.tpl:51 plugins/admin/groups/mail.tpl:95
+#: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
+#: plugins/admin/fai/faiScript.tpl:48 plugins/admin/fai/faiTemplate.tpl:41
+#: plugins/admin/fai/faiHook.tpl:48 plugins/admin/groups/mail.tpl:51
+#: plugins/admin/groups/mail.tpl:95
 #: plugins/admin/groups/class_groupMail.inc:533
 #: plugins/admin/groups/application.tpl:15
 #: plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/generic.tpl:104
 #: plugins/admin/groups/mail_locals.tpl:66
 #: plugins/admin/groups/paste_mail.tpl:30
-#: plugins/admin/groups/paste_mail.tpl:41
-#: plugins/admin/systems/servservice.tpl:20
-#: plugins/admin/systems/servservice.tpl:47
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
+#: plugins/admin/groups/paste_mail.tpl:41 plugins/admin/systems/glpi.tpl:100
+#: plugins/admin/systems/glpiPrinter.tpl:93
+#: plugins/admin/systems/glpiPrinter.tpl:121
+#: plugins/admin/systems/glpi_edit_type.tpl:8
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:7
 #: plugins/admin/systems/workstationStartup.tpl:61
 #: plugins/admin/systems/workstationStartup.tpl:81
 #: plugins/admin/systems/workstationStartup.tpl:100
 #: plugins/admin/systems/servdns.tpl:6
-#: plugins/admin/systems/phonesettings.tpl:176
-#: plugins/admin/systems/phonesettings.tpl:191
 #: plugins/admin/systems/terminalStartup.tpl:61
 #: plugins/admin/systems/terminalStartup.tpl:80
-#: plugins/admin/systems/servRepositorySetup.tpl:36
-#: plugins/admin/systems/glpi_edit_type.tpl:8
 #: plugins/admin/systems/glpiManufacturer.tpl:6
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
-#: plugins/admin/systems/glpi_edit_os.tpl:8
 #: plugins/admin/systems/class_termDNS.inc:461
 #: plugins/admin/systems/class_termDNS.inc:482
-#: plugins/admin/systems/glpi.tpl:100
 #: plugins/admin/systems/servdnseditzone.tpl:102
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/glpiPrinter.tpl:93
-#: plugins/admin/systems/glpiPrinter.tpl:121
+#: plugins/admin/systems/servRepositorySetup.tpl:36
+#: plugins/admin/systems/servservice.tpl:20
+#: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/glpi_edit_os.tpl:8
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
 #: plugins/admin/systems/class_servDNSeditZone.inc:478
+#: plugins/admin/systems/phonesettings.tpl:176
+#: plugins/admin/systems/phonesettings.tpl:191
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:270
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/generic.tpl:39
@@ -716,38 +823,37 @@ msgstr ""
 #: plugins/gofax/faxaccount/generic.tpl:78
 #: plugins/gofax/faxaccount/lists.tpl:14
 #: plugins/addons/addressbook/remove.tpl:14
-#: plugins/admin/fai/faiPartitionTable.tpl:45
-#: plugins/admin/fai/faiVariable.tpl:46 plugins/admin/fai/faiScript.tpl:46
-#: plugins/admin/fai/faiTemplate.tpl:43 plugins/admin/fai/remove.tpl:15
-#: plugins/admin/fai/faiHook.tpl:46 plugins/admin/fai/remove_branch.tpl:14
+#: plugins/admin/fai/faiVariable.tpl:46
+#: plugins/admin/fai/faiPartitionTable.tpl:45 plugins/admin/fai/remove.tpl:15
+#: plugins/admin/fai/faiScript.tpl:46 plugins/admin/fai/faiTemplate.tpl:43
+#: plugins/admin/fai/remove_branch.tpl:14 plugins/admin/fai/faiHook.tpl:46
 #: plugins/admin/groups/mail.tpl:52 plugins/admin/groups/mail.tpl:97
 #: plugins/admin/groups/remove.tpl:14 plugins/admin/groups/generic.tpl:106
 #: plugins/admin/groups/paste_mail.tpl:31
 #: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/users/remove.tpl:14
 #: plugins/admin/applications/remove.tpl:13
 #: plugins/admin/departments/remove.tpl:14
-#: plugins/admin/systems/servservice.tpl:22
-#: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/glpi_edit_type.tpl:10
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/workstationStartup.tpl:62
 #: plugins/admin/systems/workstationStartup.tpl:82
-#: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
-#: plugins/admin/systems/phonesettings.tpl:177
-#: plugins/admin/systems/phonesettings.tpl:192
-#: plugins/admin/systems/remove.tpl:14
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
 #: plugins/admin/systems/terminalStartup.tpl:62
-#: plugins/admin/systems/glpi_edit_type.tpl:10
-#: plugins/admin/systems/remove_glpi.tpl:14
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
-#: plugins/admin/systems/glpi_edit_os.tpl:10
 #: plugins/admin/systems/class_termDNS.inc:476
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:192
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
+#: plugins/admin/systems/servservice.tpl:22
+#: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/glpi_edit_os.tpl:10
+#: plugins/admin/systems/remove_glpi.tpl:14
+#: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
 #: plugins/admin/systems/class_servDNSeditZone.inc:279
 #: plugins/admin/systems/class_servDNSeditZone.inc:472
-#: plugins/admin/ogroups/generic.tpl:40 plugins/admin/ogroups/remove.tpl:14
-#: plugins/admin/ogroups/phonequeue.tpl:25 plugins/gofon/macro/remove.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:15
+#: plugins/admin/systems/phonesettings.tpl:177
+#: plugins/admin/systems/phonesettings.tpl:192
+#: plugins/admin/systems/remove.tpl:14 plugins/admin/ogroups/generic.tpl:40
+#: plugins/admin/ogroups/remove.tpl:14 plugins/admin/ogroups/phonequeue.tpl:25
+#: plugins/gofon/macro/remove.tpl:13 plugins/gofon/phoneaccount/generic.tpl:15
 #: plugins/gofon/phoneaccount/paste_generic.tpl:15
 #: plugins/gofon/conference/remove.tpl:14
 msgid "Delete"
@@ -855,6 +961,7 @@ msgstr ""
 #: plugins/gofax/blocklists/headpage.tpl:29
 #: plugins/gofax/faxaccount/locals.tpl:19
 #: plugins/addons/addressbook/contents.tpl:58
+#: plugins/addons/godfs/contents.tpl:31
 #: plugins/admin/fai/faiProfileEntry.tpl:31
 #: plugins/admin/fai/faiPackageEntry.tpl:32 plugins/admin/fai/headpage.tpl:64
 #: plugins/admin/groups/headpage.tpl:30
@@ -862,14 +969,14 @@ msgstr ""
 #: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
 #: plugins/admin/applications/headpage.tpl:47
 #: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
-#: plugins/admin/systems/headpage.tpl:29
+#: plugins/admin/systems/glpiDeviceManagement.tpl:27
 #: plugins/admin/systems/servRepository.tpl:36
 #: plugins/admin/systems/glpiSelectUser.tpl:27
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:27
+#: plugins/admin/systems/headpage.tpl:29
 #: plugins/admin/systems/glpiAttachmentPool.tpl:27
-#: plugins/admin/systems/glpiDeviceManagement.tpl:27
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/admin/ogroups/headpage.tpl:29 plugins/gofon/macro/headpage.tpl:29
 #: plugins/gofon/conference/headpage.tpl:29
@@ -879,8 +986,8 @@ msgid "Filters"
 msgstr ""
 
 #: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:32
 #: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:32
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/personal/environment/selectPrinterDialog.tpl:34
 #: plugins/gofax/faxaccount/locals.tpl:29
@@ -909,156 +1016,52 @@ msgstr ""
 msgid "User name of which addresses are shown"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:75
-#, php-format
-msgid "There is no mail method '%s' specified in your gosa.conf available."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:176
-msgid "No DESC tag in vacation file:"
+#: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
+msgid "Mail settings"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:216
-msgid "This account has no mail extensions."
+#: plugins/personal/password/class_password.inc:5
+#: plugins/admin/systems/class_systemManagement.inc:872
+#: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
+#: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
+#: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
+#: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
+#: ihtml/themes/altlinux/setup_useradmin.tpl:30
+#: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
+#: ihtml/themes/default/setup_useradmin.tpl:30 ihtml/themes/lhs/login.tpl:37
+#: ihtml/themes/lhs/login.tpl:41 ihtml/themes/lhs/setup_useradmin.tpl:30
+msgid "Password"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:225
-#: plugins/admin/groups/class_groupMail.inc:314
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid "Remove mail account"
+#: plugins/personal/password/password.tpl:2
+#: plugins/personal/password/changed.tpl:2
+#: plugins/admin/users/class_userManagement.inc:802
+#: plugins/admin/users/class_userManagement.inc:809
+msgid "Change password"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:226
-#: plugins/admin/groups/class_groupMail.inc:315
+#: plugins/personal/password/password.tpl:6
 msgid ""
-"This account has mail features enabled. You can disable them by clicking "
-"below."
+"To change your personal password use the fields below. The changes take "
+"effect immediately. Please memorize the new password, because you wouldn't "
+"be able to login without it."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:228
-#: plugins/admin/groups/class_groupMail.inc:317
-#: plugins/admin/ogroups/class_mailogroup.inc:43
-msgid "Create mail account"
+#: plugins/personal/password/password.tpl:10
+#: plugins/admin/users/password.tpl:6
+msgid ""
+"Changing the password affects your authentification on mail, proxy, samba "
+"and unix services."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:228
-#: plugins/admin/groups/class_groupMail.inc:318
-msgid ""
-"This account has mail features disabled. You can enable them by clicking "
-"below."
+#: plugins/personal/password/password.tpl:15
+msgid "Current password"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:276
-msgid ""
-"You're trying to add an invalid email address to the list of forwarders."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:282
-#: plugins/admin/groups/class_groupMail.inc:377
-msgid "Adding your one of your own addresses to the forwarders makes no sense."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:317
-#: plugins/personal/mail/class_mailAccount.inc:322
-#: plugins/admin/groups/class_groupMail.inc:405
-msgid ""
-"You're trying to add an invalid email address to the list of alternate "
-"addresses."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:332
-#: plugins/admin/groups/class_groupMail.inc:410
-msgid "The address you're trying to add is already used by user"
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:714
-msgid ""
-"There is no valid mailserver specified, please add one in the system setup."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:719
-#: plugins/admin/groups/class_groupMail.inc:798
-msgid "The required field 'Primary address' is not set."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:723
-#: plugins/personal/mail/class_mailAccount.inc:727
-#: plugins/addons/addressbook/class_addressbook.inc:588
-#: plugins/admin/ogroups/class_mailogroup.inc:70
-msgid "Please enter a valid email address in 'Primary address' field."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:733
-#: plugins/admin/groups/class_groupMail.inc:807
-#: plugins/admin/ogroups/class_mailogroup.inc:77
-msgid "The primary address you've entered is already in use."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:739
-#: plugins/admin/groups/class_groupMail.inc:813
-msgid "Value in 'Quota size' is not valid."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:748
-#: plugins/admin/groups/class_groupMail.inc:822
-msgid "Please specify a vaild mail size for mails to be rejected."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:758
-#: plugins/admin/groups/class_groupMail.inc:830
-msgid "You need to set the maximum mail size in order to reject anything."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:762
-msgid "You specified Spam settings, but there is no Folder specified."
-msgstr ""
-
-#: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
-msgid "Mail settings"
-msgstr ""
-
-#: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:871
-#: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
-#: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
-#: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
-#: ihtml/themes/altlinux/setup_useradmin.tpl:30
-#: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/default/setup_useradmin.tpl:30
-#: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
-msgid "Password"
-msgstr ""
-
-#: plugins/personal/password/password.tpl:2
-#: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:801
-#: plugins/admin/users/class_userManagement.inc:808
-msgid "Change password"
-msgstr ""
-
-#: plugins/personal/password/password.tpl:6
-msgid ""
-"To change your personal password use the fields below. The changes take "
-"effect immediately. Please memorize the new password, because you wouldn't "
-"be able to login without it."
-msgstr ""
-
-#: plugins/personal/password/password.tpl:10
-#: plugins/admin/users/password.tpl:6
-msgid ""
-"Changing the password affects your authentification on mail, proxy, samba "
-"and unix services."
-msgstr ""
-
-#: plugins/personal/password/password.tpl:15
-msgid "Current password"
-msgstr ""
-
-#: plugins/personal/password/password.tpl:20
-#: plugins/personal/generic/password.tpl:7 plugins/admin/users/password.tpl:11
-#: plugins/admin/systems/password.tpl:14
-msgid "New password"
+#: plugins/personal/password/password.tpl:20
+#: plugins/personal/generic/password.tpl:7 plugins/admin/users/password.tpl:11
+#: plugins/admin/systems/password.tpl:14
+msgid "New password"
 msgstr ""
 
 #: plugins/personal/password/password.tpl:25
@@ -1090,9 +1093,8 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
 #: plugins/addons/ldapmanager/contentexport.tpl:66
-#: plugins/admin/fai/class_faiManagement.inc:441
-#: plugins/admin/fai/faiNewBranch.tpl:52
-#: plugins/admin/departments/recursive_moce.tpl:10 include/functions.inc:1382
+#: plugins/admin/fai/faiNewBranch.tpl:50
+#: plugins/admin/departments/recursive_move.tpl:18 include/functions.inc:1382
 #: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_step3.tpl:17
@@ -1103,6 +1105,9 @@ msgstr ""
 #: ihtml/themes/default/setup_step3.tpl:17
 #: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_finish.tpl:30
+#: ihtml/themes/lhs/setup_useradmin.tpl:40 ihtml/themes/lhs/setup_step2.tpl:12
+#: ihtml/themes/lhs/setup_step3.tpl:17 ihtml/themes/lhs/setup_step4.tpl:114
+#: ihtml/themes/lhs/setup_finish.tpl:30
 msgid "Back"
 msgstr ""
 
@@ -1144,6 +1149,19 @@ msgstr ""
 msgid "External password changer reported a problem: "
 msgstr ""
 
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr ""
+
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr ""
+
+#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/systems/headpage.tpl:50
+msgid "Display systems matching"
+msgstr ""
+
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
 msgstr ""
@@ -1181,19 +1199,6 @@ msgstr ""
 msgid "Password expires on"
 msgstr ""
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
-msgstr ""
-
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
-msgstr ""
-
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:50
-msgid "Display systems matching"
-msgstr ""
-
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
@@ -1252,6 +1257,10 @@ msgstr ""
 msgid "Trust mode"
 msgstr ""
 
+#: plugins/personal/posix/main.inc:131
+msgid "Unix settings"
+msgstr ""
+
 #: plugins/personal/posix/class_posixAccount.inc:16
 #: plugins/generic/references/class_reference.inc:22
 msgid "UNIX"
@@ -1267,9 +1276,9 @@ msgid "unconfigured"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:195
-#: plugins/admin/systems/class_terminalService.inc:141
 #: plugins/admin/systems/class_workstationService.inc:134
 #: plugins/admin/systems/class_workstationStartup.inc:623
+#: plugins/admin/systems/class_terminalService.inc:141
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:211
 msgid "automatic"
 msgstr ""
@@ -1461,7 +1470,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/admin/systems/class_terminalGeneric.inc:60
 #: ihtml/themes/altlinux/setup_step4.tpl:91
-#: ihtml/themes/default/setup_step4.tpl:91
+#: ihtml/themes/default/setup_step4.tpl:91 ihtml/themes/lhs/setup_step4.tpl:91
 msgid "disabled"
 msgstr ""
 
@@ -1544,10 +1553,6 @@ msgstr ""
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 
-#: plugins/personal/posix/main.inc:131
-msgid "Unix settings"
-msgstr ""
-
 #: plugins/personal/posix/paste_generic.tpl:4
 msgid "Posix settings"
 msgstr ""
@@ -1678,6 +1683,10 @@ msgstr ""
 msgid "Allow connection from these workstations only"
 msgstr ""
 
+#: plugins/personal/samba/main.inc:123
+msgid "Samba settings"
+msgstr ""
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr ""
@@ -1686,10 +1695,6 @@ msgstr ""
 msgid "Display workstations of department"
 msgstr ""
 
-#: plugins/personal/samba/main.inc:123
-msgid "Samba settings"
-msgstr ""
-
 #: plugins/personal/samba/class_sambaAccount.inc:196
 msgid "This account has no samba extensions."
 msgstr ""
@@ -1782,6 +1787,10 @@ msgid ""
 "possible!"
 msgstr ""
 
+#: plugins/personal/environment/main.inc:124
+msgid "User environment settings"
+msgstr ""
+
 #: plugins/personal/environment/class_hotplugDialog.inc:111
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr ""
@@ -1802,11 +1811,6 @@ msgstr ""
 msgid "Please select an entry or press cancel."
 msgstr ""
 
-#: plugins/personal/environment/class_selectPrinterDialog.inc:67
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:99
-msgid "Please select a printer or press cancel."
-msgstr ""
-
 #: plugins/personal/environment/hotplugDialog.tpl:1
 msgid "Add hotplug devices"
 msgstr ""
@@ -1835,6 +1839,11 @@ msgstr ""
 msgid "Regular expression for        matching hotplugs"
 msgstr ""
 
+#: plugins/personal/environment/class_selectPrinterDialog.inc:67
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:99
+msgid "Please select a printer or press cancel."
+msgstr ""
+
 #: plugins/personal/environment/class_environment.inc:253
 #: plugins/personal/environment/class_environment.inc:290
 msgid "Remove environment extension"
@@ -1875,8 +1884,8 @@ msgstr ""
 
 #: plugins/personal/environment/class_environment.inc:510
 #: plugins/personal/environment/class_environment.inc:521
-#: plugins/admin/systems/class_terminalStartup.inc:134
 #: plugins/admin/systems/class_workstationStartup.inc:503
+#: plugins/admin/systems/class_terminalStartup.inc:134
 msgid "You must specify a valid mount point."
 msgstr ""
 
@@ -1981,9 +1990,9 @@ msgid "Resolution"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:105
-#: plugins/admin/systems/servservice.tpl:11
 #: plugins/admin/systems/workstationStartup.tpl:86
 #: plugins/admin/systems/terminalStartup.tpl:66
+#: plugins/admin/systems/servservice.tpl:11
 msgid "Shares"
 msgstr ""
 
@@ -1997,13 +2006,14 @@ msgstr ""
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:266
 #: plugins/admin/groups/class_groupMail.inc:537
 #: plugins/admin/applications/class_applicationParameters.inc:100
+#: plugins/admin/systems/glpiPrinter.tpl:122
 #: plugins/admin/systems/workstationStartup.tpl:101
-#: plugins/admin/systems/printer.tpl:48 plugins/admin/systems/servdns.tpl:8
+#: plugins/admin/systems/servdns.tpl:8
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/glpiManufacturer.tpl:8
-#: plugins/admin/systems/glpiPrinter.tpl:122
+#: plugins/admin/systems/printer.tpl:48
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:274
-#: ihtml/themes/altlinux/islocked.tpl:13
+#: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/lhs/islocked.tpl:13
 msgid "Remove"
 msgstr ""
 
@@ -2026,9 +2036,9 @@ msgid "Hotplug device settings"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:164
-#: plugins/admin/groups/class_groupManagement.inc:455
+#: plugins/admin/groups/class_groupManagement.inc:456
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:273
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
 msgid "New"
 msgstr ""
 
@@ -2044,14 +2054,6 @@ msgstr ""
 msgid "Admin Toggle"
 msgstr ""
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:96
-msgid "Specified name is invalid."
-msgstr ""
-
-#: plugins/personal/environment/class_logonManagementDialog.inc:100
-msgid "Specified description contains invalid characters."
-msgstr ""
-
 #: plugins/personal/environment/logonManagement.tpl:8
 msgid "Logon script settings"
 msgstr ""
@@ -2062,22 +2064,21 @@ msgstr ""
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:41
+#: plugins/gofax/blocklists/generic.tpl:41 plugins/addons/godfs/generic.tpl:12
+#: plugins/addons/godfs/generic.tpl:38 plugins/admin/fai/faiVariable.tpl:19
 #: plugins/admin/fai/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiVariable.tpl:19
-#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
-#: plugins/admin/fai/faiProfile.tpl:19
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:11
-#: plugins/admin/fai/faiScript.tpl:19
+#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
+#: plugins/admin/fai/faiProfile.tpl:19 plugins/admin/fai/faiScript.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:17
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHookEntry.tpl:17
 #: plugins/admin/fai/faiTemplateEntry.tpl:11 plugins/admin/fai/faiHook.tpl:19
 #: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/component.tpl:25 plugins/admin/systems/server.tpl:25
-#: plugins/admin/systems/phone.tpl:25 plugins/admin/systems/printer.tpl:13
-#: plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/server.tpl:25 plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/component.tpl:25 plugins/admin/systems/phone.tpl:25
+#: plugins/admin/systems/printer.tpl:13
 #: plugins/admin/systems/wingeneric.tpl:25
 #: plugins/admin/ogroups/generic.tpl:13 plugins/gofon/macro/generic.tpl:36
 #: plugins/gofon/conference/generic.tpl:51
@@ -2109,41 +2110,27 @@ msgstr ""
 
 #: plugins/personal/environment/logonManagement.tpl:75
 #: plugins/gofax/faxaccount/lists.tpl:31
-#: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiPackageConfiguration.tpl:6
+#: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiScriptEntry.tpl:68
+#: plugins/admin/fai/faiNewBranch.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:48
 #: plugins/admin/fai/faiPackageEntry.tpl:56
 #: plugins/admin/fai/faiHookEntry.tpl:70
 #: plugins/admin/fai/faiTemplateEntry.tpl:130
-#: plugins/admin/fai/faiNewBranch.tpl:19
-#: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/groups/application_options.tpl:8
-#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/systems/servRepositorySetup.tpl:41
+#: plugins/admin/systems/printerPPDDialog.tpl:22
 msgid "Apply"
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:67
-#: plugins/personal/environment/class_kioskManagementDialog.inc:85
-#, php-format
-msgid "Can't delete '%s'. Error was: permission denied."
-msgstr ""
-
-#: plugins/personal/environment/class_kioskManagementDialog.inc:70
-#: plugins/personal/environment/class_kioskManagementDialog.inc:88
-#, php-format
-msgid "Can't delete '%s'. Errow was: file doesn't exist."
-msgstr ""
-
-#: plugins/personal/environment/class_kioskManagementDialog.inc:130
-msgid ""
-"There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
+#: plugins/personal/environment/class_logonManagementDialog.inc:96
+msgid "Specified name is invalid."
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:136
-#, php-format
-msgid "Kiosk path '%s' is not accessible. Please check the permissions."
+#: plugins/personal/environment/class_logonManagementDialog.inc:100
+msgid "Specified description contains invalid characters."
 msgstr ""
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:1
@@ -2167,6 +2154,28 @@ msgstr ""
 msgid "save"
 msgstr ""
 
+#: plugins/personal/environment/class_kioskManagementDialog.inc:67
+#: plugins/personal/environment/class_kioskManagementDialog.inc:85
+#, php-format
+msgid "Can't delete '%s'. Error was: permission denied."
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:70
+#: plugins/personal/environment/class_kioskManagementDialog.inc:88
+#, php-format
+msgid "Can't delete '%s'. Errow was: file doesn't exist."
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:130
+msgid ""
+"There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:136
+#, php-format
+msgid "Kiosk path '%s' is not accessible. Please check the permissions."
+msgstr ""
+
 #: plugins/personal/environment/kioskManagement.tpl:1
 #: plugins/personal/environment/kioskManagement.tpl:5
 msgid "Kiosk profile management"
@@ -2179,60 +2188,171 @@ msgid "Browse"
 msgstr ""
 
 #: plugins/personal/environment/kioskManagement.tpl:25
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
 #: plugins/admin/systems/glpi_edit_type.tpl:15
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:14
 #: plugins/admin/systems/glpiManufacturer.tpl:13
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
 #: plugins/admin/systems/glpi_edit_os.tpl:15
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:14
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
 #: include/class_MultiSelectWindow.inc:45
 msgid "Close"
 msgstr ""
 
-#: plugins/personal/environment/main.inc:124
-msgid "User environment settings"
+#: plugins/personal/generic/class_user.inc:256
+msgid "female"
 msgstr ""
 
-#: plugins/personal/generic/password.tpl:2
-msgid ""
-"You have changed the method your password is stored in the ldap database. "
-"For that reason you've to enter your password at this point again. GOsa will "
-"then encode it with the selected method."
+#: plugins/personal/generic/class_user.inc:256
+msgid "male"
 msgstr ""
 
-#: plugins/personal/generic/generic_picture.tpl:5
-#: plugins/personal/generic/generic_picture.tpl:15
-#: plugins/personal/generic/generic.tpl:19
-#: plugins/personal/generic/generic.tpl:32
-#: plugins/personal/generic/paste_generic.tpl:41
-msgid "Personal picture"
+#: plugins/personal/generic/class_user.inc:270
+msgid "This account has no valid GOsa extensions."
 msgstr ""
 
-#: plugins/personal/generic/generic_picture.tpl:27
-#: plugins/personal/generic/paste_generic.tpl:27
-msgid "Remove picture"
+#: plugins/personal/generic/class_user.inc:324
+msgid "The specified file has not been uploaded via HTTP POST! Aborted."
 msgstr ""
 
-#: plugins/personal/generic/generic_picture.tpl:33
-#: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
-#: plugins/admin/systems/servnfs.tpl:75
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
-#: plugins/admin/systems/servdnseditzone.tpl:117
-#: plugins/admin/systems/glpi_devices.tpl:760
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
-#: include/class_MultiSelectWindow.inc:44
-#: ihtml/themes/default/copyPasteDialog.tpl:12
-msgid "Save"
+#: plugins/personal/generic/class_user.inc:420
+msgid "Please enter a valid serial number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:457
+#, php-format
+msgid "Certificate is valid from %s to %s and is currently %s."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:457
+msgid "valid"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:457
+msgid "invalid"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:461
+msgid "No certificate installed"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:879
+msgid "Kerberos database communication failed"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:896
+msgid "Can't remove user from kerberos database."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:907
+msgid "Can't add user to kerberos database."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:947
+msgid "You have no permissions to create a user on this 'Base'."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:952
+msgid "You have no permissions to move a user from the original 'Base'."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:958
+#: plugins/addons/addressbook/class_addressbook.inc:545
+#: plugins/admin/users/class_userManagement.inc:634
+msgid "The required field 'Name' is not set."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:967
+msgid "There's already a person with this 'Login' in the database."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:973
+#: plugins/addons/addressbook/class_addressbook.inc:549
+#: plugins/admin/users/class_userManagement.inc:637
+msgid "The required field 'Given name' is not set."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:976
+msgid "The required field 'Login' is not set."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:983
+msgid ""
+"There's already a person with this 'Name'/'Given name' combination in the "
+"database."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:990
+msgid ""
+"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:993
+msgid "The field 'Homepage' contains an invalid URL definition."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:996
+#: plugins/personal/generic/class_user.inc:1021
+#: plugins/addons/addressbook/class_addressbook.inc:555
+#: plugins/addons/addressbook/class_addressbook.inc:583
+#: plugins/admin/departments/class_departmentGeneric.inc:211
+msgid "The field 'Name' contains invalid characters."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:999
+#: plugins/personal/generic/class_user.inc:1018
+#: plugins/addons/addressbook/class_addressbook.inc:558
+#: plugins/addons/addressbook/class_addressbook.inc:580
+msgid "The field 'Given name' contains invalid characters."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1004
+#: plugins/addons/addressbook/class_addressbook.inc:563
+#: plugins/addons/addressbook/class_addressbook.inc:566
+#: plugins/admin/departments/class_departmentGeneric.inc:214
+msgid "The field 'Phone' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1007
+#: plugins/addons/addressbook/class_addressbook.inc:569
+#: plugins/admin/departments/class_departmentGeneric.inc:217
+msgid "The field 'Fax' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1010
+#: plugins/addons/addressbook/class_addressbook.inc:572
+msgid "The field 'Mobile' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1013
+#: plugins/addons/addressbook/class_addressbook.inc:575
+msgid "The field 'Pager' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1140
+msgid "Could not open specified certificate!"
+msgstr ""
+
+#: plugins/personal/generic/password.tpl:2
+msgid ""
+"You have changed the method your password is stored in the ldap database. "
+"For that reason you've to enter your password at this point again. GOsa will "
+"then encode it with the selected method."
 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_picture.tpl:5
+#: plugins/personal/generic/generic_picture.tpl:15
+#: plugins/personal/generic/paste_generic.tpl:41
+msgid "Personal picture"
+msgstr ""
+
 #: plugins/personal/generic/generic.tpl:24
 #: plugins/personal/generic/generic.tpl:34
 msgid "Change picture"
@@ -2263,8 +2383,8 @@ msgid "Login"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:67
-#: plugins/addons/addressbook/address_info.tpl:22
 #: plugins/addons/addressbook/address_edit.tpl:54
+#: plugins/addons/addressbook/address_info.tpl:22
 msgid "Personal title"
 msgstr ""
 
@@ -2278,7 +2398,7 @@ msgstr ""
 
 #: plugins/personal/generic/generic.tpl:100
 #: ihtml/themes/altlinux/sizelimit.tpl:14
-#: ihtml/themes/default/sizelimit.tpl:14
+#: ihtml/themes/default/sizelimit.tpl:14 ihtml/themes/lhs/sizelimit.tpl:14
 msgid "Set"
 msgstr ""
 
@@ -2292,30 +2412,31 @@ msgid "Preferred langage"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:127
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
 #: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/admin/fai/class_faiManagement.inc:670
-#: plugins/admin/groups/class_groupManagement.inc:458
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
+#: plugins/addons/godfs/class_dfsManagment.inc:186
+#: plugins/admin/fai/class_faiManagement.inc:678
+#: plugins/admin/groups/class_groupManagement.inc:459
 #: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/users/class_userManagement.inc:786
+#: plugins/admin/users/class_userManagement.inc:787
 #: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_applicationManagement.inc:477
+#: plugins/admin/applications/class_applicationManagement.inc:480
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_departmentManagement.inc:302
-#: plugins/admin/systems/component.tpl:13 plugins/admin/systems/server.tpl:13
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/terminal.tpl:18
-#: plugins/admin/systems/class_systemManagement.inc:771
-#: plugins/admin/systems/printer.tpl:20
+#: plugins/admin/departments/class_departmentManagement.inc:303
+#: plugins/admin/systems/server.tpl:13 plugins/admin/systems/terminal.tpl:18
 #: plugins/admin/systems/workstation.tpl:27
+#: plugins/admin/systems/component.tpl:13
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/phone.tpl:13
+#: plugins/admin/systems/class_systemManagement.inc:772
+#: plugins/admin/systems/printer.tpl:20
 #: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:43
-#: plugins/admin/ogroups/class_ogroupManagement.inc:451
-#: plugins/admin/ogroups/generic.tpl:21
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:330
-#: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/ogroups/class_ogroupManagement.inc:452
+#: plugins/admin/ogroups/generic.tpl:21 plugins/gofon/macro/generic.tpl:20
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 #: plugins/gofon/conference/generic.tpl:33
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
 msgid "Base"
 msgstr ""
 
@@ -2326,10 +2447,10 @@ msgstr ""
 #: plugins/personal/generic/generic.tpl:134
 #: plugins/admin/groups/generic.tpl:26
 #: plugins/admin/departments/generic.tpl:33
-#: plugins/admin/systems/component.tpl:18 plugins/admin/systems/server.tpl:18
-#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/terminal.tpl:23
-#: plugins/admin/systems/printer.tpl:25
+#: plugins/admin/systems/server.tpl:18 plugins/admin/systems/terminal.tpl:23
 #: plugins/admin/systems/workstation.tpl:32
+#: plugins/admin/systems/component.tpl:18 plugins/admin/systems/phone.tpl:18
+#: plugins/admin/systems/printer.tpl:25
 #: plugins/admin/systems/wingeneric.tpl:18
 #: plugins/admin/ogroups/generic.tpl:26
 msgid "Select a base"
@@ -2337,10 +2458,10 @@ msgstr ""
 
 #: plugins/personal/generic/generic.tpl:147
 #: plugins/personal/generic/generic.tpl:291
-#: plugins/addons/addressbook/address_info.tpl:33
-#: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/addons/addressbook/address_edit.tpl:72
 #: plugins/addons/addressbook/address_edit.tpl:182
+#: plugins/addons/addressbook/address_info.tpl:33
+#: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/admin/departments/generic.tpl:55
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
 msgid "Address"
@@ -2384,16 +2505,16 @@ msgid "Organization"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:213
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:323
-#: plugins/addons/addressbook/address_info.tpl:64
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
 #: plugins/addons/addressbook/address_edit.tpl:138
-#: plugins/admin/groups/class_groupManagement.inc:523
-#: plugins/admin/users/class_userManagement.inc:818
-#: plugins/admin/applications/class_applicationManagement.inc:518
-#: plugins/admin/systems/class_systemManagement.inc:791
-#: plugins/admin/ogroups/class_ogroupManagement.inc:517
-#: plugins/admin/ogroups/class_ogroupManagement.inc:585
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
+#: plugins/addons/addressbook/address_info.tpl:64
+#: plugins/admin/groups/class_groupManagement.inc:524
+#: plugins/admin/users/class_userManagement.inc:819
+#: plugins/admin/applications/class_applicationManagement.inc:521
+#: plugins/admin/systems/class_systemManagement.inc:792
+#: plugins/admin/ogroups/class_ogroupManagement.inc:518
+#: plugins/admin/ogroups/class_ogroupManagement.inc:586
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #: plugins/generic/references/class_reference.inc:38
 msgid "Department"
 msgstr ""
@@ -2417,12 +2538,13 @@ msgstr ""
 
 #: plugins/personal/generic/generic.tpl:257
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_info.tpl:40
-#: plugins/addons/addressbook/address_edit.tpl:95 html/getxls.php:236
+#: 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:283
+#: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:43
 #: plugins/admin/departments/generic.tpl:51
 #: plugins/admin/systems/workstation.tpl:18 html/getxls.php:174
@@ -2468,8 +2590,8 @@ msgid "Street"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:365
-#: plugins/addons/addressbook/address_info.tpl:70
-#: plugins/addons/addressbook/address_edit.tpl:158 html/getxls.php:174
+#: plugins/addons/addressbook/address_edit.tpl:158
+#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
 msgid "Postal code"
 msgstr ""
 
@@ -2489,6 +2611,26 @@ msgstr ""
 msgid "Public visible"
 msgstr ""
 
+#: plugins/personal/generic/generic_picture.tpl:27
+#: plugins/personal/generic/paste_generic.tpl:27
+msgid "Remove picture"
+msgstr ""
+
+#: plugins/personal/generic/generic_picture.tpl:33
+#: plugins/addons/addressbook/address_edit.tpl:233
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
+#: plugins/admin/systems/servnfs.tpl:75
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
+#: plugins/admin/systems/servdnseditzone.tpl:117
+#: plugins/admin/systems/glpi_devices.tpl:760
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
+#: include/class_MultiSelectWindow.inc:44
+#: ihtml/themes/default/copyPasteDialog.tpl:12
+msgid "Save"
+msgstr ""
+
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr ""
@@ -2505,193 +2647,62 @@ msgstr ""
 msgid "Certificate serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:256
-msgid "female"
+#: plugins/personal/generic/main.inc:107
+msgid "You are not allowed to set your password!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:256
-msgid "male"
+#: plugins/personal/generic/main.inc:189
+msgid "Generic user information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:270
-msgid "This account has no valid GOsa extensions."
+#: plugins/personal/generic/paste_generic.tpl:4
+msgid "User settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:324
-msgid "The specified file has not been uploaded via HTTP POST! Aborted."
+#: plugins/personal/generic/paste_generic.tpl:22
+msgid "User picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:420
-msgid "Please enter a valid serial number"
+#: plugins/personal/connectivity/proxy.tpl:10
+msgid "Proxy account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:457
-#, php-format
-msgid "Certificate is valid from %s to %s and is currently %s."
+#: plugins/personal/connectivity/proxy.tpl:18
+msgid "Filter unwanted content (i.e. pornographic or violence related)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:457
-msgid "valid"
+#: plugins/personal/connectivity/proxy.tpl:24
+msgid "Limit proxy access to working time"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:457
-msgid "invalid"
+#: plugins/personal/connectivity/proxy.tpl:69
+msgid "Restrict proxy usage by quota"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:461
-msgid "No certificate installed"
+#: plugins/personal/connectivity/proxy.tpl:86
+msgid "per"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:879
-msgid "Kerberos database communication failed"
+#: plugins/personal/connectivity/pptp.tpl:3
+msgid "PPTP account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:896
-msgid "Can't remove user from kerberos database."
+#: plugins/personal/connectivity/intranet.tpl:3
+msgid "Intranet account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:907
-msgid "Can't add user to kerberos database."
+#: plugins/personal/connectivity/phpgw.tpl:3
+msgid "PHPGroupware account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:947
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:952
-msgid "You have no permissions to move a user from the original 'Base'."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:958
-#: plugins/addons/addressbook/class_addressbook.inc:545
-#: plugins/admin/users/class_userManagement.inc:634
-msgid "The required field 'Name' is not set."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:967
-msgid "There's already a person with this 'Login' in the database."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:973
-#: plugins/addons/addressbook/class_addressbook.inc:549
-#: plugins/admin/users/class_userManagement.inc:637
-msgid "The required field 'Given name' is not set."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:976
-msgid "The required field 'Login' is not set."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:983
-msgid ""
-"There's already a person with this 'Name'/'Given name' combination in the "
-"database."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:990
-msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:993
-msgid "The field 'Homepage' contains an invalid URL definition."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:996
-#: plugins/personal/generic/class_user.inc:1021
-#: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/addons/addressbook/class_addressbook.inc:583
-#: plugins/admin/departments/class_departmentGeneric.inc:211
-msgid "The field 'Name' contains invalid characters."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:999
-#: plugins/personal/generic/class_user.inc:1018
-#: plugins/addons/addressbook/class_addressbook.inc:558
-#: plugins/addons/addressbook/class_addressbook.inc:580
-msgid "The field 'Given name' contains invalid characters."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1004
-#: plugins/addons/addressbook/class_addressbook.inc:563
-#: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/admin/departments/class_departmentGeneric.inc:214
-msgid "The field 'Phone' contains an invalid phone number."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1007
-#: plugins/addons/addressbook/class_addressbook.inc:569
-#: plugins/admin/departments/class_departmentGeneric.inc:217
-msgid "The field 'Fax' contains an invalid phone number."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1010
-#: plugins/addons/addressbook/class_addressbook.inc:572
-msgid "The field 'Mobile' contains an invalid phone number."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1013
-#: plugins/addons/addressbook/class_addressbook.inc:575
-msgid "The field 'Pager' contains an invalid phone number."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1140
-msgid "Could not open specified certificate!"
-msgstr ""
-
-#: plugins/personal/generic/main.inc:107
-msgid "You are not allowed to set your password!"
-msgstr ""
-
-#: plugins/personal/generic/main.inc:189
-msgid "Generic user information"
-msgstr ""
-
-#: plugins/personal/generic/paste_generic.tpl:4
-msgid "User settings"
-msgstr ""
-
-#: plugins/personal/generic/paste_generic.tpl:22
-msgid "User picture"
-msgstr ""
-
-#: plugins/personal/connectivity/proxy.tpl:10
-msgid "Proxy account"
-msgstr ""
-
-#: plugins/personal/connectivity/proxy.tpl:18
-msgid "Filter unwanted content (i.e. pornographic or violence related)"
-msgstr ""
-
-#: plugins/personal/connectivity/proxy.tpl:24
-msgid "Limit proxy access to working time"
-msgstr ""
-
-#: plugins/personal/connectivity/proxy.tpl:69
-msgid "Restrict proxy usage by quota"
-msgstr ""
-
-#: plugins/personal/connectivity/proxy.tpl:86
-msgid "per"
-msgstr ""
-
-#: plugins/personal/connectivity/pptp.tpl:3
-msgid "PPTP account"
-msgstr ""
-
-#: plugins/personal/connectivity/intranet.tpl:3
-msgid "Intranet account"
+#: plugins/personal/connectivity/glpi.tpl:1
+msgid "GLPI account"
 msgstr ""
 
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
 msgid "WebDAV"
 msgstr ""
 
-#: plugins/personal/connectivity/phpgw.tpl:3
-msgid "PHPGroupware account"
-msgstr ""
-
 #: plugins/personal/connectivity/kolab.tpl:1
 msgid "Kolab account"
 msgstr ""
@@ -2791,10 +2802,6 @@ msgstr ""
 msgid "Temporary disable FTP access"
 msgstr ""
 
-#: plugins/personal/connectivity/glpi.tpl:1
-msgid "GLPI account"
-msgstr ""
-
 #: plugins/personal/connectivity/oxchange.tpl:2
 msgid "Open-Xchange Account"
 msgstr ""
@@ -2827,6 +2834,27 @@ msgstr ""
 msgid "User Timezone"
 msgstr ""
 
+#: plugins/personal/connectivity/opengw.tpl:1
+msgid "Opengroupware"
+msgstr ""
+
+#: plugins/personal/connectivity/opengw.tpl:8
+msgid "Location team"
+msgstr ""
+
+#: plugins/personal/connectivity/opengw.tpl:21
+msgid "Template user"
+msgstr ""
+
+#: plugins/personal/connectivity/opengw.tpl:34
+#: plugins/admin/systems/class_workstationGeneric.inc:71
+msgid "Locked"
+msgstr ""
+
+#: plugins/personal/connectivity/opengw.tpl:49
+msgid "Teams"
+msgstr ""
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
@@ -2865,12 +2893,37 @@ msgstr ""
 msgid "Numerical value for Quota Setting is not valid."
 msgstr ""
 
+#: plugins/personal/connectivity/class_intranetAccount.inc:14
+msgid "Intranet"
+msgstr ""
+
 #: plugins/personal/connectivity/class_pptpAccount.inc:26
 msgid "PPTP"
 msgstr ""
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:14
-msgid "Intranet"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+msgid "Value specified as 'Upload bandwidth' is not valid."
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:140
+msgid "Value specified as 'Download bandwidth' is not valid."
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:143
+msgid "Value specified as 'Files' is not valid."
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:146
+msgid "Value specified as 'Size' is not valid."
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:149
+msgid "Value specified as 'Ratio' is not valid."
 msgstr ""
 
 #: plugins/personal/connectivity/class_phpgwAccount.inc:5
@@ -2938,29 +2991,8 @@ msgstr ""
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
-#: plugins/generic/references/class_reference.inc:34
-msgid "FTP"
-msgstr ""
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
-msgid "Value specified as 'Upload bandwidth' is not valid."
-msgstr ""
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:140
-msgid "Value specified as 'Download bandwidth' is not valid."
-msgstr ""
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:143
-msgid "Value specified as 'Files' is not valid."
-msgstr ""
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:146
-msgid "Value specified as 'Size' is not valid."
-msgstr ""
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:149
-msgid "Value specified as 'Ratio' is not valid."
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
 msgstr ""
 
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:24
@@ -3011,39 +3043,6 @@ msgstr ""
 msgid "you are not using any strange characters in the loginname."
 msgstr ""
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
-msgstr ""
-
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
-msgid "PHPscheduleit"
-msgstr ""
-
-#: plugins/personal/connectivity/class_connectivity.inc:63
-msgid "This account has no connectivity extensions."
-msgstr ""
-
-#: plugins/personal/connectivity/opengw.tpl:1
-msgid "Opengroupware"
-msgstr ""
-
-#: plugins/personal/connectivity/opengw.tpl:8
-msgid "Location team"
-msgstr ""
-
-#: plugins/personal/connectivity/opengw.tpl:21
-msgid "Template user"
-msgstr ""
-
-#: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:71
-msgid "Locked"
-msgstr ""
-
-#: plugins/personal/connectivity/opengw.tpl:49
-msgid "Teams"
-msgstr ""
-
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 msgid "Opengroupware account"
 msgstr ""
@@ -3066,92 +3065,145 @@ msgid ""
 "configuration twice."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:5
-msgid "FAX Blocklists"
+#: plugins/personal/connectivity/class_connectivity.inc:63
+msgid "This account has no connectivity extensions."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:229
-#, php-format
-msgid "You're about to delete the blocklist '%s'."
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
+msgid "PHPscheduleit"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:241
-msgid "You have no permission to remove this blocklist."
+#: plugins/gofax/blocklists/generic.tpl:8
+msgid "List name"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:251
-msgid "Please specify a valid phone number."
-msgstr ""
+#: plugins/gofax/blocklists/generic.tpl:10
+msgid "Name of blocklist"
+msgstr ""
+
+#: plugins/gofax/blocklists/generic.tpl:16
+msgid "Select subtree to place blocklist in"
+msgstr ""
+
+#: plugins/gofax/blocklists/generic.tpl:32
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/systems/workstationService.tpl:42
+#: plugins/admin/systems/workstationService.tpl:120
+#: plugins/admin/systems/servnfs.tpl:39
+#: plugins/admin/systems/terminalService.tpl:42
+#: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/systems/glpi_devices.tpl:427
+#: plugins/admin/systems/glpi_devices.tpl:492
+#: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
+#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
+msgid "Type"
+msgstr ""
+
+#: plugins/gofax/blocklists/generic.tpl:34
+msgid "Select wether to filter incoming or outgoing calls"
+msgstr ""
+
+#: plugins/gofax/blocklists/generic.tpl:43
+msgid "Descriptive text for this blocklist"
+msgstr ""
+
+#: plugins/gofax/blocklists/generic.tpl:56
+msgid "Blocked numbers"
+msgstr ""
+
+#: plugins/gofax/blocklists/generic.tpl:72
+msgid "Numbers can also contain wild cards."
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:5
+msgid "FAX Blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:229
+#, php-format
+msgid "You're about to delete the blocklist '%s'."
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:241
+msgid "You have no permission to remove this blocklist."
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:251
+msgid "Please specify a valid phone number."
+msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/admin/fai/class_faiManagement.inc:635
+#: plugins/admin/fai/class_faiManagement.inc:641
 #: plugins/admin/groups/class_groupManagement.inc:451
 #: plugins/admin/users/class_userManagement.inc:778
-#: plugins/admin/applications/class_applicationManagement.inc:470
+#: plugins/admin/applications/class_applicationManagement.inc:472
 #: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
 #: plugins/admin/ogroups/class_ogroupManagement.inc:442
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
-msgid "Go up one department"
+msgid "Go to root department"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/admin/fai/class_faiManagement.inc:635
-#: plugins/admin/fai/class_faiProfile.inc:303
+#: plugins/addons/godfs/class_dfsManagment.inc:183
+#: plugins/admin/fai/class_faiManagement.inc:641
 #: plugins/admin/groups/class_groupManagement.inc:451
 #: plugins/admin/users/class_userManagement.inc:778
-#: plugins/admin/applications/class_applicationManagement.inc:470
+#: plugins/admin/applications/class_applicationManagement.inc:472
 #: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
-#: plugins/admin/systems/class_servDNSeditZone.inc:276
+#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: plugins/admin/ogroups/class_ogroupManagement.inc:442
-#: plugins/admin/ogroups/phonequeue.tpl:17
+#: plugins/admin/ogroups/class_ogroupManagement.inc:443
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
-msgid "Up"
+msgid "Root"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
-#: plugins/admin/fai/class_faiManagement.inc:638
+#: plugins/admin/fai/class_faiManagement.inc:644
 #: plugins/admin/groups/class_groupManagement.inc:452
 #: plugins/admin/users/class_userManagement.inc:779
-#: plugins/admin/applications/class_applicationManagement.inc:471
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:297
-#: plugins/admin/systems/class_systemManagement.inc:755
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_systemManagement.inc:755
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/class_ogroupManagement.inc:443
+#: plugins/admin/ogroups/class_ogroupManagement.inc:444
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
-msgid "Go to root department"
+msgid "Go up one department"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
-#: plugins/admin/fai/class_faiManagement.inc:638
+#: plugins/addons/godfs/class_dfsManagment.inc:182
+#: plugins/admin/fai/class_faiManagement.inc:644
+#: plugins/admin/fai/class_faiProfile.inc:303
 #: plugins/admin/groups/class_groupManagement.inc:452
 #: plugins/admin/users/class_userManagement.inc:779
-#: plugins/admin/applications/class_applicationManagement.inc:471
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:297
-#: plugins/admin/systems/class_systemManagement.inc:755
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_systemManagement.inc:755
+#: plugins/admin/systems/class_servDNSeditZone.inc:276
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
 #: plugins/admin/ogroups/class_ogroupManagement.inc:444
+#: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
-msgid "Root"
+msgid "Up"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:309
 #: plugins/admin/groups/class_groupManagement.inc:453
 #: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:472
-#: plugins/admin/systems/class_systemManagement.inc:757
+#: plugins/admin/applications/class_applicationManagement.inc:474
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
 #: plugins/admin/ogroups/class_ogroupManagement.inc:445
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
@@ -3160,13 +3212,13 @@ msgid "Go to users department"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:309
-#: plugins/admin/fai/class_faiManagement.inc:641
+#: plugins/admin/fai/class_faiManagement.inc:647
 #: plugins/admin/groups/class_groupManagement.inc:453
 #: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:472
+#: plugins/admin/applications/class_applicationManagement.inc:474
 #: plugins/admin/departments/class_departmentManagement.inc:298
-#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
 #: plugins/admin/ogroups/class_ogroupManagement.inc:446
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
@@ -3174,212 +3226,200 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
+#: plugins/admin/fai/class_faiManagement.inc:649
+#: plugins/admin/groups/class_groupManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:781
+#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/departments/class_departmentManagement.inc:299
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/ogroups/class_ogroupManagement.inc:447
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
+msgid "Reload list"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
+#: plugins/addons/godfs/class_dfsManagment.inc:187
+#: plugins/admin/fai/class_faiManagement.inc:649
+#: plugins/admin/fai/class_faiManagement.inc:679
+#: plugins/admin/groups/class_groupManagement.inc:454
+#: plugins/admin/groups/class_groupManagement.inc:460
+#: plugins/admin/users/class_userManagement.inc:781
+#: plugins/admin/users/class_userManagement.inc:788
+#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/applications/class_applicationManagement.inc:481
+#: plugins/admin/departments/class_departmentManagement.inc:299
+#: plugins/admin/departments/class_departmentManagement.inc:304
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/ogroups/class_ogroupManagement.inc:447
+#: plugins/admin/ogroups/class_ogroupManagement.inc:453
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:332
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
+msgid "Submit"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
 msgid "Create new blocklist"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
 msgid "New Blocklist"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/fai/class_faiManagement.inc:671
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:787
-#: plugins/admin/applications/class_applicationManagement.inc:478
-#: plugins/admin/departments/class_departmentManagement.inc:303
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_glpiSelectUser.inc:168
-#: plugins/admin/ogroups/class_ogroupManagement.inc:452
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
+#: plugins/addons/godfs/class_dfsManagment.inc:187
+#: plugins/admin/fai/class_faiManagement.inc:679
+#: plugins/admin/groups/class_groupManagement.inc:460
+#: plugins/admin/users/class_userManagement.inc:788
+#: plugins/admin/applications/class_applicationManagement.inc:481
+#: plugins/admin/departments/class_departmentManagement.inc:304
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/ogroups/class_ogroupManagement.inc:453
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:332
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
 msgid "Submit department"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/fai/class_faiManagement.inc:671
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:787
-#: plugins/admin/applications/class_applicationManagement.inc:478
-#: plugins/admin/departments/class_departmentManagement.inc:303
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_glpiSelectUser.inc:168
-#: plugins/admin/ogroups/class_ogroupManagement.inc:452
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
-msgid "Submit"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
 #: plugins/admin/fai/class_faiScript.inc:227
 #: plugins/admin/fai/class_faiScript.inc:230
-#: plugins/admin/fai/class_faiManagement.inc:689
-#: plugins/admin/fai/class_faiManagement.inc:789
-#: plugins/admin/fai/class_faiManagement.inc:794
+#: plugins/admin/fai/class_faiManagement.inc:697
+#: plugins/admin/fai/class_faiManagement.inc:797
+#: plugins/admin/fai/class_faiManagement.inc:802
 #: plugins/admin/fai/class_faiHook.inc:251
 #: plugins/admin/fai/class_faiHook.inc:254
-#: plugins/admin/groups/class_groupManagement.inc:469
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/users/class_userManagement.inc:798
-#: plugins/admin/users/class_userManagement.inc:805
-#: plugins/admin/applications/class_applicationManagement.inc:489
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/departments/class_departmentManagement.inc:310
-#: plugins/admin/systems/class_systemManagement.inc:780
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/groups/class_groupManagement.inc:470
+#: plugins/admin/groups/class_groupManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:806
+#: plugins/admin/applications/class_applicationManagement.inc:492
+#: plugins/admin/applications/class_applicationManagement.inc:498
+#: plugins/admin/departments/class_departmentManagement.inc:311
 #: plugins/admin/systems/glpi.tpl:15 plugins/admin/systems/glpi.tpl:25
 #: plugins/admin/systems/glpi.tpl:35 plugins/admin/systems/glpiPrinter.tpl:15
 #: plugins/admin/systems/glpiPrinter.tpl:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:464
-#: plugins/admin/ogroups/class_ogroupManagement.inc:469
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/ogroups/class_ogroupManagement.inc:465
+#: plugins/admin/ogroups/class_ogroupManagement.inc:470
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
 msgid "edit"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
-#: plugins/admin/users/class_userManagement.inc:799
-#: plugins/admin/users/class_userManagement.inc:806
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
+#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:807
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 msgid "Edit user"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
 #: plugins/addons/mailqueue/contents.tpl:93
 #: plugins/admin/fai/class_faiScript.inc:231
-#: plugins/admin/fai/class_faiManagement.inc:690
-#: plugins/admin/fai/class_faiManagement.inc:796
+#: plugins/admin/fai/class_faiManagement.inc:698
+#: plugins/admin/fai/class_faiManagement.inc:804
 #: plugins/admin/fai/class_faiHook.inc:255
-#: plugins/admin/groups/class_groupManagement.inc:471
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/users/class_userManagement.inc:802
-#: plugins/admin/users/class_userManagement.inc:809
-#: plugins/admin/applications/class_applicationManagement.inc:491
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/departments/class_departmentManagement.inc:311
-#: plugins/admin/systems/class_systemManagement.inc:781
-#: plugins/admin/ogroups/class_ogroupManagement.inc:466
-#: plugins/admin/ogroups/class_ogroupManagement.inc:471
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
+#: plugins/admin/groups/class_groupManagement.inc:472
+#: plugins/admin/groups/class_groupManagement.inc:477
+#: plugins/admin/users/class_userManagement.inc:803
+#: plugins/admin/users/class_userManagement.inc:810
+#: plugins/admin/applications/class_applicationManagement.inc:494
+#: plugins/admin/applications/class_applicationManagement.inc:500
+#: plugins/admin/departments/class_departmentManagement.inc:312
+#: plugins/admin/systems/class_systemManagement.inc:782
+#: plugins/admin/ogroups/class_ogroupManagement.inc:467
+#: plugins/admin/ogroups/class_ogroupManagement.inc:472
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:338
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
 msgid "delete"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
-#: plugins/admin/users/class_userManagement.inc:803
-#: plugins/admin/users/class_userManagement.inc:810
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
+#: plugins/admin/users/class_userManagement.inc:804
+#: plugins/admin/users/class_userManagement.inc:811
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:338
 msgid "Delete user"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:323
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
 msgid "Blocklist name"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:325
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/fai/class_faiManagement.inc:686
-#: plugins/admin/groups/class_groupManagement.inc:525
-#: plugins/admin/users/class_userManagement.inc:820
-#: plugins/admin/applications/class_applicationManagement.inc:519
-#: plugins/admin/departments/class_departmentManagement.inc:318
-#: plugins/admin/systems/class_systemManagement.inc:792
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/fai/class_faiManagement.inc:694
+#: plugins/admin/groups/class_groupManagement.inc:526
+#: plugins/admin/users/class_userManagement.inc:821
+#: plugins/admin/applications/class_applicationManagement.inc:522
+#: plugins/admin/departments/class_departmentManagement.inc:319
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
-#: plugins/admin/ogroups/class_ogroupManagement.inc:494
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
+#: plugins/admin/systems/class_systemManagement.inc:793
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/ogroups/class_ogroupManagement.inc:495
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:345
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:313
 msgid "Actions"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:327
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:328
 msgid "This table displays faxblocklists for the selected tree."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:395
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:396
 msgid "send"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:395
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:396
 msgid "receive"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:543
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:548
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:549
 #: plugins/admin/departments/class_departmentGeneric.inc:199
 msgid "Required field 'Name' is not set."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:551
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:552
 msgid "Required field 'Name' contains invalid characters"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:558
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:559
 msgid "Specified name is already used."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:565
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:566
 msgid "No permission to create a blocklist on this base."
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:8
-msgid "List name"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:10
-msgid "Name of blocklist"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:16
-msgid "Select subtree to place blocklist in"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:32
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
-#: plugins/admin/systems/workstationService.tpl:42
-#: plugins/admin/systems/workstationService.tpl:120
-#: plugins/admin/systems/servnfs.tpl:39
-#: plugins/admin/systems/terminalService.tpl:42
-#: plugins/admin/systems/terminalService.tpl:120
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
-#: plugins/admin/systems/glpi_devices.tpl:427
-#: plugins/admin/systems/glpi_devices.tpl:492
-#: plugins/admin/systems/glpi_devices.tpl:542
-#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
-msgid "Type"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:34
-msgid "Select wether to filter incoming or outgoing calls"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:43
-msgid "Descriptive text for this blocklist"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:56
-msgid "Blocked numbers"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:72
-msgid "Numbers can also contain wild cards."
-msgstr ""
-
 #: plugins/gofax/blocklists/remove.tpl:2
 #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/fai/remove.tpl:2
 #: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:237 html/index.php:243 html/index.php:301
-#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/altlinux/islocked.tpl:6
-#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
+#: plugins/admin/departments/remove.tpl:2
+#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/ogroups/remove.tpl:2 plugins/gofon/macro/remove.tpl:2
+#: plugins/gofon/conference/remove.tpl:2 html/index.php:237 html/index.php:243
+#: html/index.php:301 ihtml/themes/altlinux/conflict.tpl:6
+#: ihtml/themes/altlinux/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
+#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/lhs/conflict.tpl:6
+#: ihtml/themes/lhs/islocked.tpl:6
 msgid "Warning"
 msgstr ""
 
@@ -3536,8 +3576,8 @@ msgid "FAX settings"
 msgstr ""
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:6
-#: plugins/addons/addressbook/address_info.tpl:88
 #: plugins/addons/addressbook/address_edit.tpl:206
+#: plugins/addons/addressbook/address_info.tpl:88
 #: plugins/generic/references/class_reference.inc:30
 msgid "FAX"
 msgstr ""
@@ -3616,7 +3656,7 @@ msgstr ""
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 #: plugins/admin/systems/class_printGeneric.inc:677
-#: plugins/admin/ogroups/class_ogroupManagement.inc:582
+#: plugins/admin/ogroups/class_ogroupManagement.inc:583
 msgid "User"
 msgstr ""
 
@@ -3653,45 +3693,6 @@ msgstr ""
 msgid "# pages"
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:6
-msgid "FAX Reports"
-msgstr ""
-
-#: plugins/gofax/faxreports/class_faxreport.inc:109
-#: plugins/gofax/faxreports/class_faxreport.inc:119
-#: plugins/gofax/faxreports/class_faxreport.inc:165
-#: plugins/gofax/faxreports/class_faxreport.inc:274
-msgid "Can't connect to fax database, no reports can be shown!"
-msgstr ""
-
-#: plugins/gofax/faxreports/class_faxreport.inc:112
-#: plugins/addons/logview/class_logview.inc:66
-#: plugins/gofon/fonreports/class_fonreport.inc:99
-msgid "There is no mysql extension available, please check your php setup."
-msgstr ""
-
-#: plugins/gofax/faxreports/class_faxreport.inc:123
-#: plugins/gofax/faxreports/class_faxreport.inc:128
-#: plugins/gofax/faxreports/class_faxreport.inc:169
-#: plugins/gofax/faxreports/class_faxreport.inc:278
-msgid "Can't select fax database for report generation!"
-msgstr ""
-
-#: plugins/gofax/faxreports/class_faxreport.inc:177
-#: plugins/gofax/faxreports/class_faxreport.inc:286
-msgid "Query for fax database failed!"
-msgstr ""
-
-#: plugins/gofax/faxreports/class_faxreport.inc:185
-msgid "You have no permission to retrieve informations about this fax id!"
-msgstr ""
-
-#: plugins/gofax/faxreports/class_faxreport.inc:205
-#: plugins/gofax/faxreports/class_faxreport.inc:294
-#: plugins/gofon/fonreports/class_fonreport.inc:220
-msgid "Y-M-D"
-msgstr ""
-
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/fonreports/contents.tpl:2
@@ -3733,6 +3734,7 @@ msgstr ""
 #: plugins/addons/mailqueue/contents.tpl:26
 #: plugins/addons/logview/contents.tpl:67
 #: plugins/gofon/fonreports/contents.tpl:21 ihtml/themes/default/help.tpl:21
+#: ihtml/themes/lhs/help.tpl:21
 msgid "Search"
 msgstr ""
 
@@ -3757,36 +3759,62 @@ msgstr ""
 msgid "Search returned no results..."
 msgstr ""
 
-#: plugins/gofax/faxreports/main.inc:5
-msgid "FAX reports"
-msgstr ""
-
-#: plugins/addons/addressbook/dial.tpl:3
-msgid "Dial connection..."
+#: plugins/gofax/faxreports/class_faxreport.inc:6
+msgid "FAX Reports"
 msgstr ""
 
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:360
-#: plugins/addons/addressbook/class_addressbook.inc:367
-#: plugins/addons/addressbook/class_addressbook.inc:371
-#: plugins/addons/addressbook/class_addressbook.inc:453
-msgid "Dial"
+#: plugins/gofax/faxreports/class_faxreport.inc:109
+#: plugins/gofax/faxreports/class_faxreport.inc:119
+#: plugins/gofax/faxreports/class_faxreport.inc:165
+#: plugins/gofax/faxreports/class_faxreport.inc:274
+msgid "Can't connect to fax database, no reports can be shown!"
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:112
+#: plugins/addons/logview/class_logview.inc:66
+#: plugins/gofon/fonreports/class_fonreport.inc:99
+msgid "There is no mysql extension available, please check your php setup."
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:123
+#: plugins/gofax/faxreports/class_faxreport.inc:128
+#: plugins/gofax/faxreports/class_faxreport.inc:169
+#: plugins/gofax/faxreports/class_faxreport.inc:278
+msgid "Can't select fax database for report generation!"
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:177
+#: plugins/gofax/faxreports/class_faxreport.inc:286
+msgid "Query for fax database failed!"
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:185
+msgid "You have no permission to retrieve informations about this fax id!"
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:205
+#: plugins/gofax/faxreports/class_faxreport.inc:294
+#: plugins/gofon/fonreports/class_fonreport.inc:220
+msgid "Y-M-D"
+msgstr ""
+
+#: plugins/gofax/faxreports/main.inc:5
+msgid "FAX reports"
 msgstr ""
 
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:513
 #: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/addons/addressbook/class_addressbook.inc:513
+#: plugins/admin/fai/faiVariable.tpl:9
 #: plugins/admin/fai/faiPartitionTable.tpl:9
-#: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiScriptEntry.tpl:9
-#: plugins/admin/fai/faiPackage.tpl:9 plugins/admin/fai/faiProfile.tpl:9
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiPackage.tpl:9
+#: plugins/admin/fai/faiProfile.tpl:9 plugins/admin/fai/faiScript.tpl:9
+#: plugins/admin/fai/faiVariableEntry.tpl:9
 #: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHookEntry.tpl:9
 #: plugins/admin/fai/faiTemplateEntry.tpl:7 plugins/admin/fai/faiHook.tpl:9
 #: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: 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
@@ -3800,14 +3828,16 @@ msgstr ""
 #: plugins/admin/systems/glpi_devices.tpl:615
 #: plugins/admin/systems/glpi_devices.tpl:669
 #: plugins/admin/systems/glpi_devices.tpl:715
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
 #: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
 msgid "Name"
 msgstr ""
 
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_info.tpl:29
 #: plugins/addons/addressbook/address_edit.tpl:66
+#: plugins/addons/addressbook/address_info.tpl:29
 msgid "Private"
 msgstr ""
 
@@ -3867,6 +3897,60 @@ msgstr ""
 msgid "Search string"
 msgstr ""
 
+#: plugins/addons/addressbook/dial.tpl:3
+msgid "Dial connection..."
+msgstr ""
+
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/class_addressbook.inc:360
+#: plugins/addons/addressbook/class_addressbook.inc:367
+#: plugins/addons/addressbook/class_addressbook.inc:371
+#: plugins/addons/addressbook/class_addressbook.inc:453
+msgid "Dial"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:7
+msgid "Choose the department to store entry in"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:24
+#: plugins/addons/addressbook/address_info.tpl:12
+msgid "Personal"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:44
+#: plugins/addons/addressbook/address_info.tpl:19 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Initials"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:105
+#: plugins/addons/addressbook/address_info.tpl:43
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:46
+msgid "Email"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:119
+#: plugins/addons/addressbook/address_info.tpl:53
+msgid "Organizational"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:128
+#: plugins/addons/addressbook/address_info.tpl:61
+msgid "Company"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:148
+#: plugins/addons/addressbook/address_info.tpl:67 html/getxls.php:174
+#: html/getxls.php:236
+msgid "City"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:168
+#: plugins/addons/addressbook/address_info.tpl:73
+msgid "Country"
+msgstr ""
+
 #: plugins/addons/addressbook/remove.tpl:6
 msgid ""
 "This includes all addressbook data in this entry. Please double check if "
@@ -3971,50 +4055,8 @@ msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
 
-#: plugins/addons/addressbook/address_info.tpl:12
-#: plugins/addons/addressbook/address_edit.tpl:24
-msgid "Personal"
-msgstr ""
-
-#: plugins/addons/addressbook/address_info.tpl:19
-#: plugins/addons/addressbook/address_edit.tpl:44 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Initials"
-msgstr ""
-
-#: plugins/addons/addressbook/address_info.tpl:43
-#: plugins/addons/addressbook/address_edit.tpl:105
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:46
-msgid "Email"
-msgstr ""
-
-#: plugins/addons/addressbook/address_info.tpl:53
-#: plugins/addons/addressbook/address_edit.tpl:119
-msgid "Organizational"
-msgstr ""
-
-#: plugins/addons/addressbook/address_info.tpl:61
-#: plugins/addons/addressbook/address_edit.tpl:128
-msgid "Company"
-msgstr ""
-
-#: plugins/addons/addressbook/address_info.tpl:67
-#: plugins/addons/addressbook/address_edit.tpl:148 html/getxls.php:174
-#: html/getxls.php:236
-msgid "City"
-msgstr ""
-
-#: plugins/addons/addressbook/address_info.tpl:73
-#: plugins/addons/addressbook/address_edit.tpl:168
-msgid "Country"
-msgstr ""
-
-#: plugins/addons/addressbook/address_edit.tpl:7
-msgid "Choose the department to store entry in"
-msgstr ""
-
-#: plugins/addons/mailqueue/class_mailqueue.inc:6
 #: plugins/addons/mailqueue/main.inc:23
+#: plugins/addons/mailqueue/class_mailqueue.inc:6
 msgid "Mail queue"
 msgstr ""
 
@@ -4463,6 +4505,95 @@ msgstr ""
 msgid "System log view"
 msgstr ""
 
+#: plugins/addons/godfs/class_dfsManagment.inc:16
+#: plugins/addons/godfs/contents.tpl:8
+msgid "DFS Shares"
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsManagment.inc:141
+msgid "No DFS entries found"
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsManagment.inc:182
+msgid "Go up one dfsshare"
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsManagment.inc:183
+msgid "Go to dfs root"
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsManagment.inc:184
+msgid "Create new dfsshare"
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:87
+msgid "You have no premissions to create a dfs share."
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:94
+#: plugins/addons/godfs/class_dfsgeneric.inc:96
+msgid "Dfs share already exists."
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:101
+msgid "Required Field \"Name of dfs Share\" is not set."
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:104
+msgid "Required Field \"Description\" is not set."
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:107
+msgid "Required Field \"Fileserver\" is not set."
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:110
+msgid "Required Field \"Share on fileserver\" is not set."
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:113
+msgid "Required Field \"Location\" is not set."
+msgstr ""
+
+#: plugins/addons/godfs/contents.tpl:26
+msgid ""
+"This menu allows you to create, delete and edit selected dfs shares. Having "
+"a large numbers of dfs shares, you might prefer the range selectors on top "
+"of the dfs share list."
+msgstr ""
+
+#: plugins/addons/godfs/contents.tpl:40
+msgid "Display dfs shares matching"
+msgstr ""
+
+#: plugins/addons/godfs/contents.tpl:44
+msgid "Regular expression for matching dfs share names"
+msgstr ""
+
+#: plugins/addons/godfs/generic.tpl:4
+msgid "DFS Properties"
+msgstr ""
+
+#: plugins/addons/godfs/generic.tpl:8
+msgid "Name of dfs Share"
+msgstr ""
+
+#: plugins/addons/godfs/generic.tpl:16
+msgid "Fileserver"
+msgstr ""
+
+#: plugins/addons/godfs/generic.tpl:20
+msgid "Share on Fileserver"
+msgstr ""
+
+#: plugins/addons/godfs/generic.tpl:30
+msgid "DFS Location"
+msgstr ""
+
+#: plugins/addons/godfs/main.inc:21 plugins/addons/godfs/main.inc:27
+msgid "Distributed Filesystem Administration"
+msgstr ""
+
 #: plugins/admin/fai/class_faiScript.inc:240
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
 #: plugins/admin/fai/class_faiHook.inc:264
@@ -4470,14 +4601,46 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
+#: plugins/admin/fai/faiVariable.tpl:32
+#: plugins/admin/fai/faiPartitionTable.tpl:32
+#: plugins/admin/fai/faiScript.tpl:32 plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/class_faiProfileEntry.inc:155
+#: plugins/admin/fai/faiHook.tpl:32
+msgid "Objects"
+msgstr ""
+
+#: plugins/admin/fai/faiVariable.tpl:34
+msgid "List of assigned variables"
+msgstr ""
+
+#: plugins/admin/fai/faiVariable.tpl:40
+msgid "Choose a variable to delete or edit"
+msgstr ""
+
 #: plugins/admin/fai/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/tabsTemplate.inc:34 plugins/admin/fai/tabsProfile.inc:34
+#: plugins/admin/fai/tabsScript.inc:34
 #: plugins/admin/departments/tabs_department.inc:31
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 
+#: plugins/admin/fai/class_faiPackageEntry.inc:35
+msgid "Please enter your search string here"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackageEntry.inc:48
+msgid ""
+"This list displays all assigned package names for this repository settings."
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackageEntry.inc:124
+#, php-format
+msgid ""
+"Your specified search string '%s' returned too many results. Only the first "
+"200 entries are shown, to keep the memory usage low."
+msgstr ""
+
 #: plugins/admin/fai/class_faiManagement.inc:32
 msgid "FAI"
 msgstr ""
@@ -4486,24 +4649,24 @@ msgstr ""
 msgid "Fully Automatic Installation - management"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:228
+#: plugins/admin/fai/class_faiManagement.inc:227
 #, php-format
 msgid "You're about to delete all information about the FAI class at '%s'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:234
-#: plugins/admin/fai/class_faiManagement.inc:272
+#: plugins/admin/fai/class_faiManagement.inc:233
+#: plugins/admin/fai/class_faiManagement.inc:271
 #: plugins/admin/systems/class_systemManagement.inc:532
 #: plugins/admin/systems/class_systemManagement.inc:603
 msgid "You are not allowed to delete this component!"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:324
+#: plugins/admin/fai/class_faiManagement.inc:323
 #, php-format
 msgid "You're about to delete a fai branch / freeze  '%s'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:327
+#: plugins/admin/fai/class_faiManagement.inc:326
 msgid "You are not allowed to delete this release!"
 msgstr ""
 
@@ -4516,13 +4679,15 @@ msgid "Specified freeze name is invalid."
 msgstr ""
 
 #: plugins/admin/fai/class_faiManagement.inc:391
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:349
 #: plugins/admin/systems/class_servRepository.inc:208
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:349
 msgid "This name is already in use."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:605
+#: plugins/admin/fai/class_faiManagement.inc:444
+#: plugins/admin/fai/class_faiManagement.inc:611
 #: plugins/admin/fai/faiPackageNew.tpl:44 plugins/admin/users/template.tpl:44
+#: plugins/admin/departments/class_departmentGeneric.inc:333
 #: ihtml/themes/altlinux/setup_introduction.tpl:12
 #: ihtml/themes/altlinux/setup_useradmin.tpl:41
 #: ihtml/themes/altlinux/setup_step2.tpl:13
@@ -4531,157 +4696,140 @@ msgstr ""
 #: ihtml/themes/default/setup_useradmin.tpl:41
 #: ihtml/themes/default/setup_step2.tpl:13
 #: ihtml/themes/default/setup_step3.tpl:18
+#: ihtml/themes/lhs/setup_introduction.tpl:12
+#: ihtml/themes/lhs/setup_useradmin.tpl:41 ihtml/themes/lhs/setup_step2.tpl:13
+#: ihtml/themes/lhs/setup_step3.tpl:18
 msgid "Continue"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:641
+#: plugins/admin/fai/class_faiManagement.inc:647
 #: plugins/admin/departments/class_departmentManagement.inc:298
 msgid "Go to users home department"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:646
+#: plugins/admin/fai/class_faiManagement.inc:654
 msgid "New profile"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:646
+#: plugins/admin/fai/class_faiManagement.inc:654
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
 msgid "P"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:651
+#: plugins/admin/fai/class_faiManagement.inc:659
 msgid "New partition table"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:651
+#: plugins/admin/fai/class_faiManagement.inc:659
 msgid "PT"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:654
+#: plugins/admin/fai/class_faiManagement.inc:662
 msgid "New scripts"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:654
+#: plugins/admin/fai/class_faiManagement.inc:662
 msgid "S"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:657
+#: plugins/admin/fai/class_faiManagement.inc:665
 msgid "New hooks"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:657
+#: plugins/admin/fai/class_faiManagement.inc:665
 msgid "H"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:660
+#: plugins/admin/fai/class_faiManagement.inc:668
 msgid "New variables"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:660
+#: plugins/admin/fai/class_faiManagement.inc:668
 msgid "V"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:663
+#: plugins/admin/fai/class_faiManagement.inc:671
 msgid "New templates"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:663
+#: plugins/admin/fai/class_faiManagement.inc:671
 msgid "T"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:666
+#: plugins/admin/fai/class_faiManagement.inc:674
 msgid "New package list"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:666
+#: plugins/admin/fai/class_faiManagement.inc:674
 msgid "PK"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:680
-#: plugins/admin/systems/class_systemManagement.inc:787
+#: plugins/admin/fai/class_faiManagement.inc:688
+#: plugins/admin/systems/class_systemManagement.inc:788
 msgid "This table displays all systems, in the selected tree."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:684
+#: plugins/admin/fai/class_faiManagement.inc:692
 msgid "Name of FAI class"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:685
+#: plugins/admin/fai/class_faiManagement.inc:693
 msgid "Class type"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:689
-#: plugins/admin/fai/class_faiManagement.inc:790
-#: plugins/admin/fai/class_faiManagement.inc:795
+#: plugins/admin/fai/class_faiManagement.inc:697
+#: plugins/admin/fai/class_faiManagement.inc:798
+#: plugins/admin/fai/class_faiManagement.inc:803
 msgid "Edit class"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:690
-#: plugins/admin/fai/class_faiManagement.inc:797
+#: plugins/admin/fai/class_faiManagement.inc:698
+#: plugins/admin/fai/class_faiManagement.inc:805
 msgid "Delete class"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:710
+#: plugins/admin/fai/class_faiManagement.inc:718
 #: plugins/admin/groups/class_groupApplication.inc:521
-#: plugins/admin/departments/class_departmentManagement.inc:334
+#: plugins/admin/departments/class_departmentManagement.inc:335
 msgid "department"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:731
-#: plugins/admin/fai/class_faiManagement.inc:732
+#: plugins/admin/fai/class_faiManagement.inc:739
+#: plugins/admin/fai/class_faiManagement.inc:740
 #: plugins/admin/fai/class_faiProfile.inc:297
 #: plugins/admin/fai/class_faiProfileEntry.inc:124
 msgid "Partition table"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:738
-#: plugins/admin/fai/class_faiManagement.inc:739
+#: plugins/admin/fai/class_faiManagement.inc:746
+#: plugins/admin/fai/class_faiManagement.inc:747
 msgid "Package list"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:745
-#: plugins/admin/fai/class_faiManagement.inc:746
+#: plugins/admin/fai/class_faiManagement.inc:753
+#: plugins/admin/fai/class_faiManagement.inc:754
 msgid "Scripts"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:766
-#: plugins/admin/fai/class_faiManagement.inc:767
+#: plugins/admin/fai/class_faiManagement.inc:774
+#: plugins/admin/fai/class_faiManagement.inc:775
 msgid "Profile"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:35
-msgid "Please enter your search string here"
+#: plugins/admin/fai/main.inc:38 plugins/admin/fai/main.inc:40
+msgid "Fully Automatic Installation"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:48
-msgid ""
-"This list displays all assigned package names for this repository settings."
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+msgid "Package"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:124
-#, php-format
-msgid ""
-"Your specified search string '%s' returned too many results. Only the first "
-"200 entries are shown, to keep the memory usage low."
+#: plugins/admin/fai/faiPartitionTable.tpl:34
+msgid "Discs"
 msgstr ""
 
-#: plugins/admin/fai/main.inc:38 plugins/admin/fai/main.inc:40
-msgid "Fully Automatic Installation"
-msgstr ""
-
-#: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiVariable.tpl:32 plugins/admin/fai/faiScript.tpl:32
-#: plugins/admin/fai/faiTemplate.tpl:29
-#: plugins/admin/fai/class_faiProfileEntry.inc:155
-#: plugins/admin/fai/faiHook.tpl:32
-msgid "Objects"
-msgstr ""
-
-#: plugins/admin/fai/faiPartitionTable.tpl:34
-msgid "Discs"
-msgstr ""
-
-#: plugins/admin/fai/faiPartitionTable.tpl:40
-msgid "Choose a disk to delete or edit"
+#: plugins/admin/fai/faiPartitionTable.tpl:40
+msgid "Choose a disk to delete or edit"
 msgstr ""
 
 #: plugins/admin/fai/faiProfileEntry.tpl:6
@@ -4735,8 +4883,16 @@ msgstr ""
 msgid "Regular expression for matching object names"
 msgstr ""
 
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
-msgid "Package"
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
+msgid "Device"
+msgstr ""
+
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
+msgid "Partition entries"
+msgstr ""
+
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
+msgid "Add partition"
 msgstr ""
 
 #: plugins/admin/fai/class_faiScriptEntry.inc:68
@@ -4760,21 +4916,13 @@ msgstr ""
 msgid "Please enter a script."
 msgstr ""
 
-#: plugins/admin/fai/faiVariable.tpl:34
-msgid "List of assigned variables"
-msgstr ""
-
-#: plugins/admin/fai/faiVariable.tpl:40
-msgid "Choose a variable to delete or edit"
-msgstr ""
-
 #: plugins/admin/fai/faiScriptEntry.tpl:29
-#: plugins/admin/groups/class_groupManagement.inc:524
-#: plugins/admin/users/class_userManagement.inc:819
+#: plugins/admin/groups/class_groupManagement.inc:525
+#: plugins/admin/users/class_userManagement.inc:820
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
-#: plugins/admin/ogroups/class_ogroupManagement.inc:493
+#: plugins/admin/ogroups/class_ogroupManagement.inc:494
 #: plugins/gofon/conference/generic.tpl:4
 msgid "Properties"
 msgstr ""
@@ -4812,8 +4960,8 @@ msgstr ""
 
 #: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:24
 #: plugins/admin/systems/workstationStartup.tpl:39
-#: plugins/admin/systems/servRepositorySetup.tpl:8
 #: plugins/admin/systems/class_servRepository.inc:242
+#: plugins/admin/systems/servRepositorySetup.tpl:8
 msgid "Release"
 msgstr ""
 
@@ -4893,6 +5041,20 @@ msgstr ""
 msgid "FAI classes"
 msgstr ""
 
+#: plugins/admin/fai/remove.tpl:7
+msgid ""
+"This includes 'all' object information. Please double check if your really "
+"want to do this since there is no way for GOsa to get your data back."
+msgstr ""
+
+#: plugins/admin/fai/remove.tpl:11 plugins/admin/departments/remove.tpl:10
+#: plugins/admin/systems/remove.tpl:10 plugins/gofon/conference/remove.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your LDAP tree in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
 msgid "FS type"
 msgstr ""
@@ -4961,18 +5123,6 @@ msgid ""
 "please check your configuration twice."
 msgstr ""
 
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
-msgid "Device"
-msgstr ""
-
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
-msgid "Partition entries"
-msgstr ""
-
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
-msgid "Add partition"
-msgstr ""
-
 #: plugins/admin/fai/faiScript.tpl:34
 msgid "List of scripts"
 msgstr ""
@@ -5026,6 +5176,47 @@ msgstr ""
 msgid "Please specify a value for the attribute 'content'."
 msgstr ""
 
+#: plugins/admin/fai/faiNewBranch.tpl:5
+msgid ""
+"You are now going to create a branch or locked branch. This action clones "
+"the existing release to another release name. Branches can be modified as "
+"usual. FAI classes of locked branches cannot be modified, just additional "
+"classes are possible. Branch names should be alphanumeric, excluding the "
+"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
+"and 'fai'."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:11
+msgid "Please enter a name for the branch"
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:33
+#: plugins/admin/departments/recursive_move.tpl:1
+msgid "Processing the requested operation"
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:34
+msgid ""
+"As soon as the copy operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the fai management "
+"dialog."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:40
+#: plugins/admin/departments/recursive_move.tpl:7
+msgid ""
+"Your browser doesn't support iframes, please use this link to perform the "
+"requested operation."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:42
+msgid "Perform requested operation."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:42
+msgid "Initiate operation"
+msgstr ""
+
 #: plugins/admin/fai/faiVariableEntry.tpl:29
 msgid "Variable attributes"
 msgstr ""
@@ -5052,20 +5243,6 @@ msgid ""
 "currently edited package list."
 msgstr ""
 
-#: plugins/admin/fai/remove.tpl:7
-msgid ""
-"This includes 'all' object information. Please double check if your really "
-"want to do this since there is no way for GOsa to get your data back."
-msgstr ""
-
-#: plugins/admin/fai/remove.tpl:11 plugins/admin/departments/remove.tpl:10
-#: plugins/admin/systems/remove.tpl:10 plugins/gofon/conference/remove.tpl:10
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
 #: plugins/admin/fai/headpage.tpl:6
 msgid "List of FAI classes"
 msgstr ""
@@ -5085,11 +5262,11 @@ msgid "Current release"
 msgstr ""
 
 #: plugins/admin/fai/headpage.tpl:47
-msgid "Create new branch using the current release"
+msgid "Create new branch"
 msgstr ""
 
 #: plugins/admin/fai/headpage.tpl:51
-msgid "Create a locked version of the current release"
+msgid "Create new locked branch"
 msgstr ""
 
 #: plugins/admin/fai/headpage.tpl:56
@@ -5124,6 +5301,18 @@ msgstr ""
 msgid "Show partitions"
 msgstr ""
 
+#: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
+msgid "Hook attributes"
+msgstr ""
+
+#: plugins/admin/fai/faiHookEntry.tpl:34
+msgid "Task"
+msgstr ""
+
+#: plugins/admin/fai/faiHookEntry.tpl:36
+msgid "Choose an existing FAI task"
+msgstr ""
+
 #: plugins/admin/fai/class_faiPartitionTable.inc:263
 #: plugins/admin/fai/class_faiPartitionTable.inc:269
 #, php-format
@@ -5149,18 +5338,6 @@ msgstr ""
 msgid "Class name"
 msgstr ""
 
-#: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
-msgid "Hook attributes"
-msgstr ""
-
-#: plugins/admin/fai/faiHookEntry.tpl:34
-msgid "Task"
-msgstr ""
-
-#: plugins/admin/fai/faiHookEntry.tpl:36
-msgid "Choose an existing FAI task"
-msgstr ""
-
 #: plugins/admin/fai/class_faiPackageConfiguration.inc:45
 #, php-format
 msgid "Debconf information for package '%s'"
@@ -5234,13 +5411,13 @@ msgid "Choose class name"
 msgstr ""
 
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
+#: plugins/admin/systems/glpiDeviceManagement.tpl:51
 #: plugins/admin/systems/class_glpiSelectUser.inc:113
 #: plugins/admin/systems/class_glpiSelectUser.inc:140
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:51
 #: plugins/admin/systems/glpiAttachmentPool.tpl:51
-#: plugins/admin/systems/glpiDeviceManagement.tpl:51
 #: plugins/admin/systems/SelectDeviceType.tpl:44
-#: plugins/admin/systems/class_baseSelectDialog.inc:39
+#: plugins/admin/systems/class_baseSelectDialog.inc:40
 msgid "Use"
 msgstr ""
 
@@ -5248,6 +5425,13 @@ msgstr ""
 msgid "A new class name."
 msgstr ""
 
+#: plugins/admin/fai/remove_branch.tpl:6
+msgid ""
+"This includes all account data, system access, etc. for this branch. Please "
+"double check if your really want to do this since there is no way for GOsa "
+"to get your data back."
+msgstr ""
+
 #: plugins/admin/fai/class_faiTemplateEntry.inc:81
 msgid "no file uploaded yet"
 msgstr ""
@@ -5296,8 +5480,8 @@ msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:40
 #: plugins/admin/applications/generic.tpl:95
-#: plugins/admin/systems/printerPPDDialog.tpl:11
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
+#: plugins/admin/systems/printerPPDDialog.tpl:11
 msgid "Upload"
 msgstr ""
 
@@ -5306,7 +5490,7 @@ msgid "Destination path"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
 msgid "Owner"
 msgstr ""
 
@@ -5314,7 +5498,7 @@ msgstr ""
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
 #: plugins/admin/systems/class_printGeneric.inc:672
 #: plugins/admin/systems/class_printGeneric.inc:674
-#: plugins/admin/ogroups/class_ogroupManagement.inc:583
+#: plugins/admin/ogroups/class_ogroupManagement.inc:584
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr ""
@@ -5372,52 +5556,70 @@ msgstr ""
 msgid "Choose a hook to delete or edit"
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:5
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
+#: plugins/admin/groups/class_groupGeneric.inc:122
+msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:11
-msgid "Please enter a name for the branch"
+#: plugins/admin/groups/class_groupGeneric.inc:179
+msgid "This 'dn' is no group."
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:33
-#: plugins/admin/departments/recursive_moce.tpl:1
-msgid ""
-"Processing requested operation, the status of this operation will be "
-"displayed in an iframe below."
+#: plugins/admin/groups/class_groupGeneric.inc:329
+msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:34
-msgid ""
-"As soon as the operation has finished, you can scroll down to end of the "
-"page and press the 'Back' button to return to the fai management dialog."
+#: plugins/admin/groups/class_groupGeneric.inc:329
+msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:42
+#: plugins/admin/groups/class_groupGeneric.inc:329
+msgid "Domain users"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:330
+msgid "Domain guests"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:335
+#, php-format
+msgid "Special group (%d)"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:445
+#, php-format
 msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
+"Your search method returned more than '%s' users, only '%s' users are shown."
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:44
-msgid "Perform requested operation."
+#: plugins/admin/groups/class_groupGeneric.inc:462
+msgid "! unknown id"
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:44
-msgid "Initiate operation"
+#: plugins/admin/groups/class_groupGeneric.inc:598
+#, php-format
+msgid "No configured SID found for '%s'."
 msgstr ""
 
-#: plugins/admin/fai/remove_branch.tpl:6
+#: plugins/admin/groups/class_groupGeneric.inc:603
+#, php-format
+msgid "No configured RIDBASE found for '%s'."
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:716
+#: plugins/admin/ogroups/class_ogroup.inc:655
+msgid "You have no permissions to create a group on this 'Base'."
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:726
 msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for GOsa "
-"to get your data back."
+"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:738
+#: plugins/admin/groups/class_groupGeneric.inc:752
+#: plugins/admin/groups/class_groupGeneric.inc:759
+msgid "Value specified as 'Name' is already used."
 msgstr ""
 
 #: plugins/admin/groups/mail.tpl:11 plugins/admin/groups/paste_mail.tpl:12
@@ -5444,178 +5646,167 @@ msgstr ""
 msgid "Forward messages to non group members"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:55 html/getxls.php:97
-#: html/getxls.php:99 html/getxls.php:244
-msgid "Groups"
+#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:357
-#, php-format
-msgid "You're about to delete the group '%s'."
+#: plugins/admin/groups/headpage.tpl:25
+msgid ""
+"This menu allows you to add, edit and remove selected groups. You may want "
+"to use the range selector on top of the group listbox, when working with a "
+"large number of groups."
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:363
-#: plugins/admin/groups/class_groupManagement.inc:389
-msgid "You are not allowed to delete this group!"
+#: plugins/admin/groups/headpage.tpl:41
+msgid "Select to see groups that are primary groups of users"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:441
-#: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/applications/class_applicationManagement.inc:460
-#: plugins/admin/ogroups/class_ogroupManagement.inc:431
-msgid "Paste"
+#: plugins/admin/groups/headpage.tpl:42
+msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:443
-#: plugins/admin/users/class_userManagement.inc:769
-#: plugins/admin/applications/class_applicationManagement.inc:462
-#: plugins/admin/ogroups/class_ogroupManagement.inc:433
-msgid "Can't paste"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:455
-msgid "Create new group"
+#: plugins/admin/groups/headpage.tpl:46
+msgid "Select to see groups that have samba groups mappings"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:465
-#: plugins/admin/users/class_userManagement.inc:795
-#: plugins/admin/applications/class_applicationManagement.inc:485
-#: plugins/admin/ogroups/class_ogroupManagement.inc:460
-msgid "cut"
+#: plugins/admin/groups/headpage.tpl:47
+msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:465
-#: plugins/admin/users/class_userManagement.inc:795
-#: plugins/admin/applications/class_applicationManagement.inc:485
-#: plugins/admin/ogroups/class_ogroupManagement.inc:460
-msgid "Cut this entry"
+#: plugins/admin/groups/headpage.tpl:50
+msgid "Select to see groups that have applications configured"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:797
-#: plugins/admin/applications/class_applicationManagement.inc:487
-#: plugins/admin/ogroups/class_ogroupManagement.inc:462
-msgid "copy"
+#: plugins/admin/groups/headpage.tpl:51
+msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:797
-#: plugins/admin/applications/class_applicationManagement.inc:487
-#: plugins/admin/ogroups/class_ogroupManagement.inc:462
-msgid "Copy this entry"
+#: plugins/admin/groups/headpage.tpl:54
+msgid "Select to see groups that have mail settings"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:469
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/applications/class_applicationManagement.inc:489
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/departments/class_departmentManagement.inc:310
-#: plugins/admin/ogroups/class_ogroupManagement.inc:464
-#: plugins/admin/ogroups/class_ogroupManagement.inc:469
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
-msgid "Edit this entry"
+#: plugins/admin/groups/headpage.tpl:55
+msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:471
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/applications/class_applicationManagement.inc:491
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/departments/class_departmentManagement.inc:311
-#: plugins/admin/ogroups/class_ogroupManagement.inc:466
-#: plugins/admin/ogroups/class_ogroupManagement.inc:471
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
-msgid "Delete this entry"
+#: plugins/admin/groups/headpage.tpl:58
+msgid "Select to see normal groups that have only functional aspects"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:499
-#: plugins/admin/users/class_userManagement.inc:856
-msgid "Posix"
+#: plugins/admin/groups/headpage.tpl:59
+msgid "Show functional groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:508
-#: plugins/admin/applications/class_applicationManagement.inc:509
-#: plugins/admin/ogroups/class_ogroupManagement.inc:584
-#: plugins/gofon/fonreports/contents.tpl:34
-#: plugins/generic/references/class_reference.inc:42
-msgid "Application"
+#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
+msgid "Group administration"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:523
-msgid "Groupname"
+#: plugins/admin/groups/class_groupManagement.inc:25
+#: plugins/admin/ogroups/class_ogroupManagement.inc:55 html/getxls.php:97
+#: html/getxls.php:99 html/getxls.php:244
+msgid "Groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:528
-#: plugins/admin/applications/class_applicationManagement.inc:523
-#: plugins/admin/ogroups/class_ogroupManagement.inc:498
-msgid "This table displays all groups, in the selected tree."
+#: plugins/admin/groups/class_groupManagement.inc:357
+#, php-format
+msgid "You're about to delete the group '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:122
-msgid "Can't find this groups SID in LDAP or in your configuration file!"
+#: plugins/admin/groups/class_groupManagement.inc:363
+#: plugins/admin/groups/class_groupManagement.inc:389
+msgid "You are not allowed to delete this group!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:179
-msgid "This 'dn' is no group."
+#: plugins/admin/groups/class_groupManagement.inc:441
+#: plugins/admin/users/class_userManagement.inc:767
+#: plugins/admin/applications/class_applicationManagement.inc:462
+#: plugins/admin/ogroups/class_ogroupManagement.inc:431
+msgid "Paste"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:329
-msgid "Samba group"
+#: plugins/admin/groups/class_groupManagement.inc:443
+#: plugins/admin/users/class_userManagement.inc:769
+#: plugins/admin/applications/class_applicationManagement.inc:464
+#: plugins/admin/ogroups/class_ogroupManagement.inc:433
+msgid "Can't paste"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:329
-msgid "Domain admins"
+#: plugins/admin/groups/class_groupManagement.inc:456
+msgid "Create new group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:329
-msgid "Domain users"
+#: plugins/admin/groups/class_groupManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/applications/class_applicationManagement.inc:488
+#: plugins/admin/ogroups/class_ogroupManagement.inc:461
+msgid "cut"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:330
-msgid "Domain guests"
+#: plugins/admin/groups/class_groupManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/applications/class_applicationManagement.inc:488
+#: plugins/admin/ogroups/class_ogroupManagement.inc:461
+msgid "Cut this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:335
-#, php-format
-msgid "Special group (%d)"
+#: plugins/admin/groups/class_groupManagement.inc:468
+#: plugins/admin/users/class_userManagement.inc:798
+#: plugins/admin/applications/class_applicationManagement.inc:490
+#: plugins/admin/ogroups/class_ogroupManagement.inc:463
+msgid "copy"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:445
-#, php-format
-msgid ""
-"Your search method returned more than '%s' users, only '%s' users are shown."
+#: plugins/admin/groups/class_groupManagement.inc:468
+#: plugins/admin/users/class_userManagement.inc:798
+#: plugins/admin/applications/class_applicationManagement.inc:490
+#: plugins/admin/ogroups/class_ogroupManagement.inc:463
+msgid "Copy this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:462
-msgid "! unknown id"
+#: plugins/admin/groups/class_groupManagement.inc:470
+#: plugins/admin/groups/class_groupManagement.inc:475
+#: plugins/admin/applications/class_applicationManagement.inc:492
+#: plugins/admin/applications/class_applicationManagement.inc:498
+#: plugins/admin/departments/class_departmentManagement.inc:311
+#: plugins/admin/ogroups/class_ogroupManagement.inc:465
+#: plugins/admin/ogroups/class_ogroupManagement.inc:470
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
+msgid "Edit this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:598
-#, php-format
-msgid "No configured SID found for '%s'."
+#: plugins/admin/groups/class_groupManagement.inc:472
+#: plugins/admin/groups/class_groupManagement.inc:477
+#: plugins/admin/applications/class_applicationManagement.inc:494
+#: plugins/admin/applications/class_applicationManagement.inc:500
+#: plugins/admin/departments/class_departmentManagement.inc:312
+#: plugins/admin/ogroups/class_ogroupManagement.inc:467
+#: plugins/admin/ogroups/class_ogroupManagement.inc:472
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
+msgid "Delete this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:603
-#, php-format
-msgid "No configured RIDBASE found for '%s'."
+#: plugins/admin/groups/class_groupManagement.inc:500
+#: plugins/admin/users/class_userManagement.inc:857
+msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:716
-#: plugins/admin/ogroups/class_ogroup.inc:655
-msgid "You have no permissions to create a group on this 'Base'."
+#: plugins/admin/groups/class_groupManagement.inc:509
+#: plugins/admin/applications/class_applicationManagement.inc:512
+#: plugins/admin/ogroups/class_ogroupManagement.inc:585
+#: plugins/gofon/fonreports/contents.tpl:34
+#: plugins/generic/references/class_reference.inc:42
+msgid "Application"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:726
-msgid ""
-"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
+#: plugins/admin/groups/class_groupManagement.inc:524
+msgid "Groupname"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:738
-#: plugins/admin/groups/class_groupGeneric.inc:752
-#: plugins/admin/groups/class_groupGeneric.inc:759
-msgid "Value specified as 'Name' is already used."
+#: plugins/admin/groups/class_groupManagement.inc:529
+#: plugins/admin/applications/class_applicationManagement.inc:526
+#: plugins/admin/ogroups/class_ogroupManagement.inc:499
+msgid "This table displays all groups, in the selected tree."
 msgstr ""
 
 #: plugins/admin/groups/remove.tpl:6
@@ -5624,59 +5815,8 @@ msgid ""
 "do this since there is no way for GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
-msgid "Group administration"
-msgstr ""
-
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
-msgid "List of groups"
-msgstr ""
-
-#: plugins/admin/groups/headpage.tpl:25
-msgid ""
-"This menu allows you to add, edit and remove selected groups. You may want "
-"to use the range selector on top of the group listbox, when working with a "
-"large number of groups."
-msgstr ""
-
-#: plugins/admin/groups/headpage.tpl:41
-msgid "Select to see groups that are primary groups of users"
-msgstr ""
-
-#: plugins/admin/groups/headpage.tpl:42
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/headpage.tpl:46
-msgid "Select to see groups that have samba groups mappings"
-msgstr ""
-
-#: plugins/admin/groups/headpage.tpl:47
-msgid "Show samba groups"
-msgstr ""
-
-#: plugins/admin/groups/headpage.tpl:50
-msgid "Select to see groups that have applications configured"
-msgstr ""
-
-#: plugins/admin/groups/headpage.tpl:51
-msgid "Show application groups"
-msgstr ""
-
-#: plugins/admin/groups/headpage.tpl:54
-msgid "Select to see groups that have mail settings"
-msgstr ""
-
-#: plugins/admin/groups/headpage.tpl:55
-msgid "Show mail groups"
-msgstr ""
-
-#: plugins/admin/groups/headpage.tpl:58
-msgid "Select to see normal groups that have only functional aspects"
-msgstr ""
-
-#: plugins/admin/groups/headpage.tpl:59
-msgid "Show functional groups"
+#: plugins/admin/groups/application_options.tpl:1
+msgid "Application options"
 msgstr ""
 
 #: plugins/admin/groups/class_groupMail.inc:278
@@ -5725,6 +5865,8 @@ msgid "Please select a valid mail server."
 msgstr ""
 
 #: plugins/admin/groups/acl.tpl:4
+#: plugins/admin/departments/class_departmentGeneric.inc:314
+#: include/class_ldap.inc:412
 msgid "Object"
 msgstr ""
 
@@ -5842,8 +5984,8 @@ msgstr ""
 msgid "Select a specific department"
 msgstr ""
 
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
+#: plugins/admin/groups/paste_generic.tpl:1
+msgid "Group settings"
 msgstr ""
 
 #: plugins/admin/groups/mail_locals.tpl:32
@@ -5917,10 +6059,6 @@ msgstr ""
 msgid "Insert seperator"
 msgstr ""
 
-#: plugins/admin/groups/paste_generic.tpl:1
-msgid "Group settings"
-msgstr ""
-
 #: plugins/admin/users/password.tpl:2
 msgid ""
 "To change the user password use the fields below. The changes take effect "
@@ -5928,10 +6066,31 @@ msgid ""
 "able to login without it."
 msgstr ""
 
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr ""
+
+#: plugins/admin/users/template.tpl:6
+msgid ""
+"Creating a new user can be assisted by using templates. Many database "
+"records will be filled automatically. Choose 'none' to skip the usage of "
+"templates."
+msgstr ""
+
+#: plugins/admin/users/template.tpl:11
+#: plugins/admin/users/class_userManagement.inc:1181
+#: plugins/admin/systems/class_systemManagement.inc:918
+msgid "Template"
+msgstr ""
+
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
+msgstr ""
+
 #: plugins/admin/users/class_userManagement.inc:25
-#: plugins/admin/systems/printer.tpl:66
-#: plugins/admin/systems/class_glpiSelectUser.inc:112 html/getxls.php:68
-#: html/getxls.php:70 html/getxls.php:243
+#: plugins/admin/systems/class_glpiSelectUser.inc:112
+#: plugins/admin/systems/printer.tpl:66 html/getxls.php:68 html/getxls.php:70
+#: html/getxls.php:243
 msgid "Users"
 msgstr ""
 
@@ -5961,94 +6120,89 @@ msgstr ""
 msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:782
+#: plugins/admin/users/class_userManagement.inc:783
 msgid "Create new user"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:782
+#: plugins/admin/users/class_userManagement.inc:783
 msgid "New user"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:784
 msgid "Create new template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:784
 msgid "New template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:800
-#: plugins/admin/users/class_userManagement.inc:807
+#: plugins/admin/users/class_userManagement.inc:801
+#: plugins/admin/users/class_userManagement.inc:808
 msgid "password"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:818
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
+#: plugins/admin/users/class_userManagement.inc:819
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
-#: ihtml/themes/default/setup_useradmin.tpl:22
+#: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/default/login.tpl:28 ihtml/themes/default/login.tpl:32
+#: ihtml/themes/default/setup_useradmin.tpl:22 ihtml/themes/lhs/login.tpl:28
+#: ihtml/themes/lhs/login.tpl:32 ihtml/themes/lhs/setup_useradmin.tpl:22
 msgid "Username"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:823
+#: plugins/admin/users/class_userManagement.inc:824
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:854
+#: plugins/admin/users/class_userManagement.inc:855
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:855
+#: plugins/admin/users/class_userManagement.inc:856
 msgid "Edit generic properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:857
+#: plugins/admin/users/class_userManagement.inc:858
 msgid "Edit UNIX properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:859
+#: plugins/admin/users/class_userManagement.inc:860
 msgid "Edit environment properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:861
+#: plugins/admin/users/class_userManagement.inc:862
 msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:863
+#: plugins/admin/users/class_userManagement.inc:864
 msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:865
+#: plugins/admin/users/class_userManagement.inc:866
 msgid "Edit fax properies"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:867
+#: plugins/admin/users/class_userManagement.inc:868
 msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:868
+#: plugins/admin/users/class_userManagement.inc:869
 msgid "Create user from template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:869
+#: plugins/admin/users/class_userManagement.inc:870
 msgid "Create user with this template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:928
+#: plugins/admin/users/class_userManagement.inc:929
 msgid "Online"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:935
+#: plugins/admin/users/class_userManagement.inc:936
 msgid "Offline"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:1180
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/systems/class_systemManagement.inc:917
-msgid "Template"
-msgstr ""
-
 #: plugins/admin/users/remove.tpl:6
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -6112,75 +6266,25 @@ msgstr ""
 msgid "Show proxy users"
 msgstr ""
 
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
+#: plugins/admin/applications/generic.tpl:7
+#: plugins/admin/applications/generic.tpl:8
+#: plugins/admin/applications/class_applicationManagement.inc:521
+#: plugins/admin/applications/class_applicationGeneric.inc:379
+msgid "Application name"
 msgstr ""
 
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
+#: plugins/admin/applications/generic.tpl:11
+#: plugins/gofon/macro/generic.tpl:10 html/getxls.php:174 html/getxls.php:236
+msgid "Display name"
 msgstr ""
 
-#: plugins/admin/users/template.tpl:6
-msgid ""
-"Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose 'none' to skip the usage of "
-"templates."
+#: plugins/admin/applications/generic.tpl:13
+#: plugins/admin/applications/class_applicationGeneric.inc:384
+msgid "Application name to be displayed (i.e. below icons)"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:52
-msgid "Remove options"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:53
-msgid "This application has options. You can disable them by clicking below."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:55
-msgid "Create options"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:56
-msgid ""
-"This application has options disabled. You can enable them by clicking below."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:93
-msgid "Variable"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:93
-#: plugins/gofon/macro/parameter.tpl:9
-msgid "Default value"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:104
-msgid "Add option"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:158
-#, php-format
-msgid "Value '%s' specified as option name is not valid."
-msgstr ""
-
-#: plugins/admin/applications/generic.tpl:7
-#: plugins/admin/applications/generic.tpl:8
-#: plugins/admin/applications/class_applicationGeneric.inc:379
-#: plugins/admin/applications/class_applicationManagement.inc:518
-msgid "Application name"
-msgstr ""
-
-#: plugins/admin/applications/generic.tpl:11
-#: plugins/gofon/macro/generic.tpl:10 html/getxls.php:174 html/getxls.php:236
-msgid "Display name"
-msgstr ""
-
-#: plugins/admin/applications/generic.tpl:13
-#: plugins/admin/applications/class_applicationGeneric.inc:384
-msgid "Application name to be displayed (i.e. below icons)"
-msgstr ""
-
-#: plugins/admin/applications/generic.tpl:19
-msgid "Path and/or binary name of application"
+#: plugins/admin/applications/generic.tpl:19
+msgid "Path and/or binary name of application"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:34
@@ -6219,6 +6323,41 @@ msgstr ""
 msgid "Place entry in members launch bar"
 msgstr ""
 
+#: plugins/admin/applications/class_applicationParameters.inc:52
+msgid "Remove options"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:53
+msgid "This application has options. You can disable them by clicking below."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:55
+msgid "Create options"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:56
+msgid ""
+"This application has options disabled. You can enable them by clicking below."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:93
+msgid "Variable"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:93
+#: plugins/gofon/macro/parameter.tpl:9
+msgid "Default value"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:104
+msgid "Add option"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:158
+#, php-format
+msgid "Value '%s' specified as option name is not valid."
+msgstr ""
+
 #: plugins/admin/applications/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -6249,6 +6388,25 @@ msgstr ""
 msgid "Application management"
 msgstr ""
 
+#: plugins/admin/applications/class_applicationManagement.inc:376
+#, php-format
+msgid "You're about to delete the application '%s'."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationManagement.inc:382
+#: plugins/admin/applications/class_applicationManagement.inc:408
+msgid "You are not allowed to delete this application!"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationManagement.inc:477
+#: plugins/admin/ogroups/class_ogroupManagement.inc:449
+msgid "new"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationManagement.inc:477
+msgid "Create new application"
+msgstr ""
+
 #: plugins/admin/applications/class_applicationGeneric.inc:87
 msgid "no example"
 msgstr ""
@@ -6285,25 +6443,6 @@ msgstr ""
 msgid "Application settings"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:374
-#, php-format
-msgid "You're about to delete the application '%s'."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationManagement.inc:380
-#: plugins/admin/applications/class_applicationManagement.inc:406
-msgid "You are not allowed to delete this application!"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationManagement.inc:474
-#: plugins/admin/ogroups/class_ogroupManagement.inc:448
-msgid "new"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationManagement.inc:474
-msgid "Create new application"
-msgstr ""
-
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr ""
@@ -6381,45 +6520,10 @@ msgstr ""
 msgid "Department management"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:185
-msgid "You have no permissions to create a department on this 'Base'."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:192
-#: plugins/admin/departments/class_departmentGeneric.inc:194
-msgid "Department with that 'Name' already exists."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:202
-msgid "Required field 'Description' is not set."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:207
-msgid "The field 'Name' contains the reserved word 'incoming'."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:208
-msgid " Please choose another name."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:274
-#, php-format
-msgid "Moving %s in %s"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:313
-#, php-format
-msgid "FAILED to copy %s, aborting operation"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:321
-msgid "Complete"
-msgstr ""
-
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
 #: plugins/admin/ogroups/class_ogroupManagement.inc:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:492
+#: plugins/admin/ogroups/class_ogroupManagement.inc:493
 msgid "Departments"
 msgstr ""
 
@@ -6434,67 +6538,100 @@ msgstr ""
 msgid "You have no permission to remove this department."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:300
+#: plugins/admin/departments/class_departmentManagement.inc:301
 msgid "Create new department"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:308
+#: plugins/admin/departments/class_departmentManagement.inc:309
 msgid "This table displays all departments, in the selected tree."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:317
+#: plugins/admin/departments/class_departmentManagement.inc:318
 msgid "Department name"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:411
+#: plugins/admin/departments/class_departmentManagement.inc:412
 msgid ".."
 msgstr ""
 
-#: plugins/admin/departments/recursive_moce.tpl:3
+#: plugins/admin/departments/class_departmentGeneric.inc:185
+msgid "You have no permissions to create a department on this 'Base'."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:192
+#: plugins/admin/departments/class_departmentGeneric.inc:194
+msgid "Department with that 'Name' already exists."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:202
+msgid "Required field 'Description' is not set."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:207
+msgid "The field 'Name' contains the reserved word 'incoming'."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:208
+msgid " Please choose another name."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:278
+#, php-format
+msgid "Moving %s to %s"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:317
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
+msgstr ""
+
+#: plugins/admin/departments/recursive_move.tpl:2
 msgid ""
-"Your browser isn't able to display this iframe ... use the link below intead"
+"As soon as the move operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the department "
+"management dialog."
 msgstr ""
 
 #: plugins/admin/systems/class_terminalInfo.inc:54
-#: plugins/admin/systems/class_terminalInfo.inc:199
+#: plugins/admin/systems/class_terminalInfo.inc:200
 msgid "present"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_terminalService.inc:158
-#: plugins/admin/systems/class_terminalStartup.inc:99
+#: plugins/admin/systems/class_terminalInfo.inc:68
 #: plugins/admin/systems/class_workstationService.inc:151
 #: plugins/admin/systems/class_workstationStartup.inc:372
+#: plugins/admin/systems/class_terminalService.inc:158
+#: plugins/admin/systems/class_terminalStartup.inc:99
 #: plugins/admin/systems/class_terminalGeneric.inc:153
 msgid "This 'dn' has no terminal features."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:74
+#: plugins/admin/systems/class_terminalInfo.inc:75
 msgid "There is no php snmp module installed, can't gather any informations."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:80
-#: plugins/admin/systems/class_terminalInfo.inc:174
+#: plugins/admin/systems/class_terminalInfo.inc:81
+#: plugins/admin/systems/class_terminalInfo.inc:175
 msgid "unknown status"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:89
+#: plugins/admin/systems/class_terminalInfo.inc:90
 msgid "This is a virtual terminal which has no properties to show here."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:107
+#: plugins/admin/systems/class_terminalInfo.inc:108
 msgid "online"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:163
+#: plugins/admin/systems/class_terminalInfo.inc:164
 msgid "running"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:166
+#: plugins/admin/systems/class_terminalInfo.inc:167
 msgid "not running"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:191
+#: plugins/admin/systems/class_terminalInfo.inc:192
 msgid "offline"
 msgstr ""
 
@@ -6525,8 +6662,8 @@ msgid "Zone"
 msgstr ""
 
 #: plugins/admin/systems/network.tpl:42
-#: plugins/admin/systems/class_servDNS.inc:298
 #: plugins/admin/systems/servdnseditzone.tpl:81
+#: plugins/admin/systems/class_servDNS.inc:298
 msgid "TTL"
 msgstr ""
 
@@ -6534,424 +6671,433 @@ msgstr ""
 msgid "Dns records"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:73
-#: plugins/admin/systems/class_componentGeneric.inc:50
-msgid "This 'dn' has no network features."
+#: plugins/admin/systems/workstationService.tpl:4
+#: plugins/admin/systems/terminalService.tpl:4
+msgid "Keyboard"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:162
-#: plugins/admin/systems/class_componentGeneric.inc:145
-msgid "You have no permissions to create a component on this 'Base'."
+#: plugins/admin/systems/workstationService.tpl:7
+#: plugins/admin/systems/terminalService.tpl:7
+#: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/printerPPDDialog.tpl:5
+msgid "Model"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:172
-#: plugins/admin/systems/class_phoneGeneric.inc:314
-#: plugins/admin/systems/class_terminalGeneric.inc:286
-#: plugins/admin/systems/class_servGeneric.inc:209
-#: plugins/admin/systems/class_workstationGeneric.inc:245
-#: plugins/admin/systems/class_printGeneric.inc:529
-#: plugins/admin/systems/class_componentGeneric.inc:155
-#, php-format
-msgid "There is already an entry '%s' in the base choosen by you"
+#: plugins/admin/systems/workstationService.tpl:9
+#: plugins/admin/systems/terminalService.tpl:9
+msgid "Choose keyboard model"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:1
-msgid "System information"
+#: plugins/admin/systems/workstationService.tpl:15
+#: plugins/admin/systems/terminalService.tpl:15
+msgid "Layout"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:7
-msgid "CPU"
+#: plugins/admin/systems/workstationService.tpl:17
+#: plugins/admin/systems/terminalService.tpl:17
+msgid "Choose keyboard layout"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:10
-msgid "Memory"
+#: plugins/admin/systems/workstationService.tpl:23
+#: plugins/admin/systems/terminalService.tpl:23
+msgid "Variant"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:13
-msgid "Boot MAC"
+#: plugins/admin/systems/workstationService.tpl:25
+#: plugins/admin/systems/terminalService.tpl:25
+msgid "Choose keyboard variant"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:16
-msgid "USB support"
+#: plugins/admin/systems/workstationService.tpl:39
+#: plugins/admin/systems/terminalService.tpl:39
+msgid "Mouse"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:19 plugins/admin/systems/info.tpl:87
-msgid "System status"
+#: plugins/admin/systems/workstationService.tpl:44
+#: plugins/admin/systems/terminalService.tpl:44
+msgid "Choose mouse type"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:23
-msgid "Inventory number"
+#: plugins/admin/systems/workstationService.tpl:50
+#: plugins/admin/systems/terminalService.tpl:50
+msgid "Port"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:27
-msgid "Last login"
+#: plugins/admin/systems/workstationService.tpl:52
+#: plugins/admin/systems/terminalService.tpl:52
+msgid "Choose mouse port"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:38
-msgid "Network devices"
+#: plugins/admin/systems/workstationService.tpl:66
+#: plugins/admin/systems/terminalService.tpl:66
+#: plugins/gofon/phoneaccount/generic.tpl:24
+#: plugins/gofon/phoneaccount/paste_generic.tpl:23
+msgid "Telephone hardware"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:47
-msgid "IDE devices"
-msgstr ""
-
-#: plugins/admin/systems/info.tpl:56
-msgid "SCSI devices"
-msgstr ""
-
-#: plugins/admin/systems/info.tpl:64
-msgid "Floppy device"
-msgstr ""
-
-#: plugins/admin/systems/info.tpl:68
-msgid "CDROM device"
+#: 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:25
+msgid "Telephone"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:73
 #: plugins/admin/systems/workstationService.tpl:83
+#: plugins/admin/systems/info.tpl:73
 #: plugins/admin/systems/terminalService.tpl:83
 msgid "Graphic device"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:77
-msgid "Audio device"
-msgstr ""
-
-#: plugins/admin/systems/info.tpl:93
-msgid "Up since"
+#: plugins/admin/systems/workstationService.tpl:86
+#: plugins/admin/systems/terminalService.tpl:86
+#: plugins/admin/systems/printer.tpl:46
+msgid "Driver"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:96
-msgid "CPU load"
+#: plugins/admin/systems/workstationService.tpl:88
+#: plugins/admin/systems/terminalService.tpl:88
+msgid "Choose graphic driver that is needed by the installed graphic board"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:99
-msgid "Memory usage"
+#: plugins/admin/systems/workstationService.tpl:96
+#: plugins/admin/systems/terminalService.tpl:96
+msgid "Choose screen resolution used in graphic mode"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:102
-msgid "Swap usage"
+#: plugins/admin/systems/workstationService.tpl:102
+#: plugins/admin/systems/terminalService.tpl:102
+msgid "Color depth"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:116
-msgid "SSH service"
+#: plugins/admin/systems/workstationService.tpl:104
+#: plugins/admin/systems/terminalService.tpl:104
+msgid "Choose colordepth used in graphic mode"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:119
-msgid "Print service"
+#: plugins/admin/systems/workstationService.tpl:117
+#: plugins/admin/systems/terminalService.tpl:117
+msgid "Display device"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:122
-msgid "Scan service"
+#: plugins/admin/systems/workstationService.tpl:121
+msgid "unknown"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:125
-msgid "Sound service"
+#: plugins/admin/systems/workstationService.tpl:126
+msgid "Automatic modelines"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:128
-msgid "GUI"
+#: plugins/admin/systems/workstationService.tpl:130
+#: plugins/admin/systems/terminalService.tpl:124
+msgid "HSync"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_workstationService.inc:89
-msgid "default"
+#: plugins/admin/systems/workstationService.tpl:132
+#: plugins/admin/systems/terminalService.tpl:126
+msgid "Horizontal refresh frequency for installed monitor"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_workstationService.inc:90
-msgid "show chooser"
+#: plugins/admin/systems/workstationService.tpl:135
+#: plugins/admin/systems/terminalService.tpl:129
+msgid "VSync"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:91
-msgid "direct"
+#: plugins/admin/systems/workstationService.tpl:137
+#: plugins/admin/systems/terminalService.tpl:131
+msgid "Vertical refresh frequency for installed monitor"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:107
-#: plugins/admin/systems/class_workstationService.inc:94
-msgid "load balanced"
+#: plugins/admin/systems/workstationService.tpl:149
+#: plugins/admin/systems/terminalService.tpl:203
+msgid "Scan device"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:110
-#: plugins/admin/systems/class_workstationService.inc:97
-msgid "Windows RDP"
+#: plugins/admin/systems/workstationService.tpl:150
+#: plugins/admin/systems/terminalService.tpl:204
+msgid "Select to start SANE scan service on terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:111
-#: plugins/admin/systems/class_workstationService.inc:98
-msgid "ICA client"
+#: plugins/admin/systems/workstationService.tpl:151
+#: plugins/admin/systems/terminalService.tpl:205
+msgid "Provide scan services"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:209
-#: plugins/admin/systems/class_workstationService.inc:201
-msgid "Choose the phone located at the current terminal"
+#: plugins/admin/systems/info.tpl:1
+msgid "System information"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:270
-#: plugins/admin/systems/class_terminalService.inc:275
-#: plugins/admin/systems/class_workstationService.inc:263
-#: plugins/admin/systems/class_workstationService.inc:268
-msgid "Please specify a valid VSync range."
+#: plugins/admin/systems/info.tpl:7
+msgid "CPU"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:285
-#: plugins/admin/systems/class_terminalService.inc:290
-#: plugins/admin/systems/class_workstationService.inc:278
-#: plugins/admin/systems/class_workstationService.inc:283
-msgid "Please specify a valid HSync range."
+#: plugins/admin/systems/info.tpl:10
+msgid "Memory"
 msgstr ""
 
-#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
-msgid "System management"
+#: plugins/admin/systems/info.tpl:13
+msgid "Boot MAC"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:272
-msgid "Terminal server, must have fontpath specified."
+#: plugins/admin/systems/info.tpl:16
+msgid "USB support"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
+#: plugins/admin/systems/info.tpl:19 plugins/admin/systems/info.tpl:87
+msgid "System status"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
+#: plugins/admin/systems/info.tpl:23
+msgid "Inventory number"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
+#: plugins/admin/systems/info.tpl:27
+msgid "Last login"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
+#: plugins/admin/systems/info.tpl:38
+msgid "Network devices"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
+#: plugins/admin/systems/info.tpl:47
+msgid "IDE devices"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
+#: plugins/admin/systems/info.tpl:56
+msgid "SCSI devices"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:101
-msgid "Print Service"
+#: plugins/admin/systems/info.tpl:64
+msgid "Floppy device"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:109
-msgid "Mail server"
+#: plugins/admin/systems/info.tpl:68
+msgid "CDROM device"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:1
-msgid "Choose the kind of system component you want to create"
+#: plugins/admin/systems/info.tpl:77
+msgid "Audio device"
 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/info.tpl:93
+msgid "Up since"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:7
-msgid "Linux thin client template"
+#: plugins/admin/systems/info.tpl:96
+msgid "CPU load"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:8
-msgid "Linux workstation template"
+#: plugins/admin/systems/info.tpl:99
+msgid "Memory usage"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:9
-msgid "Linux Server"
+#: plugins/admin/systems/info.tpl:102
+msgid "Swap usage"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:10
-msgid "Windows workstation"
+#: plugins/admin/systems/info.tpl:116
+msgid "SSH service"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:11
-msgid "Network printer"
+#: plugins/admin/systems/info.tpl:119
+msgid "Print service"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:13
-msgid "Other network component"
+#: plugins/admin/systems/info.tpl:122
+msgid "Scan service"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:16
-msgid "Create"
+#: plugins/admin/systems/info.tpl:125
+msgid "Sound service"
 msgstr ""
 
-#: plugins/admin/systems/component.tpl:15 plugins/admin/systems/server.tpl:15
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/terminal.tpl:20
-#: plugins/admin/systems/printer.tpl:22
-#: plugins/admin/systems/workstation.tpl:29
-#: plugins/admin/systems/wingeneric.tpl:15
-msgid "Choose subtree to place terminal in"
+#: plugins/admin/systems/info.tpl:128
+msgid "GUI"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:4
-#: plugins/admin/systems/terminalService.tpl:4
-msgid "Keyboard"
+#: plugins/admin/systems/glpi.tpl:9
+#: plugins/admin/systems/SelectDeviceType.tpl:20
+msgid "System type"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:7
-#: plugins/admin/systems/printerPPDDialog.tpl:5
-#: plugins/admin/systems/terminalService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:210
-msgid "Model"
+#: plugins/admin/systems/glpi.tpl:19
+msgid "Operating system"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:9
-#: plugins/admin/systems/terminalService.tpl:9
-msgid "Choose keyboard model"
+#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
+#: plugins/admin/systems/glpi_devices.tpl:24
+#: plugins/admin/systems/glpi_devices.tpl:123
+#: plugins/admin/systems/glpi_devices.tpl:164
+#: plugins/admin/systems/glpi_devices.tpl:219
+#: plugins/admin/systems/glpi_devices.tpl:275
+#: plugins/admin/systems/glpi_devices.tpl:333
+#: plugins/admin/systems/glpi_devices.tpl:397
+#: plugins/admin/systems/glpi_devices.tpl:469
+#: plugins/admin/systems/glpi_devices.tpl:533
+#: plugins/admin/systems/glpi_devices.tpl:580
+#: plugins/admin/systems/glpi_devices.tpl:633
+#: plugins/admin/systems/glpi_devices.tpl:687
+#: plugins/admin/systems/glpi_devices.tpl:733
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
+msgid "Manufacturer"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:15
-#: plugins/admin/systems/terminalService.tpl:15
-msgid "Layout"
+#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
+msgid "Contacts"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:17
-#: plugins/admin/systems/terminalService.tpl:17
-msgid "Choose keyboard layout"
+#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
+msgid "Contact person"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:23
-#: plugins/admin/systems/terminalService.tpl:23
-msgid "Variant"
+#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
+msgid "Technical responsible"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:25
-#: plugins/admin/systems/terminalService.tpl:25
-msgid "Choose keyboard variant"
+#: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
+#: plugins/admin/systems/glpi_devices.tpl:112
+#: plugins/admin/systems/glpi_devices.tpl:153
+#: plugins/admin/systems/glpi_devices.tpl:208
+#: plugins/admin/systems/glpi_devices.tpl:264
+#: plugins/admin/systems/glpi_devices.tpl:322
+#: plugins/admin/systems/glpi_devices.tpl:386
+#: plugins/admin/systems/glpi_devices.tpl:458
+#: plugins/admin/systems/glpi_devices.tpl:522
+#: plugins/admin/systems/glpi_devices.tpl:569
+#: plugins/admin/systems/glpi_devices.tpl:622
+#: plugins/admin/systems/glpi_devices.tpl:676
+#: plugins/admin/systems/glpi_devices.tpl:722
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
+msgid "Comment"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:39
-#: plugins/admin/systems/terminalService.tpl:39
-msgid "Mouse"
+#: plugins/admin/systems/glpi.tpl:78
+msgid "Installed devices"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:44
-#: plugins/admin/systems/terminalService.tpl:44
-msgid "Choose mouse type"
+#: plugins/admin/systems/glpi.tpl:90
+msgid "Trading"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:50
-#: plugins/admin/systems/terminalService.tpl:50
-msgid "Port"
+#: plugins/admin/systems/glpi.tpl:91
+msgid "Software"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:52
-#: plugins/admin/systems/terminalService.tpl:52
-msgid "Choose mouse port"
+#: plugins/admin/systems/glpi.tpl:92
+msgid "Contracts"
 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:23
-msgid "Telephone hardware"
+#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
+msgid "Attachments"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:69
-#: plugins/admin/systems/terminalService.tpl:69
-#: plugins/gofon/phoneaccount/generic.tpl:26
-#: plugins/gofon/phoneaccount/generic.tpl:28
-#: plugins/gofon/phoneaccount/paste_generic.tpl:25
-msgid "Telephone"
+#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/printer.tpl:46
-#: plugins/admin/systems/terminalService.tpl:86
-msgid "Driver"
+#: plugins/admin/systems/glpiPrinter.tpl:9
+msgid "Printer type"
 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"
+#: plugins/admin/systems/glpiPrinter.tpl:31
+msgid "Supported interfaces"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:96
-#: plugins/admin/systems/terminalService.tpl:96
-msgid "Choose screen resolution used in graphic mode"
+#: plugins/admin/systems/glpiPrinter.tpl:38
+msgid "Serial"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:102
-#: plugins/admin/systems/terminalService.tpl:102
-msgid "Color depth"
+#: plugins/admin/systems/glpiPrinter.tpl:46
+msgid "Parallel"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:104
-#: plugins/admin/systems/terminalService.tpl:104
-msgid "Choose colordepth used in graphic mode"
+#: plugins/admin/systems/glpiPrinter.tpl:54
+msgid "USB"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:117
-#: plugins/admin/systems/terminalService.tpl:117
-msgid "Display device"
+#: plugins/admin/systems/glpiPrinter.tpl:114
+msgid "Installed cartridges"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:121
-msgid "unknown"
+#: plugins/admin/systems/glpi_edit_type.tpl:1
+msgid "Manage System-types"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:126
-msgid "Automatic modelines"
+#: plugins/admin/systems/glpi_edit_type.tpl:9
+#: plugins/admin/systems/glpi_edit_type.tpl:28
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:8
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:29
+#: plugins/admin/systems/glpi_edit_os.tpl:9
+#: plugins/admin/systems/glpi_edit_os.tpl:28
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
+msgid "Rename"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:130
-#: plugins/admin/systems/terminalService.tpl:124
-msgid "HSync"
+#: plugins/admin/systems/glpi_edit_type.tpl:24
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:25
+#: plugins/admin/systems/glpi_edit_os.tpl:24
+msgid "Please enter a new name"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:132
-#: plugins/admin/systems/terminalService.tpl:126
-msgid "Horizontal refresh frequency for installed monitor"
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:135
-#: plugins/admin/systems/terminalService.tpl:129
-msgid "VSync"
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
+#: plugins/admin/systems/printerPPDDialog.tpl:6
+msgid "Select"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:137
-#: plugins/admin/systems/terminalService.tpl:131
-msgid "Vertical refresh frequency for installed monitor"
+#: plugins/admin/systems/class_workstationService.inc:89
+#: plugins/admin/systems/class_terminalService.inc:102
+msgid "default"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:149
-#: plugins/admin/systems/terminalService.tpl:203
-msgid "Scan device"
+#: plugins/admin/systems/class_workstationService.inc:90
+#: plugins/admin/systems/class_terminalService.inc:103
+msgid "show chooser"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:150
-#: plugins/admin/systems/terminalService.tpl:204
-msgid "Select to start SANE scan service on terminal"
+#: plugins/admin/systems/class_workstationService.inc:91
+#: plugins/admin/systems/class_terminalService.inc:104
+msgid "direct"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:151
-#: plugins/admin/systems/terminalService.tpl:205
-msgid "Provide scan services"
+#: plugins/admin/systems/class_workstationService.inc:94
+#: plugins/admin/systems/class_terminalService.inc:107
+msgid "load balanced"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
-msgid "Select entries to add"
+#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_terminalService.inc:110
+msgid "Windows RDP"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
-msgid "Display members of department"
+#: plugins/admin/systems/class_workstationService.inc:98
+#: plugins/admin/systems/class_terminalService.inc:111
+msgid "ICA client"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
-msgid "Display members matching"
+#: plugins/admin/systems/class_workstationService.inc:201
+#: plugins/admin/systems/class_terminalService.inc:209
+msgid "Choose the phone located at the current terminal"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
-msgid "Regular expression for matching member names"
+#: plugins/admin/systems/class_workstationService.inc:263
+#: plugins/admin/systems/class_workstationService.inc:268
+#: plugins/admin/systems/class_terminalService.inc:270
+#: plugins/admin/systems/class_terminalService.inc:275
+msgid "Please specify a valid VSync range."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:278
+#: plugins/admin/systems/class_workstationService.inc:283
+#: plugins/admin/systems/class_terminalService.inc:285
+#: plugins/admin/systems/class_terminalService.inc:290
+msgid "Please specify a valid HSync range."
 msgstr ""
 
 #: plugins/admin/systems/class_workstationStartup.inc:313
@@ -6986,47 +7132,6 @@ msgid ""
 "be saved."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:105
-msgid "This 'dn' has no phone features."
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
-msgid "yes"
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-msgid "no"
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:223
-msgid "dynamic"
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:223
-msgid "Networksettings"
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:238
-#, php-format
-msgid ""
-"Can't delete because there are user which are depending on this phone. One "
-"of them is user '%s'."
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:294
-msgid "The required field 'Phone name' is not set."
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:297
-msgid "The 'Phone name' '0' is reserved and cannot be used."
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:304
-msgid "You have no permissions to create a phone on this 'Base'."
-msgstr ""
-
 #: plugins/admin/systems/class_printerPPDDialog.inc:67
 #, php-format
 msgid "Can't open '%s', ppd settings resetted."
@@ -7086,10 +7191,18 @@ msgstr ""
 msgid "Server name"
 msgstr ""
 
+#: plugins/admin/systems/server.tpl:15 plugins/admin/systems/terminal.tpl:20
+#: plugins/admin/systems/workstation.tpl:29
+#: plugins/admin/systems/component.tpl:15 plugins/admin/systems/phone.tpl:15
+#: plugins/admin/systems/printer.tpl:22
+#: plugins/admin/systems/wingeneric.tpl:15
+msgid "Choose subtree to place terminal in"
+msgstr ""
+
 #: plugins/admin/systems/server.tpl:39 plugins/admin/systems/terminal.tpl:100
-#: plugins/admin/systems/workstation.tpl:79
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/workstation.tpl:79
+#: plugins/admin/systems/class_baseSelectDialog.inc:45
 #: plugins/admin/ogroups/termgroup.tpl:3
 msgid "Action"
 msgstr ""
@@ -7098,88 +7211,6 @@ msgstr ""
 msgid "Select action to execute for this server"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:61
-msgid "text"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalGeneric.inc:62
-msgid "graphic"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalGeneric.inc:90
-#: plugins/admin/systems/class_servGeneric.inc:62
-#: plugins/admin/ogroups/class_termgroup.inc:64
-msgid "No WAKECMD definition found in your gosa.conf"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalGeneric.inc:94
-#: plugins/admin/systems/class_terminalGeneric.inc:106
-#: plugins/admin/systems/class_terminalGeneric.inc:118
-#: plugins/admin/systems/class_servGeneric.inc:66
-#: plugins/admin/systems/class_servGeneric.inc:78
-#: plugins/admin/systems/class_servGeneric.inc:90
-#: plugins/admin/systems/class_workstationGeneric.inc:104
-#: plugins/admin/ogroups/class_termgroup.inc:68
-#: plugins/admin/ogroups/class_termgroup.inc:80
-#: plugins/admin/ogroups/class_termgroup.inc:92
-#, php-format
-msgid "Execution of '%s' failed!"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalGeneric.inc:102
-#: plugins/admin/systems/class_servGeneric.inc:74
-#: plugins/admin/ogroups/class_termgroup.inc:76
-msgid "No REBOOTCMD definition found in your gosa.conf"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_servGeneric.inc:86
-#: plugins/admin/ogroups/class_termgroup.inc:88
-msgid "No HALTCMD definition found in your gosa.conf"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
-#: plugins/admin/ogroups/class_termgroup.inc:104
-msgid "Switch off"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
-#: plugins/admin/ogroups/class_termgroup.inc:104
-msgid "Reboot"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalGeneric.inc:172
-#: plugins/admin/systems/class_servGeneric.inc:142
-#: plugins/admin/systems/class_workstationGeneric.inc:162
-#: plugins/admin/ogroups/class_termgroup.inc:104
-msgid "Wake up"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalGeneric.inc:269
-msgid "You have no permissions to create a terminal on this 'Base'."
-msgstr ""
-
-#: plugins/admin/systems/class_terminalGeneric.inc:273
-msgid "The required field 'Terminal name' is not set."
-msgstr ""
-
-#: plugins/admin/systems/printerPPDDialog.tpl:1
-msgid "Printer driver"
-msgstr ""
-
-#: plugins/admin/systems/printerPPDDialog.tpl:6
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
-msgid "Select"
-msgstr ""
-
-#: plugins/admin/systems/printerPPDDialog.tpl:9
-msgid "New driver"
-msgstr ""
-
 #: plugins/admin/systems/workstationStartup.tpl:4
 #: plugins/admin/systems/terminalStartup.tpl:1
 msgid "Boot parameters"
@@ -7240,20 +7271,83 @@ msgstr ""
 msgid "Mountpoint"
 msgstr ""
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:6
+msgid "List of devices"
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:52
-msgid "This 'dn' has no server features."
+#: plugins/admin/systems/glpiDeviceManagement.tpl:23
+msgid ""
+"This dialog allows you to attach a device to your currently edited computer."
+msgstr ""
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:35
+msgid "Display devices matching"
+msgstr ""
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:37
+msgid "Regular expression for matching device names"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
+#: plugins/admin/systems/class_glpiAccount.inc:144
+msgid "There is no server with valid glpi database service."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
+#: plugins/admin/systems/class_glpiAccount.inc:154
+msgid "Can't connect to glpi database, the php-mysql extension is missing."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
+#: plugins/admin/systems/class_glpiAccount.inc:164
+msgid "Can't connect to glpi database, check configuration twice."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
+#: plugins/admin/systems/class_glpiAccount.inc:564
+msgid "Remove inventory"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
+msgid ""
+"This server has inventory features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
+#: plugins/admin/systems/class_glpiAccount.inc:567
+msgid "Add inventory"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
+msgid ""
+"This server has inventory features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
+#, php-format
+msgid ""
+"Can't rename given printer type to '%s', because this type name already "
+"exists."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
+#, php-format
+msgid "Can't delete printer type, it is still in use by '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:191
-msgid "The required field 'Server name' is not set."
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:609
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:623
+#: plugins/admin/systems/class_glpiAccount.inc:631
+#: plugins/admin/systems/class_glpiAccount.inc:645
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:288
+msgid "N/A"
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:198
-msgid "You have no permissions to create a server on this 'Base'."
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:750
+msgid "since"
 msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:9
@@ -7316,1864 +7410,1941 @@ msgstr ""
 msgid "Select action to execute for this terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:36
-msgid "Remove DHCP service"
+#: plugins/admin/systems/class_servDB.inc:135
+#: plugins/admin/systems/class_servDB.inc:144
+#: plugins/admin/systems/class_servDB.inc:161
+#: plugins/admin/systems/class_servDB.inc:171
+#: plugins/admin/systems/class_servDB.inc:176
+#: plugins/admin/systems/class_servDB.inc:182
+#, php-format
+msgid "The attribute '%s' is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:37
-msgid ""
-"This server has DHCP features enabled. You can disable them by clicking "
-"below."
+#: plugins/admin/systems/class_servDB.inc:151
+#, php-format
+msgid "The imap connect string needs to be in the form '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:39
-msgid "Add DHCP service"
+#: plugins/admin/systems/class_servDB.inc:155
+msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:40
+#: plugins/admin/systems/class_servDB.inc:166
+#, php-format
+msgid "The specified kerberos password is empty."
+msgstr ""
+
+#: plugins/admin/systems/class_servDB.inc:190
+#, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
+msgstr ""
+
+#: plugins/admin/systems/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 ""
-"This server has DHCP features disabled. You can enable them by clicking "
-"below."
+"You can't delete this cartridge type, it is still in use by this printer(s) "
+"'%s'."
 msgstr ""
 
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
+msgid "Cartridges"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:144
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
-msgid "There is no server with valid glpi database service."
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
+msgid "New monitor"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:154
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
-msgid "Can't connect to glpi database, the php-mysql extension is missing."
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
+msgid "M"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:164
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
-msgid "Can't connect to glpi database, check configuration twice."
+#: plugins/admin/systems/class_workstationGeneric.inc:70
+msgid "Activated"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:178
-#: plugins/admin/systems/class_glpiAccount.inc:184
-#: plugins/admin/systems/class_glpiAccount.inc:190
-msgid "This feature is not implemented yet."
+#: plugins/admin/systems/class_workstationGeneric.inc:72
+msgid "Memory test"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:292
-msgid "Adding new sytem type failed, this system type name is already used."
+#: plugins/admin/systems/class_workstationGeneric.inc:73
+msgid "System analysis"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:312
+#: plugins/admin/systems/class_workstationGeneric.inc:100
+msgid "No ACTIONCMD definition found in your gosa.conf"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:104
+#: plugins/admin/systems/class_terminalGeneric.inc:94
+#: plugins/admin/systems/class_terminalGeneric.inc:106
+#: plugins/admin/systems/class_terminalGeneric.inc:118
+#: plugins/admin/systems/class_servGeneric.inc:66
+#: plugins/admin/systems/class_servGeneric.inc:78
+#: plugins/admin/systems/class_servGeneric.inc:90
+#: plugins/admin/ogroups/class_termgroup.inc:68
+#: plugins/admin/ogroups/class_termgroup.inc:80
+#: plugins/admin/ogroups/class_termgroup.inc:92
 #, php-format
-msgid ""
-"You can't delete this system type, it is still in use by these system(s) '%s'"
+msgid "Execution of '%s' failed!"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:323
-msgid "Rename failed, this system type name is already used."
+#: plugins/admin/systems/class_workstationGeneric.inc:114
+msgid "This 'dn' has no workstation features."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:379
-msgid "Adding new operating system failed, specifed name is already used."
+#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/systems/class_terminalGeneric.inc:170
+#: plugins/admin/systems/class_servGeneric.inc:140
+#: plugins/admin/ogroups/class_termgroup.inc:104
+msgid "Switch off"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:401
+#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/systems/class_terminalGeneric.inc:170
+#: plugins/admin/systems/class_servGeneric.inc:140
+#: plugins/admin/ogroups/class_termgroup.inc:104
+msgid "Reboot"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:157
+msgid "Instant update"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:158
+#: plugins/admin/systems/class_workstationGeneric.inc:164
+msgid "Scheduled update"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:159
+#: plugins/admin/systems/class_workstationGeneric.inc:163
+msgid "Reinstall"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:160
+msgid "Rescan hardware"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:162
+#: plugins/admin/systems/class_terminalGeneric.inc:172
+#: plugins/admin/systems/class_servGeneric.inc:142
+#: plugins/admin/ogroups/class_termgroup.inc:104
+msgid "Wake up"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:228
+msgid "You have no permissions to create a workstation on this 'Base'."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:232
+msgid "The required field 'Workstation name' is not set."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:245
+#: plugins/admin/systems/class_componentGeneric.inc:155
+#: plugins/admin/systems/class_winGeneric.inc:172
+#: plugins/admin/systems/class_terminalGeneric.inc:286
+#: plugins/admin/systems/class_servGeneric.inc:209
+#: plugins/admin/systems/class_printGeneric.inc:529
+#: plugins/admin/systems/class_phoneGeneric.inc:314
 #, php-format
-msgid ""
-"You can't delete this operating system, it is still in use by these system"
-"(s) '%s'"
+msgid "There is already an entry '%s' in the base choosen by you"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:413
-msgid "Updating operating system failed, specifed name is already used."
+#: plugins/admin/systems/servdns.tpl:1
+msgid "Zones"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:564
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
-msgid "Remove inventory"
+#: plugins/admin/systems/workstation.tpl:9
+msgid "Workstation template"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:565
+#: plugins/admin/systems/workstation.tpl:11
+msgid "Workstation name"
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:35
 msgid ""
-"This device has inventory informations enabled. You can disable them by "
-"clicking below."
+"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:567
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
-msgid "Add inventory"
+#: plugins/admin/systems/class_servNfs.inc:38
+msgid "Can't read '/etc/gosa/encodings', please check permissions."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:568
-msgid ""
-"This device has inventory informations disabled. You can enable them by "
-"clicking below."
+#: plugins/admin/systems/class_servNfs.inc:125
+msgid "Please specify a valid path for your setup."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:631
-#: plugins/admin/systems/class_glpiAccount.inc:645
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:609
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:623
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:288
-msgid "N/A"
+#: plugins/admin/systems/class_servNfs.inc:131
+msgid "Please specify a valid name for your setup."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:70
-msgid "Activated"
+#: plugins/admin/systems/class_servNfs.inc:134
+msgid "Please specify a name for your setup."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:72
-msgid "Memory test"
+#: plugins/admin/systems/class_servNfs.inc:139
+msgid "Description contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:73
-msgid "System analysis"
+#: plugins/admin/systems/class_servNfs.inc:143
+msgid "Path contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:100
-msgid "No ACTIONCMD definition found in your gosa.conf"
+#: plugins/admin/systems/class_servNfs.inc:147
+msgid "Option contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:114
-msgid "This 'dn' has no workstation features."
+#: plugins/admin/systems/servnfs.tpl:1
+msgid "Edit share"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:157
-msgid "Instant update"
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
+msgstr ""
+
+#: plugins/admin/systems/servnfs.tpl:25
+msgid "Path"
+msgstr ""
+
+#: plugins/admin/systems/servnfs.tpl:49
+msgid "Codepage"
+msgstr ""
+
+#: plugins/admin/systems/servnfs.tpl:59
+msgid "Option"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid "Remove Kolab extension"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid ""
+"This server has kolab features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:118
+msgid "Add Kolab service"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:158
-#: plugins/admin/systems/class_workstationGeneric.inc:164
-msgid "Scheduled update"
+#: plugins/admin/systems/class_servKolab.inc:118
+msgid ""
+"This server has kolab features disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:159
-#: plugins/admin/systems/class_workstationGeneric.inc:163
-msgid "Reinstall"
+#: plugins/admin/systems/class_servKolab.inc:146
+#, php-format
+msgid "Include data from %s days in the past when creating free/busy lists"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:160
-msgid "Rescan hardware"
+#: plugins/admin/systems/class_servKolab.inc:152
+#, php-format
+msgid "Warn users when using more than %s%% of their mail quota"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:228
-msgid "You have no permissions to create a workstation on this 'Base'."
+#: plugins/admin/systems/class_servKolab.inc:227
+msgid "Future days in Free/Busy settings must be set."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:232
-msgid "The required field 'Workstation name' is not set."
+#: plugins/admin/systems/class_servKolab.inc:229
+msgid "Future days in Free/Busy settings must be a positive value."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:32
-msgid "Systems"
+#: plugins/admin/systems/class_servKolab.inc:233
+msgid "The given Quota settings value must be a number."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:429
-msgid "You can't edit this object type yet!"
+#: plugins/admin/systems/class_servKolab.inc:235
+msgid "Please choose a value between 1 and 100 for Quota settings."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:455
-msgid "Passwords entered as new and repeated do not match!"
+#: plugins/admin/systems/class_servKolab.inc:237
+msgid "Future days must be a value."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:472
-msgid "You are not allowed to set this systems password!"
+#: plugins/admin/systems/class_servKolab.inc:241
+msgid "No SMTP privileged networks set."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:526
-#, php-format
-msgid "You're about to delete all information about the component at '%s'."
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:760
-msgid "New Terminal template"
+#: plugins/admin/systems/terminalService.tpl:145
+msgid "Connect method"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:760
-#: plugins/admin/systems/class_systemManagement.inc:924
-msgid "New Terminal"
+#: plugins/admin/systems/terminalService.tpl:147
+msgid "Choose method to connect to terminal server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:762
-msgid "New Workstation template"
+#: plugins/admin/systems/terminalService.tpl:154
+msgid "Terminal server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:762
-#: plugins/admin/systems/class_systemManagement.inc:925
-msgid "New Workstation"
+#: plugins/admin/systems/terminalService.tpl:156
+msgid "Select specific terminal server to use"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:763
-#: plugins/admin/systems/class_systemManagement.inc:764
-msgid "New Server"
+#: plugins/admin/systems/terminalService.tpl:163
+msgid "Font server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:765
-#: plugins/admin/systems/class_systemManagement.inc:766
-msgid "New Printer"
+#: plugins/admin/systems/terminalService.tpl:165
+msgid "Select specific font server to use"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:767
-#: plugins/admin/systems/class_systemManagement.inc:768
-msgid "New Phone"
+#: plugins/admin/systems/terminalService.tpl:181
+msgid "Print device"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:769
-#: plugins/admin/systems/class_systemManagement.inc:770
-msgid "New Component"
+#: plugins/admin/systems/terminalService.tpl:182
+msgid "Select to start IPP based printing service on terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:780
-msgid "Edit system"
+#: plugins/admin/systems/terminalService.tpl:183
+msgid "Provide print services"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:781
-msgid "Delete system"
+#: plugins/admin/systems/terminalService.tpl:189
+msgid "Spool server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:791
-msgid "System"
+#: plugins/admin/systems/terminalService.tpl:191
+msgid "Select NFS filesystem to place spool files on"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:829
-msgid "Cups Server"
+#: plugins/admin/systems/terminalService.tpl:212
+msgid "Select scanner driver to use"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:830
-msgid "Log Db"
+#: plugins/admin/systems/class_componentGeneric.inc:50
+#: plugins/admin/systems/class_winGeneric.inc:73
+msgid "This 'dn' has no network features."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:831
-msgid "Syslog Server"
+#: plugins/admin/systems/class_componentGeneric.inc:138
+msgid "The required field 'Component name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:832
-msgid "Mail Server"
+#: plugins/admin/systems/class_componentGeneric.inc:145
+#: plugins/admin/systems/class_winGeneric.inc:162
+msgid "You have no permissions to create a component on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:833
-msgid "Imap Server"
+#: plugins/admin/systems/terminalStartup.tpl:35
+msgid "Select if terminal supports graphical startup with progress bar"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:834
-msgid "Nfs Server"
+#: plugins/admin/systems/terminalStartup.tpl:36
+msgid "use graphical bootup"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:835
-msgid "Kerberos Server"
+#: plugins/admin/systems/terminalStartup.tpl:38
+msgid "Select if terminal should boot in text mode"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:836
-msgid "Asterisk Server"
+#: plugins/admin/systems/terminalStartup.tpl:39
+msgid "use standard linux textual bootup"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:837
-msgid "Fax Server"
+#: plugins/admin/systems/terminalStartup.tpl:41
+msgid "Select to get more verbose output during startup"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:838
-msgid "Ldap Server"
+#: plugins/admin/systems/terminalStartup.tpl:42
+msgid "use debug mode for startup"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:871
-msgid "Set root password"
+#: plugins/admin/systems/class_glpiAccount.inc:178
+#: plugins/admin/systems/class_glpiAccount.inc:184
+#: plugins/admin/systems/class_glpiAccount.inc:190
+msgid "This feature is not implemented yet."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:916
-msgid "New System from incoming"
+#: plugins/admin/systems/class_glpiAccount.inc:292
+msgid "Adding new sytem type failed, this system type name is already used."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:918
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:589
-msgid "Terminal"
+#: plugins/admin/systems/class_glpiAccount.inc:312
+#, php-format
+msgid ""
+"You can't delete this system type, it is still in use by these system(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:919
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:588
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
+#: plugins/admin/systems/class_glpiAccount.inc:323
+msgid "Rename failed, this system type name is already used."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:922
-msgid "Winstation"
+#: plugins/admin/systems/class_glpiAccount.inc:379
+msgid "Adding new operating system failed, specifed name is already used."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:923
-msgid "Network Device"
+#: plugins/admin/systems/class_glpiAccount.inc:401
+#, php-format
+msgid ""
+"You can't delete this operating system, it is still in use by these system"
+"(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1146
-msgid "New terminal"
+#: plugins/admin/systems/class_glpiAccount.inc:413
+msgid "Updating operating system failed, specifed name is already used."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1148
-msgid "New workstation"
+#: plugins/admin/systems/class_glpiAccount.inc:565
+msgid ""
+"This device has inventory informations enabled. You can disable them by "
+"clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1150
-msgid "New Device"
+#: plugins/admin/systems/class_glpiAccount.inc:568
+msgid ""
+"This device has inventory informations disabled. You can enable them by "
+"clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1167
-msgid "Terminal template for"
+#: plugins/admin/systems/glpiManufacturer.tpl:1
+msgid "Manage manufacturers"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1179
-msgid "Workstation template for"
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
+msgid "Attachment"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "General"
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
+msgid "Filename"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:9
-msgid "Printer name"
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
+msgid "Mime-type"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:31
-msgid "Details"
+#: plugins/admin/systems/class_termDNS.inc:313
+msgid "The required field 'IP-address' is not set."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:34
-msgid "Printer location"
+#: plugins/admin/systems/class_termDNS.inc:319
+msgid "Wrong IP format in field IP-address."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:38
-msgid "Printer URL"
+#: plugins/admin/systems/class_termDNS.inc:325
+msgid "The required field 'MAC-address' is not set."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:58
-msgid "Permissions"
+#: plugins/admin/systems/class_termDNS.inc:331
+msgid ""
+"The given macaddress is invalid. There must be 6 1byte segments seperated by "
+"':'."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:65
-msgid "Users which are allowed to use this printer"
+#: plugins/admin/systems/class_termDNS.inc:346
+#, php-format
+msgid "Found duplicate value for record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
-msgid "Add user"
+#: plugins/admin/systems/class_termDNS.inc:352
+#, php-format
+msgid "Found more than one entry for the uniqe record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
-msgid "Add group"
+#: plugins/admin/systems/class_termDNS.inc:360
+#, php-format
+msgid ""
+"The device IP '%s' is added as 'A Record', this will be done automatically, "
+"please remove the record."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:81
-msgid "Users which are allowed to administrate this printer"
+#: plugins/admin/systems/class_termDNS.inc:366
+#: plugins/admin/systems/class_servDNSeditZone.inc:386
+#, php-format
+msgid "Only lowercase is allowed, please check your '%ss'."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:82
-msgid "Admins"
+#: plugins/admin/systems/class_servRepository.inc:97
+msgid "Remove FAI repository extension."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:181
-#: plugins/admin/systems/class_inventory.inc:36
-msgid "Remove DNS service"
+#: plugins/admin/systems/class_servRepository.inc:98
+msgid ""
+"This server has FAI repository features enabled. You can disable them by "
+"clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:182
-#: plugins/admin/systems/class_inventory.inc:37
-msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
+#: plugins/admin/systems/class_servRepository.inc:100
+msgid "Add FAI repository extension."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:184
-#: plugins/admin/systems/class_inventory.inc:39
-msgid "Add DNS service"
+#: plugins/admin/systems/class_servRepository.inc:101
+msgid ""
+"This server has FAI repository features disabled. You can enable them by "
+"clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:185
-#: plugins/admin/systems/class_inventory.inc:40
+#: plugins/admin/systems/class_servRepository.inc:144
+#, php-format
 msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
+"You can't delete this release, it is still used by these workstations [%s]. "
+"Please solve this dependencies first, to keep data base consistency."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:270
+#: plugins/admin/systems/class_servRepository.inc:176
 #, php-format
 msgid ""
-"Can't delete the selected zone, because it is still in use by these entry/"
-"entries '%s'"
+"Be careful editing this release, it is still used by these workstations [%s]."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:297
-msgid "Reverse zone"
+#: plugins/admin/systems/class_servRepository.inc:243
+#: plugins/admin/systems/class_servRepository.inc:264
+#: plugins/admin/systems/servRepositorySetup.tpl:33
+msgid "Sections"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:135
-#: plugins/admin/systems/class_servDB.inc:144
-#: plugins/admin/systems/class_servDB.inc:161
-#: plugins/admin/systems/class_servDB.inc:171
-#: plugins/admin/systems/class_servDB.inc:176
-#: plugins/admin/systems/class_servDB.inc:182
-#, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
+msgid "Can't delete this entry, it is still in use."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:151
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:305
+msgid "The selected name is already in use."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:155
-msgid "The sieve port needs to be numeric."
+#: plugins/admin/systems/servRepository.tpl:6
+msgid "List of configured repositories."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:166
-#, php-format
-msgid "The specified kerberos password is empty."
+#: plugins/admin/systems/servRepository.tpl:11
+msgid "Add repository"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:190
-#, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
+#: plugins/admin/systems/servRepository.tpl:29
+msgid "This menu allows you to create, delete and edit repository settings."
 msgstr ""
 
-#: plugins/admin/systems/servdns.tpl:1
-msgid "Zones"
+#: plugins/admin/systems/servdnseditzone.tpl:7
+msgid "Zone name"
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
+#: plugins/admin/systems/servdnseditzone.tpl:13
+msgid "Network address"
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
+#: plugins/admin/systems/servdnseditzone.tpl:24
+msgid "Zone entries"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:35
-msgid ""
-"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+#: plugins/admin/systems/servdnseditzone.tpl:35
+msgid "SOA record"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:38
-msgid "Can't read '/etc/gosa/encodings', please check permissions."
+#: plugins/admin/systems/servdnseditzone.tpl:41
+msgid "Primary dns server for this zone"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:125
-msgid "Please specify a valid path for your setup."
+#: plugins/admin/systems/servdnseditzone.tpl:53
+msgid "Serial number (automatically incremented)"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:131
-msgid "Please specify a valid name for your setup."
+#: plugins/admin/systems/servdnseditzone.tpl:69
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: ihtml/themes/altlinux/setup_finish.tpl:31
+#: ihtml/themes/default/setup_finish.tpl:31
+#: ihtml/themes/lhs/setup_finish.tpl:31
+msgid "Retry"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:134
-msgid "Please specify a name for your setup."
+#: plugins/admin/systems/servdnseditzone.tpl:75
+msgid "Expire"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:139
-msgid "Description contains invalid characters."
+#: plugins/admin/systems/servdnseditzone.tpl:96
+msgid "MxRecords"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:143
-msgid "Path contains invalid characters."
+#: plugins/admin/systems/servdnseditzone.tpl:108
+msgid "Zone records"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:147
-msgid "Option contains invalid characters."
+#: plugins/admin/systems/class_glpiSelectUser.inc:140
+msgid "use"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:6
-msgid "Kerberos kadmin access"
+#: plugins/admin/systems/glpiSelectUser.tpl:23
+msgid ""
+"This dialog allows you to select a user as technical responsible person."
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:10
-msgid "Kerberos Realm"
+#: plugins/admin/systems/glpi_devices.tpl:2
+msgid "Add/Edit monitor"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
-msgid "Admin user"
+#: plugins/admin/systems/glpi_devices.tpl:17
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+msgid "Comments"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:26
-msgid "FAX database"
+#: plugins/admin/systems/glpi_devices.tpl:33
+msgid "Monitor size"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:30
-msgid "FAX DB user"
+#: plugins/admin/systems/glpi_devices.tpl:36
+msgid "Inch"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:42
-msgid "Asterisk management"
+#: plugins/admin/systems/glpi_devices.tpl:44
+msgid "Integrated microphone"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:46
-msgid "Asterisk DB user"
+#: plugins/admin/systems/glpi_devices.tpl:47
+#: plugins/admin/systems/glpi_devices.tpl:55
+#: plugins/admin/systems/glpi_devices.tpl:63
+#: plugins/admin/systems/glpi_devices.tpl:71
+#: plugins/admin/systems/glpi_devices.tpl:176
+#: plugins/admin/systems/glpi_devices.tpl:296
+#: plugins/admin/systems/glpi_devices.tpl:361
+msgid "Yes"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:54
-msgid "Country dial prefix"
+#: plugins/admin/systems/glpi_devices.tpl:48
+#: plugins/admin/systems/glpi_devices.tpl:56
+#: plugins/admin/systems/glpi_devices.tpl:64
+#: plugins/admin/systems/glpi_devices.tpl:72
+#: plugins/admin/systems/glpi_devices.tpl:177
+#: plugins/admin/systems/glpi_devices.tpl:297
+#: plugins/admin/systems/glpi_devices.tpl:362
+msgid "No"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:58
-msgid "Local dial prefix"
+#: plugins/admin/systems/glpi_devices.tpl:52
+msgid "Integrated speakers"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:70
-msgid "IMAP admin access"
+#: plugins/admin/systems/glpi_devices.tpl:60
+msgid "Sub-D"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:74
-msgid "Server identifier"
+#: plugins/admin/systems/glpi_devices.tpl:68
+msgid "BNC"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:78
-msgid "Connect URL"
+#: plugins/admin/systems/glpi_devices.tpl:76
+msgid "Serial number"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:91
-msgid "Sieve port"
+#: plugins/admin/systems/glpi_devices.tpl:83
+msgid "Additional serial number"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:100
-msgid "Logging database"
+#: plugins/admin/systems/glpi_devices.tpl:97
+msgid "Add/Edit other device"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
-msgid "Logging DB user"
+#: plugins/admin/systems/glpi_devices.tpl:138
+msgid "Add/Edit power supply"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:119
-msgid "Glpi database"
+#: plugins/admin/systems/glpi_devices.tpl:173
+msgid "Atx"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:133
-msgid "Database"
+#: plugins/admin/systems/glpi_devices.tpl:181
+msgid "Power"
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:1
-msgid "Edit share"
+#: plugins/admin/systems/glpi_devices.tpl:193
+msgid "Add/Edit graphic card"
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:2
-msgid "NFS setup"
+#: plugins/admin/systems/glpi_devices.tpl:228
+#: plugins/admin/systems/glpi_devices.tpl:284
+#: plugins/admin/systems/glpi_devices.tpl:349
+msgid "Interface"
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:25
-msgid "Path"
+#: plugins/admin/systems/glpi_devices.tpl:237
+msgid "Ram"
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:49
-msgid "Codepage"
+#: plugins/admin/systems/glpi_devices.tpl:249
+msgid "Add/Edit controller"
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:59
-msgid "Option"
+#: plugins/admin/systems/glpi_devices.tpl:307
+msgid "Add/Edit drive"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid "Remove Kolab extension"
+#: plugins/admin/systems/glpi_devices.tpl:342
+msgid "Speed"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid ""
-"This server has kolab features enabled. You can disable them by clicking "
-"below."
+#: plugins/admin/systems/glpi_devices.tpl:358
+msgid "Writeable"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:118
-msgid "Add Kolab service"
+#: plugins/admin/systems/glpi_devices.tpl:371
+msgid "Add/Edit harddisk"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:118
-msgid ""
-"This server has kolab features disabled. You can enable them by clicking "
-"below."
+#: plugins/admin/systems/glpi_devices.tpl:406
+msgid "Rpm"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:146
-#, php-format
-msgid "Include data from %s days in the past when creating free/busy lists"
+#: plugins/admin/systems/glpi_devices.tpl:413
+msgid "Cache"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:152
-#, php-format
-msgid "Warn users when using more than %s%% of their mail quota"
+#: plugins/admin/systems/glpi_devices.tpl:443
+msgid "Add/Edit memory"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:227
-msgid "Future days in Free/Busy settings must be set."
+#: plugins/admin/systems/glpi_devices.tpl:478
+msgid "Frequenz"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:229
-msgid "Future days in Free/Busy settings must be a positive value."
+#: plugins/admin/systems/glpi_devices.tpl:507
+msgid "Add/Edit sound card"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:233
-msgid "The given Quota settings value must be a number."
+#: plugins/admin/systems/glpi_devices.tpl:553
+msgid "Add/Edit network interface"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:235
-msgid "Please choose a value between 1 and 100 for Quota settings."
+#: plugins/admin/systems/glpi_devices.tpl:589
+msgid "MAC address"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:237
-msgid "Future days must be a value."
+#: plugins/admin/systems/glpi_devices.tpl:607
+msgid "Add/Edit processor"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:241
-msgid "No SMTP privileged networks set."
+#: plugins/admin/systems/glpi_devices.tpl:642
+msgid "Frequence"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:177
-#: plugins/admin/systems/class_printGeneric.inc:184
-#: plugins/admin/systems/class_printGeneric.inc:219
-#: plugins/admin/systems/class_printGeneric.inc:240
-#: plugins/admin/systems/class_printGeneric.inc:243
-msgid "Add printer extension"
+#: plugins/admin/systems/glpi_devices.tpl:649
+msgid "Default frequence"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:178
-msgid "This is a workstation template, printer tab is disabled."
+#: plugins/admin/systems/glpi_devices.tpl:661
+msgid "Add/Edit motherboard"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:185
-msgid "This is a terminal template, printer tab is disabled."
+#: plugins/admin/systems/glpi_devices.tpl:696
+msgid "Chipset"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:220
-msgid ""
-"This workstation has printer extension disabled. You can't enable it while "
-"'cn' is not present in entry. Possibly you are currently creating a new "
-"terminal template"
+#: plugins/admin/systems/glpi_devices.tpl:707
+msgid "Add/Edit computer case"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:232
-#: plugins/admin/systems/class_printGeneric.inc:235
-msgid "Remove printer extension"
+#: plugins/admin/systems/glpi_devices.tpl:742
+msgid "format"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:233
-msgid ""
-"This workstation has printer extension enabled.You can disable it by "
-"clicking below."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
+#, php-format
+msgid "Internal Error can't create device of type '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:236
-msgid ""
-"This terminal has printer extension enabled. You can disable it by clicking "
-"below."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
+#, php-format
+msgid "You're about to delete the glpi device '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:241
-msgid ""
-"This workstation has printer extension disabled. You can enable it by "
-"clicking below."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
+msgid "Can't detect object name."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:244
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
+#, php-format
 msgid ""
-"This terminal has printer extension disabled. You can enable it by clicking "
-"below."
+"You can't delete this device, it is still in use by these system(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:283
-msgid "This 'dn' has no printer features."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
+msgid "devices"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:419
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
+msgid "New mainbord"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:427
-msgid "can't get ppd informations."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
+msgid "New processor"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:439
-#, php-format
-msgid "This printer belongs to terminal %s. You can't rename this printer."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+msgid "New case"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:441
-#, php-format
-msgid "This printer belongs to workstation %s. You can't rename this printer."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+msgid "C"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:519
-msgid "You have no permissions to create a printer on this 'Base'."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+msgid "New network interface"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:14
-msgid "POP3 service"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+msgid "NI"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:22
-msgid "POP3/SSL service"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+msgid "New ram"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:30
-msgid "IMAP service"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+msgid "R"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:38
-msgid "IMAP/SSL service"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+msgid "New hard disk"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:46
-msgid "Sieve service"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+msgid "HDD"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:54
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+msgid "New drive"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:62
-msgid "HTTP FreeBusy service (legacy)"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+msgid "D"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:70
-msgid "Amavis email scanning (virus/spam)"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+msgid "New controller"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:81
-msgid "Quota settings"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+msgid "CS"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:97
-msgid "Free/Busy settings"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "New graphics card"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:102
-msgid "Allow unauthenticated downloading of Free/Busy information"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "GC"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:117
-msgid "SMTP privileged networks"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+msgid "New sound card"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:122
-msgid "Hosts/networks allowed to relay"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+msgid "SC"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:125
-msgid "Enter multiple values, seperated with"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "New power supply"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:138
-msgid "SMTP smarthost/relayhost"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "PS"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:144
-msgid "Enable MX lookup for relayhost"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+msgid "New misc device"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:149
-msgid "Host used to relay mails"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+msgid "OC"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:163
-msgid "Accept Internet Mail"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:346
+msgid "You have to specify a valid name for this device."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:169
-msgid "Accept mail from other domains over non-authenticated SMTP"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:366
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:369
+msgid "This device name is already in use."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:1
-msgid "Advanced phone settings"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
+msgid "Other"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:6
-msgid "Phone type"
+#: plugins/admin/systems/class_servService.inc:272
+msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:7
-#: plugins/admin/systems/phonesettings.tpl:25
-#: plugins/admin/systems/phonesettings.tpl:35
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:78
-#: plugins/admin/systems/phonesettings.tpl:109
-#: plugins/admin/systems/phonesettings.tpl:156
-msgid "Choose a phone type"
+#: plugins/admin/systems/servRepositorySetup.tpl:15
+msgid "Parent server"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:10
-msgid "refresh"
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:32
-msgid "DTMF mode"
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:46
-#: plugins/admin/systems/phonesettings.tpl:85
-msgid "Default IP"
+#: plugins/admin/systems/servservice.tpl:72
+msgid "Terminal Service"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:56
-#: plugins/admin/systems/phonesettings.tpl:93
-msgid "Response timeout"
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:75
-msgid "Modus"
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:106
-msgid "Authtype"
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:116
-msgid "Secret"
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:124
-msgid "GoFonInkeys"
+#: plugins/admin/systems/servservice.tpl:109
+msgid "Mail server"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:132
-msgid "GoFonOutKeys"
+#: plugins/admin/systems/glpi_edit_os.tpl:1
+msgid "Manage OS-types"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:145
-msgid "Account code"
+#: plugins/admin/systems/printerPPDDialog.tpl:1
+msgid "Printer driver"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:153
-msgid "Trunk lines"
+#: plugins/admin/systems/printerPPDDialog.tpl:9
+msgid "New driver"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:168
-msgid "Hosts that are allowed to connect"
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:183
-msgid "Hosts that are not allowed to connect"
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
+msgid "List of available cartridge type for this type of printer"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:205
-msgid "MSN"
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
+msgid ""
+"This dialog allows you to create new types of cartridges, and select one or "
+"more types for your printer. Cartridge types depends on the printer type you "
+"have selected. For each selected cartridge type there will be a new "
+"cartridge created, this allows you to select the same cartridge type for "
+"more then one printer."
 msgstr ""
 
-#: plugins/admin/systems/wingeneric.tpl:6
-msgid "Machine name"
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
+msgid "Display cartridge types matching"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:141
-msgid "Remote desktop"
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
+msgid "Regular expression for matching cartridge types"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:145
-msgid "Connect method"
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
+msgid "Reference"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:147
-msgid "Choose method to connect to terminal server"
+#: plugins/admin/systems/class_terminalGeneric.inc:61
+msgid "text"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:154
-msgid "Terminal server"
+#: plugins/admin/systems/class_terminalGeneric.inc:62
+msgid "graphic"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:156
-msgid "Select specific terminal server to use"
+#: plugins/admin/systems/class_terminalGeneric.inc:90
+#: plugins/admin/systems/class_servGeneric.inc:62
+#: plugins/admin/ogroups/class_termgroup.inc:64
+msgid "No WAKECMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:163
-msgid "Font server"
+#: plugins/admin/systems/class_terminalGeneric.inc:102
+#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/ogroups/class_termgroup.inc:76
+msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:165
-msgid "Select specific font server to use"
+#: plugins/admin/systems/class_terminalGeneric.inc:114
+#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/ogroups/class_termgroup.inc:88
+msgid "No HALTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:181
-msgid "Print device"
+#: plugins/admin/systems/class_terminalGeneric.inc:269
+msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:182
-msgid "Select to start IPP based printing service on terminal"
+#: plugins/admin/systems/class_terminalGeneric.inc:273
+msgid "The required field 'Terminal name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:183
-msgid "Provide print services"
+#: plugins/admin/systems/remove_glpi.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your MySql database in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:189
-msgid "Spool server"
+#: plugins/admin/systems/class_servGeneric.inc:52
+msgid "This 'dn' has no server features."
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:191
-msgid "Select NFS filesystem to place spool files on"
+#: plugins/admin/systems/class_servGeneric.inc:191
+msgid "The required field 'Server name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:212
-msgid "Select scanner driver to use"
+#: plugins/admin/systems/class_servGeneric.inc:198
+msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/remove.tpl:6
-msgid ""
-"This includes <b>all</b> system and setup informations. Please double check "
-"if your really want to do this since there is no way for GOsa to get your "
-"data back."
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
+msgid "Add/Edit manufacturer"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:6
-msgid "List of systems"
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
+msgid "Website"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:24
-msgid ""
-"This menu allows you to add, remove and change the properties of specific "
-"systems. You can only add systems which have already been started once."
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
+#: plugins/admin/ogroups/class_mailogroup.inc:137
+#: plugins/admin/ogroups/class_phonequeue.inc:690
+#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Phone number"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
+#: plugins/admin/systems/class_servDHCP.inc:36
+msgid "Remove DHCP service"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:39
-msgid "Select to see Linux terminals"
+#: plugins/admin/systems/class_servDHCP.inc:37
+msgid ""
+"This server has DHCP features enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:39
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
+#: plugins/admin/systems/class_servDHCP.inc:39
+msgid "Add DHCP service"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:40
-msgid "Select to see Linux workstations"
+#: plugins/admin/systems/class_servDHCP.inc:40
+msgid ""
+"This server has DHCP features disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:40
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
+#: plugins/admin/systems/class_systemManagement.inc:32
+msgid "Systems"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Select to see MicroSoft Windows based workstations"
+#: plugins/admin/systems/class_systemManagement.inc:429
+msgid "You can't edit this object type yet!"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Show windows based workstations"
+#: plugins/admin/systems/class_systemManagement.inc:455
+msgid "Passwords entered as new and repeated do not match!"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Select to see network printers"
+#: plugins/admin/systems/class_systemManagement.inc:472
+msgid "You are not allowed to set this systems password!"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Show network printers"
+#: plugins/admin/systems/class_systemManagement.inc:526
+#, php-format
+msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:43
-msgid "Select to see VOIP phones"
+#: plugins/admin/systems/class_systemManagement.inc:761
+msgid "New Terminal template"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:43
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
+#: plugins/admin/systems/class_systemManagement.inc:761
+#: plugins/admin/systems/class_systemManagement.inc:925
+msgid "New Terminal"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Select to see network devices"
+#: plugins/admin/systems/class_systemManagement.inc:763
+msgid "New Workstation template"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Show network devices"
+#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/systems/class_systemManagement.inc:926
+msgid "New Workstation"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:52
-msgid "Regular expression for matching system names"
+#: plugins/admin/systems/class_systemManagement.inc:764
+#: plugins/admin/systems/class_systemManagement.inc:765
+msgid "New Server"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:59
-msgid "Display systems of user"
+#: plugins/admin/systems/class_systemManagement.inc:766
+#: plugins/admin/systems/class_systemManagement.inc:767
+msgid "New Printer"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:62
-msgid "User name of which terminal(s) are shown"
+#: plugins/admin/systems/class_systemManagement.inc:768
+#: plugins/admin/systems/class_systemManagement.inc:769
+msgid "New Phone"
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:138
-msgid "The required field 'Component name' is not set."
+#: plugins/admin/systems/class_systemManagement.inc:770
+#: plugins/admin/systems/class_systemManagement.inc:771
+msgid "New Component"
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:35
-msgid "Select if terminal supports graphical startup with progress bar"
+#: plugins/admin/systems/class_systemManagement.inc:781
+msgid "Edit system"
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:36
-msgid "use graphical bootup"
+#: plugins/admin/systems/class_systemManagement.inc:782
+msgid "Delete system"
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:38
-msgid "Select if terminal should boot in text mode"
+#: plugins/admin/systems/class_systemManagement.inc:792
+msgid "System"
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:39
-msgid "use standard linux textual bootup"
+#: plugins/admin/systems/class_systemManagement.inc:830
+msgid "Cups Server"
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:41
-msgid "Select to get more verbose output during startup"
+#: plugins/admin/systems/class_systemManagement.inc:831
+msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:42
-msgid "use debug mode for startup"
+#: plugins/admin/systems/class_systemManagement.inc:832
+msgid "Syslog Server"
 msgstr ""
 
-#: plugins/admin/systems/password.tpl:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you "
-"wouldn't be able to log in."
+#: plugins/admin/systems/class_systemManagement.inc:833
+msgid "Mail Server"
 msgstr ""
 
-#: plugins/admin/systems/password.tpl:5
-msgid "Leave fields blank for password inheritance from default entries."
+#: plugins/admin/systems/class_systemManagement.inc:834
+msgid "Imap Server"
 msgstr ""
 
-#: plugins/admin/systems/password.tpl:9
-msgid "Changing the password impinges on authentification only."
+#: plugins/admin/systems/class_systemManagement.inc:835
+msgid "Nfs Server"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
-msgid "Printer ppd selection."
+#: plugins/admin/systems/class_systemManagement.inc:836
+msgid "Kerberos Server"
 msgstr ""
 
-#: plugins/admin/systems/servRepositorySetup.tpl:15
-msgid "Parent server"
+#: plugins/admin/systems/class_systemManagement.inc:837
+msgid "Asterisk Server"
 msgstr ""
 
-#: plugins/admin/systems/servRepositorySetup.tpl:33
-#: plugins/admin/systems/class_servRepository.inc:243
-#: plugins/admin/systems/class_servRepository.inc:264
-msgid "Sections"
+#: plugins/admin/systems/class_systemManagement.inc:838
+msgid "Fax Server"
 msgstr ""
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:117
-msgid "Please enter a value for 'release'."
+#: plugins/admin/systems/class_systemManagement.inc:839
+msgid "Ldap Server"
 msgstr ""
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:121
-msgid "Please specify a valid value for 'url'."
+#: plugins/admin/systems/class_systemManagement.inc:872
+msgid "Set root password"
 msgstr ""
 
-#: plugins/admin/systems/servRepository.tpl:6
-msgid "List of configured repositories."
+#: plugins/admin/systems/class_systemManagement.inc:917
+msgid "New System from incoming"
 msgstr ""
 
-#: plugins/admin/systems/servRepository.tpl:11
-msgid "Add repository"
+#: plugins/admin/systems/class_systemManagement.inc:919
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:590
+msgid "Terminal"
 msgstr ""
 
-#: plugins/admin/systems/servRepository.tpl:29
-msgid "This menu allows you to create, delete and edit repository settings."
+#: plugins/admin/systems/class_systemManagement.inc:920
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:589
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
-msgid ""
-"This server has inventory features enabled. You can disable them by clicking "
-"below."
+#: plugins/admin/systems/class_systemManagement.inc:923
+msgid "Winstation"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
-msgid ""
-"This server has inventory features disabled. You can enable them by clicking "
-"below."
+#: plugins/admin/systems/class_systemManagement.inc:924
+msgid "Network Device"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
-#, php-format
-msgid ""
-"Can't rename given printer type to '%s', because this type name already "
-"exists."
+#: plugins/admin/systems/class_systemManagement.inc:1147
+msgid "New terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
-#, php-format
-msgid "Can't delete printer type, it is still in use by '%s'."
+#: plugins/admin/systems/class_systemManagement.inc:1149
+msgid "New workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:750
-msgid "since"
+#: plugins/admin/systems/class_systemManagement.inc:1151
+msgid "New Device"
 msgstr ""
-
-#: plugins/admin/systems/glpi_edit_type.tpl:1
-msgid "Manage System-types"
+
+#: plugins/admin/systems/class_systemManagement.inc:1168
+msgid "Terminal template for"
 msgstr ""
 
-#: plugins/admin/systems/glpi_edit_type.tpl:9
-#: plugins/admin/systems/glpi_edit_type.tpl:28
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
-#: plugins/admin/systems/glpi_edit_os.tpl:9
-#: plugins/admin/systems/glpi_edit_os.tpl:28
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:8
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:29
-msgid "Rename"
+#: plugins/admin/systems/class_systemManagement.inc:1180
+msgid "Workstation template for"
 msgstr ""
 
-#: plugins/admin/systems/glpi_edit_type.tpl:24
-#: plugins/admin/systems/glpi_edit_os.tpl:24
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:25
-msgid "Please enter a new name"
+#: plugins/admin/systems/class_servRepositorySetup.inc:117
+msgid "Please enter a value for 'release'."
 msgstr ""
 
-#: plugins/admin/systems/remove_glpi.tpl:10
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your MySql database in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
+#: plugins/admin/systems/class_servRepositorySetup.inc:121
+msgid "Please specify a valid value for 'url'."
 msgstr ""
 
-#: plugins/admin/systems/glpiManufacturer.tpl:1
-msgid "Manage manufacturers"
+#: plugins/admin/systems/printer.tpl:6
+msgid "General"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
-msgid "Reference"
+#: plugins/admin/systems/printer.tpl:9
+msgid "Printer name"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
-#: plugins/admin/systems/glpi_devices.tpl:17
-msgid "Comments"
+#: plugins/admin/systems/printer.tpl:31
+msgid "Details"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
-#: plugins/admin/systems/glpi.tpl:63
-#: plugins/admin/systems/glpi_devices.tpl:112
-#: plugins/admin/systems/glpi_devices.tpl:153
-#: plugins/admin/systems/glpi_devices.tpl:208
-#: plugins/admin/systems/glpi_devices.tpl:264
-#: plugins/admin/systems/glpi_devices.tpl:322
-#: plugins/admin/systems/glpi_devices.tpl:386
-#: plugins/admin/systems/glpi_devices.tpl:458
-#: plugins/admin/systems/glpi_devices.tpl:522
-#: plugins/admin/systems/glpi_devices.tpl:569
-#: plugins/admin/systems/glpi_devices.tpl:622
-#: plugins/admin/systems/glpi_devices.tpl:676
-#: plugins/admin/systems/glpi_devices.tpl:722
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
-msgid "Comment"
+#: plugins/admin/systems/printer.tpl:34
+msgid "Printer location"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
-#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
-#: plugins/admin/systems/glpi_devices.tpl:24
-#: plugins/admin/systems/glpi_devices.tpl:123
-#: plugins/admin/systems/glpi_devices.tpl:164
-#: plugins/admin/systems/glpi_devices.tpl:219
-#: plugins/admin/systems/glpi_devices.tpl:275
-#: plugins/admin/systems/glpi_devices.tpl:333
-#: plugins/admin/systems/glpi_devices.tpl:397
-#: plugins/admin/systems/glpi_devices.tpl:469
-#: plugins/admin/systems/glpi_devices.tpl:533
-#: plugins/admin/systems/glpi_devices.tpl:580
-#: plugins/admin/systems/glpi_devices.tpl:633
-#: plugins/admin/systems/glpi_devices.tpl:687
-#: plugins/admin/systems/glpi_devices.tpl:733
-msgid "Manufacturer"
+#: plugins/admin/systems/printer.tpl:38
+msgid "Printer URL"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
-#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
-msgid "Technical responsible"
+#: plugins/admin/systems/printer.tpl:58
+msgid "Permissions"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:140
-msgid "use"
+#: plugins/admin/systems/printer.tpl:65
+msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: plugins/admin/systems/glpiSelectUser.tpl:23
-msgid ""
-"This dialog allows you to select a user as technical responsible person."
+#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
+msgid "Add user"
 msgstr ""
 
-#: plugins/admin/systems/glpi_edit_os.tpl:1
-msgid "Manage OS-types"
+#: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
+msgid "Add group"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:313
-msgid "The required field 'IP-address' is not set."
+#: plugins/admin/systems/printer.tpl:81
+msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:319
-msgid "Wrong IP format in field IP-address."
+#: plugins/admin/systems/printer.tpl:82
+msgid "Admins"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:325
-msgid "The required field 'MAC-address' is not set."
+#: plugins/admin/systems/class_servDNS.inc:181
+#: plugins/admin/systems/class_inventory.inc:36
+msgid "Remove DNS service"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:331
+#: plugins/admin/systems/class_servDNS.inc:182
+#: plugins/admin/systems/class_inventory.inc:37
 msgid ""
-"The given macaddress is invalid. There must be 6 1byte segments seperated by "
-"':'."
+"This server has DNS features enabled. You can disable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:346
-#, php-format
-msgid "Found duplicate value for record type '%s'."
+#: plugins/admin/systems/class_servDNS.inc:184
+#: plugins/admin/systems/class_inventory.inc:39
+msgid "Add DNS service"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:352
-#, php-format
-msgid "Found more than one entry for the uniqe record type '%s'."
+#: plugins/admin/systems/class_servDNS.inc:185
+#: plugins/admin/systems/class_inventory.inc:40
+msgid ""
+"This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:360
+#: plugins/admin/systems/class_servDNS.inc:270
 #, php-format
 msgid ""
-"The device IP '%s' is added as 'A Record', this will be done automatically, "
-"please remove the record."
+"Can't delete the selected zone, because it is still in use by these entry/"
+"entries '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:366
-#: plugins/admin/systems/class_servDNSeditZone.inc:386
-#, php-format
-msgid "Only lowercase is allowed, please check your '%ss'."
+#: plugins/admin/systems/class_servDNS.inc:297
+msgid "Reverse zone"
 msgstr ""
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
-msgid "Add/Edit manufacturer"
+#: plugins/admin/systems/class_servDNSeditZone.inc:336
+msgid "This zoneName is already in use"
 msgstr ""
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
-msgid "Website"
+#: plugins/admin/systems/class_servDNSeditZone.inc:339
+msgid "This reverse zone is already in use"
 msgstr ""
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
-#: plugins/admin/ogroups/class_mailogroup.inc:137
-#: plugins/admin/ogroups/class_phonequeue.inc:690
-#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Phone number"
+#: plugins/admin/systems/class_servDNSeditZone.inc:344
+msgid "Primary dns server must end with '.' to be a valid entry."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
-msgid "List of available cartridge type for this type of printer"
+#: plugins/admin/systems/class_servDNSeditZone.inc:348
+msgid "Your specified mail address must end with '.' to be a valid record."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
+#: plugins/admin/systems/class_servDNSeditZone.inc:352
+#: plugins/admin/systems/class_servDNSeditZone.inc:356
 msgid ""
-"This dialog allows you to create new types of cartridges, and select one or "
-"more types for your printer. Cartridge types depends on the printer type you "
-"have selected. For each selected cartridge type there will be a new "
-"cartridge created, this allows you to select the same cartridge type for "
-"more then one printer."
+"Your mail address contains '@' replace this with '.' to enable GOsa to "
+"create a valid SOA record."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
-msgid "Display cartridge types matching"
+#: plugins/admin/systems/class_servDNSeditZone.inc:360
+msgid "Only lowercase strings are allowed as zone name."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
-msgid "Regular expression for matching cartridge types"
+#: plugins/admin/systems/class_servDNSeditZone.inc:364
+msgid "Please specify a numeric value for serial number."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:58
-#, php-format
-msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
+#: plugins/admin/systems/class_servDNSeditZone.inc:368
+msgid "Please specify a numeric value for refresh."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:104
-msgid "Please specify a name."
+#: plugins/admin/systems/class_servDNSeditZone.inc:372
+msgid "Please specify a numeric value for ttl."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:113
-#: plugins/admin/systems/class_glpiManufacturer.inc:119
-msgid "Specified name is already in use, please choose another one."
+#: plugins/admin/systems/class_servDNSeditZone.inc:376
+msgid "Please specify a numeric value for expire."
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:6
-msgid "List of attachments"
+#: plugins/admin/systems/class_servDNSeditZone.inc:380
+msgid "Please specify a numeric value for retry."
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:23
-msgid ""
-"This dialog allow you to attach additional objects (like manuals, guides, "
-"etc.)  to your currently edited computer."
+#: plugins/admin/systems/servdb.tpl:6
+msgid "Kerberos kadmin access"
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:35
-msgid "Display attachments matching"
+#: plugins/admin/systems/servdb.tpl:10
+msgid "Kerberos Realm"
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:37
-msgid "Regular expression for matching attachment names"
+#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
+msgid "Admin user"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
-msgid "Can't delete this entry, it is still in use."
+#: plugins/admin/systems/servdb.tpl:26
+msgid "FAX database"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:305
-msgid "The selected name is already in use."
+#: plugins/admin/systems/servdb.tpl:30
+msgid "FAX DB user"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:9
-#: plugins/admin/systems/SelectDeviceType.tpl:20
-msgid "System type"
+#: plugins/admin/systems/servdb.tpl:42
+msgid "Asterisk management"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:19
-msgid "Operating system"
+#: plugins/admin/systems/servdb.tpl:46
+msgid "Asterisk DB user"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
-msgid "Contacts"
+#: plugins/admin/systems/servdb.tpl:54
+msgid "Country dial prefix"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
-msgid "Contact person"
+#: plugins/admin/systems/servdb.tpl:58
+msgid "Local dial prefix"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:78
-msgid "Installed devices"
+#: plugins/admin/systems/servdb.tpl:70
+msgid "IMAP admin access"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:90
-msgid "Trading"
+#: plugins/admin/systems/servdb.tpl:74
+msgid "Server identifier"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:91
-msgid "Software"
+#: plugins/admin/systems/servdb.tpl:78
+msgid "Connect URL"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:92
-msgid "Contracts"
+#: plugins/admin/systems/servdb.tpl:91
+msgid "Sieve port"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
-msgid "Attachments"
+#: plugins/admin/systems/servdb.tpl:100
+msgid "Logging database"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:7
-msgid "Zone name"
+#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
+msgid "Logging DB user"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:13
-msgid "Network address"
+#: plugins/admin/systems/servdb.tpl:119
+msgid "Glpi database"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:24
-msgid "Zone entries"
+#: plugins/admin/systems/servdb.tpl:133
+msgid "Database"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:35
-msgid "SOA record"
+#: plugins/admin/systems/class_printGeneric.inc:177
+#: plugins/admin/systems/class_printGeneric.inc:184
+#: plugins/admin/systems/class_printGeneric.inc:219
+#: plugins/admin/systems/class_printGeneric.inc:240
+#: plugins/admin/systems/class_printGeneric.inc:243
+msgid "Add printer extension"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:41
-msgid "Primary dns server for this zone"
+#: plugins/admin/systems/class_printGeneric.inc:178
+msgid "This is a workstation template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:53
-msgid "Serial number (automatically incremented)"
+#: plugins/admin/systems/class_printGeneric.inc:185
+msgid "This is a terminal template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:69
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/altlinux/setup_finish.tpl:31
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
+#: plugins/admin/systems/class_printGeneric.inc:220
+msgid ""
+"This workstation has printer extension disabled. You can't enable it while "
+"'cn' is not present in entry. Possibly you are currently creating a new "
+"terminal template"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:75
-msgid "Expire"
+#: plugins/admin/systems/class_printGeneric.inc:232
+#: plugins/admin/systems/class_printGeneric.inc:235
+msgid "Remove printer extension"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:96
-msgid "MxRecords"
+#: plugins/admin/systems/class_printGeneric.inc:233
+msgid ""
+"This workstation has printer extension enabled.You can disable it by "
+"clicking below."
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:108
-msgid "Zone records"
+#: plugins/admin/systems/class_printGeneric.inc:236
+msgid ""
+"This terminal has printer extension enabled. You can disable it by clicking "
+"below."
 msgstr ""
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:6
-msgid "List of devices"
+#: plugins/admin/systems/class_printGeneric.inc:241
+msgid ""
+"This workstation has printer extension disabled. You can enable it by "
+"clicking below."
 msgstr ""
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:23
+#: plugins/admin/systems/class_printGeneric.inc:244
 msgid ""
-"This dialog allows you to attach a device to your currently edited computer."
+"This terminal has printer extension disabled. You can enable it by clicking "
+"below."
 msgstr ""
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:35
-msgid "Display devices matching"
+#: plugins/admin/systems/class_printGeneric.inc:283
+msgid "This 'dn' has no printer features."
 msgstr ""
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:37
-msgid "Regular expression for matching device names"
+#: plugins/admin/systems/class_printGeneric.inc:419
+#, php-format
+msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:73
-#, php-format
-msgid "You're about to delete the glpi attachment component '%s'."
+#: plugins/admin/systems/class_printGeneric.inc:427
+msgid "can't get ppd informations."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:112
+#: plugins/admin/systems/class_printGeneric.inc:439
 #, php-format
-msgid ""
-"You can't delete this attachment, it is still in use by these system(s) '%s'"
+msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:124
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:128
-msgid "There is no valid file uploaded."
+#: plugins/admin/systems/class_printGeneric.inc:441
+#, php-format
+msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:131
-msgid "Upload wasn't successfull."
+#: plugins/admin/systems/class_printGeneric.inc:519
+msgid "You have no permissions to create a printer on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:134
-msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
+#: plugins/admin/systems/servkolab.tpl:14
+msgid "POP3 service"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:138
-msgid "There is already a file with the same name uploaded."
+#: plugins/admin/systems/servkolab.tpl:22
+msgid "POP3/SSL service"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:142
-#, php-format
-msgid "Can't create file '%s'."
+#: plugins/admin/systems/servkolab.tpl:30
+msgid "IMAP service"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:186
-msgid "File is available."
+#: plugins/admin/systems/servkolab.tpl:38
+msgid "IMAP/SSL service"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:188
-msgid "File is not readable, possibly the file is missing."
+#: plugins/admin/systems/servkolab.tpl:46
+msgid "Sieve service"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:191
-msgid "Currently no file uploaded."
+#: plugins/admin/systems/servkolab.tpl:54
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:202
-msgid "Mime"
+#: plugins/admin/systems/servkolab.tpl:62
+msgid "HTTP FreeBusy service (legacy)"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:205
-msgid "This table displays all available attachments."
+#: plugins/admin/systems/servkolab.tpl:70
+msgid "Amavis email scanning (virus/spam)"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:222
-msgid "empty"
+#: plugins/admin/systems/servkolab.tpl:81
+msgid "Quota settings"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
-msgid "Create new attachment"
+#: plugins/admin/systems/servkolab.tpl:97
+msgid "Free/Busy settings"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
-msgid "New Attachment"
+#: plugins/admin/systems/servkolab.tpl:102
+msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:352
-msgid "Please specify a valid name for this attachment."
+#: plugins/admin/systems/servkolab.tpl:117
+msgid "SMTP privileged networks"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
-#, php-format
-msgid "Internal Error can't create device of type '%s'"
+#: plugins/admin/systems/servkolab.tpl:122
+msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
-#, php-format
-msgid "You're about to delete the glpi device '%s'."
+#: plugins/admin/systems/servkolab.tpl:125
+msgid "Enter multiple values, seperated with"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
-msgid "Can't detect object name."
+#: plugins/admin/systems/servkolab.tpl:138
+msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
-#, php-format
-msgid ""
-"You can't delete this device, it is still in use by these system(s) '%s'"
+#: plugins/admin/systems/servkolab.tpl:144
+msgid "Enable MX lookup for relayhost"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
-msgid "devices"
+#: plugins/admin/systems/servkolab.tpl:149
+msgid "Host used to relay mails"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-msgid "New monitor"
+#: plugins/admin/systems/servkolab.tpl:163
+msgid "Accept Internet Mail"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-msgid "M"
+#: plugins/admin/systems/servkolab.tpl:169
+msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
-msgid "New mainbord"
+#: plugins/admin/systems/phonesettings.tpl:1
+msgid "Advanced phone settings"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-msgid "New processor"
+#: plugins/admin/systems/phonesettings.tpl:6
+msgid "Phone type"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
-msgid "New case"
+#: plugins/admin/systems/phonesettings.tpl:7
+#: plugins/admin/systems/phonesettings.tpl:25
+#: plugins/admin/systems/phonesettings.tpl:35
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:78
+#: plugins/admin/systems/phonesettings.tpl:109
+#: plugins/admin/systems/phonesettings.tpl:156
+msgid "Choose a phone type"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
-msgid "C"
+#: plugins/admin/systems/phonesettings.tpl:10
+msgid "refresh"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
-msgid "New network interface"
+#: plugins/admin/systems/phonesettings.tpl:32
+msgid "DTMF mode"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
-msgid "NI"
+#: plugins/admin/systems/phonesettings.tpl:46
+#: plugins/admin/systems/phonesettings.tpl:85
+msgid "Default IP"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
-msgid "New ram"
+#: plugins/admin/systems/phonesettings.tpl:56
+#: plugins/admin/systems/phonesettings.tpl:93
+msgid "Response timeout"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
-msgid "R"
+#: plugins/admin/systems/phonesettings.tpl:75
+msgid "Modus"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
-msgid "New hard disk"
+#: plugins/admin/systems/phonesettings.tpl:106
+msgid "Authtype"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
-msgid "HDD"
+#: plugins/admin/systems/phonesettings.tpl:116
+msgid "Secret"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
-msgid "New drive"
+#: plugins/admin/systems/phonesettings.tpl:124
+msgid "GoFonInkeys"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
-msgid "D"
+#: plugins/admin/systems/phonesettings.tpl:132
+msgid "GoFonOutKeys"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
-msgid "New controller"
+#: plugins/admin/systems/phonesettings.tpl:145
+msgid "Account code"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
-msgid "CS"
+#: plugins/admin/systems/phonesettings.tpl:153
+msgid "Trunk lines"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
-msgid "New graphics card"
+#: plugins/admin/systems/phonesettings.tpl:168
+msgid "Hosts that are allowed to connect"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
-msgid "GC"
+#: plugins/admin/systems/phonesettings.tpl:183
+msgid "Hosts that are not allowed to connect"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
-msgid "New sound card"
+#: plugins/admin/systems/phonesettings.tpl:205
+msgid "MSN"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
-msgid "SC"
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
-msgid "New power supply"
+#: plugins/admin/systems/remove.tpl:6
+msgid ""
+"This includes <b>all</b> system and setup informations. Please double check "
+"if your really want to do this since there is no way for GOsa to get your "
+"data back."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
-msgid "PS"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:73
+#, php-format
+msgid "You're about to delete the glpi attachment component '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
-msgid "New misc device"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:112
+#, php-format
+msgid ""
+"You can't delete this attachment, it is still in use by these system(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
-msgid "OC"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:124
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:128
+msgid "There is no valid file uploaded."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:346
-msgid "You have to specify a valid name for this device."
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:131
+msgid "Upload wasn't successfull."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:366
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:369
-msgid "This device name is already in use."
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:134
+msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
-msgid "Other"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:138
+msgid "There is already a file with the same name uploaded."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:9
-msgid "Printer type"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:142
+#, php-format
+msgid "Can't create file '%s'."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:31
-msgid "Supported interfaces"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:186
+msgid "File is available."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:38
-msgid "Serial"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:188
+msgid "File is not readable, possibly the file is missing."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:46
-msgid "Parallel"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:191
+msgid "Currently no file uploaded."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:54
-msgid "USB"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:202
+msgid "Mime"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:114
-msgid "Installed cartridges"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:205
+msgid "This table displays all available attachments."
 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_glpiAttachmentPool.inc:222
+msgid "empty"
 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_glpiAttachmentPool.inc:259
+msgid "Create new attachment"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
-msgid "Cartridges"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
+msgid "New Attachment"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:2
-msgid "Add/Edit monitor"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:352
+msgid "Please specify a valid name for this attachment."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:33
-msgid "Monitor size"
+#: plugins/admin/systems/headpage.tpl:6
+msgid "List of systems"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:36
-msgid "Inch"
+#: plugins/admin/systems/headpage.tpl:24
+msgid ""
+"This menu allows you to add, remove and change the properties of specific "
+"systems. You can only add systems which have already been started once."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:44
-msgid "Integrated microphone"
+#: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:47
-#: plugins/admin/systems/glpi_devices.tpl:55
-#: plugins/admin/systems/glpi_devices.tpl:63
-#: plugins/admin/systems/glpi_devices.tpl:71
-#: plugins/admin/systems/glpi_devices.tpl:176
-#: plugins/admin/systems/glpi_devices.tpl:296
-#: plugins/admin/systems/glpi_devices.tpl:361
-msgid "Yes"
+#: plugins/admin/systems/headpage.tpl:39
+msgid "Select to see Linux terminals"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:48
-#: plugins/admin/systems/glpi_devices.tpl:56
-#: plugins/admin/systems/glpi_devices.tpl:64
-#: plugins/admin/systems/glpi_devices.tpl:72
-#: plugins/admin/systems/glpi_devices.tpl:177
-#: plugins/admin/systems/glpi_devices.tpl:297
-#: plugins/admin/systems/glpi_devices.tpl:362
-msgid "No"
+#: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:52
-msgid "Integrated speakers"
+#: plugins/admin/systems/headpage.tpl:40
+msgid "Select to see Linux workstations"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:60
-msgid "Sub-D"
+#: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:68
-msgid "BNC"
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Select to see MicroSoft Windows based workstations"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:76
-msgid "Serial number"
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Show windows based workstations"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:83
-msgid "Additional serial number"
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Select to see network printers"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:97
-msgid "Add/Edit other device"
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Show network printers"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:138
-msgid "Add/Edit power supply"
+#: plugins/admin/systems/headpage.tpl:43
+msgid "Select to see VOIP phones"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:173
-msgid "Atx"
+#: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:181
-msgid "Power"
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Select to see network devices"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:193
-msgid "Add/Edit graphic card"
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Show network devices"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:228
-#: plugins/admin/systems/glpi_devices.tpl:284
-#: plugins/admin/systems/glpi_devices.tpl:349
-msgid "Interface"
+#: plugins/admin/systems/headpage.tpl:52
+msgid "Regular expression for matching system names"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:237
-msgid "Ram"
+#: plugins/admin/systems/headpage.tpl:59
+msgid "Display systems of user"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:249
-msgid "Add/Edit controller"
+#: plugins/admin/systems/headpage.tpl:62
+msgid "User name of which terminal(s) are shown"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:307
-msgid "Add/Edit drive"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:6
+msgid "List of attachments"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:342
-msgid "Speed"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:23
+msgid ""
+"This dialog allow you to attach additional objects (like manuals, guides, "
+"etc.)  to your currently edited computer."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:358
-msgid "Writeable"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:35
+msgid "Display attachments matching"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:371
-msgid "Add/Edit harddisk"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:37
+msgid "Regular expression for matching attachment names"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:406
-msgid "Rpm"
+#: plugins/admin/systems/password.tpl:2
+msgid ""
+"To change the terminal root password use the fields below. The changes take "
+"effect during the next reboot. Please memorize the new password, because you "
+"wouldn't be able to log in."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:413
-msgid "Cache"
+#: plugins/admin/systems/password.tpl:5
+msgid "Leave fields blank for password inheritance from default entries."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:443
-msgid "Add/Edit memory"
+#: plugins/admin/systems/password.tpl:9
+msgid "Changing the password impinges on authentification only."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:478
-msgid "Frequenz"
+#: plugins/admin/systems/chooser.tpl:1
+msgid "Choose the kind of system component you want to create"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:507
-msgid "Add/Edit sound card"
+#: 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/glpi_devices.tpl:553
-msgid "Add/Edit network interface"
+#: plugins/admin/systems/chooser.tpl:7
+msgid "Linux thin client template"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:589
-msgid "MAC address"
+#: plugins/admin/systems/chooser.tpl:8
+msgid "Linux workstation template"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:607
-msgid "Add/Edit processor"
+#: plugins/admin/systems/chooser.tpl:9
+msgid "Linux Server"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:642
-msgid "Frequence"
+#: plugins/admin/systems/chooser.tpl:10
+msgid "Windows workstation"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:649
-msgid "Default frequence"
+#: plugins/admin/systems/chooser.tpl:11
+msgid "Network printer"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:661
-msgid "Add/Edit motherboard"
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:696
-msgid "Chipset"
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:707
-msgid "Add/Edit computer case"
+#: plugins/admin/systems/class_glpiManufacturer.inc:58
+#, php-format
+msgid ""
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiManufacturer.inc:104
+msgid "Please specify a name."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:742
-msgid "format"
+#: plugins/admin/systems/class_glpiManufacturer.inc:113
+#: plugins/admin/systems/class_glpiManufacturer.inc:119
+msgid "Specified name is already in use, please choose another one."
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
-msgid "Attachment"
+#: plugins/admin/systems/class_phoneGeneric.inc:105
+msgid "This 'dn' has no phone features."
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
-msgid "Filename"
+#: plugins/admin/systems/class_phoneGeneric.inc:202
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+msgid "yes"
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
-msgid "Mime-type"
+#: plugins/admin/systems/class_phoneGeneric.inc:202
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
+msgid "no"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:336
-msgid "This zoneName is already in use"
+#: plugins/admin/systems/class_phoneGeneric.inc:223
+msgid "dynamic"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:339
-msgid "This reverse zone is already in use"
+#: plugins/admin/systems/class_phoneGeneric.inc:223
+msgid "Networksettings"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:344
-msgid "Primary dns server must end with '.' to be a valid entry."
+#: plugins/admin/systems/class_phoneGeneric.inc:238
+#, php-format
+msgid ""
+"Can't delete because there are user which are depending on this phone. One "
+"of them is user '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:348
-msgid "Your specified mail address must end with '.' to be a valid record."
+#: plugins/admin/systems/class_phoneGeneric.inc:294
+msgid "The required field 'Phone name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:352
-#: plugins/admin/systems/class_servDNSeditZone.inc:356
-msgid ""
-"Your mail address contains '@' replace this with '.' to enable GOsa to "
-"create a valid SOA record."
+#: plugins/admin/systems/class_phoneGeneric.inc:297
+msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:360
-msgid "Only lowercase strings are allowed as zone name."
+#: plugins/admin/systems/class_phoneGeneric.inc:304
+msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:364
-msgid "Please specify a numeric value for serial number."
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
+msgid "Printer ppd selection."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:368
-msgid "Please specify a numeric value for refresh."
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
+msgid "Select entries to add"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:372
-msgid "Please specify a numeric value for ttl."
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
+msgid "Display members of department"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:376
-msgid "Please specify a numeric value for expire."
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
+msgid "Display members matching"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:380
-msgid "Please specify a numeric value for retry."
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
+msgid "Regular expression for matching member names"
 msgstr ""
 
 #: plugins/admin/systems/SelectDeviceType.tpl:3
@@ -9253,54 +9424,21 @@ msgstr ""
 msgid "There is a duplicate entry in '%s' for '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:97
-msgid "Remove FAI repository extension."
-msgstr ""
-
-#: plugins/admin/systems/class_servRepository.inc:98
-msgid ""
-"This server has FAI repository features enabled. You can disable them by "
-"clicking below."
-msgstr ""
-
-#: plugins/admin/systems/class_servRepository.inc:100
-msgid "Add FAI repository extension."
-msgstr ""
-
-#: plugins/admin/systems/class_servRepository.inc:101
-msgid ""
-"This server has FAI repository features disabled. You can enable them by "
-"clicking below."
-msgstr ""
-
-#: plugins/admin/systems/class_servRepository.inc:144
-#, php-format
-msgid ""
-"You can't delete this release, it is still used by these workstations [%s]. "
-"Please solve this dependencies first, to keep data base consistency."
-msgstr ""
-
-#: plugins/admin/systems/class_servRepository.inc:176
-#, php-format
-msgid ""
-"Be careful editing this release, it is still used by these workstations [%s]."
-msgstr ""
-
 #: plugins/admin/systems/class_baseSelectDialog.inc:23
 msgid "Choose a base"
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:33
+#: plugins/admin/systems/class_baseSelectDialog.inc:34
 msgid ""
 "Step in the prefered tree and click save to use the current subtree as base. "
 "Or click the image at the end of each entry."
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:50
+#: plugins/admin/systems/class_baseSelectDialog.inc:51
 msgid "Filter entries with this syntax"
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:114
+#: plugins/admin/systems/class_baseSelectDialog.inc:115
 #, php-format
 msgid "Select this base"
 msgstr ""
@@ -9402,52 +9540,6 @@ msgstr ""
 msgid "Select action to execute for this   group of terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
-msgid "Object groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:54
-msgid "UNIX accounts"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:58 html/getxls.php:149
-#: html/getxls.php:151 html/getxls.php:158 html/getxls.php:179
-#: html/getxls.php:245 html/getxls.php:316
-msgid "Servers"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:59
-msgid "Thin Clients"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:60
-msgid "Workstations"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:279
-#, php-format
-msgid "You're about to delete the object group '%s'."
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:285
-#: plugins/admin/ogroups/class_ogroupManagement.inc:311
-msgid "You are not allowed to delete this object group!"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:448
-msgid "Create new object group"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:492
-msgid "Name of object groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:541
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
-msgstr ""
-
 #: plugins/admin/ogroups/class_ogroup.inc:144
 msgid "This 'dn' is no object group."
 msgstr ""
@@ -9508,6 +9600,52 @@ msgstr ""
 msgid "You can combine two different object types at maximum only!"
 msgstr ""
 
+#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+msgid "Object groups"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:54
+msgid "UNIX accounts"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:58 html/getxls.php:149
+#: html/getxls.php:151 html/getxls.php:158 html/getxls.php:179
+#: html/getxls.php:245 html/getxls.php:316
+msgid "Servers"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:59
+msgid "Thin Clients"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:60
+msgid "Workstations"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:279
+#, php-format
+msgid "You're about to delete the object group '%s'."
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:285
+#: plugins/admin/ogroups/class_ogroupManagement.inc:311
+msgid "You are not allowed to delete this object group!"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:449
+msgid "Create new object group"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:493
+msgid "Name of object groups"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:542
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
+msgstr ""
+
 #: plugins/admin/ogroups/generic.tpl:9
 msgid "Name of the group"
 msgstr ""
@@ -9809,6 +9947,71 @@ msgstr ""
 msgid "Ring instead of playing background music"
 msgstr ""
 
+#: plugins/gofon/fonreports/class_fonreport.inc:6
+msgid "Phone Reports"
+msgstr ""
+
+#: plugins/gofon/fonreports/class_fonreport.inc:96
+#: plugins/gofon/fonreports/class_fonreport.inc:106
+msgid "Can't connect to phone database, no reports can be shown!"
+msgstr ""
+
+#: plugins/gofon/fonreports/class_fonreport.inc:110
+msgid "Can't select phone database for report generation!"
+msgstr ""
+
+#: plugins/gofon/fonreports/class_fonreport.inc:212
+msgid "Query for phone database failed!"
+msgstr ""
+
+#: plugins/gofon/fonreports/contents.tpl:31
+msgid "Source"
+msgstr ""
+
+#: plugins/gofon/fonreports/contents.tpl:32
+msgid "Destination"
+msgstr ""
+
+#: plugins/gofon/fonreports/contents.tpl:33
+msgid "Channel"
+msgstr ""
+
+#: plugins/gofon/fonreports/contents.tpl:36
+msgid "Duration"
+msgstr ""
+
+#: plugins/gofon/fonreports/main.inc:5
+msgid "Phone reports"
+msgstr ""
+
+#: plugins/gofon/macro/parameter.tpl:3
+msgid "Argument"
+msgstr ""
+
+#: plugins/gofon/macro/parameter.tpl:7
+msgid "type"
+msgstr ""
+
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+msgid "Macro name"
+msgstr ""
+
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
+msgstr ""
+
+#: plugins/gofon/macro/generic.tpl:22
+msgid "Choose subtree to place macro in"
+msgstr ""
+
+#: plugins/gofon/macro/generic.tpl:43
+msgid "Visible for user"
+msgstr ""
+
+#: plugins/gofon/macro/generic.tpl:52
+msgid "Macro text"
+msgstr ""
+
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:25
 msgid "Phone macros"
 msgstr ""
@@ -9823,27 +10026,27 @@ msgstr ""
 msgid "You are not allowed to delete this macro!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
 msgid "Create new phone macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
 msgid "Visible"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:348
 msgid "This table displays all phone macros, in the selected tree."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
 msgid "Macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
 msgid "visible"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
 msgid "invisible"
 msgstr ""
 
@@ -9921,24 +10124,27 @@ msgstr ""
 msgid "Please choose a valid  base."
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
-msgid "Macro name"
+#: plugins/gofon/macro/headpage.tpl:6
+msgid "List of macros"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
+#: plugins/gofon/macro/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit and remove selected macros. You may want "
+"to use the range selector on top of the macro listbox, when working with a "
+"large number of macros."
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:22
-msgid "Choose subtree to place macro in"
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros matching"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:43
-msgid "Visible for user"
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros  matching"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:52
-msgid "Macro text"
+#: plugins/gofon/macro/headpage.tpl:41
+msgid "Regular expression for matching macro names"
 msgstr ""
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:245
@@ -9980,39 +10186,13 @@ msgid ""
 "using this macro '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:6
-msgid "List of macros"
-msgstr ""
-
-#: plugins/gofon/macro/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit and remove selected macros. You may want "
-"to use the range selector on top of the macro listbox, when working with a "
-"large number of macros."
-msgstr ""
-
-#: plugins/gofon/macro/headpage.tpl:38
-msgid "Display macros matching"
-msgstr ""
-
-#: plugins/gofon/macro/headpage.tpl:38
-msgid "Display macros  matching"
-msgstr ""
-
-#: plugins/gofon/macro/headpage.tpl:41
-msgid "Regular expression for matching macro names"
-msgstr ""
-
 #: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
 msgid "Phone macro management"
 msgstr ""
 
-#: plugins/gofon/macro/parameter.tpl:3
-msgid "Argument"
-msgstr ""
-
-#: plugins/gofon/macro/parameter.tpl:7
-msgid "type"
+#: plugins/gofon/phoneaccount/main.inc:122
+#: plugins/gofon/phoneaccount/paste_generic.tpl:1
+msgid "Phone settings"
 msgstr ""
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:118
@@ -10128,44 +10308,6 @@ msgstr ""
 msgid "Phone macro"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/main.inc:122
-#: plugins/gofon/phoneaccount/paste_generic.tpl:1
-msgid "Phone settings"
-msgstr ""
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
-msgid "Phone conferences"
-msgstr ""
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-msgid "Management"
-msgstr ""
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
-msgid "Create new conference"
-msgstr ""
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
-msgid "New conference"
-msgstr ""
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
-msgid "This table displays all available conference rooms."
-msgstr ""
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:309
-msgid "Name - Number"
-msgstr ""
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
-#: plugins/gofon/conference/generic.tpl:107
-msgid "PIN"
-msgstr ""
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:365
-msgid "Conference"
-msgstr ""
-
 #: plugins/gofon/conference/generic.tpl:13
 msgid "Conference name"
 msgstr ""
@@ -10187,6 +10329,11 @@ msgstr ""
 msgid "Preset PIN"
 msgstr ""
 
+#: plugins/gofon/conference/generic.tpl:107
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
+msgid "PIN"
+msgstr ""
+
 #: plugins/gofon/conference/generic.tpl:113
 msgid "Record conference"
 msgstr ""
@@ -10211,33 +10358,32 @@ msgstr ""
 msgid "Count users"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
-msgid ""
-"You have specified a conference 'without PIN' ... please leave the PIN "
-"fields empty."
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+msgid "Phone conferences"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:194
-msgid "Please enter a PIN."
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Management"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:198
-msgid "Please enter a name for the conference."
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
+msgid "Create new conference"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:202
-msgid "Only numeric chars are allowed in Number field."
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
+msgid "New conference"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:206
-msgid "Only numbers are allowed in Lifetime."
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:306
+msgid "This table displays all available conference rooms."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:236
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:346
-msgid ""
-"Can't save any changes to asterisk database, there is currently no mysql "
-"extension available in your php setup."
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
+msgid "Name - Number"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:366
+msgid "Conference"
 msgstr ""
 
 #: plugins/gofon/conference/headpage.tpl:6
@@ -10255,45 +10401,37 @@ msgstr ""
 msgid "Regular expression for        matching user names"
 msgstr ""
 
-#: plugins/gofon/conference/main.inc:38 plugins/gofon/conference/main.inc:40
-msgid "Conference management"
-msgstr ""
-
-#: plugins/gofon/fonreports/class_fonreport.inc:6
-msgid "Phone Reports"
-msgstr ""
-
-#: plugins/gofon/fonreports/class_fonreport.inc:96
-#: plugins/gofon/fonreports/class_fonreport.inc:106
-msgid "Can't connect to phone database, no reports can be shown!"
-msgstr ""
-
-#: plugins/gofon/fonreports/class_fonreport.inc:110
-msgid "Can't select phone database for report generation!"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
+msgid ""
+"You have specified a conference 'without PIN' ... please leave the PIN "
+"fields empty."
 msgstr ""
 
-#: plugins/gofon/fonreports/class_fonreport.inc:212
-msgid "Query for phone database failed!"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:194
+msgid "Please enter a PIN."
 msgstr ""
 
-#: plugins/gofon/fonreports/contents.tpl:31
-msgid "Source"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:198
+msgid "Please enter a name for the conference."
 msgstr ""
 
-#: plugins/gofon/fonreports/contents.tpl:32
-msgid "Destination"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:202
+msgid "Only numeric chars are allowed in Number field."
 msgstr ""
 
-#: plugins/gofon/fonreports/contents.tpl:33
-msgid "Channel"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:206
+msgid "Only numbers are allowed in Lifetime."
 msgstr ""
 
-#: plugins/gofon/fonreports/contents.tpl:36
-msgid "Duration"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:236
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:346
+msgid ""
+"Can't save any changes to asterisk database, there is currently no mysql "
+"extension available in your php setup."
 msgstr ""
 
-#: plugins/gofon/fonreports/main.inc:5
-msgid "Phone reports"
+#: plugins/gofon/conference/main.inc:38 plugins/gofon/conference/main.inc:40
+msgid "Conference management"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:46
@@ -10334,22 +10472,63 @@ msgstr ""
 msgid "Welcome %s!"
 msgstr ""
 
-#: include/class_plugin.inc:465
-#, php-format
+#: include/class_mail-methods-cyrus.inc:39
 msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+"Warning: Account has an invalid mailserver string! Please check the mail "
+"server settings in the mail tab."
 msgstr ""
 
-#: include/class_plugin.inc:493 include/class_password-methods.inc:181
-#, php-format
+#: include/class_mail-methods-cyrus.inc:52
 msgid ""
-"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+"Warning: IMAP Server cannot be reached! If you save this account, some mail "
+"settings will not be stored on your server!"
 msgstr ""
 
-#: include/class_plugin.inc:521
+#: include/class_mail-methods-cyrus.inc:115
 #, php-format
-msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgid "Can't create IMAP mailbox. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:131
+#, php-format
+msgid "Can't write IMAP quota. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:155
+msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:173
+msgid "Warning: imap_getacl is not available, can't get imap permissions!"
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:195
+#, php-format
+msgid "Can't remove IMAP mailbox. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:223
+#, php-format
+msgid "Can't log into SIEVE server. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:236
+#, php-format
+msgid "Can't get sieve script. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:307
+#, php-format
+msgid "Can't send sieve script. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:311
+#, php-format
+msgid "Can't activate GOsa sieve script. Server says '%s'."
+msgstr ""
+
+#: include/class_debconfTemplate.inc:250
+msgid "This package has no debconf options."
 msgstr ""
 
 #: include/functions_setup.inc:98
@@ -10766,6 +10945,7 @@ msgstr ""
 #: include/functions_setup.inc:1082 html/index.php:181
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
+#: ihtml/themes/lhs/setup_useradmin.tpl:6
 msgid ""
 "You're missing an administrative account for GOsa, you'll not be able to "
 "administrate anything!"
@@ -10776,6 +10956,12 @@ msgstr ""
 msgid "Setting the password failed. LDAP server says '%s'."
 msgstr ""
 
+#: include/class_password-methods.inc:181 include/class_plugin.inc:493
+#, php-format
+msgid ""
+"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+msgstr ""
+
 #: include/class_password-methods.inc:202
 msgid ""
 "Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
@@ -10801,29 +10987,15 @@ msgstr ""
 #: include/functions_helpviewer.inc:99
 msgid "next"
 msgstr ""
-
-#: include/functions_helpviewer.inc:387
-#, php-format
-msgid "%s results for your search with the keyword %s interpreted as %s"
-msgstr ""
-
-#: include/functions_helpviewer.inc:462
-#, php-format
-msgid "%s%% hit rate in file %s"
-msgstr ""
-
-#: include/class_password-methods-kerberos.inc:43
-msgid ""
-"Warning: Can't set kerberos password. Your PHP version has no kerberos "
-"support, password has not been changed."
-msgstr ""
-
-#: include/class_password-methods-kerberos.inc:52
-msgid "Kerberos database communication failed!"
+
+#: include/functions_helpviewer.inc:387
+#, php-format
+msgid "%s results for your search with the keyword %s interpreted as %s"
 msgstr ""
 
-#: include/class_password-methods-kerberos.inc:59
-msgid "Changing password in kerberos database failed!"
+#: include/functions_helpviewer.inc:462
+#, php-format
+msgid "%s%% hit rate in file %s"
 msgstr ""
 
 #: include/class_ppdManager.inc:13
@@ -10863,6 +11035,20 @@ msgstr ""
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 
+#: include/class_password-methods-kerberos.inc:43
+msgid ""
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
+msgstr ""
+
+#: include/class_password-methods-kerberos.inc:52
+msgid "Kerberos database communication failed!"
+msgstr ""
+
+#: include/class_password-methods-kerberos.inc:59
+msgid "Changing password in kerberos database failed!"
+msgstr ""
+
 #: include/class_certificate.inc:35
 msgid "Can't open specified file, check accessibility and or existence"
 msgstr ""
@@ -11044,6 +11230,7 @@ msgstr ""
 #: include/class_pluglist.inc:130 ihtml/themes/altlinux/framework.tpl:14
 #: ihtml/themes/altlinux/framework.tpl:24
 #: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
+#: ihtml/themes/lhs/framework.tpl:14 ihtml/themes/lhs/framework.tpl:24
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
 "changes?"
@@ -11062,110 +11249,72 @@ msgstr ""
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr ""
 
-#: include/class_ldap.inc:406
+#: include/class_ldap.inc:405
 #, php-format
-msgid "Creating duplicate of %s in %s"
+msgid "Creating copy of %s"
 msgstr ""
 
-#: include/class_ldap.inc:409
+#: include/class_ldap.inc:408
 msgid "Processing"
 msgstr ""
 
-#: include/class_ldap.inc:515
-#, php-format
-msgid "Unknown FAIstate %s"
+#: include/class_ldap.inc:448
+msgid "Error while fetching source dn - aborted!"
 msgstr ""
 
-#: include/class_ldap.inc:558
-msgid "Successfully finished"
+#: include/class_ldap.inc:511
+#, php-format
+msgid "Unknown FAIstate %s"
 msgstr ""
 
-#: include/class_ldap.inc:635
+#: include/class_ldap.inc:632
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
 "GOsa team."
 msgstr ""
 
-#: include/class_ldap.inc:897
+#: include/class_ldap.inc:894
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:910
+#: include/class_ldap.inc:907
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr ""
 
-#: include/class_ldap.inc:926
+#: include/class_ldap.inc:923
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_debconfTemplate.inc:250
-msgid "This package has no debconf options."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:39
-msgid ""
-"Warning: Account has an invalid mailserver string! Please check the mail "
-"server settings in the mail tab."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:52
-msgid ""
-"Warning: IMAP Server cannot be reached! If you save this account, some mail "
-"settings will not be stored on your server!"
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:115
-#, php-format
-msgid "Can't create IMAP mailbox. Server says '%s'."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:131
-#, php-format
-msgid "Can't write IMAP quota. Server says '%s'."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:155
-msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:173
-msgid "Warning: imap_getacl is not available, can't get imap permissions!"
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:195
-#, php-format
-msgid "Can't remove IMAP mailbox. Server says '%s'."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:223
+#: include/class_plugin.inc:465
 #, php-format
-msgid "Can't log into SIEVE server. Server says '%s'."
+msgid ""
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:236
+#: include/class_plugin.inc:521
 #, php-format
-msgid "Can't get sieve script. Server says '%s'."
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:307
+#: include/class_CopyPasteHandler.inc:172
 #, php-format
-msgid "Can't send sieve script. Server says '%s'."
+msgid "You are going to copy the entry '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:311
-#, php-format
-msgid "Can't activate GOsa sieve script. Server says '%s'."
+#: html/helpviewer.php:116
+msgid "There is no helpfile specified for this class."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:172
+#: html/helpviewer.php:226
 #, php-format
-msgid "You are going to copy the entry '%s'."
+msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
 msgstr ""
 
 #: html/getvcard.php:36
@@ -11330,15 +11479,6 @@ msgid ""
 "page before logging in!"
 msgstr ""
 
-#: html/helpviewer.php:116
-msgid "There is no helpfile specified for this class."
-msgstr ""
-
-#: html/helpviewer.php:226
-#, php-format
-msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
-msgstr ""
-
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
 msgstr ""
@@ -11351,6 +11491,16 @@ msgstr ""
 msgid "Database query failed!"
 msgstr ""
 
+#: html/getkiosk.php:25
+#, php-format
+msgid "Can't open file '%s', possibly the file does not exist."
+msgstr ""
+
+#: html/getkiosk.php:30
+#, php-format
+msgid "Can't read file '%s', check permissions."
+msgstr ""
+
 #: html/main.php:151
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
@@ -11372,16 +11522,6 @@ msgid ""
 "some errors!"
 msgstr ""
 
-#: html/getkiosk.php:25
-#, php-format
-msgid "Can't open file '%s', possibly the file does not exist."
-msgstr ""
-
-#: html/getkiosk.php:30
-#, php-format
-msgid "Can't read file '%s', check permissions."
-msgstr ""
-
 #: html/get_attachment.php:47
 msgid ""
 "Can't connect to glpi database, there is no mysl extension available in your "
@@ -11402,11 +11542,39 @@ msgstr ""
 msgid "Can't open file '%s'."
 msgstr ""
 
+#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
+#: ihtml/themes/lhs/sizelimit.tpl:3
+msgid ""
+"The size limit option makes LDAP operations faster and saves the LDAP server "
+"from getting too much load. The easiest way to handle big databases without "
+"long timeouts would be to limit your search to smaller values and use "
+"filters to get the entries you are looking for."
+msgstr ""
+
+#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
+#: ihtml/themes/lhs/sizelimit.tpl:6
+msgid "Please choose the way to react for this session"
+msgstr ""
+
+#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
+#: ihtml/themes/lhs/sizelimit.tpl:9
+msgid "ignore this error and show all entries the LDAP server returns"
+msgstr ""
+
+#: ihtml/themes/altlinux/sizelimit.tpl:10
+#: ihtml/themes/default/sizelimit.tpl:10 ihtml/themes/lhs/sizelimit.tpl:10
+msgid ""
+"ignore this error and show all entries that fit into the defined sizelimit "
+"and let me use filters instead"
+msgstr ""
+
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
+#: ihtml/themes/lhs/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr ""
 
 #: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/default/conflict.tpl:6
+#: ihtml/themes/lhs/conflict.tpl:6
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
@@ -11415,17 +11583,41 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/altlinux/conflict.tpl:10 ihtml/themes/default/conflict.tpl:10
+#: ihtml/themes/lhs/conflict.tpl:10
 msgid ""
 "Ignoring this message will change/destroy the data you're currently editing, "
 "so please close multiple windows and log in again."
 msgstr ""
 
 #: ihtml/themes/altlinux/conflict.tpl:14 ihtml/themes/default/conflict.tpl:14
+#: ihtml/themes/lhs/conflict.tpl:14
 msgid "Logout"
 msgstr ""
 
+#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
+#: ihtml/themes/lhs/login.tpl:17
+msgid "Please use your <i>username</i> and <i>password</i> to log in"
+msgstr ""
+
+#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
+#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
+#: ihtml/themes/lhs/login.tpl:46 ihtml/themes/lhs/login.tpl:49
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:57
+#: ihtml/themes/lhs/login.tpl:57
+msgid "Sign in"
+msgstr ""
+
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:58
+#: ihtml/themes/lhs/login.tpl:58
+msgid "Click here to log in"
+msgstr ""
+
 #: ihtml/themes/altlinux/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
+#: ihtml/themes/lhs/setup_introduction.tpl:1
 msgid "Welcome to the GOsa setup!"
 msgstr ""
 
@@ -11441,11 +11633,13 @@ msgstr ""
 
 #: ihtml/themes/altlinux/setup_useradmin.tpl:3
 #: ihtml/themes/default/setup_useradmin.tpl:3
+#: ihtml/themes/lhs/setup_useradmin.tpl:3
 msgid "You already have an Administrative Account and a Group."
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_useradmin.tpl:10
 #: ihtml/themes/default/setup_useradmin.tpl:10
+#: ihtml/themes/lhs/setup_useradmin.tpl:10
 msgid ""
 "To provide full administrative access to GOsa, you need to create a special "
 "group which contains the administrative user. The setup program can assist "
@@ -11453,95 +11647,57 @@ msgid ""
 "create the missing entries."
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
-msgid "Please use your <i>username</i> and <i>password</i> to log in"
-msgstr ""
-
-#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
-#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
-msgid "Directory"
-msgstr ""
-
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:57
-msgid "Sign in"
-msgstr ""
-
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:58
-msgid "Click here to log in"
-msgstr ""
-
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
-msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
-"filters to get the entries you are looking for."
-msgstr ""
-
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
-msgid "Please choose the way to react for this session"
-msgstr ""
-
-#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
-msgid "ignore this error and show all entries the LDAP server returns"
-msgstr ""
-
-#: ihtml/themes/altlinux/sizelimit.tpl:10
-#: ihtml/themes/default/sizelimit.tpl:10
-msgid ""
-"ignore this error and show all entries that fit into the defined sizelimit "
-"and let me use filters instead"
-msgstr ""
-
 #: ihtml/themes/altlinux/framework.tpl:15
-#: ihtml/themes/default/framework.tpl:15
+#: ihtml/themes/default/framework.tpl:15 ihtml/themes/lhs/framework.tpl:15
 msgid "Main"
 msgstr ""
 
 #: ihtml/themes/altlinux/framework.tpl:20
-#: ihtml/themes/default/framework.tpl:20
+#: ihtml/themes/default/framework.tpl:20 ihtml/themes/lhs/framework.tpl:20
 msgid "Help"
 msgstr ""
 
 #: ihtml/themes/altlinux/framework.tpl:25
-#: ihtml/themes/default/framework.tpl:25
+#: ihtml/themes/default/framework.tpl:25 ihtml/themes/lhs/framework.tpl:25
 msgid "Sign out"
 msgstr ""
 
 #: ihtml/themes/altlinux/framework.tpl:33
-#: ihtml/themes/default/framework.tpl:33
+#: ihtml/themes/default/framework.tpl:33 ihtml/themes/lhs/framework.tpl:33
 msgid "Signed in:"
 msgstr ""
 
-#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
-msgid "Locking conflict detected"
-msgstr ""
-
-#: ihtml/themes/altlinux/islocked.tpl:9
-msgid ""
-"If this lock detection is false, the other person has obviously closed the "
-"webbrowser during the edit operation. You may delete the lockfile in this "
-"case by pressing the <i>Remove</i> button."
-msgstr ""
-
 #: ihtml/themes/altlinux/setup_step2.tpl:1
 #: ihtml/themes/altlinux/setup_step3.tpl:1
 #: ihtml/themes/altlinux/setup_step4.tpl:1
 #: ihtml/themes/default/setup_step2.tpl:1
 #: ihtml/themes/default/setup_step3.tpl:1
-#: ihtml/themes/default/setup_step4.tpl:1
+#: ihtml/themes/default/setup_step4.tpl:1 ihtml/themes/lhs/setup_step2.tpl:1
+#: ihtml/themes/lhs/setup_step3.tpl:1 ihtml/themes/lhs/setup_step4.tpl:1
 msgid "Setup continued..."
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step2.tpl:4
-#: ihtml/themes/default/setup_step2.tpl:4
+#: ihtml/themes/default/setup_step2.tpl:4 ihtml/themes/lhs/setup_step2.tpl:4
 msgid ""
 "Step two looks for a set of helper programms and checks if they have the "
 "correct minimum version."
 msgstr ""
 
+#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
+#: ihtml/themes/lhs/islocked.tpl:2
+msgid "Locking conflict detected"
+msgstr ""
+
+#: ihtml/themes/altlinux/islocked.tpl:9 ihtml/themes/lhs/islocked.tpl:9
+msgid ""
+"If this lock detection is false, the other person has obviously closed the "
+"webbrowser during the edit operation. You may delete the lockfile in this "
+"case by pressing the <i>Remove</i> button."
+msgstr ""
+
 #: ihtml/themes/altlinux/setup_step3.tpl:4
-#: ihtml/themes/default/setup_step3.tpl:4
+#: ihtml/themes/default/setup_step3.tpl:4 ihtml/themes/lhs/setup_step3.tpl:4
 msgid ""
 "Now we're going include your LDAP server and create an initial "
 "configuration. After you've entered the server URI below, a quick check is "
@@ -11551,31 +11707,31 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step3.tpl:10
-#: ihtml/themes/default/setup_step3.tpl:10
+#: ihtml/themes/default/setup_step3.tpl:10 ihtml/themes/lhs/setup_step3.tpl:10
 msgid ""
 "Please enter the server URI to allow the setup to connect your LDAP server "
 "<i>(Example: ldap://your.server:389).</i>"
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:2
-#: ihtml/themes/default/setup_step4.tpl:2
+#: ihtml/themes/default/setup_step4.tpl:2 ihtml/themes/lhs/setup_step4.tpl:2
 msgid ""
 "The following fields allow the basic configuration of GOsa's behaviour and "
 "affect various properties in your main configuration."
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:7
-#: ihtml/themes/default/setup_step4.tpl:7
+#: ihtml/themes/default/setup_step4.tpl:7 ihtml/themes/lhs/setup_step4.tpl:7
 msgid "Enter a description for the location you're configuring here"
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:11
-#: ihtml/themes/default/setup_step4.tpl:11
+#: ihtml/themes/default/setup_step4.tpl:11 ihtml/themes/lhs/setup_step4.tpl:11
 msgid "Location name"
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:18
-#: ihtml/themes/default/setup_step4.tpl:18
+#: ihtml/themes/default/setup_step4.tpl:18 ihtml/themes/lhs/setup_step4.tpl:18
 msgid ""
 "GOsa always acts as admin and manages access rights internally. This is a "
 "workaround till OpenLDAP's in directory ACI's are fully implemented. For "
@@ -11583,17 +11739,17 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:23
-#: ihtml/themes/default/setup_step4.tpl:23
+#: ihtml/themes/default/setup_step4.tpl:23 ihtml/themes/lhs/setup_step4.tpl:23
 msgid "Admin DN"
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:27
-#: ihtml/themes/default/setup_step4.tpl:27
+#: ihtml/themes/default/setup_step4.tpl:27 ihtml/themes/lhs/setup_step4.tpl:27
 msgid "Admin password"
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:34
-#: ihtml/themes/default/setup_step4.tpl:34
+#: ihtml/themes/default/setup_step4.tpl:34 ihtml/themes/lhs/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
 "saves people and groups, including the way accounts get created. Check the "
@@ -11601,32 +11757,32 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:39
-#: ihtml/themes/default/setup_step4.tpl:39
+#: ihtml/themes/default/setup_step4.tpl:39 ihtml/themes/lhs/setup_step4.tpl:39
 msgid "Base "
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:43
-#: ihtml/themes/default/setup_step4.tpl:43
+#: ihtml/themes/default/setup_step4.tpl:43 ihtml/themes/lhs/setup_step4.tpl:43
 msgid "People storage ou"
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:47
-#: ihtml/themes/default/setup_step4.tpl:47
+#: ihtml/themes/default/setup_step4.tpl:47 ihtml/themes/lhs/setup_step4.tpl:47
 msgid "People dn attribute"
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:55
-#: ihtml/themes/default/setup_step4.tpl:55
+#: ihtml/themes/default/setup_step4.tpl:55 ihtml/themes/lhs/setup_step4.tpl:55
 msgid "Group storage ou"
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:59
-#: ihtml/themes/default/setup_step4.tpl:59
+#: ihtml/themes/default/setup_step4.tpl:59 ihtml/themes/lhs/setup_step4.tpl:59
 msgid "ID base for users/groups"
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:67
-#: ihtml/themes/default/setup_step4.tpl:67
+#: ihtml/themes/default/setup_step4.tpl:67 ihtml/themes/lhs/setup_step4.tpl:67
 msgid ""
 "GOsa supports several encryption types for your passwords. Normally this is "
 "adjustable via user templates, but you can specify a default method to be "
@@ -11634,12 +11790,12 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:72
-#: ihtml/themes/default/setup_step4.tpl:72
+#: ihtml/themes/default/setup_step4.tpl:72 ihtml/themes/lhs/setup_step4.tpl:72
 msgid "Encryption algorithm"
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:83
-#: ihtml/themes/default/setup_step4.tpl:83
+#: ihtml/themes/default/setup_step4.tpl:83 ihtml/themes/lhs/setup_step4.tpl:83
 msgid ""
 "GOsa has modular support for several mail methods. These methods provide "
 "interfaces to users mailboxes and general handling for quotas. You can "
@@ -11647,7 +11803,7 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:88
-#: ihtml/themes/default/setup_step4.tpl:88
+#: ihtml/themes/default/setup_step4.tpl:88 ihtml/themes/lhs/setup_step4.tpl:88
 msgid "Mail method"
 msgstr ""
 
@@ -11660,48 +11816,54 @@ msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:103
 #: ihtml/themes/default/setup_step4.tpl:104
+#: ihtml/themes/lhs/setup_step4.tpl:104
 msgid "Display PHP errors"
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:106
 #: ihtml/themes/default/setup_step4.tpl:107
+#: ihtml/themes/lhs/setup_step4.tpl:107
 msgid "true"
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:107
 #: ihtml/themes/default/setup_step4.tpl:108
+#: ihtml/themes/lhs/setup_step4.tpl:108
 msgid "false"
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:115
 #: ihtml/themes/default/setup_step4.tpl:115
+#: ihtml/themes/lhs/setup_step4.tpl:115
 msgid "Check"
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_finish.tpl:1
-#: ihtml/themes/default/setup_finish.tpl:1
+#: ihtml/themes/default/setup_finish.tpl:1 ihtml/themes/lhs/setup_finish.tpl:1
 msgid "Setup finished"
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_finish.tpl:3
-#: ihtml/themes/default/setup_finish.tpl:3
+#: ihtml/themes/default/setup_finish.tpl:3 ihtml/themes/lhs/setup_finish.tpl:3
 msgid ""
 "Basically the setup is finished. You can check the result of the schema "
 "check here and download the autogenerated gosa.conf below."
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_finish.tpl:7
-#: ihtml/themes/default/setup_finish.tpl:7
+#: ihtml/themes/default/setup_finish.tpl:7 ihtml/themes/lhs/setup_finish.tpl:7
 msgid "Schema Configuration"
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_finish.tpl:12
 #: ihtml/themes/default/setup_finish.tpl:12
+#: ihtml/themes/lhs/setup_finish.tpl:12
 msgid "Configuration File"
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_finish.tpl:14
 #: ihtml/themes/default/setup_finish.tpl:14
+#: ihtml/themes/lhs/setup_finish.tpl:14
 msgid ""
 "GOsa setup has collected all data needed to create an initial configuration "
 "file. Save the the link below as your gosa.conf and place that file in /etc/"
@@ -11710,18 +11872,29 @@ msgstr ""
 
 #: ihtml/themes/altlinux/setup_finish.tpl:17
 #: ihtml/themes/default/setup_finish.tpl:17
+#: ihtml/themes/lhs/setup_finish.tpl:17
 msgid "Download configuration"
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_finish.tpl:20
 #: ihtml/themes/default/setup_finish.tpl:20
+#: ihtml/themes/lhs/setup_finish.tpl:20
 msgid ""
 "After placing the file under /etc/gosa, place make sure that the webserver "
 "user is able to read gosa.conf, while other users shouldn't. You may want to "
 "execute these commands to achieve this requirement:"
 msgstr ""
 
+#: ihtml/themes/default/help.tpl:9 ihtml/themes/lhs/help.tpl:9
+msgid "GOsa help viewer"
+msgstr ""
+
+#: ihtml/themes/default/help.tpl:15 ihtml/themes/lhs/help.tpl:15
+msgid "Index"
+msgstr ""
+
 #: ihtml/themes/default/setup_introduction.tpl:4
+#: ihtml/themes/lhs/setup_introduction.tpl:4
 msgid ""
 "It looks like you're calling GOsa for the first time - no configuration was "
 "found. This setup like script will try to aid you in creating a working "
@@ -11732,6 +11905,7 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/setup_introduction.tpl:17
+#: ihtml/themes/lhs/setup_introduction.tpl:17
 msgid ""
 "You can also use the new and more-advanced way of inspecting your PHP-"
 "installation. It will give you information about the exact function that "
@@ -11740,15 +11914,23 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/setup_introduction.tpl:19
+#: ihtml/themes/lhs/setup_introduction.tpl:19
 msgid "Toggle Show/Hide"
 msgstr ""
 
-#: ihtml/themes/default/help.tpl:9
-msgid "GOsa help viewer"
+#: ihtml/themes/default/logout.tpl:5 ihtml/themes/lhs/logout.tpl:5
+msgid "Your GOsa session has expired!"
 msgstr ""
 
-#: ihtml/themes/default/help.tpl:15
-msgid "Index"
+#: ihtml/themes/default/logout.tpl:7 ihtml/themes/lhs/logout.tpl:7
+msgid ""
+"The last interaction with the GOsa web interface has been some time ago in "
+"the past. For security reasons, the session has been closed. To continue "
+"with administrative tasks, please sign in again."
+msgstr ""
+
+#: ihtml/themes/default/logout.tpl:10 ihtml/themes/lhs/logout.tpl:10
+msgid "Sign in again"
 msgstr ""
 
 #: ihtml/themes/default/islocked.tpl:9
@@ -11762,27 +11944,6 @@ msgstr ""
 msgid "Edit anyway"
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:100
-msgid ""
-"GOsa may cause PHP interpreter errors, particularly in case of Beta "
-"versions. In some cases it would be helpful to enable the error reporting."
-msgstr ""
-
-#: ihtml/themes/default/logout.tpl:5
-msgid "Your GOsa session has expired!"
-msgstr ""
-
-#: ihtml/themes/default/logout.tpl:7
-msgid ""
-"The last interaction with the GOsa web interface has been some time ago in "
-"the past. For security reasons, the session has been closed. To continue "
-"with administrative tasks, please sign in again."
-msgstr ""
-
-#: ihtml/themes/default/logout.tpl:10
-msgid "Sign in again"
-msgstr ""
-
 #: ihtml/themes/default/copyPasteDialog.tpl:1
 msgid "Copy &amp; paste wizard"
 msgstr ""
@@ -11797,3 +11958,10 @@ msgstr ""
 #: ihtml/themes/default/copyPasteDialog.tpl:18
 msgid "Operation complete"
 msgstr ""
+
+#: ihtml/themes/default/setup_step4.tpl:100
+#: ihtml/themes/lhs/setup_step4.tpl:100
+msgid ""
+"GOsa may cause PHP interpreter errors, particularly in case of Beta "
+"versions. In some cases it would be helpful to enable the error reporting."
+msgstr ""
diff --git a/locale/nl/LC_MESSAGES/messages.po b/locale/nl/LC_MESSAGES/messages.po
index 9ac82f175..ffc433e96 100644
--- a/locale/nl/LC_MESSAGES/messages.po
+++ b/locale/nl/LC_MESSAGES/messages.po
@@ -40,21 +40,19 @@ msgstr "Toevoegingen"
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
-#: plugins/gofax/faxaccount/generic.tpl:6
+#: plugins/gofax/faxaccount/generic.tpl:6 plugins/admin/fai/faiVariable.tpl:4
 #: plugins/admin/fai/faiPartitionTable.tpl:4
-#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiScriptEntry.tpl:5
-#: plugins/admin/fai/faiPackage.tpl:4 plugins/admin/fai/faiProfile.tpl:4
-#: plugins/admin/fai/faiProfile.tpl:32
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
+#: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiPackage.tpl:4
+#: plugins/admin/fai/faiProfile.tpl:4 plugins/admin/fai/faiProfile.tpl:32
 #: plugins/admin/fai/faiScript.tpl:4 plugins/admin/fai/faiVariableEntry.tpl:5
 #: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3 plugins/admin/fai/faiHook.tpl:4
-#: plugins/admin/groups/mail.tpl:7
+#: plugins/admin/groups/mail.tpl:7 plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/glpiPrinter.tpl:6
+#: plugins/admin/systems/servdnseditzone.tpl:1
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
-#: plugins/admin/systems/glpi.tpl:6
-#: plugins/admin/systems/servdnseditzone.tpl:1
-#: plugins/admin/systems/glpiPrinter.tpl:6
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr "Algemeen"
@@ -65,25 +63,25 @@ msgstr "Unix"
 
 #: contrib/gosa.conf:76 contrib/gosa.conf:88
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:514
-#: plugins/admin/users/class_userManagement.inc:858
+#: plugins/admin/groups/class_groupManagement.inc:515
+#: plugins/admin/users/class_userManagement.inc:859
 msgid "Environment"
 msgstr "Omgeving"
 
 #: contrib/gosa.conf:77 contrib/gosa.conf:90
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_groupManagement.inc:502
-#: plugins/admin/users/class_userManagement.inc:860
+#: plugins/admin/groups/class_groupManagement.inc:503
+#: plugins/admin/users/class_userManagement.inc:861
 #: plugins/admin/ogroups/tabs_ogroups.inc:72
 #: plugins/admin/ogroups/tabs_ogroups.inc:160
-#: plugins/admin/ogroups/class_ogroupManagement.inc:483
+#: plugins/admin/ogroups/class_ogroupManagement.inc:484
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "E-mail"
 
 #: contrib/gosa.conf:78 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:505
-#: plugins/admin/users/class_userManagement.inc:866
+#: plugins/admin/groups/class_groupManagement.inc:506
+#: plugins/admin/users/class_userManagement.inc:867
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -98,7 +96,7 @@ msgstr "Verbindingen"
 #: plugins/personal/generic/generic.tpl:398
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:864
+#: plugins/admin/users/class_userManagement.inc:865
 #: plugins/admin/departments/generic.tpl:63
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
@@ -108,17 +106,17 @@ msgstr "Fax"
 #: contrib/gosa.conf:81 plugins/personal/generic/generic.tpl:250
 #: plugins/personal/generic/generic.tpl:388
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/address_info.tpl:37
-#: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
-#: plugins/admin/groups/class_groupManagement.inc:511
-#: plugins/admin/users/class_userManagement.inc:862
+#: plugins/addons/addressbook/address_info.tpl:37
+#: plugins/addons/addressbook/address_info.tpl:85
+#: plugins/admin/groups/class_groupManagement.inc:512
+#: plugins/admin/users/class_userManagement.inc:863
 #: plugins/admin/departments/generic.tpl:59
+#: plugins/admin/systems/class_systemManagement.inc:921
 #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/systems/class_systemManagement.inc:920
 #: plugins/admin/ogroups/class_ogroupManagement.inc:61
-#: plugins/admin/ogroups/class_ogroupManagement.inc:587
+#: plugins/admin/ogroups/class_ogroupManagement.inc:588
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
@@ -147,8 +145,8 @@ msgid "ACL"
 msgstr "Rechten"
 
 #: contrib/gosa.conf:97 plugins/admin/applications/generic.tpl:66
-#: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/systems/class_servRepository.inc:244
+#: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/ogroups/phonequeue.tpl:31
 #: plugins/gofon/conference/generic.tpl:87
 msgid "Options"
@@ -170,9 +168,9 @@ msgstr "Apparaten"
 
 #: contrib/gosa.conf:116 contrib/gosa.conf:141
 #: plugins/personal/environment/environment.tpl:172
-#: plugins/admin/systems/class_systemManagement.inc:926
+#: plugins/admin/systems/class_systemManagement.inc:927
 #: plugins/admin/ogroups/class_ogroupManagement.inc:62
-#: plugins/admin/ogroups/class_ogroupManagement.inc:590
+#: plugins/admin/ogroups/class_ogroupManagement.inc:591
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Printer"
@@ -181,18 +179,19 @@ msgstr "Printer"
 #: plugins/gofax/blocklists/generic.tpl:70
 #: plugins/gofax/blocklists/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
+#: plugins/addons/godfs/contents.tpl:22
 #: plugins/admin/fai/faiProfileEntry.tpl:21
 #: plugins/admin/fai/faiPackageEntry.tpl:22 plugins/admin/fai/headpage.tpl:20
 #: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
 #: plugins/admin/applications/headpage.tpl:20
 #: plugins/admin/departments/headpage.tpl:20
-#: plugins/admin/systems/headpage.tpl:20
+#: plugins/admin/systems/glpiPrinter.tpl:104
+#: plugins/admin/systems/glpiDeviceManagement.tpl:20
 #: plugins/admin/systems/servRepository.tpl:24
 #: plugins/admin/systems/glpiSelectUser.tpl:20
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:20
+#: plugins/admin/systems/headpage.tpl:20
 #: plugins/admin/systems/glpiAttachmentPool.tpl:20
-#: plugins/admin/systems/glpiDeviceManagement.tpl:20
-#: plugins/admin/systems/glpiPrinter.tpl:104
 #: plugins/admin/ogroups/headpage.tpl:20 plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
@@ -255,18 +254,18 @@ msgstr "Partities"
 msgid "Script"
 msgstr "Script"
 
-#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:759
-#: plugins/admin/fai/class_faiManagement.inc:760
+#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:767
+#: plugins/admin/fai/class_faiManagement.inc:768
 msgid "Hooks"
 msgstr "Inhakers"
 
-#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:752
-#: plugins/admin/fai/class_faiManagement.inc:753
+#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:760
+#: plugins/admin/fai/class_faiManagement.inc:761
 msgid "Variables"
 msgstr "Variabelen"
 
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiManagement.inc:773
-#: plugins/admin/fai/class_faiManagement.inc:774
+#: contrib/gosa.conf:218 plugins/admin/fai/class_faiManagement.inc:781
+#: plugins/admin/fai/class_faiManagement.inc:782
 msgid "Templates"
 msgstr "Sjablonen"
 
@@ -310,87 +309,82 @@ msgstr "Engels"
 msgid "Italian"
 msgstr "Italiaans"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:19
-#: plugins/personal/mail/class_mailAccount.inc:23
-#: plugins/personal/password/class_password.inc:6
-#: plugins/personal/posix/class_posixAccount.inc:17
-#: plugins/personal/samba/class_sambaAccount.inc:25
-#: plugins/personal/environment/class_environment.inc:13
-#: plugins/personal/generic/class_user.inc:17
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_proxyAccount.inc:6
-#: plugins/personal/connectivity/class_pptpAccount.inc:27
-#: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_phpgwAccount.inc:6
-#: plugins/personal/connectivity/class_kolabAccount.inc:6
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
-#: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/personal/connectivity/class_opengwAccount.inc:7
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
-#: plugins/gofax/faxreports/class_faxreport.inc:7
-#: plugins/addons/addressbook/class_addressbook.inc:7
-#: plugins/addons/mailqueue/class_mailqueue.inc:7
-#: plugins/addons/ldapmanager/class_csvimport.inc:7
-#: plugins/addons/ldapmanager/class_exportxls.inc:8
-#: plugins/addons/ldapmanager/class_import.inc:7
-#: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:7
-#: plugins/addons/logview/class_logview.inc:7
-#: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:26
-#: plugins/admin/applications/class_applicationManagement.inc:26
-#: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/systems/class_systemManagement.inc:33
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-#: plugins/gofon/fonreports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Dit doet iets"
+#: plugins/personal/nagios/nagios.tpl:4
+msgid "Nagios Account"
+msgstr "Nagios account"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:92
-msgid "This account has no nagios extensions."
-msgstr "Dit account heeft nagios mogelijkheden uitgeschakeld."
+#: plugins/personal/nagios/nagios.tpl:7
+msgid "Alias"
+msgstr "Alias"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:101
-msgid "Remove nagios account"
-msgstr "Nagios account verwijderen"
+#: plugins/personal/nagios/nagios.tpl:12
+#: plugins/admin/systems/servdnseditzone.tpl:47 html/getxls.php:174
+msgid "Mail address"
+msgstr "E-mail adres"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:102
-msgid ""
-"This account has nagios features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Dit account heeft Nagios mogelijkheden ingeschakeld. U kunt deze "
-"uitschakelen door de knop hieronder te gebruiken."
+#: plugins/personal/nagios/nagios.tpl:17
+msgid "Host notification period"
+msgstr "Host notificatie periode"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:104
-msgid "Create nagios account"
-msgstr "Nagios account aanmaken"
+#: plugins/personal/nagios/nagios.tpl:25
+msgid "Service notification period"
+msgstr "Service notificatie periode"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:104
-msgid ""
-"This account has nagios features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Dit account heeft geen Nagios mogelijkheden. U kunt deze inschakelen door de "
-"knop hieronder te gebruiken."
+#: plugins/personal/nagios/nagios.tpl:32
+msgid "Service notification options"
+msgstr "Service notificatie opties"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:165
-msgid "The required field 'NagiosAlias' is not set."
-msgstr "Het vereiste veld 'NagiosAlias' is leeg."
+#: plugins/personal/nagios/nagios.tpl:41
+msgid "Host notification options"
+msgstr "Host notificatie opties"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:168
-msgid "The required field 'NagiosMail' is not set."
-msgstr "Het vereiste veld 'NagiosMail' is leeg."
+#: plugins/personal/nagios/nagios.tpl:48
+#: plugins/personal/generic/generic.tpl:261
+#: plugins/addons/addressbook/address_edit.tpl:217
+#: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Pager"
+msgstr "Pieper"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:172
-#: plugins/personal/nagios/class_nagiosAccount.inc:176
-msgid "Please enter a valid email address in 'NagiosMail' field."
-msgstr "Geef a.u.b. een geldig E-mail adres voor het 'NagiosMail' veld op."
+#: plugins/personal/nagios/nagios.tpl:53
+msgid "Service notification commands"
+msgstr "Service notificatie commando's"
+
+#: plugins/personal/nagios/nagios.tpl:57
+msgid "Host notification commands"
+msgstr "Host notificatie commando's"
+
+#: plugins/personal/nagios/nagios.tpl:66
+msgid "Nagios authentification"
+msgstr "Nagios authenticatie"
+
+#: plugins/personal/nagios/nagios.tpl:69
+msgid "view system informations"
+msgstr "systeem informatie bekijken"
+
+#: plugins/personal/nagios/nagios.tpl:72
+msgid "view configuration information"
+msgstr "configuratie informatie bekijken"
+
+#: plugins/personal/nagios/nagios.tpl:75
+msgid "trigger system commands"
+msgstr "systeem commando's activeren"
+
+#: plugins/personal/nagios/nagios.tpl:78
+msgid "view all services"
+msgstr "alle services bekijken"
+
+#: plugins/personal/nagios/nagios.tpl:81
+msgid "view all hosts"
+msgstr "alle hosts bekijken"
+
+#: plugins/personal/nagios/nagios.tpl:83
+msgid "trigger all service commands"
+msgstr "alle service commando's activeren"
+
+#: plugins/personal/nagios/nagios.tpl:86
+msgid "trigger all host commands"
+msgstr "alle host commando's activeren"
 
 #: plugins/personal/nagios/main.inc:104 plugins/personal/mail/main.inc:104
 #: plugins/personal/posix/main.inc:110 plugins/personal/samba/main.inc:104
@@ -400,11 +394,12 @@ msgstr "Geef a.u.b. een geldig E-mail adres voor het 'NagiosMail' veld op."
 #: plugins/personal/connectivity/main.inc:118
 #: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/fai/class_faiManagement.inc:599
+#: plugins/addons/godfs/class_dfsManagment.inc:217
+#: plugins/admin/fai/class_faiManagement.inc:605
 #: plugins/admin/groups/class_groupManagement.inc:412
 #: plugins/admin/users/class_userManagement.inc:720
-#: plugins/admin/applications/class_applicationManagement.inc:428
-#: plugins/admin/departments/class_departmentManagement.inc:366
+#: plugins/admin/applications/class_applicationManagement.inc:430
+#: plugins/admin/departments/class_departmentManagement.inc:367
 #: plugins/admin/systems/class_systemManagement.inc:720
 #: plugins/admin/ogroups/class_ogroupManagement.inc:400
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:300
@@ -416,16 +411,15 @@ msgstr "Opslaan"
 
 #: plugins/personal/nagios/main.inc:106 plugins/personal/mail/main.inc:106
 #: plugins/personal/mail/mail_locals.tpl:43
-#: plugins/personal/posix/posix_groups.tpl:67
 #: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112
+#: plugins/personal/posix/posix_groups.tpl:67
+#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
 #: plugins/personal/samba/samba3_workstations.tpl:41
-#: plugins/personal/samba/main.inc:106
+#: plugins/personal/environment/main.inc:106
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
 #: plugins/personal/environment/hotplugDialogNew.tpl:39
-#: plugins/personal/environment/main.inc:106
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
 #: plugins/personal/generic/generic_certs.tpl:78
@@ -436,54 +430,55 @@ msgstr "Opslaan"
 #: plugins/gofax/faxaccount/locals.tpl:62
 #: plugins/gofax/faxaccount/lists.tpl:33 plugins/gofax/faxaccount/main.inc:91
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
-#: plugins/admin/fai/class_faiManagement.inc:601
-#: plugins/admin/fai/class_faiManagement.inc:606
-#: plugins/admin/fai/faiProfileEntry.tpl:71
+#: plugins/addons/addressbook/remove.tpl:16
+#: plugins/addons/godfs/class_dfsManagment.inc:219
+#: plugins/admin/fai/class_faiManagement.inc:607
+#: plugins/admin/fai/class_faiManagement.inc:612
 #: plugins/admin/fai/faiPackageConfiguration.tpl:7
-#: plugins/admin/fai/faiScriptEntry.tpl:69
+#: plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
+#: plugins/admin/fai/faiScriptEntry.tpl:69 plugins/admin/fai/remove.tpl:17
 #: plugins/admin/fai/faiPackageNew.tpl:45
+#: plugins/admin/fai/faiNewBranch.tpl:20
 #: plugins/admin/fai/faiVariableEntry.tpl:49
-#: plugins/admin/fai/faiPackageEntry.tpl:57 plugins/admin/fai/remove.tpl:17
+#: plugins/admin/fai/faiPackageEntry.tpl:57
 #: plugins/admin/fai/faiHookEntry.tpl:71
-#: plugins/admin/fai/faiTemplateEntry.tpl:131
-#: plugins/admin/fai/faiNewBranch.tpl:20
 #: plugins/admin/fai/remove_branch.tpl:16
+#: plugins/admin/fai/faiTemplateEntry.tpl:131
 #: plugins/admin/groups/class_groupManagement.inc:414
 #: plugins/admin/groups/remove.tpl:16
+#: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/template.tpl:46
 #: plugins/admin/users/class_userManagement.inc:722
-#: plugins/admin/users/remove.tpl:16 plugins/admin/users/template.tpl:46
-#: plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:430
+#: plugins/admin/users/remove.tpl:16 plugins/admin/applications/remove.tpl:15
+#: plugins/admin/applications/class_applicationManagement.inc:432
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:368
-#: plugins/admin/systems/chooser.tpl:18
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
-#: plugins/admin/systems/printerPPDDialog.tpl:23
-#: plugins/admin/systems/class_systemManagement.inc:722
-#: plugins/admin/systems/servnfs.tpl:76 plugins/admin/systems/remove.tpl:16
-#: plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/servRepositorySetup.tpl:43
+#: plugins/admin/departments/class_departmentManagement.inc:369
 #: plugins/admin/systems/glpi_edit_type.tpl:29
-#: plugins/admin/systems/remove_glpi.tpl:16
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:30
+#: plugins/admin/systems/glpiDeviceManagement.tpl:52
+#: plugins/admin/systems/servnfs.tpl:76
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
+#: plugins/admin/systems/servdnseditzone.tpl:118
 #: plugins/admin/systems/glpiSelectUser.tpl:51
+#: plugins/admin/systems/glpi_devices.tpl:761
+#: plugins/admin/systems/servRepositorySetup.tpl:43
 #: plugins/admin/systems/glpi_edit_os.tpl:29
+#: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:52
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
+#: plugins/admin/systems/remove_glpi.tpl:16
+#: plugins/admin/systems/class_systemManagement.inc:722
+#: plugins/admin/systems/remove.tpl:16
 #: plugins/admin/systems/glpiAttachmentPool.tpl:52
-#: plugins/admin/systems/servdnseditzone.tpl:118
-#: plugins/admin/systems/glpiDeviceManagement.tpl:52
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:30
-#: plugins/admin/systems/glpi_devices.tpl:761
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
+#: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/SelectDeviceType.tpl:45
-#: plugins/admin/systems/class_baseSelectDialog.inc:40
+#: plugins/admin/systems/class_baseSelectDialog.inc:41
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:13
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:402
@@ -494,6 +489,7 @@ msgstr "Opslaan"
 #: plugins/gofon/conference/remove.tpl:16
 #: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
 #: ihtml/themes/default/copyPasteDialog.tpl:13
+#: ihtml/themes/lhs/islocked.tpl:15
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -511,26 +507,27 @@ msgstr ""
 
 #: plugins/personal/nagios/main.inc:115 plugins/personal/mail/main.inc:115
 #: plugins/personal/posix/main.inc:122 plugins/personal/samba/main.inc:115
-#: plugins/personal/environment/environment.tpl:139
 #: plugins/personal/environment/main.inc:115
+#: plugins/personal/environment/environment.tpl:139
 #: plugins/personal/generic/main.inc:172
 #: plugins/personal/connectivity/main.inc:129
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
+#: plugins/admin/fai/faiVariable.tpl:45
 #: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/admin/fai/faiVariable.tpl:45 plugins/admin/fai/faiScript.tpl:45
-#: plugins/admin/fai/faiTemplate.tpl:42 plugins/admin/fai/faiHook.tpl:45
-#: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/printer.tpl:47 plugins/admin/systems/servdns.tpl:7
-#: plugins/admin/systems/glpiManufacturer.tpl:7
-#: plugins/admin/systems/glpi.tpl:48 plugins/admin/systems/glpi.tpl:56
-#: plugins/admin/systems/glpi.tpl:85
-#: plugins/admin/systems/servdnseditzone.tpl:27
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:191
+#: plugins/admin/fai/faiScript.tpl:45 plugins/admin/fai/faiTemplate.tpl:42
+#: plugins/admin/fai/faiHook.tpl:45 plugins/admin/systems/glpi.tpl:48
+#: plugins/admin/systems/glpi.tpl:56 plugins/admin/systems/glpi.tpl:85
 #: plugins/admin/systems/glpiPrinter.tpl:73
 #: plugins/admin/systems/glpiPrinter.tpl:82
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:167
+#: plugins/admin/systems/servdns.tpl:7
+#: plugins/admin/systems/glpiManufacturer.tpl:7
+#: plugins/admin/systems/servdnseditzone.tpl:27
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:191
+#: plugins/admin/systems/servservice.tpl:21
+#: plugins/admin/systems/printer.tpl:47
 #: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr "Bewerken"
@@ -539,82 +536,207 @@ msgstr "Bewerken"
 msgid "Nagios settings"
 msgstr "Nagios instellingen"
 
-#: plugins/personal/nagios/nagios.tpl:4
-msgid "Nagios Account"
-msgstr "Nagios account"
-
-#: plugins/personal/nagios/nagios.tpl:7
-msgid "Alias"
-msgstr "Alias"
-
-#: plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:47 html/getxls.php:174
-msgid "Mail address"
-msgstr "E-mail adres"
-
-#: plugins/personal/nagios/nagios.tpl:17
-msgid "Host notification period"
-msgstr "Host notificatie periode"
-
-#: plugins/personal/nagios/nagios.tpl:25
-msgid "Service notification period"
-msgstr "Service notificatie periode"
-
-#: plugins/personal/nagios/nagios.tpl:32
-msgid "Service notification options"
-msgstr "Service notificatie opties"
-
-#: plugins/personal/nagios/nagios.tpl:41
-msgid "Host notification options"
-msgstr "Host notificatie opties"
-
-#: plugins/personal/nagios/nagios.tpl:48
-#: plugins/personal/generic/generic.tpl:261
-#: plugins/addons/addressbook/address_info.tpl:91
-#: plugins/addons/addressbook/address_edit.tpl:217 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Pager"
-msgstr "Pieper"
+#: plugins/personal/nagios/class_nagiosAccount.inc:19
+#: plugins/personal/mail/class_mailAccount.inc:23
+#: plugins/personal/password/class_password.inc:6
+#: plugins/personal/posix/class_posixAccount.inc:17
+#: plugins/personal/samba/class_sambaAccount.inc:25
+#: plugins/personal/environment/class_environment.inc:13
+#: plugins/personal/generic/class_user.inc:17
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_intranetAccount.inc:16
+#: plugins/personal/connectivity/class_pptpAccount.inc:27
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
+#: plugins/personal/connectivity/class_phpgwAccount.inc:6
+#: plugins/personal/connectivity/class_kolabAccount.inc:6
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
+#: plugins/personal/connectivity/class_opengwAccount.inc:7
+#: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
+#: plugins/gofax/faxreports/class_faxreport.inc:7
+#: plugins/addons/addressbook/class_addressbook.inc:7
+#: plugins/addons/mailqueue/class_mailqueue.inc:7
+#: plugins/addons/ldapmanager/class_csvimport.inc:7
+#: plugins/addons/ldapmanager/class_exportxls.inc:8
+#: plugins/addons/ldapmanager/class_import.inc:7
+#: plugins/addons/ldapmanager/class_ldif.inc:8
+#: plugins/addons/ldapmanager/class_export.inc:7
+#: plugins/addons/logview/class_logview.inc:7
+#: plugins/addons/godfs/class_dfsManagment.inc:17
+#: plugins/admin/groups/class_groupManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:26
+#: plugins/admin/applications/class_applicationManagement.inc:26
+#: plugins/admin/departments/class_departmentManagement.inc:26
+#: plugins/admin/systems/class_systemManagement.inc:33
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/gofon/fonreports/class_fonreport.inc:7
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
+msgid "This does something"
+msgstr "Dit doet iets"
 
-#: plugins/personal/nagios/nagios.tpl:53
-msgid "Service notification commands"
-msgstr "Service notificatie commando's"
+#: plugins/personal/nagios/class_nagiosAccount.inc:92
+msgid "This account has no nagios extensions."
+msgstr "Dit account heeft nagios mogelijkheden uitgeschakeld."
 
-#: plugins/personal/nagios/nagios.tpl:57
-msgid "Host notification commands"
-msgstr "Host notificatie commando's"
+#: plugins/personal/nagios/class_nagiosAccount.inc:101
+msgid "Remove nagios account"
+msgstr "Nagios account verwijderen"
 
-#: plugins/personal/nagios/nagios.tpl:66
-msgid "Nagios authentification"
-msgstr "Nagios authenticatie"
+#: plugins/personal/nagios/class_nagiosAccount.inc:102
+msgid ""
+"This account has nagios features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Dit account heeft Nagios mogelijkheden ingeschakeld. U kunt deze "
+"uitschakelen door de knop hieronder te gebruiken."
 
-#: plugins/personal/nagios/nagios.tpl:69
-msgid "view system informations"
-msgstr "systeem informatie bekijken"
+#: plugins/personal/nagios/class_nagiosAccount.inc:104
+msgid "Create nagios account"
+msgstr "Nagios account aanmaken"
 
-#: plugins/personal/nagios/nagios.tpl:72
-msgid "view configuration information"
-msgstr "configuratie informatie bekijken"
+#: plugins/personal/nagios/class_nagiosAccount.inc:104
+msgid ""
+"This account has nagios features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Dit account heeft geen Nagios mogelijkheden. U kunt deze inschakelen door de "
+"knop hieronder te gebruiken."
 
-#: plugins/personal/nagios/nagios.tpl:75
-msgid "trigger system commands"
-msgstr "systeem commando's activeren"
+#: plugins/personal/nagios/class_nagiosAccount.inc:165
+msgid "The required field 'NagiosAlias' is not set."
+msgstr "Het vereiste veld 'NagiosAlias' is leeg."
 
-#: plugins/personal/nagios/nagios.tpl:78
-msgid "view all services"
-msgstr "alle services bekijken"
+#: plugins/personal/nagios/class_nagiosAccount.inc:168
+msgid "The required field 'NagiosMail' is not set."
+msgstr "Het vereiste veld 'NagiosMail' is leeg."
 
-#: plugins/personal/nagios/nagios.tpl:81
-msgid "view all hosts"
-msgstr "alle hosts bekijken"
+#: plugins/personal/nagios/class_nagiosAccount.inc:172
+#: plugins/personal/nagios/class_nagiosAccount.inc:176
+msgid "Please enter a valid email address in 'NagiosMail' field."
+msgstr "Geef a.u.b. een geldig E-mail adres voor het 'NagiosMail' veld op."
 
-#: plugins/personal/nagios/nagios.tpl:83
-msgid "trigger all service commands"
-msgstr "alle service commando's activeren"
+#: plugins/personal/mail/class_mailAccount.inc:79
+#: plugins/admin/groups/class_groupMail.inc:75
+#, php-format
+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/nagios/nagios.tpl:86
-msgid "trigger all host commands"
-msgstr "alle host commando's activeren"
+#: plugins/personal/mail/class_mailAccount.inc:176
+msgid "No DESC tag in vacation file:"
+msgstr "Er is geen DESC variabele aanwezig in het afwezigheidsbestand:"
+
+#: plugins/personal/mail/class_mailAccount.inc:216
+msgid "This account has no mail extensions."
+msgstr "Dit account heeft E-mail mogelijkheden uitgeschakeld."
+
+#: plugins/personal/mail/class_mailAccount.inc:225
+#: plugins/admin/groups/class_groupMail.inc:314
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid "Remove mail account"
+msgstr "E-mail account verwijderen"
+
+#: plugins/personal/mail/class_mailAccount.inc:226
+#: plugins/admin/groups/class_groupMail.inc:315
+msgid ""
+"This account has mail features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Dit account heeft E-mail mogelijkheden ingeschakeld. U kunt deze "
+"uitschakelen door de knop hieronder te gebruiken."
+
+#: plugins/personal/mail/class_mailAccount.inc:228
+#: plugins/admin/groups/class_groupMail.inc:317
+#: plugins/admin/ogroups/class_mailogroup.inc:43
+msgid "Create mail account"
+msgstr "E-mail account aanmaken"
+
+#: plugins/personal/mail/class_mailAccount.inc:228
+#: plugins/admin/groups/class_groupMail.inc:318
+msgid ""
+"This account has mail features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Dit account heeft geen E-mail mogelijkheden. U kunt deze inschakelen door de "
+"knop hieronder te gebruiken."
+
+#: plugins/personal/mail/class_mailAccount.inc:276
+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:282
+#: plugins/admin/groups/class_groupMail.inc:377
+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:317
+#: plugins/personal/mail/class_mailAccount.inc:322
+#: plugins/admin/groups/class_groupMail.inc:405
+msgid ""
+"You're trying to add an invalid email address to the list of alternate "
+"addresses."
+msgstr ""
+"U probeert een ongeldig E-mail adres toe te voegen aan de lijst met "
+"alternatieve adressen."
+
+#: plugins/personal/mail/class_mailAccount.inc:332
+#: plugins/admin/groups/class_groupMail.inc:410
+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:714
+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:719
+#: plugins/admin/groups/class_groupMail.inc:798
+msgid "The required field 'Primary address' is not set."
+msgstr "Het vereiste veld 'Primair adres' is leeg."
+
+#: plugins/personal/mail/class_mailAccount.inc:723
+#: plugins/personal/mail/class_mailAccount.inc:727
+#: plugins/addons/addressbook/class_addressbook.inc:588
+#: plugins/admin/ogroups/class_mailogroup.inc:70
+msgid "Please enter a valid email address in 'Primary address' field."
+msgstr "Geef a.u.b. een geldig E-mail adres voor het 'Primair adres' op."
+
+#: plugins/personal/mail/class_mailAccount.inc:733
+#: plugins/admin/groups/class_groupMail.inc:807
+#: plugins/admin/ogroups/class_mailogroup.inc:77
+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:739
+#: plugins/admin/groups/class_groupMail.inc:813
+msgid "Value in 'Quota size' is not valid."
+msgstr "De waarde opgegeven bij 'Quota grootte' is niet geldig."
+
+#: plugins/personal/mail/class_mailAccount.inc:748
+#: plugins/admin/groups/class_groupMail.inc:822
+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:758
+#: plugins/admin/groups/class_groupMail.inc:830
+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:762
+msgid "You specified Spam settings, but there is no Folder specified."
+msgstr "U heeft Spam instellingen opgegeven, maar geen mailfolder opgegeven."
 
 #: plugins/personal/mail/generic.tpl:7 plugins/personal/mail/copypaste.tpl:7
 #: plugins/admin/groups/mail.tpl:10 plugins/admin/groups/paste_mail.tpl:8
@@ -624,9 +746,9 @@ 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_systemManagement.inc:921
+#: plugins/admin/systems/class_systemManagement.inc:922
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:586
+#: plugins/admin/ogroups/class_ogroupManagement.inc:587
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
 msgstr "Server"
@@ -640,7 +762,7 @@ msgid "Quota usage"
 msgstr "Quota gebruik"
 
 #: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
-#: plugins/admin/systems/class_terminalInfo.inc:169
+#: plugins/admin/systems/class_terminalInfo.inc:170
 #: plugins/admin/systems/class_printGeneric.inc:424
 msgid "not defined"
 msgstr "niet gedefiniëerd"
@@ -665,8 +787,8 @@ msgstr "Lijst met alternatieve E-mail adressen"
 #: plugins/personal/mail/mail_locals.tpl:41
 #: plugins/personal/mail/copypaste.tpl:21
 #: plugins/personal/mail/copypaste.tpl:44
-#: plugins/personal/posix/posix_groups.tpl:65
 #: plugins/personal/posix/trust_machines.tpl:39
+#: plugins/personal/posix/posix_groups.tpl:65
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
 #: plugins/personal/samba/samba3.tpl:330
@@ -682,43 +804,42 @@ msgstr "Lijst met alternatieve E-mail adressen"
 #: plugins/gofax/blocklists/generic.tpl:63
 #: plugins/gofax/faxaccount/generic.tpl:76
 #: plugins/gofax/faxaccount/locals.tpl:60
-#: plugins/gofax/faxaccount/lists.tpl:13
+#: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiPackage.tpl:71
-#: plugins/admin/fai/faiProfile.tpl:38 plugins/admin/fai/faiScript.tpl:48
-#: plugins/admin/fai/faiTemplate.tpl:41 plugins/admin/fai/faiHook.tpl:48
-#: plugins/admin/groups/mail.tpl:51 plugins/admin/groups/mail.tpl:95
+#: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
+#: plugins/admin/fai/faiScript.tpl:48 plugins/admin/fai/faiTemplate.tpl:41
+#: plugins/admin/fai/faiHook.tpl:48 plugins/admin/groups/mail.tpl:51
+#: plugins/admin/groups/mail.tpl:95
 #: plugins/admin/groups/class_groupMail.inc:533
 #: plugins/admin/groups/application.tpl:15
 #: plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/generic.tpl:104
 #: plugins/admin/groups/mail_locals.tpl:66
 #: plugins/admin/groups/paste_mail.tpl:30
-#: plugins/admin/groups/paste_mail.tpl:41
-#: plugins/admin/systems/servservice.tpl:20
-#: plugins/admin/systems/servservice.tpl:47
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
+#: plugins/admin/groups/paste_mail.tpl:41 plugins/admin/systems/glpi.tpl:100
+#: plugins/admin/systems/glpiPrinter.tpl:93
+#: plugins/admin/systems/glpiPrinter.tpl:121
+#: plugins/admin/systems/glpi_edit_type.tpl:8
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:7
 #: plugins/admin/systems/workstationStartup.tpl:61
 #: plugins/admin/systems/workstationStartup.tpl:81
 #: plugins/admin/systems/workstationStartup.tpl:100
 #: plugins/admin/systems/servdns.tpl:6
-#: plugins/admin/systems/phonesettings.tpl:176
-#: plugins/admin/systems/phonesettings.tpl:191
 #: plugins/admin/systems/terminalStartup.tpl:61
 #: plugins/admin/systems/terminalStartup.tpl:80
-#: plugins/admin/systems/servRepositorySetup.tpl:36
-#: plugins/admin/systems/glpi_edit_type.tpl:8
 #: plugins/admin/systems/glpiManufacturer.tpl:6
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
-#: plugins/admin/systems/glpi_edit_os.tpl:8
 #: plugins/admin/systems/class_termDNS.inc:461
 #: plugins/admin/systems/class_termDNS.inc:482
-#: plugins/admin/systems/glpi.tpl:100
 #: plugins/admin/systems/servdnseditzone.tpl:102
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/glpiPrinter.tpl:93
-#: plugins/admin/systems/glpiPrinter.tpl:121
+#: plugins/admin/systems/servRepositorySetup.tpl:36
+#: plugins/admin/systems/servservice.tpl:20
+#: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/glpi_edit_os.tpl:8
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
 #: plugins/admin/systems/class_servDNSeditZone.inc:478
+#: plugins/admin/systems/phonesettings.tpl:176
+#: plugins/admin/systems/phonesettings.tpl:191
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:270
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/generic.tpl:39
@@ -743,38 +864,37 @@ msgstr "Toevoegen"
 #: plugins/gofax/faxaccount/generic.tpl:78
 #: plugins/gofax/faxaccount/lists.tpl:14
 #: plugins/addons/addressbook/remove.tpl:14
-#: plugins/admin/fai/faiPartitionTable.tpl:45
-#: plugins/admin/fai/faiVariable.tpl:46 plugins/admin/fai/faiScript.tpl:46
-#: plugins/admin/fai/faiTemplate.tpl:43 plugins/admin/fai/remove.tpl:15
-#: plugins/admin/fai/faiHook.tpl:46 plugins/admin/fai/remove_branch.tpl:14
+#: plugins/admin/fai/faiVariable.tpl:46
+#: plugins/admin/fai/faiPartitionTable.tpl:45 plugins/admin/fai/remove.tpl:15
+#: plugins/admin/fai/faiScript.tpl:46 plugins/admin/fai/faiTemplate.tpl:43
+#: plugins/admin/fai/remove_branch.tpl:14 plugins/admin/fai/faiHook.tpl:46
 #: plugins/admin/groups/mail.tpl:52 plugins/admin/groups/mail.tpl:97
 #: plugins/admin/groups/remove.tpl:14 plugins/admin/groups/generic.tpl:106
 #: plugins/admin/groups/paste_mail.tpl:31
 #: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/users/remove.tpl:14
 #: plugins/admin/applications/remove.tpl:13
 #: plugins/admin/departments/remove.tpl:14
-#: plugins/admin/systems/servservice.tpl:22
-#: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/glpi_edit_type.tpl:10
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/workstationStartup.tpl:62
 #: plugins/admin/systems/workstationStartup.tpl:82
-#: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
-#: plugins/admin/systems/phonesettings.tpl:177
-#: plugins/admin/systems/phonesettings.tpl:192
-#: plugins/admin/systems/remove.tpl:14
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
 #: plugins/admin/systems/terminalStartup.tpl:62
-#: plugins/admin/systems/glpi_edit_type.tpl:10
-#: plugins/admin/systems/remove_glpi.tpl:14
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
-#: plugins/admin/systems/glpi_edit_os.tpl:10
 #: plugins/admin/systems/class_termDNS.inc:476
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:192
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
+#: plugins/admin/systems/servservice.tpl:22
+#: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/glpi_edit_os.tpl:10
+#: plugins/admin/systems/remove_glpi.tpl:14
+#: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
 #: plugins/admin/systems/class_servDNSeditZone.inc:279
 #: plugins/admin/systems/class_servDNSeditZone.inc:472
-#: plugins/admin/ogroups/generic.tpl:40 plugins/admin/ogroups/remove.tpl:14
-#: plugins/admin/ogroups/phonequeue.tpl:25 plugins/gofon/macro/remove.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:15
+#: plugins/admin/systems/phonesettings.tpl:177
+#: plugins/admin/systems/phonesettings.tpl:192
+#: plugins/admin/systems/remove.tpl:14 plugins/admin/ogroups/generic.tpl:40
+#: plugins/admin/ogroups/remove.tpl:14 plugins/admin/ogroups/phonequeue.tpl:25
+#: plugins/gofon/macro/remove.tpl:13 plugins/gofon/phoneaccount/generic.tpl:15
 #: plugins/gofon/phoneaccount/paste_generic.tpl:15
 #: plugins/gofon/conference/remove.tpl:14
 msgid "Delete"
@@ -886,6 +1006,7 @@ msgstr "Selecteer de toe te voegen adressen"
 #: plugins/gofax/blocklists/headpage.tpl:29
 #: plugins/gofax/faxaccount/locals.tpl:19
 #: plugins/addons/addressbook/contents.tpl:58
+#: plugins/addons/godfs/contents.tpl:31
 #: plugins/admin/fai/faiProfileEntry.tpl:31
 #: plugins/admin/fai/faiPackageEntry.tpl:32 plugins/admin/fai/headpage.tpl:64
 #: plugins/admin/groups/headpage.tpl:30
@@ -893,14 +1014,14 @@ msgstr "Selecteer de toe te voegen adressen"
 #: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
 #: plugins/admin/applications/headpage.tpl:47
 #: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
-#: plugins/admin/systems/headpage.tpl:29
+#: plugins/admin/systems/glpiDeviceManagement.tpl:27
 #: plugins/admin/systems/servRepository.tpl:36
 #: plugins/admin/systems/glpiSelectUser.tpl:27
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:27
+#: plugins/admin/systems/headpage.tpl:29
 #: plugins/admin/systems/glpiAttachmentPool.tpl:27
-#: plugins/admin/systems/glpiDeviceManagement.tpl:27
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/admin/ogroups/headpage.tpl:29 plugins/gofon/macro/headpage.tpl:29
 #: plugins/gofon/conference/headpage.tpl:29
@@ -910,8 +1031,8 @@ msgid "Filters"
 msgstr "Filters"
 
 #: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:32
 #: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:32
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/personal/environment/selectPrinterDialog.tpl:34
 #: plugins/gofax/faxaccount/locals.tpl:29
@@ -940,146 +1061,28 @@ msgstr "Toon adressen van gebruiker"
 msgid "User name of which addresses are shown"
 msgstr "Gebruikersnaam van wie de adressen getoond worden"
 
-#: plugins/personal/mail/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:75
-#, php-format
-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:176
-msgid "No DESC tag in vacation file:"
-msgstr "Er is geen DESC variabele aanwezig in het afwezigheidsbestand:"
-
-#: plugins/personal/mail/class_mailAccount.inc:216
-msgid "This account has no mail extensions."
-msgstr "Dit account heeft E-mail mogelijkheden uitgeschakeld."
-
-#: plugins/personal/mail/class_mailAccount.inc:225
-#: plugins/admin/groups/class_groupMail.inc:314
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid "Remove mail account"
-msgstr "E-mail account verwijderen"
-
-#: plugins/personal/mail/class_mailAccount.inc:226
-#: plugins/admin/groups/class_groupMail.inc:315
-msgid ""
-"This account has mail features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Dit account heeft E-mail mogelijkheden ingeschakeld. U kunt deze "
-"uitschakelen door de knop hieronder te gebruiken."
-
-#: plugins/personal/mail/class_mailAccount.inc:228
-#: plugins/admin/groups/class_groupMail.inc:317
-#: plugins/admin/ogroups/class_mailogroup.inc:43
-msgid "Create mail account"
-msgstr "E-mail account aanmaken"
-
-#: plugins/personal/mail/class_mailAccount.inc:228
-#: plugins/admin/groups/class_groupMail.inc:318
-msgid ""
-"This account has mail features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Dit account heeft geen E-mail mogelijkheden. U kunt deze inschakelen door de "
-"knop hieronder te gebruiken."
-
-#: plugins/personal/mail/class_mailAccount.inc:276
-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:282
-#: plugins/admin/groups/class_groupMail.inc:377
-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:317
-#: plugins/personal/mail/class_mailAccount.inc:322
-#: plugins/admin/groups/class_groupMail.inc:405
-msgid ""
-"You're trying to add an invalid email address to the list of alternate "
-"addresses."
-msgstr ""
-"U probeert een ongeldig E-mail adres toe te voegen aan de lijst met "
-"alternatieve adressen."
-
-#: plugins/personal/mail/class_mailAccount.inc:332
-#: plugins/admin/groups/class_groupMail.inc:410
-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:714
-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:719
-#: plugins/admin/groups/class_groupMail.inc:798
-msgid "The required field 'Primary address' is not set."
-msgstr "Het vereiste veld 'Primair adres' is leeg."
-
-#: plugins/personal/mail/class_mailAccount.inc:723
-#: plugins/personal/mail/class_mailAccount.inc:727
-#: plugins/addons/addressbook/class_addressbook.inc:588
-#: plugins/admin/ogroups/class_mailogroup.inc:70
-msgid "Please enter a valid email address in 'Primary address' field."
-msgstr "Geef a.u.b. een geldig E-mail adres voor het 'Primair adres' op."
-
-#: plugins/personal/mail/class_mailAccount.inc:733
-#: plugins/admin/groups/class_groupMail.inc:807
-#: plugins/admin/ogroups/class_mailogroup.inc:77
-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:739
-#: plugins/admin/groups/class_groupMail.inc:813
-msgid "Value in 'Quota size' is not valid."
-msgstr "De waarde opgegeven bij 'Quota grootte' is niet geldig."
-
-#: plugins/personal/mail/class_mailAccount.inc:748
-#: plugins/admin/groups/class_groupMail.inc:822
-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:758
-#: plugins/admin/groups/class_groupMail.inc:830
-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:762
-msgid "You specified Spam settings, but there is no Folder specified."
-msgstr "U heeft Spam instellingen opgegeven, maar geen mailfolder opgegeven."
-
 #: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
 #, fuzzy
 msgid "Mail settings"
 msgstr "Nagios instellingen"
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:871
+#: plugins/admin/systems/class_systemManagement.inc:872
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
-#: ihtml/themes/altlinux/setup_useradmin.tpl:30
 #: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/default/setup_useradmin.tpl:30
+#: ihtml/themes/altlinux/setup_useradmin.tpl:30
 #: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
+#: ihtml/themes/default/setup_useradmin.tpl:30 ihtml/themes/lhs/login.tpl:37
+#: ihtml/themes/lhs/login.tpl:41 ihtml/themes/lhs/setup_useradmin.tpl:30
 msgid "Password"
 msgstr "Wachtwoord"
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:801
-#: plugins/admin/users/class_userManagement.inc:808
+#: plugins/admin/users/class_userManagement.inc:802
+#: plugins/admin/users/class_userManagement.inc:809
 msgid "Change password"
 msgstr "Verander wachtwoord"
 
@@ -1143,9 +1146,8 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
 #: plugins/addons/ldapmanager/contentexport.tpl:66
-#: plugins/admin/fai/class_faiManagement.inc:441
-#: plugins/admin/fai/faiNewBranch.tpl:52
-#: plugins/admin/departments/recursive_moce.tpl:10 include/functions.inc:1382
+#: plugins/admin/fai/faiNewBranch.tpl:50
+#: plugins/admin/departments/recursive_move.tpl:18 include/functions.inc:1382
 #: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_step3.tpl:17
@@ -1156,6 +1158,9 @@ msgstr ""
 #: ihtml/themes/default/setup_step3.tpl:17
 #: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_finish.tpl:30
+#: ihtml/themes/lhs/setup_useradmin.tpl:40 ihtml/themes/lhs/setup_step2.tpl:12
+#: ihtml/themes/lhs/setup_step3.tpl:17 ihtml/themes/lhs/setup_step4.tpl:114
+#: ihtml/themes/lhs/setup_finish.tpl:30
 msgid "Back"
 msgstr "Terug"
 
@@ -1202,6 +1207,19 @@ msgstr "U heeft geen toestemming om uw wachtwoord te veranderen."
 msgid "External password changer reported a problem: "
 msgstr "Extern wachtwoord verander mechanisme rapporteerde een probleem:"
 
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Selecteer de toe te voegen systemen"
+
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr "Toon systemen van afdeling"
+
+#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/systems/headpage.tpl:50
+msgid "Display systems matching"
+msgstr "Toon de overeenkomende systemen"
+
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
 msgstr "Selecteer de toe te voegen groepen"
@@ -1239,19 +1257,6 @@ msgstr "Het wachtwoord moet bij de eerste aanmelding gewijzigd worden"
 msgid "Password expires on"
 msgstr "Wachtwoord verloopt op"
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
-msgstr "Selecteer de toe te voegen systemen"
-
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
-msgstr "Toon systemen van afdeling"
-
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:50
-msgid "Display systems matching"
-msgstr "Toon de overeenkomende systemen"
-
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
@@ -1310,6 +1315,10 @@ msgstr "Systeem vertrouwen"
 msgid "Trust mode"
 msgstr "Vertrouwensmodus"
 
+#: plugins/personal/posix/main.inc:131
+msgid "Unix settings"
+msgstr "Unix instellingen"
+
 #: plugins/personal/posix/class_posixAccount.inc:16
 #: plugins/generic/references/class_reference.inc:22
 msgid "UNIX"
@@ -1325,9 +1334,9 @@ msgid "unconfigured"
 msgstr "niet geconfigureerd"
 
 #: plugins/personal/posix/class_posixAccount.inc:195
-#: plugins/admin/systems/class_terminalService.inc:141
 #: plugins/admin/systems/class_workstationService.inc:134
 #: plugins/admin/systems/class_workstationStartup.inc:623
+#: plugins/admin/systems/class_terminalService.inc:141
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:211
 msgid "automatic"
 msgstr "automatisch"
@@ -1528,7 +1537,7 @@ msgstr "December"
 #: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/admin/systems/class_terminalGeneric.inc:60
 #: ihtml/themes/altlinux/setup_step4.tpl:91
-#: ihtml/themes/default/setup_step4.tpl:91
+#: ihtml/themes/default/setup_step4.tpl:91 ihtml/themes/lhs/setup_step4.tpl:91
 msgid "disabled"
 msgstr "gedeactiveerd"
 
@@ -1615,10 +1624,6 @@ 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/main.inc:131
-msgid "Unix settings"
-msgstr "Unix instellingen"
-
 #: plugins/personal/posix/paste_generic.tpl:4
 #, fuzzy
 msgid "Posix settings"
@@ -1750,6 +1755,10 @@ msgstr "Het account verloopt op"
 msgid "Allow connection from these workstations only"
 msgstr "Sta alleen verbindingen vanaf deze werkstations toe"
 
+#: plugins/personal/samba/main.inc:123
+msgid "Samba settings"
+msgstr "Samba Instellingen"
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "Selecteer de toe te voegen werkstations"
@@ -1758,10 +1767,6 @@ msgstr "Selecteer de toe te voegen werkstations"
 msgid "Display workstations of department"
 msgstr "Toon werkstations van afdeling"
 
-#: plugins/personal/samba/main.inc:123
-msgid "Samba settings"
-msgstr "Samba Instellingen"
-
 #: plugins/personal/samba/class_sambaAccount.inc:196
 msgid "This account has no samba extensions."
 msgstr "Dit account heeft geen samba extensies."
@@ -1867,6 +1872,10 @@ msgstr ""
 "Waarschuwing: Kan de primaire groep van de gebruiker niet identificeren - Er "
 "is geen conversie naar een Samba groep mogelijk!"
 
+#: plugins/personal/environment/main.inc:124
+msgid "User environment settings"
+msgstr "Gebruikersomgeving instellingen"
+
 #: plugins/personal/environment/class_hotplugDialog.inc:111
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr "Geef a.u.b. een geldige naam op. Alleen a-Z 0-9 zijn toegestaan."
@@ -1888,11 +1897,6 @@ msgstr "Er bestaat al een invoer met deze naam."
 msgid "Please select an entry or press cancel."
 msgstr "Selecteer a.u.b. een regel of druk op annuleren."
 
-#: plugins/personal/environment/class_selectPrinterDialog.inc:67
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:99
-msgid "Please select a printer or press cancel."
-msgstr "Selecteer a.u.b. een printer of druk annuleren in"
-
 #: plugins/personal/environment/hotplugDialog.tpl:1
 msgid "Add hotplug devices"
 msgstr "Hotplug apparaten toevoegen"
@@ -1921,6 +1925,11 @@ msgstr "Toon overeenkomende gebruikers"
 msgid "Regular expression for        matching hotplugs"
 msgstr "Reguliere expressie voor      overeenkomende hotplugs"
 
+#: plugins/personal/environment/class_selectPrinterDialog.inc:67
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:99
+msgid "Please select a printer or press cancel."
+msgstr "Selecteer a.u.b. een printer of druk annuleren in"
+
 #: plugins/personal/environment/class_environment.inc:253
 #: plugins/personal/environment/class_environment.inc:290
 msgid "Remove environment extension"
@@ -1968,8 +1977,8 @@ msgstr "Geen"
 
 #: plugins/personal/environment/class_environment.inc:510
 #: plugins/personal/environment/class_environment.inc:521
-#: plugins/admin/systems/class_terminalStartup.inc:134
 #: plugins/admin/systems/class_workstationStartup.inc:503
+#: plugins/admin/systems/class_terminalStartup.inc:134
 msgid "You must specify a valid mount point."
 msgstr "U moet een geldig mountpunt opgeven."
 
@@ -2078,9 +2087,9 @@ msgid "Resolution"
 msgstr "Resolutie"
 
 #: plugins/personal/environment/environment.tpl:105
-#: plugins/admin/systems/servservice.tpl:11
 #: plugins/admin/systems/workstationStartup.tpl:86
 #: plugins/admin/systems/terminalStartup.tpl:66
+#: plugins/admin/systems/servservice.tpl:11
 msgid "Shares"
 msgstr "Shares"
 
@@ -2094,13 +2103,14 @@ msgstr "Shares"
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:266
 #: plugins/admin/groups/class_groupMail.inc:537
 #: plugins/admin/applications/class_applicationParameters.inc:100
+#: plugins/admin/systems/glpiPrinter.tpl:122
 #: plugins/admin/systems/workstationStartup.tpl:101
-#: plugins/admin/systems/printer.tpl:48 plugins/admin/systems/servdns.tpl:8
+#: plugins/admin/systems/servdns.tpl:8
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/glpiManufacturer.tpl:8
-#: plugins/admin/systems/glpiPrinter.tpl:122
+#: plugins/admin/systems/printer.tpl:48
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:274
-#: ihtml/themes/altlinux/islocked.tpl:13
+#: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/lhs/islocked.tpl:13
 msgid "Remove"
 msgstr "Verwijderen"
 
@@ -2123,9 +2133,9 @@ msgid "Hotplug device settings"
 msgstr "Hotplug apparaat instellingen"
 
 #: plugins/personal/environment/environment.tpl:164
-#: plugins/admin/groups/class_groupManagement.inc:455
+#: plugins/admin/groups/class_groupManagement.inc:456
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:273
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
 msgid "New"
 msgstr "Nieuw"
 
@@ -2141,14 +2151,6 @@ msgstr "Printer instellingen"
 msgid "Admin Toggle"
 msgstr "Beheerder omschakeling"
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:96
-msgid "Specified name is invalid."
-msgstr "De opgegeven naam is ongeldig."
-
-#: plugins/personal/environment/class_logonManagementDialog.inc:100
-msgid "Specified description contains invalid characters."
-msgstr "De opgegeven omschrijving bevat ongeldige karakters!"
-
 #: plugins/personal/environment/logonManagement.tpl:8
 msgid "Logon script settings"
 msgstr "Login script instellingen"
@@ -2159,22 +2161,21 @@ msgstr "Scriptnaam"
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:41
+#: plugins/gofax/blocklists/generic.tpl:41 plugins/addons/godfs/generic.tpl:12
+#: plugins/addons/godfs/generic.tpl:38 plugins/admin/fai/faiVariable.tpl:19
 #: plugins/admin/fai/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiVariable.tpl:19
-#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
-#: plugins/admin/fai/faiProfile.tpl:19
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:11
-#: plugins/admin/fai/faiScript.tpl:19
+#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
+#: plugins/admin/fai/faiProfile.tpl:19 plugins/admin/fai/faiScript.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:17
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHookEntry.tpl:17
 #: plugins/admin/fai/faiTemplateEntry.tpl:11 plugins/admin/fai/faiHook.tpl:19
 #: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/component.tpl:25 plugins/admin/systems/server.tpl:25
-#: plugins/admin/systems/phone.tpl:25 plugins/admin/systems/printer.tpl:13
-#: plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/server.tpl:25 plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/component.tpl:25 plugins/admin/systems/phone.tpl:25
+#: plugins/admin/systems/printer.tpl:13
 #: plugins/admin/systems/wingeneric.tpl:25
 #: plugins/admin/ogroups/generic.tpl:13 plugins/gofon/macro/generic.tpl:36
 #: plugins/gofon/conference/generic.tpl:51
@@ -2206,44 +2207,28 @@ msgstr "Login script"
 
 #: plugins/personal/environment/logonManagement.tpl:75
 #: plugins/gofax/faxaccount/lists.tpl:31
-#: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiPackageConfiguration.tpl:6
+#: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiScriptEntry.tpl:68
+#: plugins/admin/fai/faiNewBranch.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:48
 #: plugins/admin/fai/faiPackageEntry.tpl:56
 #: plugins/admin/fai/faiHookEntry.tpl:70
 #: plugins/admin/fai/faiTemplateEntry.tpl:130
-#: plugins/admin/fai/faiNewBranch.tpl:19
-#: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/groups/application_options.tpl:8
-#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/systems/servRepositorySetup.tpl:41
+#: plugins/admin/systems/printerPPDDialog.tpl:22
 msgid "Apply"
 msgstr "Toepassen"
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:67
-#: plugins/personal/environment/class_kioskManagementDialog.inc:85
-#, php-format
-msgid "Can't delete '%s'. Error was: permission denied."
-msgstr "Kan '%s' niet verwijderen. De foutmelding was: toegang geweigerd."
-
-#: plugins/personal/environment/class_kioskManagementDialog.inc:70
-#: plugins/personal/environment/class_kioskManagementDialog.inc:88
-#, php-format
-msgid "Can't delete '%s'. Errow was: file doesn't exist."
-msgstr "Kan '%s' niet verwijderen. De foutmelding was: bestand bestaat niet."
+#: plugins/personal/environment/class_logonManagementDialog.inc:96
+msgid "Specified name is invalid."
+msgstr "De opgegeven naam is ongeldig."
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:130
-msgid ""
-"There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
-msgstr ""
-"Er is geen KIOSKPATH gedefinieerd in uw gosa.conf. Kiosk profielen kunnen "
-"niet beheerd worden!"
-
-#: plugins/personal/environment/class_kioskManagementDialog.inc:136
-#, php-format
-msgid "Kiosk path '%s' is not accessible. Please check the permissions."
-msgstr "Kioskpad '%s' is niet toegankelijk. Controleer de permissies."
+#: plugins/personal/environment/class_logonManagementDialog.inc:100
+msgid "Specified description contains invalid characters."
+msgstr "De opgegeven omschrijving bevat ongeldige karakters!"
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:1
 msgid "Create new hotplug entry"
@@ -2266,6 +2251,30 @@ msgstr "Apparaat ID"
 msgid "save"
 msgstr "Opslaan"
 
+#: plugins/personal/environment/class_kioskManagementDialog.inc:67
+#: plugins/personal/environment/class_kioskManagementDialog.inc:85
+#, php-format
+msgid "Can't delete '%s'. Error was: permission denied."
+msgstr "Kan '%s' niet verwijderen. De foutmelding was: toegang geweigerd."
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:70
+#: plugins/personal/environment/class_kioskManagementDialog.inc:88
+#, php-format
+msgid "Can't delete '%s'. Errow was: file doesn't exist."
+msgstr "Kan '%s' niet verwijderen. De foutmelding was: bestand bestaat niet."
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:130
+msgid ""
+"There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
+msgstr ""
+"Er is geen KIOSKPATH gedefinieerd in uw gosa.conf. Kiosk profielen kunnen "
+"niet beheerd worden!"
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:136
+#, php-format
+msgid "Kiosk path '%s' is not accessible. Please check the permissions."
+msgstr "Kioskpad '%s' is niet toegankelijk. Controleer de permissies."
+
 #: plugins/personal/environment/kioskManagement.tpl:1
 #: plugins/personal/environment/kioskManagement.tpl:5
 msgid "Kiosk profile management"
@@ -2278,20 +2287,159 @@ msgid "Browse"
 msgstr "Doorzoek"
 
 #: plugins/personal/environment/kioskManagement.tpl:25
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
 #: plugins/admin/systems/glpi_edit_type.tpl:15
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:14
 #: plugins/admin/systems/glpiManufacturer.tpl:13
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
 #: plugins/admin/systems/glpi_edit_os.tpl:15
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:14
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
 #: include/class_MultiSelectWindow.inc:45
 msgid "Close"
 msgstr "Sluiten"
 
-#: plugins/personal/environment/main.inc:124
-msgid "User environment settings"
-msgstr "Gebruikersomgeving instellingen"
+#: plugins/personal/generic/class_user.inc:256
+msgid "female"
+msgstr "vrouw"
+
+#: plugins/personal/generic/class_user.inc:256
+msgid "male"
+msgstr "man"
+
+#: plugins/personal/generic/class_user.inc:270
+msgid "This account has no valid GOsa extensions."
+msgstr "Dit account heeft geen geldige GOsa extensies."
+
+#: plugins/personal/generic/class_user.inc:324
+msgid "The specified file has not been uploaded via HTTP POST! Aborted."
+msgstr ""
+"Het opgegeven bestand is niet opgestuurd via HTTP POST! Aktie afgebroken."
+
+#: plugins/personal/generic/class_user.inc:420
+msgid "Please enter a valid serial number"
+msgstr "Geef a.u.b. een geldig serienummer op"
+
+#: plugins/personal/generic/class_user.inc:457
+#, php-format
+msgid "Certificate is valid from %s to %s and is currently %s."
+msgstr "Certificaat is geldig van '%s' tot '%s' en de huidige status is '%s'."
+
+#: plugins/personal/generic/class_user.inc:457
+msgid "valid"
+msgstr "geldig"
+
+#: plugins/personal/generic/class_user.inc:457
+msgid "invalid"
+msgstr "ongeldig"
+
+#: plugins/personal/generic/class_user.inc:461
+msgid "No certificate installed"
+msgstr "Geen certificaat geinstalleerd"
+
+#: plugins/personal/generic/class_user.inc:879
+msgid "Kerberos database communication failed"
+msgstr "Kerberos database communicatie is mislukt"
+
+#: plugins/personal/generic/class_user.inc:896
+msgid "Can't remove user from kerberos database."
+msgstr "Kan de gebruiker niet verwijderen uit de kerberos database."
+
+#: plugins/personal/generic/class_user.inc:907
+msgid "Can't add user to kerberos database."
+msgstr "Kan de gebruiker niet toevoegen aan de kerberos database."
+
+#: plugins/personal/generic/class_user.inc:947
+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:952
+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:958
+#: plugins/addons/addressbook/class_addressbook.inc:545
+#: plugins/admin/users/class_userManagement.inc:634
+msgid "The required field 'Name' is not set."
+msgstr "Het vereiste veld '(Achter)naam' is leeg."
+
+#: plugins/personal/generic/class_user.inc:967
+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:973
+#: plugins/addons/addressbook/class_addressbook.inc:549
+#: plugins/admin/users/class_userManagement.inc:637
+msgid "The required field 'Given name' is not set."
+msgstr "Het vereiste veld 'Voornaam' is leeg."
+
+#: plugins/personal/generic/class_user.inc:976
+msgid "The required field 'Login' is not set."
+msgstr "Het vereiste veld 'Inlog naam' is leeg."
+
+#: plugins/personal/generic/class_user.inc:983
+msgid ""
+"There's already a person with this 'Name'/'Given name' combination in the "
+"database."
+msgstr ""
+"Er bestaat al een persoon met deze '(Achter)naam'/'Voornaam' combinatie in "
+"de database."
+
+#: plugins/personal/generic/class_user.inc:990
+msgid ""
+"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+"Het veld 'Inlog naam' bevat ongeldige karakters. Kleine letters, nummers en "
+"liggende streepjes zijn toegestaan."
+
+#: plugins/personal/generic/class_user.inc:993
+msgid "The field 'Homepage' contains an invalid URL definition."
+msgstr "Het veld 'Website' bevat een ongeldige URL."
+
+#: plugins/personal/generic/class_user.inc:996
+#: plugins/personal/generic/class_user.inc:1021
+#: plugins/addons/addressbook/class_addressbook.inc:555
+#: plugins/addons/addressbook/class_addressbook.inc:583
+#: plugins/admin/departments/class_departmentGeneric.inc:211
+msgid "The field 'Name' contains invalid characters."
+msgstr "Het veld 'Naam' bevat ongeldige karakters."
+
+#: plugins/personal/generic/class_user.inc:999
+#: plugins/personal/generic/class_user.inc:1018
+#: plugins/addons/addressbook/class_addressbook.inc:558
+#: plugins/addons/addressbook/class_addressbook.inc:580
+msgid "The field 'Given name' contains invalid characters."
+msgstr "Het veld 'Voornaam' bevat ongeldige karakters."
+
+#: plugins/personal/generic/class_user.inc:1004
+#: plugins/addons/addressbook/class_addressbook.inc:563
+#: plugins/addons/addressbook/class_addressbook.inc:566
+#: plugins/admin/departments/class_departmentGeneric.inc:214
+msgid "The field 'Phone' contains an invalid phone number."
+msgstr "Het veld 'Telefoon' bevat een ongeldig telefoonnummer."
+
+#: plugins/personal/generic/class_user.inc:1007
+#: plugins/addons/addressbook/class_addressbook.inc:569
+#: plugins/admin/departments/class_departmentGeneric.inc:217
+msgid "The field 'Fax' contains an invalid phone number."
+msgstr "Het veld 'Fax' bevat een ongeldig Faxnummer."
+
+#: plugins/personal/generic/class_user.inc:1010
+#: plugins/addons/addressbook/class_addressbook.inc:572
+msgid "The field 'Mobile' contains an invalid phone number."
+msgstr "Het veld 'GSM' bevat een ongeldig telefoonnummer"
+
+#: plugins/personal/generic/class_user.inc:1013
+#: plugins/addons/addressbook/class_addressbook.inc:575
+msgid "The field 'Pager' contains an invalid phone number."
+msgstr "Het veld 'Pieper' bevat een ongeldig telefoonnummer."
+
+#: plugins/personal/generic/class_user.inc:1140
+msgid "Could not open specified certificate!"
+msgstr "Het opgegeven certificaat kon geopend worden!"
 
 #: plugins/personal/generic/password.tpl:2
 msgid ""
@@ -2303,38 +2451,18 @@ msgstr ""
 "veranderd. Daarom moet u het wachtwoord op dit moment opnieuw invoeren. GOsa "
 "zal dan het wachtwoord versleutelen op de door u geselecteerde methode."
 
-#: plugins/personal/generic/generic_picture.tpl:5
-#: plugins/personal/generic/generic_picture.tpl:15
+#: 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_picture.tpl:5
+#: plugins/personal/generic/generic_picture.tpl:15
 #: plugins/personal/generic/paste_generic.tpl:41
 msgid "Personal picture"
 msgstr "Persoonlijk plaatje"
 
-#: plugins/personal/generic/generic_picture.tpl:27
-#: plugins/personal/generic/paste_generic.tpl:27
-msgid "Remove picture"
-msgstr "Plaatje verwijderen"
-
-#: plugins/personal/generic/generic_picture.tpl:33
-#: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
-#: plugins/admin/systems/servnfs.tpl:75
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
-#: plugins/admin/systems/servdnseditzone.tpl:117
-#: plugins/admin/systems/glpi_devices.tpl:760
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
-#: include/class_MultiSelectWindow.inc:44
-#: ihtml/themes/default/copyPasteDialog.tpl:12
-msgid "Save"
-msgstr "Opslaan"
-
-#: plugins/personal/generic/generic.tpl:6
-msgid "Personal information"
-msgstr "Persoonlijke informatie"
-
 #: plugins/personal/generic/generic.tpl:24
 #: plugins/personal/generic/generic.tpl:34
 msgid "Change picture"
@@ -2365,8 +2493,8 @@ msgid "Login"
 msgstr "Inlognaam"
 
 #: plugins/personal/generic/generic.tpl:67
-#: plugins/addons/addressbook/address_info.tpl:22
 #: plugins/addons/addressbook/address_edit.tpl:54
+#: plugins/addons/addressbook/address_info.tpl:22
 msgid "Personal title"
 msgstr "Persoonlijke titel"
 
@@ -2380,7 +2508,7 @@ msgstr "Geboortedatum"
 
 #: plugins/personal/generic/generic.tpl:100
 #: ihtml/themes/altlinux/sizelimit.tpl:14
-#: ihtml/themes/default/sizelimit.tpl:14
+#: ihtml/themes/default/sizelimit.tpl:14 ihtml/themes/lhs/sizelimit.tpl:14
 msgid "Set"
 msgstr "Stel in"
 
@@ -2394,30 +2522,31 @@ msgid "Preferred langage"
 msgstr "Voorkeurstaal"
 
 #: plugins/personal/generic/generic.tpl:127
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
 #: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/admin/fai/class_faiManagement.inc:670
-#: plugins/admin/groups/class_groupManagement.inc:458
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
+#: plugins/addons/godfs/class_dfsManagment.inc:186
+#: plugins/admin/fai/class_faiManagement.inc:678
+#: plugins/admin/groups/class_groupManagement.inc:459
 #: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/users/class_userManagement.inc:786
+#: plugins/admin/users/class_userManagement.inc:787
 #: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_applicationManagement.inc:477
+#: plugins/admin/applications/class_applicationManagement.inc:480
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_departmentManagement.inc:302
-#: plugins/admin/systems/component.tpl:13 plugins/admin/systems/server.tpl:13
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/terminal.tpl:18
-#: plugins/admin/systems/class_systemManagement.inc:771
-#: plugins/admin/systems/printer.tpl:20
+#: plugins/admin/departments/class_departmentManagement.inc:303
+#: plugins/admin/systems/server.tpl:13 plugins/admin/systems/terminal.tpl:18
 #: plugins/admin/systems/workstation.tpl:27
+#: plugins/admin/systems/component.tpl:13
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/phone.tpl:13
+#: plugins/admin/systems/class_systemManagement.inc:772
+#: plugins/admin/systems/printer.tpl:20
 #: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:43
-#: plugins/admin/ogroups/class_ogroupManagement.inc:451
-#: plugins/admin/ogroups/generic.tpl:21
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:330
-#: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/ogroups/class_ogroupManagement.inc:452
+#: plugins/admin/ogroups/generic.tpl:21 plugins/gofon/macro/generic.tpl:20
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 #: plugins/gofon/conference/generic.tpl:33
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
 msgid "Base"
 msgstr "Basis"
 
@@ -2428,10 +2557,10 @@ msgstr "Kies de subtree waaronder de gebruiker geplaatst wordt"
 #: plugins/personal/generic/generic.tpl:134
 #: plugins/admin/groups/generic.tpl:26
 #: plugins/admin/departments/generic.tpl:33
-#: plugins/admin/systems/component.tpl:18 plugins/admin/systems/server.tpl:18
-#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/terminal.tpl:23
-#: plugins/admin/systems/printer.tpl:25
+#: plugins/admin/systems/server.tpl:18 plugins/admin/systems/terminal.tpl:23
 #: plugins/admin/systems/workstation.tpl:32
+#: plugins/admin/systems/component.tpl:18 plugins/admin/systems/phone.tpl:18
+#: plugins/admin/systems/printer.tpl:25
 #: plugins/admin/systems/wingeneric.tpl:18
 #: plugins/admin/ogroups/generic.tpl:26
 #, fuzzy
@@ -2440,10 +2569,10 @@ msgstr "Selecteer een server"
 
 #: plugins/personal/generic/generic.tpl:147
 #: plugins/personal/generic/generic.tpl:291
-#: plugins/addons/addressbook/address_info.tpl:33
-#: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/addons/addressbook/address_edit.tpl:72
 #: plugins/addons/addressbook/address_edit.tpl:182
+#: plugins/addons/addressbook/address_info.tpl:33
+#: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/admin/departments/generic.tpl:55
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
 msgid "Address"
@@ -2487,16 +2616,16 @@ msgid "Organization"
 msgstr "Organisatie"
 
 #: plugins/personal/generic/generic.tpl:213
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:323
-#: plugins/addons/addressbook/address_info.tpl:64
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
 #: plugins/addons/addressbook/address_edit.tpl:138
-#: plugins/admin/groups/class_groupManagement.inc:523
-#: plugins/admin/users/class_userManagement.inc:818
-#: plugins/admin/applications/class_applicationManagement.inc:518
-#: plugins/admin/systems/class_systemManagement.inc:791
-#: plugins/admin/ogroups/class_ogroupManagement.inc:517
-#: plugins/admin/ogroups/class_ogroupManagement.inc:585
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
+#: plugins/addons/addressbook/address_info.tpl:64
+#: plugins/admin/groups/class_groupManagement.inc:524
+#: plugins/admin/users/class_userManagement.inc:819
+#: plugins/admin/applications/class_applicationManagement.inc:521
+#: plugins/admin/systems/class_systemManagement.inc:792
+#: plugins/admin/ogroups/class_ogroupManagement.inc:518
+#: plugins/admin/ogroups/class_ogroupManagement.inc:586
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #: plugins/generic/references/class_reference.inc:38
 msgid "Department"
 msgstr "Afdeling"
@@ -2520,12 +2649,13 @@ msgstr "Kamer nr."
 
 #: plugins/personal/generic/generic.tpl:257
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_info.tpl:40
-#: plugins/addons/addressbook/address_edit.tpl:95 html/getxls.php:236
+#: 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:283
+#: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:43
 #: plugins/admin/departments/generic.tpl:51
 #: plugins/admin/systems/workstation.tpl:18 html/getxls.php:174
@@ -2571,8 +2701,8 @@ msgid "Street"
 msgstr "Straat"
 
 #: plugins/personal/generic/generic.tpl:365
-#: plugins/addons/addressbook/address_info.tpl:70
-#: plugins/addons/addressbook/address_edit.tpl:158 html/getxls.php:174
+#: plugins/addons/addressbook/address_edit.tpl:158
+#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
 msgid "Postal code"
 msgstr "Postcode"
 
@@ -2592,165 +2722,42 @@ msgstr "Laatste levering"
 msgid "Public visible"
 msgstr "Publiek zichtbaar"
 
-#: plugins/personal/generic/generic_certs.tpl:8
-msgid "Standard certificate"
-msgstr "Standaard certificaat"
-
-#: plugins/personal/generic/generic_certs.tpl:28
-msgid "S/MIME certificate"
-msgstr "S/MIME certificaat"
+#: plugins/personal/generic/generic_picture.tpl:27
+#: plugins/personal/generic/paste_generic.tpl:27
+msgid "Remove picture"
+msgstr "Plaatje verwijderen"
 
-#: plugins/personal/generic/generic_certs.tpl:48
-msgid "PKCS12 certificate"
+#: plugins/personal/generic/generic_picture.tpl:33
+#: plugins/addons/addressbook/address_edit.tpl:233
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
+#: plugins/admin/systems/servnfs.tpl:75
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
+#: plugins/admin/systems/servdnseditzone.tpl:117
+#: plugins/admin/systems/glpi_devices.tpl:760
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
+#: include/class_MultiSelectWindow.inc:44
+#: ihtml/themes/default/copyPasteDialog.tpl:12
+msgid "Save"
+msgstr "Opslaan"
+
+#: plugins/personal/generic/generic_certs.tpl:8
+msgid "Standard certificate"
+msgstr "Standaard certificaat"
+
+#: plugins/personal/generic/generic_certs.tpl:28
+msgid "S/MIME certificate"
+msgstr "S/MIME certificaat"
+
+#: plugins/personal/generic/generic_certs.tpl:48
+msgid "PKCS12 certificate"
 msgstr "PKCS12 certificaat"
 
 #: plugins/personal/generic/generic_certs.tpl:65
 msgid "Certificate serial number"
 msgstr "Certificaat serienummer"
 
-#: plugins/personal/generic/class_user.inc:256
-msgid "female"
-msgstr "vrouw"
-
-#: plugins/personal/generic/class_user.inc:256
-msgid "male"
-msgstr "man"
-
-#: plugins/personal/generic/class_user.inc:270
-msgid "This account has no valid GOsa extensions."
-msgstr "Dit account heeft geen geldige GOsa extensies."
-
-#: plugins/personal/generic/class_user.inc:324
-msgid "The specified file has not been uploaded via HTTP POST! Aborted."
-msgstr ""
-"Het opgegeven bestand is niet opgestuurd via HTTP POST! Aktie afgebroken."
-
-#: plugins/personal/generic/class_user.inc:420
-msgid "Please enter a valid serial number"
-msgstr "Geef a.u.b. een geldig serienummer op"
-
-#: plugins/personal/generic/class_user.inc:457
-#, php-format
-msgid "Certificate is valid from %s to %s and is currently %s."
-msgstr "Certificaat is geldig van '%s' tot '%s' en de huidige status is '%s'."
-
-#: plugins/personal/generic/class_user.inc:457
-msgid "valid"
-msgstr "geldig"
-
-#: plugins/personal/generic/class_user.inc:457
-msgid "invalid"
-msgstr "ongeldig"
-
-#: plugins/personal/generic/class_user.inc:461
-msgid "No certificate installed"
-msgstr "Geen certificaat geinstalleerd"
-
-#: plugins/personal/generic/class_user.inc:879
-msgid "Kerberos database communication failed"
-msgstr "Kerberos database communicatie is mislukt"
-
-#: plugins/personal/generic/class_user.inc:896
-msgid "Can't remove user from kerberos database."
-msgstr "Kan de gebruiker niet verwijderen uit de kerberos database."
-
-#: plugins/personal/generic/class_user.inc:907
-msgid "Can't add user to kerberos database."
-msgstr "Kan de gebruiker niet toevoegen aan de kerberos database."
-
-#: plugins/personal/generic/class_user.inc:947
-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:952
-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:958
-#: plugins/addons/addressbook/class_addressbook.inc:545
-#: plugins/admin/users/class_userManagement.inc:634
-msgid "The required field 'Name' is not set."
-msgstr "Het vereiste veld '(Achter)naam' is leeg."
-
-#: plugins/personal/generic/class_user.inc:967
-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:973
-#: plugins/addons/addressbook/class_addressbook.inc:549
-#: plugins/admin/users/class_userManagement.inc:637
-msgid "The required field 'Given name' is not set."
-msgstr "Het vereiste veld 'Voornaam' is leeg."
-
-#: plugins/personal/generic/class_user.inc:976
-msgid "The required field 'Login' is not set."
-msgstr "Het vereiste veld 'Inlog naam' is leeg."
-
-#: plugins/personal/generic/class_user.inc:983
-msgid ""
-"There's already a person with this 'Name'/'Given name' combination in the "
-"database."
-msgstr ""
-"Er bestaat al een persoon met deze '(Achter)naam'/'Voornaam' combinatie in "
-"de database."
-
-#: plugins/personal/generic/class_user.inc:990
-msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-"Het veld 'Inlog naam' bevat ongeldige karakters. Kleine letters, nummers en "
-"liggende streepjes zijn toegestaan."
-
-#: plugins/personal/generic/class_user.inc:993
-msgid "The field 'Homepage' contains an invalid URL definition."
-msgstr "Het veld 'Website' bevat een ongeldige URL."
-
-#: plugins/personal/generic/class_user.inc:996
-#: plugins/personal/generic/class_user.inc:1021
-#: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/addons/addressbook/class_addressbook.inc:583
-#: plugins/admin/departments/class_departmentGeneric.inc:211
-msgid "The field 'Name' contains invalid characters."
-msgstr "Het veld 'Naam' bevat ongeldige karakters."
-
-#: plugins/personal/generic/class_user.inc:999
-#: plugins/personal/generic/class_user.inc:1018
-#: plugins/addons/addressbook/class_addressbook.inc:558
-#: plugins/addons/addressbook/class_addressbook.inc:580
-msgid "The field 'Given name' contains invalid characters."
-msgstr "Het veld 'Voornaam' bevat ongeldige karakters."
-
-#: plugins/personal/generic/class_user.inc:1004
-#: plugins/addons/addressbook/class_addressbook.inc:563
-#: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/admin/departments/class_departmentGeneric.inc:214
-msgid "The field 'Phone' contains an invalid phone number."
-msgstr "Het veld 'Telefoon' bevat een ongeldig telefoonnummer."
-
-#: plugins/personal/generic/class_user.inc:1007
-#: plugins/addons/addressbook/class_addressbook.inc:569
-#: plugins/admin/departments/class_departmentGeneric.inc:217
-msgid "The field 'Fax' contains an invalid phone number."
-msgstr "Het veld 'Fax' bevat een ongeldig Faxnummer."
-
-#: plugins/personal/generic/class_user.inc:1010
-#: plugins/addons/addressbook/class_addressbook.inc:572
-msgid "The field 'Mobile' contains an invalid phone number."
-msgstr "Het veld 'GSM' bevat een ongeldig telefoonnummer"
-
-#: plugins/personal/generic/class_user.inc:1013
-#: plugins/addons/addressbook/class_addressbook.inc:575
-msgid "The field 'Pager' contains an invalid phone number."
-msgstr "Het veld 'Pieper' bevat een ongeldig telefoonnummer."
-
-#: plugins/personal/generic/class_user.inc:1140
-msgid "Could not open specified certificate!"
-msgstr "Het opgegeven certificaat kon geopend worden!"
-
 #: plugins/personal/generic/main.inc:107
 msgid "You are not allowed to set your password!"
 msgstr "U heeft geen toestemming om uw wachtwoord te veranderen!"
@@ -2799,14 +2806,18 @@ msgstr "PPTP account"
 msgid "Intranet account"
 msgstr "Intranet account"
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:6
-msgid "WebDAV"
-msgstr "WebDAV"
-
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "PHPGroupware account"
 
+#: plugins/personal/connectivity/glpi.tpl:1
+msgid "GLPI account"
+msgstr "GLPI account"
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:6
+msgid "WebDAV"
+msgstr "WebDAV"
+
 #: plugins/personal/connectivity/kolab.tpl:1
 msgid "Kolab account"
 msgstr "Kolab account"
@@ -2908,10 +2919,6 @@ msgstr "Selecteer om Ftp toegang uit te schakelen"
 msgid "Temporary disable FTP access"
 msgstr "Schakel FTP toegang tijdelijk uit"
 
-#: plugins/personal/connectivity/glpi.tpl:1
-msgid "GLPI account"
-msgstr "GLPI account"
-
 #: plugins/personal/connectivity/oxchange.tpl:2
 msgid "Open-Xchange Account"
 msgstr "Open-Xchange Account"
@@ -2944,6 +2951,27 @@ msgstr "Gebruikersinformatie"
 msgid "User Timezone"
 msgstr "Tijdzone"
 
+#: plugins/personal/connectivity/opengw.tpl:1
+msgid "Opengroupware"
+msgstr "OpenGroupware"
+
+#: plugins/personal/connectivity/opengw.tpl:8
+msgid "Location team"
+msgstr "Teamlocatie"
+
+#: plugins/personal/connectivity/opengw.tpl:21
+msgid "Template user"
+msgstr "Sjabloongebruiker"
+
+#: plugins/personal/connectivity/opengw.tpl:34
+#: plugins/admin/systems/class_workstationGeneric.inc:71
+msgid "Locked"
+msgstr "Geblokkeerd"
+
+#: plugins/personal/connectivity/opengw.tpl:49
+msgid "Teams"
+msgstr "Teams"
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
@@ -2982,13 +3010,38 @@ msgstr "De nummerieke waarde opgegeven voor Quota Instellingen is leeg."
 msgid "Numerical value for Quota Setting is not valid."
 msgstr "De nummerieke waarde opgegeven voor Quota Instellingen is niet geldig."
 
+#: plugins/personal/connectivity/class_intranetAccount.inc:14
+msgid "Intranet"
+msgstr "Intranet"
+
 #: plugins/personal/connectivity/class_pptpAccount.inc:26
 msgid "PPTP"
 msgstr "PPTP"
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:14
-msgid "Intranet"
-msgstr "Intranet"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
+msgstr "Ftp"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+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:140
+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:143
+msgid "Value specified as 'Files' is not valid."
+msgstr "De opgegeven waarde voor 'Bestanden' is niet geldig."
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:146
+msgid "Value specified as 'Size' is not valid."
+msgstr "De opgegeven waarde voor 'Grootte' is niet geldig."
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:149
+msgid "Value specified as 'Ratio' is not valid."
+msgstr "De opgegeven waarde voor 'Verhouding' is niet geldig."
 
 #: plugins/personal/connectivity/class_phpgwAccount.inc:5
 msgid "PHPGroupware"
@@ -3058,34 +3111,13 @@ msgstr "Het uitnodigingsbeleid invoer voor adres '%s' is niet geldig"
 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_pureftpdAccount.inc:6
-#: plugins/generic/references/class_reference.inc:34
-msgid "FTP"
-msgstr "Ftp"
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
-msgid "Value specified as 'Upload bandwidth' is not valid."
-msgstr "De opgegeven waarde voor 'Verstuur Bandbreedte' is niet geldig."
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
+msgstr "WebDAV Account"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:140
-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:143
-msgid "Value specified as 'Files' is not valid."
-msgstr "De opgegeven waarde voor 'Bestanden' is niet geldig."
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:146
-msgid "Value specified as 'Size' is not valid."
-msgstr "De opgegeven waarde voor 'Grootte' is niet geldig."
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:149
-msgid "Value specified as 'Ratio' is not valid."
-msgstr "De opgegeven waarde voor 'Verhouding' is niet geldig."
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
-msgid "Open-Xchange"
-msgstr "Open-Xchange"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
+msgid "Open-Xchange"
+msgstr "Open-Xchange"
 
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:613
 #, php-format
@@ -3135,39 +3167,6 @@ msgstr ""
 msgid "you are not using any strange characters in the loginname."
 msgstr ""
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
-msgstr "WebDAV Account"
-
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
-msgid "PHPscheduleit"
-msgstr "PHPScheduleIt"
-
-#: plugins/personal/connectivity/class_connectivity.inc:63
-msgid "This account has no connectivity extensions."
-msgstr "Dit account heeft geen verbindings mogelijkheden."
-
-#: plugins/personal/connectivity/opengw.tpl:1
-msgid "Opengroupware"
-msgstr "OpenGroupware"
-
-#: plugins/personal/connectivity/opengw.tpl:8
-msgid "Location team"
-msgstr "Teamlocatie"
-
-#: plugins/personal/connectivity/opengw.tpl:21
-msgid "Template user"
-msgstr "Sjabloongebruiker"
-
-#: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:71
-msgid "Locked"
-msgstr "Geblokkeerd"
-
-#: plugins/personal/connectivity/opengw.tpl:49
-msgid "Teams"
-msgstr "Teams"
-
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 msgid "Opengroupware account"
 msgstr "OpenGroupware account"
@@ -3196,6 +3195,57 @@ msgstr ""
 "OpenGroupware: Kan niet verbinden met de opgegeven database. Controleer uw "
 "configuratie a.u.b. nogmaals."
 
+#: plugins/personal/connectivity/class_connectivity.inc:63
+msgid "This account has no connectivity extensions."
+msgstr "Dit account heeft geen verbindings mogelijkheden."
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
+msgid "PHPscheduleit"
+msgstr "PHPScheduleIt"
+
+#: plugins/gofax/blocklists/generic.tpl:8
+msgid "List name"
+msgstr "Lijstnaam"
+
+#: plugins/gofax/blocklists/generic.tpl:10
+msgid "Name of blocklist"
+msgstr "Naam van de blokkeerlijst"
+
+#: plugins/gofax/blocklists/generic.tpl:16
+msgid "Select subtree to place blocklist in"
+msgstr "Selecteer de subtree waaronder de blokkeerlijst geplaatst wordt"
+
+#: plugins/gofax/blocklists/generic.tpl:32
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/systems/workstationService.tpl:42
+#: plugins/admin/systems/workstationService.tpl:120
+#: plugins/admin/systems/servnfs.tpl:39
+#: plugins/admin/systems/terminalService.tpl:42
+#: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/systems/glpi_devices.tpl:427
+#: plugins/admin/systems/glpi_devices.tpl:492
+#: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
+#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
+msgid "Type"
+msgstr "Type"
+
+#: plugins/gofax/blocklists/generic.tpl:34
+msgid "Select wether to filter incoming or outgoing calls"
+msgstr "Selecteer of inkomende en uitgaande gesprekken gefilterd moeten worden"
+
+#: plugins/gofax/blocklists/generic.tpl:43
+msgid "Descriptive text for this blocklist"
+msgstr "Beschrijving van deze blokkeerlijst"
+
+#: plugins/gofax/blocklists/generic.tpl:56
+msgid "Blocked numbers"
+msgstr "Geblokkeerde nummers"
+
+#: plugins/gofax/blocklists/generic.tpl:72
+msgid "Numbers can also contain wild cards."
+msgstr "Nummers kunnen ook wildcards (*?) bevatten."
+
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
 msgid "FAX Blocklists"
 msgstr "Fax blokkeerlijsten"
@@ -3214,74 +3264,76 @@ msgid "Please specify a valid phone number."
 msgstr "Geef a.u.b. een geldig telefoonnummer op."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/admin/fai/class_faiManagement.inc:635
+#: plugins/admin/fai/class_faiManagement.inc:641
 #: plugins/admin/groups/class_groupManagement.inc:451
 #: plugins/admin/users/class_userManagement.inc:778
-#: plugins/admin/applications/class_applicationManagement.inc:470
+#: plugins/admin/applications/class_applicationManagement.inc:472
 #: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
 #: plugins/admin/ogroups/class_ogroupManagement.inc:442
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
-msgid "Go up one department"
-msgstr "Ga een afdeling omhoog"
+msgid "Go to root department"
+msgstr "Ga naar basis afdelingen"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/admin/fai/class_faiManagement.inc:635
-#: plugins/admin/fai/class_faiProfile.inc:303
+#: plugins/addons/godfs/class_dfsManagment.inc:183
+#: plugins/admin/fai/class_faiManagement.inc:641
 #: plugins/admin/groups/class_groupManagement.inc:451
 #: plugins/admin/users/class_userManagement.inc:778
-#: plugins/admin/applications/class_applicationManagement.inc:470
+#: plugins/admin/applications/class_applicationManagement.inc:472
 #: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
-#: plugins/admin/systems/class_servDNSeditZone.inc:276
+#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: plugins/admin/ogroups/class_ogroupManagement.inc:442
-#: plugins/admin/ogroups/phonequeue.tpl:17
+#: plugins/admin/ogroups/class_ogroupManagement.inc:443
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
-msgid "Up"
-msgstr "Omhoog"
+msgid "Root"
+msgstr "Basis"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
-#: plugins/admin/fai/class_faiManagement.inc:638
+#: plugins/admin/fai/class_faiManagement.inc:644
 #: plugins/admin/groups/class_groupManagement.inc:452
 #: plugins/admin/users/class_userManagement.inc:779
-#: plugins/admin/applications/class_applicationManagement.inc:471
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:297
-#: plugins/admin/systems/class_systemManagement.inc:755
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_systemManagement.inc:755
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/class_ogroupManagement.inc:443
+#: plugins/admin/ogroups/class_ogroupManagement.inc:444
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
-msgid "Go to root department"
-msgstr "Ga naar basis afdelingen"
+msgid "Go up one department"
+msgstr "Ga een afdeling omhoog"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
-#: plugins/admin/fai/class_faiManagement.inc:638
+#: plugins/addons/godfs/class_dfsManagment.inc:182
+#: plugins/admin/fai/class_faiManagement.inc:644
+#: plugins/admin/fai/class_faiProfile.inc:303
 #: plugins/admin/groups/class_groupManagement.inc:452
 #: plugins/admin/users/class_userManagement.inc:779
-#: plugins/admin/applications/class_applicationManagement.inc:471
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:297
-#: plugins/admin/systems/class_systemManagement.inc:755
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_systemManagement.inc:755
+#: plugins/admin/systems/class_servDNSeditZone.inc:276
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
 #: plugins/admin/ogroups/class_ogroupManagement.inc:444
+#: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
-msgid "Root"
-msgstr "Basis"
+msgid "Up"
+msgstr "Omhoog"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:309
 #: plugins/admin/groups/class_groupManagement.inc:453
 #: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:472
-#: plugins/admin/systems/class_systemManagement.inc:757
+#: plugins/admin/applications/class_applicationManagement.inc:474
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
 #: plugins/admin/ogroups/class_ogroupManagement.inc:445
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
@@ -3290,13 +3342,13 @@ msgid "Go to users department"
 msgstr "Ga naar gebruikers afdeling"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:309
-#: plugins/admin/fai/class_faiManagement.inc:641
+#: plugins/admin/fai/class_faiManagement.inc:647
 #: plugins/admin/groups/class_groupManagement.inc:453
 #: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:472
+#: plugins/admin/applications/class_applicationManagement.inc:474
 #: plugins/admin/departments/class_departmentManagement.inc:298
-#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
 #: plugins/admin/ogroups/class_ogroupManagement.inc:446
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
@@ -3304,213 +3356,201 @@ msgstr "Ga naar gebruikers afdeling"
 msgid "Home"
 msgstr "Home"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
+#: plugins/admin/fai/class_faiManagement.inc:649
+#: plugins/admin/groups/class_groupManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:781
+#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/departments/class_departmentManagement.inc:299
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/ogroups/class_ogroupManagement.inc:447
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
+msgid "Reload list"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
+#: plugins/addons/godfs/class_dfsManagment.inc:187
+#: plugins/admin/fai/class_faiManagement.inc:649
+#: plugins/admin/fai/class_faiManagement.inc:679
+#: plugins/admin/groups/class_groupManagement.inc:454
+#: plugins/admin/groups/class_groupManagement.inc:460
+#: plugins/admin/users/class_userManagement.inc:781
+#: plugins/admin/users/class_userManagement.inc:788
+#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/applications/class_applicationManagement.inc:481
+#: plugins/admin/departments/class_departmentManagement.inc:299
+#: plugins/admin/departments/class_departmentManagement.inc:304
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/ogroups/class_ogroupManagement.inc:447
+#: plugins/admin/ogroups/class_ogroupManagement.inc:453
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:332
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
+msgid "Submit"
+msgstr "Verwerk"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
 msgid "Create new blocklist"
 msgstr "Nieuwe blokkeerlijst aanmaken"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
 msgid "New Blocklist"
 msgstr "Nieuwe Blokkeerlijst"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/fai/class_faiManagement.inc:671
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:787
-#: plugins/admin/applications/class_applicationManagement.inc:478
-#: plugins/admin/departments/class_departmentManagement.inc:303
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_glpiSelectUser.inc:168
-#: plugins/admin/ogroups/class_ogroupManagement.inc:452
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
+#: plugins/addons/godfs/class_dfsManagment.inc:187
+#: plugins/admin/fai/class_faiManagement.inc:679
+#: plugins/admin/groups/class_groupManagement.inc:460
+#: plugins/admin/users/class_userManagement.inc:788
+#: plugins/admin/applications/class_applicationManagement.inc:481
+#: plugins/admin/departments/class_departmentManagement.inc:304
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/ogroups/class_ogroupManagement.inc:453
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:332
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
 msgid "Submit department"
 msgstr "Verwerk afdeling"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/fai/class_faiManagement.inc:671
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:787
-#: plugins/admin/applications/class_applicationManagement.inc:478
-#: plugins/admin/departments/class_departmentManagement.inc:303
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_glpiSelectUser.inc:168
-#: plugins/admin/ogroups/class_ogroupManagement.inc:452
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
-msgid "Submit"
-msgstr "Verwerk"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
 #: plugins/admin/fai/class_faiScript.inc:227
 #: plugins/admin/fai/class_faiScript.inc:230
-#: plugins/admin/fai/class_faiManagement.inc:689
-#: plugins/admin/fai/class_faiManagement.inc:789
-#: plugins/admin/fai/class_faiManagement.inc:794
+#: plugins/admin/fai/class_faiManagement.inc:697
+#: plugins/admin/fai/class_faiManagement.inc:797
+#: plugins/admin/fai/class_faiManagement.inc:802
 #: plugins/admin/fai/class_faiHook.inc:251
 #: plugins/admin/fai/class_faiHook.inc:254
-#: plugins/admin/groups/class_groupManagement.inc:469
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/users/class_userManagement.inc:798
-#: plugins/admin/users/class_userManagement.inc:805
-#: plugins/admin/applications/class_applicationManagement.inc:489
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/departments/class_departmentManagement.inc:310
-#: plugins/admin/systems/class_systemManagement.inc:780
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/groups/class_groupManagement.inc:470
+#: plugins/admin/groups/class_groupManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:806
+#: plugins/admin/applications/class_applicationManagement.inc:492
+#: plugins/admin/applications/class_applicationManagement.inc:498
+#: plugins/admin/departments/class_departmentManagement.inc:311
 #: plugins/admin/systems/glpi.tpl:15 plugins/admin/systems/glpi.tpl:25
 #: plugins/admin/systems/glpi.tpl:35 plugins/admin/systems/glpiPrinter.tpl:15
 #: plugins/admin/systems/glpiPrinter.tpl:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:464
-#: plugins/admin/ogroups/class_ogroupManagement.inc:469
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/ogroups/class_ogroupManagement.inc:465
+#: plugins/admin/ogroups/class_ogroupManagement.inc:470
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
 msgid "edit"
 msgstr "Bewerk"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
-#: plugins/admin/users/class_userManagement.inc:799
-#: plugins/admin/users/class_userManagement.inc:806
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
+#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:807
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 msgid "Edit user"
 msgstr "Bewerk gebruiker"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
 #: plugins/addons/mailqueue/contents.tpl:93
 #: plugins/admin/fai/class_faiScript.inc:231
-#: plugins/admin/fai/class_faiManagement.inc:690
-#: plugins/admin/fai/class_faiManagement.inc:796
+#: plugins/admin/fai/class_faiManagement.inc:698
+#: plugins/admin/fai/class_faiManagement.inc:804
 #: plugins/admin/fai/class_faiHook.inc:255
-#: plugins/admin/groups/class_groupManagement.inc:471
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/users/class_userManagement.inc:802
-#: plugins/admin/users/class_userManagement.inc:809
-#: plugins/admin/applications/class_applicationManagement.inc:491
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/departments/class_departmentManagement.inc:311
-#: plugins/admin/systems/class_systemManagement.inc:781
-#: plugins/admin/ogroups/class_ogroupManagement.inc:466
-#: plugins/admin/ogroups/class_ogroupManagement.inc:471
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
+#: plugins/admin/groups/class_groupManagement.inc:472
+#: plugins/admin/groups/class_groupManagement.inc:477
+#: plugins/admin/users/class_userManagement.inc:803
+#: plugins/admin/users/class_userManagement.inc:810
+#: plugins/admin/applications/class_applicationManagement.inc:494
+#: plugins/admin/applications/class_applicationManagement.inc:500
+#: plugins/admin/departments/class_departmentManagement.inc:312
+#: plugins/admin/systems/class_systemManagement.inc:782
+#: plugins/admin/ogroups/class_ogroupManagement.inc:467
+#: plugins/admin/ogroups/class_ogroupManagement.inc:472
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:338
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
 msgid "delete"
 msgstr "Verwijder"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
-#: plugins/admin/users/class_userManagement.inc:803
-#: plugins/admin/users/class_userManagement.inc:810
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
+#: plugins/admin/users/class_userManagement.inc:804
+#: plugins/admin/users/class_userManagement.inc:811
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:338
 msgid "Delete user"
 msgstr "Verwijder gebruiker"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:323
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
 msgid "Blocklist name"
 msgstr "Blokkeerlijst naam"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:325
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/fai/class_faiManagement.inc:686
-#: plugins/admin/groups/class_groupManagement.inc:525
-#: plugins/admin/users/class_userManagement.inc:820
-#: plugins/admin/applications/class_applicationManagement.inc:519
-#: plugins/admin/departments/class_departmentManagement.inc:318
-#: plugins/admin/systems/class_systemManagement.inc:792
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/fai/class_faiManagement.inc:694
+#: plugins/admin/groups/class_groupManagement.inc:526
+#: plugins/admin/users/class_userManagement.inc:821
+#: plugins/admin/applications/class_applicationManagement.inc:522
+#: plugins/admin/departments/class_departmentManagement.inc:319
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
-#: plugins/admin/ogroups/class_ogroupManagement.inc:494
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
+#: plugins/admin/systems/class_systemManagement.inc:793
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/ogroups/class_ogroupManagement.inc:495
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:345
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:313
 msgid "Actions"
 msgstr "Acties"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:327
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:328
 msgid "This table displays faxblocklists for the selected tree."
 msgstr "Deze tabel toont Fax blokeerlijsten voor de geselecteerde tree"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:395
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:396
 msgid "send"
 msgstr "versturen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:395
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:396
 msgid "receive"
 msgstr "ontvangen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:543
 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:548
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:549
 #: plugins/admin/departments/class_departmentGeneric.inc:199
 msgid "Required field 'Name' is not set."
 msgstr "Vereist veld 'Naam' is leeg."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:551
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:552
 msgid "Required field 'Name' contains invalid characters"
 msgstr "Vereist veld 'Naam' bevat ongeldige karakters"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:558
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:559
 msgid "Specified name is already used."
 msgstr "De opgegeven naam wordt al gebruikt."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:565
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:566
 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/generic.tpl:8
-msgid "List name"
-msgstr "Lijstnaam"
-
-#: plugins/gofax/blocklists/generic.tpl:10
-msgid "Name of blocklist"
-msgstr "Naam van de blokkeerlijst"
-
-#: plugins/gofax/blocklists/generic.tpl:16
-msgid "Select subtree to place blocklist in"
-msgstr "Selecteer de subtree waaronder de blokkeerlijst geplaatst wordt"
-
-#: plugins/gofax/blocklists/generic.tpl:32
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
-#: plugins/admin/systems/workstationService.tpl:42
-#: plugins/admin/systems/workstationService.tpl:120
-#: plugins/admin/systems/servnfs.tpl:39
-#: plugins/admin/systems/terminalService.tpl:42
-#: plugins/admin/systems/terminalService.tpl:120
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
-#: plugins/admin/systems/glpi_devices.tpl:427
-#: plugins/admin/systems/glpi_devices.tpl:492
-#: plugins/admin/systems/glpi_devices.tpl:542
-#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
-msgid "Type"
-msgstr "Type"
-
-#: plugins/gofax/blocklists/generic.tpl:34
-msgid "Select wether to filter incoming or outgoing calls"
-msgstr "Selecteer of inkomende en uitgaande gesprekken gefilterd moeten worden"
-
-#: plugins/gofax/blocklists/generic.tpl:43
-msgid "Descriptive text for this blocklist"
-msgstr "Beschrijving van deze blokkeerlijst"
-
-#: plugins/gofax/blocklists/generic.tpl:56
-msgid "Blocked numbers"
-msgstr "Geblokkeerde nummers"
-
-#: plugins/gofax/blocklists/generic.tpl:72
-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/fai/remove.tpl:2
 #: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:237 html/index.php:243 html/index.php:301
-#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/altlinux/islocked.tpl:6
-#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
+#: plugins/admin/departments/remove.tpl:2
+#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/ogroups/remove.tpl:2 plugins/gofon/macro/remove.tpl:2
+#: plugins/gofon/conference/remove.tpl:2 html/index.php:237 html/index.php:243
+#: html/index.php:301 ihtml/themes/altlinux/conflict.tpl:6
+#: ihtml/themes/altlinux/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
+#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/lhs/conflict.tpl:6
+#: ihtml/themes/lhs/islocked.tpl:6
 msgid "Warning"
 msgstr "Waarschuwing"
 
@@ -3674,8 +3714,8 @@ msgid "FAX settings"
 msgstr "Fax instellingen"
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:6
-#: plugins/addons/addressbook/address_info.tpl:88
 #: plugins/addons/addressbook/address_edit.tpl:206
+#: plugins/addons/addressbook/address_info.tpl:88
 #: plugins/generic/references/class_reference.inc:30
 msgid "FAX"
 msgstr "Fax"
@@ -3760,7 +3800,7 @@ msgstr "Fax ID"
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 #: plugins/admin/systems/class_printGeneric.inc:677
-#: plugins/admin/ogroups/class_ogroupManagement.inc:582
+#: plugins/admin/ogroups/class_ogroupManagement.inc:583
 msgid "User"
 msgstr "Gebruiker"
 
@@ -3797,47 +3837,6 @@ msgstr "Overdrachtstijd"
 msgid "# pages"
 msgstr "# pagina's"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:6
-msgid "FAX Reports"
-msgstr "Fax rapporten"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:109
-#: plugins/gofax/faxreports/class_faxreport.inc:119
-#: plugins/gofax/faxreports/class_faxreport.inc:165
-#: plugins/gofax/faxreports/class_faxreport.inc:274
-msgid "Can't connect to fax database, no reports can be shown!"
-msgstr ""
-"Kan niet verbinden met de Fax database. Rapporten kunnen niet getoond worden!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:112
-#: plugins/addons/logview/class_logview.inc:66
-#: plugins/gofon/fonreports/class_fonreport.inc:99
-msgid "There is no mysql extension available, please check your php setup."
-msgstr ""
-"Er is geen MySQL extensie beschikbaar. Controleer uw PHP installatie a.u.b."
-
-#: plugins/gofax/faxreports/class_faxreport.inc:123
-#: plugins/gofax/faxreports/class_faxreport.inc:128
-#: plugins/gofax/faxreports/class_faxreport.inc:169
-#: plugins/gofax/faxreports/class_faxreport.inc:278
-msgid "Can't select fax database for report generation!"
-msgstr "Kan de Fax database voor rapportage niet selecteren!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:177
-#: plugins/gofax/faxreports/class_faxreport.inc:286
-msgid "Query for fax database failed!"
-msgstr "De zoekopdracht op de Fax database is mislukt!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:185
-msgid "You have no permission to retrieve informations about this fax id!"
-msgstr "U heeft geen toestemming om informatie over dit Fax ID op te vragen!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:205
-#: plugins/gofax/faxreports/class_faxreport.inc:294
-#: plugins/gofon/fonreports/class_fonreport.inc:220
-msgid "Y-M-D"
-msgstr "J-M-D"
-
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/fonreports/contents.tpl:2
@@ -3879,6 +3878,7 @@ msgstr "gedurende"
 #: plugins/addons/mailqueue/contents.tpl:26
 #: plugins/addons/logview/contents.tpl:67
 #: plugins/gofon/fonreports/contents.tpl:21 ihtml/themes/default/help.tpl:21
+#: ihtml/themes/lhs/help.tpl:21
 msgid "Search"
 msgstr "Zoeken"
 
@@ -3903,36 +3903,64 @@ msgstr "Ontvanger"
 msgid "Search returned no results..."
 msgstr "De zoekopdracht gaf geen resultaten terug..."
 
-#: plugins/gofax/faxreports/main.inc:5
-msgid "FAX reports"
+#: plugins/gofax/faxreports/class_faxreport.inc:6
+msgid "FAX Reports"
 msgstr "Fax rapporten"
 
-#: plugins/addons/addressbook/dial.tpl:3
-msgid "Dial connection..."
-msgstr "Bel..."
+#: plugins/gofax/faxreports/class_faxreport.inc:109
+#: plugins/gofax/faxreports/class_faxreport.inc:119
+#: plugins/gofax/faxreports/class_faxreport.inc:165
+#: plugins/gofax/faxreports/class_faxreport.inc:274
+msgid "Can't connect to fax database, no reports can be shown!"
+msgstr ""
+"Kan niet verbinden met de Fax database. Rapporten kunnen niet getoond worden!"
 
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:360
-#: plugins/addons/addressbook/class_addressbook.inc:367
-#: plugins/addons/addressbook/class_addressbook.inc:371
-#: plugins/addons/addressbook/class_addressbook.inc:453
-msgid "Dial"
-msgstr "Kies"
+#: plugins/gofax/faxreports/class_faxreport.inc:112
+#: plugins/addons/logview/class_logview.inc:66
+#: plugins/gofon/fonreports/class_fonreport.inc:99
+msgid "There is no mysql extension available, please check your php setup."
+msgstr ""
+"Er is geen MySQL extensie beschikbaar. Controleer uw PHP installatie a.u.b."
+
+#: plugins/gofax/faxreports/class_faxreport.inc:123
+#: plugins/gofax/faxreports/class_faxreport.inc:128
+#: plugins/gofax/faxreports/class_faxreport.inc:169
+#: plugins/gofax/faxreports/class_faxreport.inc:278
+msgid "Can't select fax database for report generation!"
+msgstr "Kan de Fax database voor rapportage niet selecteren!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:177
+#: plugins/gofax/faxreports/class_faxreport.inc:286
+msgid "Query for fax database failed!"
+msgstr "De zoekopdracht op de Fax database is mislukt!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:185
+msgid "You have no permission to retrieve informations about this fax id!"
+msgstr "U heeft geen toestemming om informatie over dit Fax ID op te vragen!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:205
+#: plugins/gofax/faxreports/class_faxreport.inc:294
+#: plugins/gofon/fonreports/class_fonreport.inc:220
+msgid "Y-M-D"
+msgstr "J-M-D"
+
+#: plugins/gofax/faxreports/main.inc:5
+msgid "FAX reports"
+msgstr "Fax rapporten"
 
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:513
 #: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/addons/addressbook/class_addressbook.inc:513
+#: plugins/admin/fai/faiVariable.tpl:9
 #: plugins/admin/fai/faiPartitionTable.tpl:9
-#: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiScriptEntry.tpl:9
-#: plugins/admin/fai/faiPackage.tpl:9 plugins/admin/fai/faiProfile.tpl:9
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiPackage.tpl:9
+#: plugins/admin/fai/faiProfile.tpl:9 plugins/admin/fai/faiScript.tpl:9
+#: plugins/admin/fai/faiVariableEntry.tpl:9
 #: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHookEntry.tpl:9
 #: plugins/admin/fai/faiTemplateEntry.tpl:7 plugins/admin/fai/faiHook.tpl:9
 #: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: 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
@@ -3946,14 +3974,16 @@ msgstr "Kies"
 #: plugins/admin/systems/glpi_devices.tpl:615
 #: plugins/admin/systems/glpi_devices.tpl:669
 #: plugins/admin/systems/glpi_devices.tpl:715
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
 #: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
 msgid "Name"
 msgstr "Naam"
 
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_info.tpl:29
 #: plugins/addons/addressbook/address_edit.tpl:66
+#: plugins/addons/addressbook/address_info.tpl:29
 msgid "Private"
 msgstr "Privé"
 
@@ -4017,6 +4047,60 @@ msgstr "Selecteer het object waarbinnen gezocht zal worden"
 msgid "Search string"
 msgstr "Zoekstring"
 
+#: plugins/addons/addressbook/dial.tpl:3
+msgid "Dial connection..."
+msgstr "Bel..."
+
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/class_addressbook.inc:360
+#: plugins/addons/addressbook/class_addressbook.inc:367
+#: plugins/addons/addressbook/class_addressbook.inc:371
+#: plugins/addons/addressbook/class_addressbook.inc:453
+msgid "Dial"
+msgstr "Kies"
+
+#: plugins/addons/addressbook/address_edit.tpl:7
+msgid "Choose the department to store entry in"
+msgstr "Selecteer de afdeling waarin de invoer bewaard wordt."
+
+#: plugins/addons/addressbook/address_edit.tpl:24
+#: plugins/addons/addressbook/address_info.tpl:12
+msgid "Personal"
+msgstr "Persoonlijk"
+
+#: plugins/addons/addressbook/address_edit.tpl:44
+#: plugins/addons/addressbook/address_info.tpl:19 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Initials"
+msgstr "Initialen"
+
+#: plugins/addons/addressbook/address_edit.tpl:105
+#: plugins/addons/addressbook/address_info.tpl:43
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:46
+msgid "Email"
+msgstr "E-mail"
+
+#: plugins/addons/addressbook/address_edit.tpl:119
+#: plugins/addons/addressbook/address_info.tpl:53
+msgid "Organizational"
+msgstr "Bedrijfsmatig"
+
+#: plugins/addons/addressbook/address_edit.tpl:128
+#: plugins/addons/addressbook/address_info.tpl:61
+msgid "Company"
+msgstr "Bedrijf"
+
+#: plugins/addons/addressbook/address_edit.tpl:148
+#: plugins/addons/addressbook/address_info.tpl:67 html/getxls.php:174
+#: html/getxls.php:236
+msgid "City"
+msgstr "Plaats"
+
+#: plugins/addons/addressbook/address_edit.tpl:168
+#: plugins/addons/addressbook/address_info.tpl:73
+msgid "Country"
+msgstr "Land"
+
 #: plugins/addons/addressbook/remove.tpl:6
 msgid ""
 "This includes all addressbook data in this entry. Please double check if "
@@ -4130,50 +4214,8 @@ msgstr ""
 "U heeft geen toestemming om globale adresboek invoeren te wijzigen of aan te "
 "maken."
 
-#: plugins/addons/addressbook/address_info.tpl:12
-#: plugins/addons/addressbook/address_edit.tpl:24
-msgid "Personal"
-msgstr "Persoonlijk"
-
-#: plugins/addons/addressbook/address_info.tpl:19
-#: plugins/addons/addressbook/address_edit.tpl:44 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Initials"
-msgstr "Initialen"
-
-#: plugins/addons/addressbook/address_info.tpl:43
-#: plugins/addons/addressbook/address_edit.tpl:105
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:46
-msgid "Email"
-msgstr "E-mail"
-
-#: plugins/addons/addressbook/address_info.tpl:53
-#: plugins/addons/addressbook/address_edit.tpl:119
-msgid "Organizational"
-msgstr "Bedrijfsmatig"
-
-#: plugins/addons/addressbook/address_info.tpl:61
-#: plugins/addons/addressbook/address_edit.tpl:128
-msgid "Company"
-msgstr "Bedrijf"
-
-#: plugins/addons/addressbook/address_info.tpl:67
-#: plugins/addons/addressbook/address_edit.tpl:148 html/getxls.php:174
-#: html/getxls.php:236
-msgid "City"
-msgstr "Plaats"
-
-#: plugins/addons/addressbook/address_info.tpl:73
-#: plugins/addons/addressbook/address_edit.tpl:168
-msgid "Country"
-msgstr "Land"
-
-#: plugins/addons/addressbook/address_edit.tpl:7
-msgid "Choose the department to store entry in"
-msgstr "Selecteer de afdeling waarin de invoer bewaard wordt."
-
-#: plugins/addons/mailqueue/class_mailqueue.inc:6
 #: plugins/addons/mailqueue/main.inc:23
+#: plugins/addons/mailqueue/class_mailqueue.inc:6
 msgid "Mail queue"
 msgstr "Mail wachtrij"
 
@@ -4646,73 +4688,223 @@ msgstr "Bericht"
 msgid "System log view"
 msgstr "Systeem log weergave"
 
-#: plugins/admin/fai/class_faiScript.inc:240
-#: plugins/admin/fai/class_faiScriptEntry.inc:89
-#: plugins/admin/fai/class_faiHook.inc:264
-#: plugins/admin/fai/class_faiHookEntry.inc:84
+#: plugins/addons/godfs/class_dfsManagment.inc:16
+#: plugins/addons/godfs/contents.tpl:8
 #, fuzzy
-msgid "Download"
-msgstr "Omlaag"
+msgid "DFS Shares"
+msgstr "Shares"
 
-#: plugins/admin/fai/tabsHook.inc:34 plugins/admin/fai/tabsPartition.inc:34
-#: plugins/admin/fai/tabsVariable.inc:34 plugins/admin/fai/tabsPackage.inc:33
-#: plugins/admin/fai/tabsProfile.inc:34 plugins/admin/fai/tabsScript.inc:34
-#: plugins/admin/fai/tabsTemplate.inc:34
-#: plugins/admin/departments/tabs_department.inc:31
-msgid "Try to move tree failed. Destination tree is subtree of source tree."
+#: plugins/addons/godfs/class_dfsManagment.inc:141
+msgid "No DFS entries found"
 msgstr ""
-"Het verplaatsen van de tree is mislukt. Bestemmings-tree is een subtree van "
-"de bron-tree."
-
-#: plugins/admin/fai/class_faiManagement.inc:32
-msgid "FAI"
-msgstr "FAI"
 
-#: plugins/admin/fai/class_faiManagement.inc:33
-msgid "Fully Automatic Installation - management"
-msgstr "Fully Automatic Installation - beheer"
+#: plugins/addons/godfs/class_dfsManagment.inc:182
+#, fuzzy
+msgid "Go up one dfsshare"
+msgstr "Ga een afdeling omhoog"
 
-#: plugins/admin/fai/class_faiManagement.inc:228
-#, php-format
-msgid "You're about to delete all information about the FAI class at '%s'."
+#: plugins/addons/godfs/class_dfsManagment.inc:183
+msgid "Go to dfs root"
 msgstr ""
-"U staat op het punt alle informatie over deze FAI klasse op '%s' te "
-"verwijderen."
 
-#: plugins/admin/fai/class_faiManagement.inc:234
-#: plugins/admin/fai/class_faiManagement.inc:272
-#: plugins/admin/systems/class_systemManagement.inc:532
-#: plugins/admin/systems/class_systemManagement.inc:603
-msgid "You are not allowed to delete this component!"
-msgstr "U heeft geen toestemming om dit component te verwijderen!"
+#: plugins/addons/godfs/class_dfsManagment.inc:184
+#, fuzzy
+msgid "Create new dfsshare"
+msgstr "Maak nieuwe gebruiker aan"
 
-#: plugins/admin/fai/class_faiManagement.inc:324
-#, php-format
-msgid "You're about to delete a fai branch / freeze  '%s'."
+#: plugins/addons/godfs/class_dfsgeneric.inc:87
+#, fuzzy
+msgid "You have no premissions to create a dfs share."
 msgstr ""
-"U staat op het punt een FAI aftakking / bevriezing '%s' te verwijderen."
+"U heeft geen toestemming om een gebruiker aan te maken onder deze 'Basis'."
 
-#: plugins/admin/fai/class_faiManagement.inc:327
-msgid "You are not allowed to delete this release!"
-msgstr "U heeft geen toestemming om deze uitgave te verwijderen!"
+#: plugins/addons/godfs/class_dfsgeneric.inc:94
+#: plugins/addons/godfs/class_dfsgeneric.inc:96
+#, fuzzy
+msgid "Dfs share already exists."
+msgstr "De opgegeven categorie bestaat al."
 
-#: plugins/admin/fai/class_faiManagement.inc:382
-msgid "Specified branch name is invalid."
-msgstr "De opgegeven aftakkingsnaam is ongeldig."
+#: plugins/addons/godfs/class_dfsgeneric.inc:101
+#, fuzzy
+msgid "Required Field \"Name of dfs Share\" is not set."
+msgstr "Vereist veld 'Naam' is leeg."
 
-#: plugins/admin/fai/class_faiManagement.inc:384
+#: plugins/addons/godfs/class_dfsgeneric.inc:104
 #, fuzzy
-msgid "Specified freeze name is invalid."
-msgstr "De opgegeven naam is ongeldig."
+msgid "Required Field \"Description\" is not set."
+msgstr "Vereist veld 'Omschrijving' is leeg."
 
-#: plugins/admin/fai/class_faiManagement.inc:391
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:349
-#: plugins/admin/systems/class_servRepository.inc:208
-msgid "This name is already in use."
-msgstr "De opgegeven naam wordt al gebruikt."
+#: plugins/addons/godfs/class_dfsgeneric.inc:107
+#, fuzzy
+msgid "Required Field \"Fileserver\" is not set."
+msgstr "Vereist veld 'Naam' is leeg."
 
-#: plugins/admin/fai/class_faiManagement.inc:605
+#: plugins/addons/godfs/class_dfsgeneric.inc:110
+#, fuzzy
+msgid "Required Field \"Share on fileserver\" is not set."
+msgstr "Vereist veld 'Naam' is leeg."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:113
+#, fuzzy
+msgid "Required Field \"Location\" is not set."
+msgstr "Vereist veld 'Omschrijving' is leeg."
+
+#: plugins/addons/godfs/contents.tpl:26
+#, fuzzy
+msgid ""
+"This menu allows you to create, delete and edit selected dfs shares. Having "
+"a large numbers of dfs shares, you might prefer the range selectors on top "
+"of the dfs share list."
+msgstr ""
+"Dit menu maakt het mogelijk om geselecteerde afdelingen toe te voegen, "
+"bewerken of verwijderen. Indien u veel afdelingen heeft is het aan te raden "
+"de selectie mogelijkheden te gebruiken."
+
+#: plugins/addons/godfs/contents.tpl:40
+#, fuzzy
+msgid "Display dfs shares matching"
+msgstr "Toon overeenkomende adressen"
+
+#: plugins/addons/godfs/contents.tpl:44
+#, fuzzy
+msgid "Regular expression for matching dfs share names"
+msgstr "Reguliere expressie voor overeenkomende systeemnamen"
+
+#: plugins/addons/godfs/generic.tpl:4
+#, fuzzy
+msgid "DFS Properties"
+msgstr "Eigenschappen"
+
+#: plugins/addons/godfs/generic.tpl:8
+#, fuzzy
+msgid "Name of dfs Share"
+msgstr "Naam van de afdeling"
+
+#: plugins/addons/godfs/generic.tpl:16
+#, fuzzy
+msgid "Fileserver"
+msgstr "Mail server"
+
+#: plugins/addons/godfs/generic.tpl:20
+#, fuzzy
+msgid "Share on Fileserver"
+msgstr "Hoofd/Parent server"
+
+#: plugins/addons/godfs/generic.tpl:30
+#, fuzzy
+msgid "DFS Location"
+msgstr "Plaats"
+
+#: plugins/addons/godfs/main.inc:21 plugins/addons/godfs/main.inc:27
+msgid "Distributed Filesystem Administration"
+msgstr ""
+
+#: plugins/admin/fai/class_faiScript.inc:240
+#: plugins/admin/fai/class_faiScriptEntry.inc:89
+#: plugins/admin/fai/class_faiHook.inc:264
+#: plugins/admin/fai/class_faiHookEntry.inc:84
+#, fuzzy
+msgid "Download"
+msgstr "Omlaag"
+
+#: plugins/admin/fai/faiVariable.tpl:32
+#: plugins/admin/fai/faiPartitionTable.tpl:32
+#: plugins/admin/fai/faiScript.tpl:32 plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/class_faiProfileEntry.inc:155
+#: plugins/admin/fai/faiHook.tpl:32
+msgid "Objects"
+msgstr "Objecten"
+
+#: plugins/admin/fai/faiVariable.tpl:34
+msgid "List of assigned variables"
+msgstr "Lijst met toegekende variabelen"
+
+#: plugins/admin/fai/faiVariable.tpl:40
+msgid "Choose a variable to delete or edit"
+msgstr "Kies een te bewerken of verwijderen variabele"
+
+#: 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/tabsTemplate.inc:34 plugins/admin/fai/tabsProfile.inc:34
+#: plugins/admin/fai/tabsScript.inc:34
+#: plugins/admin/departments/tabs_department.inc:31
+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 "
+"de bron-tree."
+
+#: plugins/admin/fai/class_faiPackageEntry.inc:35
+msgid "Please enter your search string here"
+msgstr "Geef hier uw zoekwaarde op"
+
+#: plugins/admin/fai/class_faiPackageEntry.inc:48
+msgid ""
+"This list displays all assigned package names for this repository settings."
+msgstr ""
+"Deze lijst toont alle toegekende pakketnamen voor deze verzamelplaats "
+"instellingen."
+
+#: plugins/admin/fai/class_faiPackageEntry.inc:124
+#, php-format
+msgid ""
+"Your specified search string '%s' returned too many results. Only the first "
+"200 entries are shown, to keep the memory usage low."
+msgstr ""
+"De door u opgegeven zoekopdracht '%s' gaf teveel resultaten terug. Om het "
+"geheugengebruik laag te houden worden alleen de eerste 200 resultaten "
+"getoond."
+
+#: plugins/admin/fai/class_faiManagement.inc:32
+msgid "FAI"
+msgstr "FAI"
+
+#: plugins/admin/fai/class_faiManagement.inc:33
+msgid "Fully Automatic Installation - management"
+msgstr "Fully Automatic Installation - beheer"
+
+#: plugins/admin/fai/class_faiManagement.inc:227
+#, php-format
+msgid "You're about to delete all information about the FAI class at '%s'."
+msgstr ""
+"U staat op het punt alle informatie over deze FAI klasse op '%s' te "
+"verwijderen."
+
+#: plugins/admin/fai/class_faiManagement.inc:233
+#: plugins/admin/fai/class_faiManagement.inc:271
+#: plugins/admin/systems/class_systemManagement.inc:532
+#: plugins/admin/systems/class_systemManagement.inc:603
+msgid "You are not allowed to delete this component!"
+msgstr "U heeft geen toestemming om dit component te verwijderen!"
+
+#: plugins/admin/fai/class_faiManagement.inc:323
+#, php-format
+msgid "You're about to delete a fai branch / freeze  '%s'."
+msgstr ""
+"U staat op het punt een FAI aftakking / bevriezing '%s' te verwijderen."
+
+#: plugins/admin/fai/class_faiManagement.inc:326
+msgid "You are not allowed to delete this release!"
+msgstr "U heeft geen toestemming om deze uitgave te verwijderen!"
+
+#: plugins/admin/fai/class_faiManagement.inc:382
+msgid "Specified branch name is invalid."
+msgstr "De opgegeven aftakkingsnaam is ongeldig."
+
+#: plugins/admin/fai/class_faiManagement.inc:384
+#, fuzzy
+msgid "Specified freeze name is invalid."
+msgstr "De opgegeven naam is ongeldig."
+
+#: plugins/admin/fai/class_faiManagement.inc:391
+#: plugins/admin/systems/class_servRepository.inc:208
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:349
+msgid "This name is already in use."
+msgstr "De opgegeven naam wordt al gebruikt."
+
+#: plugins/admin/fai/class_faiManagement.inc:444
+#: plugins/admin/fai/class_faiManagement.inc:611
 #: plugins/admin/fai/faiPackageNew.tpl:44 plugins/admin/users/template.tpl:44
+#: plugins/admin/departments/class_departmentGeneric.inc:333
 #: ihtml/themes/altlinux/setup_introduction.tpl:12
 #: ihtml/themes/altlinux/setup_useradmin.tpl:41
 #: ihtml/themes/altlinux/setup_step2.tpl:13
@@ -4721,155 +4913,133 @@ msgstr "De opgegeven naam wordt al gebruikt."
 #: ihtml/themes/default/setup_useradmin.tpl:41
 #: ihtml/themes/default/setup_step2.tpl:13
 #: ihtml/themes/default/setup_step3.tpl:18
+#: ihtml/themes/lhs/setup_introduction.tpl:12
+#: ihtml/themes/lhs/setup_useradmin.tpl:41 ihtml/themes/lhs/setup_step2.tpl:13
+#: ihtml/themes/lhs/setup_step3.tpl:18
 msgid "Continue"
 msgstr "Doorgaan"
 
-#: plugins/admin/fai/class_faiManagement.inc:641
+#: plugins/admin/fai/class_faiManagement.inc:647
 #: plugins/admin/departments/class_departmentManagement.inc:298
 msgid "Go to users home department"
 msgstr "Ga naar de afdeling van de gebruiker"
 
-#: plugins/admin/fai/class_faiManagement.inc:646
+#: plugins/admin/fai/class_faiManagement.inc:654
 msgid "New profile"
 msgstr "Nieuw profiel"
 
-#: plugins/admin/fai/class_faiManagement.inc:646
+#: plugins/admin/fai/class_faiManagement.inc:654
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
 msgid "P"
 msgstr "PR"
 
-#: plugins/admin/fai/class_faiManagement.inc:651
+#: plugins/admin/fai/class_faiManagement.inc:659
 msgid "New partition table"
 msgstr "Nieuwe partitietabel"
 
-#: plugins/admin/fai/class_faiManagement.inc:651
+#: plugins/admin/fai/class_faiManagement.inc:659
 msgid "PT"
 msgstr "PT"
 
-#: plugins/admin/fai/class_faiManagement.inc:654
+#: plugins/admin/fai/class_faiManagement.inc:662
 msgid "New scripts"
 msgstr "Nieuwe scripts"
 
-#: plugins/admin/fai/class_faiManagement.inc:654
+#: plugins/admin/fai/class_faiManagement.inc:662
 msgid "S"
 msgstr "SC"
 
-#: plugins/admin/fai/class_faiManagement.inc:657
+#: plugins/admin/fai/class_faiManagement.inc:665
 msgid "New hooks"
 msgstr "Nieuwe inhakers"
 
-#: plugins/admin/fai/class_faiManagement.inc:657
+#: plugins/admin/fai/class_faiManagement.inc:665
 msgid "H"
 msgstr "H"
 
-#: plugins/admin/fai/class_faiManagement.inc:660
+#: plugins/admin/fai/class_faiManagement.inc:668
 msgid "New variables"
 msgstr "Nieuwe variabelen"
 
-#: plugins/admin/fai/class_faiManagement.inc:660
+#: plugins/admin/fai/class_faiManagement.inc:668
 msgid "V"
 msgstr "V"
 
-#: plugins/admin/fai/class_faiManagement.inc:663
+#: plugins/admin/fai/class_faiManagement.inc:671
 msgid "New templates"
 msgstr "Nieuwe sjablonen"
 
-#: plugins/admin/fai/class_faiManagement.inc:663
+#: plugins/admin/fai/class_faiManagement.inc:671
 msgid "T"
 msgstr "SJ"
 
-#: plugins/admin/fai/class_faiManagement.inc:666
+#: plugins/admin/fai/class_faiManagement.inc:674
 msgid "New package list"
 msgstr "Nieuwe pakketlijst"
 
-#: plugins/admin/fai/class_faiManagement.inc:666
+#: plugins/admin/fai/class_faiManagement.inc:674
 msgid "PK"
 msgstr "PK"
 
-#: plugins/admin/fai/class_faiManagement.inc:680
-#: plugins/admin/systems/class_systemManagement.inc:787
+#: plugins/admin/fai/class_faiManagement.inc:688
+#: plugins/admin/systems/class_systemManagement.inc:788
 msgid "This table displays all systems, in the selected tree."
 msgstr "Deze tabel toont alle systemen in de geselecteerde tree"
 
-#: plugins/admin/fai/class_faiManagement.inc:684
+#: plugins/admin/fai/class_faiManagement.inc:692
 msgid "Name of FAI class"
 msgstr "Naam van de FAI klasse"
 
-#: plugins/admin/fai/class_faiManagement.inc:685
+#: plugins/admin/fai/class_faiManagement.inc:693
 msgid "Class type"
 msgstr "Klasse type"
 
-#: plugins/admin/fai/class_faiManagement.inc:689
-#: plugins/admin/fai/class_faiManagement.inc:790
-#: plugins/admin/fai/class_faiManagement.inc:795
+#: plugins/admin/fai/class_faiManagement.inc:697
+#: plugins/admin/fai/class_faiManagement.inc:798
+#: plugins/admin/fai/class_faiManagement.inc:803
 msgid "Edit class"
 msgstr "Bewerk klasse"
 
-#: plugins/admin/fai/class_faiManagement.inc:690
-#: plugins/admin/fai/class_faiManagement.inc:797
+#: plugins/admin/fai/class_faiManagement.inc:698
+#: plugins/admin/fai/class_faiManagement.inc:805
 msgid "Delete class"
 msgstr "Verwijder klasse"
 
-#: plugins/admin/fai/class_faiManagement.inc:710
+#: plugins/admin/fai/class_faiManagement.inc:718
 #: plugins/admin/groups/class_groupApplication.inc:521
-#: plugins/admin/departments/class_departmentManagement.inc:334
+#: plugins/admin/departments/class_departmentManagement.inc:335
 msgid "department"
 msgstr "afdeling"
 
-#: plugins/admin/fai/class_faiManagement.inc:731
-#: plugins/admin/fai/class_faiManagement.inc:732
+#: plugins/admin/fai/class_faiManagement.inc:739
+#: plugins/admin/fai/class_faiManagement.inc:740
 #: plugins/admin/fai/class_faiProfile.inc:297
 #: plugins/admin/fai/class_faiProfileEntry.inc:124
 msgid "Partition table"
 msgstr "Partitietabel"
 
-#: plugins/admin/fai/class_faiManagement.inc:738
-#: plugins/admin/fai/class_faiManagement.inc:739
+#: plugins/admin/fai/class_faiManagement.inc:746
+#: plugins/admin/fai/class_faiManagement.inc:747
 msgid "Package list"
 msgstr "Pakketlijst"
 
-#: plugins/admin/fai/class_faiManagement.inc:745
-#: plugins/admin/fai/class_faiManagement.inc:746
+#: plugins/admin/fai/class_faiManagement.inc:753
+#: plugins/admin/fai/class_faiManagement.inc:754
 msgid "Scripts"
 msgstr "Scripts"
 
-#: plugins/admin/fai/class_faiManagement.inc:766
-#: plugins/admin/fai/class_faiManagement.inc:767
+#: plugins/admin/fai/class_faiManagement.inc:774
+#: plugins/admin/fai/class_faiManagement.inc:775
 msgid "Profile"
 msgstr "Profiel"
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:35
-msgid "Please enter your search string here"
-msgstr "Geef hier uw zoekwaarde op"
-
-#: plugins/admin/fai/class_faiPackageEntry.inc:48
-msgid ""
-"This list displays all assigned package names for this repository settings."
-msgstr ""
-"Deze lijst toont alle toegekende pakketnamen voor deze verzamelplaats "
-"instellingen."
-
-#: plugins/admin/fai/class_faiPackageEntry.inc:124
-#, php-format
-msgid ""
-"Your specified search string '%s' returned too many results. Only the first "
-"200 entries are shown, to keep the memory usage low."
-msgstr ""
-"De door u opgegeven zoekopdracht '%s' gaf teveel resultaten terug. Om het "
-"geheugengebruik laag te houden worden alleen de eerste 200 resultaten "
-"getoond."
-
 #: plugins/admin/fai/main.inc:38 plugins/admin/fai/main.inc:40
 msgid "Fully Automatic Installation"
 msgstr "Fully Automatic Installation"
 
-#: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiVariable.tpl:32 plugins/admin/fai/faiScript.tpl:32
-#: plugins/admin/fai/faiTemplate.tpl:29
-#: plugins/admin/fai/class_faiProfileEntry.inc:155
-#: plugins/admin/fai/faiHook.tpl:32
-msgid "Objects"
-msgstr "Objecten"
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+msgid "Package"
+msgstr "Pakket"
 
 #: plugins/admin/fai/faiPartitionTable.tpl:34
 msgid "Discs"
@@ -4932,9 +5102,17 @@ msgstr "Toon overeenkomende objecten"
 msgid "Regular expression for matching object names"
 msgstr "Reguliere expressie voor overeenkomende objectnamen"
 
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
-msgid "Package"
-msgstr "Pakket"
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
+msgid "Device"
+msgstr "Apparaat"
+
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
+msgid "Partition entries"
+msgstr "Partitie regels"
+
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
+msgid "Add partition"
+msgstr "Partitie toevoegen"
 
 #: plugins/admin/fai/class_faiScriptEntry.inc:68
 #: plugins/admin/fai/class_faiHookEntry.inc:71
@@ -4957,21 +5135,13 @@ msgstr "Kies a.u.b. een naam."
 msgid "Please enter a script."
 msgstr "Geef a.u.b. een scripts op."
 
-#: plugins/admin/fai/faiVariable.tpl:34
-msgid "List of assigned variables"
-msgstr "Lijst met toegekende variabelen"
-
-#: plugins/admin/fai/faiVariable.tpl:40
-msgid "Choose a variable to delete or edit"
-msgstr "Kies een te bewerken of verwijderen variabele"
-
 #: plugins/admin/fai/faiScriptEntry.tpl:29
-#: plugins/admin/groups/class_groupManagement.inc:524
-#: plugins/admin/users/class_userManagement.inc:819
+#: plugins/admin/groups/class_groupManagement.inc:525
+#: plugins/admin/users/class_userManagement.inc:820
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
-#: plugins/admin/ogroups/class_ogroupManagement.inc:493
+#: plugins/admin/ogroups/class_ogroupManagement.inc:494
 #: plugins/gofon/conference/generic.tpl:4
 msgid "Properties"
 msgstr "Eigenschappen"
@@ -5010,8 +5180,8 @@ msgstr "Pakketbestand '%s' bestaat niet."
 
 #: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:24
 #: plugins/admin/systems/workstationStartup.tpl:39
-#: plugins/admin/systems/servRepositorySetup.tpl:8
 #: plugins/admin/systems/class_servRepository.inc:242
+#: plugins/admin/systems/servRepositorySetup.tpl:8
 msgid "Release"
 msgstr "Distributie versie"
 
@@ -5092,6 +5262,25 @@ msgstr "Er bestaat al een profiel met deze klassenaam."
 msgid "FAI classes"
 msgstr "FAI klassen"
 
+#: plugins/admin/fai/remove.tpl:7
+msgid ""
+"This includes 'all' object information. Please double check if your really "
+"want to do this since there is no way for GOsa to get your data back."
+msgstr ""
+"Dit omvat 'alle' object informatie. Verzeker uzelf hiervan, aangezien er "
+"geen manier is voor GOsa om deze gegevens terug te halen."
+
+#: plugins/admin/fai/remove.tpl:11 plugins/admin/departments/remove.tpl:10
+#: plugins/admin/systems/remove.tpl:10 plugins/gofon/conference/remove.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your LDAP tree in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Het is aan te raden de huidige inhoud van uw LDAP database op te slaan "
+"alvorens u doorgaat. Indien u dat gedaan heeft drukt u op 'Verwijderen' om "
+"door te gaan of op 'Annuleren' om te annuleren."
+
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
 msgid "FS type"
 msgstr "FS type"
@@ -5164,18 +5353,6 @@ msgid ""
 "please check your configuration twice."
 msgstr ""
 
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
-msgid "Device"
-msgstr "Apparaat"
-
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
-msgid "Partition entries"
-msgstr "Partitie regels"
-
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
-msgid "Add partition"
-msgstr "Partitie toevoegen"
-
 #: plugins/admin/fai/faiScript.tpl:34
 msgid "List of scripts"
 msgstr "Lijst met scripts"
@@ -5240,52 +5417,83 @@ msgstr "stel in"
 msgid "Please specify a value for the attribute 'content'."
 msgstr "Geef a.u.b. een waarde op voor het atribuut 'inhoud'."
 
-#: plugins/admin/fai/faiVariableEntry.tpl:29
-msgid "Variable attributes"
-msgstr "Variabele attributen"
-
-#: plugins/admin/fai/faiVariableEntry.tpl:34
-msgid "Variable content"
-msgstr "Variabele inhoud"
-
-#: plugins/admin/fai/faiTemplate.tpl:31
-msgid "List of template files"
-msgstr "Lijst met sjabloonbestanden"
-
-#: plugins/admin/fai/faiTemplate.tpl:38
-msgid "Choose a template to delete or edit"
-msgstr "Selecteer een te bewerken of verwijderen sjabloon"
-
-#: plugins/admin/fai/faiPackageEntry.tpl:6
-msgid "List of available packages"
-msgstr "Lijst met beschikbare pakketten"
-
-#: plugins/admin/fai/faiPackageEntry.tpl:26
+#: plugins/admin/fai/faiNewBranch.tpl:5
 msgid ""
-"This menu allows you to select multiple packages to add them to the "
-"currently edited package list."
+"You are now going to create a branch or locked branch. This action clones "
+"the existing release to another release name. Branches can be modified as "
+"usual. FAI classes of locked branches cannot be modified, just additional "
+"classes are possible. Branch names should be alphanumeric, excluding the "
+"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
+"and 'fai'."
 msgstr ""
-"Dit menu maakt het mogelijk om meerdere pakketten toe te voegen aan de op "
-"dit moment bewerkte pakketlijst."
+"U staat op het punt een nieuwe distributie of afgesloten distributie aan te "
+"maken. Deze actie kopieert de bestaande uitgave naar een nieuwe uitgave "
+"naam. Distributies kunnen zoals gewoonlijk veranderd worden. FAI klassen of "
+"gesloten distributies kunnen niet veranderd worden. Er kunnen alleen "
+"additionele klassen aangemaakt worden. Distributie namen moeten alfanumeriek "
+"zijn, met uitzondering van de gereserveerde namen 'scripts', 'hooks', "
+"'partitions', 'variables', 'templates' en 'fai'."
 
-#: plugins/admin/fai/remove.tpl:7
+#: plugins/admin/fai/faiNewBranch.tpl:11
+msgid "Please enter a name for the branch"
+msgstr "Voer a.u.b. een naam voor de aftakking in."
+
+#: plugins/admin/fai/faiNewBranch.tpl:33
+#: plugins/admin/departments/recursive_move.tpl:1
+#, fuzzy
+msgid "Processing the requested operation"
+msgstr "Fout bij het exporteren van de gevraagde gegevens!"
+
+#: plugins/admin/fai/faiNewBranch.tpl:34
 msgid ""
-"This includes 'all' object information. Please double check if your really "
-"want to do this since there is no way for GOsa to get your data back."
+"As soon as the copy operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the fai management "
+"dialog."
 msgstr ""
-"Dit omvat 'alle' object informatie. Verzeker uzelf hiervan, aangezien er "
-"geen manier is voor GOsa om deze gegevens terug te halen."
 
-#: plugins/admin/fai/remove.tpl:11 plugins/admin/departments/remove.tpl:10
-#: plugins/admin/systems/remove.tpl:10 plugins/gofon/conference/remove.tpl:10
+#: plugins/admin/fai/faiNewBranch.tpl:40
+#: plugins/admin/departments/recursive_move.tpl:7
 msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
+"Your browser doesn't support iframes, please use this link to perform the "
+"requested operation."
 msgstr ""
-"Het is aan te raden de huidige inhoud van uw LDAP database op te slaan "
-"alvorens u doorgaat. Indien u dat gedaan heeft drukt u op 'Verwijderen' om "
-"door te gaan of op 'Annuleren' om te annuleren."
+
+#: plugins/admin/fai/faiNewBranch.tpl:42
+msgid "Perform requested operation."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:42
+#, fuzzy
+msgid "Initiate operation"
+msgstr "Opties aanmaken"
+
+#: plugins/admin/fai/faiVariableEntry.tpl:29
+msgid "Variable attributes"
+msgstr "Variabele attributen"
+
+#: plugins/admin/fai/faiVariableEntry.tpl:34
+msgid "Variable content"
+msgstr "Variabele inhoud"
+
+#: plugins/admin/fai/faiTemplate.tpl:31
+msgid "List of template files"
+msgstr "Lijst met sjabloonbestanden"
+
+#: plugins/admin/fai/faiTemplate.tpl:38
+msgid "Choose a template to delete or edit"
+msgstr "Selecteer een te bewerken of verwijderen sjabloon"
+
+#: plugins/admin/fai/faiPackageEntry.tpl:6
+msgid "List of available packages"
+msgstr "Lijst met beschikbare pakketten"
+
+#: plugins/admin/fai/faiPackageEntry.tpl:26
+msgid ""
+"This menu allows you to select multiple packages to add them to the "
+"currently edited package list."
+msgstr ""
+"Dit menu maakt het mogelijk om meerdere pakketten toe te voegen aan de op "
+"dit moment bewerkte pakketlijst."
 
 #: plugins/admin/fai/headpage.tpl:6
 msgid "List of FAI classes"
@@ -5308,12 +5516,14 @@ msgid "Current release"
 msgstr "Huidige uitgave"
 
 #: plugins/admin/fai/headpage.tpl:47
-msgid "Create new branch using the current release"
-msgstr "Maak een nieuwe distributie met behulp van de huidige uitgave"
+#, fuzzy
+msgid "Create new branch"
+msgstr "Maak nieuwe gebruiker aan"
 
 #: plugins/admin/fai/headpage.tpl:51
-msgid "Create a locked version of the current release"
-msgstr "Maak een afgesloten versie van de huidige uitgave"
+#, fuzzy
+msgid "Create new locked branch"
+msgstr "Maak nieuwe conferentie aan"
 
 #: plugins/admin/fai/headpage.tpl:56
 msgid "Delete current release"
@@ -5347,6 +5557,18 @@ msgstr "Toon pakketten"
 msgid "Show partitions"
 msgstr "Toon partities"
 
+#: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
+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"
+
 #: plugins/admin/fai/class_faiPartitionTable.inc:263
 #: plugins/admin/fai/class_faiPartitionTable.inc:269
 #, php-format
@@ -5372,18 +5594,6 @@ msgstr "Pakket bundel"
 msgid "Class name"
 msgstr "Klassenaam"
 
-#: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
-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"
-
 #: plugins/admin/fai/class_faiPackageConfiguration.inc:45
 #, php-format
 msgid "Debconf information for package '%s'"
@@ -5466,13 +5676,13 @@ msgid "Choose class name"
 msgstr "Kies een klassenaam"
 
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
+#: plugins/admin/systems/glpiDeviceManagement.tpl:51
 #: plugins/admin/systems/class_glpiSelectUser.inc:113
 #: plugins/admin/systems/class_glpiSelectUser.inc:140
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:51
 #: plugins/admin/systems/glpiAttachmentPool.tpl:51
-#: plugins/admin/systems/glpiDeviceManagement.tpl:51
 #: plugins/admin/systems/SelectDeviceType.tpl:44
-#: plugins/admin/systems/class_baseSelectDialog.inc:39
+#: plugins/admin/systems/class_baseSelectDialog.inc:40
 msgid "Use"
 msgstr "Gebruik"
 
@@ -5480,6 +5690,16 @@ msgstr "Gebruik"
 msgid "A new class name."
 msgstr "Een nieuwe klassenaam."
 
+#: plugins/admin/fai/remove_branch.tpl:6
+msgid ""
+"This includes all account data, system access, etc. for this branch. Please "
+"double check if your really want to do this since there is no way for GOsa "
+"to get your data back."
+msgstr ""
+"Dit omvat alle account gegevens, systeem toegangsregels, instellingen etc. "
+"voor deze aftakkingen. Verzeker uzelf hiervan, aangezien er geen "
+"mogelijkheid voor GOsa is om deze informatie terug te halen."
+
 #: plugins/admin/fai/class_faiTemplateEntry.inc:81
 msgid "no file uploaded yet"
 msgstr "nog geen bestand ge-upload."
@@ -5528,8 +5748,8 @@ msgstr "Sjabloon opslaan"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:40
 #: plugins/admin/applications/generic.tpl:95
-#: plugins/admin/systems/printerPPDDialog.tpl:11
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
+#: plugins/admin/systems/printerPPDDialog.tpl:11
 msgid "Upload"
 msgstr "Uploaden"
 
@@ -5538,7 +5758,7 @@ msgid "Destination path"
 msgstr "Doelpad"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
 msgid "Owner"
 msgstr "Eigenaar"
 
@@ -5546,7 +5766,7 @@ msgstr "Eigenaar"
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
 #: plugins/admin/systems/class_printGeneric.inc:672
 #: plugins/admin/systems/class_printGeneric.inc:674
-#: plugins/admin/ogroups/class_ogroupManagement.inc:583
+#: plugins/admin/ogroups/class_ogroupManagement.inc:584
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr "Groep"
@@ -5604,64 +5824,76 @@ msgstr "Lijst met inhakers scripts"
 msgid "Choose a hook to delete or edit"
 msgstr "Selecteer een te bewerken of verwijderen inhaker"
 
-#: plugins/admin/fai/faiNewBranch.tpl:5
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
+#: plugins/admin/groups/class_groupGeneric.inc:122
+msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
-"U staat op het punt een nieuwe distributie of afgesloten distributie aan te "
-"maken. Deze actie kopieert de bestaande uitgave naar een nieuwe uitgave "
-"naam. Distributies kunnen zoals gewoonlijk veranderd worden. FAI klassen of "
-"gesloten distributies kunnen niet veranderd worden. Er kunnen alleen "
-"additionele klassen aangemaakt worden. Distributie namen moeten alfanumeriek "
-"zijn, met uitzondering van de gereserveerde namen 'scripts', 'hooks', "
-"'partitions', 'variables', 'templates' en 'fai'."
+"Kan de SID van deze groep niet vinden in de LDAP database of in uw "
+"configuratie bestand."
 
-#: plugins/admin/fai/faiNewBranch.tpl:11
-msgid "Please enter a name for the branch"
-msgstr "Voer a.u.b. een naam voor de aftakking in."
+#: plugins/admin/groups/class_groupGeneric.inc:179
+msgid "This 'dn' is no group."
+msgstr "Deze 'dn' is geen groep."
 
-#: plugins/admin/fai/faiNewBranch.tpl:33
-#: plugins/admin/departments/recursive_moce.tpl:1
-msgid ""
-"Processing requested operation, the status of this operation will be "
-"displayed in an iframe below."
-msgstr ""
+#: plugins/admin/groups/class_groupGeneric.inc:329
+msgid "Samba group"
+msgstr "Samba groep"
 
-#: plugins/admin/fai/faiNewBranch.tpl:34
+#: plugins/admin/groups/class_groupGeneric.inc:329
+msgid "Domain admins"
+msgstr "Windows beheerders"
+
+#: plugins/admin/groups/class_groupGeneric.inc:329
+msgid "Domain users"
+msgstr "Windows gebruikers"
+
+#: plugins/admin/groups/class_groupGeneric.inc:330
+msgid "Domain guests"
+msgstr "Windows gasten"
+
+#: plugins/admin/groups/class_groupGeneric.inc:335
+#, php-format
+msgid "Special group (%d)"
+msgstr "Speciale groep (%d)"
+
+#: plugins/admin/groups/class_groupGeneric.inc:445
+#, php-format
 msgid ""
-"As soon as the operation has finished, you can scroll down to end of the "
-"page and press the 'Back' button to return to the fai management dialog."
+"Your search method returned more than '%s' users, only '%s' users are shown."
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:42
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
+#: plugins/admin/groups/class_groupGeneric.inc:462
+#, fuzzy
+msgid "! unknown id"
+msgstr "onbekend"
+
+#: plugins/admin/groups/class_groupGeneric.inc:598
+#, php-format
+msgid "No configured SID found for '%s'."
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:44
-msgid "Perform requested operation."
+#: plugins/admin/groups/class_groupGeneric.inc:603
+#, php-format
+msgid "No configured RIDBASE found for '%s'."
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:44
-#, fuzzy
-msgid "Initiate operation"
-msgstr "Opties aanmaken"
+#: plugins/admin/groups/class_groupGeneric.inc:716
+#: plugins/admin/ogroups/class_ogroup.inc:655
+msgid "You have no permissions to create a group on this 'Base'."
+msgstr "U heeft geen toestemming een groep aan te maken onder deze 'Basis'."
 
-#: plugins/admin/fai/remove_branch.tpl:6
+#: plugins/admin/groups/class_groupGeneric.inc:726
 msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for GOsa "
-"to get your data back."
+"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
 msgstr ""
-"Dit omvat alle account gegevens, systeem toegangsregels, instellingen etc. "
-"voor deze aftakkingen. Verzeker uzelf hiervan, aangezien er geen "
-"mogelijkheid voor GOsa is om deze informatie terug te halen."
+"Het veld 'Naam' bevat ongeldige karakters. Kleine letters, cijfers en "
+"liggende streepjes zijn toegestaan."
+
+#: plugins/admin/groups/class_groupGeneric.inc:738
+#: plugins/admin/groups/class_groupGeneric.inc:752
+#: plugins/admin/groups/class_groupGeneric.inc:759
+msgid "Value specified as 'Name' is already used."
+msgstr "De waarde die opgegeven is voor de naam wordt al gebruikt."
 
 #: plugins/admin/groups/mail.tpl:11 plugins/admin/groups/paste_mail.tpl:12
 msgid "Primary mail address for this shared folder"
@@ -5687,190 +5919,179 @@ msgstr "Groepslid rechten"
 msgid "Forward messages to non group members"
 msgstr "Stuur berichten door naar niet groepsleden"
 
-#: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:55 html/getxls.php:97
-#: html/getxls.php:99 html/getxls.php:244
-msgid "Groups"
-msgstr "Groepen"
+#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
+msgstr "Lijst met groepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:357
-#, php-format
-msgid "You're about to delete the group '%s'."
-msgstr "U staat op het punt de groep '%s' te verwijderen."
+#: plugins/admin/groups/headpage.tpl:25
+msgid ""
+"This menu allows you to add, edit and remove selected groups. You may want "
+"to use the range selector on top of the group listbox, when working with a "
+"large number of groups."
+msgstr ""
+"Dit menu maakt het mogelijk om geselecteerde groepen toe te voegen, bewerken "
+"of verwijderen. Indien u veel groepen heeft, dan is het aan te raden de "
+"selectie mogelijkheden te gebruiken."
 
-#: plugins/admin/groups/class_groupManagement.inc:363
-#: plugins/admin/groups/class_groupManagement.inc:389
-msgid "You are not allowed to delete this group!"
-msgstr "U heeft geen toestemming om deze groep te verwijderen!"
+#: plugins/admin/groups/headpage.tpl:41
+msgid "Select to see groups that are primary groups of users"
+msgstr ""
+"Selecteer om de groepen te zien die primaire groepen van gebruikers zijn"
 
-#: plugins/admin/groups/class_groupManagement.inc:441
-#: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/applications/class_applicationManagement.inc:460
-#: plugins/admin/ogroups/class_ogroupManagement.inc:431
-#, fuzzy
-msgid "Paste"
-msgstr "Pad"
+#: plugins/admin/groups/headpage.tpl:42
+msgid "Show primary groups"
+msgstr "Toon primaire groepen"
+
+#: plugins/admin/groups/headpage.tpl:46
+msgid "Select to see groups that have samba groups mappings"
+msgstr "Selecteer om groepen te zien die Samba groep verbindingen hebben"
+
+#: plugins/admin/groups/headpage.tpl:47
+msgid "Show samba groups"
+msgstr "Toon Samba groepen"
+
+#: plugins/admin/groups/headpage.tpl:50
+msgid "Select to see groups that have applications configured"
+msgstr "Selecteer om groepen te zien die programma's geconfigureerd hebben"
+
+#: plugins/admin/groups/headpage.tpl:51
+msgid "Show application groups"
+msgstr "Toon programma groepen"
+
+#: plugins/admin/groups/headpage.tpl:54
+msgid "Select to see groups that have mail settings"
+msgstr "Selecteer om groepen te zien die E-mail instellingen hebben"
+
+#: plugins/admin/groups/headpage.tpl:55
+msgid "Show mail groups"
+msgstr "Toon E-mail groepen"
+
+#: plugins/admin/groups/headpage.tpl:58
+msgid "Select to see normal groups that have only functional aspects"
+msgstr ""
+"Selecteer om normale groepen die alleen functionele aspecten hebben te zien"
+
+#: plugins/admin/groups/headpage.tpl:59
+msgid "Show functional groups"
+msgstr "Toon functionele groepen"
+
+#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
+msgid "Group administration"
+msgstr "Groepen beheer"
+
+#: plugins/admin/groups/class_groupManagement.inc:25
+#: plugins/admin/ogroups/class_ogroupManagement.inc:55 html/getxls.php:97
+#: html/getxls.php:99 html/getxls.php:244
+msgid "Groups"
+msgstr "Groepen"
+
+#: plugins/admin/groups/class_groupManagement.inc:357
+#, php-format
+msgid "You're about to delete the group '%s'."
+msgstr "U staat op het punt de groep '%s' te verwijderen."
+
+#: plugins/admin/groups/class_groupManagement.inc:363
+#: plugins/admin/groups/class_groupManagement.inc:389
+msgid "You are not allowed to delete this group!"
+msgstr "U heeft geen toestemming om deze groep te verwijderen!"
+
+#: plugins/admin/groups/class_groupManagement.inc:441
+#: plugins/admin/users/class_userManagement.inc:767
+#: plugins/admin/applications/class_applicationManagement.inc:462
+#: plugins/admin/ogroups/class_ogroupManagement.inc:431
+#, fuzzy
+msgid "Paste"
+msgstr "Pad"
 
 #: plugins/admin/groups/class_groupManagement.inc:443
 #: plugins/admin/users/class_userManagement.inc:769
-#: plugins/admin/applications/class_applicationManagement.inc:462
+#: plugins/admin/applications/class_applicationManagement.inc:464
 #: plugins/admin/ogroups/class_ogroupManagement.inc:433
 #, fuzzy
 msgid "Can't paste"
 msgstr "Onmiddelijk bijwerken"
 
-#: plugins/admin/groups/class_groupManagement.inc:455
+#: plugins/admin/groups/class_groupManagement.inc:456
 msgid "Create new group"
 msgstr "Nieuwe groep aanmaken"
 
-#: plugins/admin/groups/class_groupManagement.inc:465
-#: plugins/admin/users/class_userManagement.inc:795
-#: plugins/admin/applications/class_applicationManagement.inc:485
-#: plugins/admin/ogroups/class_ogroupManagement.inc:460
+#: plugins/admin/groups/class_groupManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/applications/class_applicationManagement.inc:488
+#: plugins/admin/ogroups/class_ogroupManagement.inc:461
 #, fuzzy
 msgid "cut"
 msgstr "Commando"
 
-#: plugins/admin/groups/class_groupManagement.inc:465
-#: plugins/admin/users/class_userManagement.inc:795
-#: plugins/admin/applications/class_applicationManagement.inc:485
-#: plugins/admin/ogroups/class_ogroupManagement.inc:460
+#: plugins/admin/groups/class_groupManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/applications/class_applicationManagement.inc:488
+#: plugins/admin/ogroups/class_ogroupManagement.inc:461
 #, fuzzy
 msgid "Cut this entry"
 msgstr "Bewerk deze invoer"
 
-#: plugins/admin/groups/class_groupManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:797
-#: plugins/admin/applications/class_applicationManagement.inc:487
-#: plugins/admin/ogroups/class_ogroupManagement.inc:462
+#: plugins/admin/groups/class_groupManagement.inc:468
+#: plugins/admin/users/class_userManagement.inc:798
+#: plugins/admin/applications/class_applicationManagement.inc:490
+#: plugins/admin/ogroups/class_ogroupManagement.inc:463
 msgid "copy"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:797
-#: plugins/admin/applications/class_applicationManagement.inc:487
-#: plugins/admin/ogroups/class_ogroupManagement.inc:462
+#: plugins/admin/groups/class_groupManagement.inc:468
+#: plugins/admin/users/class_userManagement.inc:798
+#: plugins/admin/applications/class_applicationManagement.inc:490
+#: plugins/admin/ogroups/class_ogroupManagement.inc:463
 #, fuzzy
 msgid "Copy this entry"
 msgstr "Bewerk deze invoer"
 
-#: plugins/admin/groups/class_groupManagement.inc:469
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/applications/class_applicationManagement.inc:489
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/departments/class_departmentManagement.inc:310
-#: plugins/admin/ogroups/class_ogroupManagement.inc:464
-#: plugins/admin/ogroups/class_ogroupManagement.inc:469
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
+#: plugins/admin/groups/class_groupManagement.inc:470
+#: plugins/admin/groups/class_groupManagement.inc:475
+#: plugins/admin/applications/class_applicationManagement.inc:492
+#: plugins/admin/applications/class_applicationManagement.inc:498
+#: plugins/admin/departments/class_departmentManagement.inc:311
+#: plugins/admin/ogroups/class_ogroupManagement.inc:465
+#: plugins/admin/ogroups/class_ogroupManagement.inc:470
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
 msgid "Edit this entry"
 msgstr "Bewerk deze invoer"
 
-#: plugins/admin/groups/class_groupManagement.inc:471
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/applications/class_applicationManagement.inc:491
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/departments/class_departmentManagement.inc:311
-#: plugins/admin/ogroups/class_ogroupManagement.inc:466
-#: plugins/admin/ogroups/class_ogroupManagement.inc:471
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
+#: plugins/admin/groups/class_groupManagement.inc:472
+#: plugins/admin/groups/class_groupManagement.inc:477
+#: plugins/admin/applications/class_applicationManagement.inc:494
+#: plugins/admin/applications/class_applicationManagement.inc:500
+#: plugins/admin/departments/class_departmentManagement.inc:312
+#: plugins/admin/ogroups/class_ogroupManagement.inc:467
+#: plugins/admin/ogroups/class_ogroupManagement.inc:472
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
 msgid "Delete this entry"
 msgstr "Verwijder deze invoer"
 
-#: plugins/admin/groups/class_groupManagement.inc:499
-#: plugins/admin/users/class_userManagement.inc:856
+#: plugins/admin/groups/class_groupManagement.inc:500
+#: plugins/admin/users/class_userManagement.inc:857
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:508
-#: plugins/admin/applications/class_applicationManagement.inc:509
-#: plugins/admin/ogroups/class_ogroupManagement.inc:584
+#: plugins/admin/groups/class_groupManagement.inc:509
+#: plugins/admin/applications/class_applicationManagement.inc:512
+#: plugins/admin/ogroups/class_ogroupManagement.inc:585
 #: plugins/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
 msgid "Application"
 msgstr "Programma"
 
-#: plugins/admin/groups/class_groupManagement.inc:523
+#: plugins/admin/groups/class_groupManagement.inc:524
 msgid "Groupname"
 msgstr "Groepnaam"
 
-#: plugins/admin/groups/class_groupManagement.inc:528
-#: plugins/admin/applications/class_applicationManagement.inc:523
-#: plugins/admin/ogroups/class_ogroupManagement.inc:498
+#: plugins/admin/groups/class_groupManagement.inc:529
+#: plugins/admin/applications/class_applicationManagement.inc:526
+#: plugins/admin/ogroups/class_ogroupManagement.inc:499
 msgid "This table displays all groups, in the selected tree."
 msgstr "Deze tabel geeft alle groepen binnen de geselecteerde tree weer"
 
-#: plugins/admin/groups/class_groupGeneric.inc:122
-msgid "Can't find this groups SID in LDAP or in your configuration file!"
-msgstr ""
-"Kan de SID van deze groep niet vinden in de LDAP database of in uw "
-"configuratie bestand."
-
-#: plugins/admin/groups/class_groupGeneric.inc:179
-msgid "This 'dn' is no group."
-msgstr "Deze 'dn' is geen groep."
-
-#: plugins/admin/groups/class_groupGeneric.inc:329
-msgid "Samba group"
-msgstr "Samba groep"
-
-#: plugins/admin/groups/class_groupGeneric.inc:329
-msgid "Domain admins"
-msgstr "Windows beheerders"
-
-#: plugins/admin/groups/class_groupGeneric.inc:329
-msgid "Domain users"
-msgstr "Windows gebruikers"
-
-#: plugins/admin/groups/class_groupGeneric.inc:330
-msgid "Domain guests"
-msgstr "Windows gasten"
-
-#: plugins/admin/groups/class_groupGeneric.inc:335
-#, php-format
-msgid "Special group (%d)"
-msgstr "Speciale groep (%d)"
-
-#: plugins/admin/groups/class_groupGeneric.inc:445
-#, php-format
-msgid ""
-"Your search method returned more than '%s' users, only '%s' users are shown."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:462
-#, fuzzy
-msgid "! unknown id"
-msgstr "onbekend"
-
-#: plugins/admin/groups/class_groupGeneric.inc:598
-#, php-format
-msgid "No configured SID found for '%s'."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:603
-#, php-format
-msgid "No configured RIDBASE found for '%s'."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:716
-#: plugins/admin/ogroups/class_ogroup.inc:655
-msgid "You have no permissions to create a group on this 'Base'."
-msgstr "U heeft geen toestemming een groep aan te maken onder deze 'Basis'."
-
-#: plugins/admin/groups/class_groupGeneric.inc:726
-msgid ""
-"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-"Het veld 'Naam' bevat ongeldige karakters. Kleine letters, cijfers en "
-"liggende streepjes zijn toegestaan."
-
-#: plugins/admin/groups/class_groupGeneric.inc:738
-#: plugins/admin/groups/class_groupGeneric.inc:752
-#: plugins/admin/groups/class_groupGeneric.inc:759
-msgid "Value specified as 'Name' is already used."
-msgstr "De waarde die opgegeven is voor de naam wordt al gebruikt."
-
 #: plugins/admin/groups/remove.tpl:6
 msgid ""
 "This may be a primary user group. Please double check if you really want to "
@@ -5879,65 +6100,9 @@ msgstr ""
 "Dit kan een primaire groep zijn. Verzeker uzelf ervan dat dit is wat u wilt, "
 "aangezien er geen mogelijkheid voor GOsa is om deze gegevens terug te halen."
 
-#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
-msgid "Group administration"
-msgstr "Groepen beheer"
-
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
-msgid "List of groups"
-msgstr "Lijst met groepen"
-
-#: plugins/admin/groups/headpage.tpl:25
-msgid ""
-"This menu allows you to add, edit and remove selected groups. You may want "
-"to use the range selector on top of the group listbox, when working with a "
-"large number of groups."
-msgstr ""
-"Dit menu maakt het mogelijk om geselecteerde groepen toe te voegen, bewerken "
-"of verwijderen. Indien u veel groepen heeft, dan is het aan te raden de "
-"selectie mogelijkheden te gebruiken."
-
-#: plugins/admin/groups/headpage.tpl:41
-msgid "Select to see groups that are primary groups of users"
-msgstr ""
-"Selecteer om de groepen te zien die primaire groepen van gebruikers zijn"
-
-#: plugins/admin/groups/headpage.tpl:42
-msgid "Show primary groups"
-msgstr "Toon primaire groepen"
-
-#: plugins/admin/groups/headpage.tpl:46
-msgid "Select to see groups that have samba groups mappings"
-msgstr "Selecteer om groepen te zien die Samba groep verbindingen hebben"
-
-#: plugins/admin/groups/headpage.tpl:47
-msgid "Show samba groups"
-msgstr "Toon Samba groepen"
-
-#: plugins/admin/groups/headpage.tpl:50
-msgid "Select to see groups that have applications configured"
-msgstr "Selecteer om groepen te zien die programma's geconfigureerd hebben"
-
-#: plugins/admin/groups/headpage.tpl:51
-msgid "Show application groups"
-msgstr "Toon programma groepen"
-
-#: plugins/admin/groups/headpage.tpl:54
-msgid "Select to see groups that have mail settings"
-msgstr "Selecteer om groepen te zien die E-mail instellingen hebben"
-
-#: plugins/admin/groups/headpage.tpl:55
-msgid "Show mail groups"
-msgstr "Toon E-mail groepen"
-
-#: plugins/admin/groups/headpage.tpl:58
-msgid "Select to see normal groups that have only functional aspects"
-msgstr ""
-"Selecteer om normale groepen die alleen functionele aspecten hebben te zien"
-
-#: plugins/admin/groups/headpage.tpl:59
-msgid "Show functional groups"
-msgstr "Toon functionele groepen"
+#: plugins/admin/groups/application_options.tpl:1
+msgid "Application options"
+msgstr "Programma opties"
 
 #: plugins/admin/groups/class_groupMail.inc:278
 msgid "read"
@@ -5987,6 +6152,8 @@ msgid "Please select a valid mail server."
 msgstr "Selecteer a.u.b. een geldig mailserver"
 
 #: plugins/admin/groups/acl.tpl:4
+#: plugins/admin/departments/class_departmentGeneric.inc:314
+#: include/class_ldap.inc:412
 msgid "Object"
 msgstr "Object"
 
@@ -6107,9 +6274,10 @@ msgstr "Map beheerders"
 msgid "Select a specific department"
 msgstr "Selecteer een specifieke afdeling"
 
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
-msgstr "Programma opties"
+#: plugins/admin/groups/paste_generic.tpl:1
+#, fuzzy
+msgid "Group settings"
+msgstr "Quota instellingen"
 
 #: plugins/admin/groups/mail_locals.tpl:32
 msgid "Display addresses of department"
@@ -6187,11 +6355,6 @@ msgstr "Omlaag verplaatsen"
 msgid "Insert seperator"
 msgstr "Scheidingsteken invoegen"
 
-#: plugins/admin/groups/paste_generic.tpl:1
-#, fuzzy
-msgid "Group settings"
-msgstr "Quota instellingen"
-
 #: plugins/admin/users/password.tpl:2
 msgid ""
 "To change the user password use the fields below. The changes take effect "
@@ -6202,10 +6365,34 @@ msgstr ""
 "veranderingen worden onmiddelijk doorgevoerd. Onthoud het nieuwe wachtwoord "
 "a.u.b. aangezien de gebruiker niet in kan loggen zonder dit wachtwoord."
 
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr "Een nieuwe gebruiker aanmaken m.b.v. een sjabloon"
+
+#: plugins/admin/users/template.tpl:6
+msgid ""
+"Creating a new user can be assisted by using templates. Many database "
+"records will be filled automatically. Choose 'none' to skip the usage of "
+"templates."
+msgstr ""
+"Het aanmaken van een nieuwe gebruiker kan m.b.v. sjablonen gebeuren. Veel "
+"database records zullen dan automatisch gevuld worden. Kies 'geen' om het "
+"gebruik van sjablonen over te slaan."
+
+#: plugins/admin/users/template.tpl:11
+#: plugins/admin/users/class_userManagement.inc:1181
+#: plugins/admin/systems/class_systemManagement.inc:918
+msgid "Template"
+msgstr "Sjabloon"
+
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
+msgstr "Gebruikersbeheer"
+
 #: plugins/admin/users/class_userManagement.inc:25
-#: plugins/admin/systems/printer.tpl:66
-#: plugins/admin/systems/class_glpiSelectUser.inc:112 html/getxls.php:68
-#: html/getxls.php:70 html/getxls.php:243
+#: plugins/admin/systems/class_glpiSelectUser.inc:112
+#: plugins/admin/systems/printer.tpl:66 html/getxls.php:68 html/getxls.php:70
+#: html/getxls.php:243
 msgid "Users"
 msgstr "Gebruikers"
 
@@ -6236,94 +6423,89 @@ msgstr "geen"
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Er bestaat al een persoon met deze naam in deze tree."
 
-#: plugins/admin/users/class_userManagement.inc:782
+#: plugins/admin/users/class_userManagement.inc:783
 msgid "Create new user"
 msgstr "Maak nieuwe gebruiker aan"
 
-#: plugins/admin/users/class_userManagement.inc:782
+#: plugins/admin/users/class_userManagement.inc:783
 msgid "New user"
 msgstr "Nieuwe gebruiker"
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:784
 msgid "Create new template"
 msgstr "Maak nieuw sjabloon"
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:784
 msgid "New template"
 msgstr "Nieuw sjabloon"
 
-#: plugins/admin/users/class_userManagement.inc:800
-#: plugins/admin/users/class_userManagement.inc:807
+#: plugins/admin/users/class_userManagement.inc:801
+#: plugins/admin/users/class_userManagement.inc:808
 msgid "password"
 msgstr "wachtwoord"
 
-#: plugins/admin/users/class_userManagement.inc:818
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
+#: plugins/admin/users/class_userManagement.inc:819
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
-#: ihtml/themes/default/setup_useradmin.tpl:22
+#: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/default/login.tpl:28 ihtml/themes/default/login.tpl:32
+#: ihtml/themes/default/setup_useradmin.tpl:22 ihtml/themes/lhs/login.tpl:28
+#: ihtml/themes/lhs/login.tpl:32 ihtml/themes/lhs/setup_useradmin.tpl:22
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: plugins/admin/users/class_userManagement.inc:823
+#: plugins/admin/users/class_userManagement.inc:824
 msgid "This table displays all users, in the selected tree."
 msgstr "Deze tabel geeft alle gebruikers in de geselecteerde tree weer"
 
-#: plugins/admin/users/class_userManagement.inc:854
+#: plugins/admin/users/class_userManagement.inc:855
 msgid "GOsa"
 msgstr "GOsa"
 
-#: plugins/admin/users/class_userManagement.inc:855
+#: plugins/admin/users/class_userManagement.inc:856
 msgid "Edit generic properties"
 msgstr "Bewerk algemene eigenschappen"
 
-#: plugins/admin/users/class_userManagement.inc:857
+#: plugins/admin/users/class_userManagement.inc:858
 msgid "Edit UNIX properties"
 msgstr "Bewerk UNIX eigenschappen"
 
-#: plugins/admin/users/class_userManagement.inc:859
+#: plugins/admin/users/class_userManagement.inc:860
 msgid "Edit environment properties"
 msgstr "Bewerk omgeving eigenschappen"
 
-#: plugins/admin/users/class_userManagement.inc:861
+#: plugins/admin/users/class_userManagement.inc:862
 msgid "Edit mail properties"
 msgstr "Bewerk E-mail eigenschappen"
 
-#: plugins/admin/users/class_userManagement.inc:863
+#: plugins/admin/users/class_userManagement.inc:864
 msgid "Edit phone properties"
 msgstr "Bewerk telefoon eigenschappen"
 
-#: plugins/admin/users/class_userManagement.inc:865
+#: plugins/admin/users/class_userManagement.inc:866
 msgid "Edit fax properies"
 msgstr "Bewerk Fax eigenschappen"
 
-#: plugins/admin/users/class_userManagement.inc:867
+#: plugins/admin/users/class_userManagement.inc:868
 msgid "Edit samba properties"
 msgstr "Bewerk Samba eigenschappen"
 
-#: plugins/admin/users/class_userManagement.inc:868
+#: plugins/admin/users/class_userManagement.inc:869
 msgid "Create user from template"
 msgstr "Maak gebruiker aan vanuit sjabloon"
 
-#: plugins/admin/users/class_userManagement.inc:869
+#: plugins/admin/users/class_userManagement.inc:870
 msgid "Create user with this template"
 msgstr "Maak gebruiker aan met dit sjabloon"
 
-#: plugins/admin/users/class_userManagement.inc:928
+#: plugins/admin/users/class_userManagement.inc:929
 msgid "Online"
 msgstr "Online"
 
-#: plugins/admin/users/class_userManagement.inc:935
+#: plugins/admin/users/class_userManagement.inc:936
 msgid "Offline"
 msgstr "Offline"
 
-#: plugins/admin/users/class_userManagement.inc:1180
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/systems/class_systemManagement.inc:917
-msgid "Template"
-msgstr "Sjabloon"
-
 #: plugins/admin/users/remove.tpl:6
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -6393,67 +6575,10 @@ msgstr "Selecteer om gebruikers te zien die Proxy instellingen hebben"
 msgid "Show proxy users"
 msgstr "Toon Proxy gebruikers"
 
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
-msgstr "Gebruikersbeheer"
-
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
-msgstr "Een nieuwe gebruiker aanmaken m.b.v. een sjabloon"
-
-#: plugins/admin/users/template.tpl:6
-msgid ""
-"Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose 'none' to skip the usage of "
-"templates."
-msgstr ""
-"Het aanmaken van een nieuwe gebruiker kan m.b.v. sjablonen gebeuren. Veel "
-"database records zullen dan automatisch gevuld worden. Kies 'geen' om het "
-"gebruik van sjablonen over te slaan."
-
-#: plugins/admin/applications/class_applicationParameters.inc:52
-msgid "Remove options"
-msgstr "Opties verwijderen"
-
-#: plugins/admin/applications/class_applicationParameters.inc:53
-msgid "This application has options. You can disable them by clicking below."
-msgstr ""
-"Dit programma heeft opties ingeschakeld. U kunt deze uitschakelen door de "
-"knop hieronder te gebruiken."
-
-#: plugins/admin/applications/class_applicationParameters.inc:55
-msgid "Create options"
-msgstr "Opties aanmaken"
-
-#: plugins/admin/applications/class_applicationParameters.inc:56
-msgid ""
-"This application has options disabled. You can enable them by clicking below."
-msgstr ""
-"Dit programma heeft opties uitgeschakeld. U kunt deze inschakelen door de "
-"knop hieronder te gebruiken."
-
-#: plugins/admin/applications/class_applicationParameters.inc:93
-msgid "Variable"
-msgstr "Variabele"
-
-#: plugins/admin/applications/class_applicationParameters.inc:93
-#: plugins/gofon/macro/parameter.tpl:9
-msgid "Default value"
-msgstr "Standaard waarde"
-
-#: plugins/admin/applications/class_applicationParameters.inc:104
-msgid "Add option"
-msgstr "Optie toevoegen"
-
-#: plugins/admin/applications/class_applicationParameters.inc:158
-#, php-format
-msgid "Value '%s' specified as option name is not valid."
-msgstr "Waarde '%s' die opgegeven is als optienaam is niet geldig."
-
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
+#: plugins/admin/applications/class_applicationManagement.inc:521
 #: plugins/admin/applications/class_applicationGeneric.inc:379
-#: plugins/admin/applications/class_applicationManagement.inc:518
 msgid "Application name"
 msgstr "Programmanaam"
 
@@ -6507,6 +6632,45 @@ msgstr "Plaats programma in het startmenu van groepsleden"
 msgid "Place entry in members launch bar"
 msgstr "Plaats invoer in snelstartbalk van groepsleden"
 
+#: plugins/admin/applications/class_applicationParameters.inc:52
+msgid "Remove options"
+msgstr "Opties verwijderen"
+
+#: plugins/admin/applications/class_applicationParameters.inc:53
+msgid "This application has options. You can disable them by clicking below."
+msgstr ""
+"Dit programma heeft opties ingeschakeld. U kunt deze uitschakelen door de "
+"knop hieronder te gebruiken."
+
+#: plugins/admin/applications/class_applicationParameters.inc:55
+msgid "Create options"
+msgstr "Opties aanmaken"
+
+#: plugins/admin/applications/class_applicationParameters.inc:56
+msgid ""
+"This application has options disabled. You can enable them by clicking below."
+msgstr ""
+"Dit programma heeft opties uitgeschakeld. U kunt deze inschakelen door de "
+"knop hieronder te gebruiken."
+
+#: plugins/admin/applications/class_applicationParameters.inc:93
+msgid "Variable"
+msgstr "Variabele"
+
+#: plugins/admin/applications/class_applicationParameters.inc:93
+#: plugins/gofon/macro/parameter.tpl:9
+msgid "Default value"
+msgstr "Standaard waarde"
+
+#: plugins/admin/applications/class_applicationParameters.inc:104
+msgid "Add option"
+msgstr "Optie toevoegen"
+
+#: plugins/admin/applications/class_applicationParameters.inc:158
+#, php-format
+msgid "Value '%s' specified as option name is not valid."
+msgstr "Waarde '%s' die opgegeven is als optienaam is niet geldig."
+
 #: plugins/admin/applications/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -6543,6 +6707,25 @@ msgstr "Reguliere expressie voor overeenkomende programma namen"
 msgid "Application management"
 msgstr "Programma beheer"
 
+#: plugins/admin/applications/class_applicationManagement.inc:376
+#, php-format
+msgid "You're about to delete the application '%s'."
+msgstr "U staat op het punt de programma '%s' te verwijderen."
+
+#: plugins/admin/applications/class_applicationManagement.inc:382
+#: plugins/admin/applications/class_applicationManagement.inc:408
+msgid "You are not allowed to delete this application!"
+msgstr "U heeft geen toestemming dit programma te verwijderen"
+
+#: plugins/admin/applications/class_applicationManagement.inc:477
+#: plugins/admin/ogroups/class_ogroupManagement.inc:449
+msgid "new"
+msgstr "nieuw"
+
+#: plugins/admin/applications/class_applicationManagement.inc:477
+msgid "Create new application"
+msgstr "Nieuw programma aanmaken"
+
 #: plugins/admin/applications/class_applicationGeneric.inc:87
 msgid "no example"
 msgstr "geen voorbeeld"
@@ -6581,25 +6764,6 @@ msgstr "Er is al een programma met deze 'Naam'."
 msgid "Application settings"
 msgstr "Programma opties"
 
-#: plugins/admin/applications/class_applicationManagement.inc:374
-#, php-format
-msgid "You're about to delete the application '%s'."
-msgstr "U staat op het punt de programma '%s' te verwijderen."
-
-#: plugins/admin/applications/class_applicationManagement.inc:380
-#: plugins/admin/applications/class_applicationManagement.inc:406
-msgid "You are not allowed to delete this application!"
-msgstr "U heeft geen toestemming dit programma te verwijderen"
-
-#: plugins/admin/applications/class_applicationManagement.inc:474
-#: plugins/admin/ogroups/class_ogroupManagement.inc:448
-msgid "new"
-msgstr "nieuw"
-
-#: plugins/admin/applications/class_applicationManagement.inc:474
-msgid "Create new application"
-msgstr "Nieuw programma aanmaken"
-
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr "Naam van de afdeling"
@@ -6683,47 +6847,10 @@ msgstr "Reguliere expressie voor overeenkomende afdelingen"
 msgid "Department management"
 msgstr "Afdeling beheer"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:185
-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:192
-#: plugins/admin/departments/class_departmentGeneric.inc:194
-msgid "Department with that 'Name' already exists."
-msgstr "Er bestaat al een afdeling met deze 'Naam'."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:202
-msgid "Required field 'Description' is not set."
-msgstr "Vereist veld 'Omschrijving' is leeg."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:207
-msgid "The field 'Name' contains the reserved word 'incoming'."
-msgstr "Het veld 'Naam' bevat het gereserveerde woord 'incoming'."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:208
-msgid " Please choose another name."
-msgstr "Kies a.u.b. een andere naam."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:274
-#, php-format
-msgid "Moving %s in %s"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:313
-#, php-format
-msgid "FAILED to copy %s, aborting operation"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:321
-#, fuzzy
-msgid "Complete"
-msgstr "onvolledig"
-
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
 #: plugins/admin/ogroups/class_ogroupManagement.inc:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:492
+#: plugins/admin/ogroups/class_ogroupManagement.inc:493
 msgid "Departments"
 msgstr "Afdelingen"
 
@@ -6738,71 +6865,105 @@ msgstr "U staat op het punt de hele LDAP subtree onder '%s' te verwijderen."
 msgid "You have no permission to remove this department."
 msgstr "U heeft geen toestemming om deze afdeling te verwijderen."
 
-#: plugins/admin/departments/class_departmentManagement.inc:300
+#: plugins/admin/departments/class_departmentManagement.inc:301
 msgid "Create new department"
 msgstr "Nieuwe afdeling aanmaken"
 
-#: plugins/admin/departments/class_departmentManagement.inc:308
+#: plugins/admin/departments/class_departmentManagement.inc:309
 msgid "This table displays all departments, in the selected tree."
 msgstr "Deze tabel toont alle afdelingen in de geselecteerde tree."
 
-#: plugins/admin/departments/class_departmentManagement.inc:317
+#: plugins/admin/departments/class_departmentManagement.inc:318
 msgid "Department name"
 msgstr "Afdelingnaam"
 
-#: plugins/admin/departments/class_departmentManagement.inc:411
+#: plugins/admin/departments/class_departmentManagement.inc:412
 msgid ".."
 msgstr ".."
 
-#: plugins/admin/departments/recursive_moce.tpl:3
+#: plugins/admin/departments/class_departmentGeneric.inc:185
+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:192
+#: plugins/admin/departments/class_departmentGeneric.inc:194
+msgid "Department with that 'Name' already exists."
+msgstr "Er bestaat al een afdeling met deze 'Naam'."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:202
+msgid "Required field 'Description' is not set."
+msgstr "Vereist veld 'Omschrijving' is leeg."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:207
+msgid "The field 'Name' contains the reserved word 'incoming'."
+msgstr "Het veld 'Naam' bevat het gereserveerde woord 'incoming'."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:208
+msgid " Please choose another name."
+msgstr "Kies a.u.b. een andere naam."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:278
+#, php-format
+msgid "Moving %s to %s"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:317
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
+msgstr ""
+
+#: plugins/admin/departments/recursive_move.tpl:2
 msgid ""
-"Your browser isn't able to display this iframe ... use the link below intead"
+"As soon as the move operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the department "
+"management dialog."
 msgstr ""
 
 #: plugins/admin/systems/class_terminalInfo.inc:54
-#: plugins/admin/systems/class_terminalInfo.inc:199
+#: plugins/admin/systems/class_terminalInfo.inc:200
 msgid "present"
 msgstr "aanwezig"
 
-#: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_terminalService.inc:158
-#: plugins/admin/systems/class_terminalStartup.inc:99
+#: plugins/admin/systems/class_terminalInfo.inc:68
 #: plugins/admin/systems/class_workstationService.inc:151
 #: plugins/admin/systems/class_workstationStartup.inc:372
+#: plugins/admin/systems/class_terminalService.inc:158
+#: plugins/admin/systems/class_terminalStartup.inc:99
 #: plugins/admin/systems/class_terminalGeneric.inc:153
 msgid "This 'dn' has no terminal features."
 msgstr "Deze 'dn' heeft geen terminal mogelijkheden."
 
-#: plugins/admin/systems/class_terminalInfo.inc:74
+#: plugins/admin/systems/class_terminalInfo.inc:75
 msgid "There is no php snmp module installed, can't gather any informations."
 msgstr ""
 "Er is geen PHP SNMP module geinstalleerd. Er kan geen informatie verzameld "
 "worden."
 
-#: plugins/admin/systems/class_terminalInfo.inc:80
-#: plugins/admin/systems/class_terminalInfo.inc:174
+#: plugins/admin/systems/class_terminalInfo.inc:81
+#: plugins/admin/systems/class_terminalInfo.inc:175
 msgid "unknown status"
 msgstr "onbekende status"
 
-#: plugins/admin/systems/class_terminalInfo.inc:89
+#: plugins/admin/systems/class_terminalInfo.inc:90
 msgid "This is a virtual terminal which has no properties to show here."
 msgstr ""
 "Dit is een virtuele terminal die geen eigenschappen voorhanden heeft die "
 "hier getoond kunnen worden."
 
-#: plugins/admin/systems/class_terminalInfo.inc:107
+#: plugins/admin/systems/class_terminalInfo.inc:108
 msgid "online"
 msgstr "online"
 
-#: plugins/admin/systems/class_terminalInfo.inc:163
+#: plugins/admin/systems/class_terminalInfo.inc:164
 msgid "running"
 msgstr "draait"
 
-#: plugins/admin/systems/class_terminalInfo.inc:166
+#: plugins/admin/systems/class_terminalInfo.inc:167
 msgid "not running"
 msgstr "draait niet"
 
-#: plugins/admin/systems/class_terminalInfo.inc:191
+#: plugins/admin/systems/class_terminalInfo.inc:192
 msgid "offline"
 msgstr "offline"
 
@@ -6834,8 +6995,8 @@ msgid "Zone"
 msgstr "Zone"
 
 #: plugins/admin/systems/network.tpl:42
-#: plugins/admin/systems/class_servDNS.inc:298
 #: plugins/admin/systems/servdnseditzone.tpl:81
+#: plugins/admin/systems/class_servDNS.inc:298
 msgid "TTL"
 msgstr "TTL"
 
@@ -6843,31 +7004,162 @@ msgstr "TTL"
 msgid "Dns records"
 msgstr "DNS records"
 
-#: plugins/admin/systems/class_winGeneric.inc:73
-#: plugins/admin/systems/class_componentGeneric.inc:50
-msgid "This 'dn' has no network features."
-msgstr "Deze 'dn' heeft geen netwerk mogelijkheden."
+#: plugins/admin/systems/workstationService.tpl:4
+#: plugins/admin/systems/terminalService.tpl:4
+msgid "Keyboard"
+msgstr "Toetsenbord"
 
-#: plugins/admin/systems/class_winGeneric.inc:162
-#: plugins/admin/systems/class_componentGeneric.inc:145
-msgid "You have no permissions to create a component on this 'Base'."
-msgstr ""
-"U heeft geen toestemming om een component aan te maken onder deze 'Basis'."
+#: plugins/admin/systems/workstationService.tpl:7
+#: plugins/admin/systems/terminalService.tpl:7
+#: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/printerPPDDialog.tpl:5
+msgid "Model"
+msgstr "Model"
 
-#: plugins/admin/systems/class_winGeneric.inc:172
-#: plugins/admin/systems/class_phoneGeneric.inc:314
-#: plugins/admin/systems/class_terminalGeneric.inc:286
-#: plugins/admin/systems/class_servGeneric.inc:209
-#: plugins/admin/systems/class_workstationGeneric.inc:245
-#: plugins/admin/systems/class_printGeneric.inc:529
-#: plugins/admin/systems/class_componentGeneric.inc:155
-#, php-format
-msgid "There is already an entry '%s' in the base choosen by you"
-msgstr "Er is al een invoer '%s' onder de basis die u gekozen heeft"
+#: plugins/admin/systems/workstationService.tpl:9
+#: plugins/admin/systems/terminalService.tpl:9
+msgid "Choose keyboard model"
+msgstr "Kies toetsenbord model"
 
-#: plugins/admin/systems/info.tpl:1
-msgid "System information"
-msgstr "Systeem informatie"
+#: plugins/admin/systems/workstationService.tpl:15
+#: plugins/admin/systems/terminalService.tpl:15
+msgid "Layout"
+msgstr "Indeling"
+
+#: plugins/admin/systems/workstationService.tpl:17
+#: plugins/admin/systems/terminalService.tpl:17
+msgid "Choose keyboard layout"
+msgstr "Kies toetsenbord indeling"
+
+#: plugins/admin/systems/workstationService.tpl:23
+#: plugins/admin/systems/terminalService.tpl:23
+msgid "Variant"
+msgstr "Variant"
+
+#: plugins/admin/systems/workstationService.tpl:25
+#: plugins/admin/systems/terminalService.tpl:25
+msgid "Choose keyboard variant"
+msgstr "Kies toetsenbord variant"
+
+#: plugins/admin/systems/workstationService.tpl:39
+#: plugins/admin/systems/terminalService.tpl:39
+msgid "Mouse"
+msgstr "Muis"
+
+#: plugins/admin/systems/workstationService.tpl:44
+#: plugins/admin/systems/terminalService.tpl:44
+msgid "Choose mouse type"
+msgstr "Kies het muis type"
+
+#: plugins/admin/systems/workstationService.tpl:50
+#: plugins/admin/systems/terminalService.tpl:50
+msgid "Port"
+msgstr "Poort"
+
+#: plugins/admin/systems/workstationService.tpl:52
+#: plugins/admin/systems/terminalService.tpl:52
+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:23
+msgid "Telephone hardware"
+msgstr "Telefoon hardware"
+
+#: 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:25
+msgid "Telephone"
+msgstr "Telefoon"
+
+#: plugins/admin/systems/workstationService.tpl:83
+#: plugins/admin/systems/info.tpl:73
+#: plugins/admin/systems/terminalService.tpl:83
+msgid "Graphic device"
+msgstr "Grafische kaart"
+
+#: plugins/admin/systems/workstationService.tpl:86
+#: plugins/admin/systems/terminalService.tpl:86
+#: plugins/admin/systems/printer.tpl:46
+msgid "Driver"
+msgstr "Stuurprogramma"
+
+#: plugins/admin/systems/workstationService.tpl:88
+#: plugins/admin/systems/terminalService.tpl:88
+msgid "Choose graphic driver that is needed by the installed graphic board"
+msgstr ""
+"Kies het stuurprogramma dat nodig is voor de geïnstalleerde grafische kaart"
+
+#: plugins/admin/systems/workstationService.tpl:96
+#: plugins/admin/systems/terminalService.tpl:96
+msgid "Choose screen resolution used in graphic mode"
+msgstr "Kies de scherm resolutie die gebruikt wordt in grafische modus"
+
+#: plugins/admin/systems/workstationService.tpl:102
+#: plugins/admin/systems/terminalService.tpl:102
+msgid "Color depth"
+msgstr "Kleurdiepte"
+
+#: plugins/admin/systems/workstationService.tpl:104
+#: plugins/admin/systems/terminalService.tpl:104
+msgid "Choose colordepth used in graphic mode"
+msgstr "Kies de kleurdiepte die gebruikt wordt in grafische modus"
+
+#: plugins/admin/systems/workstationService.tpl:117
+#: plugins/admin/systems/terminalService.tpl:117
+msgid "Display device"
+msgstr "Scherm"
+
+#: plugins/admin/systems/workstationService.tpl:121
+msgid "unknown"
+msgstr "onbekend"
+
+#: plugins/admin/systems/workstationService.tpl:126
+msgid "Automatic modelines"
+msgstr "Automatische modusregels"
+
+#: plugins/admin/systems/workstationService.tpl:130
+#: plugins/admin/systems/terminalService.tpl:124
+msgid "HSync"
+msgstr "HSync"
+
+#: plugins/admin/systems/workstationService.tpl:132
+#: plugins/admin/systems/terminalService.tpl:126
+msgid "Horizontal refresh frequency for installed monitor"
+msgstr "Horizontale ververs frequentie voor de geïnstalleerde monitor"
+
+#: plugins/admin/systems/workstationService.tpl:135
+#: plugins/admin/systems/terminalService.tpl:129
+msgid "VSync"
+msgstr "VSync"
+
+#: plugins/admin/systems/workstationService.tpl:137
+#: plugins/admin/systems/terminalService.tpl:131
+msgid "Vertical refresh frequency for installed monitor"
+msgstr "Verticale ververs frequentie voor de geïnstalleerde monitor"
+
+#: plugins/admin/systems/workstationService.tpl:149
+#: plugins/admin/systems/terminalService.tpl:203
+msgid "Scan device"
+msgstr "Scanner"
+
+#: plugins/admin/systems/workstationService.tpl:150
+#: plugins/admin/systems/terminalService.tpl:204
+msgid "Select to start SANE scan service on terminal"
+msgstr "Selecteer om de SANE scan service te starten op de terminal"
+
+#: plugins/admin/systems/workstationService.tpl:151
+#: plugins/admin/systems/terminalService.tpl:205
+msgid "Provide scan services"
+msgstr "Lever scan diensten"
+
+#: plugins/admin/systems/info.tpl:1
+msgid "System information"
+msgstr "Systeem informatie"
 
 #: plugins/admin/systems/info.tpl:7
 msgid "CPU"
@@ -6917,12 +7209,6 @@ msgstr "Diskdrive"
 msgid "CDROM device"
 msgstr "CDROM speler"
 
-#: plugins/admin/systems/info.tpl:73
-#: plugins/admin/systems/workstationService.tpl:83
-#: plugins/admin/systems/terminalService.tpl:83
-msgid "Graphic device"
-msgstr "Grafische kaart"
-
 #: plugins/admin/systems/info.tpl:77
 msgid "Audio device"
 msgstr "Geluidskaart"
@@ -6963,487 +7249,605 @@ msgstr "Audio service"
 msgid "GUI"
 msgstr "GUI"
 
-#: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_workstationService.inc:89
-msgid "default"
-msgstr "standaard"
+#: plugins/admin/systems/glpi.tpl:9
+#: plugins/admin/systems/SelectDeviceType.tpl:20
+msgid "System type"
+msgstr "Systeemtype"
 
-#: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_workstationService.inc:90
-msgid "show chooser"
-msgstr "toon keuze-mogelijkheid"
+#: plugins/admin/systems/glpi.tpl:19
+msgid "Operating system"
+msgstr "Besturingssysteem"
 
-#: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:91
-msgid "direct"
-msgstr "direkt"
+#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
+#: plugins/admin/systems/glpi_devices.tpl:24
+#: plugins/admin/systems/glpi_devices.tpl:123
+#: plugins/admin/systems/glpi_devices.tpl:164
+#: plugins/admin/systems/glpi_devices.tpl:219
+#: plugins/admin/systems/glpi_devices.tpl:275
+#: plugins/admin/systems/glpi_devices.tpl:333
+#: plugins/admin/systems/glpi_devices.tpl:397
+#: plugins/admin/systems/glpi_devices.tpl:469
+#: plugins/admin/systems/glpi_devices.tpl:533
+#: plugins/admin/systems/glpi_devices.tpl:580
+#: plugins/admin/systems/glpi_devices.tpl:633
+#: plugins/admin/systems/glpi_devices.tpl:687
+#: plugins/admin/systems/glpi_devices.tpl:733
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
+msgid "Manufacturer"
+msgstr "Fabricant"
 
-#: plugins/admin/systems/class_terminalService.inc:107
-#: plugins/admin/systems/class_workstationService.inc:94
-msgid "load balanced"
-msgstr "load balanced"
+#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
+msgid "Contacts"
+msgstr "Contacten"
 
-#: plugins/admin/systems/class_terminalService.inc:110
-#: plugins/admin/systems/class_workstationService.inc:97
-msgid "Windows RDP"
-msgstr "Windows RDP"
+#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
+msgid "Contact person"
+msgstr "Contactpersoon"
 
-#: plugins/admin/systems/class_terminalService.inc:111
-#: plugins/admin/systems/class_workstationService.inc:98
-msgid "ICA client"
-msgstr "ICA client"
+#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
+msgid "Technical responsible"
+msgstr "Technisch verantwoordelijke"
 
-#: plugins/admin/systems/class_terminalService.inc:209
-#: plugins/admin/systems/class_workstationService.inc:201
-msgid "Choose the phone located at the current terminal"
-msgstr "Selecteer de telefoon die zich bij de huidige terminal bevindt."
+#: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
+#: plugins/admin/systems/glpi_devices.tpl:112
+#: plugins/admin/systems/glpi_devices.tpl:153
+#: plugins/admin/systems/glpi_devices.tpl:208
+#: plugins/admin/systems/glpi_devices.tpl:264
+#: plugins/admin/systems/glpi_devices.tpl:322
+#: plugins/admin/systems/glpi_devices.tpl:386
+#: plugins/admin/systems/glpi_devices.tpl:458
+#: plugins/admin/systems/glpi_devices.tpl:522
+#: plugins/admin/systems/glpi_devices.tpl:569
+#: plugins/admin/systems/glpi_devices.tpl:622
+#: plugins/admin/systems/glpi_devices.tpl:676
+#: plugins/admin/systems/glpi_devices.tpl:722
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
+msgid "Comment"
+msgstr "Opmerking"
 
-#: plugins/admin/systems/class_terminalService.inc:270
-#: plugins/admin/systems/class_terminalService.inc:275
-#: plugins/admin/systems/class_workstationService.inc:263
-#: plugins/admin/systems/class_workstationService.inc:268
-msgid "Please specify a valid VSync range."
-msgstr "Geef a.u.b. een geldig VSync bereik op."
+#: plugins/admin/systems/glpi.tpl:78
+msgid "Installed devices"
+msgstr "Geinstalleerde apparaten"
 
-#: plugins/admin/systems/class_terminalService.inc:285
-#: plugins/admin/systems/class_terminalService.inc:290
-#: plugins/admin/systems/class_workstationService.inc:278
-#: plugins/admin/systems/class_workstationService.inc:283
-msgid "Please specify a valid HSync range."
-msgstr "Geef a.u.b. een geldig HSync bereik op."
+#: plugins/admin/systems/glpi.tpl:90
+msgid "Trading"
+msgstr "Uit-/Omwisseling"
+
+#: plugins/admin/systems/glpi.tpl:91
+msgid "Software"
+msgstr "Software"
+
+#: plugins/admin/systems/glpi.tpl:92
+msgid "Contracts"
+msgstr "Contracten"
+
+#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
+msgid "Attachments"
+msgstr "Bijlagen"
 
 #: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
 msgid "System management"
 msgstr "Systeembeheer"
 
-#: plugins/admin/systems/class_servService.inc:272
-msgid "Terminal server, must have fontpath specified."
-msgstr "Terminal server moet een fontpath hebben."
+#: plugins/admin/systems/glpiPrinter.tpl:9
+msgid "Printer type"
+msgstr "Printertype"
 
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
-msgstr "Tijd Service"
+#: plugins/admin/systems/glpiPrinter.tpl:31
+msgid "Supported interfaces"
+msgstr "Ondersteunde interfaces"
 
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
-msgstr "LDAP Service"
+#: plugins/admin/systems/glpiPrinter.tpl:38
+msgid "Serial"
+msgstr "Serieel"
 
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
-msgstr "Terminal Service"
+#: plugins/admin/systems/glpiPrinter.tpl:46
+msgid "Parallel"
+msgstr "Parallel"
 
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
-msgstr "Schakel inlog mogelijkheid tijdelijk uit"
+#: plugins/admin/systems/glpiPrinter.tpl:54
+msgid "USB"
+msgstr "USB"
 
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
-msgstr "Fontpad"
+#: plugins/admin/systems/glpiPrinter.tpl:114
+msgid "Installed cartridges"
+msgstr "Geinstalleerde cartridges"
 
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
-msgstr "Syslog Service"
+#: plugins/admin/systems/glpi_edit_type.tpl:1
+#, fuzzy
+msgid "Manage System-types"
+msgstr "Systeemtype"
 
-#: plugins/admin/systems/servservice.tpl:101
-msgid "Print Service"
-msgstr "Print Service"
+#: plugins/admin/systems/glpi_edit_type.tpl:9
+#: plugins/admin/systems/glpi_edit_type.tpl:28
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:8
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:29
+#: plugins/admin/systems/glpi_edit_os.tpl:9
+#: plugins/admin/systems/glpi_edit_os.tpl:28
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
+msgid "Rename"
+msgstr "Hernoemen"
 
-#: plugins/admin/systems/servservice.tpl:109
-msgid "Mail server"
-msgstr "Mail server"
+#: plugins/admin/systems/glpi_edit_type.tpl:24
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:25
+#: plugins/admin/systems/glpi_edit_os.tpl:24
+#, fuzzy
+msgid "Please enter a new name"
+msgstr "Kies a.u.b. een naam."
 
-#: 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/printerPPDSelectionDialog.tpl:6
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr "Selecteer de toe te voegen objecten"
 
-#: plugins/admin/systems/chooser.tpl:4
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
+#: plugins/admin/systems/printerPPDDialog.tpl:6
+msgid "Select"
+msgstr "Selecteer"
+
+#: plugins/admin/systems/class_workstationService.inc:89
+#: plugins/admin/systems/class_terminalService.inc:102
+msgid "default"
+msgstr "standaard"
+
+#: plugins/admin/systems/class_workstationService.inc:90
+#: plugins/admin/systems/class_terminalService.inc:103
+msgid "show chooser"
+msgstr "toon keuze-mogelijkheid"
+
+#: plugins/admin/systems/class_workstationService.inc:91
+#: plugins/admin/systems/class_terminalService.inc:104
+msgid "direct"
+msgstr "direkt"
+
+#: plugins/admin/systems/class_workstationService.inc:94
+#: plugins/admin/systems/class_terminalService.inc:107
+msgid "load balanced"
+msgstr "load balanced"
+
+#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_terminalService.inc:110
+msgid "Windows RDP"
+msgstr "Windows RDP"
+
+#: plugins/admin/systems/class_workstationService.inc:98
+#: plugins/admin/systems/class_terminalService.inc:111
+msgid "ICA client"
+msgstr "ICA client"
+
+#: plugins/admin/systems/class_workstationService.inc:201
+#: plugins/admin/systems/class_terminalService.inc:209
+msgid "Choose the phone located at the current terminal"
+msgstr "Selecteer de telefoon die zich bij de huidige terminal bevindt."
+
+#: plugins/admin/systems/class_workstationService.inc:263
+#: plugins/admin/systems/class_workstationService.inc:268
+#: plugins/admin/systems/class_terminalService.inc:270
+#: plugins/admin/systems/class_terminalService.inc:275
+msgid "Please specify a valid VSync range."
+msgstr "Geef a.u.b. een geldig VSync bereik op."
+
+#: plugins/admin/systems/class_workstationService.inc:278
+#: plugins/admin/systems/class_workstationService.inc:283
+#: plugins/admin/systems/class_terminalService.inc:285
+#: plugins/admin/systems/class_terminalService.inc:290
+msgid "Please specify a valid HSync range."
+msgstr "Geef a.u.b. een geldig HSync bereik op."
+
+#: plugins/admin/systems/class_workstationStartup.inc:313
 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."
+"There are packages in your configuration, which can't be resolved with "
+"current server/release settings."
 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/class_workstationStartup.inc:354
+msgid "Please select a 'FAI server' or remove the 'FAI classes'."
+msgstr "Selecteer a.u.b. een 'FAI server' of  verwijder de 'FAI klasses'."
 
-#: plugins/admin/systems/chooser.tpl:9
-msgid "Linux Server"
-msgstr "Linux server"
+#: plugins/admin/systems/class_workstationStartup.inc:410
+msgid ""
+"There is already a profile in your selection that contain partition table "
+"configurations."
+msgstr ""
+"Er bestaat al een profiel in uw selectie die partitietabel configuraties "
+"bevat."
 
-#: plugins/admin/systems/chooser.tpl:10
-msgid "Windows workstation"
-msgstr "Windows werkstation"
+#: plugins/admin/systems/class_workstationStartup.inc:691
+#, php-format
+msgid ""
+"Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
+"Server was reset to 'auto'."
+msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:11
-msgid "Network printer"
-msgstr "Netwerk printer"
+#: plugins/admin/systems/class_workstationStartup.inc:702
+#, php-format
+msgid ""
+"Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
+"configurations, possibly some classes where deleted or renamed. !All classes "
+"have been removed from this account, press cancel if you don't want this to "
+"be saved."
+msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:13
-msgid "Other network component"
-msgstr "Ander netwerk component"
+#: plugins/admin/systems/class_printerPPDDialog.inc:67
+#, php-format
+msgid "Can't open '%s', ppd settings resetted."
+msgstr "Kon '%s' niet openen. PPD instellingen zijn teruggezet."
 
-#: plugins/admin/systems/chooser.tpl:16
-msgid "Create"
-msgstr "Aanmaken"
+#: plugins/admin/systems/class_printerPPDDialog.inc:108
+#, php-format
+msgid ""
+"The specified PPD_PATH='%s' in your gosa.conf is invalid, can't read any ppd "
+"informations."
+msgstr ""
+"Het opgegeven PPD_PATH='%s' in uw gosa.conf is ongeldig. Kan geen PPD "
+"informatie lezen."
 
-#: plugins/admin/systems/component.tpl:15 plugins/admin/systems/server.tpl:15
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/terminal.tpl:20
-#: plugins/admin/systems/printer.tpl:22
-#: plugins/admin/systems/workstation.tpl:29
-#: plugins/admin/systems/wingeneric.tpl:15
-msgid "Choose subtree to place terminal in"
-msgstr "Selecteer de subtree waar de terminal onder geplaatst zal worden"
+#: plugins/admin/systems/class_printerPPDDialog.inc:109
+msgid "Can't get ppd informations."
+msgstr "Kan de PPD informatie niet ophalen."
 
-#: plugins/admin/systems/workstationService.tpl:4
-#: plugins/admin/systems/terminalService.tpl:4
-msgid "Keyboard"
-msgstr "Toetsenbord"
+#: plugins/admin/systems/class_printerPPDDialog.inc:125
+#, php-format
+msgid "Can't create folder '%s' for the uploaded ppd file."
+msgstr "Kan directory '%s',voor het verstuurde PPD bestand, niet aanmaken."
 
-#: plugins/admin/systems/workstationService.tpl:7
-#: plugins/admin/systems/printerPPDDialog.tpl:5
-#: plugins/admin/systems/terminalService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:210
-msgid "Model"
-msgstr "Model"
+#: plugins/admin/systems/class_printerPPDDialog.inc:138
+#, php-format
+msgid "There is already a ppd file for this kind of printer."
+msgstr "Er bestaat al een PPD bestand voor dit type printer."
 
-#: plugins/admin/systems/workstationService.tpl:9
-#: plugins/admin/systems/terminalService.tpl:9
-msgid "Choose keyboard model"
-msgstr "Kies toetsenbord model"
+#: plugins/admin/systems/class_printerPPDDialog.inc:146
+#, php-format
+msgid "Can't save file '%s'."
+msgstr "Kan bestand '%s' niet opslaan."
 
-#: plugins/admin/systems/workstationService.tpl:15
-#: plugins/admin/systems/terminalService.tpl:15
-msgid "Layout"
-msgstr "Indeling"
+#: plugins/admin/systems/class_printerPPDDialog.inc:163
+#: plugins/admin/systems/class_printerPPDDialog.inc:166
+msgid "Please specify a valid ppd file."
+msgstr "Geef a.u.b. een geldige PPD bestand op."
 
-#: plugins/admin/systems/workstationService.tpl:17
-#: plugins/admin/systems/terminalService.tpl:17
-msgid "Choose keyboard layout"
-msgstr "Kies toetsenbord indeling"
+#: plugins/admin/systems/class_printerPPDDialog.inc:190
+msgid "Please select a valid ppd."
+msgstr "Selecteer a.u.b. een geldig PPD bestand."
 
-#: plugins/admin/systems/workstationService.tpl:23
-#: plugins/admin/systems/terminalService.tpl:23
-msgid "Variant"
-msgstr "Variant"
+#: plugins/admin/systems/class_printerPPDDialog.inc:369
+#: plugins/admin/systems/class_printerPPDDialog.inc:372
+msgid "True"
+msgstr "Ja"
 
-#: plugins/admin/systems/workstationService.tpl:25
-#: plugins/admin/systems/terminalService.tpl:25
-msgid "Choose keyboard variant"
-msgstr "Kies toetsenbord variant"
+#: plugins/admin/systems/class_printerPPDDialog.inc:370
+#: plugins/admin/systems/class_printerPPDDialog.inc:373
+msgid "False"
+msgstr "Nee"
 
-#: plugins/admin/systems/workstationService.tpl:39
-#: plugins/admin/systems/terminalService.tpl:39
-msgid "Mouse"
-msgstr "Muis"
+#: plugins/admin/systems/class_printerPPDDialog.inc:378
+#, php-format
+msgid "Unsupported ppd type '%s' used for '%s' "
+msgstr "PPD type '%s', gebruikt voor '%s', wordt niet ondersteund "
 
-#: plugins/admin/systems/workstationService.tpl:44
-#: plugins/admin/systems/terminalService.tpl:44
-msgid "Choose mouse type"
-msgstr "Kies het muis type"
+#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
+msgid "Server name"
+msgstr "Servernaam"
 
-#: plugins/admin/systems/workstationService.tpl:50
-#: plugins/admin/systems/terminalService.tpl:50
-msgid "Port"
-msgstr "Poort"
+#: plugins/admin/systems/server.tpl:15 plugins/admin/systems/terminal.tpl:20
+#: plugins/admin/systems/workstation.tpl:29
+#: plugins/admin/systems/component.tpl:15 plugins/admin/systems/phone.tpl:15
+#: plugins/admin/systems/printer.tpl:22
+#: plugins/admin/systems/wingeneric.tpl:15
+msgid "Choose subtree to place terminal in"
+msgstr "Selecteer de subtree waar de terminal onder geplaatst zal worden"
 
-#: plugins/admin/systems/workstationService.tpl:52
-#: plugins/admin/systems/terminalService.tpl:52
-msgid "Choose mouse port"
-msgstr "Kies muispoort"
+#: plugins/admin/systems/server.tpl:39 plugins/admin/systems/terminal.tpl:100
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
+#: plugins/admin/systems/workstation.tpl:79
+#: plugins/admin/systems/class_baseSelectDialog.inc:45
+#: plugins/admin/ogroups/termgroup.tpl:3
+msgid "Action"
+msgstr "Actie"
 
-#: plugins/admin/systems/workstationService.tpl:66
-#: plugins/admin/systems/terminalService.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:24
-#: plugins/gofon/phoneaccount/paste_generic.tpl:23
-msgid "Telephone hardware"
-msgstr "Telefoon hardware"
+#: plugins/admin/systems/server.tpl:43
+msgid "Select action to execute for this server"
+msgstr "Selecteer de voor deze server uit te voeren actie"
 
-#: 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:25
-msgid "Telephone"
-msgstr "Telefoon"
+#: plugins/admin/systems/workstationStartup.tpl:4
+#: plugins/admin/systems/terminalStartup.tpl:1
+msgid "Boot parameters"
+msgstr "Opstart parameters"
 
-#: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/printer.tpl:46
-#: plugins/admin/systems/terminalService.tpl:86
-msgid "Driver"
-msgstr "Stuurprogramma"
+#: plugins/admin/systems/workstationStartup.tpl:8
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "LDAP server"
+msgstr "LDAP server"
 
-#: plugins/admin/systems/workstationService.tpl:88
-#: plugins/admin/systems/terminalService.tpl:88
-msgid "Choose graphic driver that is needed by the installed graphic board"
-msgstr ""
-"Kies het stuurprogramma dat nodig is voor de geïnstalleerde grafische kaart"
+#: plugins/admin/systems/workstationStartup.tpl:10
+#: plugins/admin/systems/terminalStartup.tpl:10
+msgid "Choose LDAP server to use for accounts and terminal management"
+msgstr "Selecteer de te gebruiken LDAP server voor account en terminal beheer"
 
-#: plugins/admin/systems/workstationService.tpl:96
-#: plugins/admin/systems/terminalService.tpl:96
-msgid "Choose screen resolution used in graphic mode"
-msgstr "Kies de scherm resolutie die gebruikt wordt in grafische modus"
+#: plugins/admin/systems/workstationStartup.tpl:17
+#: plugins/admin/systems/terminalStartup.tpl:17
+msgid "Boot kernel"
+msgstr "Boot kernel"
 
-#: plugins/admin/systems/workstationService.tpl:102
-#: plugins/admin/systems/terminalService.tpl:102
-msgid "Color depth"
-msgstr "Kleurdiepte"
+#: plugins/admin/systems/workstationStartup.tpl:19
+#: plugins/admin/systems/terminalStartup.tpl:19
+msgid "Enter the filename of the kernel to use"
+msgstr "Geef de bestandsnaam op van de te gebruiken kernel"
 
-#: plugins/admin/systems/workstationService.tpl:104
-#: plugins/admin/systems/terminalService.tpl:104
-msgid "Choose colordepth used in graphic mode"
-msgstr "Kies de kleurdiepte die gebruikt wordt in grafische modus"
+#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/terminalStartup.tpl:22
+msgid "Custom options"
+msgstr "Aangepaste opties"
 
-#: plugins/admin/systems/workstationService.tpl:117
-#: plugins/admin/systems/terminalService.tpl:117
-msgid "Display device"
-msgstr "Scherm"
+#: plugins/admin/systems/workstationStartup.tpl:24
+#: plugins/admin/systems/terminalStartup.tpl:24
+msgid ""
+"Enter any parameters that should be passed to the kernel as append line "
+"during bootup"
+msgstr ""
+"Geef parameters op die meegeven worden aan de kernel als append regel "
+"tijdens het opstarten"
 
-#: plugins/admin/systems/workstationService.tpl:121
-msgid "unknown"
-msgstr "onbekend"
+#: plugins/admin/systems/workstationStartup.tpl:37
+msgid "FAI server"
+msgstr "FAI server"
 
-#: plugins/admin/systems/workstationService.tpl:126
-msgid "Automatic modelines"
-msgstr "Automatische modusregels"
+#: plugins/admin/systems/workstationStartup.tpl:54
+msgid "Assigned FAI classes"
+msgstr "Toegekende FAI klasses"
 
-#: plugins/admin/systems/workstationService.tpl:130
-#: plugins/admin/systems/terminalService.tpl:124
-msgid "HSync"
-msgstr "HSync"
+#: plugins/admin/systems/workstationStartup.tpl:73
+#: plugins/admin/systems/terminalStartup.tpl:53
+msgid "Kernel modules (format: name parameters)"
+msgstr "Kernel modules (formaat: naam parameters)"
 
-#: plugins/admin/systems/workstationService.tpl:132
-#: plugins/admin/systems/terminalService.tpl:126
-msgid "Horizontal refresh frequency for installed monitor"
-msgstr "Horizontale ververs frequentie voor de geïnstalleerde monitor"
+#: plugins/admin/systems/workstationStartup.tpl:75
+#: plugins/admin/systems/terminalStartup.tpl:55
+msgid "Add additional modules to load on startup"
+msgstr "Voeg additioneel te laden modules toe bij het opstarten"
 
-#: plugins/admin/systems/workstationService.tpl:135
-#: plugins/admin/systems/terminalService.tpl:129
-msgid "VSync"
-msgstr "VSync"
+#: plugins/admin/systems/workstationStartup.tpl:99
+#: plugins/admin/systems/terminalStartup.tpl:79
+msgid "Mountpoint"
+msgstr "Koppelpunt"
 
-#: plugins/admin/systems/workstationService.tpl:137
-#: plugins/admin/systems/terminalService.tpl:131
-msgid "Vertical refresh frequency for installed monitor"
-msgstr "Verticale ververs frequentie voor de geïnstalleerde monitor"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:6
+msgid "List of devices"
+msgstr "Lijst met apparaten"
 
-#: plugins/admin/systems/workstationService.tpl:149
-#: plugins/admin/systems/terminalService.tpl:203
-msgid "Scan device"
-msgstr "Scanner"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:23
+msgid ""
+"This dialog allows you to attach a device to your currently edited computer."
+msgstr ""
+"Deze dialoog maakt het mogelijk om een apparaat te verbinden aan de computer "
+"die u momenteel aan het bewerken bent."
 
-#: plugins/admin/systems/workstationService.tpl:150
-#: plugins/admin/systems/terminalService.tpl:204
-msgid "Select to start SANE scan service on terminal"
-msgstr "Selecteer om de SANE scan service te starten op de terminal"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:35
+msgid "Display devices matching"
+msgstr "Toon overeenkomende apparaten"
 
-#: plugins/admin/systems/workstationService.tpl:151
-#: plugins/admin/systems/terminalService.tpl:205
-msgid "Provide scan services"
-msgstr "Lever scan diensten"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:37
+msgid "Regular expression for matching device names"
+msgstr "Reguliere expressie voor overeenkomende apparaat namen"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
-msgid "Select entries to add"
-msgstr "Selecteer de toe te voegen regels"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
+#: plugins/admin/systems/class_glpiAccount.inc:144
+msgid "There is no server with valid glpi database service."
+msgstr "Er is geen server met geldige GLPI database service aanwezig."
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
-msgid "Display members of department"
-msgstr "Toon leden van afdeling"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
+#: plugins/admin/systems/class_glpiAccount.inc:154
+msgid "Can't connect to glpi database, the php-mysql extension is missing."
+msgstr ""
+"Kan niet verbinden met de GLPI database. Er is geen MySQL extensie "
+"beschikbaar. Controleer uw PHP installatie."
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
-msgid "Display members matching"
-msgstr "Toon de overeenkomende leden"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
+#: plugins/admin/systems/class_glpiAccount.inc:164
+msgid "Can't connect to glpi database, check configuration twice."
+msgstr ""
+"Kan niet verbinden met de GLPI database. Controleer uw configuratie a.u.b. "
+"nogmaals."
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
-msgid "Regular expression for matching member names"
-msgstr "Reguliere expressie voor overeenkomende lidnamen"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
+#: plugins/admin/systems/class_glpiAccount.inc:564
+#, fuzzy
+msgid "Remove inventory"
+msgstr "Record verwijderen"
 
-#: plugins/admin/systems/class_workstationStartup.inc:313
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
 msgid ""
-"There are packages in your configuration, which can't be resolved with "
-"current server/release settings."
+"This server has inventory features enabled. You can disable them by clicking "
+"below."
 msgstr ""
+"Deze server heeft inventaris mogelijkheden ingeschakeld. U kunt deze "
+"uitschakelen door de knop hieronder te gebruiken."
 
-#: plugins/admin/systems/class_workstationStartup.inc:354
-msgid "Please select a 'FAI server' or remove the 'FAI classes'."
-msgstr "Selecteer a.u.b. een 'FAI server' of  verwijder de 'FAI klasses'."
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
+#: plugins/admin/systems/class_glpiAccount.inc:567
+#, fuzzy
+msgid "Add inventory"
+msgstr "Record toevoegen"
 
-#: plugins/admin/systems/class_workstationStartup.inc:410
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
 msgid ""
-"There is already a profile in your selection that contain partition table "
-"configurations."
+"This server has inventory features disabled. You can enable them by clicking "
+"below."
 msgstr ""
-"Er bestaat al een profiel in uw selectie die partitietabel configuraties "
-"bevat."
+"Deze server heeft inventaris mogelijkheden uitgeschakeld. U kunt deze "
+"inschakelen door de knop hieronder te gebruiken."
 
-#: plugins/admin/systems/class_workstationStartup.inc:691
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
 #, php-format
 msgid ""
-"Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
-"Server was reset to 'auto'."
+"Can't rename given printer type to '%s', because this type name already "
+"exists."
 msgstr ""
+"Kan het opgegeven printertype niet wijzigen naar '%s', aangezien deze "
+"typenaam al bestaat."
 
-#: plugins/admin/systems/class_workstationStartup.inc:702
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
 #, php-format
-msgid ""
-"Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
-"configurations, possibly some classes where deleted or renamed. !All classes "
-"have been removed from this account, press cancel if you don't want this to "
-"be saved."
+msgid "Can't delete printer type, it is still in use by '%s'."
 msgstr ""
+"Kan het printertype niet verwijderen, aangezien deze nog steeds in gebruik "
+"is door: '%s'"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:105
-msgid "This 'dn' has no phone features."
-msgstr "Deze 'dn' heeft geen telefoon mogelijkheden."
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:609
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:623
+#: plugins/admin/systems/class_glpiAccount.inc:631
+#: plugins/admin/systems/class_glpiAccount.inc:645
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:288
+msgid "N/A"
+msgstr "Niet beschikbaar"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
-msgid "yes"
-msgstr "ja"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:750
+msgid "since"
+msgstr "sinds"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-msgid "no"
-msgstr "nee"
+#: plugins/admin/systems/terminal.tpl:9
+msgid "Terminal template"
+msgstr "Terminal sjabloon"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:223
-msgid "dynamic"
-msgstr "dynamisch"
+#: plugins/admin/systems/terminal.tpl:11
+msgid "Terminal name"
+msgstr "Terminal naam"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:223
-msgid "Networksettings"
-msgstr "Netwerk instellingen"
+#: plugins/admin/systems/terminal.tpl:37
+#: plugins/admin/systems/workstation.tpl:46
+#: plugins/admin/systems/phonesettings.tpl:21
+msgid "Mode"
+msgstr "Modus"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:238
-#, php-format
-msgid ""
-"Can't delete because there are user which are depending on this phone. One "
-"of them is user '%s'."
-msgstr ""
-"Kan niet verwijderd worden, aangezien er een gebruiker is die afhankelijkis "
-"van deze telefoon. Een van deze gebruiker(s) is '%s'."
+#: plugins/admin/systems/terminal.tpl:39
+#: plugins/admin/systems/workstation.tpl:48
+msgid "Select terminal mode"
+msgstr "Selecteer terminal modus"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:294
-msgid "The required field 'Phone name' is not set."
-msgstr "Het vereiste veld 'Telefoonnaam' is leeg."
+#: plugins/admin/systems/terminal.tpl:53
+msgid "Root server"
+msgstr "Root server"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:297
-msgid "The 'Phone name' '0' is reserved and cannot be used."
-msgstr "De 'Telefoonnaam' '0' is gereserveerd en kan niet gebruikt worden."
+#: plugins/admin/systems/terminal.tpl:55
+msgid "Select NFS root filesystem to use"
+msgstr "Selecteer het te gebruiken NFS root bestandssysteem"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:304
-msgid "You have no permissions to create a phone on this 'Base'."
-msgstr ""
-"U heeft geen toestemming om een telefoon aan te maken onder deze 'Basis'."
+#: plugins/admin/systems/terminal.tpl:61
+msgid "Swap server"
+msgstr "Swap server"
+
+#: plugins/admin/systems/terminal.tpl:63
+msgid "Choose NFS filesystem to place swap files on"
+msgstr "Kies het NFS bestandssysteem waarop de swapbestanden geplaatst worden"
+
+#: plugins/admin/systems/terminal.tpl:75
+#: plugins/admin/systems/workstation.tpl:55
+msgid "Syslog server"
+msgstr "Syslog server"
+
+#: plugins/admin/systems/terminal.tpl:77
+#: plugins/admin/systems/workstation.tpl:57
+msgid "Choose server to use for logging"
+msgstr "Selecteer de server die gebruikt wordt voor log doeleinden"
+
+#: plugins/admin/systems/terminal.tpl:83
+#: plugins/admin/systems/workstation.tpl:63
+msgid "NTP server"
+msgstr "NTP tijdserver"
+
+#: plugins/admin/systems/terminal.tpl:85
+#: plugins/admin/systems/workstation.tpl:65
+msgid "Choose server to use for synchronizing time"
+msgstr "Selecteer de server die gebruikt wordt voor tijdsynchronisatie"
+
+#: plugins/admin/systems/terminal.tpl:104
+#: plugins/admin/systems/workstation.tpl:83
+msgid "Select action to execute for this terminal"
+msgstr "Selecteer de voor deze terminal uit te voeren actie"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:67
+#: plugins/admin/systems/class_servDB.inc:135
+#: plugins/admin/systems/class_servDB.inc:144
+#: plugins/admin/systems/class_servDB.inc:161
+#: plugins/admin/systems/class_servDB.inc:171
+#: plugins/admin/systems/class_servDB.inc:176
+#: plugins/admin/systems/class_servDB.inc:182
 #, php-format
-msgid "Can't open '%s', ppd settings resetted."
-msgstr "Kon '%s' niet openen. PPD instellingen zijn teruggezet."
+msgid "The attribute '%s' is empty or contains invalid characters."
+msgstr "Het atribuut '%s' is leeg of bevat ongeldige karakters!"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:108
+#: plugins/admin/systems/class_servDB.inc:151
 #, php-format
-msgid ""
-"The specified PPD_PATH='%s' in your gosa.conf is invalid, can't read any ppd "
-"informations."
-msgstr ""
-"Het opgegeven PPD_PATH='%s' in uw gosa.conf is ongeldig. Kan geen PPD "
-"informatie lezen."
+msgid "The imap connect string needs to be in the form '%s'."
+msgstr "De imap verbindings string dient in eruit te zien als '%s'."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:109
-msgid "Can't get ppd informations."
-msgstr "Kan de PPD informatie niet ophalen."
+#: plugins/admin/systems/class_servDB.inc:155
+msgid "The sieve port needs to be numeric."
+msgstr "De sieve poort dient nummeriek te zijn."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:125
+#: plugins/admin/systems/class_servDB.inc:166
 #, php-format
-msgid "Can't create folder '%s' for the uploaded ppd file."
-msgstr "Kan directory '%s',voor het verstuurde PPD bestand, niet aanmaken."
+msgid "The specified kerberos password is empty."
+msgstr "Het opgegeven kerberos wachtwoord is leeg."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:138
+#: plugins/admin/systems/class_servDB.inc:190
 #, php-format
-msgid "There is already a ppd file for this kind of printer."
-msgstr "Er bestaat al een PPD bestand voor dit type printer."
+msgid "The imap name string needs to be a hostname or an IP-address."
+msgstr "De imap naam dient een hostnaam of een IP adres te zijn."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:146
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
 #, php-format
-msgid "Can't save file '%s'."
-msgstr "Kan bestand '%s' niet opslaan."
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:163
-#: plugins/admin/systems/class_printerPPDDialog.inc:166
-msgid "Please specify a valid ppd file."
-msgstr "Geef a.u.b. een geldige PPD bestand op."
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:190
-msgid "Please select a valid ppd."
-msgstr "Selecteer a.u.b. een geldig PPD bestand."
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:369
-#: plugins/admin/systems/class_printerPPDDialog.inc:372
-msgid "True"
-msgstr "Ja"
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:370
-#: plugins/admin/systems/class_printerPPDDialog.inc:373
-msgid "False"
-msgstr "Nee"
+msgid "You're about to delete the glpi cartridge type '%s'."
+msgstr "U staat op het punt het GLPI cartridgetype '%s' te verwijderen."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:378
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:116
 #, php-format
-msgid "Unsupported ppd type '%s' used for '%s' "
-msgstr "PPD type '%s', gebruikt voor '%s', wordt niet ondersteund "
+msgid ""
+"You can't delete this cartridge type, it is still in use by this printer(s) "
+"'%s'."
+msgstr ""
+"U kunt dit cartridgetype niet verwijderen, aangezien deze nog steeds in "
+"gebruik is door deze printer(s): '%s'"
 
-#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
-msgid "Server name"
-msgstr "Servernaam"
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
+msgid "Cartridges"
+msgstr "Cartridges"
 
-#: plugins/admin/systems/server.tpl:39 plugins/admin/systems/terminal.tpl:100
-#: plugins/admin/systems/workstation.tpl:79
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:44
-#: plugins/admin/ogroups/termgroup.tpl:3
-msgid "Action"
-msgstr "Actie"
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
+msgid "New monitor"
+msgstr "Nieuwe monitor"
 
-#: plugins/admin/systems/server.tpl:43
-msgid "Select action to execute for this server"
-msgstr "Selecteer de voor deze server uit te voeren actie"
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
+msgid "M"
+msgstr "M"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:61
-msgid "text"
-msgstr "tekst"
+#: plugins/admin/systems/class_workstationGeneric.inc:70
+msgid "Activated"
+msgstr "Geactiveerd"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:62
-msgid "graphic"
-msgstr "grafisch"
+#: plugins/admin/systems/class_workstationGeneric.inc:72
+msgid "Memory test"
+msgstr "Geheugentest"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:90
-#: plugins/admin/systems/class_servGeneric.inc:62
-#: plugins/admin/ogroups/class_termgroup.inc:64
-msgid "No WAKECMD definition found in your gosa.conf"
-msgstr "Er is geen 'WAKECMD' gedefiniëerd in uw gosa.conf"
+#: plugins/admin/systems/class_workstationGeneric.inc:73
+msgid "System analysis"
+msgstr "Systeem analyse"
 
+#: plugins/admin/systems/class_workstationGeneric.inc:100
+msgid "No ACTIONCMD definition found in your gosa.conf"
+msgstr "Es is geen ACTIONCMD definitie in uw gosa.conf gedefiniëerd"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:104
 #: plugins/admin/systems/class_terminalGeneric.inc:94
 #: plugins/admin/systems/class_terminalGeneric.inc:106
 #: plugins/admin/systems/class_terminalGeneric.inc:118
 #: plugins/admin/systems/class_servGeneric.inc:66
 #: plugins/admin/systems/class_servGeneric.inc:78
 #: plugins/admin/systems/class_servGeneric.inc:90
-#: plugins/admin/systems/class_workstationGeneric.inc:104
 #: plugins/admin/ogroups/class_termgroup.inc:68
 #: plugins/admin/ogroups/class_termgroup.inc:80
 #: plugins/admin/ogroups/class_termgroup.inc:92
@@ -7451,248 +7855,293 @@ msgstr "Er is geen 'WAKECMD' gedefiniëerd in uw gosa.conf"
 msgid "Execution of '%s' failed!"
 msgstr "Uitvoer van '%s' is mislukt!"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:102
-#: plugins/admin/systems/class_servGeneric.inc:74
-#: plugins/admin/ogroups/class_termgroup.inc:76
-msgid "No REBOOTCMD definition found in your gosa.conf"
-msgstr "Er is geen 'REBOOTCMD' in uw gosa.conf gedefiniëerd"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_servGeneric.inc:86
-#: plugins/admin/ogroups/class_termgroup.inc:88
-msgid "No HALTCMD definition found in your gosa.conf"
-msgstr "Er is geen 'HALTCMD' in uw gosa.conf gedefiniëerd"
+#: plugins/admin/systems/class_workstationGeneric.inc:114
+msgid "This 'dn' has no workstation features."
+msgstr "Deze 'dn' heeft geen werkstation mogelijkheden."
 
+#: plugins/admin/systems/class_workstationGeneric.inc:156
 #: plugins/admin/systems/class_terminalGeneric.inc:170
 #: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Switch off"
 msgstr "Uitschakelen"
 
+#: plugins/admin/systems/class_workstationGeneric.inc:156
 #: plugins/admin/systems/class_terminalGeneric.inc:170
 #: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Reboot"
 msgstr "Herstarten"
 
+#: plugins/admin/systems/class_workstationGeneric.inc:157
+msgid "Instant update"
+msgstr "Onmiddelijk bijwerken"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:158
+#: plugins/admin/systems/class_workstationGeneric.inc:164
+msgid "Scheduled update"
+msgstr "Geplande bijwerking"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:159
+#: plugins/admin/systems/class_workstationGeneric.inc:163
+msgid "Reinstall"
+msgstr "Herinstalleer"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:160
+msgid "Rescan hardware"
+msgstr "Hardware opnieuw scannen"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:162
 #: plugins/admin/systems/class_terminalGeneric.inc:172
 #: plugins/admin/systems/class_servGeneric.inc:142
-#: plugins/admin/systems/class_workstationGeneric.inc:162
 #: plugins/admin/ogroups/class_termgroup.inc:104
 msgid "Wake up"
 msgstr "Aanzetten"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:269
-msgid "You have no permissions to create a terminal on this 'Base'."
+#: plugins/admin/systems/class_workstationGeneric.inc:228
+msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr ""
-"U heeft geen toestemming om een nieuwe terminal aan te maken onder deze "
-"'basis'"
+"U heeft geen toestemming om een werkstation aan te maken onder deze 'basis'"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:273
-msgid "The required field 'Terminal name' is not set."
-msgstr "Het vereiste veld 'Terminal naam' is leeg."
+#: plugins/admin/systems/class_workstationGeneric.inc:232
+msgid "The required field 'Workstation name' is not set."
+msgstr "Het vereiste veld 'Werkstation naam' is leeg."
 
-#: plugins/admin/systems/printerPPDDialog.tpl:1
-msgid "Printer driver"
-msgstr "Printer stuurprogramma"
+#: plugins/admin/systems/class_workstationGeneric.inc:245
+#: plugins/admin/systems/class_componentGeneric.inc:155
+#: plugins/admin/systems/class_winGeneric.inc:172
+#: plugins/admin/systems/class_terminalGeneric.inc:286
+#: plugins/admin/systems/class_servGeneric.inc:209
+#: plugins/admin/systems/class_printGeneric.inc:529
+#: plugins/admin/systems/class_phoneGeneric.inc:314
+#, php-format
+msgid "There is already an entry '%s' in the base choosen by you"
+msgstr "Er is al een invoer '%s' onder de basis die u gekozen heeft"
 
-#: plugins/admin/systems/printerPPDDialog.tpl:6
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
-msgid "Select"
-msgstr "Selecteer"
+#: plugins/admin/systems/servdns.tpl:1
+msgid "Zones"
+msgstr "Zones"
 
-#: plugins/admin/systems/printerPPDDialog.tpl:9
-msgid "New driver"
-msgstr "Nieuw stuurprogramma"
+#: plugins/admin/systems/workstation.tpl:9
+msgid "Workstation template"
+msgstr "Werkstation sjabloon"
 
-#: plugins/admin/systems/workstationStartup.tpl:4
-#: plugins/admin/systems/terminalStartup.tpl:1
-msgid "Boot parameters"
-msgstr "Opstart parameters"
+#: plugins/admin/systems/workstation.tpl:11
+msgid "Workstation name"
+msgstr "Werkstation naam"
+
+#: plugins/admin/systems/class_servNfs.inc:35
+msgid ""
+"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+msgstr ""
+"Het bestand '/etc/gosa/encodings' bestaat niet. Kan de ondersteunde "
+"karaktersets niet ophalen."
+
+#: plugins/admin/systems/class_servNfs.inc:38
+msgid "Can't read '/etc/gosa/encodings', please check permissions."
+msgstr ""
+"Kan bestand '/etc/gosa/encodings' niet openen. Controlleer de "
+"bestandspermissies a.u.b."
+
+#: plugins/admin/systems/class_servNfs.inc:125
+msgid "Please specify a valid path for your setup."
+msgstr "Geef a.u.b. een geldig pad op voor uw instellingen."
+
+#: plugins/admin/systems/class_servNfs.inc:131
+msgid "Please specify a valid name for your setup."
+msgstr "Geef a.u.b. een geldige naam op voor uw instellingen."
+
+#: plugins/admin/systems/class_servNfs.inc:134
+msgid "Please specify a name for your setup."
+msgstr "Geef a.u.b. een naam op voor uw instellingen."
+
+#: plugins/admin/systems/class_servNfs.inc:139
+msgid "Description contains invalid characters."
+msgstr "De omschrijving bevat ongeldige karakters."
+
+#: plugins/admin/systems/class_servNfs.inc:143
+msgid "Path contains invalid characters."
+msgstr "Het pad bevat ongeldige karakters."
+
+#: plugins/admin/systems/class_servNfs.inc:147
+msgid "Option contains invalid characters."
+msgstr "De optie bevat ongeldige karakters."
+
+#: 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 "Path"
+msgstr "Pad"
 
-#: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "LDAP server"
-msgstr "LDAP server"
+#: plugins/admin/systems/servnfs.tpl:49
+msgid "Codepage"
+msgstr "Karakterset"
 
-#: plugins/admin/systems/workstationStartup.tpl:10
-#: plugins/admin/systems/terminalStartup.tpl:10
-msgid "Choose LDAP server to use for accounts and terminal management"
-msgstr "Selecteer de te gebruiken LDAP server voor account en terminal beheer"
+#: plugins/admin/systems/servnfs.tpl:59
+msgid "Option"
+msgstr "Optie"
 
-#: plugins/admin/systems/workstationStartup.tpl:17
-#: plugins/admin/systems/terminalStartup.tpl:17
-msgid "Boot kernel"
-msgstr "Boot kernel"
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid "Remove Kolab extension"
+msgstr "Verwijder Kolab mogelijkheden"
 
-#: plugins/admin/systems/workstationStartup.tpl:19
-#: plugins/admin/systems/terminalStartup.tpl:19
-msgid "Enter the filename of the kernel to use"
-msgstr "Geef de bestandsnaam op van de te gebruiken kernel"
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid ""
+"This server has kolab features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Deze server heeft Kolab mogelijkheden ingeschakeld. U kunt deze uitschakelen "
+"door de knop hieronder te gebruiken."
 
-#: plugins/admin/systems/workstationStartup.tpl:22
-#: plugins/admin/systems/terminalStartup.tpl:22
-msgid "Custom options"
-msgstr "Aangepaste opties"
+#: plugins/admin/systems/class_servKolab.inc:118
+msgid "Add Kolab service"
+msgstr "Voeg Kolab service toe"
 
-#: plugins/admin/systems/workstationStartup.tpl:24
-#: plugins/admin/systems/terminalStartup.tpl:24
+#: plugins/admin/systems/class_servKolab.inc:118
 msgid ""
-"Enter any parameters that should be passed to the kernel as append line "
-"during bootup"
+"This server has kolab features disabled. You can enable them by clicking "
+"below."
 msgstr ""
-"Geef parameters op die meegeven worden aan de kernel als append regel "
-"tijdens het opstarten"
+"Deze server heeft Kolab mogelijkheden uitgeschakeld. U kunt deze inschakelen "
+"door de knop hieronder te gebruiken."
 
-#: plugins/admin/systems/workstationStartup.tpl:37
-msgid "FAI server"
-msgstr "FAI server"
+#: plugins/admin/systems/class_servKolab.inc:146
+#, php-format
+msgid "Include data from %s days in the past when creating free/busy lists"
+msgstr ""
+"Gebruik data van %s dagen geleden wanneer free/busy lijsten worden aangemaakt"
 
-#: plugins/admin/systems/workstationStartup.tpl:54
-msgid "Assigned FAI classes"
-msgstr "Toegekende FAI klasses"
+#: plugins/admin/systems/class_servKolab.inc:152
+#, php-format
+msgid "Warn users when using more than %s%% of their mail quota"
+msgstr ""
+"Waarschuw gebruikers wanneer meer dan %s%% van hun E-mail quota gebruikt "
+"wordt"
 
-#: plugins/admin/systems/workstationStartup.tpl:73
-#: plugins/admin/systems/terminalStartup.tpl:53
-msgid "Kernel modules (format: name parameters)"
-msgstr "Kernel modules (formaat: naam parameters)"
+#: plugins/admin/systems/class_servKolab.inc:227
+msgid "Future days in Free/Busy settings must be set."
+msgstr "Toekomstige dagen moet ingesteld zijn in de Free/Busy instellingen."
 
-#: plugins/admin/systems/workstationStartup.tpl:75
-#: plugins/admin/systems/terminalStartup.tpl:55
-msgid "Add additional modules to load on startup"
-msgstr "Voeg additioneel te laden modules toe bij het opstarten"
+#: plugins/admin/systems/class_servKolab.inc:229
+msgid "Future days in Free/Busy settings must be a positive value."
+msgstr ""
+"Toekomstige dagen moet een positieve waarde bevatten in de Free/Busy "
+"instellingen."
 
-#: plugins/admin/systems/workstationStartup.tpl:99
-#: plugins/admin/systems/terminalStartup.tpl:79
-msgid "Mountpoint"
-msgstr "Koppelpunt"
+#: plugins/admin/systems/class_servKolab.inc:233
+msgid "The given Quota settings value must be a number."
+msgstr "De opgegeven Quota instellingen moeten nummeriek zijn."
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
-msgstr "Telefoonnaam"
+#: plugins/admin/systems/class_servKolab.inc:235
+msgid "Please choose a value between 1 and 100 for Quota settings."
+msgstr "Kies a.u.b. een waarde tussen 1 en 100 voor de Quota instellingen."
 
-#: plugins/admin/systems/class_servGeneric.inc:52
-msgid "This 'dn' has no server features."
-msgstr "Deze 'dn' heeft geen server mogelijkheden."
+#: plugins/admin/systems/class_servKolab.inc:237
+msgid "Future days must be a value."
+msgstr "Toekomstige dagen moet een waarde bevatten."
 
-#: plugins/admin/systems/class_servGeneric.inc:191
-msgid "The required field 'Server name' is not set."
-msgstr "Het vereiste veld 'Servernaam' is leeg."
+#: plugins/admin/systems/class_servKolab.inc:241
+msgid "No SMTP privileged networks set."
+msgstr "Er zijn geen netwerken met SMTP privileges ingesteld"
 
-#: plugins/admin/systems/class_servGeneric.inc:198
-msgid "You have no permissions to create a server on this 'Base'."
-msgstr ""
-"U heeft geen toestemming om een server aan te maken onder deze 'Basis'."
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
+msgstr "Remote desktop"
 
-#: plugins/admin/systems/terminal.tpl:9
-msgid "Terminal template"
-msgstr "Terminal sjabloon"
+#: plugins/admin/systems/terminalService.tpl:145
+msgid "Connect method"
+msgstr "Verbindings methode"
 
-#: plugins/admin/systems/terminal.tpl:11
-msgid "Terminal name"
-msgstr "Terminal naam"
+#: plugins/admin/systems/terminalService.tpl:147
+msgid "Choose method to connect to terminal server"
+msgstr "Kies de methode om te verbinden met de terminal server"
 
-#: plugins/admin/systems/terminal.tpl:37
-#: plugins/admin/systems/workstation.tpl:46
-#: plugins/admin/systems/phonesettings.tpl:21
-msgid "Mode"
-msgstr "Modus"
+#: plugins/admin/systems/terminalService.tpl:154
+msgid "Terminal server"
+msgstr "Terminal server"
 
-#: plugins/admin/systems/terminal.tpl:39
-#: plugins/admin/systems/workstation.tpl:48
-msgid "Select terminal mode"
-msgstr "Selecteer terminal modus"
+#: plugins/admin/systems/terminalService.tpl:156
+msgid "Select specific terminal server to use"
+msgstr "Selecteer de te gebruiken terminal server"
 
-#: plugins/admin/systems/terminal.tpl:53
-msgid "Root server"
-msgstr "Root server"
+#: plugins/admin/systems/terminalService.tpl:163
+msgid "Font server"
+msgstr "Font server"
 
-#: plugins/admin/systems/terminal.tpl:55
-msgid "Select NFS root filesystem to use"
-msgstr "Selecteer het te gebruiken NFS root bestandssysteem"
+#: plugins/admin/systems/terminalService.tpl:165
+msgid "Select specific font server to use"
+msgstr "Selecteer de te gebruiken font server"
 
-#: plugins/admin/systems/terminal.tpl:61
-msgid "Swap server"
-msgstr "Swap server"
+#: plugins/admin/systems/terminalService.tpl:181
+msgid "Print device"
+msgstr "Printer"
 
-#: plugins/admin/systems/terminal.tpl:63
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "Kies het NFS bestandssysteem waarop de swapbestanden geplaatst worden"
+#: plugins/admin/systems/terminalService.tpl:182
+msgid "Select to start IPP based printing service on terminal"
+msgstr "Selecteer om de IPP gebaseerde print service te starten op de terminal"
 
-#: plugins/admin/systems/terminal.tpl:75
-#: plugins/admin/systems/workstation.tpl:55
-msgid "Syslog server"
-msgstr "Syslog server"
+#: plugins/admin/systems/terminalService.tpl:183
+msgid "Provide print services"
+msgstr "Lever print diensten"
 
-#: plugins/admin/systems/terminal.tpl:77
-#: plugins/admin/systems/workstation.tpl:57
-msgid "Choose server to use for logging"
-msgstr "Selecteer de server die gebruikt wordt voor log doeleinden"
+#: plugins/admin/systems/terminalService.tpl:189
+msgid "Spool server"
+msgstr "Spool server"
 
-#: plugins/admin/systems/terminal.tpl:83
-#: plugins/admin/systems/workstation.tpl:63
-msgid "NTP server"
-msgstr "NTP tijdserver"
+#: plugins/admin/systems/terminalService.tpl:191
+msgid "Select NFS filesystem to place spool files on"
+msgstr "Selecteer NFS bestandssysteem waarop spool bestanden geplaatst worden"
 
-#: plugins/admin/systems/terminal.tpl:85
-#: plugins/admin/systems/workstation.tpl:65
-msgid "Choose server to use for synchronizing time"
-msgstr "Selecteer de server die gebruikt wordt voor tijdsynchronisatie"
+#: plugins/admin/systems/terminalService.tpl:212
+msgid "Select scanner driver to use"
+msgstr "Selecteer de te gebruiken scanner driver"
 
-#: plugins/admin/systems/terminal.tpl:104
-#: plugins/admin/systems/workstation.tpl:83
-msgid "Select action to execute for this terminal"
-msgstr "Selecteer de voor deze terminal uit te voeren actie"
+#: plugins/admin/systems/class_componentGeneric.inc:50
+#: plugins/admin/systems/class_winGeneric.inc:73
+msgid "This 'dn' has no network features."
+msgstr "Deze 'dn' heeft geen netwerk mogelijkheden."
 
-#: plugins/admin/systems/class_servDHCP.inc:36
-msgid "Remove DHCP service"
-msgstr "Verwijder DHCP service"
+#: plugins/admin/systems/class_componentGeneric.inc:138
+msgid "The required field 'Component name' is not set."
+msgstr "Het vereiste veld 'Component naam' is leeg."
 
-#: plugins/admin/systems/class_servDHCP.inc:37
-msgid ""
-"This server has DHCP features enabled. You can disable them by clicking "
-"below."
+#: plugins/admin/systems/class_componentGeneric.inc:145
+#: plugins/admin/systems/class_winGeneric.inc:162
+msgid "You have no permissions to create a component on this 'Base'."
 msgstr ""
-"Deze server heeft DHCP mogelijkheden ingeschakeld. U kunt deze uitschakelen "
-"door de knop hieronder te gebruiken."
-
-#: plugins/admin/systems/class_servDHCP.inc:39
-msgid "Add DHCP service"
-msgstr "Voeg DHCP service toe"
+"U heeft geen toestemming om een component aan te maken onder deze 'Basis'."
 
-#: plugins/admin/systems/class_servDHCP.inc:40
-msgid ""
-"This server has DHCP features disabled. You can enable them by clicking "
-"below."
+#: plugins/admin/systems/terminalStartup.tpl:35
+msgid "Select if terminal supports graphical startup with progress bar"
 msgstr ""
-"Deze server heeft DHCP mogelijkheden uitgeschakeld. U kunt deze inschakelen "
-"door de knop hieronder te gebruiken."
+"Selecteer indien de terminal een grafische start met voortgangsstatus "
+"ondersteunt"
 
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
-msgstr "Selecteer de toe te voegen objecten"
+#: plugins/admin/systems/terminalStartup.tpl:36
+msgid "use graphical bootup"
+msgstr "Gebruik grafische boot"
 
-#: plugins/admin/systems/class_glpiAccount.inc:144
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
-msgid "There is no server with valid glpi database service."
-msgstr "Er is geen server met geldige GLPI database service aanwezig."
+#: plugins/admin/systems/terminalStartup.tpl:38
+msgid "Select if terminal should boot in text mode"
+msgstr "Selecteer wanneer de terminal op moet starten in tekstmodus"
 
-#: plugins/admin/systems/class_glpiAccount.inc:154
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
-msgid "Can't connect to glpi database, the php-mysql extension is missing."
-msgstr ""
-"Kan niet verbinden met de GLPI database. Er is geen MySQL extensie "
-"beschikbaar. Controleer uw PHP installatie."
+#: plugins/admin/systems/terminalStartup.tpl:39
+msgid "use standard linux textual bootup"
+msgstr "Gebruik standaard linux tekstuele boot"
 
-#: plugins/admin/systems/class_glpiAccount.inc:164
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
-msgid "Can't connect to glpi database, check configuration twice."
-msgstr ""
-"Kan niet verbinden met de GLPI database. Controleer uw configuratie a.u.b. "
-"nogmaals."
+#: plugins/admin/systems/terminalStartup.tpl:41
+msgid "Select to get more verbose output during startup"
+msgstr "Selecteer om meer uitvoer te produceren tijdens opstarten"
+
+#: plugins/admin/systems/terminalStartup.tpl:42
+msgid "use debug mode for startup"
+msgstr "Gebruik debug modus bij boot"
 
 #: plugins/admin/systems/class_glpiAccount.inc:178
 #: plugins/admin/systems/class_glpiAccount.inc:184
@@ -7739,12 +8188,6 @@ msgstr ""
 "Het bijwerken van het besturingssysteem is mislukt. De opgegeven naam wordt "
 "al gebruikt."
 
-#: plugins/admin/systems/class_glpiAccount.inc:564
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
-#, fuzzy
-msgid "Remove inventory"
-msgstr "Record verwijderen"
-
 #: plugins/admin/systems/class_glpiAccount.inc:565
 msgid ""
 "This device has inventory informations enabled. You can disable them by "
@@ -7753,12 +8196,6 @@ msgstr ""
 "Dit apparaat heeft inventaris mogelijkheden ingeschakeld. U kunt deze "
 "uitschakelen door de knop hieronder te gebruiken."
 
-#: plugins/admin/systems/class_glpiAccount.inc:567
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
-#, fuzzy
-msgid "Add inventory"
-msgstr "Record toevoegen"
-
 #: plugins/admin/systems/class_glpiAccount.inc:568
 msgid ""
 "This device has inventory informations disabled. You can enable them by "
@@ -7767,1394 +8204,1322 @@ msgstr ""
 "Dit apparaat heeft inventaris mogelijkheden uitgeschakeld. U kunt deze "
 "inschakelen door de knop hieronder te gebruiken."
 
-#: plugins/admin/systems/class_glpiAccount.inc:631
-#: plugins/admin/systems/class_glpiAccount.inc:645
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:609
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:623
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:288
-msgid "N/A"
-msgstr "Niet beschikbaar"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:70
-msgid "Activated"
-msgstr "Geactiveerd"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:72
-msgid "Memory test"
-msgstr "Geheugentest"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:73
-msgid "System analysis"
-msgstr "Systeem analyse"
+#: plugins/admin/systems/glpiManufacturer.tpl:1
+#, fuzzy
+msgid "Manage manufacturers"
+msgstr "Fabricant"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:100
-msgid "No ACTIONCMD definition found in your gosa.conf"
-msgstr "Es is geen ACTIONCMD definitie in uw gosa.conf gedefiniëerd"
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
+msgid "Attachment"
+msgstr "Bijlage"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:114
-msgid "This 'dn' has no workstation features."
-msgstr "Deze 'dn' heeft geen werkstation mogelijkheden."
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
+msgid "Filename"
+msgstr "Bestandsnaam"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:157
-msgid "Instant update"
-msgstr "Onmiddelijk bijwerken"
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
+msgid "Mime-type"
+msgstr "MIME-type"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:158
-#: plugins/admin/systems/class_workstationGeneric.inc:164
-msgid "Scheduled update"
-msgstr "Geplande bijwerking"
+#: plugins/admin/systems/class_termDNS.inc:313
+msgid "The required field 'IP-address' is not set."
+msgstr "Het vereiste veld 'IP adres' is leeg."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:159
-#: plugins/admin/systems/class_workstationGeneric.inc:163
-msgid "Reinstall"
-msgstr "Herinstalleer"
+#: plugins/admin/systems/class_termDNS.inc:319
+msgid "Wrong IP format in field IP-address."
+msgstr "Verkeerd IP formaat in het veld IP adres"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:160
-msgid "Rescan hardware"
-msgstr "Hardware opnieuw scannen"
+#: plugins/admin/systems/class_termDNS.inc:325
+msgid "The required field 'MAC-address' is not set."
+msgstr "Het vereiste veld 'Hardware adres (MAC)' is leeg."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:228
-msgid "You have no permissions to create a workstation on this 'Base'."
+#: plugins/admin/systems/class_termDNS.inc:331
+msgid ""
+"The given macaddress is invalid. There must be 6 1byte segments seperated by "
+"':'."
 msgstr ""
-"U heeft geen toestemming om een werkstation aan te maken onder deze 'basis'"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:232
-msgid "The required field 'Workstation name' is not set."
-msgstr "Het vereiste veld 'Werkstation naam' is leeg."
-
-#: plugins/admin/systems/class_systemManagement.inc:32
-msgid "Systems"
-msgstr "Systemen"
-
-#: plugins/admin/systems/class_systemManagement.inc:429
-msgid "You can't edit this object type yet!"
-msgstr "U kunt dit object type nog niet bewerken!"
+"Het opgegeven mac-adres is ongeldig. Deze moet bestaan uit 6 segmenten van 1 "
+"byte, gescheiden door ':'"
 
-#: plugins/admin/systems/class_systemManagement.inc:455
-msgid "Passwords entered as new and repeated do not match!"
+#: plugins/admin/systems/class_termDNS.inc:346
+#, php-format
+msgid "Found duplicate value for record type '%s'."
 msgstr ""
-"Het nieuwe wachtwoord en het herhaalde wachtwoord komen niet met elkaar "
-"overeen!"
 
-#: plugins/admin/systems/class_systemManagement.inc:472
-msgid "You are not allowed to set this systems password!"
+#: plugins/admin/systems/class_termDNS.inc:352
+#, php-format
+msgid "Found more than one entry for the uniqe record type '%s'."
 msgstr ""
-"U heeft geen toestemming om het wachtwoord van dit systeem in te stellen!"
 
-#: plugins/admin/systems/class_systemManagement.inc:526
+#: plugins/admin/systems/class_termDNS.inc:360
 #, php-format
-msgid "You're about to delete all information about the component at '%s'."
+msgid ""
+"The device IP '%s' is added as 'A Record', this will be done automatically, "
+"please remove the record."
 msgstr ""
-"U staat op het punt alle informatie over dit component op '%s' te "
-"verwijderen."
+"Het apparaat IP '%s' is toegevoegd als 'A Record'. Dit wordt automatisch "
+"afgehandeld door GOsa. Verwijder het record a.u.b."
 
-#: plugins/admin/systems/class_systemManagement.inc:760
-msgid "New Terminal template"
-msgstr "Nieuw terminal sjabloon"
+#: plugins/admin/systems/class_termDNS.inc:366
+#: plugins/admin/systems/class_servDNSeditZone.inc:386
+#, php-format
+msgid "Only lowercase is allowed, please check your '%ss'."
+msgstr "Hoofdletters zijn niet toegestaan. Controleer uw '%ss'"
 
-#: plugins/admin/systems/class_systemManagement.inc:760
-#: plugins/admin/systems/class_systemManagement.inc:924
-msgid "New Terminal"
-msgstr "Nieuwe terminal"
+#: plugins/admin/systems/class_servRepository.inc:97
+msgid "Remove FAI repository extension."
+msgstr "Verwijder printer mogelijkheden"
 
-#: plugins/admin/systems/class_systemManagement.inc:762
-msgid "New Workstation template"
-msgstr "Nieuw werkstation sjabloon"
+#: plugins/admin/systems/class_servRepository.inc:98
+msgid ""
+"This server has FAI repository features enabled. You can disable them by "
+"clicking below."
+msgstr ""
+"Deze server heeft FAI verzamelplaats mogelijkheden ingeschakeld. U kunt deze "
+"uitschakelen door de knop hieronder te gebruiken."
 
-#: plugins/admin/systems/class_systemManagement.inc:762
-#: plugins/admin/systems/class_systemManagement.inc:925
-msgid "New Workstation"
-msgstr "Nieuw werkstation"
+#: plugins/admin/systems/class_servRepository.inc:100
+msgid "Add FAI repository extension."
+msgstr "Voeg FAI verzamelplaats extensie toe"
 
-#: plugins/admin/systems/class_systemManagement.inc:763
-#: plugins/admin/systems/class_systemManagement.inc:764
-msgid "New Server"
-msgstr "Nieuwe server"
+#: plugins/admin/systems/class_servRepository.inc:101
+msgid ""
+"This server has FAI repository features disabled. You can enable them by "
+"clicking below."
+msgstr ""
+"Deze server heeft FAI verzamelplaats mogelijkheden uitgeschakeld. U kunt "
+"deze inschakelen door de knop hieronder te gebruiken."
 
-#: plugins/admin/systems/class_systemManagement.inc:765
-#: plugins/admin/systems/class_systemManagement.inc:766
-msgid "New Printer"
-msgstr "Nieuwe printer"
+#: plugins/admin/systems/class_servRepository.inc:144
+#, php-format
+msgid ""
+"You can't delete this release, it is still used by these workstations [%s]. "
+"Please solve this dependencies first, to keep data base consistency."
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:767
-#: plugins/admin/systems/class_systemManagement.inc:768
-msgid "New Phone"
-msgstr "Nieuwe telefoon"
+#: plugins/admin/systems/class_servRepository.inc:176
+#, fuzzy, php-format
+msgid ""
+"Be careful editing this release, it is still used by these workstations [%s]."
+msgstr ""
+"U kunt dit apparaat niet verwijderen, aangezien deze nog steeds gebruikt "
+"wordt door deze systemen: '%s'"
 
-#: plugins/admin/systems/class_systemManagement.inc:769
-#: plugins/admin/systems/class_systemManagement.inc:770
-msgid "New Component"
-msgstr "Nieuw component"
+#: plugins/admin/systems/class_servRepository.inc:243
+#: plugins/admin/systems/class_servRepository.inc:264
+#: plugins/admin/systems/servRepositorySetup.tpl:33
+msgid "Sections"
+msgstr "Secties"
 
-#: plugins/admin/systems/class_systemManagement.inc:780
-msgid "Edit system"
-msgstr "Bewerk systeem"
+#: 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."
 
-#: plugins/admin/systems/class_systemManagement.inc:781
-msgid "Delete system"
-msgstr "Verwijder systeem"
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:305
+msgid "The selected name is already in use."
+msgstr "De opgegeven naam wordt al gebruikt."
 
-#: plugins/admin/systems/class_systemManagement.inc:791
-msgid "System"
-msgstr "Systeem"
+#: plugins/admin/systems/servRepository.tpl:6
+msgid "List of configured repositories."
+msgstr "Lijst met gedefinieerde verzamelplaatsen."
 
-#: plugins/admin/systems/class_systemManagement.inc:829
-msgid "Cups Server"
-msgstr "Cups server"
+#: plugins/admin/systems/servRepository.tpl:11
+msgid "Add repository"
+msgstr "Verzamelplaats toevoegen"
 
-#: plugins/admin/systems/class_systemManagement.inc:830
-msgid "Log Db"
-msgstr "Log DB"
+#: plugins/admin/systems/servRepository.tpl:29
+msgid "This menu allows you to create, delete and edit repository settings."
+msgstr ""
+"Dit menu maakt het mogelijk om FAI verzamelplaatsen aan te maken, bewerken "
+"en verwijderen."
 
-#: plugins/admin/systems/class_systemManagement.inc:831
-msgid "Syslog Server"
-msgstr "Syslog server"
+#: plugins/admin/systems/servdnseditzone.tpl:7
+msgid "Zone name"
+msgstr "Zone-naam"
 
-#: plugins/admin/systems/class_systemManagement.inc:832
-msgid "Mail Server"
-msgstr "Mail server"
+#: plugins/admin/systems/servdnseditzone.tpl:13
+#, fuzzy
+msgid "Network address"
+msgstr "Netwerk apparaten"
 
-#: plugins/admin/systems/class_systemManagement.inc:833
-msgid "Imap Server"
-msgstr "Imap server"
+#: plugins/admin/systems/servdnseditzone.tpl:24
+#, fuzzy
+msgid "Zone entries"
+msgstr "Zone instellingen"
 
-#: plugins/admin/systems/class_systemManagement.inc:834
-msgid "Nfs Server"
-msgstr "Nfs server"
+#: plugins/admin/systems/servdnseditzone.tpl:35
+#, fuzzy
+msgid "SOA record"
+msgstr "DNS records"
 
-#: plugins/admin/systems/class_systemManagement.inc:835
-msgid "Kerberos Server"
-msgstr "Kerberos server"
+#: plugins/admin/systems/servdnseditzone.tpl:41
+msgid "Primary dns server for this zone"
+msgstr "Primaire DNS server voor deze zone"
 
-#: plugins/admin/systems/class_systemManagement.inc:836
-msgid "Asterisk Server"
-msgstr "Asterisk server"
+#: plugins/admin/systems/servdnseditzone.tpl:53
+msgid "Serial number (automatically incremented)"
+msgstr "Serienummer (automatisch opgehoogd)"
 
-#: plugins/admin/systems/class_systemManagement.inc:837
-msgid "Fax Server"
-msgstr "Fax server"
+#: plugins/admin/systems/servdnseditzone.tpl:69
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: ihtml/themes/altlinux/setup_finish.tpl:31
+#: ihtml/themes/default/setup_finish.tpl:31
+#: ihtml/themes/lhs/setup_finish.tpl:31
+msgid "Retry"
+msgstr "Opnieuw proberen"
 
-#: plugins/admin/systems/class_systemManagement.inc:838
-msgid "Ldap Server"
-msgstr "Ldap server"
+#: plugins/admin/systems/servdnseditzone.tpl:75
+msgid "Expire"
+msgstr "Vervaltijd"
 
-#: plugins/admin/systems/class_systemManagement.inc:871
-msgid "Set root password"
-msgstr "root wachtwoord instellen"
+#: plugins/admin/systems/servdnseditzone.tpl:96
+#, fuzzy
+msgid "MxRecords"
+msgstr "Records"
 
-#: plugins/admin/systems/class_systemManagement.inc:916
-msgid "New System from incoming"
-msgstr "Nieuw systeem uit inkomende wachtrij"
+#: plugins/admin/systems/servdnseditzone.tpl:108
+#, fuzzy
+msgid "Zone records"
+msgstr "DNS records"
 
-#: plugins/admin/systems/class_systemManagement.inc:918
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:589
-msgid "Terminal"
-msgstr "Terminal"
+#: plugins/admin/systems/class_glpiSelectUser.inc:140
+msgid "use"
+msgstr "gebruik"
 
-#: plugins/admin/systems/class_systemManagement.inc:919
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:588
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
-msgstr "Werkstation"
+#: plugins/admin/systems/glpiSelectUser.tpl:23
+msgid ""
+"This dialog allows you to select a user as technical responsible person."
+msgstr ""
+"Deze dialoog stelt u in staat om een gebruiker als technisch "
+"verantwoordelijk persoon aan te wijzen."
 
-#: plugins/admin/systems/class_systemManagement.inc:922
-msgid "Winstation"
-msgstr "Windows werkstation"
+#: plugins/admin/systems/glpi_devices.tpl:2
+#, fuzzy
+msgid "Add/Edit monitor"
+msgstr "Invoer bewerken"
 
-#: plugins/admin/systems/class_systemManagement.inc:923
-msgid "Network Device"
-msgstr "Netwerk apparaat"
+#: plugins/admin/systems/glpi_devices.tpl:17
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+msgid "Comments"
+msgstr "Opmerkingen"
 
-#: plugins/admin/systems/class_systemManagement.inc:1146
-msgid "New terminal"
-msgstr "Nieuwe terminal"
+#: plugins/admin/systems/glpi_devices.tpl:33
+msgid "Monitor size"
+msgstr "Monitor grootte"
 
-#: plugins/admin/systems/class_systemManagement.inc:1148
-msgid "New workstation"
-msgstr "Nieuw werkstation"
+#: plugins/admin/systems/glpi_devices.tpl:36
+msgid "Inch"
+msgstr "Inch"
 
-#: plugins/admin/systems/class_systemManagement.inc:1150
-msgid "New Device"
-msgstr "Nieuw apparaat"
+#: plugins/admin/systems/glpi_devices.tpl:44
+msgid "Integrated microphone"
+msgstr "Geintegreerde microfoon"
 
-#: plugins/admin/systems/class_systemManagement.inc:1167
-msgid "Terminal template for"
-msgstr "Terminal sjabloon voor"
+#: plugins/admin/systems/glpi_devices.tpl:47
+#: plugins/admin/systems/glpi_devices.tpl:55
+#: plugins/admin/systems/glpi_devices.tpl:63
+#: plugins/admin/systems/glpi_devices.tpl:71
+#: plugins/admin/systems/glpi_devices.tpl:176
+#: plugins/admin/systems/glpi_devices.tpl:296
+#: plugins/admin/systems/glpi_devices.tpl:361
+msgid "Yes"
+msgstr "Ja"
 
-#: plugins/admin/systems/class_systemManagement.inc:1179
-msgid "Workstation template for"
-msgstr "Werkstation sjabloon voor"
+#: plugins/admin/systems/glpi_devices.tpl:48
+#: plugins/admin/systems/glpi_devices.tpl:56
+#: plugins/admin/systems/glpi_devices.tpl:64
+#: plugins/admin/systems/glpi_devices.tpl:72
+#: plugins/admin/systems/glpi_devices.tpl:177
+#: plugins/admin/systems/glpi_devices.tpl:297
+#: plugins/admin/systems/glpi_devices.tpl:362
+msgid "No"
+msgstr "Nee"
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "General"
-msgstr "Algemeen"
+#: plugins/admin/systems/glpi_devices.tpl:52
+msgid "Integrated speakers"
+msgstr "Geintegreerde luidsprekers"
 
-#: plugins/admin/systems/printer.tpl:9
-msgid "Printer name"
-msgstr "Printernaam"
+#: plugins/admin/systems/glpi_devices.tpl:60
+msgid "Sub-D"
+msgstr "Sub-D"
 
-#: plugins/admin/systems/printer.tpl:31
-msgid "Details"
-msgstr "Details"
+#: plugins/admin/systems/glpi_devices.tpl:68
+msgid "BNC"
+msgstr "BNC"
 
-#: plugins/admin/systems/printer.tpl:34
-msgid "Printer location"
-msgstr "Printer locatie"
+#: plugins/admin/systems/glpi_devices.tpl:76
+msgid "Serial number"
+msgstr "Serienummer"
 
-#: plugins/admin/systems/printer.tpl:38
-msgid "Printer URL"
-msgstr "Printer URL"
+#: plugins/admin/systems/glpi_devices.tpl:83
+msgid "Additional serial number"
+msgstr "Extra serienummer"
 
-#: plugins/admin/systems/printer.tpl:58
-msgid "Permissions"
-msgstr "Rechten"
+#: plugins/admin/systems/glpi_devices.tpl:97
+#, fuzzy
+msgid "Add/Edit other device"
+msgstr "Geluidskaart"
 
-#: plugins/admin/systems/printer.tpl:65
-msgid "Users which are allowed to use this printer"
-msgstr "Gebruikers die deze printer mogen gebruiken"
+#: plugins/admin/systems/glpi_devices.tpl:138
+#, fuzzy
+msgid "Add/Edit power supply"
+msgstr "Nieuwe voeding"
 
-#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
-msgid "Add user"
-msgstr "Gebruiker toevoegen"
+#: plugins/admin/systems/glpi_devices.tpl:173
+msgid "Atx"
+msgstr "ATX"
 
-#: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
-msgid "Add group"
-msgstr "Groep toevoegen"
+#: plugins/admin/systems/glpi_devices.tpl:181
+msgid "Power"
+msgstr "Voeding"
 
-#: plugins/admin/systems/printer.tpl:81
-msgid "Users which are allowed to administrate this printer"
-msgstr "Gebruikers die deze printer mogen beheren"
+#: plugins/admin/systems/glpi_devices.tpl:193
+#, fuzzy
+msgid "Add/Edit graphic card"
+msgstr "Nieuwe grafische kaart"
 
-#: plugins/admin/systems/printer.tpl:82
-msgid "Admins"
-msgstr "Beheerders"
+#: plugins/admin/systems/glpi_devices.tpl:228
+#: plugins/admin/systems/glpi_devices.tpl:284
+#: plugins/admin/systems/glpi_devices.tpl:349
+msgid "Interface"
+msgstr "Interface"
 
-#: plugins/admin/systems/class_servDNS.inc:181
-#: plugins/admin/systems/class_inventory.inc:36
-msgid "Remove DNS service"
-msgstr "Verwijder DNS service"
+#: plugins/admin/systems/glpi_devices.tpl:237
+msgid "Ram"
+msgstr "RAM"
 
-#: plugins/admin/systems/class_servDNS.inc:182
-#: plugins/admin/systems/class_inventory.inc:37
-msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
+#: plugins/admin/systems/glpi_devices.tpl:249
+#, fuzzy
+msgid "Add/Edit controller"
+msgstr "Nieuwe controller"
+
+#: plugins/admin/systems/glpi_devices.tpl:307
+msgid "Add/Edit drive"
 msgstr ""
-"Deze server heeft DNS mogelijkheden ingeschakeld. U kunt deze uitschakelen "
-"door de knop hieronder te gebruiken."
 
-#: plugins/admin/systems/class_servDNS.inc:184
-#: plugins/admin/systems/class_inventory.inc:39
-msgid "Add DNS service"
-msgstr "Voeg DNS service toe"
+#: plugins/admin/systems/glpi_devices.tpl:342
+msgid "Speed"
+msgstr "Snelheid"
 
-#: plugins/admin/systems/class_servDNS.inc:185
-#: plugins/admin/systems/class_inventory.inc:40
-msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
-msgstr ""
-"Deze server heeft DNS mogelijkheden uitgeschakeld. U kunt deze inschakelen "
-"door de knop hieronder te gebruiken."
+#: plugins/admin/systems/glpi_devices.tpl:358
+msgid "Writeable"
+msgstr "Schrijfbaar"
 
-#: plugins/admin/systems/class_servDNS.inc:270
-#, php-format
-msgid ""
-"Can't delete the selected zone, because it is still in use by these entry/"
-"entries '%s'"
-msgstr ""
-"Kan de geselecteerde zone niet verwijderen, aangezien deze nog gebruikt "
-"wordt door de volgende regel(s) '%s'"
+#: plugins/admin/systems/glpi_devices.tpl:371
+#, fuzzy
+msgid "Add/Edit harddisk"
+msgstr "Nieuwe hardeschijf"
 
-#: plugins/admin/systems/class_servDNS.inc:297
-msgid "Reverse zone"
-msgstr "Reverse zone"
+#: plugins/admin/systems/glpi_devices.tpl:406
+msgid "Rpm"
+msgstr "RPM"
 
-#: plugins/admin/systems/class_servDB.inc:135
-#: plugins/admin/systems/class_servDB.inc:144
-#: plugins/admin/systems/class_servDB.inc:161
-#: plugins/admin/systems/class_servDB.inc:171
-#: plugins/admin/systems/class_servDB.inc:176
-#: plugins/admin/systems/class_servDB.inc:182
-#, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
-msgstr "Het atribuut '%s' is leeg of bevat ongeldige karakters!"
+#: plugins/admin/systems/glpi_devices.tpl:413
+msgid "Cache"
+msgstr "Cache"
 
-#: plugins/admin/systems/class_servDB.inc:151
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
-msgstr "De imap verbindings string dient in eruit te zien als '%s'."
+#: plugins/admin/systems/glpi_devices.tpl:443
+#, fuzzy
+msgid "Add/Edit memory"
+msgstr "Invoer bewerken"
 
-#: plugins/admin/systems/class_servDB.inc:155
-msgid "The sieve port needs to be numeric."
-msgstr "De sieve poort dient nummeriek te zijn."
+#: plugins/admin/systems/glpi_devices.tpl:478
+msgid "Frequenz"
+msgstr "Frequentie"
 
-#: plugins/admin/systems/class_servDB.inc:166
-#, php-format
-msgid "The specified kerberos password is empty."
-msgstr "Het opgegeven kerberos wachtwoord is leeg."
+#: plugins/admin/systems/glpi_devices.tpl:507
+#, fuzzy
+msgid "Add/Edit sound card"
+msgstr "Nieuwe geluidskaart"
 
-#: plugins/admin/systems/class_servDB.inc:190
-#, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
-msgstr "De imap naam dient een hostnaam of een IP adres te zijn."
+#: plugins/admin/systems/glpi_devices.tpl:553
+#, fuzzy
+msgid "Add/Edit network interface"
+msgstr "Nieuwe netwerk aansluiting"
 
-#: plugins/admin/systems/servdns.tpl:1
-msgid "Zones"
-msgstr "Zones"
+#: plugins/admin/systems/glpi_devices.tpl:589
+msgid "MAC address"
+msgstr "Hardware adres (MAC)"
 
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
-msgstr "Werkstation sjabloon"
+#: plugins/admin/systems/glpi_devices.tpl:607
+#, fuzzy
+msgid "Add/Edit processor"
+msgstr "Nieuwe processor"
 
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
-msgstr "Werkstation naam"
+#: plugins/admin/systems/glpi_devices.tpl:642
+msgid "Frequence"
+msgstr "Frequentie"
 
-#: plugins/admin/systems/class_servNfs.inc:35
-msgid ""
-"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
-msgstr ""
-"Het bestand '/etc/gosa/encodings' bestaat niet. Kan de ondersteunde "
-"karaktersets niet ophalen."
+#: plugins/admin/systems/glpi_devices.tpl:649
+msgid "Default frequence"
+msgstr "Standaard frequentie"
 
-#: plugins/admin/systems/class_servNfs.inc:38
-msgid "Can't read '/etc/gosa/encodings', please check permissions."
-msgstr ""
-"Kan bestand '/etc/gosa/encodings' niet openen. Controlleer de "
-"bestandspermissies a.u.b."
+#: plugins/admin/systems/glpi_devices.tpl:661
+#, fuzzy
+msgid "Add/Edit motherboard"
+msgstr "Moederbord"
 
-#: plugins/admin/systems/class_servNfs.inc:125
-msgid "Please specify a valid path for your setup."
-msgstr "Geef a.u.b. een geldig pad op voor uw instellingen."
+#: plugins/admin/systems/glpi_devices.tpl:696
+msgid "Chipset"
+msgstr "Chipset"
 
-#: plugins/admin/systems/class_servNfs.inc:131
-msgid "Please specify a valid name for your setup."
-msgstr "Geef a.u.b. een geldige naam op voor uw instellingen."
+#: plugins/admin/systems/glpi_devices.tpl:707
+#, fuzzy
+msgid "Add/Edit computer case"
+msgstr "Computer behuizing"
 
-#: plugins/admin/systems/class_servNfs.inc:134
-msgid "Please specify a name for your setup."
-msgstr "Geef a.u.b. een naam op voor uw instellingen."
+#: plugins/admin/systems/glpi_devices.tpl:742
+msgid "format"
+msgstr "formaat"
 
-#: plugins/admin/systems/class_servNfs.inc:139
-msgid "Description contains invalid characters."
-msgstr "De omschrijving bevat ongeldige karakters."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
+#, php-format
+msgid "Internal Error can't create device of type '%s'"
+msgstr "Interne fout. Kan apparaat van het type '%s' niet aanmaken."
 
-#: plugins/admin/systems/class_servNfs.inc:143
-msgid "Path contains invalid characters."
-msgstr "Het pad bevat ongeldige karakters."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
+#, php-format
+msgid "You're about to delete the glpi device '%s'."
+msgstr "U staat op het punt het GLPI apparaat '%s' te verwijderen."
 
-#: plugins/admin/systems/class_servNfs.inc:147
-msgid "Option contains invalid characters."
-msgstr "De optie bevat ongeldige karakters."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
+msgid "Can't detect object name."
+msgstr "Kan de objectnaam niet detecteren"
 
-#: plugins/admin/systems/servdb.tpl:6
-msgid "Kerberos kadmin access"
-msgstr "Kerberos kadmin toegang"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
+#, php-format
+msgid ""
+"You can't delete this device, it is still in use by these system(s) '%s'"
+msgstr ""
+"U kunt dit apparaat niet verwijderen, aangezien deze nog steeds gebruikt "
+"wordt door deze systemen: '%s'"
 
-#: plugins/admin/systems/servdb.tpl:10
-msgid "Kerberos Realm"
-msgstr "Kerberos Realm"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
+msgid "devices"
+msgstr "apparaten"
 
-#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
-msgid "Admin user"
-msgstr "Beheerder"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
+msgid "New mainbord"
+msgstr "Nieuw moederbord"
 
-#: plugins/admin/systems/servdb.tpl:26
-msgid "FAX database"
-msgstr "FAX database"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
+msgid "New processor"
+msgstr "Nieuwe processor"
 
-#: plugins/admin/systems/servdb.tpl:30
-msgid "FAX DB user"
-msgstr "FAX DB gebruiker"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+msgid "New case"
+msgstr "Nieuwe behuizing"
 
-#: plugins/admin/systems/servdb.tpl:42
-msgid "Asterisk management"
-msgstr "Asterisk beheer"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+msgid "C"
+msgstr "C"
 
-#: plugins/admin/systems/servdb.tpl:46
-msgid "Asterisk DB user"
-msgstr "Asterisk DB gebruiker"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+msgid "New network interface"
+msgstr "Nieuwe netwerk aansluiting"
 
-#: plugins/admin/systems/servdb.tpl:54
-msgid "Country dial prefix"
-msgstr "Internationale telefoon prefix"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+msgid "NI"
+msgstr "NI"
 
-#: plugins/admin/systems/servdb.tpl:58
-msgid "Local dial prefix"
-msgstr "Lokale telefoon prefix"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+msgid "New ram"
+msgstr "Nieuw geheugen"
 
-#: plugins/admin/systems/servdb.tpl:70
-msgid "IMAP admin access"
-msgstr "IMAP beheerder toegang"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+msgid "R"
+msgstr "R"
 
-#: plugins/admin/systems/servdb.tpl:74
-msgid "Server identifier"
-msgstr "Server identificatie"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+msgid "New hard disk"
+msgstr "Nieuwe hardeschijf"
 
-#: plugins/admin/systems/servdb.tpl:78
-msgid "Connect URL"
-msgstr "Verbindingings URL"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+msgid "HDD"
+msgstr "HDD"
 
-#: plugins/admin/systems/servdb.tpl:91
-msgid "Sieve port"
-msgstr "Sieve poort"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+msgid "New drive"
+msgstr "Nieuwe schijf"
 
-#: plugins/admin/systems/servdb.tpl:100
-msgid "Logging database"
-msgstr "Log database"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+msgid "D"
+msgstr "D"
 
-#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
-msgid "Logging DB user"
-msgstr "Log DB gebruiker"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+msgid "New controller"
+msgstr "Nieuwe controller"
 
-#: plugins/admin/systems/servdb.tpl:119
-msgid "Glpi database"
-msgstr "Glpi database"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+msgid "CS"
+msgstr "CS"
 
-#: plugins/admin/systems/servdb.tpl:133
-msgid "Database"
-msgstr "Database"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "New graphics card"
+msgstr "Nieuwe grafische kaart"
 
-#: plugins/admin/systems/servnfs.tpl:1
-msgid "Edit share"
-msgstr "Bewerk share"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "GC"
+msgstr "GC"
 
-#: plugins/admin/systems/servnfs.tpl:2
-msgid "NFS setup"
-msgstr "NFS instellingen"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+msgid "New sound card"
+msgstr "Nieuwe geluidskaart"
 
-#: plugins/admin/systems/servnfs.tpl:25
-msgid "Path"
-msgstr "Pad"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+msgid "SC"
+msgstr "SC"
 
-#: plugins/admin/systems/servnfs.tpl:49
-msgid "Codepage"
-msgstr "Karakterset"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "New power supply"
+msgstr "Nieuwe voeding"
 
-#: plugins/admin/systems/servnfs.tpl:59
-msgid "Option"
-msgstr "Optie"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "PS"
+msgstr "PS"
 
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid "Remove Kolab extension"
-msgstr "Verwijder Kolab mogelijkheden"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+msgid "New misc device"
+msgstr "Nieuw overig apparaat"
 
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid ""
-"This server has kolab features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Deze server heeft Kolab mogelijkheden ingeschakeld. U kunt deze uitschakelen "
-"door de knop hieronder te gebruiken."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+msgid "OC"
+msgstr "OC"
 
-#: plugins/admin/systems/class_servKolab.inc:118
-msgid "Add Kolab service"
-msgstr "Voeg Kolab service toe"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:346
+msgid "You have to specify a valid name for this device."
+msgstr "Geef a.u.b. een geldige naam op voor dit apparaat."
 
-#: plugins/admin/systems/class_servKolab.inc:118
-msgid ""
-"This server has kolab features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Deze server heeft Kolab mogelijkheden uitgeschakeld. U kunt deze inschakelen "
-"door de knop hieronder te gebruiken."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:366
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:369
+msgid "This device name is already in use."
+msgstr "De opgegeven apparaat naam wordt al gebruikt."
 
-#: plugins/admin/systems/class_servKolab.inc:146
-#, php-format
-msgid "Include data from %s days in the past when creating free/busy lists"
-msgstr ""
-"Gebruik data van %s dagen geleden wanneer free/busy lijsten worden aangemaakt"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
+msgid "Other"
+msgstr "Overige"
 
-#: plugins/admin/systems/class_servKolab.inc:152
-#, php-format
-msgid "Warn users when using more than %s%% of their mail quota"
-msgstr ""
-"Waarschuw gebruikers wanneer meer dan %s%% van hun E-mail quota gebruikt "
-"wordt"
+#: plugins/admin/systems/class_servService.inc:272
+msgid "Terminal server, must have fontpath specified."
+msgstr "Terminal server moet een fontpath hebben."
 
-#: plugins/admin/systems/class_servKolab.inc:227
-msgid "Future days in Free/Busy settings must be set."
-msgstr "Toekomstige dagen moet ingesteld zijn in de Free/Busy instellingen."
+#: plugins/admin/systems/servRepositorySetup.tpl:15
+msgid "Parent server"
+msgstr "Hoofd/Parent server"
 
-#: plugins/admin/systems/class_servKolab.inc:229
-msgid "Future days in Free/Busy settings must be a positive value."
-msgstr ""
-"Toekomstige dagen moet een positieve waarde bevatten in de Free/Busy "
-"instellingen."
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
+msgstr "Tijd Service"
 
-#: plugins/admin/systems/class_servKolab.inc:233
-msgid "The given Quota settings value must be a number."
-msgstr "De opgegeven Quota instellingen moeten nummeriek zijn."
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
+msgstr "LDAP Service"
 
-#: plugins/admin/systems/class_servKolab.inc:235
-msgid "Please choose a value between 1 and 100 for Quota settings."
-msgstr "Kies a.u.b. een waarde tussen 1 en 100 voor de Quota instellingen."
+#: plugins/admin/systems/servservice.tpl:72
+msgid "Terminal Service"
+msgstr "Terminal Service"
 
-#: plugins/admin/systems/class_servKolab.inc:237
-msgid "Future days must be a value."
-msgstr "Toekomstige dagen moet een waarde bevatten."
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
+msgstr "Schakel inlog mogelijkheid tijdelijk uit"
 
-#: plugins/admin/systems/class_servKolab.inc:241
-msgid "No SMTP privileged networks set."
-msgstr "Er zijn geen netwerken met SMTP privileges ingesteld"
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
+msgstr "Fontpad"
 
-#: plugins/admin/systems/class_printGeneric.inc:177
-#: plugins/admin/systems/class_printGeneric.inc:184
-#: plugins/admin/systems/class_printGeneric.inc:219
-#: plugins/admin/systems/class_printGeneric.inc:240
-#: plugins/admin/systems/class_printGeneric.inc:243
-msgid "Add printer extension"
-msgstr "Voeg printer extensie toe"
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
+msgstr "Syslog Service"
 
-#: plugins/admin/systems/class_printGeneric.inc:178
-msgid "This is a workstation template, printer tab is disabled."
-msgstr "Dit is een werkstationsjabloon. Het printer tabblad is uitgeschakeld."
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
+msgstr "Print Service"
 
-#: plugins/admin/systems/class_printGeneric.inc:185
-msgid "This is a terminal template, printer tab is disabled."
-msgstr "Dit is een terminalsjabloon. Het printer tabblad is uitgeschakeld."
+#: plugins/admin/systems/servservice.tpl:109
+msgid "Mail server"
+msgstr "Mail server"
 
-#: plugins/admin/systems/class_printGeneric.inc:220
-msgid ""
-"This workstation has printer extension disabled. You can't enable it while "
-"'cn' is not present in entry. Possibly you are currently creating a new "
-"terminal template"
+#: plugins/admin/systems/glpi_edit_os.tpl:1
+msgid "Manage OS-types"
 msgstr ""
-"Dit werkstation heeft printer mogelijkheden uitgeschakeld. U kunt deze niet "
-"inschakelen zolang 'cn' niet aanwezig is in de invoer. Het kan mogelijk zijn "
-"dat u een nieuwe terminal sjabloon aan het maken bent."
 
-#: plugins/admin/systems/class_printGeneric.inc:232
-#: plugins/admin/systems/class_printGeneric.inc:235
-msgid "Remove printer extension"
-msgstr "Verwijder printer mogelijkheden"
+#: plugins/admin/systems/printerPPDDialog.tpl:1
+msgid "Printer driver"
+msgstr "Printer stuurprogramma"
 
-#: plugins/admin/systems/class_printGeneric.inc:233
-msgid ""
-"This workstation has printer extension enabled.You can disable it by "
-"clicking below."
-msgstr ""
-"Dit werkstation heeft printer mogelijkheden ingeschakeld. U kunt deze "
-"uitschakelen door de knop hieronder te gebruiken."
+#: plugins/admin/systems/printerPPDDialog.tpl:9
+msgid "New driver"
+msgstr "Nieuw stuurprogramma"
 
-#: plugins/admin/systems/class_printGeneric.inc:236
-msgid ""
-"This terminal has printer extension enabled. You can disable it by clicking "
-"below."
-msgstr ""
-"Deze terminal heeft printer mogelijkheden ingeschakeld. U kunt deze "
-"uitschakelen door de knop hieronder te gebruiken."
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
+msgstr "Telefoonnaam"
 
-#: plugins/admin/systems/class_printGeneric.inc:241
-msgid ""
-"This workstation has printer extension disabled. You can enable it by "
-"clicking below."
-msgstr ""
-"Dit werkstation heeft printer mogelijkheden uitgeschakeld. U kunt deze "
-"inschakelen door de knop hieronder te gebruiken."
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
+msgid "List of available cartridge type for this type of printer"
+msgstr "Lijst met beschikbare cartridges voor dit type printer"
 
-#: plugins/admin/systems/class_printGeneric.inc:244
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
 msgid ""
-"This terminal has printer extension disabled. You can enable it by clicking "
-"below."
+"This dialog allows you to create new types of cartridges, and select one or "
+"more types for your printer. Cartridge types depends on the printer type you "
+"have selected. For each selected cartridge type there will be a new "
+"cartridge created, this allows you to select the same cartridge type for "
+"more then one printer."
 msgstr ""
-"Deze terminal heeft printer mogelijkheden uitgeschakeld. U kunt deze "
-"inschakelen door de knop hieronder te gebruiken."
-
-#: plugins/admin/systems/class_printGeneric.inc:283
-msgid "This 'dn' has no printer features."
-msgstr "Deze 'dn' heeft geen printer mogelijkheden."
+"Deze dialoog maakt het mogelijk om nieuwe cartridgetypes aan te maken en één "
+"of meer types te selecteren voor uw printer. De cartridgetypes zijn "
+"afhankelijk van de door u geselecteerde printer. Voor elk geselecteerde "
+"cartridgetype zal een nieuwe cartridge aangemaakt worden. Dit maakt het "
+"mogelijk om hetzelfde cartridgetype voor meerdere printers te selecteren."
 
-#: plugins/admin/systems/class_printGeneric.inc:419
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr "Uw huidig geselecteerde PPD bestand '%s' bestaat niet."
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
+msgid "Display cartridge types matching"
+msgstr "Toon de overeenkomende cartridgetypes"
 
-#: plugins/admin/systems/class_printGeneric.inc:427
-msgid "can't get ppd informations."
-msgstr "kan de PPD informatie niet ophalen"
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
+msgid "Regular expression for matching cartridge types"
+msgstr "Reguliere expresie voor overeenkomende cartridgetypes"
 
-#: plugins/admin/systems/class_printGeneric.inc:439
-#, php-format
-msgid "This printer belongs to terminal %s. You can't rename this printer."
-msgstr ""
-"Deze printer behoort bij terminal %s. U kunt deze printer niet hernoemen."
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
+msgid "Reference"
+msgstr "Referentie"
 
-#: plugins/admin/systems/class_printGeneric.inc:441
-#, php-format
-msgid "This printer belongs to workstation %s. You can't rename this printer."
-msgstr ""
-"Deze printer behoort bij werkstation %s. U kunt deze printer niet hernoemen."
+#: plugins/admin/systems/class_terminalGeneric.inc:61
+msgid "text"
+msgstr "tekst"
 
-#: plugins/admin/systems/class_printGeneric.inc:519
-msgid "You have no permissions to create a printer on this 'Base'."
-msgstr ""
-"U heeft geen toestemming om een printer aan te maken onder deze 'Basis'."
+#: plugins/admin/systems/class_terminalGeneric.inc:62
+msgid "graphic"
+msgstr "grafisch"
 
-#: plugins/admin/systems/servkolab.tpl:14
-msgid "POP3 service"
-msgstr "POP3 service"
+#: plugins/admin/systems/class_terminalGeneric.inc:90
+#: plugins/admin/systems/class_servGeneric.inc:62
+#: plugins/admin/ogroups/class_termgroup.inc:64
+msgid "No WAKECMD definition found in your gosa.conf"
+msgstr "Er is geen 'WAKECMD' gedefiniëerd in uw gosa.conf"
 
-#: plugins/admin/systems/servkolab.tpl:22
-msgid "POP3/SSL service"
-msgstr "POP3/SSL service"
+#: plugins/admin/systems/class_terminalGeneric.inc:102
+#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/ogroups/class_termgroup.inc:76
+msgid "No REBOOTCMD definition found in your gosa.conf"
+msgstr "Er is geen 'REBOOTCMD' in uw gosa.conf gedefiniëerd"
 
-#: plugins/admin/systems/servkolab.tpl:30
-msgid "IMAP service"
-msgstr "IMAP Service"
+#: plugins/admin/systems/class_terminalGeneric.inc:114
+#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/ogroups/class_termgroup.inc:88
+msgid "No HALTCMD definition found in your gosa.conf"
+msgstr "Er is geen 'HALTCMD' in uw gosa.conf gedefiniëerd"
 
-#: plugins/admin/systems/servkolab.tpl:38
-msgid "IMAP/SSL service"
-msgstr "IMAP/SSL service"
+#: plugins/admin/systems/class_terminalGeneric.inc:269
+msgid "You have no permissions to create a terminal on this 'Base'."
+msgstr ""
+"U heeft geen toestemming om een nieuwe terminal aan te maken onder deze "
+"'basis'"
 
-#: plugins/admin/systems/servkolab.tpl:46
-msgid "Sieve service"
-msgstr "Sieve service"
+#: plugins/admin/systems/class_terminalGeneric.inc:273
+msgid "The required field 'Terminal name' is not set."
+msgstr "Het vereiste veld 'Terminal naam' is leeg."
 
-#: plugins/admin/systems/servkolab.tpl:54
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+#: plugins/admin/systems/remove_glpi.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your MySql database in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
 msgstr ""
-"FTP Free/Busy service (vervallen, niet compatibel met Kolab2 Free/Busy)"
-
-#: plugins/admin/systems/servkolab.tpl:62
-msgid "HTTP FreeBusy service (legacy)"
-msgstr "HTTP Free/Busy service (vervallen)"
+"Het is aan te raden de huidige inhoud van uw MySQL database op te slaan "
+"alvorens u doorgaat. Indien u dat gedaan heeft drukt u op 'Verwijderen' om "
+"door te gaan of op 'Annuleren' om te annuleren."
 
-#: plugins/admin/systems/servkolab.tpl:70
-msgid "Amavis email scanning (virus/spam)"
-msgstr "Amavis email scannen (virus/anti-spam)"
+#: plugins/admin/systems/class_servGeneric.inc:52
+msgid "This 'dn' has no server features."
+msgstr "Deze 'dn' heeft geen server mogelijkheden."
 
-#: plugins/admin/systems/servkolab.tpl:81
-msgid "Quota settings"
-msgstr "Quota instellingen"
+#: plugins/admin/systems/class_servGeneric.inc:191
+msgid "The required field 'Server name' is not set."
+msgstr "Het vereiste veld 'Servernaam' is leeg."
 
-#: plugins/admin/systems/servkolab.tpl:97
-msgid "Free/Busy settings"
-msgstr "Free/Busy instellingen"
+#: plugins/admin/systems/class_servGeneric.inc:198
+msgid "You have no permissions to create a server on this 'Base'."
+msgstr ""
+"U heeft geen toestemming om een server aan te maken onder deze 'Basis'."
 
-#: plugins/admin/systems/servkolab.tpl:102
-msgid "Allow unauthenticated downloading of Free/Busy information"
-msgstr "Sta ongeauthoriseerd downloaden van Free/Busy informatie toe"
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
+#, fuzzy
+msgid "Add/Edit manufacturer"
+msgstr "Invoer bewerken"
 
-#: plugins/admin/systems/servkolab.tpl:117
-msgid "SMTP privileged networks"
-msgstr "SMTP toegestane netwerken"
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
+msgid "Website"
+msgstr "Website"
 
-#: plugins/admin/systems/servkolab.tpl:122
-msgid "Hosts/networks allowed to relay"
-msgstr "Hosts/netwerken die E-mail mogen ralayen"
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
+#: plugins/admin/ogroups/class_mailogroup.inc:137
+#: plugins/admin/ogroups/class_phonequeue.inc:690
+#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Phone number"
+msgstr "Telefoonnummer"
 
-#: plugins/admin/systems/servkolab.tpl:125
-msgid "Enter multiple values, seperated with"
-msgstr "Voor meerdere waardes in, gescheiden door"
+#: plugins/admin/systems/class_servDHCP.inc:36
+msgid "Remove DHCP service"
+msgstr "Verwijder DHCP service"
 
-#: plugins/admin/systems/servkolab.tpl:138
-msgid "SMTP smarthost/relayhost"
-msgstr "SMTP smarthost/relayhost"
+#: plugins/admin/systems/class_servDHCP.inc:37
+msgid ""
+"This server has DHCP features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Deze server heeft DHCP mogelijkheden ingeschakeld. U kunt deze uitschakelen "
+"door de knop hieronder te gebruiken."
 
-#: plugins/admin/systems/servkolab.tpl:144
-msgid "Enable MX lookup for relayhost"
-msgstr "Sta MX record opzoeken voor relayhost toe"
+#: plugins/admin/systems/class_servDHCP.inc:39
+msgid "Add DHCP service"
+msgstr "Voeg DHCP service toe"
 
-#: plugins/admin/systems/servkolab.tpl:149
-msgid "Host used to relay mails"
-msgstr "Host die gebruikt wordt om E-mails te relayen"
+#: plugins/admin/systems/class_servDHCP.inc:40
+msgid ""
+"This server has DHCP features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Deze server heeft DHCP mogelijkheden uitgeschakeld. U kunt deze inschakelen "
+"door de knop hieronder te gebruiken."
 
-#: plugins/admin/systems/servkolab.tpl:163
-msgid "Accept Internet Mail"
-msgstr "Accepteer Internet E-mail"
+#: plugins/admin/systems/class_systemManagement.inc:32
+msgid "Systems"
+msgstr "Systemen"
 
-#: plugins/admin/systems/servkolab.tpl:169
-msgid "Accept mail from other domains over non-authenticated SMTP"
-msgstr "Accepteer E-mail van andere domeinen over niet geauthenticeerde SMTP"
+#: plugins/admin/systems/class_systemManagement.inc:429
+msgid "You can't edit this object type yet!"
+msgstr "U kunt dit object type nog niet bewerken!"
 
-#: plugins/admin/systems/phonesettings.tpl:1
-msgid "Advanced phone settings"
-msgstr "Geavanceerde telefoon instellingen"
+#: plugins/admin/systems/class_systemManagement.inc:455
+msgid "Passwords entered as new and repeated do not match!"
+msgstr ""
+"Het nieuwe wachtwoord en het herhaalde wachtwoord komen niet met elkaar "
+"overeen!"
 
-#: plugins/admin/systems/phonesettings.tpl:6
-msgid "Phone type"
-msgstr "Telefoontype"
+#: plugins/admin/systems/class_systemManagement.inc:472
+msgid "You are not allowed to set this systems password!"
+msgstr ""
+"U heeft geen toestemming om het wachtwoord van dit systeem in te stellen!"
 
-#: plugins/admin/systems/phonesettings.tpl:7
-#: plugins/admin/systems/phonesettings.tpl:25
-#: plugins/admin/systems/phonesettings.tpl:35
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:78
-#: plugins/admin/systems/phonesettings.tpl:109
-#: plugins/admin/systems/phonesettings.tpl:156
-msgid "Choose a phone type"
-msgstr "Kies een telefoontype"
+#: plugins/admin/systems/class_systemManagement.inc:526
+#, php-format
+msgid "You're about to delete all information about the component at '%s'."
+msgstr ""
+"U staat op het punt alle informatie over dit component op '%s' te "
+"verwijderen."
 
-#: plugins/admin/systems/phonesettings.tpl:10
-msgid "refresh"
-msgstr "ververs"
+#: plugins/admin/systems/class_systemManagement.inc:761
+msgid "New Terminal template"
+msgstr "Nieuw terminal sjabloon"
 
-#: plugins/admin/systems/phonesettings.tpl:32
-msgid "DTMF mode"
-msgstr "DTMF modus"
+#: plugins/admin/systems/class_systemManagement.inc:761
+#: plugins/admin/systems/class_systemManagement.inc:925
+msgid "New Terminal"
+msgstr "Nieuwe terminal"
 
-#: plugins/admin/systems/phonesettings.tpl:46
-#: plugins/admin/systems/phonesettings.tpl:85
-msgid "Default IP"
-msgstr "Standaard IP"
+#: plugins/admin/systems/class_systemManagement.inc:763
+msgid "New Workstation template"
+msgstr "Nieuw werkstation sjabloon"
 
-#: plugins/admin/systems/phonesettings.tpl:56
-#: plugins/admin/systems/phonesettings.tpl:93
-msgid "Response timeout"
-msgstr "Reageer timeout"
+#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/systems/class_systemManagement.inc:926
+msgid "New Workstation"
+msgstr "Nieuw werkstation"
 
-#: plugins/admin/systems/phonesettings.tpl:75
-msgid "Modus"
-msgstr "Modus"
+#: plugins/admin/systems/class_systemManagement.inc:764
+#: plugins/admin/systems/class_systemManagement.inc:765
+msgid "New Server"
+msgstr "Nieuwe server"
 
-#: plugins/admin/systems/phonesettings.tpl:106
-msgid "Authtype"
-msgstr "Authorisatietype"
+#: plugins/admin/systems/class_systemManagement.inc:766
+#: plugins/admin/systems/class_systemManagement.inc:767
+msgid "New Printer"
+msgstr "Nieuwe printer"
 
-#: plugins/admin/systems/phonesettings.tpl:116
-msgid "Secret"
-msgstr "Wachtwoord"
+#: plugins/admin/systems/class_systemManagement.inc:768
+#: plugins/admin/systems/class_systemManagement.inc:769
+msgid "New Phone"
+msgstr "Nieuwe telefoon"
 
-#: plugins/admin/systems/phonesettings.tpl:124
-msgid "GoFonInkeys"
-msgstr "GOFonInKeys"
+#: plugins/admin/systems/class_systemManagement.inc:770
+#: plugins/admin/systems/class_systemManagement.inc:771
+msgid "New Component"
+msgstr "Nieuw component"
 
-#: plugins/admin/systems/phonesettings.tpl:132
-msgid "GoFonOutKeys"
-msgstr "GoFonOutKeys"
+#: plugins/admin/systems/class_systemManagement.inc:781
+msgid "Edit system"
+msgstr "Bewerk systeem"
 
-#: plugins/admin/systems/phonesettings.tpl:145
-msgid "Account code"
-msgstr "Account code"
+#: plugins/admin/systems/class_systemManagement.inc:782
+msgid "Delete system"
+msgstr "Verwijder systeem"
 
-#: plugins/admin/systems/phonesettings.tpl:153
-msgid "Trunk lines"
-msgstr "Trunk lijnen"
+#: plugins/admin/systems/class_systemManagement.inc:792
+msgid "System"
+msgstr "Systeem"
 
-#: plugins/admin/systems/phonesettings.tpl:168
-msgid "Hosts that are allowed to connect"
-msgstr "Hosts die mogen verbinden"
+#: plugins/admin/systems/class_systemManagement.inc:830
+msgid "Cups Server"
+msgstr "Cups server"
 
-#: plugins/admin/systems/phonesettings.tpl:183
-msgid "Hosts that are not allowed to connect"
-msgstr "Hosts die niet mogen verbinden"
+#: plugins/admin/systems/class_systemManagement.inc:831
+msgid "Log Db"
+msgstr "Log DB"
 
-#: plugins/admin/systems/phonesettings.tpl:205
-msgid "MSN"
-msgstr "MSN"
+#: plugins/admin/systems/class_systemManagement.inc:832
+msgid "Syslog Server"
+msgstr "Syslog server"
 
-#: plugins/admin/systems/wingeneric.tpl:6
-msgid "Machine name"
-msgstr "Machinenaam"
+#: plugins/admin/systems/class_systemManagement.inc:833
+msgid "Mail Server"
+msgstr "Mail server"
 
-#: plugins/admin/systems/terminalService.tpl:141
-msgid "Remote desktop"
-msgstr "Remote desktop"
+#: plugins/admin/systems/class_systemManagement.inc:834
+msgid "Imap Server"
+msgstr "Imap server"
 
-#: plugins/admin/systems/terminalService.tpl:145
-msgid "Connect method"
-msgstr "Verbindings methode"
+#: plugins/admin/systems/class_systemManagement.inc:835
+msgid "Nfs Server"
+msgstr "Nfs server"
 
-#: plugins/admin/systems/terminalService.tpl:147
-msgid "Choose method to connect to terminal server"
-msgstr "Kies de methode om te verbinden met de terminal server"
+#: plugins/admin/systems/class_systemManagement.inc:836
+msgid "Kerberos Server"
+msgstr "Kerberos server"
 
-#: plugins/admin/systems/terminalService.tpl:154
-msgid "Terminal server"
-msgstr "Terminal server"
+#: plugins/admin/systems/class_systemManagement.inc:837
+msgid "Asterisk Server"
+msgstr "Asterisk server"
 
-#: plugins/admin/systems/terminalService.tpl:156
-msgid "Select specific terminal server to use"
-msgstr "Selecteer de te gebruiken terminal server"
+#: plugins/admin/systems/class_systemManagement.inc:838
+msgid "Fax Server"
+msgstr "Fax server"
 
-#: plugins/admin/systems/terminalService.tpl:163
-msgid "Font server"
-msgstr "Font server"
+#: plugins/admin/systems/class_systemManagement.inc:839
+msgid "Ldap Server"
+msgstr "Ldap server"
 
-#: plugins/admin/systems/terminalService.tpl:165
-msgid "Select specific font server to use"
-msgstr "Selecteer de te gebruiken font server"
+#: plugins/admin/systems/class_systemManagement.inc:872
+msgid "Set root password"
+msgstr "root wachtwoord instellen"
 
-#: plugins/admin/systems/terminalService.tpl:181
-msgid "Print device"
-msgstr "Printer"
+#: plugins/admin/systems/class_systemManagement.inc:917
+msgid "New System from incoming"
+msgstr "Nieuw systeem uit inkomende wachtrij"
 
-#: plugins/admin/systems/terminalService.tpl:182
-msgid "Select to start IPP based printing service on terminal"
-msgstr "Selecteer om de IPP gebaseerde print service te starten op de terminal"
+#: plugins/admin/systems/class_systemManagement.inc:919
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:590
+msgid "Terminal"
+msgstr "Terminal"
 
-#: plugins/admin/systems/terminalService.tpl:183
-msgid "Provide print services"
-msgstr "Lever print diensten"
+#: plugins/admin/systems/class_systemManagement.inc:920
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:589
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr "Werkstation"
 
-#: plugins/admin/systems/terminalService.tpl:189
-msgid "Spool server"
-msgstr "Spool server"
+#: plugins/admin/systems/class_systemManagement.inc:923
+msgid "Winstation"
+msgstr "Windows werkstation"
 
-#: plugins/admin/systems/terminalService.tpl:191
-msgid "Select NFS filesystem to place spool files on"
-msgstr "Selecteer NFS bestandssysteem waarop spool bestanden geplaatst worden"
+#: plugins/admin/systems/class_systemManagement.inc:924
+msgid "Network Device"
+msgstr "Netwerk apparaat"
 
-#: plugins/admin/systems/terminalService.tpl:212
-msgid "Select scanner driver to use"
-msgstr "Selecteer de te gebruiken scanner driver"
+#: plugins/admin/systems/class_systemManagement.inc:1147
+msgid "New terminal"
+msgstr "Nieuwe terminal"
 
-#: plugins/admin/systems/remove.tpl:6
-msgid ""
-"This includes <b>all</b> system and setup informations. Please double check "
-"if your really want to do this since there is no way for GOsa to get your "
-"data back."
-msgstr ""
-"Dit omvat <b>alle</b> systeem en configuratie informatie. Verzeker uzelf "
-"hiervan, aangezien er geen manier is voor GOsa om deze gegevens terug te "
-"halen."
+#: plugins/admin/systems/class_systemManagement.inc:1149
+msgid "New workstation"
+msgstr "Nieuw werkstation"
 
-#: plugins/admin/systems/headpage.tpl:6
-msgid "List of systems"
-msgstr "Lijst met systemen"
+#: plugins/admin/systems/class_systemManagement.inc:1151
+msgid "New Device"
+msgstr "Nieuw apparaat"
 
-#: plugins/admin/systems/headpage.tpl:24
-msgid ""
-"This menu allows you to add, remove and change the properties of specific "
-"systems. You can only add systems which have already been started once."
-msgstr ""
-"Dit menu maakt het mogelijk om specifieke systemen toe te voegen, bewerken "
-"en verwijderen. U kunt alleen systemen toevoegen die al eens opgestart "
-"geweest zijn."
+#: plugins/admin/systems/class_systemManagement.inc:1168
+msgid "Terminal template for"
+msgstr "Terminal sjabloon voor"
 
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
-msgstr "Toon servers"
+#: plugins/admin/systems/class_systemManagement.inc:1180
+msgid "Workstation template for"
+msgstr "Werkstation sjabloon voor"
 
-#: plugins/admin/systems/headpage.tpl:39
-msgid "Select to see Linux terminals"
-msgstr "Selecteer om Linux terminals te zien"
+#: plugins/admin/systems/class_servRepositorySetup.inc:117
+msgid "Please enter a value for 'release'."
+msgstr "Geef a.u.b. een waarde voor 'versie' op"
 
-#: plugins/admin/systems/headpage.tpl:39
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
-msgstr "Toon terminals"
+#: plugins/admin/systems/class_servRepositorySetup.inc:121
+msgid "Please specify a valid value for 'url'."
+msgstr "Geef a.u.b. een geldige waarde op voor 'url'."
 
-#: plugins/admin/systems/headpage.tpl:40
-msgid "Select to see Linux workstations"
-msgstr "Selecteer om Linux werkstations te zien"
+#: plugins/admin/systems/printer.tpl:6
+msgid "General"
+msgstr "Algemeen"
 
-#: plugins/admin/systems/headpage.tpl:40
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
-msgstr "Toon werkstations"
+#: plugins/admin/systems/printer.tpl:9
+msgid "Printer name"
+msgstr "Printernaam"
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Select to see MicroSoft Windows based workstations"
-msgstr "Selecteer om Microsoft Windows werkstations te zien"
+#: plugins/admin/systems/printer.tpl:31
+msgid "Details"
+msgstr "Details"
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Show windows based workstations"
-msgstr "Toon Windows werkstations"
+#: plugins/admin/systems/printer.tpl:34
+msgid "Printer location"
+msgstr "Printer locatie"
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Select to see network printers"
-msgstr "Selecteer om netwerk printers te zien"
+#: plugins/admin/systems/printer.tpl:38
+msgid "Printer URL"
+msgstr "Printer URL"
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Show network printers"
-msgstr "Toon netwerk printers"
+#: plugins/admin/systems/printer.tpl:58
+msgid "Permissions"
+msgstr "Rechten"
 
-#: plugins/admin/systems/headpage.tpl:43
-msgid "Select to see VOIP phones"
-msgstr "Selecteer om VOIP telefoons te zien"
+#: plugins/admin/systems/printer.tpl:65
+msgid "Users which are allowed to use this printer"
+msgstr "Gebruikers die deze printer mogen gebruiken"
 
-#: plugins/admin/systems/headpage.tpl:43
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
-msgstr "Toon telefoons"
+#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
+msgid "Add user"
+msgstr "Gebruiker toevoegen"
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Select to see network devices"
-msgstr "Selecteer om netwerk apparaten te zien"
+#: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
+msgid "Add group"
+msgstr "Groep toevoegen"
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Show network devices"
-msgstr "Toon netwerk apparaten"
+#: plugins/admin/systems/printer.tpl:81
+msgid "Users which are allowed to administrate this printer"
+msgstr "Gebruikers die deze printer mogen beheren"
 
-#: plugins/admin/systems/headpage.tpl:52
-msgid "Regular expression for matching system names"
-msgstr "Reguliere expressie voor overeenkomende systeemnamen"
+#: plugins/admin/systems/printer.tpl:82
+msgid "Admins"
+msgstr "Beheerders"
 
-#: plugins/admin/systems/headpage.tpl:59
-msgid "Display systems of user"
-msgstr "Toon systemen van gebruiker"
+#: plugins/admin/systems/class_servDNS.inc:181
+#: plugins/admin/systems/class_inventory.inc:36
+msgid "Remove DNS service"
+msgstr "Verwijder DNS service"
 
-#: plugins/admin/systems/headpage.tpl:62
-msgid "User name of which terminal(s) are shown"
-msgstr "Gebruikersnaam van wie de terminal(s) getoond worden"
+#: plugins/admin/systems/class_servDNS.inc:182
+#: plugins/admin/systems/class_inventory.inc:37
+msgid ""
+"This server has DNS features enabled. You can disable them by clicking below."
+msgstr ""
+"Deze server heeft DNS mogelijkheden ingeschakeld. U kunt deze uitschakelen "
+"door de knop hieronder te gebruiken."
 
-#: plugins/admin/systems/class_componentGeneric.inc:138
-msgid "The required field 'Component name' is not set."
-msgstr "Het vereiste veld 'Component naam' is leeg."
+#: plugins/admin/systems/class_servDNS.inc:184
+#: plugins/admin/systems/class_inventory.inc:39
+msgid "Add DNS service"
+msgstr "Voeg DNS service toe"
 
-#: plugins/admin/systems/terminalStartup.tpl:35
-msgid "Select if terminal supports graphical startup with progress bar"
+#: plugins/admin/systems/class_servDNS.inc:185
+#: plugins/admin/systems/class_inventory.inc:40
+msgid ""
+"This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
-"Selecteer indien de terminal een grafische start met voortgangsstatus "
-"ondersteunt"
+"Deze server heeft DNS mogelijkheden uitgeschakeld. U kunt deze inschakelen "
+"door de knop hieronder te gebruiken."
 
-#: plugins/admin/systems/terminalStartup.tpl:36
-msgid "use graphical bootup"
-msgstr "Gebruik grafische boot"
+#: plugins/admin/systems/class_servDNS.inc:270
+#, php-format
+msgid ""
+"Can't delete the selected zone, because it is still in use by these entry/"
+"entries '%s'"
+msgstr ""
+"Kan de geselecteerde zone niet verwijderen, aangezien deze nog gebruikt "
+"wordt door de volgende regel(s) '%s'"
 
-#: plugins/admin/systems/terminalStartup.tpl:38
-msgid "Select if terminal should boot in text mode"
-msgstr "Selecteer wanneer de terminal op moet starten in tekstmodus"
+#: plugins/admin/systems/class_servDNS.inc:297
+msgid "Reverse zone"
+msgstr "Reverse zone"
 
-#: plugins/admin/systems/terminalStartup.tpl:39
-msgid "use standard linux textual bootup"
-msgstr "Gebruik standaard linux tekstuele boot"
+#: plugins/admin/systems/class_servDNSeditZone.inc:336
+msgid "This zoneName is already in use"
+msgstr "De opgegeven zone-naam wordt al gebruikt."
 
-#: plugins/admin/systems/terminalStartup.tpl:41
-msgid "Select to get more verbose output during startup"
-msgstr "Selecteer om meer uitvoer te produceren tijdens opstarten"
+#: plugins/admin/systems/class_servDNSeditZone.inc:339
+msgid "This reverse zone is already in use"
+msgstr "De opgegeven reverse zone wordt al gebruikt."
 
-#: plugins/admin/systems/terminalStartup.tpl:42
-msgid "use debug mode for startup"
-msgstr "Gebruik debug modus bij boot"
+#: plugins/admin/systems/class_servDNSeditZone.inc:344
+msgid "Primary dns server must end with '.' to be a valid entry."
+msgstr "De primaire DNS server invoer moet eindigen op '.' om geldig te zijn."
 
-#: plugins/admin/systems/password.tpl:2
+#: plugins/admin/systems/class_servDNSeditZone.inc:348
+#, fuzzy
+msgid "Your specified mail address must end with '.' to be a valid record."
+msgstr "Het opgegeven E-mail adres moet eindigen op '.' om geldig te zijn."
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:352
+#: plugins/admin/systems/class_servDNSeditZone.inc:356
 msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you "
-"wouldn't be able to log in."
+"Your mail address contains '@' replace this with '.' to enable GOsa to "
+"create a valid SOA record."
 msgstr ""
-"Gebruik de velden hieronder om het terminal root wachtwoord te veranderen. "
-"De veranderingen worden onmiddelijk doorgevoerd. Onthoud het nieuwe "
-"wachtwoord a.u.b. aangezien u niet in kan loggen zonder dit wachtwoord."
+"Uw E-mail adres bevat '@'. Vervang dit door  '.' om GOsa een geldig SOA "
+"record aan te laten maken."
 
-#: plugins/admin/systems/password.tpl:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr "Laat velden leeg voor wachtwoord overerving vanuit standaard waarden."
+#: plugins/admin/systems/class_servDNSeditZone.inc:360
+msgid "Only lowercase strings are allowed as zone name."
+msgstr "Hoofdletter zijn niet toegestaan voor de zone-naam."
 
-#: plugins/admin/systems/password.tpl:9
-msgid "Changing the password impinges on authentification only."
-msgstr ""
-"Het veranderen van het wachtwoord is alleen van toepassing op authenticatie."
+#: plugins/admin/systems/class_servDNSeditZone.inc:364
+msgid "Please specify a numeric value for serial number."
+msgstr "Geef a.u.b. een nummerieke waarde voor het serienummer op."
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
-msgid "Printer ppd selection."
-msgstr "Printer PPD selectie"
+#: plugins/admin/systems/class_servDNSeditZone.inc:368
+msgid "Please specify a numeric value for refresh."
+msgstr "Geef a.u.b. een nummerieke waarde op voor de verversing."
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:372
+msgid "Please specify a numeric value for ttl."
+msgstr "Geef a.u.b. een nummerieke waarde op voor TTL."
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:376
+msgid "Please specify a numeric value for expire."
+msgstr "Geef a.u.b. een nummerieke waarde op voor verval."
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:380
+msgid "Please specify a numeric value for retry."
+msgstr "Geef a.u.b. een nummerieke waarde op voor opnieuw proberen."
 
-#: plugins/admin/systems/servRepositorySetup.tpl:15
-msgid "Parent server"
-msgstr "Hoofd/Parent server"
+#: plugins/admin/systems/servdb.tpl:6
+msgid "Kerberos kadmin access"
+msgstr "Kerberos kadmin toegang"
 
-#: plugins/admin/systems/servRepositorySetup.tpl:33
-#: plugins/admin/systems/class_servRepository.inc:243
-#: plugins/admin/systems/class_servRepository.inc:264
-msgid "Sections"
-msgstr "Secties"
+#: plugins/admin/systems/servdb.tpl:10
+msgid "Kerberos Realm"
+msgstr "Kerberos Realm"
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:117
-msgid "Please enter a value for 'release'."
-msgstr "Geef a.u.b. een waarde voor 'versie' op"
+#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
+msgid "Admin user"
+msgstr "Beheerder"
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:121
-msgid "Please specify a valid value for 'url'."
-msgstr "Geef a.u.b. een geldige waarde op voor 'url'."
+#: plugins/admin/systems/servdb.tpl:26
+msgid "FAX database"
+msgstr "FAX database"
 
-#: plugins/admin/systems/servRepository.tpl:6
-msgid "List of configured repositories."
-msgstr "Lijst met gedefinieerde verzamelplaatsen."
+#: plugins/admin/systems/servdb.tpl:30
+msgid "FAX DB user"
+msgstr "FAX DB gebruiker"
 
-#: plugins/admin/systems/servRepository.tpl:11
-msgid "Add repository"
-msgstr "Verzamelplaats toevoegen"
+#: plugins/admin/systems/servdb.tpl:42
+msgid "Asterisk management"
+msgstr "Asterisk beheer"
 
-#: plugins/admin/systems/servRepository.tpl:29
-msgid "This menu allows you to create, delete and edit repository settings."
-msgstr ""
-"Dit menu maakt het mogelijk om FAI verzamelplaatsen aan te maken, bewerken "
-"en verwijderen."
+#: plugins/admin/systems/servdb.tpl:46
+msgid "Asterisk DB user"
+msgstr "Asterisk DB gebruiker"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
-msgid ""
-"This server has inventory features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Deze server heeft inventaris mogelijkheden ingeschakeld. U kunt deze "
-"uitschakelen door de knop hieronder te gebruiken."
+#: plugins/admin/systems/servdb.tpl:54
+msgid "Country dial prefix"
+msgstr "Internationale telefoon prefix"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
-msgid ""
-"This server has inventory features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Deze server heeft inventaris mogelijkheden uitgeschakeld. U kunt deze "
-"inschakelen door de knop hieronder te gebruiken."
+#: plugins/admin/systems/servdb.tpl:58
+msgid "Local dial prefix"
+msgstr "Lokale telefoon prefix"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
-#, php-format
-msgid ""
-"Can't rename given printer type to '%s', because this type name already "
-"exists."
-msgstr ""
-"Kan het opgegeven printertype niet wijzigen naar '%s', aangezien deze "
-"typenaam al bestaat."
+#: plugins/admin/systems/servdb.tpl:70
+msgid "IMAP admin access"
+msgstr "IMAP beheerder toegang"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
-#, php-format
-msgid "Can't delete printer type, it is still in use by '%s'."
-msgstr ""
-"Kan het printertype niet verwijderen, aangezien deze nog steeds in gebruik "
-"is door: '%s'"
+#: plugins/admin/systems/servdb.tpl:74
+msgid "Server identifier"
+msgstr "Server identificatie"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:750
-msgid "since"
-msgstr "sinds"
+#: plugins/admin/systems/servdb.tpl:78
+msgid "Connect URL"
+msgstr "Verbindingings URL"
 
-#: plugins/admin/systems/glpi_edit_type.tpl:1
-#, fuzzy
-msgid "Manage System-types"
-msgstr "Systeemtype"
+#: plugins/admin/systems/servdb.tpl:91
+msgid "Sieve port"
+msgstr "Sieve poort"
 
-#: plugins/admin/systems/glpi_edit_type.tpl:9
-#: plugins/admin/systems/glpi_edit_type.tpl:28
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
-#: plugins/admin/systems/glpi_edit_os.tpl:9
-#: plugins/admin/systems/glpi_edit_os.tpl:28
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:8
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:29
-msgid "Rename"
-msgstr "Hernoemen"
+#: plugins/admin/systems/servdb.tpl:100
+msgid "Logging database"
+msgstr "Log database"
 
-#: plugins/admin/systems/glpi_edit_type.tpl:24
-#: plugins/admin/systems/glpi_edit_os.tpl:24
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:25
-#, fuzzy
-msgid "Please enter a new name"
-msgstr "Kies a.u.b. een naam."
+#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
+msgid "Logging DB user"
+msgstr "Log DB gebruiker"
 
-#: plugins/admin/systems/remove_glpi.tpl:10
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your MySql database in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Het is aan te raden de huidige inhoud van uw MySQL database op te slaan "
-"alvorens u doorgaat. Indien u dat gedaan heeft drukt u op 'Verwijderen' om "
-"door te gaan of op 'Annuleren' om te annuleren."
+#: plugins/admin/systems/servdb.tpl:119
+msgid "Glpi database"
+msgstr "Glpi database"
 
-#: plugins/admin/systems/glpiManufacturer.tpl:1
-#, fuzzy
-msgid "Manage manufacturers"
-msgstr "Fabricant"
+#: plugins/admin/systems/servdb.tpl:133
+msgid "Database"
+msgstr "Database"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
-msgid "Reference"
-msgstr "Referentie"
+#: plugins/admin/systems/class_printGeneric.inc:177
+#: plugins/admin/systems/class_printGeneric.inc:184
+#: plugins/admin/systems/class_printGeneric.inc:219
+#: plugins/admin/systems/class_printGeneric.inc:240
+#: plugins/admin/systems/class_printGeneric.inc:243
+msgid "Add printer extension"
+msgstr "Voeg printer extensie toe"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
-#: plugins/admin/systems/glpi_devices.tpl:17
-msgid "Comments"
-msgstr "Opmerkingen"
+#: plugins/admin/systems/class_printGeneric.inc:178
+msgid "This is a workstation template, printer tab is disabled."
+msgstr "Dit is een werkstationsjabloon. Het printer tabblad is uitgeschakeld."
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
-#: plugins/admin/systems/glpi.tpl:63
-#: plugins/admin/systems/glpi_devices.tpl:112
-#: plugins/admin/systems/glpi_devices.tpl:153
-#: plugins/admin/systems/glpi_devices.tpl:208
-#: plugins/admin/systems/glpi_devices.tpl:264
-#: plugins/admin/systems/glpi_devices.tpl:322
-#: plugins/admin/systems/glpi_devices.tpl:386
-#: plugins/admin/systems/glpi_devices.tpl:458
-#: plugins/admin/systems/glpi_devices.tpl:522
-#: plugins/admin/systems/glpi_devices.tpl:569
-#: plugins/admin/systems/glpi_devices.tpl:622
-#: plugins/admin/systems/glpi_devices.tpl:676
-#: plugins/admin/systems/glpi_devices.tpl:722
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
-msgid "Comment"
-msgstr "Opmerking"
+#: plugins/admin/systems/class_printGeneric.inc:185
+msgid "This is a terminal template, printer tab is disabled."
+msgstr "Dit is een terminalsjabloon. Het printer tabblad is uitgeschakeld."
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
-#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
-#: plugins/admin/systems/glpi_devices.tpl:24
-#: plugins/admin/systems/glpi_devices.tpl:123
-#: plugins/admin/systems/glpi_devices.tpl:164
-#: plugins/admin/systems/glpi_devices.tpl:219
-#: plugins/admin/systems/glpi_devices.tpl:275
-#: plugins/admin/systems/glpi_devices.tpl:333
-#: plugins/admin/systems/glpi_devices.tpl:397
-#: plugins/admin/systems/glpi_devices.tpl:469
-#: plugins/admin/systems/glpi_devices.tpl:533
-#: plugins/admin/systems/glpi_devices.tpl:580
-#: plugins/admin/systems/glpi_devices.tpl:633
-#: plugins/admin/systems/glpi_devices.tpl:687
-#: plugins/admin/systems/glpi_devices.tpl:733
-msgid "Manufacturer"
-msgstr "Fabricant"
+#: plugins/admin/systems/class_printGeneric.inc:220
+msgid ""
+"This workstation has printer extension disabled. You can't enable it while "
+"'cn' is not present in entry. Possibly you are currently creating a new "
+"terminal template"
+msgstr ""
+"Dit werkstation heeft printer mogelijkheden uitgeschakeld. U kunt deze niet "
+"inschakelen zolang 'cn' niet aanwezig is in de invoer. Het kan mogelijk zijn "
+"dat u een nieuwe terminal sjabloon aan het maken bent."
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
-#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
-msgid "Technical responsible"
-msgstr "Technisch verantwoordelijke"
+#: plugins/admin/systems/class_printGeneric.inc:232
+#: plugins/admin/systems/class_printGeneric.inc:235
+msgid "Remove printer extension"
+msgstr "Verwijder printer mogelijkheden"
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:140
-msgid "use"
-msgstr "gebruik"
+#: plugins/admin/systems/class_printGeneric.inc:233
+msgid ""
+"This workstation has printer extension enabled.You can disable it by "
+"clicking below."
+msgstr ""
+"Dit werkstation heeft printer mogelijkheden ingeschakeld. U kunt deze "
+"uitschakelen door de knop hieronder te gebruiken."
 
-#: plugins/admin/systems/glpiSelectUser.tpl:23
+#: plugins/admin/systems/class_printGeneric.inc:236
 msgid ""
-"This dialog allows you to select a user as technical responsible person."
+"This terminal has printer extension enabled. You can disable it by clicking "
+"below."
 msgstr ""
-"Deze dialoog stelt u in staat om een gebruiker als technisch "
-"verantwoordelijk persoon aan te wijzen."
+"Deze terminal heeft printer mogelijkheden ingeschakeld. U kunt deze "
+"uitschakelen door de knop hieronder te gebruiken."
 
-#: plugins/admin/systems/glpi_edit_os.tpl:1
-msgid "Manage OS-types"
+#: plugins/admin/systems/class_printGeneric.inc:241
+msgid ""
+"This workstation has printer extension disabled. You can enable it by "
+"clicking below."
 msgstr ""
+"Dit werkstation heeft printer mogelijkheden uitgeschakeld. U kunt deze "
+"inschakelen door de knop hieronder te gebruiken."
 
-#: plugins/admin/systems/class_termDNS.inc:313
-msgid "The required field 'IP-address' is not set."
-msgstr "Het vereiste veld 'IP adres' is leeg."
+#: plugins/admin/systems/class_printGeneric.inc:244
+msgid ""
+"This terminal has printer extension disabled. You can enable it by clicking "
+"below."
+msgstr ""
+"Deze terminal heeft printer mogelijkheden uitgeschakeld. U kunt deze "
+"inschakelen door de knop hieronder te gebruiken."
 
-#: plugins/admin/systems/class_termDNS.inc:319
-msgid "Wrong IP format in field IP-address."
-msgstr "Verkeerd IP formaat in het veld IP adres"
+#: plugins/admin/systems/class_printGeneric.inc:283
+msgid "This 'dn' has no printer features."
+msgstr "Deze 'dn' heeft geen printer mogelijkheden."
 
-#: plugins/admin/systems/class_termDNS.inc:325
-msgid "The required field 'MAC-address' is not set."
-msgstr "Het vereiste veld 'Hardware adres (MAC)' is leeg."
+#: plugins/admin/systems/class_printGeneric.inc:419
+#, php-format
+msgid "Your currently selected PPD file '%s' doesn't exist."
+msgstr "Uw huidig geselecteerde PPD bestand '%s' bestaat niet."
 
-#: plugins/admin/systems/class_termDNS.inc:331
-msgid ""
-"The given macaddress is invalid. There must be 6 1byte segments seperated by "
-"':'."
-msgstr ""
-"Het opgegeven mac-adres is ongeldig. Deze moet bestaan uit 6 segmenten van 1 "
-"byte, gescheiden door ':'"
+#: plugins/admin/systems/class_printGeneric.inc:427
+msgid "can't get ppd informations."
+msgstr "kan de PPD informatie niet ophalen"
 
-#: plugins/admin/systems/class_termDNS.inc:346
+#: plugins/admin/systems/class_printGeneric.inc:439
 #, php-format
-msgid "Found duplicate value for record type '%s'."
+msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
+"Deze printer behoort bij terminal %s. U kunt deze printer niet hernoemen."
 
-#: plugins/admin/systems/class_termDNS.inc:352
+#: plugins/admin/systems/class_printGeneric.inc:441
 #, php-format
-msgid "Found more than one entry for the uniqe record type '%s'."
+msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
+"Deze printer behoort bij werkstation %s. U kunt deze printer niet hernoemen."
 
-#: plugins/admin/systems/class_termDNS.inc:360
-#, php-format
-msgid ""
-"The device IP '%s' is added as 'A Record', this will be done automatically, "
-"please remove the record."
+#: plugins/admin/systems/class_printGeneric.inc:519
+msgid "You have no permissions to create a printer on this 'Base'."
 msgstr ""
-"Het apparaat IP '%s' is toegevoegd als 'A Record'. Dit wordt automatisch "
-"afgehandeld door GOsa. Verwijder het record a.u.b."
+"U heeft geen toestemming om een printer aan te maken onder deze 'Basis'."
 
-#: plugins/admin/systems/class_termDNS.inc:366
-#: plugins/admin/systems/class_servDNSeditZone.inc:386
-#, php-format
-msgid "Only lowercase is allowed, please check your '%ss'."
-msgstr "Hoofdletters zijn niet toegestaan. Controleer uw '%ss'"
+#: plugins/admin/systems/servkolab.tpl:14
+msgid "POP3 service"
+msgstr "POP3 service"
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
-#, fuzzy
-msgid "Add/Edit manufacturer"
-msgstr "Invoer bewerken"
+#: plugins/admin/systems/servkolab.tpl:22
+msgid "POP3/SSL service"
+msgstr "POP3/SSL service"
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
-msgid "Website"
-msgstr "Website"
+#: plugins/admin/systems/servkolab.tpl:30
+msgid "IMAP service"
+msgstr "IMAP Service"
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
-#: plugins/admin/ogroups/class_mailogroup.inc:137
-#: plugins/admin/ogroups/class_phonequeue.inc:690
-#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Phone number"
-msgstr "Telefoonnummer"
+#: plugins/admin/systems/servkolab.tpl:38
+msgid "IMAP/SSL service"
+msgstr "IMAP/SSL service"
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
-msgid "List of available cartridge type for this type of printer"
-msgstr "Lijst met beschikbare cartridges voor dit type printer"
+#: plugins/admin/systems/servkolab.tpl:46
+msgid "Sieve service"
+msgstr "Sieve service"
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
-msgid ""
-"This dialog allows you to create new types of cartridges, and select one or "
-"more types for your printer. Cartridge types depends on the printer type you "
-"have selected. For each selected cartridge type there will be a new "
-"cartridge created, this allows you to select the same cartridge type for "
-"more then one printer."
+#: plugins/admin/systems/servkolab.tpl:54
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
 msgstr ""
-"Deze dialoog maakt het mogelijk om nieuwe cartridgetypes aan te maken en één "
-"of meer types te selecteren voor uw printer. De cartridgetypes zijn "
-"afhankelijk van de door u geselecteerde printer. Voor elk geselecteerde "
-"cartridgetype zal een nieuwe cartridge aangemaakt worden. Dit maakt het "
-"mogelijk om hetzelfde cartridgetype voor meerdere printers te selecteren."
+"FTP Free/Busy service (vervallen, niet compatibel met Kolab2 Free/Busy)"
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
-msgid "Display cartridge types matching"
-msgstr "Toon de overeenkomende cartridgetypes"
+#: plugins/admin/systems/servkolab.tpl:62
+msgid "HTTP FreeBusy service (legacy)"
+msgstr "HTTP Free/Busy service (vervallen)"
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
-msgid "Regular expression for matching cartridge types"
-msgstr "Reguliere expresie voor overeenkomende cartridgetypes"
+#: plugins/admin/systems/servkolab.tpl:70
+msgid "Amavis email scanning (virus/spam)"
+msgstr "Amavis email scannen (virus/anti-spam)"
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:58
-#, php-format
-msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
-msgstr ""
-"U kunt deze fabrikant niet verwijderen, aangezien deze nog steeds in gebruik "
-"is door deze systemen: '%s'"
+#: plugins/admin/systems/servkolab.tpl:81
+msgid "Quota settings"
+msgstr "Quota instellingen"
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:104
-msgid "Please specify a name."
-msgstr "Geef a.u.b. een naam op."
+#: plugins/admin/systems/servkolab.tpl:97
+msgid "Free/Busy settings"
+msgstr "Free/Busy instellingen"
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:113
-#: plugins/admin/systems/class_glpiManufacturer.inc:119
-msgid "Specified name is already in use, please choose another one."
-msgstr "De opgegeven naam is al in gebruik. Kies a.u.b. een andere naam."
+#: plugins/admin/systems/servkolab.tpl:102
+msgid "Allow unauthenticated downloading of Free/Busy information"
+msgstr "Sta ongeauthoriseerd downloaden van Free/Busy informatie toe"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:6
-msgid "List of attachments"
-msgstr "Lijst met bijlages"
+#: plugins/admin/systems/servkolab.tpl:117
+msgid "SMTP privileged networks"
+msgstr "SMTP toegestane netwerken"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:23
-msgid ""
-"This dialog allow you to attach additional objects (like manuals, guides, "
-"etc.)  to your currently edited computer."
-msgstr ""
-"Deze dialoog maakt het mogelijk om extra objecten (zoals handleidingen, "
-"documenten, etc.), aan de computer die u momenteel aan het bewerken bent, "
-"toe te voegen."
+#: plugins/admin/systems/servkolab.tpl:122
+msgid "Hosts/networks allowed to relay"
+msgstr "Hosts/netwerken die E-mail mogen ralayen"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:35
-msgid "Display attachments matching"
-msgstr "Toon overeenkomende bijlages"
+#: plugins/admin/systems/servkolab.tpl:125
+msgid "Enter multiple values, seperated with"
+msgstr "Voor meerdere waardes in, gescheiden door"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:37
-msgid "Regular expression for matching attachment names"
-msgstr "Reguliere expressie voor overeenkomende bijlagenamen"
+#: plugins/admin/systems/servkolab.tpl:138
+msgid "SMTP smarthost/relayhost"
+msgstr "SMTP smarthost/relayhost"
 
-#: 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."
+#: plugins/admin/systems/servkolab.tpl:144
+msgid "Enable MX lookup for relayhost"
+msgstr "Sta MX record opzoeken voor relayhost toe"
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:305
-msgid "The selected name is already in use."
-msgstr "De opgegeven naam wordt al gebruikt."
+#: plugins/admin/systems/servkolab.tpl:149
+msgid "Host used to relay mails"
+msgstr "Host die gebruikt wordt om E-mails te relayen"
 
-#: plugins/admin/systems/glpi.tpl:9
-#: plugins/admin/systems/SelectDeviceType.tpl:20
-msgid "System type"
-msgstr "Systeemtype"
+#: plugins/admin/systems/servkolab.tpl:163
+msgid "Accept Internet Mail"
+msgstr "Accepteer Internet E-mail"
 
-#: plugins/admin/systems/glpi.tpl:19
-msgid "Operating system"
-msgstr "Besturingssysteem"
+#: plugins/admin/systems/servkolab.tpl:169
+msgid "Accept mail from other domains over non-authenticated SMTP"
+msgstr "Accepteer E-mail van andere domeinen over niet geauthenticeerde SMTP"
 
-#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
-msgid "Contacts"
-msgstr "Contacten"
+#: plugins/admin/systems/phonesettings.tpl:1
+msgid "Advanced phone settings"
+msgstr "Geavanceerde telefoon instellingen"
 
-#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
-msgid "Contact person"
-msgstr "Contactpersoon"
+#: plugins/admin/systems/phonesettings.tpl:6
+msgid "Phone type"
+msgstr "Telefoontype"
 
-#: plugins/admin/systems/glpi.tpl:78
-msgid "Installed devices"
-msgstr "Geinstalleerde apparaten"
+#: plugins/admin/systems/phonesettings.tpl:7
+#: plugins/admin/systems/phonesettings.tpl:25
+#: plugins/admin/systems/phonesettings.tpl:35
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:78
+#: plugins/admin/systems/phonesettings.tpl:109
+#: plugins/admin/systems/phonesettings.tpl:156
+msgid "Choose a phone type"
+msgstr "Kies een telefoontype"
 
-#: plugins/admin/systems/glpi.tpl:90
-msgid "Trading"
-msgstr "Uit-/Omwisseling"
+#: plugins/admin/systems/phonesettings.tpl:10
+msgid "refresh"
+msgstr "ververs"
 
-#: plugins/admin/systems/glpi.tpl:91
-msgid "Software"
-msgstr "Software"
+#: plugins/admin/systems/phonesettings.tpl:32
+msgid "DTMF mode"
+msgstr "DTMF modus"
 
-#: plugins/admin/systems/glpi.tpl:92
-msgid "Contracts"
-msgstr "Contracten"
+#: plugins/admin/systems/phonesettings.tpl:46
+#: plugins/admin/systems/phonesettings.tpl:85
+msgid "Default IP"
+msgstr "Standaard IP"
 
-#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
-msgid "Attachments"
-msgstr "Bijlagen"
+#: plugins/admin/systems/phonesettings.tpl:56
+#: plugins/admin/systems/phonesettings.tpl:93
+msgid "Response timeout"
+msgstr "Reageer timeout"
 
-#: plugins/admin/systems/servdnseditzone.tpl:7
-msgid "Zone name"
-msgstr "Zone-naam"
+#: plugins/admin/systems/phonesettings.tpl:75
+msgid "Modus"
+msgstr "Modus"
 
-#: plugins/admin/systems/servdnseditzone.tpl:13
-#, fuzzy
-msgid "Network address"
-msgstr "Netwerk apparaten"
+#: plugins/admin/systems/phonesettings.tpl:106
+msgid "Authtype"
+msgstr "Authorisatietype"
 
-#: plugins/admin/systems/servdnseditzone.tpl:24
-#, fuzzy
-msgid "Zone entries"
-msgstr "Zone instellingen"
+#: plugins/admin/systems/phonesettings.tpl:116
+msgid "Secret"
+msgstr "Wachtwoord"
 
-#: plugins/admin/systems/servdnseditzone.tpl:35
-#, fuzzy
-msgid "SOA record"
-msgstr "DNS records"
+#: plugins/admin/systems/phonesettings.tpl:124
+msgid "GoFonInkeys"
+msgstr "GOFonInKeys"
 
-#: plugins/admin/systems/servdnseditzone.tpl:41
-msgid "Primary dns server for this zone"
-msgstr "Primaire DNS server voor deze zone"
+#: plugins/admin/systems/phonesettings.tpl:132
+msgid "GoFonOutKeys"
+msgstr "GoFonOutKeys"
 
-#: plugins/admin/systems/servdnseditzone.tpl:53
-msgid "Serial number (automatically incremented)"
-msgstr "Serienummer (automatisch opgehoogd)"
+#: plugins/admin/systems/phonesettings.tpl:145
+msgid "Account code"
+msgstr "Account code"
 
-#: plugins/admin/systems/servdnseditzone.tpl:69
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/altlinux/setup_finish.tpl:31
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr "Opnieuw proberen"
+#: plugins/admin/systems/phonesettings.tpl:153
+msgid "Trunk lines"
+msgstr "Trunk lijnen"
 
-#: plugins/admin/systems/servdnseditzone.tpl:75
-msgid "Expire"
-msgstr "Vervaltijd"
+#: plugins/admin/systems/phonesettings.tpl:168
+msgid "Hosts that are allowed to connect"
+msgstr "Hosts die mogen verbinden"
 
-#: plugins/admin/systems/servdnseditzone.tpl:96
-#, fuzzy
-msgid "MxRecords"
-msgstr "Records"
+#: plugins/admin/systems/phonesettings.tpl:183
+msgid "Hosts that are not allowed to connect"
+msgstr "Hosts die niet mogen verbinden"
 
-#: plugins/admin/systems/servdnseditzone.tpl:108
-#, fuzzy
-msgid "Zone records"
-msgstr "DNS records"
+#: plugins/admin/systems/phonesettings.tpl:205
+msgid "MSN"
+msgstr "MSN"
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:6
-msgid "List of devices"
-msgstr "Lijst met apparaten"
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
+msgstr "Machinenaam"
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:23
+#: plugins/admin/systems/remove.tpl:6
 msgid ""
-"This dialog allows you to attach a device to your currently edited computer."
+"This includes <b>all</b> system and setup informations. Please double check "
+"if your really want to do this since there is no way for GOsa to get your "
+"data back."
 msgstr ""
-"Deze dialoog maakt het mogelijk om een apparaat te verbinden aan de computer "
-"die u momenteel aan het bewerken bent."
-
-#: plugins/admin/systems/glpiDeviceManagement.tpl:35
-msgid "Display devices matching"
-msgstr "Toon overeenkomende apparaten"
-
-#: plugins/admin/systems/glpiDeviceManagement.tpl:37
-msgid "Regular expression for matching device names"
-msgstr "Reguliere expressie voor overeenkomende apparaat namen"
+"Dit omvat <b>alle</b> systeem en configuratie informatie. Verzeker uzelf "
+"hiervan, aangezien er geen manier is voor GOsa om deze gegevens terug te "
+"halen."
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:73
 #, php-format
@@ -9217,432 +9582,268 @@ msgid "empty"
 msgstr "leeg"
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:259
-msgid "Create new attachment"
-msgstr "Nieuwe bijlage aanmaken"
-
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
-msgid "New Attachment"
-msgstr "Nieuwe bijlage"
-
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:352
-msgid "Please specify a valid name for this attachment."
-msgstr "Geef a.u.b. een geldige naam op voor deze bijlage."
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
-#, php-format
-msgid "Internal Error can't create device of type '%s'"
-msgstr "Interne fout. Kan apparaat van het type '%s' niet aanmaken."
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
-#, php-format
-msgid "You're about to delete the glpi device '%s'."
-msgstr "U staat op het punt het GLPI apparaat '%s' te verwijderen."
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
-msgid "Can't detect object name."
-msgstr "Kan de objectnaam niet detecteren"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
-#, php-format
-msgid ""
-"You can't delete this device, it is still in use by these system(s) '%s'"
-msgstr ""
-"U kunt dit apparaat niet verwijderen, aangezien deze nog steeds gebruikt "
-"wordt door deze systemen: '%s'"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
-msgid "devices"
-msgstr "apparaten"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-msgid "New monitor"
-msgstr "Nieuwe monitor"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-msgid "M"
-msgstr "M"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
-msgid "New mainbord"
-msgstr "Nieuw moederbord"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-msgid "New processor"
-msgstr "Nieuwe processor"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
-msgid "New case"
-msgstr "Nieuwe behuizing"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
-msgid "C"
-msgstr "C"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
-msgid "New network interface"
-msgstr "Nieuwe netwerk aansluiting"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
-msgid "NI"
-msgstr "NI"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
-msgid "New ram"
-msgstr "Nieuw geheugen"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
-msgid "R"
-msgstr "R"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
-msgid "New hard disk"
-msgstr "Nieuwe hardeschijf"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
-msgid "HDD"
-msgstr "HDD"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
-msgid "New drive"
-msgstr "Nieuwe schijf"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
-msgid "D"
-msgstr "D"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
-msgid "New controller"
-msgstr "Nieuwe controller"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
-msgid "CS"
-msgstr "CS"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
-msgid "New graphics card"
-msgstr "Nieuwe grafische kaart"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
-msgid "GC"
-msgstr "GC"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
-msgid "New sound card"
-msgstr "Nieuwe geluidskaart"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
-msgid "SC"
-msgstr "SC"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
-msgid "New power supply"
-msgstr "Nieuwe voeding"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
-msgid "PS"
-msgstr "PS"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
-msgid "New misc device"
-msgstr "Nieuw overig apparaat"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
-msgid "OC"
-msgstr "OC"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:346
-msgid "You have to specify a valid name for this device."
-msgstr "Geef a.u.b. een geldige naam op voor dit apparaat."
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:366
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:369
-msgid "This device name is already in use."
-msgstr "De opgegeven apparaat naam wordt al gebruikt."
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
-msgid "Other"
-msgstr "Overige"
-
-#: plugins/admin/systems/glpiPrinter.tpl:9
-msgid "Printer type"
-msgstr "Printertype"
-
-#: plugins/admin/systems/glpiPrinter.tpl:31
-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"
-
-#: plugins/admin/systems/glpiPrinter.tpl:54
-msgid "USB"
-msgstr "USB"
-
-#: plugins/admin/systems/glpiPrinter.tpl:114
-msgid "Installed cartridges"
-msgstr "Geinstalleerde cartridges"
-
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
-#, php-format
-msgid "You're about to delete the glpi cartridge type '%s'."
-msgstr "U staat op het punt het GLPI cartridgetype '%s' te verwijderen."
-
-#: 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 ""
-"U kunt dit cartridgetype niet verwijderen, aangezien deze nog steeds in "
-"gebruik is door deze printer(s): '%s'"
-
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
-msgid "Cartridges"
-msgstr "Cartridges"
+msgid "Create new attachment"
+msgstr "Nieuwe bijlage aanmaken"
 
-#: plugins/admin/systems/glpi_devices.tpl:2
-#, fuzzy
-msgid "Add/Edit monitor"
-msgstr "Invoer bewerken"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
+msgid "New Attachment"
+msgstr "Nieuwe bijlage"
 
-#: plugins/admin/systems/glpi_devices.tpl:33
-msgid "Monitor size"
-msgstr "Monitor grootte"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:352
+msgid "Please specify a valid name for this attachment."
+msgstr "Geef a.u.b. een geldige naam op voor deze bijlage."
 
-#: plugins/admin/systems/glpi_devices.tpl:36
-msgid "Inch"
-msgstr "Inch"
+#: plugins/admin/systems/headpage.tpl:6
+msgid "List of systems"
+msgstr "Lijst met systemen"
 
-#: plugins/admin/systems/glpi_devices.tpl:44
-msgid "Integrated microphone"
-msgstr "Geintegreerde microfoon"
+#: plugins/admin/systems/headpage.tpl:24
+msgid ""
+"This menu allows you to add, remove and change the properties of specific "
+"systems. You can only add systems which have already been started once."
+msgstr ""
+"Dit menu maakt het mogelijk om specifieke systemen toe te voegen, bewerken "
+"en verwijderen. U kunt alleen systemen toevoegen die al eens opgestart "
+"geweest zijn."
 
-#: plugins/admin/systems/glpi_devices.tpl:47
-#: plugins/admin/systems/glpi_devices.tpl:55
-#: plugins/admin/systems/glpi_devices.tpl:63
-#: plugins/admin/systems/glpi_devices.tpl:71
-#: plugins/admin/systems/glpi_devices.tpl:176
-#: plugins/admin/systems/glpi_devices.tpl:296
-#: plugins/admin/systems/glpi_devices.tpl:361
-msgid "Yes"
-msgstr "Ja"
+#: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
+msgstr "Toon servers"
 
-#: plugins/admin/systems/glpi_devices.tpl:48
-#: plugins/admin/systems/glpi_devices.tpl:56
-#: plugins/admin/systems/glpi_devices.tpl:64
-#: plugins/admin/systems/glpi_devices.tpl:72
-#: plugins/admin/systems/glpi_devices.tpl:177
-#: plugins/admin/systems/glpi_devices.tpl:297
-#: plugins/admin/systems/glpi_devices.tpl:362
-msgid "No"
-msgstr "Nee"
+#: plugins/admin/systems/headpage.tpl:39
+msgid "Select to see Linux terminals"
+msgstr "Selecteer om Linux terminals te zien"
 
-#: plugins/admin/systems/glpi_devices.tpl:52
-msgid "Integrated speakers"
-msgstr "Geintegreerde luidsprekers"
+#: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
+msgstr "Toon terminals"
 
-#: plugins/admin/systems/glpi_devices.tpl:60
-msgid "Sub-D"
-msgstr "Sub-D"
+#: plugins/admin/systems/headpage.tpl:40
+msgid "Select to see Linux workstations"
+msgstr "Selecteer om Linux werkstations te zien"
 
-#: plugins/admin/systems/glpi_devices.tpl:68
-msgid "BNC"
-msgstr "BNC"
+#: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
+msgstr "Toon werkstations"
 
-#: plugins/admin/systems/glpi_devices.tpl:76
-msgid "Serial number"
-msgstr "Serienummer"
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Select to see MicroSoft Windows based workstations"
+msgstr "Selecteer om Microsoft Windows werkstations te zien"
 
-#: plugins/admin/systems/glpi_devices.tpl:83
-msgid "Additional serial number"
-msgstr "Extra serienummer"
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Show windows based workstations"
+msgstr "Toon Windows werkstations"
 
-#: plugins/admin/systems/glpi_devices.tpl:97
-#, fuzzy
-msgid "Add/Edit other device"
-msgstr "Geluidskaart"
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Select to see network printers"
+msgstr "Selecteer om netwerk printers te zien"
 
-#: plugins/admin/systems/glpi_devices.tpl:138
-#, fuzzy
-msgid "Add/Edit power supply"
-msgstr "Nieuwe voeding"
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Show network printers"
+msgstr "Toon netwerk printers"
 
-#: plugins/admin/systems/glpi_devices.tpl:173
-msgid "Atx"
-msgstr "ATX"
+#: plugins/admin/systems/headpage.tpl:43
+msgid "Select to see VOIP phones"
+msgstr "Selecteer om VOIP telefoons te zien"
 
-#: plugins/admin/systems/glpi_devices.tpl:181
-msgid "Power"
-msgstr "Voeding"
+#: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
+msgstr "Toon telefoons"
 
-#: plugins/admin/systems/glpi_devices.tpl:193
-#, fuzzy
-msgid "Add/Edit graphic card"
-msgstr "Nieuwe grafische kaart"
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Select to see network devices"
+msgstr "Selecteer om netwerk apparaten te zien"
 
-#: plugins/admin/systems/glpi_devices.tpl:228
-#: plugins/admin/systems/glpi_devices.tpl:284
-#: plugins/admin/systems/glpi_devices.tpl:349
-msgid "Interface"
-msgstr "Interface"
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Show network devices"
+msgstr "Toon netwerk apparaten"
 
-#: plugins/admin/systems/glpi_devices.tpl:237
-msgid "Ram"
-msgstr "RAM"
+#: plugins/admin/systems/headpage.tpl:52
+msgid "Regular expression for matching system names"
+msgstr "Reguliere expressie voor overeenkomende systeemnamen"
 
-#: plugins/admin/systems/glpi_devices.tpl:249
-#, fuzzy
-msgid "Add/Edit controller"
-msgstr "Nieuwe controller"
+#: plugins/admin/systems/headpage.tpl:59
+msgid "Display systems of user"
+msgstr "Toon systemen van gebruiker"
 
-#: plugins/admin/systems/glpi_devices.tpl:307
-msgid "Add/Edit drive"
-msgstr ""
+#: plugins/admin/systems/headpage.tpl:62
+msgid "User name of which terminal(s) are shown"
+msgstr "Gebruikersnaam van wie de terminal(s) getoond worden"
 
-#: plugins/admin/systems/glpi_devices.tpl:342
-msgid "Speed"
-msgstr "Snelheid"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:6
+msgid "List of attachments"
+msgstr "Lijst met bijlages"
 
-#: plugins/admin/systems/glpi_devices.tpl:358
-msgid "Writeable"
-msgstr "Schrijfbaar"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:23
+msgid ""
+"This dialog allow you to attach additional objects (like manuals, guides, "
+"etc.)  to your currently edited computer."
+msgstr ""
+"Deze dialoog maakt het mogelijk om extra objecten (zoals handleidingen, "
+"documenten, etc.), aan de computer die u momenteel aan het bewerken bent, "
+"toe te voegen."
 
-#: plugins/admin/systems/glpi_devices.tpl:371
-#, fuzzy
-msgid "Add/Edit harddisk"
-msgstr "Nieuwe hardeschijf"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:35
+msgid "Display attachments matching"
+msgstr "Toon overeenkomende bijlages"
 
-#: plugins/admin/systems/glpi_devices.tpl:406
-msgid "Rpm"
-msgstr "RPM"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:37
+msgid "Regular expression for matching attachment names"
+msgstr "Reguliere expressie voor overeenkomende bijlagenamen"
 
-#: plugins/admin/systems/glpi_devices.tpl:413
-msgid "Cache"
-msgstr "Cache"
+#: plugins/admin/systems/password.tpl:2
+msgid ""
+"To change the terminal root password use the fields below. The changes take "
+"effect during the next reboot. Please memorize the new password, because you "
+"wouldn't be able to log in."
+msgstr ""
+"Gebruik de velden hieronder om het terminal root wachtwoord te veranderen. "
+"De veranderingen worden onmiddelijk doorgevoerd. Onthoud het nieuwe "
+"wachtwoord a.u.b. aangezien u niet in kan loggen zonder dit wachtwoord."
 
-#: plugins/admin/systems/glpi_devices.tpl:443
-#, fuzzy
-msgid "Add/Edit memory"
-msgstr "Invoer bewerken"
+#: plugins/admin/systems/password.tpl:5
+msgid "Leave fields blank for password inheritance from default entries."
+msgstr "Laat velden leeg voor wachtwoord overerving vanuit standaard waarden."
 
-#: plugins/admin/systems/glpi_devices.tpl:478
-msgid "Frequenz"
-msgstr "Frequentie"
+#: plugins/admin/systems/password.tpl:9
+msgid "Changing the password impinges on authentification only."
+msgstr ""
+"Het veranderen van het wachtwoord is alleen van toepassing op authenticatie."
 
-#: plugins/admin/systems/glpi_devices.tpl:507
-#, fuzzy
-msgid "Add/Edit sound card"
-msgstr "Nieuwe geluidskaart"
+#: 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/glpi_devices.tpl:553
-#, fuzzy
-msgid "Add/Edit network interface"
-msgstr "Nieuwe netwerk aansluiting"
+#: 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/glpi_devices.tpl:589
-msgid "MAC address"
-msgstr "Hardware adres (MAC)"
+#: plugins/admin/systems/chooser.tpl:7
+msgid "Linux thin client template"
+msgstr "Linux thin client sjabloon"
 
-#: plugins/admin/systems/glpi_devices.tpl:607
-#, fuzzy
-msgid "Add/Edit processor"
-msgstr "Nieuwe processor"
+#: plugins/admin/systems/chooser.tpl:8
+msgid "Linux workstation template"
+msgstr "Linux werkstation sjabloon"
 
-#: plugins/admin/systems/glpi_devices.tpl:642
-msgid "Frequence"
-msgstr "Frequentie"
+#: plugins/admin/systems/chooser.tpl:9
+msgid "Linux Server"
+msgstr "Linux server"
 
-#: plugins/admin/systems/glpi_devices.tpl:649
-msgid "Default frequence"
-msgstr "Standaard frequentie"
+#: plugins/admin/systems/chooser.tpl:10
+msgid "Windows workstation"
+msgstr "Windows werkstation"
 
-#: plugins/admin/systems/glpi_devices.tpl:661
-#, fuzzy
-msgid "Add/Edit motherboard"
-msgstr "Moederbord"
+#: plugins/admin/systems/chooser.tpl:11
+msgid "Network printer"
+msgstr "Netwerk printer"
 
-#: plugins/admin/systems/glpi_devices.tpl:696
-msgid "Chipset"
-msgstr "Chipset"
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
+msgstr "Ander netwerk component"
 
-#: plugins/admin/systems/glpi_devices.tpl:707
-#, fuzzy
-msgid "Add/Edit computer case"
-msgstr "Computer behuizing"
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
+msgstr "Aanmaken"
 
-#: plugins/admin/systems/glpi_devices.tpl:742
-msgid "format"
-msgstr "formaat"
+#: plugins/admin/systems/class_glpiManufacturer.inc:58
+#, php-format
+msgid ""
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
+msgstr ""
+"U kunt deze fabrikant niet verwijderen, aangezien deze nog steeds in gebruik "
+"is door deze systemen: '%s'"
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
-msgid "Attachment"
-msgstr "Bijlage"
+#: plugins/admin/systems/class_glpiManufacturer.inc:104
+msgid "Please specify a name."
+msgstr "Geef a.u.b. een naam op."
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
-msgid "Filename"
-msgstr "Bestandsnaam"
+#: plugins/admin/systems/class_glpiManufacturer.inc:113
+#: plugins/admin/systems/class_glpiManufacturer.inc:119
+msgid "Specified name is already in use, please choose another one."
+msgstr "De opgegeven naam is al in gebruik. Kies a.u.b. een andere naam."
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
-msgid "Mime-type"
-msgstr "MIME-type"
+#: plugins/admin/systems/class_phoneGeneric.inc:105
+msgid "This 'dn' has no phone features."
+msgstr "Deze 'dn' heeft geen telefoon mogelijkheden."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:336
-msgid "This zoneName is already in use"
-msgstr "De opgegeven zone-naam wordt al gebruikt."
+#: plugins/admin/systems/class_phoneGeneric.inc:202
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+msgid "yes"
+msgstr "ja"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:339
-msgid "This reverse zone is already in use"
-msgstr "De opgegeven reverse zone wordt al gebruikt."
+#: plugins/admin/systems/class_phoneGeneric.inc:202
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
+msgid "no"
+msgstr "nee"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:344
-msgid "Primary dns server must end with '.' to be a valid entry."
-msgstr "De primaire DNS server invoer moet eindigen op '.' om geldig te zijn."
+#: plugins/admin/systems/class_phoneGeneric.inc:223
+msgid "dynamic"
+msgstr "dynamisch"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:348
-#, fuzzy
-msgid "Your specified mail address must end with '.' to be a valid record."
-msgstr "Het opgegeven E-mail adres moet eindigen op '.' om geldig te zijn."
+#: plugins/admin/systems/class_phoneGeneric.inc:223
+msgid "Networksettings"
+msgstr "Netwerk instellingen"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:352
-#: plugins/admin/systems/class_servDNSeditZone.inc:356
+#: plugins/admin/systems/class_phoneGeneric.inc:238
+#, php-format
 msgid ""
-"Your mail address contains '@' replace this with '.' to enable GOsa to "
-"create a valid SOA record."
+"Can't delete because there are user which are depending on this phone. One "
+"of them is user '%s'."
 msgstr ""
-"Uw E-mail adres bevat '@'. Vervang dit door  '.' om GOsa een geldig SOA "
-"record aan te laten maken."
+"Kan niet verwijderd worden, aangezien er een gebruiker is die afhankelijkis "
+"van deze telefoon. Een van deze gebruiker(s) is '%s'."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:360
-msgid "Only lowercase strings are allowed as zone name."
-msgstr "Hoofdletter zijn niet toegestaan voor de zone-naam."
+#: plugins/admin/systems/class_phoneGeneric.inc:294
+msgid "The required field 'Phone name' is not set."
+msgstr "Het vereiste veld 'Telefoonnaam' is leeg."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:364
-msgid "Please specify a numeric value for serial number."
-msgstr "Geef a.u.b. een nummerieke waarde voor het serienummer op."
+#: plugins/admin/systems/class_phoneGeneric.inc:297
+msgid "The 'Phone name' '0' is reserved and cannot be used."
+msgstr "De 'Telefoonnaam' '0' is gereserveerd en kan niet gebruikt worden."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:368
-msgid "Please specify a numeric value for refresh."
-msgstr "Geef a.u.b. een nummerieke waarde op voor de verversing."
+#: plugins/admin/systems/class_phoneGeneric.inc:304
+msgid "You have no permissions to create a phone on this 'Base'."
+msgstr ""
+"U heeft geen toestemming om een telefoon aan te maken onder deze 'Basis'."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:372
-msgid "Please specify a numeric value for ttl."
-msgstr "Geef a.u.b. een nummerieke waarde op voor TTL."
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
+msgid "Printer ppd selection."
+msgstr "Printer PPD selectie"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:376
-msgid "Please specify a numeric value for expire."
-msgstr "Geef a.u.b. een nummerieke waarde op voor verval."
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
+msgid "Select entries to add"
+msgstr "Selecteer de toe te voegen regels"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:380
-msgid "Please specify a numeric value for retry."
-msgstr "Geef a.u.b. een nummerieke waarde op voor opnieuw proberen."
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
+msgid "Display members of department"
+msgstr "Toon leden van afdeling"
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
+msgid "Display members matching"
+msgstr "Toon de overeenkomende leden"
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
+msgid "Regular expression for matching member names"
+msgstr "Reguliere expressie voor overeenkomende lidnamen"
 
 #: plugins/admin/systems/SelectDeviceType.tpl:3
 msgid ""
@@ -9729,61 +9930,22 @@ msgstr "Er is geen help-bestand aanwezig voor deze klasse."
 msgid "There is a duplicate entry in '%s' for '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:97
-msgid "Remove FAI repository extension."
-msgstr "Verwijder printer mogelijkheden"
-
-#: plugins/admin/systems/class_servRepository.inc:98
-msgid ""
-"This server has FAI repository features enabled. You can disable them by "
-"clicking below."
-msgstr ""
-"Deze server heeft FAI verzamelplaats mogelijkheden ingeschakeld. U kunt deze "
-"uitschakelen door de knop hieronder te gebruiken."
-
-#: plugins/admin/systems/class_servRepository.inc:100
-msgid "Add FAI repository extension."
-msgstr "Voeg FAI verzamelplaats extensie toe"
-
-#: plugins/admin/systems/class_servRepository.inc:101
-msgid ""
-"This server has FAI repository features disabled. You can enable them by "
-"clicking below."
-msgstr ""
-"Deze server heeft FAI verzamelplaats mogelijkheden uitgeschakeld. U kunt "
-"deze inschakelen door de knop hieronder te gebruiken."
-
-#: plugins/admin/systems/class_servRepository.inc:144
-#, php-format
-msgid ""
-"You can't delete this release, it is still used by these workstations [%s]. "
-"Please solve this dependencies first, to keep data base consistency."
-msgstr ""
-
-#: plugins/admin/systems/class_servRepository.inc:176
-#, fuzzy, php-format
-msgid ""
-"Be careful editing this release, it is still used by these workstations [%s]."
-msgstr ""
-"U kunt dit apparaat niet verwijderen, aangezien deze nog steeds gebruikt "
-"wordt door deze systemen: '%s'"
-
 #: plugins/admin/systems/class_baseSelectDialog.inc:23
 #, fuzzy
 msgid "Choose a base"
 msgstr "Kies een klassenaam"
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:33
+#: plugins/admin/systems/class_baseSelectDialog.inc:34
 msgid ""
 "Step in the prefered tree and click save to use the current subtree as base. "
 "Or click the image at the end of each entry."
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:50
+#: plugins/admin/systems/class_baseSelectDialog.inc:51
 msgid "Filter entries with this syntax"
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:114
+#: plugins/admin/systems/class_baseSelectDialog.inc:115
 #, fuzzy, php-format
 msgid "Select this base"
 msgstr "Verwijder dit bericht"
@@ -9888,52 +10050,6 @@ msgstr ""
 msgid "Select action to execute for this   group of terminals"
 msgstr "Selecteer de voor deze terminal-groep uit te voeren actie"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
-msgid "Object groups"
-msgstr "Objectgroepen"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:54
-msgid "UNIX accounts"
-msgstr "Unix accounts"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:58 html/getxls.php:149
-#: html/getxls.php:151 html/getxls.php:158 html/getxls.php:179
-#: html/getxls.php:245 html/getxls.php:316
-msgid "Servers"
-msgstr "Servers"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:59
-msgid "Thin Clients"
-msgstr "Thin Clients"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:60
-msgid "Workstations"
-msgstr "Werkstations"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:279
-#, php-format
-msgid "You're about to delete the object group '%s'."
-msgstr "U staat op het punt de objectgroep '%s' te verwijderen."
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:285
-#: plugins/admin/ogroups/class_ogroupManagement.inc:311
-msgid "You are not allowed to delete this object group!"
-msgstr "U heeft geen toestemming deze objectgroep te verwijderen!"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:448
-msgid "Create new object group"
-msgstr "Nieuwe objectgroep aanmaken"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:492
-msgid "Name of object groups"
-msgstr "Naam van objectgroepen"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:541
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
-msgstr "Objectgroep"
-
 #: plugins/admin/ogroups/class_ogroup.inc:144
 msgid "This 'dn' is no object group."
 msgstr "Deze 'dn' is geen objectgroep."
@@ -9970,29 +10086,75 @@ msgstr "werkstations"
 msgid "terminals"
 msgstr "terminals"
 
-#: plugins/admin/ogroups/class_ogroup.inc:288
-msgid "phones"
-msgstr "telefoons"
+#: plugins/admin/ogroups/class_ogroup.inc:288
+msgid "phones"
+msgstr "telefoons"
+
+#: plugins/admin/ogroups/class_ogroup.inc:289
+msgid "printers"
+msgstr "printers"
+
+#: plugins/admin/ogroups/class_ogroup.inc:296
+msgid "and"
+msgstr "en"
+
+#: plugins/admin/ogroups/class_ogroup.inc:508
+msgid "Non existing dn: "
+msgstr "Niet bestaande dn: "
+
+#: plugins/admin/ogroups/class_ogroup.inc:648
+msgid "There is already an object with this cn."
+msgstr "Er bestaat al een object met deze cn."
+
+#: plugins/admin/ogroups/class_ogroup.inc:665
+msgid "You can combine two different object types at maximum only!"
+msgstr "U kunt maximaal twee verschillende object types tegelijk combineren!"
+
+#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+msgid "Object groups"
+msgstr "Objectgroepen"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:54
+msgid "UNIX accounts"
+msgstr "Unix accounts"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:58 html/getxls.php:149
+#: html/getxls.php:151 html/getxls.php:158 html/getxls.php:179
+#: html/getxls.php:245 html/getxls.php:316
+msgid "Servers"
+msgstr "Servers"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:59
+msgid "Thin Clients"
+msgstr "Thin Clients"
 
-#: plugins/admin/ogroups/class_ogroup.inc:289
-msgid "printers"
-msgstr "printers"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:60
+msgid "Workstations"
+msgstr "Werkstations"
 
-#: plugins/admin/ogroups/class_ogroup.inc:296
-msgid "and"
-msgstr "en"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:279
+#, php-format
+msgid "You're about to delete the object group '%s'."
+msgstr "U staat op het punt de objectgroep '%s' te verwijderen."
 
-#: plugins/admin/ogroups/class_ogroup.inc:508
-msgid "Non existing dn: "
-msgstr "Niet bestaande dn: "
+#: plugins/admin/ogroups/class_ogroupManagement.inc:285
+#: plugins/admin/ogroups/class_ogroupManagement.inc:311
+msgid "You are not allowed to delete this object group!"
+msgstr "U heeft geen toestemming deze objectgroep te verwijderen!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:648
-msgid "There is already an object with this cn."
-msgstr "Er bestaat al een object met deze cn."
+#: plugins/admin/ogroups/class_ogroupManagement.inc:449
+msgid "Create new object group"
+msgstr "Nieuwe objectgroep aanmaken"
 
-#: plugins/admin/ogroups/class_ogroup.inc:665
-msgid "You can combine two different object types at maximum only!"
-msgstr "U kunt maximaal twee verschillende object types tegelijk combineren!"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:493
+msgid "Name of object groups"
+msgstr "Naam van objectgroepen"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:542
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
+msgstr "Objectgroep"
 
 #: plugins/admin/ogroups/generic.tpl:9
 msgid "Name of the group"
@@ -10314,6 +10476,73 @@ msgstr "Sta de bellende gebruiker toe op te hangen door * in te drukken"
 msgid "Ring instead of playing background music"
 msgstr "Rinkel i.p.v. achtergrond muziek afspelen"
 
+#: plugins/gofon/fonreports/class_fonreport.inc:6
+msgid "Phone Reports"
+msgstr "Telefoon rapporten"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:96
+#: plugins/gofon/fonreports/class_fonreport.inc:106
+msgid "Can't connect to phone database, no reports can be shown!"
+msgstr ""
+"Kan niet verbinden met de telefoondatabase. Rapporten kunnen niet getoond "
+"worden!"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:110
+msgid "Can't select phone database for report generation!"
+msgstr "Kan de telefoondatabase voor rapportage niet selecteren!"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:212
+msgid "Query for phone database failed!"
+msgstr "De zoekopdracht binnen de telefoon database is mislukt!"
+
+#: plugins/gofon/fonreports/contents.tpl:31
+msgid "Source"
+msgstr "Bron"
+
+#: plugins/gofon/fonreports/contents.tpl:32
+msgid "Destination"
+msgstr "Doel"
+
+#: plugins/gofon/fonreports/contents.tpl:33
+msgid "Channel"
+msgstr "Kanaal"
+
+#: plugins/gofon/fonreports/contents.tpl:36
+msgid "Duration"
+msgstr "Tijdsduur"
+
+#: plugins/gofon/fonreports/main.inc:5
+msgid "Phone reports"
+msgstr "Telefoon rapporten"
+
+#: plugins/gofon/macro/parameter.tpl:3
+msgid "Argument"
+msgstr "Argument"
+
+#: plugins/gofon/macro/parameter.tpl:7
+msgid "type"
+msgstr "type"
+
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+msgid "Macro name"
+msgstr "Macronaam"
+
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
+msgstr "Weer te geven macronaam"
+
+#: plugins/gofon/macro/generic.tpl:22
+msgid "Choose subtree to place macro in"
+msgstr "Selecteer de subtree waaronder deze macro geplaatst wordt"
+
+#: plugins/gofon/macro/generic.tpl:43
+msgid "Visible for user"
+msgstr "Zichtbaar voor gebruikers"
+
+#: plugins/gofon/macro/generic.tpl:52
+msgid "Macro text"
+msgstr "Macro tekst"
+
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:25
 msgid "Phone macros"
 msgstr "Telefoon macro's"
@@ -10328,27 +10557,27 @@ msgstr "U staat op het punt de macro '%s' te verwijderen."
 msgid "You are not allowed to delete this macro!"
 msgstr "U heeft geen toestemming om deze macro te verwijderen!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
 msgid "Create new phone macro"
 msgstr "Nieuwe telefoonmacro aanmaken"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
 msgid "Visible"
 msgstr "Zichtbaar"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:348
 msgid "This table displays all phone macros, in the selected tree."
 msgstr "Deze tabel toont alle telefoonmacro's in de geselecteerde tree"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
 msgid "Macro"
 msgstr "Macro"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
 msgid "visible"
 msgstr "zichtbaar"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
 msgid "invisible"
 msgstr "onzichtbaar"
 
@@ -10436,25 +10665,31 @@ msgstr "De macro lengte moet minder dan 100 regels zijn"
 msgid "Please choose a valid  base."
 msgstr "Geef a.u.b. een geldige basis op."
 
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
-msgid "Macro name"
-msgstr "Macronaam"
+#: plugins/gofon/macro/headpage.tpl:6
+msgid "List of macros"
+msgstr "Lijst met macro's"
 
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
-msgstr "Weer te geven macronaam"
+#: plugins/gofon/macro/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit and remove selected macros. You may want "
+"to use the range selector on top of the macro listbox, when working with a "
+"large number of macros."
+msgstr ""
+"Dit menu maakt het mogelijk om geselecteerde macro's toe te voegen, bewerken "
+"of verwijderen. Indien u veel macro's heeft, dan is het aan te raden de "
+"selectie mogelijkheden te gebruiken."
 
-#: plugins/gofon/macro/generic.tpl:22
-msgid "Choose subtree to place macro in"
-msgstr "Selecteer de subtree waaronder deze macro geplaatst wordt"
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros matching"
+msgstr "Toon overeenkomende macro's"
 
-#: plugins/gofon/macro/generic.tpl:43
-msgid "Visible for user"
-msgstr "Zichtbaar voor gebruikers"
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros  matching"
+msgstr "Toon overeenkomende macro's"
 
-#: plugins/gofon/macro/generic.tpl:52
-msgid "Macro text"
-msgstr "Macro tekst"
+#: plugins/gofon/macro/headpage.tpl:41
+msgid "Regular expression for matching macro names"
+msgstr "Reguliere expressie voor overeenkomende macronamen"
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:245
 msgid "String"
@@ -10500,43 +10735,14 @@ msgstr ""
 "Parameter hoeveelheid van de macro is veranderd. U dient elke gebruiker, die "
 "deze macro '%s' gebruik, bij te werken."
 
-#: plugins/gofon/macro/headpage.tpl:6
-msgid "List of macros"
-msgstr "Lijst met macro's"
-
-#: plugins/gofon/macro/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit and remove selected macros. You may want "
-"to use the range selector on top of the macro listbox, when working with a "
-"large number of macros."
-msgstr ""
-"Dit menu maakt het mogelijk om geselecteerde macro's toe te voegen, bewerken "
-"of verwijderen. Indien u veel macro's heeft, dan is het aan te raden de "
-"selectie mogelijkheden te gebruiken."
-
-#: plugins/gofon/macro/headpage.tpl:38
-msgid "Display macros matching"
-msgstr "Toon overeenkomende macro's"
-
-#: plugins/gofon/macro/headpage.tpl:38
-msgid "Display macros  matching"
-msgstr "Toon overeenkomende macro's"
-
-#: plugins/gofon/macro/headpage.tpl:41
-msgid "Regular expression for matching macro names"
-msgstr "Reguliere expressie voor overeenkomende macronamen"
-
 #: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
 msgid "Phone macro management"
 msgstr "Telefoon macrobeheer"
 
-#: plugins/gofon/macro/parameter.tpl:3
-msgid "Argument"
-msgstr "Argument"
-
-#: plugins/gofon/macro/parameter.tpl:7
-msgid "type"
-msgstr "type"
+#: plugins/gofon/phoneaccount/main.inc:122
+#: plugins/gofon/phoneaccount/paste_generic.tpl:1
+msgid "Phone settings"
+msgstr "Telefoon instellingen"
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:118
 msgid "no macro"
@@ -10665,44 +10871,6 @@ msgstr "Telefoon PIN-code"
 msgid "Phone macro"
 msgstr "Telefoon macro"
 
-#: plugins/gofon/phoneaccount/main.inc:122
-#: plugins/gofon/phoneaccount/paste_generic.tpl:1
-msgid "Phone settings"
-msgstr "Telefoon instellingen"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
-msgid "Phone conferences"
-msgstr "Telefoon conferenties"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-msgid "Management"
-msgstr "Beheer"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
-msgid "Create new conference"
-msgstr "Maak nieuwe conferentie aan"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
-msgid "New conference"
-msgstr "Nieuwe conferentie"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
-msgid "This table displays all available conference rooms."
-msgstr "Deze tabel geeft alle beschikbaare conferentie-kamers weer"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:309
-msgid "Name - Number"
-msgstr "Naam - nummer"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
-#: plugins/gofon/conference/generic.tpl:107
-msgid "PIN"
-msgstr "PIN-code"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:365
-msgid "Conference"
-msgstr "Conferentie"
-
 #: plugins/gofon/conference/generic.tpl:13
 msgid "Conference name"
 msgstr "Conferentienaam"
@@ -10724,6 +10892,11 @@ msgstr "Geldigheidsduur (in dagen)"
 msgid "Preset PIN"
 msgstr "Voorgedefinieerde PIN-code"
 
+#: plugins/gofon/conference/generic.tpl:107
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
+msgid "PIN"
+msgstr "PIN-code"
+
 #: plugins/gofon/conference/generic.tpl:113
 msgid "Record conference"
 msgstr "Conferentie opnemen"
@@ -10744,9 +10917,55 @@ msgstr "Activeer sessiemenu"
 msgid "Announce users joining or leaving the conference"
 msgstr "Kondig binnenkomende en verlatende gebruikers aan"
 
-#: plugins/gofon/conference/generic.tpl:156
-msgid "Count users"
-msgstr "Tel het aantal gebruikers"
+#: plugins/gofon/conference/generic.tpl:156
+msgid "Count users"
+msgstr "Tel het aantal gebruikers"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+msgid "Phone conferences"
+msgstr "Telefoon conferenties"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Management"
+msgstr "Beheer"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
+msgid "Create new conference"
+msgstr "Maak nieuwe conferentie aan"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
+msgid "New conference"
+msgstr "Nieuwe conferentie"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:306
+msgid "This table displays all available conference rooms."
+msgstr "Deze tabel geeft alle beschikbaare conferentie-kamers weer"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
+msgid "Name - Number"
+msgstr "Naam - nummer"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:366
+msgid "Conference"
+msgstr "Conferentie"
+
+#: plugins/gofon/conference/headpage.tpl:6
+msgid "List of conference rooms"
+msgstr "Lijst met conferentie-kamers"
+
+#: plugins/gofon/conference/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected phone conferences. "
+"Having a large number of phone conferences, you might prefer the range "
+"selectors on top of the conferences list."
+msgstr ""
+"Dit menu maakt het mogelijk om geselecteerde telefoon conferenties toe te "
+"voegen, bewerken of verwijderen. Indien u veel conferenties heeft is het aan "
+"te raden de selectie mogelijkheden te gebruiken."
+
+#: plugins/gofon/conference/headpage.tpl:36
+msgid "Regular expression for        matching user names"
+msgstr "Reguliere expressie voor       overeenkomende gebruikersnamen"
 
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
 msgid ""
@@ -10781,67 +11000,10 @@ msgstr ""
 "Kan geen veranderingen opslaan in de Asterisk database. Er is geen MySQL "
 "extensie beschikbaar. Controleer uw PHP installatie."
 
-#: plugins/gofon/conference/headpage.tpl:6
-msgid "List of conference rooms"
-msgstr "Lijst met conferentie-kamers"
-
-#: plugins/gofon/conference/headpage.tpl:24
-msgid ""
-"This menu allows you to create, delete and edit selected phone conferences. "
-"Having a large number of phone conferences, you might prefer the range "
-"selectors on top of the conferences list."
-msgstr ""
-"Dit menu maakt het mogelijk om geselecteerde telefoon conferenties toe te "
-"voegen, bewerken of verwijderen. Indien u veel conferenties heeft is het aan "
-"te raden de selectie mogelijkheden te gebruiken."
-
-#: plugins/gofon/conference/headpage.tpl:36
-msgid "Regular expression for        matching user names"
-msgstr "Reguliere expressie voor       overeenkomende gebruikersnamen"
-
 #: plugins/gofon/conference/main.inc:38 plugins/gofon/conference/main.inc:40
 msgid "Conference management"
 msgstr "Conferentie beheer"
 
-#: plugins/gofon/fonreports/class_fonreport.inc:6
-msgid "Phone Reports"
-msgstr "Telefoon rapporten"
-
-#: plugins/gofon/fonreports/class_fonreport.inc:96
-#: plugins/gofon/fonreports/class_fonreport.inc:106
-msgid "Can't connect to phone database, no reports can be shown!"
-msgstr ""
-"Kan niet verbinden met de telefoondatabase. Rapporten kunnen niet getoond "
-"worden!"
-
-#: plugins/gofon/fonreports/class_fonreport.inc:110
-msgid "Can't select phone database for report generation!"
-msgstr "Kan de telefoondatabase voor rapportage niet selecteren!"
-
-#: plugins/gofon/fonreports/class_fonreport.inc:212
-msgid "Query for phone database failed!"
-msgstr "De zoekopdracht binnen de telefoon database is mislukt!"
-
-#: plugins/gofon/fonreports/contents.tpl:31
-msgid "Source"
-msgstr "Bron"
-
-#: plugins/gofon/fonreports/contents.tpl:32
-msgid "Destination"
-msgstr "Doel"
-
-#: plugins/gofon/fonreports/contents.tpl:33
-msgid "Channel"
-msgstr "Kanaal"
-
-#: plugins/gofon/fonreports/contents.tpl:36
-msgid "Duration"
-msgstr "Tijdsduur"
-
-#: plugins/gofon/fonreports/main.inc:5
-msgid "Phone reports"
-msgstr "Telefoon rapporten"
-
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
 msgstr "Thin Client"
@@ -10886,29 +11048,74 @@ msgstr "Het GOsa team"
 msgid "Welcome %s!"
 msgstr "Welkom %s!"
 
-#: include/class_plugin.inc:465
-#, php-format
+#: include/class_mail-methods-cyrus.inc:39
 msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+"Warning: Account has an invalid mailserver string! Please check the mail "
+"server settings in the mail tab."
 msgstr ""
-"Het commando '%s' dat gespecificeerd is als POSTCREATE voor module '%s' "
-"bestaat niet."
+"Waarschuwing: Het account heeft een ongeldige mailserver string! Controleer "
+"a.u.b. de mailserver installingen in de E-mail tab."
 
-#: include/class_plugin.inc:493 include/class_password-methods.inc:181
-#, php-format
+#: include/class_mail-methods-cyrus.inc:52
 msgid ""
-"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+"Warning: IMAP Server cannot be reached! If you save this account, some mail "
+"settings will not be stored on your server!"
 msgstr ""
-"Het commando '%s' dat gespecificeerd is als POSTMODIFY voor module '%s' "
-"bestaat niet."
+"Waarschuwing: De IMAP server kan niet bereikt worden! Indien u dit account "
+"bewaart dan zullen sommige E-mail instellingen niet opgeslagen worden op de "
+"mail server!"
 
-#: include/class_plugin.inc:521
+#: include/class_mail-methods-cyrus.inc:115
 #, php-format
-msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgid "Can't create IMAP mailbox. Server says '%s'."
+msgstr "Kan de IMAP mailbox niet aanmaken. De IMAP server meldt: '%s'."
+
+#: include/class_mail-methods-cyrus.inc:131
+#, php-format
+msgid "Can't write IMAP quota. Server says '%s'."
 msgstr ""
-"Het commando '%s' dat gespecificeerd is als POSTREMOVE voor module '%s' "
-"bestaat niet."
+"Kan de IMAP quota instellingen niet wegschrijven. De IMAP server meldt: '%s'."
+
+#: include/class_mail-methods-cyrus.inc:155
+msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
+msgstr ""
+"Waarschuwing: De PHP functie 'imap_getacl' is niet voorhanden. "
+"Toegangsbeheer informatie kan niet veranderd worden."
+
+#: include/class_mail-methods-cyrus.inc:173
+msgid "Warning: imap_getacl is not available, can't get imap permissions!"
+msgstr ""
+"Waarschuwing: De PHP functie 'imap_get_acl' is niet voorhanden. Imap rechten "
+"kunnen niet opgehaald worden!"
+
+#: include/class_mail-methods-cyrus.inc:195
+#, php-format
+msgid "Can't remove IMAP mailbox. Server says '%s'."
+msgstr "Kan de IMAP mailbox niet verwijderen. De server meldt: '%s'."
+
+#: include/class_mail-methods-cyrus.inc:223
+#, php-format
+msgid "Can't log into SIEVE server. Server says '%s'."
+msgstr "Kan niet op de SIEVE server inloggen. De server meldt: '%s'."
+
+#: include/class_mail-methods-cyrus.inc:236
+#, php-format
+msgid "Can't get sieve script. Server says '%s'."
+msgstr "Kan het SIEVE script niet ophalen. De server meldt: '%s'."
+
+#: include/class_mail-methods-cyrus.inc:307
+#, php-format
+msgid "Can't send sieve script. Server says '%s'."
+msgstr "Kan het SIEVE script niet versturen. De server meldt: '%s'."
+
+#: include/class_mail-methods-cyrus.inc:311
+#, php-format
+msgid "Can't activate GOsa sieve script. Server says '%s'."
+msgstr "Kan het GOsa SIEVE script niet activeren. De server meldt: '%s'."
+
+#: include/class_debconfTemplate.inc:250
+msgid "This package has no debconf options."
+msgstr "Dit pakket heeft geen debconf mogelijkheden."
 
 #: include/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
@@ -11405,6 +11612,7 @@ msgstr "De aanmelding op de LDAP server is mislukt. De reden was: '%s'."
 #: include/functions_setup.inc:1082 html/index.php:181
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
+#: ihtml/themes/lhs/setup_useradmin.tpl:6
 msgid ""
 "You're missing an administrative account for GOsa, you'll not be able to "
 "administrate anything!"
@@ -11417,6 +11625,14 @@ msgstr ""
 msgid "Setting the password failed. LDAP server says '%s'."
 msgstr "Instellen van het wachtwoord is mislukt. De LDAP server meldt: '%s'."
 
+#: include/class_password-methods.inc:181 include/class_plugin.inc:493
+#, php-format
+msgid ""
+"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Het commando '%s' dat gespecificeerd is als POSTMODIFY voor module '%s' "
+"bestaat niet."
+
 #: include/class_password-methods.inc:202
 msgid ""
 "Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
@@ -11458,22 +11674,6 @@ msgstr ""
 msgid "%s%% hit rate in file %s"
 msgstr "%s%% resultaat in bestand %s"
 
-#: include/class_password-methods-kerberos.inc:43
-msgid ""
-"Warning: Can't set kerberos password. Your PHP version has no kerberos "
-"support, password has not been changed."
-msgstr ""
-"Waarschuwing: Kan het kerberos wachtwoord niet instellen. Uw PHP versie "
-"heeft geen kerberos ondersteuning. Wachtwoord is niet veranderd."
-
-#: include/class_password-methods-kerberos.inc:52
-msgid "Kerberos database communication failed!"
-msgstr "De kerberos database communicatie is mislukt!"
-
-#: include/class_password-methods-kerberos.inc:59
-msgid "Changing password in kerberos database failed!"
-msgstr "Het veranderen van het wachtwoord in de kerberos database is mislukt!"
-
 #: include/class_ppdManager.inc:13
 #, php-format
 msgid "PPD manager : The specified path '%s' doesn't exists."
@@ -11514,6 +11714,22 @@ msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 "Het parsen van PPD bestand %s is mislukt - er is geen informatie gevonden."
 
+#: include/class_password-methods-kerberos.inc:43
+msgid ""
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
+msgstr ""
+"Waarschuwing: Kan het kerberos wachtwoord niet instellen. Uw PHP versie "
+"heeft geen kerberos ondersteuning. Wachtwoord is niet veranderd."
+
+#: include/class_password-methods-kerberos.inc:52
+msgid "Kerberos database communication failed!"
+msgstr "De kerberos database communicatie is mislukt!"
+
+#: include/class_password-methods-kerberos.inc:59
+msgid "Changing password in kerberos database failed!"
+msgstr "Het veranderen van het wachtwoord in de kerberos database is mislukt!"
+
 #: include/class_certificate.inc:35
 msgid "Can't open specified file, check accessibility and or existence"
 msgstr ""
@@ -11719,6 +11935,7 @@ msgstr ""
 #: include/class_pluglist.inc:130 ihtml/themes/altlinux/framework.tpl:14
 #: ihtml/themes/altlinux/framework.tpl:24
 #: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
+#: ihtml/themes/lhs/framework.tpl:14 ihtml/themes/lhs/framework.tpl:24
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
 "changes?"
@@ -11741,27 +11958,27 @@ msgstr ""
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr "SID en/of RIDBASE ontbreken in uw configuratie!"
 
-#: include/class_ldap.inc:406
+#: include/class_ldap.inc:405
 #, fuzzy, php-format
-msgid "Creating duplicate of %s in %s"
+msgid "Creating copy of %s"
 msgstr "Gebruikerslijst van %s in %s "
 
-#: include/class_ldap.inc:409
+#: include/class_ldap.inc:408
 #, fuzzy
 msgid "Processing"
 msgstr "Processor"
 
-#: include/class_ldap.inc:515
+#: include/class_ldap.inc:448
+#, fuzzy
+msgid "Error while fetching source dn - aborted!"
+msgstr "Fout bij het schrijven van de printer"
+
+#: include/class_ldap.inc:511
 #, php-format
 msgid "Unknown FAIstate %s"
 msgstr "Onbekende FAI status %s"
 
-#: include/class_ldap.inc:558
-#, fuzzy
-msgid "Successfully finished"
-msgstr "Installatie beëindigd"
-
-#: include/class_ldap.inc:635
+#: include/class_ldap.inc:632
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -11770,101 +11987,59 @@ msgstr ""
 "Automatische aanmaak van object type '%s' wordt momenteel niet ondersteund. "
 "Rapporteer dit a.u.b. aan het GOsa team."
 
-#: include/class_ldap.inc:897
+#: include/class_ldap.inc:894
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-"Dit is geen geldige DN: '%s'. Een blok dat geïmporteerd wordt, dient te "
-"beginnen met 'dn: ...' op regel %s"
-
-#: include/class_ldap.inc:910
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
-msgstr "De dn: '%s' (op regel %s) bestaat al in de LDAP database."
-
-#: include/class_ldap.inc:926
-#, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
-msgstr ""
-"Fout bij het importeren van dn: '%s', controleer uw LDIF bestand a.u.b. "
-"vanaf regel %s!"
-
-#: include/class_debconfTemplate.inc:250
-msgid "This package has no debconf options."
-msgstr "Dit pakket heeft geen debconf mogelijkheden."
-
-#: include/class_mail-methods-cyrus.inc:39
-msgid ""
-"Warning: Account has an invalid mailserver string! Please check the mail "
-"server settings in the mail tab."
-msgstr ""
-"Waarschuwing: Het account heeft een ongeldige mailserver string! Controleer "
-"a.u.b. de mailserver installingen in de E-mail tab."
-
-#: include/class_mail-methods-cyrus.inc:52
-msgid ""
-"Warning: IMAP Server cannot be reached! If you save this account, some mail "
-"settings will not be stored on your server!"
-msgstr ""
-"Waarschuwing: De IMAP server kan niet bereikt worden! Indien u dit account "
-"bewaart dan zullen sommige E-mail instellingen niet opgeslagen worden op de "
-"mail server!"
-
-#: include/class_mail-methods-cyrus.inc:115
-#, php-format
-msgid "Can't create IMAP mailbox. Server says '%s'."
-msgstr "Kan de IMAP mailbox niet aanmaken. De IMAP server meldt: '%s'."
-
-#: include/class_mail-methods-cyrus.inc:131
-#, php-format
-msgid "Can't write IMAP quota. Server says '%s'."
-msgstr ""
-"Kan de IMAP quota instellingen niet wegschrijven. De IMAP server meldt: '%s'."
-
-#: include/class_mail-methods-cyrus.inc:155
-msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
-msgstr ""
-"Waarschuwing: De PHP functie 'imap_getacl' is niet voorhanden. "
-"Toegangsbeheer informatie kan niet veranderd worden."
-
-#: include/class_mail-methods-cyrus.inc:173
-msgid "Warning: imap_getacl is not available, can't get imap permissions!"
-msgstr ""
-"Waarschuwing: De PHP functie 'imap_get_acl' is niet voorhanden. Imap rechten "
-"kunnen niet opgehaald worden!"
-
-#: include/class_mail-methods-cyrus.inc:195
-#, php-format
-msgid "Can't remove IMAP mailbox. Server says '%s'."
-msgstr "Kan de IMAP mailbox niet verwijderen. De server meldt: '%s'."
+"in line %s"
+msgstr ""
+"Dit is geen geldige DN: '%s'. Een blok dat geïmporteerd wordt, dient te "
+"beginnen met 'dn: ...' op regel %s"
 
-#: include/class_mail-methods-cyrus.inc:223
+#: include/class_ldap.inc:907
 #, php-format
-msgid "Can't log into SIEVE server. Server says '%s'."
-msgstr "Kan niet op de SIEVE server inloggen. De server meldt: '%s'."
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr "De dn: '%s' (op regel %s) bestaat al in de LDAP database."
 
-#: include/class_mail-methods-cyrus.inc:236
+#: include/class_ldap.inc:923
 #, php-format
-msgid "Can't get sieve script. Server says '%s'."
-msgstr "Kan het SIEVE script niet ophalen. De server meldt: '%s'."
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+"Fout bij het importeren van dn: '%s', controleer uw LDIF bestand a.u.b. "
+"vanaf regel %s!"
 
-#: include/class_mail-methods-cyrus.inc:307
+#: include/class_plugin.inc:465
 #, php-format
-msgid "Can't send sieve script. Server says '%s'."
-msgstr "Kan het SIEVE script niet versturen. De server meldt: '%s'."
+msgid ""
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Het commando '%s' dat gespecificeerd is als POSTCREATE voor module '%s' "
+"bestaat niet."
 
-#: include/class_mail-methods-cyrus.inc:311
+#: include/class_plugin.inc:521
 #, php-format
-msgid "Can't activate GOsa sieve script. Server says '%s'."
-msgstr "Kan het GOsa SIEVE script niet activeren. De server meldt: '%s'."
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Het commando '%s' dat gespecificeerd is als POSTREMOVE voor module '%s' "
+"bestaat niet."
 
 #: include/class_CopyPasteHandler.inc:172
 #, fuzzy, php-format
 msgid "You are going to copy the entry '%s'."
 msgstr "U staat op het punt de invoer %s te verwijderen."
 
+#: html/helpviewer.php:116
+msgid "There is no helpfile specified for this class."
+msgstr "Er is geen help-bestand aanwezig voor deze klasse."
+
+#: html/helpviewer.php:226
+#, php-format
+msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
+msgstr ""
+"Help directory '%s' is niet toegankelijk. Er kunnen geen helpbestanden "
+"gelezen worden."
+
 #: html/getvcard.php:36
 msgid "Error: getcvard.php needs a parameter to export a vcard!"
 msgstr ""
@@ -12036,17 +12211,6 @@ msgid ""
 "page before logging in!"
 msgstr ""
 
-#: html/helpviewer.php:116
-msgid "There is no helpfile specified for this class."
-msgstr "Er is geen help-bestand aanwezig voor deze klasse."
-
-#: html/helpviewer.php:226
-#, php-format
-msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
-msgstr ""
-"Help directory '%s' is niet toegankelijk. Er kunnen geen helpbestanden "
-"gelezen worden."
-
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
 msgstr "Kan niet verbinden met de database server!"
@@ -12059,6 +12223,16 @@ msgstr "De opgegeven database kon niet geselecteerd worden!"
 msgid "Database query failed!"
 msgstr "De database zoekopdracht is mislukt"
 
+#: html/getkiosk.php:25
+#, php-format
+msgid "Can't open file '%s', possibly the file does not exist."
+msgstr "Kan '%s' niet openen. Het is mogelijk dat het bestand niet bestaat."
+
+#: html/getkiosk.php:30
+#, php-format
+msgid "Can't read file '%s', check permissions."
+msgstr "Kan bestand '%s' niet openen. Controleer de bestandspermissies a.u.b."
+
 #: html/main.php:151
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
@@ -12086,16 +12260,6 @@ msgstr ""
 "Bij het genereren van deze pagina zijn er fouten geconstateerd bij de W3C "
 "controle!"
 
-#: html/getkiosk.php:25
-#, php-format
-msgid "Can't open file '%s', possibly the file does not exist."
-msgstr "Kan '%s' niet openen. Het is mogelijk dat het bestand niet bestaat."
-
-#: html/getkiosk.php:30
-#, php-format
-msgid "Can't read file '%s', check permissions."
-msgstr "Kan bestand '%s' niet openen. Controleer de bestandspermissies a.u.b."
-
 #: html/get_attachment.php:47
 msgid ""
 "Can't connect to glpi database, there is no mysl extension available in your "
@@ -12122,11 +12286,45 @@ msgstr ""
 msgid "Can't open file '%s'."
 msgstr "Kan bestand '%s' niet openen."
 
+#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
+#: ihtml/themes/lhs/sizelimit.tpl:3
+msgid ""
+"The size limit option makes LDAP operations faster and saves the LDAP server "
+"from getting too much load. The easiest way to handle big databases without "
+"long timeouts would be to limit your search to smaller values and use "
+"filters to get the entries you are looking for."
+msgstr ""
+"De grootte limiet optie maakt LDAP bewerkingen sneller en behoedt de LDAP "
+"server voor een te grote werkdruk. De eenvoudigste manier om met grote "
+"databases te werken zonder lange timeouts is door zoekopdrachten in grootte "
+"te beperken en door filters te gebruiken voor de informatie die u zoekt."
+
+#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
+#: ihtml/themes/lhs/sizelimit.tpl:6
+msgid "Please choose the way to react for this session"
+msgstr "Kies a.u.b. de manier waarop gereageerd moet worden voor deze sessie"
+
+#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
+#: ihtml/themes/lhs/sizelimit.tpl:9
+msgid "ignore this error and show all entries the LDAP server returns"
+msgstr "Negeer deze fout en toon alle gegevens die de LDAP server teruggeeft"
+
+#: ihtml/themes/altlinux/sizelimit.tpl:10
+#: ihtml/themes/default/sizelimit.tpl:10 ihtml/themes/lhs/sizelimit.tpl:10
+msgid ""
+"ignore this error and show all entries that fit into the defined sizelimit "
+"and let me use filters instead"
+msgstr ""
+"Negeer deze fout en toon alle gegevens die passen binnen de gedefiniëerde "
+"grootte limiet en laat me daarvoor in de plaats filters gebruiken"
+
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
+#: ihtml/themes/lhs/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr "Er is een sessie conflict gedetecteerd"
 
 #: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/default/conflict.tpl:6
+#: ihtml/themes/lhs/conflict.tpl:6
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
@@ -12140,6 +12338,7 @@ msgstr ""
 "<b>Uitloggen</b> knop wordt deze sessie afgesloten."
 
 #: ihtml/themes/altlinux/conflict.tpl:10 ihtml/themes/default/conflict.tpl:10
+#: ihtml/themes/lhs/conflict.tpl:10
 msgid ""
 "Ignoring this message will change/destroy the data you're currently editing, "
 "so please close multiple windows and log in again."
@@ -12149,11 +12348,34 @@ msgstr ""
 "opnieuw in."
 
 #: ihtml/themes/altlinux/conflict.tpl:14 ihtml/themes/default/conflict.tpl:14
+#: ihtml/themes/lhs/conflict.tpl:14
 msgid "Logout"
 msgstr "Uitloggen"
 
+#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
+#: ihtml/themes/lhs/login.tpl:17
+msgid "Please use your <i>username</i> and <i>password</i> to log in"
+msgstr "Voer uw <i>gebruikersnaam</i> en <i>wachtwoord</i> in"
+
+#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
+#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
+#: ihtml/themes/lhs/login.tpl:46 ihtml/themes/lhs/login.tpl:49
+msgid "Directory"
+msgstr "Directory"
+
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:57
+#: ihtml/themes/lhs/login.tpl:57
+msgid "Sign in"
+msgstr "Inloggen"
+
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:58
+#: ihtml/themes/lhs/login.tpl:58
+msgid "Click here to log in"
+msgstr "Klik hier om in te loggen"
+
 #: ihtml/themes/altlinux/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
+#: ihtml/themes/lhs/setup_introduction.tpl:1
 msgid "Welcome to the GOsa setup!"
 msgstr "Welkom bij het GOsa installatie programma!"
 
@@ -12176,11 +12398,13 @@ msgstr ""
 
 #: ihtml/themes/altlinux/setup_useradmin.tpl:3
 #: ihtml/themes/default/setup_useradmin.tpl:3
+#: ihtml/themes/lhs/setup_useradmin.tpl:3
 msgid "You already have an Administrative Account and a Group."
 msgstr "U heeft al een Administratief Account en Groep"
 
 #: ihtml/themes/altlinux/setup_useradmin.tpl:10
 #: ihtml/themes/default/setup_useradmin.tpl:10
+#: ihtml/themes/lhs/setup_useradmin.tpl:10
 msgid ""
 "To provide full administrative access to GOsa, you need to create a special "
 "group which contains the administrative user. The setup program can assist "
@@ -12192,97 +12416,38 @@ msgstr ""
 "installatie programma kan u bij deze taak helpen. Voer hieronder de gewenste "
 "gebruikersnaam en wachtwoord in om de ontbrekende gegevens aan te maken."
 
-#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
-msgid "Please use your <i>username</i> and <i>password</i> to log in"
-msgstr "Voer uw <i>gebruikersnaam</i> en <i>wachtwoord</i> in"
-
-#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
-#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
-msgid "Directory"
-msgstr "Directory"
-
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:57
-msgid "Sign in"
-msgstr "Inloggen"
-
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:58
-msgid "Click here to log in"
-msgstr "Klik hier om in te loggen"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
-msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
-"filters to get the entries you are looking for."
-msgstr ""
-"De grootte limiet optie maakt LDAP bewerkingen sneller en behoedt de LDAP "
-"server voor een te grote werkdruk. De eenvoudigste manier om met grote "
-"databases te werken zonder lange timeouts is door zoekopdrachten in grootte "
-"te beperken en door filters te gebruiken voor de informatie die u zoekt."
-
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
-msgid "Please choose the way to react for this session"
-msgstr "Kies a.u.b. de manier waarop gereageerd moet worden voor deze sessie"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
-msgid "ignore this error and show all entries the LDAP server returns"
-msgstr "Negeer deze fout en toon alle gegevens die de LDAP server teruggeeft"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:10
-#: ihtml/themes/default/sizelimit.tpl:10
-msgid ""
-"ignore this error and show all entries that fit into the defined sizelimit "
-"and let me use filters instead"
-msgstr ""
-"Negeer deze fout en toon alle gegevens die passen binnen de gedefiniëerde "
-"grootte limiet en laat me daarvoor in de plaats filters gebruiken"
-
 #: ihtml/themes/altlinux/framework.tpl:15
-#: ihtml/themes/default/framework.tpl:15
+#: ihtml/themes/default/framework.tpl:15 ihtml/themes/lhs/framework.tpl:15
 msgid "Main"
 msgstr "Hoofdmenu"
 
 #: ihtml/themes/altlinux/framework.tpl:20
-#: ihtml/themes/default/framework.tpl:20
+#: ihtml/themes/default/framework.tpl:20 ihtml/themes/lhs/framework.tpl:20
 msgid "Help"
 msgstr "Help"
 
 #: ihtml/themes/altlinux/framework.tpl:25
-#: ihtml/themes/default/framework.tpl:25
+#: ihtml/themes/default/framework.tpl:25 ihtml/themes/lhs/framework.tpl:25
 msgid "Sign out"
 msgstr "Uitloggen"
 
 #: ihtml/themes/altlinux/framework.tpl:33
-#: ihtml/themes/default/framework.tpl:33
+#: ihtml/themes/default/framework.tpl:33 ihtml/themes/lhs/framework.tpl:33
 msgid "Signed in:"
 msgstr "Aangemeld:"
 
-#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
-msgid "Locking conflict detected"
-msgstr "Er is een blokkade conflict gedetecteerd"
-
-#: ihtml/themes/altlinux/islocked.tpl:9
-msgid ""
-"If this lock detection is false, the other person has obviously closed the "
-"webbrowser during the edit operation. You may delete the lockfile in this "
-"case by pressing the <i>Remove</i> button."
-msgstr ""
-"Indien deze blokkade detectie foutief is dan heeft de andere persoon de "
-"webbrowser afgesloten tijdens de bewerking. U kunt de blokkade in dit geval "
-"verwijderen door de <i>Verwijderen</i> knop te gebruiken."
-
 #: ihtml/themes/altlinux/setup_step2.tpl:1
 #: ihtml/themes/altlinux/setup_step3.tpl:1
 #: ihtml/themes/altlinux/setup_step4.tpl:1
 #: ihtml/themes/default/setup_step2.tpl:1
 #: ihtml/themes/default/setup_step3.tpl:1
-#: ihtml/themes/default/setup_step4.tpl:1
+#: ihtml/themes/default/setup_step4.tpl:1 ihtml/themes/lhs/setup_step2.tpl:1
+#: ihtml/themes/lhs/setup_step3.tpl:1 ihtml/themes/lhs/setup_step4.tpl:1
 msgid "Setup continued..."
 msgstr "Installatie vervolg..."
 
 #: ihtml/themes/altlinux/setup_step2.tpl:4
-#: ihtml/themes/default/setup_step2.tpl:4
+#: ihtml/themes/default/setup_step2.tpl:4 ihtml/themes/lhs/setup_step2.tpl:4
 msgid ""
 "Step two looks for a set of helper programms and checks if they have the "
 "correct minimum version."
@@ -12290,8 +12455,23 @@ msgstr ""
 "Stap twee zoekt naar een collectie hulpprogramma's en controleert of deze "
 "programma's de correcte minimum versies hebben."
 
+#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
+#: ihtml/themes/lhs/islocked.tpl:2
+msgid "Locking conflict detected"
+msgstr "Er is een blokkade conflict gedetecteerd"
+
+#: ihtml/themes/altlinux/islocked.tpl:9 ihtml/themes/lhs/islocked.tpl:9
+msgid ""
+"If this lock detection is false, the other person has obviously closed the "
+"webbrowser during the edit operation. You may delete the lockfile in this "
+"case by pressing the <i>Remove</i> button."
+msgstr ""
+"Indien deze blokkade detectie foutief is dan heeft de andere persoon de "
+"webbrowser afgesloten tijdens de bewerking. U kunt de blokkade in dit geval "
+"verwijderen door de <i>Verwijderen</i> knop te gebruiken."
+
 #: ihtml/themes/altlinux/setup_step3.tpl:4
-#: ihtml/themes/default/setup_step3.tpl:4
+#: ihtml/themes/default/setup_step3.tpl:4 ihtml/themes/lhs/setup_step3.tpl:4
 msgid ""
 "Now we're going include your LDAP server and create an initial "
 "configuration. After you've entered the server URI below, a quick check is "
@@ -12306,7 +12486,7 @@ msgstr ""
 "opgebouwd is worden later gevraagd"
 
 #: ihtml/themes/altlinux/setup_step3.tpl:10
-#: ihtml/themes/default/setup_step3.tpl:10
+#: ihtml/themes/default/setup_step3.tpl:10 ihtml/themes/lhs/setup_step3.tpl:10
 msgid ""
 "Please enter the server URI to allow the setup to connect your LDAP server "
 "<i>(Example: ldap://your.server:389).</i>"
@@ -12315,7 +12495,7 @@ msgstr ""
 "verbinden met uw LDAP server <i>(Bijvoorbeeld: ldap://uw.server:389).</i>"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:2
-#: ihtml/themes/default/setup_step4.tpl:2
+#: ihtml/themes/default/setup_step4.tpl:2 ihtml/themes/lhs/setup_step4.tpl:2
 msgid ""
 "The following fields allow the basic configuration of GOsa's behaviour and "
 "affect various properties in your main configuration."
@@ -12324,19 +12504,19 @@ msgstr ""
 "beïnvloeden diverse eigenschappen in uw hoofd configuratie."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:7
-#: ihtml/themes/default/setup_step4.tpl:7
+#: ihtml/themes/default/setup_step4.tpl:7 ihtml/themes/lhs/setup_step4.tpl:7
 msgid "Enter a description for the location you're configuring here"
 msgstr ""
 "Geef a.u.b. een omschrijving van de locatie die u hier aan het configureren "
 "bent"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:11
-#: ihtml/themes/default/setup_step4.tpl:11
+#: ihtml/themes/default/setup_step4.tpl:11 ihtml/themes/lhs/setup_step4.tpl:11
 msgid "Location name"
 msgstr "Naam van de locatie"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:18
-#: ihtml/themes/default/setup_step4.tpl:18
+#: ihtml/themes/default/setup_step4.tpl:18 ihtml/themes/lhs/setup_step4.tpl:18
 msgid ""
 "GOsa always acts as admin and manages access rights internally. This is a "
 "workaround till OpenLDAP's in directory ACI's are fully implemented. For "
@@ -12348,17 +12528,17 @@ msgstr ""
 "beheerders DN en het bijbehorende wachtwoord nodig."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:23
-#: ihtml/themes/default/setup_step4.tpl:23
+#: ihtml/themes/default/setup_step4.tpl:23 ihtml/themes/lhs/setup_step4.tpl:23
 msgid "Admin DN"
 msgstr "Beheerders DN"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:27
-#: ihtml/themes/default/setup_step4.tpl:27
+#: ihtml/themes/default/setup_step4.tpl:27 ihtml/themes/lhs/setup_step4.tpl:27
 msgid "Admin password"
 msgstr "Beheerders wachtwoord"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:34
-#: ihtml/themes/default/setup_step4.tpl:34
+#: ihtml/themes/default/setup_step4.tpl:34 ihtml/themes/lhs/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
 "saves people and groups, including the way accounts get created. Check the "
@@ -12370,32 +12550,32 @@ msgstr ""
 "voorzien."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:39
-#: ihtml/themes/default/setup_step4.tpl:39
+#: ihtml/themes/default/setup_step4.tpl:39 ihtml/themes/lhs/setup_step4.tpl:39
 msgid "Base "
 msgstr "Basis "
 
 #: ihtml/themes/altlinux/setup_step4.tpl:43
-#: ihtml/themes/default/setup_step4.tpl:43
+#: ihtml/themes/default/setup_step4.tpl:43 ihtml/themes/lhs/setup_step4.tpl:43
 msgid "People storage ou"
 msgstr "OU voor gebruikers opslag"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:47
-#: ihtml/themes/default/setup_step4.tpl:47
+#: ihtml/themes/default/setup_step4.tpl:47 ihtml/themes/lhs/setup_step4.tpl:47
 msgid "People dn attribute"
 msgstr "DN atribuut voor gebruikers"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:55
-#: ihtml/themes/default/setup_step4.tpl:55
+#: ihtml/themes/default/setup_step4.tpl:55 ihtml/themes/lhs/setup_step4.tpl:55
 msgid "Group storage ou"
 msgstr "OU voor groepen opslag"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:59
-#: ihtml/themes/default/setup_step4.tpl:59
+#: ihtml/themes/default/setup_step4.tpl:59 ihtml/themes/lhs/setup_step4.tpl:59
 msgid "ID base for users/groups"
 msgstr "ID basis voor gebruikers/groepen"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:67
-#: ihtml/themes/default/setup_step4.tpl:67
+#: ihtml/themes/default/setup_step4.tpl:67 ihtml/themes/lhs/setup_step4.tpl:67
 msgid ""
 "GOsa supports several encryption types for your passwords. Normally this is "
 "adjustable via user templates, but you can specify a default method to be "
@@ -12406,12 +12586,12 @@ msgstr ""
 "gebruiken methode opgeven."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:72
-#: ihtml/themes/default/setup_step4.tpl:72
+#: ihtml/themes/default/setup_step4.tpl:72 ihtml/themes/lhs/setup_step4.tpl:72
 msgid "Encryption algorithm"
 msgstr "Encryptie algoritme"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:83
-#: ihtml/themes/default/setup_step4.tpl:83
+#: ihtml/themes/default/setup_step4.tpl:83 ihtml/themes/lhs/setup_step4.tpl:83
 msgid ""
 "GOsa has modular support for several mail methods. These methods provide "
 "interfaces to users mailboxes and general handling for quotas. You can "
@@ -12423,7 +12603,7 @@ msgstr ""
 "ongewijzigd te laten."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:88
-#: ihtml/themes/default/setup_step4.tpl:88
+#: ihtml/themes/default/setup_step4.tpl:88 ihtml/themes/lhs/setup_step4.tpl:88
 msgid "Mail method"
 msgstr "E-mail methode"
 
@@ -12439,31 +12619,35 @@ msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:103
 #: ihtml/themes/default/setup_step4.tpl:104
+#: ihtml/themes/lhs/setup_step4.tpl:104
 msgid "Display PHP errors"
 msgstr "Toon PHP fouten"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:106
 #: ihtml/themes/default/setup_step4.tpl:107
+#: ihtml/themes/lhs/setup_step4.tpl:107
 msgid "true"
 msgstr "ja"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:107
 #: ihtml/themes/default/setup_step4.tpl:108
+#: ihtml/themes/lhs/setup_step4.tpl:108
 msgid "false"
 msgstr "nee"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:115
 #: ihtml/themes/default/setup_step4.tpl:115
+#: ihtml/themes/lhs/setup_step4.tpl:115
 msgid "Check"
 msgstr "Controleer"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:1
-#: ihtml/themes/default/setup_finish.tpl:1
+#: ihtml/themes/default/setup_finish.tpl:1 ihtml/themes/lhs/setup_finish.tpl:1
 msgid "Setup finished"
 msgstr "Installatie beëindigd"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:3
-#: ihtml/themes/default/setup_finish.tpl:3
+#: ihtml/themes/default/setup_finish.tpl:3 ihtml/themes/lhs/setup_finish.tpl:3
 msgid ""
 "Basically the setup is finished. You can check the result of the schema "
 "check here and download the autogenerated gosa.conf below."
@@ -12473,17 +12657,19 @@ msgstr ""
 "hieronder downloaden."
 
 #: ihtml/themes/altlinux/setup_finish.tpl:7
-#: ihtml/themes/default/setup_finish.tpl:7
+#: ihtml/themes/default/setup_finish.tpl:7 ihtml/themes/lhs/setup_finish.tpl:7
 msgid "Schema Configuration"
 msgstr "Schema Configuratie"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:12
 #: ihtml/themes/default/setup_finish.tpl:12
+#: ihtml/themes/lhs/setup_finish.tpl:12
 msgid "Configuration File"
 msgstr "Configuratie bestand"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:14
 #: ihtml/themes/default/setup_finish.tpl:14
+#: ihtml/themes/lhs/setup_finish.tpl:14
 msgid ""
 "GOsa setup has collected all data needed to create an initial configuration "
 "file. Save the the link below as your gosa.conf and place that file in /etc/"
@@ -12495,11 +12681,13 @@ msgstr ""
 
 #: ihtml/themes/altlinux/setup_finish.tpl:17
 #: ihtml/themes/default/setup_finish.tpl:17
+#: ihtml/themes/lhs/setup_finish.tpl:17
 msgid "Download configuration"
 msgstr "Systeem configuratie"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:20
 #: ihtml/themes/default/setup_finish.tpl:20
+#: ihtml/themes/lhs/setup_finish.tpl:20
 msgid ""
 "After placing the file under /etc/gosa, place make sure that the webserver "
 "user is able to read gosa.conf, while other users shouldn't. You may want to "
@@ -12510,7 +12698,16 @@ msgstr ""
 "geplaatst heeft. U wil misschien de volgende commando's uitvoeren om aan "
 "deze vereiste te voldoen: "
 
+#: ihtml/themes/default/help.tpl:9 ihtml/themes/lhs/help.tpl:9
+msgid "GOsa help viewer"
+msgstr "GOsa help"
+
+#: ihtml/themes/default/help.tpl:15 ihtml/themes/lhs/help.tpl:15
+msgid "Index"
+msgstr "Index"
+
 #: ihtml/themes/default/setup_introduction.tpl:4
+#: ihtml/themes/lhs/setup_introduction.tpl:4
 msgid ""
 "It looks like you're calling GOsa for the first time - no configuration was "
 "found. This setup like script will try to aid you in creating a working "
@@ -12528,6 +12725,7 @@ msgstr ""
 "installatie gecontroleerd worden."
 
 #: ihtml/themes/default/setup_introduction.tpl:17
+#: ihtml/themes/lhs/setup_introduction.tpl:17
 msgid ""
 "You can also use the new and more-advanced way of inspecting your PHP-"
 "installation. It will give you information about the exact function that "
@@ -12540,16 +12738,27 @@ msgstr ""
 "worden, zullen niet getoond worden). Dit is nuttig indien u weet wat u doet."
 
 #: ihtml/themes/default/setup_introduction.tpl:19
+#: ihtml/themes/lhs/setup_introduction.tpl:19
 msgid "Toggle Show/Hide"
 msgstr "Wissel tonen/verbergen"
 
-#: ihtml/themes/default/help.tpl:9
-msgid "GOsa help viewer"
-msgstr "GOsa help"
+#: ihtml/themes/default/logout.tpl:5 ihtml/themes/lhs/logout.tpl:5
+msgid "Your GOsa session has expired!"
+msgstr "Uw GOsa sessie is verlopen!"
 
-#: ihtml/themes/default/help.tpl:15
-msgid "Index"
-msgstr "Index"
+#: ihtml/themes/default/logout.tpl:7 ihtml/themes/lhs/logout.tpl:7
+msgid ""
+"The last interaction with the GOsa web interface has been some time ago in "
+"the past. For security reasons, the session has been closed. To continue "
+"with administrative tasks, please sign in again."
+msgstr ""
+"Uw laatste interactie met de GOsa webinterface is enige tijd geleden. Uit "
+"veiligheidsoverwegingen is de sessie gesloten. Om door te gaan met "
+"administratieve taken, dient u opnieuw in te loggen."
+
+#: ihtml/themes/default/logout.tpl:10 ihtml/themes/lhs/logout.tpl:10
+msgid "Sign in again"
+msgstr "Opnieuw inloggen"
 
 #: ihtml/themes/default/islocked.tpl:9
 #, fuzzy
@@ -12567,33 +12776,6 @@ msgstr ""
 msgid "Edit anyway"
 msgstr "Invoer bewerken"
 
-#: ihtml/themes/default/setup_step4.tpl:100
-msgid ""
-"GOsa may cause PHP interpreter errors, particularly in case of Beta "
-"versions. In some cases it would be helpful to enable the error reporting."
-msgstr ""
-"Het kan, met name bij Beta versies, voorkomen dat GOsa PHP fouten genereert. "
-"In sommige gevallen kan het handig zijn om foutrapportage aan te zetten (dit "
-"kan een veiligheidsrisico vormen) "
-
-#: ihtml/themes/default/logout.tpl:5
-msgid "Your GOsa session has expired!"
-msgstr "Uw GOsa sessie is verlopen!"
-
-#: ihtml/themes/default/logout.tpl:7
-msgid ""
-"The last interaction with the GOsa web interface has been some time ago in "
-"the past. For security reasons, the session has been closed. To continue "
-"with administrative tasks, please sign in again."
-msgstr ""
-"Uw laatste interactie met de GOsa webinterface is enige tijd geleden. Uit "
-"veiligheidsoverwegingen is de sessie gesloten. Om door te gaan met "
-"administratieve taken, dient u opnieuw in te loggen."
-
-#: ihtml/themes/default/logout.tpl:10
-msgid "Sign in again"
-msgstr "Opnieuw inloggen"
-
 #: ihtml/themes/default/copyPasteDialog.tpl:1
 msgid "Copy &amp; paste wizard"
 msgstr ""
@@ -12610,6 +12792,34 @@ msgstr ""
 msgid "Operation complete"
 msgstr "onvolledig"
 
+#: ihtml/themes/default/setup_step4.tpl:100
+#: ihtml/themes/lhs/setup_step4.tpl:100
+msgid ""
+"GOsa may cause PHP interpreter errors, particularly in case of Beta "
+"versions. In some cases it would be helpful to enable the error reporting."
+msgstr ""
+"Het kan, met name bij Beta versies, voorkomen dat GOsa PHP fouten genereert. "
+"In sommige gevallen kan het handig zijn om foutrapportage aan te zetten (dit "
+"kan een veiligheidsrisico vormen) "
+
+#, fuzzy
+#~ msgid "DFS shares"
+#~ msgstr "Shares"
+
+#, fuzzy
+#~ msgid "Complete"
+#~ msgstr "onvolledig"
+
+#, fuzzy
+#~ msgid "Successfully finished"
+#~ msgstr "Installatie beëindigd"
+
+#~ msgid "Create new branch using the current release"
+#~ msgstr "Maak een nieuwe distributie met behulp van de huidige uitgave"
+
+#~ msgid "Create a locked version of the current release"
+#~ msgstr "Maak een afgesloten versie van de huidige uitgave"
+
 #, fuzzy
 #~ msgid "Releases"
 #~ msgstr "Distributie versie"
diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po
index 00241ac71..ab3aea5c6 100644
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -35,21 +35,19 @@ msgstr "Дополнительно"
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
-#: plugins/gofax/faxaccount/generic.tpl:6
+#: plugins/gofax/faxaccount/generic.tpl:6 plugins/admin/fai/faiVariable.tpl:4
 #: plugins/admin/fai/faiPartitionTable.tpl:4
-#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiScriptEntry.tpl:5
-#: plugins/admin/fai/faiPackage.tpl:4 plugins/admin/fai/faiProfile.tpl:4
-#: plugins/admin/fai/faiProfile.tpl:32
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
+#: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiPackage.tpl:4
+#: plugins/admin/fai/faiProfile.tpl:4 plugins/admin/fai/faiProfile.tpl:32
 #: plugins/admin/fai/faiScript.tpl:4 plugins/admin/fai/faiVariableEntry.tpl:5
 #: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3 plugins/admin/fai/faiHook.tpl:4
-#: plugins/admin/groups/mail.tpl:7
+#: plugins/admin/groups/mail.tpl:7 plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/glpiPrinter.tpl:6
+#: plugins/admin/systems/servdnseditzone.tpl:1
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
-#: plugins/admin/systems/glpi.tpl:6
-#: plugins/admin/systems/servdnseditzone.tpl:1
-#: plugins/admin/systems/glpiPrinter.tpl:6
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr "Общее"
@@ -60,25 +58,25 @@ msgstr "Unix"
 
 #: contrib/gosa.conf:76 contrib/gosa.conf:88
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:514
-#: plugins/admin/users/class_userManagement.inc:858
+#: plugins/admin/groups/class_groupManagement.inc:515
+#: plugins/admin/users/class_userManagement.inc:859
 msgid "Environment"
 msgstr "Окружение"
 
 #: contrib/gosa.conf:77 contrib/gosa.conf:90
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_groupManagement.inc:502
-#: plugins/admin/users/class_userManagement.inc:860
+#: plugins/admin/groups/class_groupManagement.inc:503
+#: plugins/admin/users/class_userManagement.inc:861
 #: plugins/admin/ogroups/tabs_ogroups.inc:72
 #: plugins/admin/ogroups/tabs_ogroups.inc:160
-#: plugins/admin/ogroups/class_ogroupManagement.inc:483
+#: plugins/admin/ogroups/class_ogroupManagement.inc:484
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Почта"
 
 #: contrib/gosa.conf:78 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:505
-#: plugins/admin/users/class_userManagement.inc:866
+#: plugins/admin/groups/class_groupManagement.inc:506
+#: plugins/admin/users/class_userManagement.inc:867
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -93,7 +91,7 @@ msgstr "Подключение"
 #: plugins/personal/generic/generic.tpl:398
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:864
+#: plugins/admin/users/class_userManagement.inc:865
 #: plugins/admin/departments/generic.tpl:63
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
@@ -103,17 +101,17 @@ msgstr "Факс"
 #: contrib/gosa.conf:81 plugins/personal/generic/generic.tpl:250
 #: plugins/personal/generic/generic.tpl:388
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/address_info.tpl:37
-#: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
-#: plugins/admin/groups/class_groupManagement.inc:511
-#: plugins/admin/users/class_userManagement.inc:862
+#: plugins/addons/addressbook/address_info.tpl:37
+#: plugins/addons/addressbook/address_info.tpl:85
+#: plugins/admin/groups/class_groupManagement.inc:512
+#: plugins/admin/users/class_userManagement.inc:863
 #: plugins/admin/departments/generic.tpl:59
+#: plugins/admin/systems/class_systemManagement.inc:921
 #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/systems/class_systemManagement.inc:920
 #: plugins/admin/ogroups/class_ogroupManagement.inc:61
-#: plugins/admin/ogroups/class_ogroupManagement.inc:587
+#: plugins/admin/ogroups/class_ogroupManagement.inc:588
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
@@ -142,8 +140,8 @@ msgid "ACL"
 msgstr "Доступ"
 
 #: contrib/gosa.conf:97 plugins/admin/applications/generic.tpl:66
-#: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/systems/class_servRepository.inc:244
+#: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/ogroups/phonequeue.tpl:31
 #: plugins/gofon/conference/generic.tpl:87
 msgid "Options"
@@ -166,9 +164,9 @@ msgstr "Устройства"
 
 #: contrib/gosa.conf:116 contrib/gosa.conf:141
 #: plugins/personal/environment/environment.tpl:172
-#: plugins/admin/systems/class_systemManagement.inc:926
+#: plugins/admin/systems/class_systemManagement.inc:927
 #: plugins/admin/ogroups/class_ogroupManagement.inc:62
-#: plugins/admin/ogroups/class_ogroupManagement.inc:590
+#: plugins/admin/ogroups/class_ogroupManagement.inc:591
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Принтер"
@@ -177,18 +175,19 @@ msgstr "Принтер"
 #: plugins/gofax/blocklists/generic.tpl:70
 #: plugins/gofax/blocklists/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
+#: plugins/addons/godfs/contents.tpl:22
 #: plugins/admin/fai/faiProfileEntry.tpl:21
 #: plugins/admin/fai/faiPackageEntry.tpl:22 plugins/admin/fai/headpage.tpl:20
 #: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
 #: plugins/admin/applications/headpage.tpl:20
 #: plugins/admin/departments/headpage.tpl:20
-#: plugins/admin/systems/headpage.tpl:20
+#: plugins/admin/systems/glpiPrinter.tpl:104
+#: plugins/admin/systems/glpiDeviceManagement.tpl:20
 #: plugins/admin/systems/servRepository.tpl:24
 #: plugins/admin/systems/glpiSelectUser.tpl:20
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:20
+#: plugins/admin/systems/headpage.tpl:20
 #: plugins/admin/systems/glpiAttachmentPool.tpl:20
-#: plugins/admin/systems/glpiDeviceManagement.tpl:20
-#: plugins/admin/systems/glpiPrinter.tpl:104
 #: plugins/admin/ogroups/headpage.tpl:20 plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
@@ -256,19 +255,19 @@ msgstr "Назначение"
 msgid "Script"
 msgstr "Путь к сценариям"
 
-#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:759
-#: plugins/admin/fai/class_faiManagement.inc:760
+#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:767
+#: plugins/admin/fai/class_faiManagement.inc:768
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:752
-#: plugins/admin/fai/class_faiManagement.inc:753
+#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:760
+#: plugins/admin/fai/class_faiManagement.inc:761
 #, fuzzy
 msgid "Variables"
 msgstr "Переменная"
 
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiManagement.inc:773
-#: plugins/admin/fai/class_faiManagement.inc:774
+#: contrib/gosa.conf:218 plugins/admin/fai/class_faiManagement.inc:781
+#: plugins/admin/fai/class_faiManagement.inc:782
 #, fuzzy
 msgid "Templates"
 msgstr "Шаблон"
@@ -315,95 +314,95 @@ msgstr "Английский"
 msgid "Italian"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:19
-#: plugins/personal/mail/class_mailAccount.inc:23
-#: plugins/personal/password/class_password.inc:6
-#: plugins/personal/posix/class_posixAccount.inc:17
-#: plugins/personal/samba/class_sambaAccount.inc:25
-#: plugins/personal/environment/class_environment.inc:13
-#: plugins/personal/generic/class_user.inc:17
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_proxyAccount.inc:6
-#: plugins/personal/connectivity/class_pptpAccount.inc:27
-#: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_phpgwAccount.inc:6
-#: plugins/personal/connectivity/class_kolabAccount.inc:6
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
-#: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/personal/connectivity/class_opengwAccount.inc:7
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
-#: plugins/gofax/faxreports/class_faxreport.inc:7
-#: plugins/addons/addressbook/class_addressbook.inc:7
-#: plugins/addons/mailqueue/class_mailqueue.inc:7
-#: plugins/addons/ldapmanager/class_csvimport.inc:7
-#: plugins/addons/ldapmanager/class_exportxls.inc:8
-#: plugins/addons/ldapmanager/class_import.inc:7
-#: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:7
-#: plugins/addons/logview/class_logview.inc:7
-#: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:26
-#: plugins/admin/applications/class_applicationManagement.inc:26
-#: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/systems/class_systemManagement.inc:33
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-#: plugins/gofon/fonreports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Что-то будет"
+#: plugins/personal/nagios/nagios.tpl:4
+#, fuzzy
+msgid "Nagios Account"
+msgstr "Контакт"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:92
+#: plugins/personal/nagios/nagios.tpl:7
 #, fuzzy
-msgid "This account has no nagios extensions."
-msgstr "В этой учетной записи нет почтовых расширений."
+msgid "Alias"
+msgstr "женский"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:101
+#: plugins/personal/nagios/nagios.tpl:12
+#: plugins/admin/systems/servdnseditzone.tpl:47 html/getxls.php:174
 #, fuzzy
-msgid "Remove nagios account"
-msgstr "Удалить настройки эл. почты"
+msgid "Mail address"
+msgstr "MAC-адрес"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:102
+#: plugins/personal/nagios/nagios.tpl:17
 #, fuzzy
-msgid ""
-"This account has nagios features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"В этой учетной записи есть настройки электронной почты. Вы можете удалить "
-"их, щелкнув ниже."
+msgid "Host notification period"
+msgstr "Параметры приложения"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:104
+#: plugins/personal/nagios/nagios.tpl:25
 #, fuzzy
-msgid "Create nagios account"
-msgstr "Создать настройки запись эл. почты"
+msgid "Service notification period"
+msgstr "Параметры приложения"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:104
+#: plugins/personal/nagios/nagios.tpl:32
 #, fuzzy
-msgid ""
-"This account has nagios features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"В этой учетной записи нет настроек электронной почты. Вы можете добавить их, "
-"щелкнув ниже."
+msgid "Service notification options"
+msgstr "Параметры приложения"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:165
+#: plugins/personal/nagios/nagios.tpl:41
 #, fuzzy
-msgid "The required field 'NagiosAlias' is not set."
-msgstr "Обязательное поле \"Имя\" не заполнено."
+msgid "Host notification options"
+msgstr "Параметры приложения"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:168
+#: plugins/personal/nagios/nagios.tpl:48
+#: plugins/personal/generic/generic.tpl:261
+#: plugins/addons/addressbook/address_edit.tpl:217
+#: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Pager"
+msgstr "Пейджер"
+
+#: plugins/personal/nagios/nagios.tpl:53
 #, fuzzy
-msgid "The required field 'NagiosMail' is not set."
-msgstr "Обязательное поле \"Имя\" не заполнено."
+msgid "Service notification commands"
+msgstr "Параметры приложения"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:172
-#: plugins/personal/nagios/class_nagiosAccount.inc:176
+#: plugins/personal/nagios/nagios.tpl:57
 #, fuzzy
-msgid "Please enter a valid email address in 'NagiosMail' field."
-msgstr "Введите корректное значение в поле \"Основной адрес\"."
+msgid "Host notification commands"
+msgstr "Параметры приложения"
+
+#: plugins/personal/nagios/nagios.tpl:66
+#, fuzzy
+msgid "Nagios authentification"
+msgstr "Рабочая станция Windows"
+
+#: plugins/personal/nagios/nagios.tpl:69
+#, fuzzy
+msgid "view system informations"
+msgstr "Системная информация"
+
+#: plugins/personal/nagios/nagios.tpl:72
+#, fuzzy
+msgid "view configuration information"
+msgstr "Информация об организации"
+
+#: plugins/personal/nagios/nagios.tpl:75
+msgid "trigger system commands"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:78
+#, fuzzy
+msgid "view all services"
+msgstr "Предоставлять службу сканирования"
+
+#: plugins/personal/nagios/nagios.tpl:81
+msgid "view all hosts"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:83
+msgid "trigger all service commands"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:86
+msgid "trigger all host commands"
+msgstr ""
 
 #: plugins/personal/nagios/main.inc:104 plugins/personal/mail/main.inc:104
 #: plugins/personal/posix/main.inc:110 plugins/personal/samba/main.inc:104
@@ -413,11 +412,12 @@ msgstr "Введите корректное значение в поле \"Ос
 #: plugins/personal/connectivity/main.inc:118
 #: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/fai/class_faiManagement.inc:599
+#: plugins/addons/godfs/class_dfsManagment.inc:217
+#: plugins/admin/fai/class_faiManagement.inc:605
 #: plugins/admin/groups/class_groupManagement.inc:412
 #: plugins/admin/users/class_userManagement.inc:720
-#: plugins/admin/applications/class_applicationManagement.inc:428
-#: plugins/admin/departments/class_departmentManagement.inc:366
+#: plugins/admin/applications/class_applicationManagement.inc:430
+#: plugins/admin/departments/class_departmentManagement.inc:367
 #: plugins/admin/systems/class_systemManagement.inc:720
 #: plugins/admin/ogroups/class_ogroupManagement.inc:400
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:300
@@ -429,16 +429,15 @@ msgstr "Готово"
 
 #: plugins/personal/nagios/main.inc:106 plugins/personal/mail/main.inc:106
 #: plugins/personal/mail/mail_locals.tpl:43
-#: plugins/personal/posix/posix_groups.tpl:67
 #: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112
+#: plugins/personal/posix/posix_groups.tpl:67
+#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
 #: plugins/personal/samba/samba3_workstations.tpl:41
-#: plugins/personal/samba/main.inc:106
+#: plugins/personal/environment/main.inc:106
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
 #: plugins/personal/environment/hotplugDialogNew.tpl:39
-#: plugins/personal/environment/main.inc:106
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
 #: plugins/personal/generic/generic_certs.tpl:78
@@ -449,54 +448,55 @@ msgstr "Готово"
 #: plugins/gofax/faxaccount/locals.tpl:62
 #: plugins/gofax/faxaccount/lists.tpl:33 plugins/gofax/faxaccount/main.inc:91
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
-#: plugins/admin/fai/class_faiManagement.inc:601
-#: plugins/admin/fai/class_faiManagement.inc:606
-#: plugins/admin/fai/faiProfileEntry.tpl:71
+#: plugins/addons/addressbook/remove.tpl:16
+#: plugins/addons/godfs/class_dfsManagment.inc:219
+#: plugins/admin/fai/class_faiManagement.inc:607
+#: plugins/admin/fai/class_faiManagement.inc:612
 #: plugins/admin/fai/faiPackageConfiguration.tpl:7
-#: plugins/admin/fai/faiScriptEntry.tpl:69
+#: plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
+#: plugins/admin/fai/faiScriptEntry.tpl:69 plugins/admin/fai/remove.tpl:17
 #: plugins/admin/fai/faiPackageNew.tpl:45
+#: plugins/admin/fai/faiNewBranch.tpl:20
 #: plugins/admin/fai/faiVariableEntry.tpl:49
-#: plugins/admin/fai/faiPackageEntry.tpl:57 plugins/admin/fai/remove.tpl:17
+#: plugins/admin/fai/faiPackageEntry.tpl:57
 #: plugins/admin/fai/faiHookEntry.tpl:71
-#: plugins/admin/fai/faiTemplateEntry.tpl:131
-#: plugins/admin/fai/faiNewBranch.tpl:20
 #: plugins/admin/fai/remove_branch.tpl:16
+#: plugins/admin/fai/faiTemplateEntry.tpl:131
 #: plugins/admin/groups/class_groupManagement.inc:414
 #: plugins/admin/groups/remove.tpl:16
+#: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/template.tpl:46
 #: plugins/admin/users/class_userManagement.inc:722
-#: plugins/admin/users/remove.tpl:16 plugins/admin/users/template.tpl:46
-#: plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:430
+#: plugins/admin/users/remove.tpl:16 plugins/admin/applications/remove.tpl:15
+#: plugins/admin/applications/class_applicationManagement.inc:432
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:368
-#: plugins/admin/systems/chooser.tpl:18
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
-#: plugins/admin/systems/printerPPDDialog.tpl:23
-#: plugins/admin/systems/class_systemManagement.inc:722
-#: plugins/admin/systems/servnfs.tpl:76 plugins/admin/systems/remove.tpl:16
-#: plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/servRepositorySetup.tpl:43
+#: plugins/admin/departments/class_departmentManagement.inc:369
 #: plugins/admin/systems/glpi_edit_type.tpl:29
-#: plugins/admin/systems/remove_glpi.tpl:16
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:30
+#: plugins/admin/systems/glpiDeviceManagement.tpl:52
+#: plugins/admin/systems/servnfs.tpl:76
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
+#: plugins/admin/systems/servdnseditzone.tpl:118
 #: plugins/admin/systems/glpiSelectUser.tpl:51
+#: plugins/admin/systems/glpi_devices.tpl:761
+#: plugins/admin/systems/servRepositorySetup.tpl:43
 #: plugins/admin/systems/glpi_edit_os.tpl:29
+#: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:52
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
+#: plugins/admin/systems/remove_glpi.tpl:16
+#: plugins/admin/systems/class_systemManagement.inc:722
+#: plugins/admin/systems/remove.tpl:16
 #: plugins/admin/systems/glpiAttachmentPool.tpl:52
-#: plugins/admin/systems/servdnseditzone.tpl:118
-#: plugins/admin/systems/glpiDeviceManagement.tpl:52
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:30
-#: plugins/admin/systems/glpi_devices.tpl:761
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
+#: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/SelectDeviceType.tpl:45
-#: plugins/admin/systems/class_baseSelectDialog.inc:40
+#: plugins/admin/systems/class_baseSelectDialog.inc:41
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:13
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:402
@@ -507,6 +507,7 @@ msgstr "Готово"
 #: plugins/gofon/conference/remove.tpl:16
 #: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
 #: ihtml/themes/default/copyPasteDialog.tpl:13
+#: ihtml/themes/lhs/islocked.tpl:15
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -522,26 +523,27 @@ msgstr "Нажмите 'Изменить' чтобы отредактирова
 
 #: plugins/personal/nagios/main.inc:115 plugins/personal/mail/main.inc:115
 #: plugins/personal/posix/main.inc:122 plugins/personal/samba/main.inc:115
-#: plugins/personal/environment/environment.tpl:139
 #: plugins/personal/environment/main.inc:115
+#: plugins/personal/environment/environment.tpl:139
 #: plugins/personal/generic/main.inc:172
 #: plugins/personal/connectivity/main.inc:129
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
+#: plugins/admin/fai/faiVariable.tpl:45
 #: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/admin/fai/faiVariable.tpl:45 plugins/admin/fai/faiScript.tpl:45
-#: plugins/admin/fai/faiTemplate.tpl:42 plugins/admin/fai/faiHook.tpl:45
-#: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/printer.tpl:47 plugins/admin/systems/servdns.tpl:7
-#: plugins/admin/systems/glpiManufacturer.tpl:7
-#: plugins/admin/systems/glpi.tpl:48 plugins/admin/systems/glpi.tpl:56
-#: plugins/admin/systems/glpi.tpl:85
-#: plugins/admin/systems/servdnseditzone.tpl:27
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:191
+#: plugins/admin/fai/faiScript.tpl:45 plugins/admin/fai/faiTemplate.tpl:42
+#: plugins/admin/fai/faiHook.tpl:45 plugins/admin/systems/glpi.tpl:48
+#: plugins/admin/systems/glpi.tpl:56 plugins/admin/systems/glpi.tpl:85
 #: plugins/admin/systems/glpiPrinter.tpl:73
 #: plugins/admin/systems/glpiPrinter.tpl:82
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:167
+#: plugins/admin/systems/servdns.tpl:7
+#: plugins/admin/systems/glpiManufacturer.tpl:7
+#: plugins/admin/systems/servdnseditzone.tpl:27
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:191
+#: plugins/admin/systems/servservice.tpl:21
+#: plugins/admin/systems/printer.tpl:47
 #: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr "Изменить"
@@ -551,94 +553,209 @@ msgstr "Изменить"
 msgid "Nagios settings"
 msgstr "Почтовые настройки пользователя"
 
-#: plugins/personal/nagios/nagios.tpl:4
-#, fuzzy
-msgid "Nagios Account"
-msgstr "Контакт"
-
-#: plugins/personal/nagios/nagios.tpl:7
-#, fuzzy
-msgid "Alias"
-msgstr "женский"
-
-#: plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:47 html/getxls.php:174
-#, fuzzy
-msgid "Mail address"
-msgstr "MAC-адрес"
-
-#: plugins/personal/nagios/nagios.tpl:17
-#, fuzzy
-msgid "Host notification period"
-msgstr "Параметры приложения"
-
-#: plugins/personal/nagios/nagios.tpl:25
-#, fuzzy
-msgid "Service notification period"
-msgstr "Параметры приложения"
-
-#: plugins/personal/nagios/nagios.tpl:32
+#: plugins/personal/nagios/class_nagiosAccount.inc:19
+#: plugins/personal/mail/class_mailAccount.inc:23
+#: plugins/personal/password/class_password.inc:6
+#: plugins/personal/posix/class_posixAccount.inc:17
+#: plugins/personal/samba/class_sambaAccount.inc:25
+#: plugins/personal/environment/class_environment.inc:13
+#: plugins/personal/generic/class_user.inc:17
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_intranetAccount.inc:16
+#: plugins/personal/connectivity/class_pptpAccount.inc:27
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
+#: plugins/personal/connectivity/class_phpgwAccount.inc:6
+#: plugins/personal/connectivity/class_kolabAccount.inc:6
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
+#: plugins/personal/connectivity/class_opengwAccount.inc:7
+#: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
+#: plugins/gofax/faxreports/class_faxreport.inc:7
+#: plugins/addons/addressbook/class_addressbook.inc:7
+#: plugins/addons/mailqueue/class_mailqueue.inc:7
+#: plugins/addons/ldapmanager/class_csvimport.inc:7
+#: plugins/addons/ldapmanager/class_exportxls.inc:8
+#: plugins/addons/ldapmanager/class_import.inc:7
+#: plugins/addons/ldapmanager/class_ldif.inc:8
+#: plugins/addons/ldapmanager/class_export.inc:7
+#: plugins/addons/logview/class_logview.inc:7
+#: plugins/addons/godfs/class_dfsManagment.inc:17
+#: plugins/admin/groups/class_groupManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:26
+#: plugins/admin/applications/class_applicationManagement.inc:26
+#: plugins/admin/departments/class_departmentManagement.inc:26
+#: plugins/admin/systems/class_systemManagement.inc:33
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/gofon/fonreports/class_fonreport.inc:7
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
+msgid "This does something"
+msgstr "Что-то будет"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:92
 #, fuzzy
-msgid "Service notification options"
-msgstr "Параметры приложения"
+msgid "This account has no nagios extensions."
+msgstr "В этой учетной записи нет почтовых расширений."
 
-#: plugins/personal/nagios/nagios.tpl:41
+#: plugins/personal/nagios/class_nagiosAccount.inc:101
 #, fuzzy
-msgid "Host notification options"
-msgstr "Параметры приложения"
+msgid "Remove nagios account"
+msgstr "Удалить настройки эл. почты"
 
-#: plugins/personal/nagios/nagios.tpl:48
-#: plugins/personal/generic/generic.tpl:261
-#: plugins/addons/addressbook/address_info.tpl:91
-#: plugins/addons/addressbook/address_edit.tpl:217 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Pager"
-msgstr "Пейджер"
+#: plugins/personal/nagios/class_nagiosAccount.inc:102
+#, fuzzy
+msgid ""
+"This account has nagios features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"В этой учетной записи есть настройки электронной почты. Вы можете удалить "
+"их, щелкнув ниже."
 
-#: plugins/personal/nagios/nagios.tpl:53
+#: plugins/personal/nagios/class_nagiosAccount.inc:104
 #, fuzzy
-msgid "Service notification commands"
-msgstr "Параметры приложения"
+msgid "Create nagios account"
+msgstr "Создать настройки запись эл. почты"
 
-#: plugins/personal/nagios/nagios.tpl:57
+#: plugins/personal/nagios/class_nagiosAccount.inc:104
 #, fuzzy
-msgid "Host notification commands"
-msgstr "Параметры приложения"
+msgid ""
+"This account has nagios features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"В этой учетной записи нет настроек электронной почты. Вы можете добавить их, "
+"щелкнув ниже."
 
-#: plugins/personal/nagios/nagios.tpl:66
+#: plugins/personal/nagios/class_nagiosAccount.inc:165
 #, fuzzy
-msgid "Nagios authentification"
-msgstr "Рабочая станция Windows"
+msgid "The required field 'NagiosAlias' is not set."
+msgstr "Обязательное поле \"Имя\" не заполнено."
 
-#: plugins/personal/nagios/nagios.tpl:69
+#: plugins/personal/nagios/class_nagiosAccount.inc:168
 #, fuzzy
-msgid "view system informations"
-msgstr "Системная информация"
+msgid "The required field 'NagiosMail' is not set."
+msgstr "Обязательное поле \"Имя\" не заполнено."
 
-#: plugins/personal/nagios/nagios.tpl:72
+#: plugins/personal/nagios/class_nagiosAccount.inc:172
+#: plugins/personal/nagios/class_nagiosAccount.inc:176
 #, fuzzy
-msgid "view configuration information"
-msgstr "Информация об организации"
+msgid "Please enter a valid email address in 'NagiosMail' field."
+msgstr "Введите корректное значение в поле \"Основной адрес\"."
 
-#: plugins/personal/nagios/nagios.tpl:75
-msgid "trigger system commands"
+#: plugins/personal/mail/class_mailAccount.inc:79
+#: plugins/admin/groups/class_groupMail.inc:75
+#, php-format
+msgid "There is no mail method '%s' specified in your gosa.conf available."
+msgstr "Метод '%s' не описан в вашем файле конфигурации."
+
+#: plugins/personal/mail/class_mailAccount.inc:176
+msgid "No DESC tag in vacation file:"
+msgstr "В файле сообщения автоответчика отсутствует тег DESC:"
+
+#: plugins/personal/mail/class_mailAccount.inc:216
+msgid "This account has no mail extensions."
+msgstr "В этой учетной записи нет почтовых расширений."
+
+#: plugins/personal/mail/class_mailAccount.inc:225
+#: plugins/admin/groups/class_groupMail.inc:314
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid "Remove mail account"
+msgstr "Удалить настройки эл. почты"
+
+#: plugins/personal/mail/class_mailAccount.inc:226
+#: plugins/admin/groups/class_groupMail.inc:315
+msgid ""
+"This account has mail features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"В этой учетной записи есть настройки электронной почты. Вы можете удалить "
+"их, щелкнув ниже."
+
+#: plugins/personal/mail/class_mailAccount.inc:228
+#: plugins/admin/groups/class_groupMail.inc:317
+#: plugins/admin/ogroups/class_mailogroup.inc:43
+msgid "Create mail account"
+msgstr "Создать настройки запись эл. почты"
+
+#: plugins/personal/mail/class_mailAccount.inc:228
+#: plugins/admin/groups/class_groupMail.inc:318
+msgid ""
+"This account has mail features disabled. You can enable them by clicking "
+"below."
 msgstr ""
+"В этой учетной записи нет настроек электронной почты. Вы можете добавить их, "
+"щелкнув ниже."
 
-#: plugins/personal/nagios/nagios.tpl:78
-#, fuzzy
-msgid "view all services"
-msgstr "Предоставлять службу сканирования"
+#: plugins/personal/mail/class_mailAccount.inc:276
+msgid ""
+"You're trying to add an invalid email address to the list of forwarders."
+msgstr ""
+"Вы пытаетесь добавить некорректный адрес электронной почты к списку тех, "
+"кому должны пересылаться сообщения."
 
-#: plugins/personal/nagios/nagios.tpl:81
-msgid "view all hosts"
+#: plugins/personal/mail/class_mailAccount.inc:282
+#: plugins/admin/groups/class_groupMail.inc:377
+msgid "Adding your one of your own addresses to the forwarders makes no sense."
+msgstr ""
+"Добавление своего единственного адреса к списку пересылки не имеет смысла."
+
+#: plugins/personal/mail/class_mailAccount.inc:317
+#: plugins/personal/mail/class_mailAccount.inc:322
+#: plugins/admin/groups/class_groupMail.inc:405
+msgid ""
+"You're trying to add an invalid email address to the list of alternate "
+"addresses."
 msgstr ""
+"Вы пытаетесь добавить некорректный адрес электронной почты к списку "
+"альтернативных адресов."
 
-#: plugins/personal/nagios/nagios.tpl:83
-msgid "trigger all service commands"
+#: plugins/personal/mail/class_mailAccount.inc:332
+#: plugins/admin/groups/class_groupMail.inc:410
+msgid "The address you're trying to add is already used by user"
+msgstr "Добавляемый вами адрес уже используется пользователем"
+
+#: plugins/personal/mail/class_mailAccount.inc:714
+msgid ""
+"There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:86
-msgid "trigger all host commands"
+#: plugins/personal/mail/class_mailAccount.inc:719
+#: plugins/admin/groups/class_groupMail.inc:798
+msgid "The required field 'Primary address' is not set."
+msgstr "Обязательное поле \"Основной адрес\" не заполнено."
+
+#: plugins/personal/mail/class_mailAccount.inc:723
+#: plugins/personal/mail/class_mailAccount.inc:727
+#: plugins/addons/addressbook/class_addressbook.inc:588
+#: plugins/admin/ogroups/class_mailogroup.inc:70
+msgid "Please enter a valid email address in 'Primary address' field."
+msgstr "Введите корректное значение в поле \"Основной адрес\"."
+
+#: plugins/personal/mail/class_mailAccount.inc:733
+#: plugins/admin/groups/class_groupMail.inc:807
+#: plugins/admin/ogroups/class_mailogroup.inc:77
+msgid "The primary address you've entered is already in use."
+msgstr "Введенный вами адрес уже используется."
+
+#: plugins/personal/mail/class_mailAccount.inc:739
+#: plugins/admin/groups/class_groupMail.inc:813
+msgid "Value in 'Quota size' is not valid."
+msgstr "Значение поля \"Квота\" некорректно."
+
+#: plugins/personal/mail/class_mailAccount.inc:748
+#: plugins/admin/groups/class_groupMail.inc:822
+msgid "Please specify a vaild mail size for mails to be rejected."
+msgstr "Укажите корректный размер сообщений, которые будут отклоняться."
+
+#: plugins/personal/mail/class_mailAccount.inc:758
+#: plugins/admin/groups/class_groupMail.inc:830
+msgid "You need to set the maximum mail size in order to reject anything."
+msgstr "Помните, что указывать нужно максимальный допустимый размер сообщений."
+
+#: plugins/personal/mail/class_mailAccount.inc:762
+msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:7 plugins/personal/mail/copypaste.tpl:7
@@ -649,9 +766,9 @@ msgstr "Основной адрес"
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:921
+#: plugins/admin/systems/class_systemManagement.inc:922
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:586
+#: plugins/admin/ogroups/class_ogroupManagement.inc:587
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
 msgstr "Сервер"
@@ -665,7 +782,7 @@ msgid "Quota usage"
 msgstr "Использование квоты"
 
 #: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
-#: plugins/admin/systems/class_terminalInfo.inc:169
+#: plugins/admin/systems/class_terminalInfo.inc:170
 #: plugins/admin/systems/class_printGeneric.inc:424
 msgid "not defined"
 msgstr "не определена"
@@ -691,8 +808,8 @@ msgstr "Список альтернативных адресов эл. почт
 #: plugins/personal/mail/mail_locals.tpl:41
 #: plugins/personal/mail/copypaste.tpl:21
 #: plugins/personal/mail/copypaste.tpl:44
-#: plugins/personal/posix/posix_groups.tpl:65
 #: plugins/personal/posix/trust_machines.tpl:39
+#: plugins/personal/posix/posix_groups.tpl:65
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
 #: plugins/personal/samba/samba3.tpl:330
@@ -708,43 +825,42 @@ msgstr "Список альтернативных адресов эл. почт
 #: plugins/gofax/blocklists/generic.tpl:63
 #: plugins/gofax/faxaccount/generic.tpl:76
 #: plugins/gofax/faxaccount/locals.tpl:60
-#: plugins/gofax/faxaccount/lists.tpl:13
+#: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiPackage.tpl:71
-#: plugins/admin/fai/faiProfile.tpl:38 plugins/admin/fai/faiScript.tpl:48
-#: plugins/admin/fai/faiTemplate.tpl:41 plugins/admin/fai/faiHook.tpl:48
-#: plugins/admin/groups/mail.tpl:51 plugins/admin/groups/mail.tpl:95
+#: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
+#: plugins/admin/fai/faiScript.tpl:48 plugins/admin/fai/faiTemplate.tpl:41
+#: plugins/admin/fai/faiHook.tpl:48 plugins/admin/groups/mail.tpl:51
+#: plugins/admin/groups/mail.tpl:95
 #: plugins/admin/groups/class_groupMail.inc:533
 #: plugins/admin/groups/application.tpl:15
 #: plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/generic.tpl:104
 #: plugins/admin/groups/mail_locals.tpl:66
 #: plugins/admin/groups/paste_mail.tpl:30
-#: plugins/admin/groups/paste_mail.tpl:41
-#: plugins/admin/systems/servservice.tpl:20
-#: plugins/admin/systems/servservice.tpl:47
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
+#: plugins/admin/groups/paste_mail.tpl:41 plugins/admin/systems/glpi.tpl:100
+#: plugins/admin/systems/glpiPrinter.tpl:93
+#: plugins/admin/systems/glpiPrinter.tpl:121
+#: plugins/admin/systems/glpi_edit_type.tpl:8
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:7
 #: plugins/admin/systems/workstationStartup.tpl:61
 #: plugins/admin/systems/workstationStartup.tpl:81
 #: plugins/admin/systems/workstationStartup.tpl:100
 #: plugins/admin/systems/servdns.tpl:6
-#: plugins/admin/systems/phonesettings.tpl:176
-#: plugins/admin/systems/phonesettings.tpl:191
 #: plugins/admin/systems/terminalStartup.tpl:61
 #: plugins/admin/systems/terminalStartup.tpl:80
-#: plugins/admin/systems/servRepositorySetup.tpl:36
-#: plugins/admin/systems/glpi_edit_type.tpl:8
 #: plugins/admin/systems/glpiManufacturer.tpl:6
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
-#: plugins/admin/systems/glpi_edit_os.tpl:8
 #: plugins/admin/systems/class_termDNS.inc:461
 #: plugins/admin/systems/class_termDNS.inc:482
-#: plugins/admin/systems/glpi.tpl:100
 #: plugins/admin/systems/servdnseditzone.tpl:102
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/glpiPrinter.tpl:93
-#: plugins/admin/systems/glpiPrinter.tpl:121
+#: plugins/admin/systems/servRepositorySetup.tpl:36
+#: plugins/admin/systems/servservice.tpl:20
+#: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/glpi_edit_os.tpl:8
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
 #: plugins/admin/systems/class_servDNSeditZone.inc:478
+#: plugins/admin/systems/phonesettings.tpl:176
+#: plugins/admin/systems/phonesettings.tpl:191
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:270
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/generic.tpl:39
@@ -769,38 +885,37 @@ msgstr "Добавить"
 #: plugins/gofax/faxaccount/generic.tpl:78
 #: plugins/gofax/faxaccount/lists.tpl:14
 #: plugins/addons/addressbook/remove.tpl:14
-#: plugins/admin/fai/faiPartitionTable.tpl:45
-#: plugins/admin/fai/faiVariable.tpl:46 plugins/admin/fai/faiScript.tpl:46
-#: plugins/admin/fai/faiTemplate.tpl:43 plugins/admin/fai/remove.tpl:15
-#: plugins/admin/fai/faiHook.tpl:46 plugins/admin/fai/remove_branch.tpl:14
+#: plugins/admin/fai/faiVariable.tpl:46
+#: plugins/admin/fai/faiPartitionTable.tpl:45 plugins/admin/fai/remove.tpl:15
+#: plugins/admin/fai/faiScript.tpl:46 plugins/admin/fai/faiTemplate.tpl:43
+#: plugins/admin/fai/remove_branch.tpl:14 plugins/admin/fai/faiHook.tpl:46
 #: plugins/admin/groups/mail.tpl:52 plugins/admin/groups/mail.tpl:97
 #: plugins/admin/groups/remove.tpl:14 plugins/admin/groups/generic.tpl:106
 #: plugins/admin/groups/paste_mail.tpl:31
 #: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/users/remove.tpl:14
 #: plugins/admin/applications/remove.tpl:13
 #: plugins/admin/departments/remove.tpl:14
-#: plugins/admin/systems/servservice.tpl:22
-#: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/glpi_edit_type.tpl:10
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/workstationStartup.tpl:62
 #: plugins/admin/systems/workstationStartup.tpl:82
-#: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
-#: plugins/admin/systems/phonesettings.tpl:177
-#: plugins/admin/systems/phonesettings.tpl:192
-#: plugins/admin/systems/remove.tpl:14
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
 #: plugins/admin/systems/terminalStartup.tpl:62
-#: plugins/admin/systems/glpi_edit_type.tpl:10
-#: plugins/admin/systems/remove_glpi.tpl:14
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
-#: plugins/admin/systems/glpi_edit_os.tpl:10
 #: plugins/admin/systems/class_termDNS.inc:476
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:192
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
+#: plugins/admin/systems/servservice.tpl:22
+#: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/glpi_edit_os.tpl:10
+#: plugins/admin/systems/remove_glpi.tpl:14
+#: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
 #: plugins/admin/systems/class_servDNSeditZone.inc:279
 #: plugins/admin/systems/class_servDNSeditZone.inc:472
-#: plugins/admin/ogroups/generic.tpl:40 plugins/admin/ogroups/remove.tpl:14
-#: plugins/admin/ogroups/phonequeue.tpl:25 plugins/gofon/macro/remove.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:15
+#: plugins/admin/systems/phonesettings.tpl:177
+#: plugins/admin/systems/phonesettings.tpl:192
+#: plugins/admin/systems/remove.tpl:14 plugins/admin/ogroups/generic.tpl:40
+#: plugins/admin/ogroups/remove.tpl:14 plugins/admin/ogroups/phonequeue.tpl:25
+#: plugins/gofon/macro/remove.tpl:13 plugins/gofon/phoneaccount/generic.tpl:15
 #: plugins/gofon/phoneaccount/paste_generic.tpl:15
 #: plugins/gofon/conference/remove.tpl:14
 msgid "Delete"
@@ -912,6 +1027,7 @@ msgstr "Выберите адреса для добавления"
 #: plugins/gofax/blocklists/headpage.tpl:29
 #: plugins/gofax/faxaccount/locals.tpl:19
 #: plugins/addons/addressbook/contents.tpl:58
+#: plugins/addons/godfs/contents.tpl:31
 #: plugins/admin/fai/faiProfileEntry.tpl:31
 #: plugins/admin/fai/faiPackageEntry.tpl:32 plugins/admin/fai/headpage.tpl:64
 #: plugins/admin/groups/headpage.tpl:30
@@ -919,14 +1035,14 @@ msgstr "Выберите адреса для добавления"
 #: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
 #: plugins/admin/applications/headpage.tpl:47
 #: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
-#: plugins/admin/systems/headpage.tpl:29
+#: plugins/admin/systems/glpiDeviceManagement.tpl:27
 #: plugins/admin/systems/servRepository.tpl:36
 #: plugins/admin/systems/glpiSelectUser.tpl:27
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:27
+#: plugins/admin/systems/headpage.tpl:29
 #: plugins/admin/systems/glpiAttachmentPool.tpl:27
-#: plugins/admin/systems/glpiDeviceManagement.tpl:27
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/admin/ogroups/headpage.tpl:29 plugins/gofon/macro/headpage.tpl:29
 #: plugins/gofon/conference/headpage.tpl:29
@@ -936,8 +1052,8 @@ msgid "Filters"
 msgstr "Фильтры"
 
 #: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:32
 #: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:32
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/personal/environment/selectPrinterDialog.tpl:34
 #: plugins/gofax/faxaccount/locals.tpl:29
@@ -966,141 +1082,28 @@ msgstr "Показать адреса пользователя"
 msgid "User name of which addresses are shown"
 msgstr "Имя пользователя, адрес которого показан"
 
-#: plugins/personal/mail/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:75
-#, php-format
-msgid "There is no mail method '%s' specified in your gosa.conf available."
-msgstr "Метод '%s' не описан в вашем файле конфигурации."
-
-#: plugins/personal/mail/class_mailAccount.inc:176
-msgid "No DESC tag in vacation file:"
-msgstr "В файле сообщения автоответчика отсутствует тег DESC:"
-
-#: plugins/personal/mail/class_mailAccount.inc:216
-msgid "This account has no mail extensions."
-msgstr "В этой учетной записи нет почтовых расширений."
-
-#: plugins/personal/mail/class_mailAccount.inc:225
-#: plugins/admin/groups/class_groupMail.inc:314
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid "Remove mail account"
-msgstr "Удалить настройки эл. почты"
-
-#: plugins/personal/mail/class_mailAccount.inc:226
-#: plugins/admin/groups/class_groupMail.inc:315
-msgid ""
-"This account has mail features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"В этой учетной записи есть настройки электронной почты. Вы можете удалить "
-"их, щелкнув ниже."
-
-#: plugins/personal/mail/class_mailAccount.inc:228
-#: plugins/admin/groups/class_groupMail.inc:317
-#: plugins/admin/ogroups/class_mailogroup.inc:43
-msgid "Create mail account"
-msgstr "Создать настройки запись эл. почты"
-
-#: plugins/personal/mail/class_mailAccount.inc:228
-#: plugins/admin/groups/class_groupMail.inc:318
-msgid ""
-"This account has mail features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"В этой учетной записи нет настроек электронной почты. Вы можете добавить их, "
-"щелкнув ниже."
-
-#: plugins/personal/mail/class_mailAccount.inc:276
-msgid ""
-"You're trying to add an invalid email address to the list of forwarders."
-msgstr ""
-"Вы пытаетесь добавить некорректный адрес электронной почты к списку тех, "
-"кому должны пересылаться сообщения."
-
-#: plugins/personal/mail/class_mailAccount.inc:282
-#: plugins/admin/groups/class_groupMail.inc:377
-msgid "Adding your one of your own addresses to the forwarders makes no sense."
-msgstr ""
-"Добавление своего единственного адреса к списку пересылки не имеет смысла."
-
-#: plugins/personal/mail/class_mailAccount.inc:317
-#: plugins/personal/mail/class_mailAccount.inc:322
-#: plugins/admin/groups/class_groupMail.inc:405
-msgid ""
-"You're trying to add an invalid email address to the list of alternate "
-"addresses."
-msgstr ""
-"Вы пытаетесь добавить некорректный адрес электронной почты к списку "
-"альтернативных адресов."
-
-#: plugins/personal/mail/class_mailAccount.inc:332
-#: plugins/admin/groups/class_groupMail.inc:410
-msgid "The address you're trying to add is already used by user"
-msgstr "Добавляемый вами адрес уже используется пользователем"
-
-#: plugins/personal/mail/class_mailAccount.inc:714
-msgid ""
-"There is no valid mailserver specified, please add one in the system setup."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:719
-#: plugins/admin/groups/class_groupMail.inc:798
-msgid "The required field 'Primary address' is not set."
-msgstr "Обязательное поле \"Основной адрес\" не заполнено."
-
-#: plugins/personal/mail/class_mailAccount.inc:723
-#: plugins/personal/mail/class_mailAccount.inc:727
-#: plugins/addons/addressbook/class_addressbook.inc:588
-#: plugins/admin/ogroups/class_mailogroup.inc:70
-msgid "Please enter a valid email address in 'Primary address' field."
-msgstr "Введите корректное значение в поле \"Основной адрес\"."
-
-#: plugins/personal/mail/class_mailAccount.inc:733
-#: plugins/admin/groups/class_groupMail.inc:807
-#: plugins/admin/ogroups/class_mailogroup.inc:77
-msgid "The primary address you've entered is already in use."
-msgstr "Введенный вами адрес уже используется."
-
-#: plugins/personal/mail/class_mailAccount.inc:739
-#: plugins/admin/groups/class_groupMail.inc:813
-msgid "Value in 'Quota size' is not valid."
-msgstr "Значение поля \"Квота\" некорректно."
-
-#: plugins/personal/mail/class_mailAccount.inc:748
-#: plugins/admin/groups/class_groupMail.inc:822
-msgid "Please specify a vaild mail size for mails to be rejected."
-msgstr "Укажите корректный размер сообщений, которые будут отклоняться."
-
-#: plugins/personal/mail/class_mailAccount.inc:758
-#: plugins/admin/groups/class_groupMail.inc:830
-msgid "You need to set the maximum mail size in order to reject anything."
-msgstr "Помните, что указывать нужно максимальный допустимый размер сообщений."
-
-#: plugins/personal/mail/class_mailAccount.inc:762
-msgid "You specified Spam settings, but there is no Folder specified."
-msgstr ""
-
 #: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
 #, fuzzy
 msgid "Mail settings"
 msgstr "Почтовые настройки пользователя"
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:871
+#: plugins/admin/systems/class_systemManagement.inc:872
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
-#: ihtml/themes/altlinux/setup_useradmin.tpl:30
 #: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/default/setup_useradmin.tpl:30
+#: ihtml/themes/altlinux/setup_useradmin.tpl:30
 #: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
+#: ihtml/themes/default/setup_useradmin.tpl:30 ihtml/themes/lhs/login.tpl:37
+#: ihtml/themes/lhs/login.tpl:41 ihtml/themes/lhs/setup_useradmin.tpl:30
 msgid "Password"
 msgstr "Пароль"
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:801
-#: plugins/admin/users/class_userManagement.inc:808
+#: plugins/admin/users/class_userManagement.inc:802
+#: plugins/admin/users/class_userManagement.inc:809
 msgid "Change password"
 msgstr "Сменить пароль"
 
@@ -1166,9 +1169,8 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
 #: plugins/addons/ldapmanager/contentexport.tpl:66
-#: plugins/admin/fai/class_faiManagement.inc:441
-#: plugins/admin/fai/faiNewBranch.tpl:52
-#: plugins/admin/departments/recursive_moce.tpl:10 include/functions.inc:1382
+#: plugins/admin/fai/faiNewBranch.tpl:50
+#: plugins/admin/departments/recursive_move.tpl:18 include/functions.inc:1382
 #: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_step3.tpl:17
@@ -1179,6 +1181,9 @@ msgstr ""
 #: ihtml/themes/default/setup_step3.tpl:17
 #: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_finish.tpl:30
+#: ihtml/themes/lhs/setup_useradmin.tpl:40 ihtml/themes/lhs/setup_step2.tpl:12
+#: ihtml/themes/lhs/setup_step3.tpl:17 ihtml/themes/lhs/setup_step4.tpl:114
+#: ihtml/themes/lhs/setup_finish.tpl:30
 msgid "Back"
 msgstr "Назад"
 
@@ -1220,6 +1225,19 @@ msgstr "У вас недостаточно прав для смены своег
 msgid "External password changer reported a problem: "
 msgstr "При попытке сменить пароль извне возникла проблема: "
 
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Выберите системы для добавления"
+
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr "Показать системы в подразделении"
+
+#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/systems/headpage.tpl:50
+msgid "Display systems matching"
+msgstr "Показать подходяшие системы"
+
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
 msgstr "Выберите группы для добавления"
@@ -1257,19 +1275,6 @@ msgstr "Пользователь должен сменить пароль при
 msgid "Password expires on"
 msgstr "Срок действия пароля истекает"
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
-msgstr "Выберите системы для добавления"
-
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
-msgstr "Показать системы в подразделении"
-
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:50
-msgid "Display systems matching"
-msgstr "Показать подходяшие системы"
-
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
@@ -1330,6 +1335,10 @@ msgstr "Системные доверия"
 msgid "Trust mode"
 msgstr "Режим"
 
+#: plugins/personal/posix/main.inc:131
+msgid "Unix settings"
+msgstr "Атрибуты UNIX"
+
 #: plugins/personal/posix/class_posixAccount.inc:16
 #: plugins/generic/references/class_reference.inc:22
 msgid "UNIX"
@@ -1345,9 +1354,9 @@ msgid "unconfigured"
 msgstr "Не настроено"
 
 #: plugins/personal/posix/class_posixAccount.inc:195
-#: plugins/admin/systems/class_terminalService.inc:141
 #: plugins/admin/systems/class_workstationService.inc:134
 #: plugins/admin/systems/class_workstationStartup.inc:623
+#: plugins/admin/systems/class_terminalService.inc:141
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:211
 msgid "automatic"
 msgstr "автоматически"
@@ -1550,7 +1559,7 @@ msgstr "Декабрь"
 #: plugins/personal/samba/class_sambaAccount.inc:453
 #: plugins/admin/systems/class_terminalGeneric.inc:60
 #: ihtml/themes/altlinux/setup_step4.tpl:91
-#: ihtml/themes/default/setup_step4.tpl:91
+#: ihtml/themes/default/setup_step4.tpl:91 ihtml/themes/lhs/setup_step4.tpl:91
 msgid "disabled"
 msgstr "отключен"
 
@@ -1638,10 +1647,6 @@ msgstr ""
 msgid "Too many users, can't allocate a free ID!"
 msgstr "Слишком много пользователей, невозможно создать идентификатор!"
 
-#: plugins/personal/posix/main.inc:131
-msgid "Unix settings"
-msgstr "Атрибуты UNIX"
-
 #: plugins/personal/posix/paste_generic.tpl:4
 #, fuzzy
 msgid "Posix settings"
@@ -1774,6 +1779,10 @@ msgstr ""
 msgid "Allow connection from these workstations only"
 msgstr "Разрешить подключения только от этой рабочей станции"
 
+#: plugins/personal/samba/main.inc:123
+msgid "Samba settings"
+msgstr "Настройки Samba"
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "Выберите рабочие станции для добавления"
@@ -1782,10 +1791,6 @@ msgstr "Выберите рабочие станции для добавлени
 msgid "Display workstations of department"
 msgstr "Показать рабочие станции подразделения"
 
-#: plugins/personal/samba/main.inc:123
-msgid "Samba settings"
-msgstr "Настройки Samba"
-
 #: plugins/personal/samba/class_sambaAccount.inc:196
 msgid "This account has no samba extensions."
 msgstr "В этой учетной записи нет расширений Samba."
@@ -1890,6 +1895,11 @@ msgstr ""
 "Предупреждение: не удается идентифицировать основную группу, преобразование "
 "в группу Samba невозможно!"
 
+#: plugins/personal/environment/main.inc:124
+#, fuzzy
+msgid "User environment settings"
+msgstr "Почтовые настройки пользователя"
+
 #: plugins/personal/environment/class_hotplugDialog.inc:111
 #, fuzzy
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
@@ -1915,12 +1925,6 @@ msgstr "Подразделение с таким именем уже сущес
 msgid "Please select an entry or press cancel."
 msgstr "Введите корректный номер телефона!"
 
-#: plugins/personal/environment/class_selectPrinterDialog.inc:67
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:99
-#, fuzzy
-msgid "Please select a printer or press cancel."
-msgstr "Введите корректный номер телефона!"
-
 #: plugins/personal/environment/hotplugDialog.tpl:1
 #, fuzzy
 msgid "Add hotplug devices"
@@ -1954,6 +1958,12 @@ msgstr "Фильтр"
 msgid "Regular expression for        matching hotplugs"
 msgstr "Регулярное выражение, соответствующее именам пользователей"
 
+#: plugins/personal/environment/class_selectPrinterDialog.inc:67
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:99
+#, fuzzy
+msgid "Please select a printer or press cancel."
+msgstr "Введите корректный номер телефона!"
+
 #: plugins/personal/environment/class_environment.inc:253
 #: plugins/personal/environment/class_environment.inc:290
 #, fuzzy
@@ -2006,8 +2016,8 @@ msgstr "нет"
 
 #: plugins/personal/environment/class_environment.inc:510
 #: plugins/personal/environment/class_environment.inc:521
-#: plugins/admin/systems/class_terminalStartup.inc:134
 #: plugins/admin/systems/class_workstationStartup.inc:503
+#: plugins/admin/systems/class_terminalStartup.inc:134
 #, fuzzy
 msgid "You must specify a valid mount point."
 msgstr "Введите корректное имя пользователя!"
@@ -2127,9 +2137,9 @@ msgid "Resolution"
 msgstr "Разрешение"
 
 #: plugins/personal/environment/environment.tpl:105
-#: plugins/admin/systems/servservice.tpl:11
 #: plugins/admin/systems/workstationStartup.tpl:86
 #: plugins/admin/systems/terminalStartup.tpl:66
+#: plugins/admin/systems/servservice.tpl:11
 #, fuzzy
 msgid "Shares"
 msgstr "сброс"
@@ -2144,13 +2154,14 @@ msgstr "сброс"
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:266
 #: plugins/admin/groups/class_groupMail.inc:537
 #: plugins/admin/applications/class_applicationParameters.inc:100
+#: plugins/admin/systems/glpiPrinter.tpl:122
 #: plugins/admin/systems/workstationStartup.tpl:101
-#: plugins/admin/systems/printer.tpl:48 plugins/admin/systems/servdns.tpl:8
+#: plugins/admin/systems/servdns.tpl:8
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/glpiManufacturer.tpl:8
-#: plugins/admin/systems/glpiPrinter.tpl:122
+#: plugins/admin/systems/printer.tpl:48
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:274
-#: ihtml/themes/altlinux/islocked.tpl:13
+#: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/lhs/islocked.tpl:13
 msgid "Remove"
 msgstr "Удалить"
 
@@ -2176,9 +2187,9 @@ msgid "Hotplug device settings"
 msgstr "Дисковод"
 
 #: plugins/personal/environment/environment.tpl:164
-#: plugins/admin/groups/class_groupManagement.inc:455
+#: plugins/admin/groups/class_groupManagement.inc:456
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:273
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
 msgid "New"
 msgstr "Создать"
 
@@ -2196,16 +2207,6 @@ msgstr "Настройки телефона"
 msgid "Admin Toggle"
 msgstr "Пользователи домена"
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:96
-#, fuzzy
-msgid "Specified name is invalid."
-msgstr "Указанное имя уже используется."
-
-#: plugins/personal/environment/class_logonManagementDialog.inc:100
-#, fuzzy
-msgid "Specified description contains invalid characters."
-msgstr "Неправильное указание таймаута '%s'"
-
 #: plugins/personal/environment/logonManagement.tpl:8
 #, fuzzy
 msgid "Logon script settings"
@@ -2218,22 +2219,21 @@ msgstr "Список"
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:41
+#: plugins/gofax/blocklists/generic.tpl:41 plugins/addons/godfs/generic.tpl:12
+#: plugins/addons/godfs/generic.tpl:38 plugins/admin/fai/faiVariable.tpl:19
 #: plugins/admin/fai/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiVariable.tpl:19
-#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
-#: plugins/admin/fai/faiProfile.tpl:19
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:11
-#: plugins/admin/fai/faiScript.tpl:19
+#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
+#: plugins/admin/fai/faiProfile.tpl:19 plugins/admin/fai/faiScript.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:17
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHookEntry.tpl:17
 #: plugins/admin/fai/faiTemplateEntry.tpl:11 plugins/admin/fai/faiHook.tpl:19
 #: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/component.tpl:25 plugins/admin/systems/server.tpl:25
-#: plugins/admin/systems/phone.tpl:25 plugins/admin/systems/printer.tpl:13
-#: plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/server.tpl:25 plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/component.tpl:25 plugins/admin/systems/phone.tpl:25
+#: plugins/admin/systems/printer.tpl:13
 #: plugins/admin/systems/wingeneric.tpl:25
 #: plugins/admin/ogroups/generic.tpl:13 plugins/gofon/macro/generic.tpl:36
 #: plugins/gofon/conference/generic.tpl:51
@@ -2266,42 +2266,30 @@ msgstr ""
 
 #: plugins/personal/environment/logonManagement.tpl:75
 #: plugins/gofax/faxaccount/lists.tpl:31
-#: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiPackageConfiguration.tpl:6
+#: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiScriptEntry.tpl:68
+#: plugins/admin/fai/faiNewBranch.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:48
 #: plugins/admin/fai/faiPackageEntry.tpl:56
 #: plugins/admin/fai/faiHookEntry.tpl:70
 #: plugins/admin/fai/faiTemplateEntry.tpl:130
-#: plugins/admin/fai/faiNewBranch.tpl:19
-#: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/groups/application_options.tpl:8
-#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/systems/servRepositorySetup.tpl:41
+#: plugins/admin/systems/printerPPDDialog.tpl:22
 msgid "Apply"
 msgstr "Применить"
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:67
-#: plugins/personal/environment/class_kioskManagementDialog.inc:85
-#, php-format
-msgid "Can't delete '%s'. Error was: permission denied."
-msgstr ""
-
-#: plugins/personal/environment/class_kioskManagementDialog.inc:70
-#: plugins/personal/environment/class_kioskManagementDialog.inc:88
-#, php-format
-msgid "Can't delete '%s'. Errow was: file doesn't exist."
-msgstr ""
-
-#: plugins/personal/environment/class_kioskManagementDialog.inc:130
-msgid ""
-"There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
-msgstr ""
+#: plugins/personal/environment/class_logonManagementDialog.inc:96
+#, fuzzy
+msgid "Specified name is invalid."
+msgstr "Указанное имя уже используется."
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:136
-#, php-format
-msgid "Kiosk path '%s' is not accessible. Please check the permissions."
-msgstr ""
+#: plugins/personal/environment/class_logonManagementDialog.inc:100
+#, fuzzy
+msgid "Specified description contains invalid characters."
+msgstr "Неправильное указание таймаута '%s'"
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:1
 #, fuzzy
@@ -2329,6 +2317,28 @@ msgstr "Устройства"
 msgid "save"
 msgstr "Сохранить"
 
+#: plugins/personal/environment/class_kioskManagementDialog.inc:67
+#: plugins/personal/environment/class_kioskManagementDialog.inc:85
+#, php-format
+msgid "Can't delete '%s'. Error was: permission denied."
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:70
+#: plugins/personal/environment/class_kioskManagementDialog.inc:88
+#, php-format
+msgid "Can't delete '%s'. Errow was: file doesn't exist."
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:130
+msgid ""
+"There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:136
+#, php-format
+msgid "Kiosk path '%s' is not accessible. Please check the permissions."
+msgstr ""
+
 #: plugins/personal/environment/kioskManagement.tpl:1
 #: plugins/personal/environment/kioskManagement.tpl:5
 #, fuzzy
@@ -2342,22 +2352,162 @@ msgid "Browse"
 msgstr "Просмотр"
 
 #: plugins/personal/environment/kioskManagement.tpl:25
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
 #: plugins/admin/systems/glpi_edit_type.tpl:15
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:14
 #: plugins/admin/systems/glpiManufacturer.tpl:13
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
 #: plugins/admin/systems/glpi_edit_os.tpl:15
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:14
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
 #: include/class_MultiSelectWindow.inc:45
 #, fuzzy
 msgid "Close"
 msgstr "Выбрать"
 
-#: plugins/personal/environment/main.inc:124
+#: plugins/personal/generic/class_user.inc:256
+msgid "female"
+msgstr "женский"
+
+#: plugins/personal/generic/class_user.inc:256
+msgid "male"
+msgstr "мужской"
+
+#: plugins/personal/generic/class_user.inc:270
+msgid "This account has no valid GOsa extensions."
+msgstr "Для этой учетной записи нет корректных расширений GOsa."
+
+#: plugins/personal/generic/class_user.inc:324
+msgid "The specified file has not been uploaded via HTTP POST! Aborted."
+msgstr ""
+"Указанный файл не был загружен на сервер (метод HTTP POST)! Операция "
+"прервана."
+
+#: plugins/personal/generic/class_user.inc:420
+msgid "Please enter a valid serial number"
+msgstr "Введите корректный серийный номер"
+
+#: plugins/personal/generic/class_user.inc:457
+#, php-format
+msgid "Certificate is valid from %s to %s and is currently %s."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:457
+msgid "valid"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:457
+msgid "invalid"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:461
 #, fuzzy
-msgid "User environment settings"
-msgstr "Почтовые настройки пользователя"
+msgid "No certificate installed"
+msgstr "Изменить сертификаты"
+
+#: plugins/personal/generic/class_user.inc:879
+msgid "Kerberos database communication failed"
+msgstr "Ошибка соединения с базой данных Kerberos"
+
+#: plugins/personal/generic/class_user.inc:896
+msgid "Can't remove user from kerberos database."
+msgstr "Не удается удалить пользователя из базы данных Kerberos."
+
+#: plugins/personal/generic/class_user.inc:907
+msgid "Can't add user to kerberos database."
+msgstr "Не удается добавить пользователя в базу данных Kerberos."
+
+#: plugins/personal/generic/class_user.inc:947
+msgid "You have no permissions to create a user on this 'Base'."
+msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
+
+#: plugins/personal/generic/class_user.inc:952
+#, fuzzy
+msgid "You have no permissions to move a user from the original 'Base'."
+msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
+
+#: plugins/personal/generic/class_user.inc:958
+#: plugins/addons/addressbook/class_addressbook.inc:545
+#: plugins/admin/users/class_userManagement.inc:634
+msgid "The required field 'Name' is not set."
+msgstr "Обязательное поле \"Имя\" не заполнено."
+
+#: plugins/personal/generic/class_user.inc:967
+msgid "There's already a person with this 'Login' in the database."
+msgstr ""
+"Пользователь с таким регистрационным именем в базе данных уже существует."
+
+#: plugins/personal/generic/class_user.inc:973
+#: plugins/addons/addressbook/class_addressbook.inc:549
+#: plugins/admin/users/class_userManagement.inc:637
+msgid "The required field 'Given name' is not set."
+msgstr "Обязательное поле \"Личное имя\" не заполнено."
+
+#: plugins/personal/generic/class_user.inc:976
+msgid "The required field 'Login' is not set."
+msgstr "Обязательное поле \"Регистрационное имя\" не заполнено."
+
+#: plugins/personal/generic/class_user.inc:983
+msgid ""
+"There's already a person with this 'Name'/'Given name' combination in the "
+"database."
+msgstr ""
+"Пользователь с такой комбинацией имени и личного имени в базе данных уже "
+"существует."
+
+#: plugins/personal/generic/class_user.inc:990
+msgid ""
+"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+"Значение поля \"Регистрационное имя\" содержит недопустимые символы. "
+"Допустимыми являются буквы в нижнем регистре, цифры и дефисы."
+
+#: plugins/personal/generic/class_user.inc:993
+msgid "The field 'Homepage' contains an invalid URL definition."
+msgstr "Значение поля \"Домашняя страница\" содержит некорректный URL."
+
+#: plugins/personal/generic/class_user.inc:996
+#: plugins/personal/generic/class_user.inc:1021
+#: plugins/addons/addressbook/class_addressbook.inc:555
+#: plugins/addons/addressbook/class_addressbook.inc:583
+#: plugins/admin/departments/class_departmentGeneric.inc:211
+msgid "The field 'Name' contains invalid characters."
+msgstr "Значение поля \"Имя\" содержит недопустимые символы."
+
+#: plugins/personal/generic/class_user.inc:999
+#: plugins/personal/generic/class_user.inc:1018
+#: plugins/addons/addressbook/class_addressbook.inc:558
+#: plugins/addons/addressbook/class_addressbook.inc:580
+msgid "The field 'Given name' contains invalid characters."
+msgstr "Значение поля \"Личное имя\" содержит недопустимые символы."
+
+#: plugins/personal/generic/class_user.inc:1004
+#: plugins/addons/addressbook/class_addressbook.inc:563
+#: plugins/addons/addressbook/class_addressbook.inc:566
+#: plugins/admin/departments/class_departmentGeneric.inc:214
+msgid "The field 'Phone' contains an invalid phone number."
+msgstr "Значение поля \"Телефон\" содержит недопустимый номер телефона."
+
+#: plugins/personal/generic/class_user.inc:1007
+#: plugins/addons/addressbook/class_addressbook.inc:569
+#: plugins/admin/departments/class_departmentGeneric.inc:217
+msgid "The field 'Fax' contains an invalid phone number."
+msgstr "Значение поля \"Факс\" содержит недопустимый номер телефона."
+
+#: plugins/personal/generic/class_user.inc:1010
+#: plugins/addons/addressbook/class_addressbook.inc:572
+msgid "The field 'Mobile' contains an invalid phone number."
+msgstr "Значение поля \"Мобильный\" содержит некорректный номер телефона."
+
+#: plugins/personal/generic/class_user.inc:1013
+#: plugins/addons/addressbook/class_addressbook.inc:575
+msgid "The field 'Pager' contains an invalid phone number."
+msgstr "Значение поля \"Пейджер\" содержит некорректный номер телефона."
+
+#: plugins/personal/generic/class_user.inc:1140
+#, fuzzy
+msgid "Could not open specified certificate!"
+msgstr "Невозможно выбрать базу данных!"
 
 #: plugins/personal/generic/password.tpl:2
 msgid ""
@@ -2369,38 +2519,18 @@ msgstr ""
 "свой пароль снова. GOsa произведет шифрование в соответствии с выбраной "
 "схемой."
 
-#: plugins/personal/generic/generic_picture.tpl:5
-#: plugins/personal/generic/generic_picture.tpl:15
+#: 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_picture.tpl:5
+#: plugins/personal/generic/generic_picture.tpl:15
 #: plugins/personal/generic/paste_generic.tpl:41
 msgid "Personal picture"
 msgstr "Изображение"
 
-#: plugins/personal/generic/generic_picture.tpl:27
-#: plugins/personal/generic/paste_generic.tpl:27
-msgid "Remove picture"
-msgstr "Удалить изображение"
-
-#: plugins/personal/generic/generic_picture.tpl:33
-#: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
-#: plugins/admin/systems/servnfs.tpl:75
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
-#: plugins/admin/systems/servdnseditzone.tpl:117
-#: plugins/admin/systems/glpi_devices.tpl:760
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
-#: include/class_MultiSelectWindow.inc:44
-#: ihtml/themes/default/copyPasteDialog.tpl:12
-msgid "Save"
-msgstr "Сохранить"
-
-#: plugins/personal/generic/generic.tpl:6
-msgid "Personal information"
-msgstr "Личная информация"
-
 #: plugins/personal/generic/generic.tpl:24
 #: plugins/personal/generic/generic.tpl:34
 msgid "Change picture"
@@ -2434,8 +2564,8 @@ msgid "Login"
 msgstr "Имя пользователя"
 
 #: plugins/personal/generic/generic.tpl:67
-#: plugins/addons/addressbook/address_info.tpl:22
 #: plugins/addons/addressbook/address_edit.tpl:54
+#: plugins/addons/addressbook/address_info.tpl:22
 msgid "Personal title"
 msgstr "Обращение"
 
@@ -2449,7 +2579,7 @@ msgstr "Дата рождения"
 
 #: plugins/personal/generic/generic.tpl:100
 #: ihtml/themes/altlinux/sizelimit.tpl:14
-#: ihtml/themes/default/sizelimit.tpl:14
+#: ihtml/themes/default/sizelimit.tpl:14 ihtml/themes/lhs/sizelimit.tpl:14
 msgid "Set"
 msgstr "Установить"
 
@@ -2464,30 +2594,31 @@ msgid "Preferred langage"
 msgstr "Язык по умолчанию"
 
 #: plugins/personal/generic/generic.tpl:127
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
 #: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/admin/fai/class_faiManagement.inc:670
-#: plugins/admin/groups/class_groupManagement.inc:458
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
+#: plugins/addons/godfs/class_dfsManagment.inc:186
+#: plugins/admin/fai/class_faiManagement.inc:678
+#: plugins/admin/groups/class_groupManagement.inc:459
 #: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/users/class_userManagement.inc:786
+#: plugins/admin/users/class_userManagement.inc:787
 #: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_applicationManagement.inc:477
+#: plugins/admin/applications/class_applicationManagement.inc:480
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_departmentManagement.inc:302
-#: plugins/admin/systems/component.tpl:13 plugins/admin/systems/server.tpl:13
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/terminal.tpl:18
-#: plugins/admin/systems/class_systemManagement.inc:771
-#: plugins/admin/systems/printer.tpl:20
+#: plugins/admin/departments/class_departmentManagement.inc:303
+#: plugins/admin/systems/server.tpl:13 plugins/admin/systems/terminal.tpl:18
 #: plugins/admin/systems/workstation.tpl:27
+#: plugins/admin/systems/component.tpl:13
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/phone.tpl:13
+#: plugins/admin/systems/class_systemManagement.inc:772
+#: plugins/admin/systems/printer.tpl:20
 #: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:43
-#: plugins/admin/ogroups/class_ogroupManagement.inc:451
-#: plugins/admin/ogroups/generic.tpl:21
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:330
-#: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/ogroups/class_ogroupManagement.inc:452
+#: plugins/admin/ogroups/generic.tpl:21 plugins/gofon/macro/generic.tpl:20
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 #: plugins/gofon/conference/generic.tpl:33
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
 msgid "Base"
 msgstr "Ветка"
 
@@ -2498,10 +2629,10 @@ msgstr "Выберите ветку для пользователя"
 #: plugins/personal/generic/generic.tpl:134
 #: plugins/admin/groups/generic.tpl:26
 #: plugins/admin/departments/generic.tpl:33
-#: plugins/admin/systems/component.tpl:18 plugins/admin/systems/server.tpl:18
-#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/terminal.tpl:23
-#: plugins/admin/systems/printer.tpl:25
+#: plugins/admin/systems/server.tpl:18 plugins/admin/systems/terminal.tpl:23
 #: plugins/admin/systems/workstation.tpl:32
+#: plugins/admin/systems/component.tpl:18 plugins/admin/systems/phone.tpl:18
+#: plugins/admin/systems/printer.tpl:25
 #: plugins/admin/systems/wingeneric.tpl:18
 #: plugins/admin/ogroups/generic.tpl:26
 #, fuzzy
@@ -2510,10 +2641,10 @@ msgstr "Выберите, чтобы просмотреть серверы"
 
 #: plugins/personal/generic/generic.tpl:147
 #: plugins/personal/generic/generic.tpl:291
-#: plugins/addons/addressbook/address_info.tpl:33
-#: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/addons/addressbook/address_edit.tpl:72
 #: plugins/addons/addressbook/address_edit.tpl:182
+#: plugins/addons/addressbook/address_info.tpl:33
+#: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/admin/departments/generic.tpl:55
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
 msgid "Address"
@@ -2557,16 +2688,16 @@ msgid "Organization"
 msgstr "Организация"
 
 #: plugins/personal/generic/generic.tpl:213
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:323
-#: plugins/addons/addressbook/address_info.tpl:64
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
 #: plugins/addons/addressbook/address_edit.tpl:138
-#: plugins/admin/groups/class_groupManagement.inc:523
-#: plugins/admin/users/class_userManagement.inc:818
-#: plugins/admin/applications/class_applicationManagement.inc:518
-#: plugins/admin/systems/class_systemManagement.inc:791
-#: plugins/admin/ogroups/class_ogroupManagement.inc:517
-#: plugins/admin/ogroups/class_ogroupManagement.inc:585
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
+#: plugins/addons/addressbook/address_info.tpl:64
+#: plugins/admin/groups/class_groupManagement.inc:524
+#: plugins/admin/users/class_userManagement.inc:819
+#: plugins/admin/applications/class_applicationManagement.inc:521
+#: plugins/admin/systems/class_systemManagement.inc:792
+#: plugins/admin/ogroups/class_ogroupManagement.inc:518
+#: plugins/admin/ogroups/class_ogroupManagement.inc:586
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #: plugins/generic/references/class_reference.inc:38
 msgid "Department"
 msgstr "Подразделение"
@@ -2590,12 +2721,13 @@ msgstr "Номер комнаты"
 
 #: plugins/personal/generic/generic.tpl:257
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_info.tpl:40
-#: plugins/addons/addressbook/address_edit.tpl:95 html/getxls.php:236
+#: 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:283
+#: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:43
 #: plugins/admin/departments/generic.tpl:51
 #: plugins/admin/systems/workstation.tpl:18 html/getxls.php:174
@@ -2641,8 +2773,8 @@ msgid "Street"
 msgstr "Улица"
 
 #: plugins/personal/generic/generic.tpl:365
-#: plugins/addons/addressbook/address_info.tpl:70
-#: plugins/addons/addressbook/address_edit.tpl:158 html/getxls.php:174
+#: plugins/addons/addressbook/address_edit.tpl:158
+#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
 msgid "Postal code"
 msgstr "Почтовый индекс"
 
@@ -2662,166 +2794,41 @@ msgstr "Последняя доставка"
 msgid "Public visible"
 msgstr "Видимый всем"
 
-#: plugins/personal/generic/generic_certs.tpl:8
-msgid "Standard certificate"
-msgstr "Стандартный сертификат"
-
-#: plugins/personal/generic/generic_certs.tpl:28
-msgid "S/MIME certificate"
-msgstr "Сертификат S/MIME"
-
-#: plugins/personal/generic/generic_certs.tpl:48
-msgid "PKCS12 certificate"
-msgstr "Сертификат PKCS12"
-
-#: plugins/personal/generic/generic_certs.tpl:65
-msgid "Certificate serial number"
-msgstr "Серийный номер сертификата"
+#: plugins/personal/generic/generic_picture.tpl:27
+#: plugins/personal/generic/paste_generic.tpl:27
+msgid "Remove picture"
+msgstr "Удалить изображение"
 
-#: plugins/personal/generic/class_user.inc:256
-msgid "female"
-msgstr "женский"
-
-#: plugins/personal/generic/class_user.inc:256
-msgid "male"
-msgstr "мужской"
-
-#: plugins/personal/generic/class_user.inc:270
-msgid "This account has no valid GOsa extensions."
-msgstr "Для этой учетной записи нет корректных расширений GOsa."
-
-#: plugins/personal/generic/class_user.inc:324
-msgid "The specified file has not been uploaded via HTTP POST! Aborted."
-msgstr ""
-"Указанный файл не был загружен на сервер (метод HTTP POST)! Операция "
-"прервана."
-
-#: plugins/personal/generic/class_user.inc:420
-msgid "Please enter a valid serial number"
-msgstr "Введите корректный серийный номер"
-
-#: plugins/personal/generic/class_user.inc:457
-#, php-format
-msgid "Certificate is valid from %s to %s and is currently %s."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:457
-msgid "valid"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:457
-msgid "invalid"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:461
-#, fuzzy
-msgid "No certificate installed"
-msgstr "Изменить сертификаты"
-
-#: plugins/personal/generic/class_user.inc:879
-msgid "Kerberos database communication failed"
-msgstr "Ошибка соединения с базой данных Kerberos"
-
-#: plugins/personal/generic/class_user.inc:896
-msgid "Can't remove user from kerberos database."
-msgstr "Не удается удалить пользователя из базы данных Kerberos."
-
-#: plugins/personal/generic/class_user.inc:907
-msgid "Can't add user to kerberos database."
-msgstr "Не удается добавить пользователя в базу данных Kerberos."
-
-#: plugins/personal/generic/class_user.inc:947
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
-
-#: plugins/personal/generic/class_user.inc:952
-#, fuzzy
-msgid "You have no permissions to move a user from the original 'Base'."
-msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
-
-#: plugins/personal/generic/class_user.inc:958
-#: plugins/addons/addressbook/class_addressbook.inc:545
-#: plugins/admin/users/class_userManagement.inc:634
-msgid "The required field 'Name' is not set."
-msgstr "Обязательное поле \"Имя\" не заполнено."
-
-#: plugins/personal/generic/class_user.inc:967
-msgid "There's already a person with this 'Login' in the database."
-msgstr ""
-"Пользователь с таким регистрационным именем в базе данных уже существует."
-
-#: plugins/personal/generic/class_user.inc:973
-#: plugins/addons/addressbook/class_addressbook.inc:549
-#: plugins/admin/users/class_userManagement.inc:637
-msgid "The required field 'Given name' is not set."
-msgstr "Обязательное поле \"Личное имя\" не заполнено."
-
-#: plugins/personal/generic/class_user.inc:976
-msgid "The required field 'Login' is not set."
-msgstr "Обязательное поле \"Регистрационное имя\" не заполнено."
-
-#: plugins/personal/generic/class_user.inc:983
-msgid ""
-"There's already a person with this 'Name'/'Given name' combination in the "
-"database."
-msgstr ""
-"Пользователь с такой комбинацией имени и личного имени в базе данных уже "
-"существует."
-
-#: plugins/personal/generic/class_user.inc:990
-msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-"Значение поля \"Регистрационное имя\" содержит недопустимые символы. "
-"Допустимыми являются буквы в нижнем регистре, цифры и дефисы."
-
-#: plugins/personal/generic/class_user.inc:993
-msgid "The field 'Homepage' contains an invalid URL definition."
-msgstr "Значение поля \"Домашняя страница\" содержит некорректный URL."
-
-#: plugins/personal/generic/class_user.inc:996
-#: plugins/personal/generic/class_user.inc:1021
-#: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/addons/addressbook/class_addressbook.inc:583
-#: plugins/admin/departments/class_departmentGeneric.inc:211
-msgid "The field 'Name' contains invalid characters."
-msgstr "Значение поля \"Имя\" содержит недопустимые символы."
-
-#: plugins/personal/generic/class_user.inc:999
-#: plugins/personal/generic/class_user.inc:1018
-#: plugins/addons/addressbook/class_addressbook.inc:558
-#: plugins/addons/addressbook/class_addressbook.inc:580
-msgid "The field 'Given name' contains invalid characters."
-msgstr "Значение поля \"Личное имя\" содержит недопустимые символы."
-
-#: plugins/personal/generic/class_user.inc:1004
-#: plugins/addons/addressbook/class_addressbook.inc:563
-#: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/admin/departments/class_departmentGeneric.inc:214
-msgid "The field 'Phone' contains an invalid phone number."
-msgstr "Значение поля \"Телефон\" содержит недопустимый номер телефона."
+#: plugins/personal/generic/generic_picture.tpl:33
+#: plugins/addons/addressbook/address_edit.tpl:233
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
+#: plugins/admin/systems/servnfs.tpl:75
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
+#: plugins/admin/systems/servdnseditzone.tpl:117
+#: plugins/admin/systems/glpi_devices.tpl:760
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
+#: include/class_MultiSelectWindow.inc:44
+#: ihtml/themes/default/copyPasteDialog.tpl:12
+msgid "Save"
+msgstr "Сохранить"
 
-#: plugins/personal/generic/class_user.inc:1007
-#: plugins/addons/addressbook/class_addressbook.inc:569
-#: plugins/admin/departments/class_departmentGeneric.inc:217
-msgid "The field 'Fax' contains an invalid phone number."
-msgstr "Значение поля \"Факс\" содержит недопустимый номер телефона."
+#: plugins/personal/generic/generic_certs.tpl:8
+msgid "Standard certificate"
+msgstr "Стандартный сертификат"
 
-#: plugins/personal/generic/class_user.inc:1010
-#: plugins/addons/addressbook/class_addressbook.inc:572
-msgid "The field 'Mobile' contains an invalid phone number."
-msgstr "Значение поля \"Мобильный\" содержит некорректный номер телефона."
+#: plugins/personal/generic/generic_certs.tpl:28
+msgid "S/MIME certificate"
+msgstr "Сертификат S/MIME"
 
-#: plugins/personal/generic/class_user.inc:1013
-#: plugins/addons/addressbook/class_addressbook.inc:575
-msgid "The field 'Pager' contains an invalid phone number."
-msgstr "Значение поля \"Пейджер\" содержит некорректный номер телефона."
+#: plugins/personal/generic/generic_certs.tpl:48
+msgid "PKCS12 certificate"
+msgstr "Сертификат PKCS12"
 
-#: plugins/personal/generic/class_user.inc:1140
-#, fuzzy
-msgid "Could not open specified certificate!"
-msgstr "Невозможно выбрать базу данных!"
+#: plugins/personal/generic/generic_certs.tpl:65
+msgid "Certificate serial number"
+msgstr "Серийный номер сертификата"
 
 #: plugins/personal/generic/main.inc:107
 msgid "You are not allowed to set your password!"
@@ -2873,14 +2880,19 @@ msgstr "Аккаунт FTP"
 msgid "Intranet account"
 msgstr "Создать телефонный аккаунт"
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:6
-msgid "WebDAV"
-msgstr "WebDAV"
-
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "Учетная запись Groupware"
 
+#: plugins/personal/connectivity/glpi.tpl:1
+#, fuzzy
+msgid "GLPI account"
+msgstr "Аккаунт FTP"
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:6
+msgid "WebDAV"
+msgstr "WebDAV"
+
 #: plugins/personal/connectivity/kolab.tpl:1
 #, fuzzy
 msgid "Kolab account"
@@ -2985,11 +2997,6 @@ msgstr "Отметьте, чтобы отключить доступ к FTP"
 msgid "Temporary disable FTP access"
 msgstr "Временно отключить доступ к FTP"
 
-#: plugins/personal/connectivity/glpi.tpl:1
-#, fuzzy
-msgid "GLPI account"
-msgstr "Аккаунт FTP"
-
 #: plugins/personal/connectivity/oxchange.tpl:2
 msgid "Open-Xchange Account"
 msgstr ""
@@ -3025,6 +3032,30 @@ msgstr "Информация"
 msgid "User Timezone"
 msgstr ""
 
+#: plugins/personal/connectivity/opengw.tpl:1
+#, fuzzy
+msgid "Opengroupware"
+msgstr "Учетная запись Groupware"
+
+#: plugins/personal/connectivity/opengw.tpl:8
+#, fuzzy
+msgid "Location team"
+msgstr "Местоположение"
+
+#: plugins/personal/connectivity/opengw.tpl:21
+#, fuzzy
+msgid "Template user"
+msgstr "Шаблон"
+
+#: plugins/personal/connectivity/opengw.tpl:34
+#: plugins/admin/systems/class_workstationGeneric.inc:71
+msgid "Locked"
+msgstr ""
+
+#: plugins/personal/connectivity/opengw.tpl:49
+msgid "Teams"
+msgstr ""
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
@@ -3064,13 +3095,38 @@ msgstr ""
 msgid "Numerical value for Quota Setting is not valid."
 msgstr "Значение поля \"Квота\" некорректно."
 
+#: plugins/personal/connectivity/class_intranetAccount.inc:14
+msgid "Intranet"
+msgstr ""
+
 #: plugins/personal/connectivity/class_pptpAccount.inc:26
 msgid "PPTP"
 msgstr ""
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:14
-msgid "Intranet"
-msgstr ""
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
+msgstr "FTP"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+msgid "Value specified as 'Upload bandwidth' is not valid."
+msgstr "Значение поля \"Пропускная способность (на сервер)\" некорректно."
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:140
+msgid "Value specified as 'Download bandwidth' is not valid."
+msgstr "Значение поля \"Пропускная способность (с сервера)\" некорректно."
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:143
+msgid "Value specified as 'Files' is not valid."
+msgstr "Значение поля \"Файлы\" некорректно."
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:146
+msgid "Value specified as 'Size' is not valid."
+msgstr "Значение поля \"Размер\" некорректно."
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:149
+msgid "Value specified as 'Ratio' is not valid."
+msgstr "Значение поля \"Отношение\" некорректно."
 
 #: plugins/personal/connectivity/class_phpgwAccount.inc:5
 msgid "PHPGroupware"
@@ -3145,34 +3201,13 @@ msgstr ""
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
-#: plugins/generic/references/class_reference.inc:34
-msgid "FTP"
-msgstr "FTP"
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
-msgid "Value specified as 'Upload bandwidth' is not valid."
-msgstr "Значение поля \"Пропускная способность (на сервер)\" некорректно."
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
+msgstr "Учетная запись WebDAV"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:140
-msgid "Value specified as 'Download bandwidth' is not valid."
-msgstr "Значение поля \"Пропускная способность (с сервера)\" некорректно."
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:143
-msgid "Value specified as 'Files' is not valid."
-msgstr "Значение поля \"Файлы\" некорректно."
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:146
-msgid "Value specified as 'Size' is not valid."
-msgstr "Значение поля \"Размер\" некорректно."
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:149
-msgid "Value specified as 'Ratio' is not valid."
-msgstr "Значение поля \"Отношение\" некорректно."
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
-msgid "Open-Xchange"
-msgstr ""
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
+msgid "Open-Xchange"
+msgstr ""
 
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:613
 #, fuzzy, php-format
@@ -3225,43 +3260,6 @@ msgstr ""
 msgid "you are not using any strange characters in the loginname."
 msgstr ""
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
-msgstr "Учетная запись WebDAV"
-
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
-#, fuzzy
-msgid "PHPscheduleit"
-msgstr "Учетная запись Groupware"
-
-#: plugins/personal/connectivity/class_connectivity.inc:63
-msgid "This account has no connectivity extensions."
-msgstr "В этой учетной записи нет атрибутов для подключения."
-
-#: plugins/personal/connectivity/opengw.tpl:1
-#, fuzzy
-msgid "Opengroupware"
-msgstr "Учетная запись Groupware"
-
-#: plugins/personal/connectivity/opengw.tpl:8
-#, fuzzy
-msgid "Location team"
-msgstr "Местоположение"
-
-#: plugins/personal/connectivity/opengw.tpl:21
-#, fuzzy
-msgid "Template user"
-msgstr "Шаблон"
-
-#: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:71
-msgid "Locked"
-msgstr ""
-
-#: plugins/personal/connectivity/opengw.tpl:49
-msgid "Teams"
-msgstr ""
-
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 #, fuzzy
 msgid "Opengroupware account"
@@ -3285,6 +3283,58 @@ msgid ""
 "configuration twice."
 msgstr ""
 
+#: plugins/personal/connectivity/class_connectivity.inc:63
+msgid "This account has no connectivity extensions."
+msgstr "В этой учетной записи нет атрибутов для подключения."
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
+#, fuzzy
+msgid "PHPscheduleit"
+msgstr "Учетная запись Groupware"
+
+#: plugins/gofax/blocklists/generic.tpl:8
+msgid "List name"
+msgstr "Список"
+
+#: plugins/gofax/blocklists/generic.tpl:10
+msgid "Name of blocklist"
+msgstr "Имя стоп-листа"
+
+#: plugins/gofax/blocklists/generic.tpl:16
+msgid "Select subtree to place blocklist in"
+msgstr "Выберите ветку стоп-листа"
+
+#: plugins/gofax/blocklists/generic.tpl:32
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/systems/workstationService.tpl:42
+#: plugins/admin/systems/workstationService.tpl:120
+#: plugins/admin/systems/servnfs.tpl:39
+#: plugins/admin/systems/terminalService.tpl:42
+#: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/systems/glpi_devices.tpl:427
+#: plugins/admin/systems/glpi_devices.tpl:492
+#: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
+#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
+msgid "Type"
+msgstr "Тип"
+
+#: plugins/gofax/blocklists/generic.tpl:34
+msgid "Select wether to filter incoming or outgoing calls"
+msgstr "Выберите, нужно ли фильтровать входящие или исходящие звонки"
+
+#: plugins/gofax/blocklists/generic.tpl:43
+msgid "Descriptive text for this blocklist"
+msgstr "Описание стоп-листа"
+
+#: plugins/gofax/blocklists/generic.tpl:56
+msgid "Blocked numbers"
+msgstr "Блокируемые номера"
+
+#: plugins/gofax/blocklists/generic.tpl:72
+msgid "Numbers can also contain wild cards."
+msgstr "Вместо точных номеров можно использовать шаблоны."
+
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
 msgid "FAX Blocklists"
 msgstr "Стоп-лист номеров (факсы)"
@@ -3303,77 +3353,79 @@ msgid "Please specify a valid phone number."
 msgstr "Укажите корректный номер телефона."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/admin/fai/class_faiManagement.inc:635
+#: plugins/admin/fai/class_faiManagement.inc:641
 #: plugins/admin/groups/class_groupManagement.inc:451
 #: plugins/admin/users/class_userManagement.inc:778
-#: plugins/admin/applications/class_applicationManagement.inc:470
+#: plugins/admin/applications/class_applicationManagement.inc:472
 #: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
 #: plugins/admin/ogroups/class_ogroupManagement.inc:442
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
 #, fuzzy
-msgid "Go up one department"
-msgstr "Подразделение"
+msgid "Go to root department"
+msgstr "Список подразделений"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/admin/fai/class_faiManagement.inc:635
-#: plugins/admin/fai/class_faiProfile.inc:303
+#: plugins/addons/godfs/class_dfsManagment.inc:183
+#: plugins/admin/fai/class_faiManagement.inc:641
 #: plugins/admin/groups/class_groupManagement.inc:451
 #: plugins/admin/users/class_userManagement.inc:778
-#: plugins/admin/applications/class_applicationManagement.inc:470
+#: plugins/admin/applications/class_applicationManagement.inc:472
 #: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
-#: plugins/admin/systems/class_servDNSeditZone.inc:276
+#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: plugins/admin/ogroups/class_ogroupManagement.inc:442
-#: plugins/admin/ogroups/phonequeue.tpl:17
+#: plugins/admin/ogroups/class_ogroupManagement.inc:443
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
-msgid "Up"
-msgstr ""
+#, fuzzy
+msgid "Root"
+msgstr "Перезагрузить"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
-#: plugins/admin/fai/class_faiManagement.inc:638
+#: plugins/admin/fai/class_faiManagement.inc:644
 #: plugins/admin/groups/class_groupManagement.inc:452
 #: plugins/admin/users/class_userManagement.inc:779
-#: plugins/admin/applications/class_applicationManagement.inc:471
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:297
-#: plugins/admin/systems/class_systemManagement.inc:755
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_systemManagement.inc:755
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/class_ogroupManagement.inc:443
+#: plugins/admin/ogroups/class_ogroupManagement.inc:444
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
 #, fuzzy
-msgid "Go to root department"
-msgstr "Список подразделений"
+msgid "Go up one department"
+msgstr "Подразделение"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
-#: plugins/admin/fai/class_faiManagement.inc:638
+#: plugins/addons/godfs/class_dfsManagment.inc:182
+#: plugins/admin/fai/class_faiManagement.inc:644
+#: plugins/admin/fai/class_faiProfile.inc:303
 #: plugins/admin/groups/class_groupManagement.inc:452
 #: plugins/admin/users/class_userManagement.inc:779
-#: plugins/admin/applications/class_applicationManagement.inc:471
+#: plugins/admin/applications/class_applicationManagement.inc:473
 #: plugins/admin/departments/class_departmentManagement.inc:297
-#: plugins/admin/systems/class_systemManagement.inc:755
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_systemManagement.inc:755
+#: plugins/admin/systems/class_servDNSeditZone.inc:276
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
 #: plugins/admin/ogroups/class_ogroupManagement.inc:444
+#: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
-#, fuzzy
-msgid "Root"
-msgstr "Перезагрузить"
+msgid "Up"
+msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:309
 #: plugins/admin/groups/class_groupManagement.inc:453
 #: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:472
-#: plugins/admin/systems/class_systemManagement.inc:757
+#: plugins/admin/applications/class_applicationManagement.inc:474
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
 #: plugins/admin/ogroups/class_ogroupManagement.inc:445
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
@@ -3383,13 +3435,13 @@ msgid "Go to users department"
 msgstr "Выберите подразделение"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:309
-#: plugins/admin/fai/class_faiManagement.inc:641
+#: plugins/admin/fai/class_faiManagement.inc:647
 #: plugins/admin/groups/class_groupManagement.inc:453
 #: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:472
+#: plugins/admin/applications/class_applicationManagement.inc:474
 #: plugins/admin/departments/class_departmentManagement.inc:298
-#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
 #: plugins/admin/ogroups/class_ogroupManagement.inc:446
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
@@ -3398,242 +3450,230 @@ msgstr "Выберите подразделение"
 msgid "Home"
 msgstr "Имя системы"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
+#: plugins/admin/fai/class_faiManagement.inc:649
+#: plugins/admin/groups/class_groupManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:781
+#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/departments/class_departmentManagement.inc:299
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/ogroups/class_ogroupManagement.inc:447
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
+msgid "Reload list"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
+#: plugins/addons/godfs/class_dfsManagment.inc:187
+#: plugins/admin/fai/class_faiManagement.inc:649
+#: plugins/admin/fai/class_faiManagement.inc:679
+#: plugins/admin/groups/class_groupManagement.inc:454
+#: plugins/admin/groups/class_groupManagement.inc:460
+#: plugins/admin/users/class_userManagement.inc:781
+#: plugins/admin/users/class_userManagement.inc:788
+#: plugins/admin/applications/class_applicationManagement.inc:475
+#: plugins/admin/applications/class_applicationManagement.inc:481
+#: plugins/admin/departments/class_departmentManagement.inc:299
+#: plugins/admin/departments/class_departmentManagement.inc:304
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/ogroups/class_ogroupManagement.inc:447
+#: plugins/admin/ogroups/class_ogroupManagement.inc:453
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:332
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
+msgid "Submit"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
 #, fuzzy
 msgid "Create new blocklist"
 msgstr "Имя стоп-листа"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
 #, fuzzy
 msgid "New Blocklist"
 msgstr "\"Черные списки\""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/fai/class_faiManagement.inc:671
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:787
-#: plugins/admin/applications/class_applicationManagement.inc:478
-#: plugins/admin/departments/class_departmentManagement.inc:303
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_glpiSelectUser.inc:168
-#: plugins/admin/ogroups/class_ogroupManagement.inc:452
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
+#: plugins/addons/godfs/class_dfsManagment.inc:187
+#: plugins/admin/fai/class_faiManagement.inc:679
+#: plugins/admin/groups/class_groupManagement.inc:460
+#: plugins/admin/users/class_userManagement.inc:788
+#: plugins/admin/applications/class_applicationManagement.inc:481
+#: plugins/admin/departments/class_departmentManagement.inc:304
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/ogroups/class_ogroupManagement.inc:453
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:332
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
 #, fuzzy
 msgid "Submit department"
 msgstr "Показать подразделения"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/fai/class_faiManagement.inc:671
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:787
-#: plugins/admin/applications/class_applicationManagement.inc:478
-#: plugins/admin/departments/class_departmentManagement.inc:303
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_glpiSelectUser.inc:168
-#: plugins/admin/ogroups/class_ogroupManagement.inc:452
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
-msgid "Submit"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
 #: plugins/admin/fai/class_faiScript.inc:227
 #: plugins/admin/fai/class_faiScript.inc:230
-#: plugins/admin/fai/class_faiManagement.inc:689
-#: plugins/admin/fai/class_faiManagement.inc:789
-#: plugins/admin/fai/class_faiManagement.inc:794
+#: plugins/admin/fai/class_faiManagement.inc:697
+#: plugins/admin/fai/class_faiManagement.inc:797
+#: plugins/admin/fai/class_faiManagement.inc:802
 #: plugins/admin/fai/class_faiHook.inc:251
 #: plugins/admin/fai/class_faiHook.inc:254
-#: plugins/admin/groups/class_groupManagement.inc:469
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/users/class_userManagement.inc:798
-#: plugins/admin/users/class_userManagement.inc:805
-#: plugins/admin/applications/class_applicationManagement.inc:489
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/departments/class_departmentManagement.inc:310
-#: plugins/admin/systems/class_systemManagement.inc:780
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/groups/class_groupManagement.inc:470
+#: plugins/admin/groups/class_groupManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:806
+#: plugins/admin/applications/class_applicationManagement.inc:492
+#: plugins/admin/applications/class_applicationManagement.inc:498
+#: plugins/admin/departments/class_departmentManagement.inc:311
 #: plugins/admin/systems/glpi.tpl:15 plugins/admin/systems/glpi.tpl:25
 #: plugins/admin/systems/glpi.tpl:35 plugins/admin/systems/glpiPrinter.tpl:15
 #: plugins/admin/systems/glpiPrinter.tpl:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:464
-#: plugins/admin/ogroups/class_ogroupManagement.inc:469
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/ogroups/class_ogroupManagement.inc:465
+#: plugins/admin/ogroups/class_ogroupManagement.inc:470
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
 #, fuzzy
 msgid "edit"
 msgstr "Изменить"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
-#: plugins/admin/users/class_userManagement.inc:799
-#: plugins/admin/users/class_userManagement.inc:806
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
+#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:807
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 #, fuzzy
 msgid "Edit user"
 msgstr "Пользователи домена"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
 #: plugins/addons/mailqueue/contents.tpl:93
 #: plugins/admin/fai/class_faiScript.inc:231
-#: plugins/admin/fai/class_faiManagement.inc:690
-#: plugins/admin/fai/class_faiManagement.inc:796
+#: plugins/admin/fai/class_faiManagement.inc:698
+#: plugins/admin/fai/class_faiManagement.inc:804
 #: plugins/admin/fai/class_faiHook.inc:255
-#: plugins/admin/groups/class_groupManagement.inc:471
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/users/class_userManagement.inc:802
-#: plugins/admin/users/class_userManagement.inc:809
-#: plugins/admin/applications/class_applicationManagement.inc:491
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/departments/class_departmentManagement.inc:311
-#: plugins/admin/systems/class_systemManagement.inc:781
-#: plugins/admin/ogroups/class_ogroupManagement.inc:466
-#: plugins/admin/ogroups/class_ogroupManagement.inc:471
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
+#: plugins/admin/groups/class_groupManagement.inc:472
+#: plugins/admin/groups/class_groupManagement.inc:477
+#: plugins/admin/users/class_userManagement.inc:803
+#: plugins/admin/users/class_userManagement.inc:810
+#: plugins/admin/applications/class_applicationManagement.inc:494
+#: plugins/admin/applications/class_applicationManagement.inc:500
+#: plugins/admin/departments/class_departmentManagement.inc:312
+#: plugins/admin/systems/class_systemManagement.inc:782
+#: plugins/admin/ogroups/class_ogroupManagement.inc:467
+#: plugins/admin/ogroups/class_ogroupManagement.inc:472
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:338
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
 #, fuzzy
 msgid "delete"
 msgstr "Удалить"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
-#: plugins/admin/users/class_userManagement.inc:803
-#: plugins/admin/users/class_userManagement.inc:810
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
+#: plugins/admin/users/class_userManagement.inc:804
+#: plugins/admin/users/class_userManagement.inc:811
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:338
 #, fuzzy
 msgid "Delete user"
 msgstr "Удалить"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:323
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
 #, fuzzy
 msgid "Blocklist name"
 msgstr "Управление \"черными списками\""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:325
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/fai/class_faiManagement.inc:686
-#: plugins/admin/groups/class_groupManagement.inc:525
-#: plugins/admin/users/class_userManagement.inc:820
-#: plugins/admin/applications/class_applicationManagement.inc:519
-#: plugins/admin/departments/class_departmentManagement.inc:318
-#: plugins/admin/systems/class_systemManagement.inc:792
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/fai/class_faiManagement.inc:694
+#: plugins/admin/groups/class_groupManagement.inc:526
+#: plugins/admin/users/class_userManagement.inc:821
+#: plugins/admin/applications/class_applicationManagement.inc:522
+#: plugins/admin/departments/class_departmentManagement.inc:319
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
-#: plugins/admin/ogroups/class_ogroupManagement.inc:494
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
+#: plugins/admin/systems/class_systemManagement.inc:793
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/ogroups/class_ogroupManagement.inc:495
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:345
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:313
 msgid "Actions"
 msgstr "Действия"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:327
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:328
 msgid "This table displays faxblocklists for the selected tree."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:395
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:396
 msgid "send"
 msgstr "отправка"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:395
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:396
 msgid "receive"
 msgstr "получение"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:543
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr "У вас недостаточно прав для создания стоп-листа в этой ветке."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:548
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:549
 #: plugins/admin/departments/class_departmentGeneric.inc:199
 msgid "Required field 'Name' is not set."
 msgstr "Обязательное поле \"Имя\" не заполнено."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:551
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:552
 msgid "Required field 'Name' contains invalid characters"
 msgstr "Значение поля 'Имя' содержит недопустимые символы."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:558
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:559
 msgid "Specified name is already used."
 msgstr "Указанное имя уже используется."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:565
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:566
 msgid "No permission to create a blocklist on this base."
 msgstr "Недостаточно прав для создания стоп-листа в этой ветке."
 
-#: plugins/gofax/blocklists/generic.tpl:8
-msgid "List name"
-msgstr "Список"
+#: plugins/gofax/blocklists/remove.tpl:2
+#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/fai/remove.tpl:2
+#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/groups/remove.tpl:2
+#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2
+#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/ogroups/remove.tpl:2 plugins/gofon/macro/remove.tpl:2
+#: plugins/gofon/conference/remove.tpl:2 html/index.php:237 html/index.php:243
+#: html/index.php:301 ihtml/themes/altlinux/conflict.tpl:6
+#: ihtml/themes/altlinux/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
+#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/lhs/conflict.tpl:6
+#: ihtml/themes/lhs/islocked.tpl:6
+msgid "Warning"
+msgstr "Предупреждение"
 
-#: plugins/gofax/blocklists/generic.tpl:10
-msgid "Name of blocklist"
-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/generic.tpl:16
-msgid "Select subtree to place blocklist in"
-msgstr "Выберите ветку стоп-листа"
-
-#: plugins/gofax/blocklists/generic.tpl:32
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
-#: plugins/admin/systems/workstationService.tpl:42
-#: plugins/admin/systems/workstationService.tpl:120
-#: plugins/admin/systems/servnfs.tpl:39
-#: plugins/admin/systems/terminalService.tpl:42
-#: plugins/admin/systems/terminalService.tpl:120
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
-#: plugins/admin/systems/glpi_devices.tpl:427
-#: plugins/admin/systems/glpi_devices.tpl:492
-#: plugins/admin/systems/glpi_devices.tpl:542
-#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
-msgid "Type"
-msgstr "Тип"
-
-#: plugins/gofax/blocklists/generic.tpl:34
-msgid "Select wether to filter incoming or outgoing calls"
-msgstr "Выберите, нужно ли фильтровать входящие или исходящие звонки"
-
-#: plugins/gofax/blocklists/generic.tpl:43
-msgid "Descriptive text for this blocklist"
-msgstr "Описание стоп-листа"
-
-#: plugins/gofax/blocklists/generic.tpl:56
-msgid "Blocked numbers"
-msgstr "Блокируемые номера"
-
-#: plugins/gofax/blocklists/generic.tpl:72
-msgid "Numbers can also contain wild cards."
-msgstr "Вместо точных номеров можно использовать шаблоны."
-
-#: plugins/gofax/blocklists/remove.tpl:2
-#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/fai/remove.tpl:2
-#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/groups/remove.tpl:2
-#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:237 html/index.php:243 html/index.php:301
-#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/altlinux/islocked.tpl:6
-#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
-msgid "Warning"
-msgstr "Предупреждение"
-
-#: plugins/gofax/blocklists/remove.tpl:6
-#: plugins/admin/systems/remove_glpi.tpl:6
-msgid ""
-"Please double check if your really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr ""
-"Подумайте еще раз, действительно ли вам нужно удаление, так как GOsa не "
-"сможет отменить результаты этой операции."
-
-#: plugins/gofax/blocklists/remove.tpl:10
-#: plugins/addons/addressbook/remove.tpl:10
-#: plugins/admin/fai/remove_branch.tpl:10 plugins/admin/groups/remove.tpl:10
-#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
-#: plugins/admin/ogroups/remove.tpl:10 plugins/gofon/macro/remove.tpl:9
-#, fuzzy
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Если вы уверены в своих действиях, нажмите на кнопку <i>Удалить</i>, иначе "
-"нажмите <i>Отмена</i>."
+#: plugins/gofax/blocklists/remove.tpl:10
+#: plugins/addons/addressbook/remove.tpl:10
+#: plugins/admin/fai/remove_branch.tpl:10 plugins/admin/groups/remove.tpl:10
+#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
+#: plugins/admin/ogroups/remove.tpl:10 plugins/gofon/macro/remove.tpl:9
+#, fuzzy
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Если вы уверены в своих действиях, нажмите на кнопку <i>Удалить</i>, иначе "
+"нажмите <i>Отмена</i>."
 
 #: plugins/gofax/blocklists/headpage.tpl:6
 msgid "List of blocklists"
@@ -3780,8 +3820,8 @@ msgid "FAX settings"
 msgstr "Настройки факса"
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:6
-#: plugins/addons/addressbook/address_info.tpl:88
 #: plugins/addons/addressbook/address_edit.tpl:206
+#: plugins/addons/addressbook/address_info.tpl:88
 #: plugins/generic/references/class_reference.inc:30
 msgid "FAX"
 msgstr "Факс"
@@ -3866,7 +3906,7 @@ msgstr "Идентификатор факса"
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 #: plugins/admin/systems/class_printGeneric.inc:677
-#: plugins/admin/ogroups/class_ogroupManagement.inc:582
+#: plugins/admin/ogroups/class_ogroupManagement.inc:583
 msgid "User"
 msgstr "Пользователь"
 
@@ -3903,46 +3943,6 @@ msgstr "Время передачи"
 msgid "# pages"
 msgstr "Число страниц"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:6
-msgid "FAX Reports"
-msgstr "Отчеты о факсах"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:109
-#: plugins/gofax/faxreports/class_faxreport.inc:119
-#: plugins/gofax/faxreports/class_faxreport.inc:165
-#: plugins/gofax/faxreports/class_faxreport.inc:274
-msgid "Can't connect to fax database, no reports can be shown!"
-msgstr ""
-"Не удается подключиться к базе данных факсов, отчеты показаны не будут!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:112
-#: plugins/addons/logview/class_logview.inc:66
-#: plugins/gofon/fonreports/class_fonreport.inc:99
-msgid "There is no mysql extension available, please check your php setup."
-msgstr ""
-
-#: plugins/gofax/faxreports/class_faxreport.inc:123
-#: plugins/gofax/faxreports/class_faxreport.inc:128
-#: plugins/gofax/faxreports/class_faxreport.inc:169
-#: plugins/gofax/faxreports/class_faxreport.inc:278
-msgid "Can't select fax database for report generation!"
-msgstr "Не удается выбрать базу данных факсов для создания отчетов!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:177
-#: plugins/gofax/faxreports/class_faxreport.inc:286
-msgid "Query for fax database failed!"
-msgstr "Невозможно выполнить запрос к базе данных факсов!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:185
-msgid "You have no permission to retrieve informations about this fax id!"
-msgstr "У вас недостаточно прав для получения информации об этом факсе!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:205
-#: plugins/gofax/faxreports/class_faxreport.inc:294
-#: plugins/gofon/fonreports/class_fonreport.inc:220
-msgid "Y-M-D"
-msgstr "Г-М-Д"
-
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/fonreports/contents.tpl:2
@@ -3984,6 +3984,7 @@ msgstr "в течение"
 #: plugins/addons/mailqueue/contents.tpl:26
 #: plugins/addons/logview/contents.tpl:67
 #: plugins/gofon/fonreports/contents.tpl:21 ihtml/themes/default/help.tpl:21
+#: ihtml/themes/lhs/help.tpl:21
 msgid "Search"
 msgstr "Поиск"
 
@@ -4008,36 +4009,63 @@ msgstr "Получатель"
 msgid "Search returned no results..."
 msgstr "Не найдено..."
 
-#: plugins/gofax/faxreports/main.inc:5
-msgid "FAX reports"
+#: plugins/gofax/faxreports/class_faxreport.inc:6
+msgid "FAX Reports"
 msgstr "Отчеты о факсах"
 
-#: plugins/addons/addressbook/dial.tpl:3
-msgid "Dial connection..."
-msgstr "Соединение..."
+#: plugins/gofax/faxreports/class_faxreport.inc:109
+#: plugins/gofax/faxreports/class_faxreport.inc:119
+#: plugins/gofax/faxreports/class_faxreport.inc:165
+#: plugins/gofax/faxreports/class_faxreport.inc:274
+msgid "Can't connect to fax database, no reports can be shown!"
+msgstr ""
+"Не удается подключиться к базе данных факсов, отчеты показаны не будут!"
 
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:360
-#: plugins/addons/addressbook/class_addressbook.inc:367
-#: plugins/addons/addressbook/class_addressbook.inc:371
-#: plugins/addons/addressbook/class_addressbook.inc:453
-msgid "Dial"
-msgstr "Звонок"
+#: plugins/gofax/faxreports/class_faxreport.inc:112
+#: plugins/addons/logview/class_logview.inc:66
+#: plugins/gofon/fonreports/class_fonreport.inc:99
+msgid "There is no mysql extension available, please check your php setup."
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:123
+#: plugins/gofax/faxreports/class_faxreport.inc:128
+#: plugins/gofax/faxreports/class_faxreport.inc:169
+#: plugins/gofax/faxreports/class_faxreport.inc:278
+msgid "Can't select fax database for report generation!"
+msgstr "Не удается выбрать базу данных факсов для создания отчетов!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:177
+#: plugins/gofax/faxreports/class_faxreport.inc:286
+msgid "Query for fax database failed!"
+msgstr "Невозможно выполнить запрос к базе данных факсов!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:185
+msgid "You have no permission to retrieve informations about this fax id!"
+msgstr "У вас недостаточно прав для получения информации об этом факсе!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:205
+#: plugins/gofax/faxreports/class_faxreport.inc:294
+#: plugins/gofon/fonreports/class_fonreport.inc:220
+msgid "Y-M-D"
+msgstr "Г-М-Д"
+
+#: plugins/gofax/faxreports/main.inc:5
+msgid "FAX reports"
+msgstr "Отчеты о факсах"
 
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:513
 #: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/addons/addressbook/class_addressbook.inc:513
+#: plugins/admin/fai/faiVariable.tpl:9
 #: plugins/admin/fai/faiPartitionTable.tpl:9
-#: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiScriptEntry.tpl:9
-#: plugins/admin/fai/faiPackage.tpl:9 plugins/admin/fai/faiProfile.tpl:9
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiPackage.tpl:9
+#: plugins/admin/fai/faiProfile.tpl:9 plugins/admin/fai/faiScript.tpl:9
+#: plugins/admin/fai/faiVariableEntry.tpl:9
 #: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHookEntry.tpl:9
 #: plugins/admin/fai/faiTemplateEntry.tpl:7 plugins/admin/fai/faiHook.tpl:9
 #: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: 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
@@ -4051,14 +4079,16 @@ msgstr "Звонок"
 #: plugins/admin/systems/glpi_devices.tpl:615
 #: plugins/admin/systems/glpi_devices.tpl:669
 #: plugins/admin/systems/glpi_devices.tpl:715
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
 #: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
 msgid "Name"
 msgstr "Фамилия"
 
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_info.tpl:29
 #: plugins/addons/addressbook/address_edit.tpl:66
+#: plugins/addons/addressbook/address_info.tpl:29
 msgid "Private"
 msgstr "Личный"
 
@@ -4122,6 +4152,60 @@ msgstr "Выберите объект, в котором будет осущес
 msgid "Search string"
 msgstr "Строка поиска"
 
+#: plugins/addons/addressbook/dial.tpl:3
+msgid "Dial connection..."
+msgstr "Соединение..."
+
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/class_addressbook.inc:360
+#: plugins/addons/addressbook/class_addressbook.inc:367
+#: plugins/addons/addressbook/class_addressbook.inc:371
+#: plugins/addons/addressbook/class_addressbook.inc:453
+msgid "Dial"
+msgstr "Звонок"
+
+#: plugins/addons/addressbook/address_edit.tpl:7
+msgid "Choose the department to store entry in"
+msgstr "Выбрать раздел, для хранения объекта"
+
+#: plugins/addons/addressbook/address_edit.tpl:24
+#: plugins/addons/addressbook/address_info.tpl:12
+msgid "Personal"
+msgstr "Контакт"
+
+#: plugins/addons/addressbook/address_edit.tpl:44
+#: plugins/addons/addressbook/address_info.tpl:19 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Initials"
+msgstr "Отчество"
+
+#: plugins/addons/addressbook/address_edit.tpl:105
+#: plugins/addons/addressbook/address_info.tpl:43
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:46
+msgid "Email"
+msgstr "Email"
+
+#: plugins/addons/addressbook/address_edit.tpl:119
+#: plugins/addons/addressbook/address_info.tpl:53
+msgid "Organizational"
+msgstr "Организация"
+
+#: plugins/addons/addressbook/address_edit.tpl:128
+#: plugins/addons/addressbook/address_info.tpl:61
+msgid "Company"
+msgstr "Компания"
+
+#: plugins/addons/addressbook/address_edit.tpl:148
+#: plugins/addons/addressbook/address_info.tpl:67 html/getxls.php:174
+#: html/getxls.php:236
+msgid "City"
+msgstr "Город"
+
+#: plugins/addons/addressbook/address_edit.tpl:168
+#: plugins/addons/addressbook/address_info.tpl:73
+msgid "Country"
+msgstr "Страна"
+
 #: plugins/addons/addressbook/remove.tpl:6
 msgid ""
 "This includes all addressbook data in this entry. Please double check if "
@@ -4233,50 +4317,8 @@ msgstr ""
 "У вас недостаточно прав для создания или изменения объекта в общей адресной "
 "книге."
 
-#: plugins/addons/addressbook/address_info.tpl:12
-#: plugins/addons/addressbook/address_edit.tpl:24
-msgid "Personal"
-msgstr "Контакт"
-
-#: plugins/addons/addressbook/address_info.tpl:19
-#: plugins/addons/addressbook/address_edit.tpl:44 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Initials"
-msgstr "Отчество"
-
-#: plugins/addons/addressbook/address_info.tpl:43
-#: plugins/addons/addressbook/address_edit.tpl:105
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:46
-msgid "Email"
-msgstr "Email"
-
-#: plugins/addons/addressbook/address_info.tpl:53
-#: plugins/addons/addressbook/address_edit.tpl:119
-msgid "Organizational"
-msgstr "Организация"
-
-#: plugins/addons/addressbook/address_info.tpl:61
-#: plugins/addons/addressbook/address_edit.tpl:128
-msgid "Company"
-msgstr "Компания"
-
-#: plugins/addons/addressbook/address_info.tpl:67
-#: plugins/addons/addressbook/address_edit.tpl:148 html/getxls.php:174
-#: html/getxls.php:236
-msgid "City"
-msgstr "Город"
-
-#: plugins/addons/addressbook/address_info.tpl:73
-#: plugins/addons/addressbook/address_edit.tpl:168
-msgid "Country"
-msgstr "Страна"
-
-#: plugins/addons/addressbook/address_edit.tpl:7
-msgid "Choose the department to store entry in"
-msgstr "Выбрать раздел, для хранения объекта"
-
-#: plugins/addons/mailqueue/class_mailqueue.inc:6
 #: plugins/addons/mailqueue/main.inc:23
+#: plugins/addons/mailqueue/class_mailqueue.inc:6
 #, fuzzy
 msgid "Mail queue"
 msgstr "Сервер"
@@ -4774,7 +4816,117 @@ msgstr "Сообщение"
 msgid "System log view"
 msgstr "Просмотр системного журнала"
 
-#: plugins/admin/fai/class_faiScript.inc:240
+#: plugins/addons/godfs/class_dfsManagment.inc:16
+#: plugins/addons/godfs/contents.tpl:8
+#, fuzzy
+msgid "DFS Shares"
+msgstr "сброс"
+
+#: plugins/addons/godfs/class_dfsManagment.inc:141
+msgid "No DFS entries found"
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsManagment.inc:182
+#, fuzzy
+msgid "Go up one dfsshare"
+msgstr "Подразделение"
+
+#: plugins/addons/godfs/class_dfsManagment.inc:183
+msgid "Go to dfs root"
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsManagment.inc:184
+#, fuzzy
+msgid "Create new dfsshare"
+msgstr "Создание нового объекта в"
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:87
+#, fuzzy
+msgid "You have no premissions to create a dfs share."
+msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:94
+#: plugins/addons/godfs/class_dfsgeneric.inc:96
+#, fuzzy
+msgid "Dfs share already exists."
+msgstr "Подразделение с таким именем уже существует."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:101
+#, fuzzy
+msgid "Required Field \"Name of dfs Share\" is not set."
+msgstr "Обязательное поле \"Имя\" не заполнено."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:104
+#, fuzzy
+msgid "Required Field \"Description\" is not set."
+msgstr "Обязательное поле \"Описание\" не заполнено."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:107
+#, fuzzy
+msgid "Required Field \"Fileserver\" is not set."
+msgstr "Обязательное поле \"Имя\" не заполнено."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:110
+#, fuzzy
+msgid "Required Field \"Share on fileserver\" is not set."
+msgstr "Обязательное поле \"Имя\" не заполнено."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:113
+#, fuzzy
+msgid "Required Field \"Location\" is not set."
+msgstr "Обязательное поле \"Описание\" не заполнено."
+
+#: plugins/addons/godfs/contents.tpl:26
+#, fuzzy
+msgid ""
+"This menu allows you to create, delete and edit selected dfs shares. Having "
+"a large numbers of dfs shares, you might prefer the range selectors on top "
+"of the dfs share list."
+msgstr ""
+"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+"подразделения. Если у вас достаточно большое количество подразделений, вы "
+"можете использовать групповое выделение."
+
+#: plugins/addons/godfs/contents.tpl:40
+#, fuzzy
+msgid "Display dfs shares matching"
+msgstr "Показать подходяшие адреса"
+
+#: plugins/addons/godfs/contents.tpl:44
+#, fuzzy
+msgid "Regular expression for matching dfs share names"
+msgstr "Регулярное выражение, соответствующее именам систем"
+
+#: plugins/addons/godfs/generic.tpl:4
+#, fuzzy
+msgid "DFS Properties"
+msgstr "Свойства"
+
+#: plugins/addons/godfs/generic.tpl:8
+#, fuzzy
+msgid "Name of dfs Share"
+msgstr "Подразделение"
+
+#: plugins/addons/godfs/generic.tpl:16
+#, fuzzy
+msgid "Fileserver"
+msgstr "Сервер"
+
+#: plugins/addons/godfs/generic.tpl:20
+#, fuzzy
+msgid "Share on Fileserver"
+msgstr "Служба печати"
+
+#: plugins/addons/godfs/generic.tpl:30
+#, fuzzy
+msgid "DFS Location"
+msgstr "Местоположение"
+
+#: plugins/addons/godfs/main.inc:21 plugins/addons/godfs/main.inc:27
+msgid "Distributed Filesystem Administration"
+msgstr ""
+
+#: plugins/admin/fai/class_faiScript.inc:240
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
 #: plugins/admin/fai/class_faiHook.inc:264
 #: plugins/admin/fai/class_faiHookEntry.inc:84
@@ -4782,14 +4934,49 @@ msgstr "Просмотр системного журнала"
 msgid "Download"
 msgstr "Домен"
 
+#: plugins/admin/fai/faiVariable.tpl:32
+#: plugins/admin/fai/faiPartitionTable.tpl:32
+#: plugins/admin/fai/faiScript.tpl:32 plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/class_faiProfileEntry.inc:155
+#: plugins/admin/fai/faiHook.tpl:32
+#, fuzzy
+msgid "Objects"
+msgstr "Объект"
+
+#: plugins/admin/fai/faiVariable.tpl:34
+#, fuzzy
+msgid "List of assigned variables"
+msgstr "Выберите тип мыши"
+
+#: plugins/admin/fai/faiVariable.tpl:40
+msgid "Choose a variable to delete or edit"
+msgstr ""
+
 #: 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/tabsTemplate.inc:34 plugins/admin/fai/tabsProfile.inc:34
+#: plugins/admin/fai/tabsScript.inc:34
 #: plugins/admin/departments/tabs_department.inc:31
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 
+#: plugins/admin/fai/class_faiPackageEntry.inc:35
+#, fuzzy
+msgid "Please enter your search string here"
+msgstr "Введите корректный серийный номер"
+
+#: plugins/admin/fai/class_faiPackageEntry.inc:48
+msgid ""
+"This list displays all assigned package names for this repository settings."
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackageEntry.inc:124
+#, php-format
+msgid ""
+"Your specified search string '%s' returned too many results. Only the first "
+"200 entries are shown, to keep the memory usage low."
+msgstr ""
+
 #: plugins/admin/fai/class_faiManagement.inc:32
 #, fuzzy
 msgid "FAI"
@@ -4800,25 +4987,25 @@ msgstr "Идентификатор факса"
 msgid "Fully Automatic Installation - management"
 msgstr "Управление приложениями"
 
-#: plugins/admin/fai/class_faiManagement.inc:228
+#: plugins/admin/fai/class_faiManagement.inc:227
 #, fuzzy, php-format
 msgid "You're about to delete all information about the FAI class at '%s'."
 msgstr "Вы собираетесь удалить всю информацию о терминале (\"%s\")."
 
-#: plugins/admin/fai/class_faiManagement.inc:234
-#: plugins/admin/fai/class_faiManagement.inc:272
+#: plugins/admin/fai/class_faiManagement.inc:233
+#: plugins/admin/fai/class_faiManagement.inc:271
 #: plugins/admin/systems/class_systemManagement.inc:532
 #: plugins/admin/systems/class_systemManagement.inc:603
 #, fuzzy
 msgid "You are not allowed to delete this component!"
 msgstr "У вас недостаточно прав для удаления этого объекта!"
 
-#: plugins/admin/fai/class_faiManagement.inc:324
+#: plugins/admin/fai/class_faiManagement.inc:323
 #, fuzzy, php-format
 msgid "You're about to delete a fai branch / freeze  '%s'."
 msgstr "Вы собираетесь удалить группу \"%s\"."
 
-#: plugins/admin/fai/class_faiManagement.inc:327
+#: plugins/admin/fai/class_faiManagement.inc:326
 #, fuzzy
 msgid "You are not allowed to delete this release!"
 msgstr "У вас недостаточно прав для удаления этого пользователя!"
@@ -4834,14 +5021,16 @@ msgid "Specified freeze name is invalid."
 msgstr "Указанное имя уже используется."
 
 #: plugins/admin/fai/class_faiManagement.inc:391
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:349
 #: plugins/admin/systems/class_servRepository.inc:208
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:349
 #, fuzzy
 msgid "This name is already in use."
 msgstr "Указанное имя уже используется."
 
-#: plugins/admin/fai/class_faiManagement.inc:605
+#: plugins/admin/fai/class_faiManagement.inc:444
+#: plugins/admin/fai/class_faiManagement.inc:611
 #: plugins/admin/fai/faiPackageNew.tpl:44 plugins/admin/users/template.tpl:44
+#: plugins/admin/departments/class_departmentGeneric.inc:333
 #: ihtml/themes/altlinux/setup_introduction.tpl:12
 #: ihtml/themes/altlinux/setup_useradmin.tpl:41
 #: ihtml/themes/altlinux/setup_step2.tpl:13
@@ -4850,168 +5039,150 @@ msgstr "Указанное имя уже используется."
 #: ihtml/themes/default/setup_useradmin.tpl:41
 #: ihtml/themes/default/setup_step2.tpl:13
 #: ihtml/themes/default/setup_step3.tpl:18
+#: ihtml/themes/lhs/setup_introduction.tpl:12
+#: ihtml/themes/lhs/setup_useradmin.tpl:41 ihtml/themes/lhs/setup_step2.tpl:13
+#: ihtml/themes/lhs/setup_step3.tpl:18
 msgid "Continue"
 msgstr "Продолжить"
 
-#: plugins/admin/fai/class_faiManagement.inc:641
+#: plugins/admin/fai/class_faiManagement.inc:647
 #: plugins/admin/departments/class_departmentManagement.inc:298
 #, fuzzy
 msgid "Go to users home department"
 msgstr "Подразделение"
 
-#: plugins/admin/fai/class_faiManagement.inc:646
+#: plugins/admin/fai/class_faiManagement.inc:654
 #, fuzzy
 msgid "New profile"
 msgstr "Управление системами"
 
-#: plugins/admin/fai/class_faiManagement.inc:646
+#: plugins/admin/fai/class_faiManagement.inc:654
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
 msgid "P"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:651
+#: plugins/admin/fai/class_faiManagement.inc:659
 #, fuzzy
 msgid "New partition table"
 msgstr "Принтер"
 
-#: plugins/admin/fai/class_faiManagement.inc:651
+#: plugins/admin/fai/class_faiManagement.inc:659
 msgid "PT"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:654
+#: plugins/admin/fai/class_faiManagement.inc:662
 #, fuzzy
 msgid "New scripts"
 msgstr "Показать хосты"
 
-#: plugins/admin/fai/class_faiManagement.inc:654
+#: plugins/admin/fai/class_faiManagement.inc:662
 msgid "S"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:657
+#: plugins/admin/fai/class_faiManagement.inc:665
 #, fuzzy
 msgid "New hooks"
 msgstr "Показать хосты"
 
-#: plugins/admin/fai/class_faiManagement.inc:657
+#: plugins/admin/fai/class_faiManagement.inc:665
 msgid "H"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:660
+#: plugins/admin/fai/class_faiManagement.inc:668
 #, fuzzy
 msgid "New variables"
 msgstr "Показать терминалы"
 
-#: plugins/admin/fai/class_faiManagement.inc:660
+#: plugins/admin/fai/class_faiManagement.inc:668
 msgid "V"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:663
+#: plugins/admin/fai/class_faiManagement.inc:671
 #, fuzzy
 msgid "New templates"
 msgstr "Создать шаблон"
 
-#: plugins/admin/fai/class_faiManagement.inc:663
+#: plugins/admin/fai/class_faiManagement.inc:671
 msgid "T"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:666
+#: plugins/admin/fai/class_faiManagement.inc:674
 #, fuzzy
 msgid "New package list"
 msgstr "Число страниц"
 
-#: plugins/admin/fai/class_faiManagement.inc:666
+#: plugins/admin/fai/class_faiManagement.inc:674
 msgid "PK"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:680
-#: plugins/admin/systems/class_systemManagement.inc:787
+#: plugins/admin/fai/class_faiManagement.inc:688
+#: plugins/admin/systems/class_systemManagement.inc:788
 msgid "This table displays all systems, in the selected tree."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:684
+#: plugins/admin/fai/class_faiManagement.inc:692
 #, fuzzy
 msgid "Name of FAI class"
 msgstr "Имя стоп-листа"
 
-#: plugins/admin/fai/class_faiManagement.inc:685
+#: plugins/admin/fai/class_faiManagement.inc:693
 msgid "Class type"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:689
-#: plugins/admin/fai/class_faiManagement.inc:790
-#: plugins/admin/fai/class_faiManagement.inc:795
+#: plugins/admin/fai/class_faiManagement.inc:697
+#: plugins/admin/fai/class_faiManagement.inc:798
+#: plugins/admin/fai/class_faiManagement.inc:803
 #, fuzzy
 msgid "Edit class"
 msgstr "Список систем"
 
-#: plugins/admin/fai/class_faiManagement.inc:690
-#: plugins/admin/fai/class_faiManagement.inc:797
+#: plugins/admin/fai/class_faiManagement.inc:698
+#: plugins/admin/fai/class_faiManagement.inc:805
 #, fuzzy
 msgid "Delete class"
 msgstr "Удалить"
 
-#: plugins/admin/fai/class_faiManagement.inc:710
+#: plugins/admin/fai/class_faiManagement.inc:718
 #: plugins/admin/groups/class_groupApplication.inc:521
-#: plugins/admin/departments/class_departmentManagement.inc:334
+#: plugins/admin/departments/class_departmentManagement.inc:335
 #, fuzzy
 msgid "department"
 msgstr "подразделения"
 
-#: plugins/admin/fai/class_faiManagement.inc:731
-#: plugins/admin/fai/class_faiManagement.inc:732
+#: plugins/admin/fai/class_faiManagement.inc:739
+#: plugins/admin/fai/class_faiManagement.inc:740
 #: plugins/admin/fai/class_faiProfile.inc:297
 #: plugins/admin/fai/class_faiProfileEntry.inc:124
 #, fuzzy
 msgid "Partition table"
 msgstr "Переменная"
 
-#: plugins/admin/fai/class_faiManagement.inc:738
-#: plugins/admin/fai/class_faiManagement.inc:739
+#: plugins/admin/fai/class_faiManagement.inc:746
+#: plugins/admin/fai/class_faiManagement.inc:747
 msgid "Package list"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:745
-#: plugins/admin/fai/class_faiManagement.inc:746
+#: plugins/admin/fai/class_faiManagement.inc:753
+#: plugins/admin/fai/class_faiManagement.inc:754
 #, fuzzy
 msgid "Scripts"
 msgstr "Путь к сценариям"
 
-#: plugins/admin/fai/class_faiManagement.inc:766
-#: plugins/admin/fai/class_faiManagement.inc:767
+#: plugins/admin/fai/class_faiManagement.inc:774
+#: plugins/admin/fai/class_faiManagement.inc:775
 #, fuzzy
 msgid "Profile"
 msgstr "Путь к профилю"
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:35
-#, fuzzy
-msgid "Please enter your search string here"
-msgstr "Введите корректный серийный номер"
-
-#: plugins/admin/fai/class_faiPackageEntry.inc:48
-msgid ""
-"This list displays all assigned package names for this repository settings."
-msgstr ""
-
-#: plugins/admin/fai/class_faiPackageEntry.inc:124
-#, php-format
-msgid ""
-"Your specified search string '%s' returned too many results. Only the first "
-"200 entries are shown, to keep the memory usage low."
-msgstr ""
-
 #: plugins/admin/fai/main.inc:38 plugins/admin/fai/main.inc:40
 #, fuzzy
 msgid "Fully Automatic Installation"
 msgstr "Управление приложениями"
 
-#: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiVariable.tpl:32 plugins/admin/fai/faiScript.tpl:32
-#: plugins/admin/fai/faiTemplate.tpl:29
-#: plugins/admin/fai/class_faiProfileEntry.inc:155
-#: plugins/admin/fai/faiHook.tpl:32
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
 #, fuzzy
-msgid "Objects"
-msgstr "Объект"
+msgid "Package"
+msgstr "Показать телефоны"
 
 #: plugins/admin/fai/faiPartitionTable.tpl:34
 #, fuzzy
@@ -5076,10 +5247,20 @@ msgstr "Показать совпадения объектов"
 msgid "Regular expression for matching object names"
 msgstr "Регулярное выражение, соответствующее именам объектов"
 
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
 #, fuzzy
-msgid "Package"
-msgstr "Показать телефоны"
+msgid "Device"
+msgstr "Устройства"
+
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
+#, fuzzy
+msgid "Partition entries"
+msgstr "Переменная"
+
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
+#, fuzzy
+msgid "Add partition"
+msgstr "Добавить параметр"
 
 #: plugins/admin/fai/class_faiScriptEntry.inc:68
 #: plugins/admin/fai/class_faiHookEntry.inc:71
@@ -5106,22 +5287,13 @@ msgstr "Введите адрес сервера"
 msgid "Please enter a script."
 msgstr "Введите корректный серийный номер"
 
-#: plugins/admin/fai/faiVariable.tpl:34
-#, fuzzy
-msgid "List of assigned variables"
-msgstr "Выберите тип мыши"
-
-#: plugins/admin/fai/faiVariable.tpl:40
-msgid "Choose a variable to delete or edit"
-msgstr ""
-
 #: plugins/admin/fai/faiScriptEntry.tpl:29
-#: plugins/admin/groups/class_groupManagement.inc:524
-#: plugins/admin/users/class_userManagement.inc:819
+#: plugins/admin/groups/class_groupManagement.inc:525
+#: plugins/admin/users/class_userManagement.inc:820
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
-#: plugins/admin/ogroups/class_ogroupManagement.inc:493
+#: plugins/admin/ogroups/class_ogroupManagement.inc:494
 #: plugins/gofon/conference/generic.tpl:4
 msgid "Properties"
 msgstr "Свойства"
@@ -5165,8 +5337,8 @@ msgstr ""
 
 #: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:24
 #: plugins/admin/systems/workstationStartup.tpl:39
-#: plugins/admin/systems/servRepositorySetup.tpl:8
 #: plugins/admin/systems/class_servRepository.inc:242
+#: plugins/admin/systems/servRepositorySetup.tpl:8
 #, fuzzy
 msgid "Release"
 msgstr "Набор правил"
@@ -5259,6 +5431,28 @@ msgstr ""
 msgid "FAI classes"
 msgstr "Выберите тип мыши"
 
+#: plugins/admin/fai/remove.tpl:7
+#, fuzzy
+msgid ""
+"This includes 'all' object information. Please double check if your really "
+"want to do this since there is no way for GOsa to get your data back."
+msgstr ""
+"Сюда входит <b>вся</b> информация о системе и ее настройках. Подумайте еще "
+"раз, действительно ли вам нужно удаление, так как GOsa не сможет отменить "
+"результаты этой операции."
+
+#: plugins/admin/fai/remove.tpl:11 plugins/admin/departments/remove.tpl:10
+#: plugins/admin/systems/remove.tpl:10 plugins/gofon/conference/remove.tpl:10
+#, fuzzy
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your LDAP tree in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Лучше всего перед удалением сохранить резервную копию текущего дерева LDAP в "
+"файл. Если вы сделали это и действительно хотите выполнить удаление, нажмите "
+"<i>Удалить</i>, иначе нажмите <i>Отмена</i>."
+
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
 #, fuzzy
 msgid "FS type"
@@ -5333,21 +5527,6 @@ msgid ""
 "please check your configuration twice."
 msgstr ""
 
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
-#, fuzzy
-msgid "Device"
-msgstr "Устройства"
-
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
-#, fuzzy
-msgid "Partition entries"
-msgstr "Переменная"
-
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
-#, fuzzy
-msgid "Add partition"
-msgstr "Добавить параметр"
-
 #: plugins/admin/fai/faiScript.tpl:34
 #, fuzzy
 msgid "List of scripts"
@@ -5406,6 +5585,49 @@ msgstr "сброс"
 msgid "Please specify a value for the attribute 'content'."
 msgstr "Укажите корректный номер телефона."
 
+#: plugins/admin/fai/faiNewBranch.tpl:5
+msgid ""
+"You are now going to create a branch or locked branch. This action clones "
+"the existing release to another release name. Branches can be modified as "
+"usual. FAI classes of locked branches cannot be modified, just additional "
+"classes are possible. Branch names should be alphanumeric, excluding the "
+"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
+"and 'fai'."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:11
+#, fuzzy
+msgid "Please enter a name for the branch"
+msgstr "Введите корректный номер телефона!"
+
+#: plugins/admin/fai/faiNewBranch.tpl:33
+#: plugins/admin/departments/recursive_move.tpl:1
+msgid "Processing the requested operation"
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:34
+msgid ""
+"As soon as the copy operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the fai management "
+"dialog."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:40
+#: plugins/admin/departments/recursive_move.tpl:7
+msgid ""
+"Your browser doesn't support iframes, please use this link to perform the "
+"requested operation."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:42
+msgid "Perform requested operation."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:42
+#, fuzzy
+msgid "Initiate operation"
+msgstr "Создать параметры"
+
 #: plugins/admin/fai/faiVariableEntry.tpl:29
 #, fuzzy
 msgid "Variable attributes"
@@ -5437,35 +5659,13 @@ msgid ""
 "currently edited package list."
 msgstr ""
 
-#: plugins/admin/fai/remove.tpl:7
+#: plugins/admin/fai/headpage.tpl:6
 #, fuzzy
-msgid ""
-"This includes 'all' object information. Please double check if your really "
-"want to do this since there is no way for GOsa to get your data back."
-msgstr ""
-"Сюда входит <b>вся</b> информация о системе и ее настройках. Подумайте еще "
-"раз, действительно ли вам нужно удаление, так как GOsa не сможет отменить "
-"результаты этой операции."
-
-#: plugins/admin/fai/remove.tpl:11 plugins/admin/departments/remove.tpl:10
-#: plugins/admin/systems/remove.tpl:10 plugins/gofon/conference/remove.tpl:10
-#, fuzzy
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Лучше всего перед удалением сохранить резервную копию текущего дерева LDAP в "
-"файл. Если вы сделали это и действительно хотите выполнить удаление, нажмите "
-"<i>Удалить</i>, иначе нажмите <i>Отмена</i>."
-
-#: plugins/admin/fai/headpage.tpl:6
-#, fuzzy
-msgid "List of FAI classes"
-msgstr "Выберите тип мыши"
-
-#: plugins/admin/fai/headpage.tpl:24
-msgid "This menu allows you to create, delete and edit FAI classes."
+msgid "List of FAI classes"
+msgstr "Выберите тип мыши"
+
+#: plugins/admin/fai/headpage.tpl:24
+msgid "This menu allows you to create, delete and edit FAI classes."
 msgstr ""
 
 #: plugins/admin/fai/headpage.tpl:29
@@ -5481,12 +5681,14 @@ msgid "Current release"
 msgstr "Текущий пароль"
 
 #: plugins/admin/fai/headpage.tpl:47
-msgid "Create new branch using the current release"
-msgstr ""
+#, fuzzy
+msgid "Create new branch"
+msgstr "Создание нового объекта в"
 
 #: plugins/admin/fai/headpage.tpl:51
-msgid "Create a locked version of the current release"
-msgstr ""
+#, fuzzy
+msgid "Create new locked branch"
+msgstr "Создание нового объекта в"
 
 #: plugins/admin/fai/headpage.tpl:56
 #, fuzzy
@@ -5527,6 +5729,19 @@ msgstr "Показать телефоны"
 msgid "Show partitions"
 msgstr "Показать рабочие станции"
 
+#: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
+#, fuzzy
+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 ""
+
 #: plugins/admin/fai/class_faiPartitionTable.inc:263
 #: plugins/admin/fai/class_faiPartitionTable.inc:269
 #, fuzzy, php-format
@@ -5554,19 +5769,6 @@ msgstr ""
 msgid "Class name"
 msgstr "Выберите тип мыши"
 
-#: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
-#, fuzzy
-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 ""
-
 #: plugins/admin/fai/class_faiPackageConfiguration.inc:45
 #, php-format
 msgid "Debconf information for package '%s'"
@@ -5651,13 +5853,13 @@ msgid "Choose class name"
 msgstr "Выберите тип мыши"
 
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
+#: plugins/admin/systems/glpiDeviceManagement.tpl:51
 #: plugins/admin/systems/class_glpiSelectUser.inc:113
 #: plugins/admin/systems/class_glpiSelectUser.inc:140
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:51
 #: plugins/admin/systems/glpiAttachmentPool.tpl:51
-#: plugins/admin/systems/glpiDeviceManagement.tpl:51
 #: plugins/admin/systems/SelectDeviceType.tpl:44
-#: plugins/admin/systems/class_baseSelectDialog.inc:39
+#: plugins/admin/systems/class_baseSelectDialog.inc:40
 #, fuzzy
 msgid "Use"
 msgstr "Пользователь"
@@ -5667,6 +5869,18 @@ msgstr "Пользователь"
 msgid "A new class name."
 msgstr "Доступные приложения"
 
+#: plugins/admin/fai/remove_branch.tpl:6
+#, fuzzy
+msgid ""
+"This includes all account data, system access, etc. for this branch. Please "
+"double check if your really want to do this since there is no way for GOsa "
+"to get your data back."
+msgstr ""
+"Сюда входит вся информация об учетной записи этого пользователя, его права "
+"доступа в системе, настройки IMAP и т. д. Подумайте еще раз, действительно "
+"ли вам нужно удаление, так как GOsa не сможет отменить результаты этой "
+"операции."
+
 #: plugins/admin/fai/class_faiTemplateEntry.inc:81
 #, fuzzy
 msgid "no file uploaded yet"
@@ -5725,8 +5939,8 @@ msgstr "Создать шаблон"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:40
 #: plugins/admin/applications/generic.tpl:95
-#: plugins/admin/systems/printerPPDDialog.tpl:11
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
+#: plugins/admin/systems/printerPPDDialog.tpl:11
 #, fuzzy
 msgid "Upload"
 msgstr "Загрузка процессора"
@@ -5737,7 +5951,7 @@ msgid "Destination path"
 msgstr "Назначение"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
 msgid "Owner"
 msgstr ""
 
@@ -5745,7 +5959,7 @@ msgstr ""
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
 #: plugins/admin/systems/class_printGeneric.inc:672
 #: plugins/admin/systems/class_printGeneric.inc:674
-#: plugins/admin/ogroups/class_ogroupManagement.inc:583
+#: plugins/admin/ogroups/class_ogroupManagement.inc:584
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr "Группа"
@@ -5813,60 +6027,74 @@ msgstr "Стоп-листы"
 msgid "Choose a hook to delete or edit"
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:5
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr ""
+#: plugins/admin/groups/class_groupGeneric.inc:122
+msgid "Can't find this groups SID in LDAP or in your configuration file!"
+msgstr "Не могу найти SID в базе LDAP или в сонфигурационном файле!"
 
-#: plugins/admin/fai/faiNewBranch.tpl:11
-#, fuzzy
-msgid "Please enter a name for the branch"
-msgstr "Введите корректный номер телефона!"
+#: plugins/admin/groups/class_groupGeneric.inc:179
+msgid "This 'dn' is no group."
+msgstr "Это DN соответствует не группе."
 
-#: plugins/admin/fai/faiNewBranch.tpl:33
-#: plugins/admin/departments/recursive_moce.tpl:1
-msgid ""
-"Processing requested operation, the status of this operation will be "
-"displayed in an iframe below."
-msgstr ""
+#: plugins/admin/groups/class_groupGeneric.inc:329
+msgid "Samba group"
+msgstr "Группа Samba"
 
-#: plugins/admin/fai/faiNewBranch.tpl:34
+#: plugins/admin/groups/class_groupGeneric.inc:329
+msgid "Domain admins"
+msgstr "Администраторы домена"
+
+#: plugins/admin/groups/class_groupGeneric.inc:329
+msgid "Domain users"
+msgstr "Пользователи домена"
+
+#: plugins/admin/groups/class_groupGeneric.inc:330
+msgid "Domain guests"
+msgstr "Непривилегированные пользователи домена"
+
+#: plugins/admin/groups/class_groupGeneric.inc:335
+#, php-format
+msgid "Special group (%d)"
+msgstr "Специальная группа (%d)"
+
+#: plugins/admin/groups/class_groupGeneric.inc:445
+#, php-format
 msgid ""
-"As soon as the operation has finished, you can scroll down to end of the "
-"page and press the 'Back' button to return to the fai management dialog."
+"Your search method returned more than '%s' users, only '%s' users are shown."
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:42
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
+#: plugins/admin/groups/class_groupGeneric.inc:462
+#, fuzzy
+msgid "! unknown id"
+msgstr "состояние неизвестно"
+
+#: plugins/admin/groups/class_groupGeneric.inc:598
+#, php-format
+msgid "No configured SID found for '%s'."
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:44
-msgid "Perform requested operation."
+#: plugins/admin/groups/class_groupGeneric.inc:603
+#, php-format
+msgid "No configured RIDBASE found for '%s'."
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:44
-#, fuzzy
-msgid "Initiate operation"
-msgstr "Создать параметры"
+#: plugins/admin/groups/class_groupGeneric.inc:716
+#: plugins/admin/ogroups/class_ogroup.inc:655
+msgid "You have no permissions to create a group on this 'Base'."
+msgstr "У вас недостаточно прав для создания группы в этой ветке."
 
-#: plugins/admin/fai/remove_branch.tpl:6
-#, fuzzy
+#: plugins/admin/groups/class_groupGeneric.inc:726
 msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for GOsa "
-"to get your data back."
+"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
 msgstr ""
-"Сюда входит вся информация об учетной записи этого пользователя, его права "
-"доступа в системе, настройки IMAP и т. д. Подумайте еще раз, действительно "
-"ли вам нужно удаление, так как GOsa не сможет отменить результаты этой "
-"операции."
+"Значение поля \"Имя\" содержит недопустимые символы. Допустимыми являются "
+"буквы в нижнем регистре, цифры и дефисы."
+
+#: plugins/admin/groups/class_groupGeneric.inc:738
+#: plugins/admin/groups/class_groupGeneric.inc:752
+#: plugins/admin/groups/class_groupGeneric.inc:759
+msgid "Value specified as 'Name' is already used."
+msgstr "Группа с таким именем уже существует."
 
 #: plugins/admin/groups/mail.tpl:11 plugins/admin/groups/paste_mail.tpl:12
 msgid "Primary mail address for this shared folder"
@@ -5892,6 +6120,66 @@ msgstr "Права для членов группы"
 msgid "Forward messages to non group members"
 msgstr "Пересылать сообщения не членам группы"
 
+#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
+msgstr "Список групп"
+
+#: plugins/admin/groups/headpage.tpl:25
+#, fuzzy
+msgid ""
+"This menu allows you to add, edit and remove selected groups. You may want "
+"to use the range selector on top of the group listbox, when working with a "
+"large number of groups."
+msgstr ""
+"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+"группы пользователей. Если у вас их достаточно большое количество, вы можете "
+"использовать групповое выделение."
+
+#: plugins/admin/groups/headpage.tpl:41
+msgid "Select to see groups that are primary groups of users"
+msgstr "Выберите, чтобы просмотреть список основных групп пользователей"
+
+#: plugins/admin/groups/headpage.tpl:42
+msgid "Show primary groups"
+msgstr "Показать основные группы"
+
+#: plugins/admin/groups/headpage.tpl:46
+msgid "Select to see groups that have samba groups mappings"
+msgstr "Выберите, чтобы просмотреть группы, которые входят в samba"
+
+#: plugins/admin/groups/headpage.tpl:47
+msgid "Show samba groups"
+msgstr "Показать группы samba"
+
+#: plugins/admin/groups/headpage.tpl:50
+msgid "Select to see groups that have applications configured"
+msgstr "Выберите, чтобы просмотреть список групп, которым доступны приложения"
+
+#: plugins/admin/groups/headpage.tpl:51
+msgid "Show application groups"
+msgstr "Показать группы приложений"
+
+#: plugins/admin/groups/headpage.tpl:54
+msgid "Select to see groups that have mail settings"
+msgstr ""
+"Выберите, чтобы просмотреть список групп, которым доступны функции эл. почты"
+
+#: plugins/admin/groups/headpage.tpl:55
+msgid "Show mail groups"
+msgstr "Показать группы с эл. почтой"
+
+#: plugins/admin/groups/headpage.tpl:58
+msgid "Select to see normal groups that have only functional aspects"
+msgstr "Выберите, чтобы просмотреть список обычных групп"
+
+#: plugins/admin/groups/headpage.tpl:59
+msgid "Show functional groups"
+msgstr "Показать обычные группы"
+
+#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
+msgid "Group administration"
+msgstr "Управление группами"
+
 #: plugins/admin/groups/class_groupManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:55 html/getxls.php:97
 #: html/getxls.php:99 html/getxls.php:244
@@ -5910,7 +6198,7 @@ msgstr "У вас недостаточно прав для удаления эт
 
 #: plugins/admin/groups/class_groupManagement.inc:441
 #: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/applications/class_applicationManagement.inc:460
+#: plugins/admin/applications/class_applicationManagement.inc:462
 #: plugins/admin/ogroups/class_ogroupManagement.inc:431
 #, fuzzy
 msgid "Paste"
@@ -5918,235 +6206,110 @@ msgstr "Дата"
 
 #: plugins/admin/groups/class_groupManagement.inc:443
 #: plugins/admin/users/class_userManagement.inc:769
-#: plugins/admin/applications/class_applicationManagement.inc:462
+#: plugins/admin/applications/class_applicationManagement.inc:464
 #: plugins/admin/ogroups/class_ogroupManagement.inc:433
 #, fuzzy
 msgid "Can't paste"
 msgstr "Создать телефонный аккаунт"
 
-#: plugins/admin/groups/class_groupManagement.inc:455
+#: plugins/admin/groups/class_groupManagement.inc:456
 #, fuzzy
 msgid "Create new group"
 msgstr "Создать телефонный аккаунт"
 
-#: plugins/admin/groups/class_groupManagement.inc:465
-#: plugins/admin/users/class_userManagement.inc:795
-#: plugins/admin/applications/class_applicationManagement.inc:485
-#: plugins/admin/ogroups/class_ogroupManagement.inc:460
+#: plugins/admin/groups/class_groupManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/applications/class_applicationManagement.inc:488
+#: plugins/admin/ogroups/class_ogroupManagement.inc:461
 #, fuzzy
 msgid "cut"
 msgstr "Выполнить"
 
-#: plugins/admin/groups/class_groupManagement.inc:465
-#: plugins/admin/users/class_userManagement.inc:795
-#: plugins/admin/applications/class_applicationManagement.inc:485
-#: plugins/admin/ogroups/class_ogroupManagement.inc:460
+#: plugins/admin/groups/class_groupManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/applications/class_applicationManagement.inc:488
+#: plugins/admin/ogroups/class_ogroupManagement.inc:461
 #, fuzzy
 msgid "Cut this entry"
 msgstr "Редактиовать объект"
 
-#: plugins/admin/groups/class_groupManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:797
-#: plugins/admin/applications/class_applicationManagement.inc:487
-#: plugins/admin/ogroups/class_ogroupManagement.inc:462
+#: plugins/admin/groups/class_groupManagement.inc:468
+#: plugins/admin/users/class_userManagement.inc:798
+#: plugins/admin/applications/class_applicationManagement.inc:490
+#: plugins/admin/ogroups/class_ogroupManagement.inc:463
 msgid "copy"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:797
-#: plugins/admin/applications/class_applicationManagement.inc:487
-#: plugins/admin/ogroups/class_ogroupManagement.inc:462
+#: plugins/admin/groups/class_groupManagement.inc:468
+#: plugins/admin/users/class_userManagement.inc:798
+#: plugins/admin/applications/class_applicationManagement.inc:490
+#: plugins/admin/ogroups/class_ogroupManagement.inc:463
 #, fuzzy
 msgid "Copy this entry"
 msgstr "Редактиовать объект"
 
-#: plugins/admin/groups/class_groupManagement.inc:469
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/applications/class_applicationManagement.inc:489
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/departments/class_departmentManagement.inc:310
-#: plugins/admin/ogroups/class_ogroupManagement.inc:464
-#: plugins/admin/ogroups/class_ogroupManagement.inc:469
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
+#: plugins/admin/groups/class_groupManagement.inc:470
+#: plugins/admin/groups/class_groupManagement.inc:475
+#: plugins/admin/applications/class_applicationManagement.inc:492
+#: plugins/admin/applications/class_applicationManagement.inc:498
+#: plugins/admin/departments/class_departmentManagement.inc:311
+#: plugins/admin/ogroups/class_ogroupManagement.inc:465
+#: plugins/admin/ogroups/class_ogroupManagement.inc:470
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
 #, fuzzy
 msgid "Edit this entry"
 msgstr "Редактиовать объект"
 
-#: plugins/admin/groups/class_groupManagement.inc:471
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/applications/class_applicationManagement.inc:491
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/departments/class_departmentManagement.inc:311
-#: plugins/admin/ogroups/class_ogroupManagement.inc:466
-#: plugins/admin/ogroups/class_ogroupManagement.inc:471
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
+#: plugins/admin/groups/class_groupManagement.inc:472
+#: plugins/admin/groups/class_groupManagement.inc:477
+#: plugins/admin/applications/class_applicationManagement.inc:494
+#: plugins/admin/applications/class_applicationManagement.inc:500
+#: plugins/admin/departments/class_departmentManagement.inc:312
+#: plugins/admin/ogroups/class_ogroupManagement.inc:467
+#: plugins/admin/ogroups/class_ogroupManagement.inc:472
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
 #, fuzzy
 msgid "Delete this entry"
 msgstr "Удалить"
 
-#: plugins/admin/groups/class_groupManagement.inc:499
-#: plugins/admin/users/class_userManagement.inc:856
+#: plugins/admin/groups/class_groupManagement.inc:500
+#: plugins/admin/users/class_userManagement.inc:857
 #, fuzzy
 msgid "Posix"
 msgstr "Прокси-сервер"
 
-#: plugins/admin/groups/class_groupManagement.inc:508
-#: plugins/admin/applications/class_applicationManagement.inc:509
-#: plugins/admin/ogroups/class_ogroupManagement.inc:584
+#: plugins/admin/groups/class_groupManagement.inc:509
+#: plugins/admin/applications/class_applicationManagement.inc:512
+#: plugins/admin/ogroups/class_ogroupManagement.inc:585
 #: plugins/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
 msgid "Application"
 msgstr "Приложение"
 
-#: plugins/admin/groups/class_groupManagement.inc:523
+#: plugins/admin/groups/class_groupManagement.inc:524
 #, fuzzy
 msgid "Groupname"
 msgstr "Группа"
 
-#: plugins/admin/groups/class_groupManagement.inc:528
-#: plugins/admin/applications/class_applicationManagement.inc:523
-#: plugins/admin/ogroups/class_ogroupManagement.inc:498
+#: plugins/admin/groups/class_groupManagement.inc:529
+#: plugins/admin/applications/class_applicationManagement.inc:526
+#: plugins/admin/ogroups/class_ogroupManagement.inc:499
 msgid "This table displays all groups, in the selected tree."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:122
-msgid "Can't find this groups SID in LDAP or in your configuration file!"
-msgstr "Не могу найти SID в базе LDAP или в сонфигурационном файле!"
+#: plugins/admin/groups/remove.tpl:6
+msgid ""
+"This may be a primary user group. Please double check if you really want to "
+"do this since there is no way for GOsa to get your data back."
+msgstr ""
+"Возможно, это основная группа пользователей. Еще раз проверте что Вы "
+"действительно хотите удалить ее, так как GOsa не сможет отменить результаты "
+"этой операции."
 
-#: plugins/admin/groups/class_groupGeneric.inc:179
-msgid "This 'dn' is no group."
-msgstr "Это DN соответствует не группе."
-
-#: plugins/admin/groups/class_groupGeneric.inc:329
-msgid "Samba group"
-msgstr "Группа Samba"
-
-#: plugins/admin/groups/class_groupGeneric.inc:329
-msgid "Domain admins"
-msgstr "Администраторы домена"
-
-#: plugins/admin/groups/class_groupGeneric.inc:329
-msgid "Domain users"
-msgstr "Пользователи домена"
-
-#: plugins/admin/groups/class_groupGeneric.inc:330
-msgid "Domain guests"
-msgstr "Непривилегированные пользователи домена"
-
-#: plugins/admin/groups/class_groupGeneric.inc:335
-#, php-format
-msgid "Special group (%d)"
-msgstr "Специальная группа (%d)"
-
-#: plugins/admin/groups/class_groupGeneric.inc:445
-#, php-format
-msgid ""
-"Your search method returned more than '%s' users, only '%s' users are shown."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:462
-#, fuzzy
-msgid "! unknown id"
-msgstr "состояние неизвестно"
-
-#: plugins/admin/groups/class_groupGeneric.inc:598
-#, php-format
-msgid "No configured SID found for '%s'."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:603
-#, php-format
-msgid "No configured RIDBASE found for '%s'."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:716
-#: plugins/admin/ogroups/class_ogroup.inc:655
-msgid "You have no permissions to create a group on this 'Base'."
-msgstr "У вас недостаточно прав для создания группы в этой ветке."
-
-#: plugins/admin/groups/class_groupGeneric.inc:726
-msgid ""
-"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-"Значение поля \"Имя\" содержит недопустимые символы. Допустимыми являются "
-"буквы в нижнем регистре, цифры и дефисы."
-
-#: plugins/admin/groups/class_groupGeneric.inc:738
-#: plugins/admin/groups/class_groupGeneric.inc:752
-#: plugins/admin/groups/class_groupGeneric.inc:759
-msgid "Value specified as 'Name' is already used."
-msgstr "Группа с таким именем уже существует."
-
-#: plugins/admin/groups/remove.tpl:6
-msgid ""
-"This may be a primary user group. Please double check if you really want to "
-"do this since there is no way for GOsa to get your data back."
-msgstr ""
-"Возможно, это основная группа пользователей. Еще раз проверте что Вы "
-"действительно хотите удалить ее, так как GOsa не сможет отменить результаты "
-"этой операции."
-
-#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
-msgid "Group administration"
-msgstr "Управление группами"
-
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
-msgid "List of groups"
-msgstr "Список групп"
-
-#: plugins/admin/groups/headpage.tpl:25
-#, fuzzy
-msgid ""
-"This menu allows you to add, edit and remove selected groups. You may want "
-"to use the range selector on top of the group listbox, when working with a "
-"large number of groups."
-msgstr ""
-"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
-"группы пользователей. Если у вас их достаточно большое количество, вы можете "
-"использовать групповое выделение."
-
-#: plugins/admin/groups/headpage.tpl:41
-msgid "Select to see groups that are primary groups of users"
-msgstr "Выберите, чтобы просмотреть список основных групп пользователей"
-
-#: plugins/admin/groups/headpage.tpl:42
-msgid "Show primary groups"
-msgstr "Показать основные группы"
-
-#: plugins/admin/groups/headpage.tpl:46
-msgid "Select to see groups that have samba groups mappings"
-msgstr "Выберите, чтобы просмотреть группы, которые входят в samba"
-
-#: plugins/admin/groups/headpage.tpl:47
-msgid "Show samba groups"
-msgstr "Показать группы samba"
-
-#: plugins/admin/groups/headpage.tpl:50
-msgid "Select to see groups that have applications configured"
-msgstr "Выберите, чтобы просмотреть список групп, которым доступны приложения"
-
-#: plugins/admin/groups/headpage.tpl:51
-msgid "Show application groups"
-msgstr "Показать группы приложений"
-
-#: plugins/admin/groups/headpage.tpl:54
-msgid "Select to see groups that have mail settings"
-msgstr ""
-"Выберите, чтобы просмотреть список групп, которым доступны функции эл. почты"
-
-#: plugins/admin/groups/headpage.tpl:55
-msgid "Show mail groups"
-msgstr "Показать группы с эл. почтой"
-
-#: plugins/admin/groups/headpage.tpl:58
-msgid "Select to see normal groups that have only functional aspects"
-msgstr "Выберите, чтобы просмотреть список обычных групп"
-
-#: plugins/admin/groups/headpage.tpl:59
-msgid "Show functional groups"
-msgstr "Показать обычные группы"
+#: plugins/admin/groups/application_options.tpl:1
+msgid "Application options"
+msgstr "Параметры приложения"
 
 #: plugins/admin/groups/class_groupMail.inc:278
 msgid "read"
@@ -6195,6 +6358,8 @@ msgid "Please select a valid mail server."
 msgstr "Введите корректный серийный номер"
 
 #: plugins/admin/groups/acl.tpl:4
+#: plugins/admin/departments/class_departmentGeneric.inc:314
+#: include/class_ldap.inc:412
 msgid "Object"
 msgstr "Объект"
 
@@ -6317,9 +6482,10 @@ msgstr "Администраторы папки"
 msgid "Select a specific department"
 msgstr "Выберите подразделение."
 
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
-msgstr "Параметры приложения"
+#: plugins/admin/groups/paste_generic.tpl:1
+#, fuzzy
+msgid "Group settings"
+msgstr "Настройки Samba"
 
 #: plugins/admin/groups/mail_locals.tpl:32
 msgid "Display addresses of department"
@@ -6402,11 +6568,6 @@ msgstr "Домен"
 msgid "Insert seperator"
 msgstr ""
 
-#: plugins/admin/groups/paste_generic.tpl:1
-#, fuzzy
-msgid "Group settings"
-msgstr "Настройки Samba"
-
 #: plugins/admin/users/password.tpl:2
 #, fuzzy
 msgid ""
@@ -6418,10 +6579,35 @@ msgstr ""
 "вступят в силу немедленно. Пожалуйста, запомните новый пароль, так как иначе "
 "пользователь не сможет войти в систему."
 
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr "Создание пользователя на основе шаблона"
+
+#: plugins/admin/users/template.tpl:6
+#, fuzzy
+msgid ""
+"Creating a new user can be assisted by using templates. Many database "
+"records will be filled automatically. Choose 'none' to skip the usage of "
+"templates."
+msgstr ""
+"Можно создавать пользователей на основе шаблонов. При этом многие поля в "
+"базе данных будут заполнены автоматически. Выберите <b>нет</b>, чтобы не "
+"использовать шаблоны."
+
+#: plugins/admin/users/template.tpl:11
+#: plugins/admin/users/class_userManagement.inc:1181
+#: plugins/admin/systems/class_systemManagement.inc:918
+msgid "Template"
+msgstr "Шаблон"
+
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
+msgstr "Управление пользователями"
+
 #: plugins/admin/users/class_userManagement.inc:25
-#: plugins/admin/systems/printer.tpl:66
-#: plugins/admin/systems/class_glpiSelectUser.inc:112 html/getxls.php:68
-#: html/getxls.php:70 html/getxls.php:243
+#: plugins/admin/systems/class_glpiSelectUser.inc:112
+#: plugins/admin/systems/printer.tpl:66 html/getxls.php:68 html/getxls.php:70
+#: html/getxls.php:243
 msgid "Users"
 msgstr "Пользователи"
 
@@ -6451,109 +6637,104 @@ msgstr "нет"
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Пользователь с таким именем уже есть в этой ветке."
 
-#: plugins/admin/users/class_userManagement.inc:782
+#: plugins/admin/users/class_userManagement.inc:783
 #, fuzzy
 msgid "Create new user"
 msgstr "Создание нового объекта в"
 
-#: plugins/admin/users/class_userManagement.inc:782
+#: plugins/admin/users/class_userManagement.inc:783
 #, fuzzy
 msgid "New user"
 msgstr "пользователи"
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:784
 #, fuzzy
 msgid "Create new template"
 msgstr "Создать шаблон"
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:784
 msgid "New template"
 msgstr "Создать шаблон"
 
-#: plugins/admin/users/class_userManagement.inc:800
-#: plugins/admin/users/class_userManagement.inc:807
+#: plugins/admin/users/class_userManagement.inc:801
+#: plugins/admin/users/class_userManagement.inc:808
 #, fuzzy
 msgid "password"
 msgstr "Пароль"
 
-#: plugins/admin/users/class_userManagement.inc:818
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
+#: plugins/admin/users/class_userManagement.inc:819
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
-#: ihtml/themes/default/setup_useradmin.tpl:22
+#: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/default/login.tpl:28 ihtml/themes/default/login.tpl:32
+#: ihtml/themes/default/setup_useradmin.tpl:22 ihtml/themes/lhs/login.tpl:28
+#: ihtml/themes/lhs/login.tpl:32 ihtml/themes/lhs/setup_useradmin.tpl:22
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: plugins/admin/users/class_userManagement.inc:823
+#: plugins/admin/users/class_userManagement.inc:824
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:854
+#: plugins/admin/users/class_userManagement.inc:855
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:855
+#: plugins/admin/users/class_userManagement.inc:856
 #, fuzzy
 msgid "Edit generic properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:857
+#: plugins/admin/users/class_userManagement.inc:858
 #, fuzzy
 msgid "Edit UNIX properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:859
+#: plugins/admin/users/class_userManagement.inc:860
 #, fuzzy
 msgid "Edit environment properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:861
+#: plugins/admin/users/class_userManagement.inc:862
 #, fuzzy
 msgid "Edit mail properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:863
+#: plugins/admin/users/class_userManagement.inc:864
 #, fuzzy
 msgid "Edit phone properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:865
+#: plugins/admin/users/class_userManagement.inc:866
 #, fuzzy
 msgid "Edit fax properies"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:867
+#: plugins/admin/users/class_userManagement.inc:868
 #, fuzzy
 msgid "Edit samba properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:868
+#: plugins/admin/users/class_userManagement.inc:869
 #, fuzzy
 msgid "Create user from template"
 msgstr "Создать шаблон"
 
-#: plugins/admin/users/class_userManagement.inc:869
+#: plugins/admin/users/class_userManagement.inc:870
 #, fuzzy
 msgid "Create user with this template"
 msgstr "Создать шаблон"
 
-#: plugins/admin/users/class_userManagement.inc:928
+#: plugins/admin/users/class_userManagement.inc:929
 #, fuzzy
 msgid "Online"
 msgstr "в сети"
 
-#: plugins/admin/users/class_userManagement.inc:935
+#: plugins/admin/users/class_userManagement.inc:936
 #, fuzzy
 msgid "Offline"
 msgstr "не в сети"
 
-#: plugins/admin/users/class_userManagement.inc:1180
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/systems/class_systemManagement.inc:917
-msgid "Template"
-msgstr "Шаблон"
-
 #: plugins/admin/users/remove.tpl:6
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -6627,94 +6808,36 @@ msgstr "Выберите, чтобы просмотреть пользовате
 msgid "Show proxy users"
 msgstr "Показать пользователей с прокси-серверами"
 
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
-msgstr "Управление пользователями"
+#: plugins/admin/applications/generic.tpl:7
+#: plugins/admin/applications/generic.tpl:8
+#: plugins/admin/applications/class_applicationManagement.inc:521
+#: plugins/admin/applications/class_applicationGeneric.inc:379
+msgid "Application name"
+msgstr "Приложение"
 
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
-msgstr "Создание пользователя на основе шаблона"
+#: plugins/admin/applications/generic.tpl:11
+#: plugins/gofon/macro/generic.tpl:10 html/getxls.php:174 html/getxls.php:236
+msgid "Display name"
+msgstr "Отображаемое имя"
 
-#: plugins/admin/users/template.tpl:6
-#, fuzzy
-msgid ""
-"Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose 'none' to skip the usage of "
-"templates."
+#: plugins/admin/applications/generic.tpl:13
+#: plugins/admin/applications/class_applicationGeneric.inc:384
+msgid "Application name to be displayed (i.e. below icons)"
 msgstr ""
-"Можно создавать пользователей на основе шаблонов. При этом многие поля в "
-"базе данных будут заполнены автоматически. Выберите <b>нет</b>, чтобы не "
-"использовать шаблоны."
+"Имя приложения, которое будет показано пользователям (например, под "
+"пиктограммами)"
 
-#: plugins/admin/applications/class_applicationParameters.inc:52
-msgid "Remove options"
-msgstr "Удалить параметры"
+#: plugins/admin/applications/generic.tpl:19
+msgid "Path and/or binary name of application"
+msgstr "Путь и/или имя исполняемого файла приложения"
 
-#: plugins/admin/applications/class_applicationParameters.inc:53
-msgid "This application has options. You can disable them by clicking below."
-msgstr ""
-"Для этого приложения указаны параметры. Вы можете отключить их "
-"использование, щелкнув ниже."
+#: plugins/admin/applications/generic.tpl:34
+msgid "Choose subtree to place application in"
+msgstr "Выберите ветку, куда нужно поместить приложение"
 
-#: plugins/admin/applications/class_applicationParameters.inc:55
-msgid "Create options"
-msgstr "Создать параметры"
-
-#: plugins/admin/applications/class_applicationParameters.inc:56
-msgid ""
-"This application has options disabled. You can enable them by clicking below."
-msgstr ""
-"Для этого приложения отключено использование параметров. Вы можете включить "
-"его, щелкнув ниже."
-
-#: plugins/admin/applications/class_applicationParameters.inc:93
-msgid "Variable"
-msgstr "Переменная"
-
-#: plugins/admin/applications/class_applicationParameters.inc:93
-#: plugins/gofon/macro/parameter.tpl:9
-msgid "Default value"
-msgstr "По умолчанию"
-
-#: plugins/admin/applications/class_applicationParameters.inc:104
-msgid "Add option"
-msgstr "Добавить параметр"
-
-#: plugins/admin/applications/class_applicationParameters.inc:158
-#, php-format
-msgid "Value '%s' specified as option name is not valid."
-msgstr "Значение \"%s\", указанное как имя параметра, некорректно."
-
-#: plugins/admin/applications/generic.tpl:7
-#: plugins/admin/applications/generic.tpl:8
-#: plugins/admin/applications/class_applicationGeneric.inc:379
-#: plugins/admin/applications/class_applicationManagement.inc:518
-msgid "Application name"
-msgstr "Приложение"
-
-#: plugins/admin/applications/generic.tpl:11
-#: plugins/gofon/macro/generic.tpl:10 html/getxls.php:174 html/getxls.php:236
-msgid "Display name"
-msgstr "Отображаемое имя"
-
-#: plugins/admin/applications/generic.tpl:13
-#: plugins/admin/applications/class_applicationGeneric.inc:384
-msgid "Application name to be displayed (i.e. below icons)"
-msgstr ""
-"Имя приложения, которое будет показано пользователям (например, под "
-"пиктограммами)"
-
-#: plugins/admin/applications/generic.tpl:19
-msgid "Path and/or binary name of application"
-msgstr "Путь и/или имя исполняемого файла приложения"
-
-#: plugins/admin/applications/generic.tpl:34
-msgid "Choose subtree to place application in"
-msgstr "Выберите ветку, куда нужно поместить приложение"
-
-#: plugins/admin/applications/generic.tpl:48
-msgid "Icon"
-msgstr "Пиктограмма"
+#: plugins/admin/applications/generic.tpl:48
+msgid "Icon"
+msgstr "Пиктограмма"
 
 #: plugins/admin/applications/generic.tpl:56
 msgid "Update"
@@ -6745,6 +6868,45 @@ msgstr "Помещать членам группы соответствующи
 msgid "Place entry in members launch bar"
 msgstr "Помещать членам группы соответствующий элемент в меню запуска"
 
+#: plugins/admin/applications/class_applicationParameters.inc:52
+msgid "Remove options"
+msgstr "Удалить параметры"
+
+#: plugins/admin/applications/class_applicationParameters.inc:53
+msgid "This application has options. You can disable them by clicking below."
+msgstr ""
+"Для этого приложения указаны параметры. Вы можете отключить их "
+"использование, щелкнув ниже."
+
+#: plugins/admin/applications/class_applicationParameters.inc:55
+msgid "Create options"
+msgstr "Создать параметры"
+
+#: plugins/admin/applications/class_applicationParameters.inc:56
+msgid ""
+"This application has options disabled. You can enable them by clicking below."
+msgstr ""
+"Для этого приложения отключено использование параметров. Вы можете включить "
+"его, щелкнув ниже."
+
+#: plugins/admin/applications/class_applicationParameters.inc:93
+msgid "Variable"
+msgstr "Переменная"
+
+#: plugins/admin/applications/class_applicationParameters.inc:93
+#: plugins/gofon/macro/parameter.tpl:9
+msgid "Default value"
+msgstr "По умолчанию"
+
+#: plugins/admin/applications/class_applicationParameters.inc:104
+msgid "Add option"
+msgstr "Добавить параметр"
+
+#: plugins/admin/applications/class_applicationParameters.inc:158
+#, php-format
+msgid "Value '%s' specified as option name is not valid."
+msgstr "Значение \"%s\", указанное как имя параметра, некорректно."
+
 #: plugins/admin/applications/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -6782,6 +6944,27 @@ msgstr "Регулярное выражение, соответствующее
 msgid "Application management"
 msgstr "Управление приложениями"
 
+#: plugins/admin/applications/class_applicationManagement.inc:376
+#, php-format
+msgid "You're about to delete the application '%s'."
+msgstr "Вы собираетесь удалить приложение \"%s\"."
+
+#: plugins/admin/applications/class_applicationManagement.inc:382
+#: plugins/admin/applications/class_applicationManagement.inc:408
+msgid "You are not allowed to delete this application!"
+msgstr "У вас недостаточно прав для удаления этого приложения!"
+
+#: plugins/admin/applications/class_applicationManagement.inc:477
+#: plugins/admin/ogroups/class_ogroupManagement.inc:449
+#, fuzzy
+msgid "new"
+msgstr "Создать"
+
+#: plugins/admin/applications/class_applicationManagement.inc:477
+#, fuzzy
+msgid "Create new application"
+msgstr "Создать приложения"
+
 #: plugins/admin/applications/class_applicationGeneric.inc:87
 #, fuzzy
 msgid "no example"
@@ -6820,27 +7003,6 @@ msgstr "Приложение с таким именем уже существу
 msgid "Application settings"
 msgstr "Параметры приложения"
 
-#: plugins/admin/applications/class_applicationManagement.inc:374
-#, php-format
-msgid "You're about to delete the application '%s'."
-msgstr "Вы собираетесь удалить приложение \"%s\"."
-
-#: plugins/admin/applications/class_applicationManagement.inc:380
-#: plugins/admin/applications/class_applicationManagement.inc:406
-msgid "You are not allowed to delete this application!"
-msgstr "У вас недостаточно прав для удаления этого приложения!"
-
-#: plugins/admin/applications/class_applicationManagement.inc:474
-#: plugins/admin/ogroups/class_ogroupManagement.inc:448
-#, fuzzy
-msgid "new"
-msgstr "Создать"
-
-#: plugins/admin/applications/class_applicationManagement.inc:474
-#, fuzzy
-msgid "Create new application"
-msgstr "Создать приложения"
-
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr "Подразделение"
@@ -6926,46 +7088,10 @@ msgstr "Регулярное выражение, соответствующее
 msgid "Department management"
 msgstr "Управление подразделениями"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:185
-msgid "You have no permissions to create a department on this 'Base'."
-msgstr "У вас недостаточно прав для создания подразделения в этой ветке."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:192
-#: plugins/admin/departments/class_departmentGeneric.inc:194
-msgid "Department with that 'Name' already exists."
-msgstr "Подразделение с таким именем уже существует."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:202
-msgid "Required field 'Description' is not set."
-msgstr "Обязательное поле \"Описание\" не заполнено."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:207
-msgid "The field 'Name' contains the reserved word 'incoming'."
-msgstr "Значение поля \"Имя\" содержит служебное слово \"incoming\"."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:208
-msgid " Please choose another name."
-msgstr " Введите другое имя."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:274
-#, php-format
-msgid "Moving %s in %s"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:313
-#, php-format
-msgid "FAILED to copy %s, aborting operation"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:321
-#, fuzzy
-msgid "Complete"
-msgstr "не полный"
-
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
 #: plugins/admin/ogroups/class_ogroupManagement.inc:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:492
+#: plugins/admin/ogroups/class_ogroupManagement.inc:493
 msgid "Departments"
 msgstr "Подразделения"
 
@@ -6980,72 +7106,105 @@ msgstr "Вы собираетесь удалить целую ветку LDAP с
 msgid "You have no permission to remove this department."
 msgstr "У вас недостаточно прав для удаления этого подразделения."
 
-#: plugins/admin/departments/class_departmentManagement.inc:300
+#: plugins/admin/departments/class_departmentManagement.inc:301
 #, fuzzy
 msgid "Create new department"
 msgstr "Подразделение"
 
-#: plugins/admin/departments/class_departmentManagement.inc:308
+#: plugins/admin/departments/class_departmentManagement.inc:309
 msgid "This table displays all departments, in the selected tree."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:317
+#: plugins/admin/departments/class_departmentManagement.inc:318
 #, fuzzy
 msgid "Department name"
 msgstr "Управление подразделениями"
 
-#: plugins/admin/departments/class_departmentManagement.inc:411
+#: plugins/admin/departments/class_departmentManagement.inc:412
 msgid ".."
 msgstr ""
 
-#: plugins/admin/departments/recursive_moce.tpl:3
+#: plugins/admin/departments/class_departmentGeneric.inc:185
+msgid "You have no permissions to create a department on this 'Base'."
+msgstr "У вас недостаточно прав для создания подразделения в этой ветке."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:192
+#: plugins/admin/departments/class_departmentGeneric.inc:194
+msgid "Department with that 'Name' already exists."
+msgstr "Подразделение с таким именем уже существует."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:202
+msgid "Required field 'Description' is not set."
+msgstr "Обязательное поле \"Описание\" не заполнено."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:207
+msgid "The field 'Name' contains the reserved word 'incoming'."
+msgstr "Значение поля \"Имя\" содержит служебное слово \"incoming\"."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:208
+msgid " Please choose another name."
+msgstr " Введите другое имя."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:278
+#, php-format
+msgid "Moving %s to %s"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:317
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
+msgstr ""
+
+#: plugins/admin/departments/recursive_move.tpl:2
 msgid ""
-"Your browser isn't able to display this iframe ... use the link below intead"
+"As soon as the move operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the department "
+"management dialog."
 msgstr ""
 
 #: plugins/admin/systems/class_terminalInfo.inc:54
-#: plugins/admin/systems/class_terminalInfo.inc:199
+#: plugins/admin/systems/class_terminalInfo.inc:200
 msgid "present"
 msgstr "присутствует"
 
-#: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_terminalService.inc:158
-#: plugins/admin/systems/class_terminalStartup.inc:99
+#: plugins/admin/systems/class_terminalInfo.inc:68
 #: plugins/admin/systems/class_workstationService.inc:151
 #: plugins/admin/systems/class_workstationStartup.inc:372
+#: plugins/admin/systems/class_terminalService.inc:158
+#: plugins/admin/systems/class_terminalStartup.inc:99
 #: plugins/admin/systems/class_terminalGeneric.inc:153
 msgid "This 'dn' has no terminal features."
 msgstr "Это DN не соответствует терминалу."
 
-#: plugins/admin/systems/class_terminalInfo.inc:74
+#: plugins/admin/systems/class_terminalInfo.inc:75
 #, fuzzy
 msgid "There is no php snmp module installed, can't gather any informations."
 msgstr ""
 "Предупреждение: функция imap_getacl не реализована, и вы не сможете менять "
 "права доступа к общим папкам."
 
-#: plugins/admin/systems/class_terminalInfo.inc:80
-#: plugins/admin/systems/class_terminalInfo.inc:174
+#: plugins/admin/systems/class_terminalInfo.inc:81
+#: plugins/admin/systems/class_terminalInfo.inc:175
 msgid "unknown status"
 msgstr "состояние неизвестно"
 
-#: plugins/admin/systems/class_terminalInfo.inc:89
+#: plugins/admin/systems/class_terminalInfo.inc:90
 msgid "This is a virtual terminal which has no properties to show here."
 msgstr "Это виртуальный терминал без особых свойств."
 
-#: plugins/admin/systems/class_terminalInfo.inc:107
+#: plugins/admin/systems/class_terminalInfo.inc:108
 msgid "online"
 msgstr "в сети"
 
-#: plugins/admin/systems/class_terminalInfo.inc:163
+#: plugins/admin/systems/class_terminalInfo.inc:164
 msgid "running"
 msgstr "запущен"
 
-#: plugins/admin/systems/class_terminalInfo.inc:166
+#: plugins/admin/systems/class_terminalInfo.inc:167
 msgid "not running"
 msgstr "не запущен"
 
-#: plugins/admin/systems/class_terminalInfo.inc:191
+#: plugins/admin/systems/class_terminalInfo.inc:192
 msgid "offline"
 msgstr "не в сети"
 
@@ -7079,8 +7238,8 @@ msgid "Zone"
 msgstr "телефоны"
 
 #: plugins/admin/systems/network.tpl:42
-#: plugins/admin/systems/class_servDNS.inc:298
 #: plugins/admin/systems/servdnseditzone.tpl:81
+#: plugins/admin/systems/class_servDNS.inc:298
 msgid "TTL"
 msgstr ""
 
@@ -7089,48 +7248,178 @@ msgstr ""
 msgid "Dns records"
 msgstr "Каталог"
 
-#: plugins/admin/systems/class_winGeneric.inc:73
-#: plugins/admin/systems/class_componentGeneric.inc:50
-#, fuzzy
-msgid "This 'dn' has no network features."
-msgstr "Этот DN не имеет свойств принтера."
-
-#: plugins/admin/systems/class_winGeneric.inc:162
-#: plugins/admin/systems/class_componentGeneric.inc:145
-#, fuzzy
-msgid "You have no permissions to create a component on this 'Base'."
-msgstr "У вас недостаточно прав для создания телефонов в этой ветке."
+#: plugins/admin/systems/workstationService.tpl:4
+#: plugins/admin/systems/terminalService.tpl:4
+msgid "Keyboard"
+msgstr "Клавиатура"
 
-#: plugins/admin/systems/class_winGeneric.inc:172
-#: plugins/admin/systems/class_phoneGeneric.inc:314
-#: plugins/admin/systems/class_terminalGeneric.inc:286
-#: plugins/admin/systems/class_servGeneric.inc:209
-#: plugins/admin/systems/class_workstationGeneric.inc:245
-#: plugins/admin/systems/class_printGeneric.inc:529
-#: plugins/admin/systems/class_componentGeneric.inc:155
-#, php-format
-msgid "There is already an entry '%s' in the base choosen by you"
-msgstr "В выбранной вами ветке уже есть запись \"%s\""
+#: plugins/admin/systems/workstationService.tpl:7
+#: plugins/admin/systems/terminalService.tpl:7
+#: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/printerPPDDialog.tpl:5
+msgid "Model"
+msgstr "Модель"
 
-#: plugins/admin/systems/info.tpl:1
-msgid "System information"
-msgstr "Системная информация"
+#: plugins/admin/systems/workstationService.tpl:9
+#: plugins/admin/systems/terminalService.tpl:9
+msgid "Choose keyboard model"
+msgstr "Выберите модель клавиатуры"
 
-#: plugins/admin/systems/info.tpl:7
-msgid "CPU"
-msgstr "Процессор"
+#: plugins/admin/systems/workstationService.tpl:15
+#: plugins/admin/systems/terminalService.tpl:15
+msgid "Layout"
+msgstr "Раскладка"
 
-#: plugins/admin/systems/info.tpl:10
-msgid "Memory"
-msgstr "Память"
+#: plugins/admin/systems/workstationService.tpl:17
+#: plugins/admin/systems/terminalService.tpl:17
+msgid "Choose keyboard layout"
+msgstr "Выберите раскладку"
 
-#: plugins/admin/systems/info.tpl:13
-msgid "Boot MAC"
-msgstr "MAC-адрес"
+#: plugins/admin/systems/workstationService.tpl:23
+#: plugins/admin/systems/terminalService.tpl:23
+msgid "Variant"
+msgstr "Вариант"
 
-#: plugins/admin/systems/info.tpl:16
-msgid "USB support"
-msgstr "Поддержка USB"
+#: plugins/admin/systems/workstationService.tpl:25
+#: plugins/admin/systems/terminalService.tpl:25
+msgid "Choose keyboard variant"
+msgstr "Выберите вариант раскладки"
+
+#: plugins/admin/systems/workstationService.tpl:39
+#: plugins/admin/systems/terminalService.tpl:39
+msgid "Mouse"
+msgstr "Мышь"
+
+#: plugins/admin/systems/workstationService.tpl:44
+#: plugins/admin/systems/terminalService.tpl:44
+msgid "Choose mouse type"
+msgstr "Выберите тип мыши"
+
+#: plugins/admin/systems/workstationService.tpl:50
+#: plugins/admin/systems/terminalService.tpl:50
+msgid "Port"
+msgstr "Порт"
+
+#: plugins/admin/systems/workstationService.tpl:52
+#: plugins/admin/systems/terminalService.tpl:52
+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:23
+msgid "Telephone hardware"
+msgstr "Телефонное оборудование"
+
+#: plugins/admin/systems/workstationService.tpl:69
+#: plugins/admin/systems/terminalService.tpl:69
+#: plugins/gofon/phoneaccount/generic.tpl:26
+#: plugins/gofon/phoneaccount/generic.tpl:28
+#: plugins/gofon/phoneaccount/paste_generic.tpl:25
+msgid "Telephone"
+msgstr "Телефон"
+
+#: plugins/admin/systems/workstationService.tpl:83
+#: plugins/admin/systems/info.tpl:73
+#: plugins/admin/systems/terminalService.tpl:83
+msgid "Graphic device"
+msgstr "Видеокарта"
+
+#: plugins/admin/systems/workstationService.tpl:86
+#: plugins/admin/systems/terminalService.tpl:86
+#: plugins/admin/systems/printer.tpl:46
+msgid "Driver"
+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"
+msgstr "Выберите подходящий драйвер для установленной видеокарты"
+
+#: plugins/admin/systems/workstationService.tpl:96
+#: plugins/admin/systems/terminalService.tpl:96
+msgid "Choose screen resolution used in graphic mode"
+msgstr "Выберите подходящее разрешение экрана"
+
+#: plugins/admin/systems/workstationService.tpl:102
+#: plugins/admin/systems/terminalService.tpl:102
+msgid "Color depth"
+msgstr "Глубина цвета"
+
+#: plugins/admin/systems/workstationService.tpl:104
+#: plugins/admin/systems/terminalService.tpl:104
+msgid "Choose colordepth used in graphic mode"
+msgstr "Выберите подходящую глубину цвета"
+
+#: plugins/admin/systems/workstationService.tpl:117
+#: plugins/admin/systems/terminalService.tpl:117
+msgid "Display device"
+msgstr "Устройство отображения"
+
+#: plugins/admin/systems/workstationService.tpl:121
+#, fuzzy
+msgid "unknown"
+msgstr "состояние неизвестно"
+
+#: plugins/admin/systems/workstationService.tpl:126
+msgid "Automatic modelines"
+msgstr ""
+
+#: plugins/admin/systems/workstationService.tpl:130
+#: plugins/admin/systems/terminalService.tpl:124
+msgid "HSync"
+msgstr "Строчная синхронизация"
+
+#: plugins/admin/systems/workstationService.tpl:132
+#: plugins/admin/systems/terminalService.tpl:126
+msgid "Horizontal refresh frequency for installed monitor"
+msgstr "Частота обновления строк для данного монитора"
+
+#: plugins/admin/systems/workstationService.tpl:135
+#: plugins/admin/systems/terminalService.tpl:129
+msgid "VSync"
+msgstr "Кадровая синхронизация"
+
+#: plugins/admin/systems/workstationService.tpl:137
+#: plugins/admin/systems/terminalService.tpl:131
+msgid "Vertical refresh frequency for installed monitor"
+msgstr "Частота обновления кадров для данного монитора"
+
+#: plugins/admin/systems/workstationService.tpl:149
+#: plugins/admin/systems/terminalService.tpl:203
+msgid "Scan device"
+msgstr "Устройство сканирования"
+
+#: plugins/admin/systems/workstationService.tpl:150
+#: plugins/admin/systems/terminalService.tpl:204
+msgid "Select to start SANE scan service on terminal"
+msgstr "Выберите, чтобы запустить на терминале службу сканирования"
+
+#: plugins/admin/systems/workstationService.tpl:151
+#: plugins/admin/systems/terminalService.tpl:205
+msgid "Provide scan services"
+msgstr "Предоставлять службу сканирования"
+
+#: plugins/admin/systems/info.tpl:1
+msgid "System information"
+msgstr "Системная информация"
+
+#: plugins/admin/systems/info.tpl:7
+msgid "CPU"
+msgstr "Процессор"
+
+#: plugins/admin/systems/info.tpl:10
+msgid "Memory"
+msgstr "Память"
+
+#: plugins/admin/systems/info.tpl:13
+msgid "Boot MAC"
+msgstr "MAC-адрес"
+
+#: plugins/admin/systems/info.tpl:16
+msgid "USB support"
+msgstr "Поддержка USB"
 
 #: plugins/admin/systems/info.tpl:19 plugins/admin/systems/info.tpl:87
 msgid "System status"
@@ -7165,12 +7454,6 @@ msgstr "Дисковод"
 msgid "CDROM device"
 msgstr "Привод CDROM"
 
-#: plugins/admin/systems/info.tpl:73
-#: plugins/admin/systems/workstationService.tpl:83
-#: plugins/admin/systems/terminalService.tpl:83
-msgid "Graphic device"
-msgstr "Видеокарта"
-
 #: plugins/admin/systems/info.tpl:77
 msgid "Audio device"
 msgstr "Звуковая карта"
@@ -7211,326 +7494,210 @@ msgstr "Звук"
 msgid "GUI"
 msgstr "Графический интерфейс"
 
-#: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_workstationService.inc:89
-msgid "default"
-msgstr "по умолчанию"
-
-#: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_workstationService.inc:90
-msgid "show chooser"
-msgstr "показать окно входа в систему"
-
-#: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:91
-msgid "direct"
-msgstr "напрямую"
-
-#: plugins/admin/systems/class_terminalService.inc:107
-#: plugins/admin/systems/class_workstationService.inc:94
-msgid "load balanced"
-msgstr "с выравниваем нагрузки"
-
-#: plugins/admin/systems/class_terminalService.inc:110
-#: plugins/admin/systems/class_workstationService.inc:97
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: plugins/admin/systems/class_terminalService.inc:111
-#: plugins/admin/systems/class_workstationService.inc:98
-msgid "ICA client"
-msgstr "Клиент ICA"
+#: plugins/admin/systems/glpi.tpl:9
+#: plugins/admin/systems/SelectDeviceType.tpl:20
+#, fuzzy
+msgid "System type"
+msgstr "Системы"
 
-#: plugins/admin/systems/class_terminalService.inc:209
-#: plugins/admin/systems/class_workstationService.inc:201
+#: plugins/admin/systems/glpi.tpl:19
 #, fuzzy
-msgid "Choose the phone located at the current terminal"
-msgstr "Выбрать раздел, для хранения объекта"
+msgid "Operating system"
+msgstr "Удалить"
 
-#: plugins/admin/systems/class_terminalService.inc:270
-#: plugins/admin/systems/class_terminalService.inc:275
-#: plugins/admin/systems/class_workstationService.inc:263
-#: plugins/admin/systems/class_workstationService.inc:268
-msgid "Please specify a valid VSync range."
-msgstr "Пожалуйста, укажите корректную кадровую синхронизацию."
+#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
+#: plugins/admin/systems/glpi_devices.tpl:24
+#: plugins/admin/systems/glpi_devices.tpl:123
+#: plugins/admin/systems/glpi_devices.tpl:164
+#: plugins/admin/systems/glpi_devices.tpl:219
+#: plugins/admin/systems/glpi_devices.tpl:275
+#: plugins/admin/systems/glpi_devices.tpl:333
+#: plugins/admin/systems/glpi_devices.tpl:397
+#: plugins/admin/systems/glpi_devices.tpl:469
+#: plugins/admin/systems/glpi_devices.tpl:533
+#: plugins/admin/systems/glpi_devices.tpl:580
+#: plugins/admin/systems/glpi_devices.tpl:633
+#: plugins/admin/systems/glpi_devices.tpl:687
+#: plugins/admin/systems/glpi_devices.tpl:733
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
+msgid "Manufacturer"
+msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:285
-#: plugins/admin/systems/class_terminalService.inc:290
-#: plugins/admin/systems/class_workstationService.inc:278
-#: plugins/admin/systems/class_workstationService.inc:283
-msgid "Please specify a valid HSync range."
-msgstr "Пожалуйста, укажите корректную строчную синхронзацию."
+#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
+#, fuzzy
+msgid "Contacts"
+msgstr "Контакт"
 
-#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
-msgid "System management"
-msgstr "Управление системами"
+#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
+#, fuzzy
+msgid "Contact person"
+msgstr "Контакт"
 
-#: plugins/admin/systems/class_servService.inc:272
-msgid "Terminal server, must have fontpath specified."
+#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
+msgid "Technical responsible"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:37
+#: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
+#: plugins/admin/systems/glpi_devices.tpl:112
+#: plugins/admin/systems/glpi_devices.tpl:153
+#: plugins/admin/systems/glpi_devices.tpl:208
+#: plugins/admin/systems/glpi_devices.tpl:264
+#: plugins/admin/systems/glpi_devices.tpl:322
+#: plugins/admin/systems/glpi_devices.tpl:386
+#: plugins/admin/systems/glpi_devices.tpl:458
+#: plugins/admin/systems/glpi_devices.tpl:522
+#: plugins/admin/systems/glpi_devices.tpl:569
+#: plugins/admin/systems/glpi_devices.tpl:622
+#: plugins/admin/systems/glpi_devices.tpl:676
+#: plugins/admin/systems/glpi_devices.tpl:722
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
 #, fuzzy
-msgid "Time Service"
-msgstr "Сервисы"
+msgid "Comment"
+msgstr "Контакт"
 
-#: plugins/admin/systems/servservice.tpl:61
+#: plugins/admin/systems/glpi.tpl:78
 #, fuzzy
-msgid "LDAP Service"
-msgstr "LDAP-сервер"
+msgid "Installed devices"
+msgstr "Клиентские устройства"
 
-#: plugins/admin/systems/servservice.tpl:72
+#: plugins/admin/systems/glpi.tpl:90
 #, fuzzy
-msgid "Terminal Service"
-msgstr "Терминальный сервер"
+msgid "Trading"
+msgstr "Затенение"
 
-#: plugins/admin/systems/servservice.tpl:77
+#: plugins/admin/systems/glpi.tpl:91
 #, fuzzy
-msgid "Temporary disable login"
-msgstr "Временно отключить использование факса"
+msgid "Software"
+msgstr "Адм. единица"
 
-#: plugins/admin/systems/servservice.tpl:80
+#: plugins/admin/systems/glpi.tpl:92
 #, fuzzy
-msgid "Font path"
+msgid "Contracts"
 msgstr "Контакт"
 
-#: plugins/admin/systems/servservice.tpl:93
+#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
 #, fuzzy
-msgid "Syslog Service"
-msgstr "Сервер системных журналов"
+msgid "Attachments"
+msgstr "подразделения"
 
-#: plugins/admin/systems/servservice.tpl:101
-#, fuzzy
-msgid "Print Service"
-msgstr "Служба печати"
+#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
+msgstr "Управление системами"
 
-#: plugins/admin/systems/servservice.tpl:109
+#: plugins/admin/systems/glpiPrinter.tpl:9
 #, fuzzy
-msgid "Mail server"
-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"
+msgid "Printer type"
+msgstr "Имя принтера"
 
-#: plugins/admin/systems/chooser.tpl:11
-msgid "Network printer"
+#: plugins/admin/systems/glpiPrinter.tpl:31
+#, fuzzy
+msgid "Supported interfaces"
 msgstr "Сетевой принтер"
 
-#: plugins/admin/systems/chooser.tpl:13
-msgid "Other network component"
-msgstr "Прочие сетевые компоненты"
-
-#: plugins/admin/systems/chooser.tpl:16
-msgid "Create"
-msgstr "Создать"
-
-#: plugins/admin/systems/component.tpl:15 plugins/admin/systems/server.tpl:15
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/terminal.tpl:20
-#: plugins/admin/systems/printer.tpl:22
-#: plugins/admin/systems/workstation.tpl:29
-#: plugins/admin/systems/wingeneric.tpl:15
-msgid "Choose subtree to place terminal in"
-msgstr "Выберите ветку терминала"
-
-#: plugins/admin/systems/workstationService.tpl:4
-#: plugins/admin/systems/terminalService.tpl:4
-msgid "Keyboard"
-msgstr "Клавиатура"
-
-#: plugins/admin/systems/workstationService.tpl:7
-#: plugins/admin/systems/printerPPDDialog.tpl:5
-#: plugins/admin/systems/terminalService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:210
-msgid "Model"
-msgstr "Модель"
-
-#: plugins/admin/systems/workstationService.tpl:9
-#: plugins/admin/systems/terminalService.tpl:9
-msgid "Choose keyboard model"
-msgstr "Выберите модель клавиатуры"
-
-#: plugins/admin/systems/workstationService.tpl:15
-#: plugins/admin/systems/terminalService.tpl:15
-msgid "Layout"
-msgstr "Раскладка"
-
-#: plugins/admin/systems/workstationService.tpl:17
-#: plugins/admin/systems/terminalService.tpl:17
-msgid "Choose keyboard layout"
-msgstr "Выберите раскладку"
-
-#: plugins/admin/systems/workstationService.tpl:23
-#: plugins/admin/systems/terminalService.tpl:23
-msgid "Variant"
-msgstr "Вариант"
-
-#: plugins/admin/systems/workstationService.tpl:25
-#: plugins/admin/systems/terminalService.tpl:25
-msgid "Choose keyboard variant"
-msgstr "Выберите вариант раскладки"
-
-#: plugins/admin/systems/workstationService.tpl:39
-#: plugins/admin/systems/terminalService.tpl:39
-msgid "Mouse"
-msgstr "Мышь"
-
-#: plugins/admin/systems/workstationService.tpl:44
-#: plugins/admin/systems/terminalService.tpl:44
-msgid "Choose mouse type"
-msgstr "Выберите тип мыши"
-
-#: plugins/admin/systems/workstationService.tpl:50
-#: plugins/admin/systems/terminalService.tpl:50
-msgid "Port"
-msgstr "Порт"
-
-#: plugins/admin/systems/workstationService.tpl:52
-#: plugins/admin/systems/terminalService.tpl:52
-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:23
-msgid "Telephone hardware"
-msgstr "Телефонное оборудование"
-
-#: plugins/admin/systems/workstationService.tpl:69
-#: plugins/admin/systems/terminalService.tpl:69
-#: plugins/gofon/phoneaccount/generic.tpl:26
-#: plugins/gofon/phoneaccount/generic.tpl:28
-#: plugins/gofon/phoneaccount/paste_generic.tpl:25
-msgid "Telephone"
-msgstr "Телефон"
-
-#: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/printer.tpl:46
-#: plugins/admin/systems/terminalService.tpl:86
-msgid "Driver"
-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"
-msgstr "Выберите подходящий драйвер для установленной видеокарты"
+#: plugins/admin/systems/glpiPrinter.tpl:38
+#, fuzzy
+msgid "Serial"
+msgstr "терминалы"
 
-#: plugins/admin/systems/workstationService.tpl:96
-#: plugins/admin/systems/terminalService.tpl:96
-msgid "Choose screen resolution used in graphic mode"
-msgstr "Выберите подходящее разрешение экрана"
+#: plugins/admin/systems/glpiPrinter.tpl:46
+#, fuzzy
+msgid "Parallel"
+msgstr "Переменная"
 
-#: plugins/admin/systems/workstationService.tpl:102
-#: plugins/admin/systems/terminalService.tpl:102
-msgid "Color depth"
-msgstr "Глубина цвета"
+#: plugins/admin/systems/glpiPrinter.tpl:54
+msgid "USB"
+msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:104
-#: plugins/admin/systems/terminalService.tpl:104
-msgid "Choose colordepth used in graphic mode"
-msgstr "Выберите подходящую глубину цвета"
+#: plugins/admin/systems/glpiPrinter.tpl:114
+#, fuzzy
+msgid "Installed cartridges"
+msgstr "Клиентские устройства"
 
-#: plugins/admin/systems/workstationService.tpl:117
-#: plugins/admin/systems/terminalService.tpl:117
-msgid "Display device"
-msgstr "Устройство отображения"
+#: plugins/admin/systems/glpi_edit_type.tpl:1
+#, fuzzy
+msgid "Manage System-types"
+msgstr "Системы"
 
-#: plugins/admin/systems/workstationService.tpl:121
+#: plugins/admin/systems/glpi_edit_type.tpl:9
+#: plugins/admin/systems/glpi_edit_type.tpl:28
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:8
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:29
+#: plugins/admin/systems/glpi_edit_os.tpl:9
+#: plugins/admin/systems/glpi_edit_os.tpl:28
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
 #, fuzzy
-msgid "unknown"
-msgstr "состояние неизвестно"
+msgid "Rename"
+msgstr "Имя сервера"
 
-#: plugins/admin/systems/workstationService.tpl:126
-msgid "Automatic modelines"
-msgstr ""
+#: plugins/admin/systems/glpi_edit_type.tpl:24
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:25
+#: plugins/admin/systems/glpi_edit_os.tpl:24
+#, fuzzy
+msgid "Please enter a new name"
+msgstr "Введите адрес сервера"
 
-#: plugins/admin/systems/workstationService.tpl:130
-#: plugins/admin/systems/terminalService.tpl:124
-msgid "HSync"
-msgstr "Строчная синхронизация"
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr "Выбрать объекты для добавления"
 
-#: plugins/admin/systems/workstationService.tpl:132
-#: plugins/admin/systems/terminalService.tpl:126
-msgid "Horizontal refresh frequency for installed monitor"
-msgstr "Частота обновления строк для данного монитора"
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
+#: plugins/admin/systems/printerPPDDialog.tpl:6
+#, fuzzy
+msgid "Select"
+msgstr "Удалить"
 
-#: plugins/admin/systems/workstationService.tpl:135
-#: plugins/admin/systems/terminalService.tpl:129
-msgid "VSync"
-msgstr "Кадровая синхронизация"
+#: plugins/admin/systems/class_workstationService.inc:89
+#: plugins/admin/systems/class_terminalService.inc:102
+msgid "default"
+msgstr "по умолчанию"
 
-#: plugins/admin/systems/workstationService.tpl:137
-#: plugins/admin/systems/terminalService.tpl:131
-msgid "Vertical refresh frequency for installed monitor"
-msgstr "Частота обновления кадров для данного монитора"
+#: plugins/admin/systems/class_workstationService.inc:90
+#: plugins/admin/systems/class_terminalService.inc:103
+msgid "show chooser"
+msgstr "показать окно входа в систему"
 
-#: plugins/admin/systems/workstationService.tpl:149
-#: plugins/admin/systems/terminalService.tpl:203
-msgid "Scan device"
-msgstr "Устройство сканирования"
+#: plugins/admin/systems/class_workstationService.inc:91
+#: plugins/admin/systems/class_terminalService.inc:104
+msgid "direct"
+msgstr "напрямую"
 
-#: plugins/admin/systems/workstationService.tpl:150
-#: plugins/admin/systems/terminalService.tpl:204
-msgid "Select to start SANE scan service on terminal"
-msgstr "Выберите, чтобы запустить на терминале службу сканирования"
+#: plugins/admin/systems/class_workstationService.inc:94
+#: plugins/admin/systems/class_terminalService.inc:107
+msgid "load balanced"
+msgstr "с выравниваем нагрузки"
 
-#: plugins/admin/systems/workstationService.tpl:151
-#: plugins/admin/systems/terminalService.tpl:205
-msgid "Provide scan services"
-msgstr "Предоставлять службу сканирования"
+#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_terminalService.inc:110
+msgid "Windows RDP"
+msgstr "Windows RDP"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
-#, fuzzy
-msgid "Select entries to add"
-msgstr "Выбрать пользователей для добавления"
+#: plugins/admin/systems/class_workstationService.inc:98
+#: plugins/admin/systems/class_terminalService.inc:111
+msgid "ICA client"
+msgstr "Клиент ICA"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
+#: plugins/admin/systems/class_workstationService.inc:201
+#: plugins/admin/systems/class_terminalService.inc:209
 #, fuzzy
-msgid "Display members of department"
-msgstr "Показать номера из подразделения"
+msgid "Choose the phone located at the current terminal"
+msgstr "Выбрать раздел, для хранения объекта"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
-#, fuzzy
-msgid "Display members matching"
-msgstr "Показать совпадения номеров"
+#: plugins/admin/systems/class_workstationService.inc:263
+#: plugins/admin/systems/class_workstationService.inc:268
+#: plugins/admin/systems/class_terminalService.inc:270
+#: plugins/admin/systems/class_terminalService.inc:275
+msgid "Please specify a valid VSync range."
+msgstr "Пожалуйста, укажите корректную кадровую синхронизацию."
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
-#, fuzzy
-msgid "Regular expression for matching member names"
-msgstr "Регулярное выражение, соответствующее именам пользователей"
+#: plugins/admin/systems/class_workstationService.inc:278
+#: plugins/admin/systems/class_workstationService.inc:283
+#: plugins/admin/systems/class_terminalService.inc:285
+#: plugins/admin/systems/class_terminalService.inc:290
+msgid "Please specify a valid HSync range."
+msgstr "Пожалуйста, укажите корректную строчную синхронзацию."
 
 #: plugins/admin/systems/class_workstationStartup.inc:313
 msgid ""
@@ -7567,51 +7734,6 @@ msgid ""
 "be saved."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:105
-msgid "This 'dn' has no phone features."
-msgstr "Этот DN не имеет свойств телефона."
-
-#: plugins/admin/systems/class_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
-#, fuzzy
-msgid "yes"
-msgstr "Системы"
-
-#: plugins/admin/systems/class_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-#, fuzzy
-msgid "no"
-msgstr "нет"
-
-#: plugins/admin/systems/class_phoneGeneric.inc:223
-msgid "dynamic"
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:223
-#, fuzzy
-msgid "Networksettings"
-msgstr "Сетевые настройки"
-
-#: plugins/admin/systems/class_phoneGeneric.inc:238
-#, php-format
-msgid ""
-"Can't delete because there are user which are depending on this phone. One "
-"of them is user '%s'."
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:294
-#, fuzzy
-msgid "The required field 'Phone name' is not set."
-msgstr "Обязательное поле \"Личное имя\" не заполнено."
-
-#: plugins/admin/systems/class_phoneGeneric.inc:297
-msgid "The 'Phone name' '0' is reserved and cannot be used."
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:304
-msgid "You have no permissions to create a phone on this 'Base'."
-msgstr "У вас недостаточно прав для создания телефонов в этой ветке."
-
 #: plugins/admin/systems/class_printerPPDDialog.inc:67
 #, php-format
 msgid "Can't open '%s', ppd settings resetted."
@@ -7629,151 +7751,74 @@ msgstr ""
 msgid "Can't get ppd informations."
 msgstr "Общая информация о пользователе"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:125
-#, php-format
-msgid "Can't create folder '%s' for the uploaded ppd file."
-msgstr ""
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:138
-#, fuzzy, php-format
-msgid "There is already a ppd file for this kind of printer."
-msgstr ""
-"Пользователь с таким регистрационным именем в базе данных уже существует."
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:146
-#, fuzzy, php-format
-msgid "Can't save file '%s'."
-msgstr "Удалить"
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:163
-#: plugins/admin/systems/class_printerPPDDialog.inc:166
-#, fuzzy
-msgid "Please specify a valid ppd file."
-msgstr "Введите корректное имя пользователя!"
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:190
-#, fuzzy
-msgid "Please select a valid ppd."
-msgstr "Введите корректный серийный номер"
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:369
-#: plugins/admin/systems/class_printerPPDDialog.inc:372
-#, fuzzy
-msgid "True"
-msgstr "Улица"
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:370
-#: plugins/admin/systems/class_printerPPDDialog.inc:373
-#, fuzzy
-msgid "False"
-msgstr "женский"
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:378
-#, php-format
-msgid "Unsupported ppd type '%s' used for '%s' "
-msgstr ""
-
-#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
-msgid "Server name"
-msgstr "Имя сервера"
-
-#: plugins/admin/systems/server.tpl:39 plugins/admin/systems/terminal.tpl:100
-#: plugins/admin/systems/workstation.tpl:79
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:44
-#: plugins/admin/ogroups/termgroup.tpl:3
-msgid "Action"
-msgstr "Действие"
-
-#: plugins/admin/systems/server.tpl:43
-#, fuzzy
-msgid "Select action to execute for this server"
-msgstr "Выберите действие, которое нужно выполнить на этом терминале"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:61
-msgid "text"
-msgstr "текст"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:62
-msgid "graphic"
-msgstr "графика"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:90
-#: plugins/admin/systems/class_servGeneric.inc:62
-#: plugins/admin/ogroups/class_termgroup.inc:64
-msgid "No WAKECMD definition found in your gosa.conf"
-msgstr "Определение WAKECMD в вашем файле gosa.conf не найдено"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:94
-#: plugins/admin/systems/class_terminalGeneric.inc:106
-#: plugins/admin/systems/class_terminalGeneric.inc:118
-#: plugins/admin/systems/class_servGeneric.inc:66
-#: plugins/admin/systems/class_servGeneric.inc:78
-#: plugins/admin/systems/class_servGeneric.inc:90
-#: plugins/admin/systems/class_workstationGeneric.inc:104
-#: plugins/admin/ogroups/class_termgroup.inc:68
-#: plugins/admin/ogroups/class_termgroup.inc:80
-#: plugins/admin/ogroups/class_termgroup.inc:92
-#, php-format
-msgid "Execution of '%s' failed!"
-msgstr "Ошибка при выполнении \"%s\"!"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:102
-#: plugins/admin/systems/class_servGeneric.inc:74
-#: plugins/admin/ogroups/class_termgroup.inc:76
-msgid "No REBOOTCMD definition found in your gosa.conf"
-msgstr "Определение REBOOTCMD в вашем файле gosa.conf не найдено"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_servGeneric.inc:86
-#: plugins/admin/ogroups/class_termgroup.inc:88
-msgid "No HALTCMD definition found in your gosa.conf"
-msgstr "Определение HALTCMD в вашем файле gosa.conf не найдено"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
-#: plugins/admin/ogroups/class_termgroup.inc:104
-msgid "Switch off"
-msgstr "Выключить"
+#: plugins/admin/systems/class_printerPPDDialog.inc:125
+#, php-format
+msgid "Can't create folder '%s' for the uploaded ppd file."
+msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
-#: plugins/admin/ogroups/class_termgroup.inc:104
-msgid "Reboot"
-msgstr "Перезагрузить"
+#: plugins/admin/systems/class_printerPPDDialog.inc:138
+#, fuzzy, php-format
+msgid "There is already a ppd file for this kind of printer."
+msgstr ""
+"Пользователь с таким регистрационным именем в базе данных уже существует."
 
-#: plugins/admin/systems/class_terminalGeneric.inc:172
-#: plugins/admin/systems/class_servGeneric.inc:142
-#: plugins/admin/systems/class_workstationGeneric.inc:162
-#: plugins/admin/ogroups/class_termgroup.inc:104
-msgid "Wake up"
-msgstr "Вернуть в обычный режим"
+#: plugins/admin/systems/class_printerPPDDialog.inc:146
+#, fuzzy, php-format
+msgid "Can't save file '%s'."
+msgstr "Удалить"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:269
-msgid "You have no permissions to create a terminal on this 'Base'."
-msgstr "У вас недостаточно прав для создания терминала в этой ветке."
+#: plugins/admin/systems/class_printerPPDDialog.inc:163
+#: plugins/admin/systems/class_printerPPDDialog.inc:166
+#, fuzzy
+msgid "Please specify a valid ppd file."
+msgstr "Введите корректное имя пользователя!"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:273
-msgid "The required field 'Terminal name' is not set."
-msgstr "Обязательное поле 'Название терминала' не заполнено."
+#: plugins/admin/systems/class_printerPPDDialog.inc:190
+#, fuzzy
+msgid "Please select a valid ppd."
+msgstr "Введите корректный серийный номер"
 
-#: plugins/admin/systems/printerPPDDialog.tpl:1
+#: plugins/admin/systems/class_printerPPDDialog.inc:369
+#: plugins/admin/systems/class_printerPPDDialog.inc:372
 #, fuzzy
-msgid "Printer driver"
-msgstr "Устройство печати"
+msgid "True"
+msgstr "Улица"
 
-#: plugins/admin/systems/printerPPDDialog.tpl:6
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
+#: plugins/admin/systems/class_printerPPDDialog.inc:370
+#: plugins/admin/systems/class_printerPPDDialog.inc:373
 #, fuzzy
-msgid "Select"
-msgstr "Удалить"
+msgid "False"
+msgstr "женский"
 
-#: plugins/admin/systems/printerPPDDialog.tpl:9
+#: plugins/admin/systems/class_printerPPDDialog.inc:378
+#, php-format
+msgid "Unsupported ppd type '%s' used for '%s' "
+msgstr ""
+
+#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
+msgid "Server name"
+msgstr "Имя сервера"
+
+#: plugins/admin/systems/server.tpl:15 plugins/admin/systems/terminal.tpl:20
+#: plugins/admin/systems/workstation.tpl:29
+#: plugins/admin/systems/component.tpl:15 plugins/admin/systems/phone.tpl:15
+#: plugins/admin/systems/printer.tpl:22
+#: plugins/admin/systems/wingeneric.tpl:15
+msgid "Choose subtree to place terminal in"
+msgstr "Выберите ветку терминала"
+
+#: plugins/admin/systems/server.tpl:39 plugins/admin/systems/terminal.tpl:100
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
+#: plugins/admin/systems/workstation.tpl:79
+#: plugins/admin/systems/class_baseSelectDialog.inc:45
+#: plugins/admin/ogroups/termgroup.tpl:3
+msgid "Action"
+msgstr "Действие"
+
+#: plugins/admin/systems/server.tpl:43
 #, fuzzy
-msgid "New driver"
-msgstr "Сервер"
+msgid "Select action to execute for this server"
+msgstr "Выберите действие, которое нужно выполнить на этом терминале"
 
 #: plugins/admin/systems/workstationStartup.tpl:4
 #: plugins/admin/systems/terminalStartup.tpl:1
@@ -7841,24 +7886,98 @@ msgstr ""
 msgid "Mountpoint"
 msgstr "Мониторинг"
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
-msgstr "Название"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:6
+#, fuzzy
+msgid "List of devices"
+msgstr "Список пользователей"
 
-#: plugins/admin/systems/class_servGeneric.inc:52
+#: plugins/admin/systems/glpiDeviceManagement.tpl:23
+msgid ""
+"This dialog allows you to attach a device to your currently edited computer."
+msgstr ""
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:35
 #, fuzzy
-msgid "This 'dn' has no server features."
-msgstr "Этот DN не имеет свойств принтера."
+msgid "Display devices matching"
+msgstr "Показать подходяшие адреса"
 
-#: plugins/admin/systems/class_servGeneric.inc:191
+#: plugins/admin/systems/glpiDeviceManagement.tpl:37
 #, fuzzy
-msgid "The required field 'Server name' is not set."
-msgstr "Обязательное поле \"Личное имя\" не заполнено."
+msgid "Regular expression for matching device names"
+msgstr "Регулярное выражение, соответствующее именам пользователей"
 
-#: plugins/admin/systems/class_servGeneric.inc:198
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
+#: plugins/admin/systems/class_glpiAccount.inc:144
+msgid "There is no server with valid glpi database service."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
+#: plugins/admin/systems/class_glpiAccount.inc:154
 #, fuzzy
-msgid "You have no permissions to create a server on this 'Base'."
-msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
+msgid "Can't connect to glpi database, the php-mysql extension is missing."
+msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
+#: plugins/admin/systems/class_glpiAccount.inc:164
+#, fuzzy
+msgid "Can't connect to glpi database, check configuration twice."
+msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
+#: plugins/admin/systems/class_glpiAccount.inc:564
+#, fuzzy
+msgid "Remove inventory"
+msgstr "Удалить объект"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
+#, fuzzy
+msgid ""
+"This server has inventory features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
+"ниже."
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
+#: plugins/admin/systems/class_glpiAccount.inc:567
+#, fuzzy
+msgid "Add inventory"
+msgstr "Добавить объект"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
+#, fuzzy
+msgid ""
+"This server has inventory features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+"ниже."
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
+#, php-format
+msgid ""
+"Can't rename given printer type to '%s', because this type name already "
+"exists."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
+#, php-format
+msgid "Can't delete printer type, it is still in use by '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:609
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:623
+#: plugins/admin/systems/class_glpiAccount.inc:631
+#: plugins/admin/systems/class_glpiAccount.inc:645
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:288
+msgid "N/A"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:750
+#, fuzzy
+msgid "since"
+msgstr "Работает с"
 
 #: plugins/admin/systems/terminal.tpl:9
 msgid "Terminal template"
@@ -7920,129 +8039,62 @@ msgstr "Выберите сервер для синхронизации врем
 msgid "Select action to execute for this terminal"
 msgstr "Выберите действие, которое нужно выполнить на этом терминале"
 
-#: plugins/admin/systems/class_servDHCP.inc:36
-msgid "Remove DHCP service"
-msgstr "Удалить сервис DHCP"
-
-#: plugins/admin/systems/class_servDHCP.inc:37
-#, fuzzy
-msgid ""
-"This server has DHCP features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
-"ниже."
-
-#: plugins/admin/systems/class_servDHCP.inc:39
-msgid "Add DHCP service"
-msgstr "Добавить сервис DHCP"
-
-#: plugins/admin/systems/class_servDHCP.inc:40
-#, fuzzy
-msgid ""
-"This server has DHCP features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
-
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
-msgstr "Выбрать объекты для добавления"
+#: plugins/admin/systems/class_servDB.inc:135
+#: plugins/admin/systems/class_servDB.inc:144
+#: plugins/admin/systems/class_servDB.inc:161
+#: plugins/admin/systems/class_servDB.inc:171
+#: plugins/admin/systems/class_servDB.inc:176
+#: plugins/admin/systems/class_servDB.inc:182
+#, fuzzy, php-format
+msgid "The attribute '%s' is empty or contains invalid characters."
+msgstr "Неправильное указание таймаута '%s'"
 
-#: plugins/admin/systems/class_glpiAccount.inc:144
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
-msgid "There is no server with valid glpi database service."
+#: plugins/admin/systems/class_servDB.inc:151
+#, php-format
+msgid "The imap connect string needs to be in the form '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:154
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
-#, fuzzy
-msgid "Can't connect to glpi database, the php-mysql extension is missing."
-msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
-
-#: plugins/admin/systems/class_glpiAccount.inc:164
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
-#, fuzzy
-msgid "Can't connect to glpi database, check configuration twice."
-msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
-
-#: plugins/admin/systems/class_glpiAccount.inc:178
-#: plugins/admin/systems/class_glpiAccount.inc:184
-#: plugins/admin/systems/class_glpiAccount.inc:190
-msgid "This feature is not implemented yet."
+#: plugins/admin/systems/class_servDB.inc:155
+msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:292
-msgid "Adding new sytem type failed, this system type name is already used."
-msgstr ""
+#: plugins/admin/systems/class_servDB.inc:166
+#, fuzzy, php-format
+msgid "The specified kerberos password is empty."
+msgstr "Значение поля \"Файлы\" некорректно."
 
-#: plugins/admin/systems/class_glpiAccount.inc:312
-#, php-format
-msgid ""
-"You can't delete this system type, it is still in use by these system(s) '%s'"
+#: plugins/admin/systems/class_servDB.inc:190
+#, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:323
-#, fuzzy
-msgid "Rename failed, this system type name is already used."
-msgstr "Указанное имя уже используется."
-
-#: plugins/admin/systems/class_glpiAccount.inc:379
-#, fuzzy
-msgid "Adding new operating system failed, specifed name is already used."
-msgstr "Группа с таким именем уже существует."
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
+#, fuzzy, php-format
+msgid "You're about to delete the glpi cartridge type '%s'."
+msgstr "Вы собираетесь удалить приложение \"%s\"."
 
-#: plugins/admin/systems/class_glpiAccount.inc:401
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:116
 #, php-format
 msgid ""
-"You can't delete this operating system, it is still in use by these system"
-"(s) '%s'"
+"You can't delete this cartridge type, it is still in use by this printer(s) "
+"'%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:413
-#, fuzzy
-msgid "Updating operating system failed, specifed name is already used."
-msgstr "Группа с таким именем уже существует."
-
-#: plugins/admin/systems/class_glpiAccount.inc:564
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
-#, fuzzy
-msgid "Remove inventory"
-msgstr "Удалить объект"
-
-#: plugins/admin/systems/class_glpiAccount.inc:565
-#, fuzzy
-msgid ""
-"This device has inventory informations enabled. You can disable them by "
-"clicking below."
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
+msgid "Cartridges"
 msgstr ""
-"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
-"ниже."
 
-#: plugins/admin/systems/class_glpiAccount.inc:567
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
 #, fuzzy
-msgid "Add inventory"
-msgstr "Добавить объект"
+msgid "New monitor"
+msgstr "Новый пароль"
 
-#: plugins/admin/systems/class_glpiAccount.inc:568
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
 #, fuzzy
-msgid ""
-"This device has inventory informations disabled. You can enable them by "
-"clicking below."
-msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
-
-#: plugins/admin/systems/class_glpiAccount.inc:631
-#: plugins/admin/systems/class_glpiAccount.inc:645
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:609
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:623
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:288
-msgid "N/A"
-msgstr ""
+msgid "M"
+msgstr "Мб"
 
 #: plugins/admin/systems/class_workstationGeneric.inc:70
 #, fuzzy
@@ -8064,10 +8116,38 @@ msgstr "Системные журналы"
 msgid "No ACTIONCMD definition found in your gosa.conf"
 msgstr "Определение HALTCMD в вашем файле gosa.conf не найдено"
 
+#: plugins/admin/systems/class_workstationGeneric.inc:104
+#: plugins/admin/systems/class_terminalGeneric.inc:94
+#: plugins/admin/systems/class_terminalGeneric.inc:106
+#: plugins/admin/systems/class_terminalGeneric.inc:118
+#: plugins/admin/systems/class_servGeneric.inc:66
+#: plugins/admin/systems/class_servGeneric.inc:78
+#: plugins/admin/systems/class_servGeneric.inc:90
+#: plugins/admin/ogroups/class_termgroup.inc:68
+#: plugins/admin/ogroups/class_termgroup.inc:80
+#: plugins/admin/ogroups/class_termgroup.inc:92
+#, php-format
+msgid "Execution of '%s' failed!"
+msgstr "Ошибка при выполнении \"%s\"!"
+
 #: plugins/admin/systems/class_workstationGeneric.inc:114
 msgid "This 'dn' has no workstation features."
 msgstr "Это DN не содержит атрибутоов рабочей станции."
 
+#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/systems/class_terminalGeneric.inc:170
+#: plugins/admin/systems/class_servGeneric.inc:140
+#: plugins/admin/ogroups/class_termgroup.inc:104
+msgid "Switch off"
+msgstr "Выключить"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/systems/class_terminalGeneric.inc:170
+#: plugins/admin/systems/class_servGeneric.inc:140
+#: plugins/admin/ogroups/class_termgroup.inc:104
+msgid "Reboot"
+msgstr "Перезагрузить"
+
 #: plugins/admin/systems/class_workstationGeneric.inc:157
 #, fuzzy
 msgid "Instant update"
@@ -8089,6 +8169,13 @@ msgstr ""
 msgid "Rescan hardware"
 msgstr "Телефонное оборудование"
 
+#: plugins/admin/systems/class_workstationGeneric.inc:162
+#: plugins/admin/systems/class_terminalGeneric.inc:172
+#: plugins/admin/systems/class_servGeneric.inc:142
+#: plugins/admin/ogroups/class_termgroup.inc:104
+msgid "Wake up"
+msgstr "Вернуть в обычный режим"
+
 #: plugins/admin/systems/class_workstationGeneric.inc:228
 msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr "У вас недостаточно прав для создания рабочей станции в этой ветке."
@@ -8097,1970 +8184,2083 @@ msgstr "У вас недостаточно прав для создания ра
 msgid "The required field 'Workstation name' is not set."
 msgstr "Обязательное поле 'Название рабочей станции' не заполнено."
 
-#: plugins/admin/systems/class_systemManagement.inc:32
-msgid "Systems"
-msgstr "Системы"
-
-#: plugins/admin/systems/class_systemManagement.inc:429
-msgid "You can't edit this object type yet!"
-msgstr "Вы не можете редактировать сейчас этот тип объекта!"
-
-#: plugins/admin/systems/class_systemManagement.inc:455
-msgid "Passwords entered as new and repeated do not match!"
-msgstr "Введенные пароли не совпадают!"
-
-#: plugins/admin/systems/class_systemManagement.inc:472
-msgid "You are not allowed to set this systems password!"
-msgstr "У вас недостаточно прав для смены пароля этой системы!"
-
-#: plugins/admin/systems/class_systemManagement.inc:526
-#, fuzzy, php-format
-msgid "You're about to delete all information about the component at '%s'."
-msgstr "Вы собираетесь удалить всю информацию о терминале (\"%s\")."
-
-#: plugins/admin/systems/class_systemManagement.inc:760
-#, fuzzy
-msgid "New Terminal template"
-msgstr "Шаблон терминала"
-
-#: plugins/admin/systems/class_systemManagement.inc:760
-#: plugins/admin/systems/class_systemManagement.inc:924
-#, fuzzy
-msgid "New Terminal"
-msgstr "Создать терминал"
-
-#: plugins/admin/systems/class_systemManagement.inc:762
-#, fuzzy
-msgid "New Workstation template"
-msgstr "Шаблон рабочей станции"
-
-#: plugins/admin/systems/class_systemManagement.inc:762
-#: plugins/admin/systems/class_systemManagement.inc:925
-#, fuzzy
-msgid "New Workstation"
-msgstr "Новая рабочая станция"
-
-#: plugins/admin/systems/class_systemManagement.inc:763
-#: plugins/admin/systems/class_systemManagement.inc:764
-#, fuzzy
-msgid "New Server"
-msgstr "Сервер"
-
-#: plugins/admin/systems/class_systemManagement.inc:765
-#: plugins/admin/systems/class_systemManagement.inc:766
-#, fuzzy
-msgid "New Printer"
-msgstr "Принтер"
-
-#: plugins/admin/systems/class_systemManagement.inc:767
-#: plugins/admin/systems/class_systemManagement.inc:768
-#, fuzzy
-msgid "New Phone"
-msgstr "Телефон"
-
-#: plugins/admin/systems/class_systemManagement.inc:769
-#: plugins/admin/systems/class_systemManagement.inc:770
-#, fuzzy
-msgid "New Component"
-msgstr "Прочие сетевые компоненты"
-
-#: plugins/admin/systems/class_systemManagement.inc:780
-#, fuzzy
-msgid "Edit system"
-msgstr "Список систем"
-
-#: plugins/admin/systems/class_systemManagement.inc:781
-#, fuzzy
-msgid "Delete system"
-msgstr "Удалить"
-
-#: plugins/admin/systems/class_systemManagement.inc:791
-#, fuzzy
-msgid "System"
-msgstr "Системы"
-
-#: plugins/admin/systems/class_systemManagement.inc:829
-#, fuzzy
-msgid "Cups Server"
-msgstr "Сервер"
-
-#: plugins/admin/systems/class_systemManagement.inc:830
-msgid "Log Db"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:831
-#, fuzzy
-msgid "Syslog Server"
-msgstr "Сервер системных журналов"
-
-#: plugins/admin/systems/class_systemManagement.inc:832
-#, fuzzy
-msgid "Mail Server"
-msgstr "Сервер"
-
-#: plugins/admin/systems/class_systemManagement.inc:833
-#, fuzzy
-msgid "Imap Server"
-msgstr "Сервер подкачки"
-
-#: plugins/admin/systems/class_systemManagement.inc:834
-#, fuzzy
-msgid "Nfs Server"
-msgstr "Сервер"
-
-#: plugins/admin/systems/class_systemManagement.inc:835
-#, fuzzy
-msgid "Kerberos Server"
-msgstr "Kerberos"
-
-#: plugins/admin/systems/class_systemManagement.inc:836
-#, fuzzy
-msgid "Asterisk Server"
-msgstr "Терминальный сервер"
-
-#: plugins/admin/systems/class_systemManagement.inc:837
-#, fuzzy
-msgid "Fax Server"
-msgstr "Сервер"
-
-#: plugins/admin/systems/class_systemManagement.inc:838
-#, fuzzy
-msgid "Ldap Server"
-msgstr "Сервер подкачки"
-
-#: plugins/admin/systems/class_systemManagement.inc:871
-#, fuzzy
-msgid "Set root password"
-msgstr "Изменить пароль"
-
-#: plugins/admin/systems/class_systemManagement.inc:916
-#, fuzzy
-msgid "New System from incoming"
-msgstr "Системная информация"
-
-#: plugins/admin/systems/class_systemManagement.inc:918
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:589
-#, fuzzy
-msgid "Terminal"
-msgstr "Терминалы"
-
-#: plugins/admin/systems/class_systemManagement.inc:919
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:588
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
-msgstr "Рабочая станция"
+#: plugins/admin/systems/class_workstationGeneric.inc:245
+#: plugins/admin/systems/class_componentGeneric.inc:155
+#: plugins/admin/systems/class_winGeneric.inc:172
+#: plugins/admin/systems/class_terminalGeneric.inc:286
+#: plugins/admin/systems/class_servGeneric.inc:209
+#: plugins/admin/systems/class_printGeneric.inc:529
+#: plugins/admin/systems/class_phoneGeneric.inc:314
+#, php-format
+msgid "There is already an entry '%s' in the base choosen by you"
+msgstr "В выбранной вами ветке уже есть запись \"%s\""
 
-#: plugins/admin/systems/class_systemManagement.inc:922
+#: plugins/admin/systems/servdns.tpl:1
 #, fuzzy
-msgid "Winstation"
-msgstr "Рабочая станция"
+msgid "Zones"
+msgstr "телефоны"
 
-#: plugins/admin/systems/class_systemManagement.inc:923
-#, fuzzy
-msgid "Network Device"
-msgstr "Сетевые устройства"
+#: plugins/admin/systems/workstation.tpl:9
+msgid "Workstation template"
+msgstr "Шаблон рабочей станции"
 
-#: plugins/admin/systems/class_systemManagement.inc:1146
-msgid "New terminal"
-msgstr "Создать терминал"
+#: plugins/admin/systems/workstation.tpl:11
+msgid "Workstation name"
+msgstr "Имя рабочий станции"
 
-#: plugins/admin/systems/class_systemManagement.inc:1148
-msgid "New workstation"
-msgstr "Новая рабочая станция"
+#: plugins/admin/systems/class_servNfs.inc:35
+msgid ""
+"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1150
+#: plugins/admin/systems/class_servNfs.inc:38
 #, fuzzy
-msgid "New Device"
-msgstr "Сетевые устройства"
+msgid "Can't read '/etc/gosa/encodings', please check permissions."
+msgstr "Удалить"
 
-#: plugins/admin/systems/class_systemManagement.inc:1167
+#: plugins/admin/systems/class_servNfs.inc:125
 #, fuzzy
-msgid "Terminal template for"
-msgstr "Шаблон терминала"
-
-#: plugins/admin/systems/class_systemManagement.inc:1179
-msgid "Workstation template for"
-msgstr "Шаблон рабочей станции для"
+msgid "Please specify a valid path for your setup."
+msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/printer.tpl:6
+#: plugins/admin/systems/class_servNfs.inc:131
 #, fuzzy
-msgid "General"
-msgstr "Общее"
-
-#: plugins/admin/systems/printer.tpl:9
-msgid "Printer name"
-msgstr "Имя принтера"
-
-#: plugins/admin/systems/printer.tpl:31
-msgid "Details"
-msgstr ""
+msgid "Please specify a valid name for your setup."
+msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/printer.tpl:34
+#: plugins/admin/systems/class_servNfs.inc:134
 #, fuzzy
-msgid "Printer location"
-msgstr "Настройки телефона"
+msgid "Please specify a name for your setup."
+msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/printer.tpl:38
-msgid "Printer URL"
-msgstr "URL принтера"
+#: plugins/admin/systems/class_servNfs.inc:139
+#, fuzzy
+msgid "Description contains invalid characters."
+msgstr "Неправильное указание таймаута '%s'"
 
-#: plugins/admin/systems/printer.tpl:58
+#: plugins/admin/systems/class_servNfs.inc:143
 #, fuzzy
-msgid "Permissions"
-msgstr "Права для членов группы"
+msgid "Path contains invalid characters."
+msgstr "Значение поля \"Имя\" содержит недопустимые символы."
 
-#: plugins/admin/systems/printer.tpl:65
+#: plugins/admin/systems/class_servNfs.inc:147
 #, fuzzy
-msgid "Users which are allowed to use this printer"
-msgstr "У вас недостаточно прав для удаления этого объекта!"
+msgid "Option contains invalid characters."
+msgstr "Неправильное указание таймаута '%s'"
 
-#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
+#: plugins/admin/systems/servnfs.tpl:1
 #, fuzzy
-msgid "Add user"
+msgid "Edit share"
 msgstr "Пользователи домена"
 
-#: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
-#, fuzzy
-msgid "Add group"
-msgstr "группы"
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
+msgstr ""
 
-#: plugins/admin/systems/printer.tpl:81
+#: plugins/admin/systems/servnfs.tpl:25
+msgid "Path"
+msgstr ""
+
+#: plugins/admin/systems/servnfs.tpl:49
 #, fuzzy
-msgid "Users which are allowed to administrate this printer"
-msgstr "У вас недостаточно прав для удаления этого объекта!"
+msgid "Codepage"
+msgstr "Домашняя страница"
 
-#: plugins/admin/systems/printer.tpl:82
+#: plugins/admin/systems/servnfs.tpl:59
 #, fuzzy
-msgid "Admins"
-msgstr "DN администратора"
+msgid "Option"
+msgstr "Параметры"
 
-#: plugins/admin/systems/class_servDNS.inc:181
-#: plugins/admin/systems/class_inventory.inc:36
-msgid "Remove DNS service"
-msgstr "Удалить сервис DNS"
+#: plugins/admin/systems/class_servKolab.inc:115
+#, fuzzy
+msgid "Remove Kolab extension"
+msgstr "Удалить параметры"
 
-#: plugins/admin/systems/class_servDNS.inc:182
-#: plugins/admin/systems/class_inventory.inc:37
+#: plugins/admin/systems/class_servKolab.inc:115
 #, fuzzy
 msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
+"This server has kolab features enabled. You can disable them by clicking "
+"below."
 msgstr ""
 "В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_servDNS.inc:184
-#: plugins/admin/systems/class_inventory.inc:39
-msgid "Add DNS service"
+#: plugins/admin/systems/class_servKolab.inc:118
+#, fuzzy
+msgid "Add Kolab service"
 msgstr "Добавить сервис DNS"
 
-#: plugins/admin/systems/class_servDNS.inc:185
-#: plugins/admin/systems/class_inventory.inc:40
+#: plugins/admin/systems/class_servKolab.inc:118
 #, fuzzy
 msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
+"This server has kolab features disabled. You can enable them by clicking "
+"below."
 msgstr ""
 "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_servDNS.inc:270
+#: plugins/admin/systems/class_servKolab.inc:146
 #, php-format
-msgid ""
-"Can't delete the selected zone, because it is still in use by these entry/"
-"entries '%s'"
+msgid "Include data from %s days in the past when creating free/busy lists"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:297
-#, fuzzy
-msgid "Reverse zone"
-msgstr "Ссылки"
+#: plugins/admin/systems/class_servKolab.inc:152
+#, php-format
+msgid "Warn users when using more than %s%% of their mail quota"
+msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:135
-#: plugins/admin/systems/class_servDB.inc:144
-#: plugins/admin/systems/class_servDB.inc:161
-#: plugins/admin/systems/class_servDB.inc:171
-#: plugins/admin/systems/class_servDB.inc:176
-#: plugins/admin/systems/class_servDB.inc:182
-#, fuzzy, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
-msgstr "Неправильное указание таймаута '%s'"
+#: plugins/admin/systems/class_servKolab.inc:227
+msgid "Future days in Free/Busy settings must be set."
+msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:151
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
+#: plugins/admin/systems/class_servKolab.inc:229
+msgid "Future days in Free/Busy settings must be a positive value."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:155
-msgid "The sieve port needs to be numeric."
+#: plugins/admin/systems/class_servKolab.inc:233
+msgid "The given Quota settings value must be a number."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:166
-#, fuzzy, php-format
-msgid "The specified kerberos password is empty."
-msgstr "Значение поля \"Файлы\" некорректно."
+#: plugins/admin/systems/class_servKolab.inc:235
+msgid "Please choose a value between 1 and 100 for Quota settings."
+msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:190
-#, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
+#: plugins/admin/systems/class_servKolab.inc:237
+msgid "Future days must be a value."
 msgstr ""
 
-#: plugins/admin/systems/servdns.tpl:1
+#: plugins/admin/systems/class_servKolab.inc:241
+msgid "No SMTP privileged networks set."
+msgstr ""
+
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
+msgstr "Удаленная рабочая станция"
+
+#: plugins/admin/systems/terminalService.tpl:145
+msgid "Connect method"
+msgstr "Способ подключения"
+
+#: plugins/admin/systems/terminalService.tpl:147
+msgid "Choose method to connect to terminal server"
+msgstr "Выберите способ подключения к серверу терминалов"
+
+#: plugins/admin/systems/terminalService.tpl:154
+msgid "Terminal server"
+msgstr "Терминал-сервер"
+
+#: plugins/admin/systems/terminalService.tpl:156
+msgid "Select specific terminal server to use"
+msgstr "Выберите сервер терминалов"
+
+#: plugins/admin/systems/terminalService.tpl:163
+msgid "Font server"
+msgstr "Сервер шрифтов"
+
+#: plugins/admin/systems/terminalService.tpl:165
+msgid "Select specific font server to use"
+msgstr "Выберите сервер шрифтов"
+
+#: plugins/admin/systems/terminalService.tpl:181
+msgid "Print device"
+msgstr "Устройство печати"
+
+#: plugins/admin/systems/terminalService.tpl:182
+msgid "Select to start IPP based printing service on terminal"
+msgstr "Выберите, чтобы запустить на терминале службу печати по протоколу IPP"
+
+#: plugins/admin/systems/terminalService.tpl:183
+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 для хранения временных файлов"
+
+#: plugins/admin/systems/terminalService.tpl:212
+msgid "Select scanner driver to use"
+msgstr "Выберите драйвер для используемого сканера"
+
+#: plugins/admin/systems/class_componentGeneric.inc:50
+#: plugins/admin/systems/class_winGeneric.inc:73
 #, fuzzy
-msgid "Zones"
-msgstr "телефоны"
+msgid "This 'dn' has no network features."
+msgstr "Этот DN не имеет свойств принтера."
 
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
-msgstr "Шаблон рабочей станции"
+#: plugins/admin/systems/class_componentGeneric.inc:138
+#, fuzzy
+msgid "The required field 'Component name' is not set."
+msgstr "Обязательное поле \"Личное имя\" не заполнено."
 
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
-msgstr "Имя рабочий станции"
+#: plugins/admin/systems/class_componentGeneric.inc:145
+#: plugins/admin/systems/class_winGeneric.inc:162
+#, fuzzy
+msgid "You have no permissions to create a component on this 'Base'."
+msgstr "У вас недостаточно прав для создания телефонов в этой ветке."
 
-#: plugins/admin/systems/class_servNfs.inc:35
-msgid ""
-"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+#: plugins/admin/systems/terminalStartup.tpl:35
+msgid "Select if terminal supports graphical startup with progress bar"
 msgstr ""
+"Выберите, должен ли терминал подерживать загрузку в графическом режиме с "
+"показом индикатора состояния"
 
-#: plugins/admin/systems/class_servNfs.inc:38
-#, fuzzy
-msgid "Can't read '/etc/gosa/encodings', please check permissions."
-msgstr "Удалить"
+#: plugins/admin/systems/terminalStartup.tpl:36
+msgid "use graphical bootup"
+msgstr "Загружать в графическом режиме"
 
-#: plugins/admin/systems/class_servNfs.inc:125
-#, fuzzy
-msgid "Please specify a valid path for your setup."
-msgstr "Укажите корректный номер телефона."
+#: plugins/admin/systems/terminalStartup.tpl:38
+msgid "Select if terminal should boot in text mode"
+msgstr "Выберите, должен ли терминал загружаться в текстовом режиме"
 
-#: plugins/admin/systems/class_servNfs.inc:131
-#, fuzzy
-msgid "Please specify a valid name for your setup."
-msgstr "Укажите корректный номер телефона."
+#: plugins/admin/systems/terminalStartup.tpl:39
+msgid "use standard linux textual bootup"
+msgstr "Загружать в стандартном текстовом режиме"
 
-#: plugins/admin/systems/class_servNfs.inc:134
-#, fuzzy
-msgid "Please specify a name for your setup."
-msgstr "Укажите корректный номер телефона."
+#: plugins/admin/systems/terminalStartup.tpl:41
+msgid "Select to get more verbose output during startup"
+msgstr ""
+"Выберите, нужно ли использовать подробный вывод информации при загрузке"
 
-#: plugins/admin/systems/class_servNfs.inc:139
-#, fuzzy
-msgid "Description contains invalid characters."
-msgstr "Неправильное указание таймаута '%s'"
+#: plugins/admin/systems/terminalStartup.tpl:42
+msgid "use debug mode for startup"
+msgstr "Используйте отладочный режим"
 
-#: plugins/admin/systems/class_servNfs.inc:143
-#, fuzzy
-msgid "Path contains invalid characters."
-msgstr "Значение поля \"Имя\" содержит недопустимые символы."
+#: plugins/admin/systems/class_glpiAccount.inc:178
+#: plugins/admin/systems/class_glpiAccount.inc:184
+#: plugins/admin/systems/class_glpiAccount.inc:190
+msgid "This feature is not implemented yet."
+msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:147
-#, fuzzy
-msgid "Option contains invalid characters."
-msgstr "Неправильное указание таймаута '%s'"
+#: plugins/admin/systems/class_glpiAccount.inc:292
+msgid "Adding new sytem type failed, this system type name is already used."
+msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:6
-msgid "Kerberos kadmin access"
+#: plugins/admin/systems/class_glpiAccount.inc:312
+#, php-format
+msgid ""
+"You can't delete this system type, it is still in use by these system(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:10
+#: plugins/admin/systems/class_glpiAccount.inc:323
 #, fuzzy
-msgid "Kerberos Realm"
-msgstr "Kerberos"
+msgid "Rename failed, this system type name is already used."
+msgstr "Указанное имя уже используется."
 
-#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
+#: plugins/admin/systems/class_glpiAccount.inc:379
 #, fuzzy
-msgid "Admin user"
-msgstr "Пользователи домена"
+msgid "Adding new operating system failed, specifed name is already used."
+msgstr "Группа с таким именем уже существует."
 
-#: plugins/admin/systems/servdb.tpl:26
-#, fuzzy
-msgid "FAX database"
-msgstr "Базы данных"
+#: plugins/admin/systems/class_glpiAccount.inc:401
+#, php-format
+msgid ""
+"You can't delete this operating system, it is still in use by these system"
+"(s) '%s'"
+msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:30
+#: plugins/admin/systems/class_glpiAccount.inc:413
 #, fuzzy
-msgid "FAX DB user"
-msgstr "Показать пользователей факсов"
+msgid "Updating operating system failed, specifed name is already used."
+msgstr "Группа с таким именем уже существует."
 
-#: plugins/admin/systems/servdb.tpl:42
+#: plugins/admin/systems/class_glpiAccount.inc:565
 #, fuzzy
-msgid "Asterisk management"
-msgstr "Управление системами"
-
-#: plugins/admin/systems/servdb.tpl:46
-msgid "Asterisk DB user"
-msgstr ""
-
-#: plugins/admin/systems/servdb.tpl:54
-msgid "Country dial prefix"
+msgid ""
+"This device has inventory informations enabled. You can disable them by "
+"clicking below."
 msgstr ""
+"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
+"ниже."
 
-#: plugins/admin/systems/servdb.tpl:58
-msgid "Local dial prefix"
+#: plugins/admin/systems/class_glpiAccount.inc:568
+#, fuzzy
+msgid ""
+"This device has inventory informations disabled. You can enable them by "
+"clicking below."
 msgstr ""
+"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+"ниже."
 
-#: plugins/admin/systems/servdb.tpl:70
-msgid "IMAP admin access"
-msgstr ""
+#: plugins/admin/systems/glpiManufacturer.tpl:1
+#, fuzzy
+msgid "Manage manufacturers"
+msgstr "Редактиовать объект"
 
-#: plugins/admin/systems/servdb.tpl:74
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
 #, fuzzy
-msgid "Server identifier"
-msgstr "Номер дома"
+msgid "Attachment"
+msgstr "подразделения"
 
-#: plugins/admin/systems/servdb.tpl:78
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
 #, fuzzy
-msgid "Connect URL"
-msgstr "Подключение"
+msgid "Filename"
+msgstr "Имя сервера"
 
-#: plugins/admin/systems/servdb.tpl:91
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
 #, fuzzy
-msgid "Sieve port"
-msgstr "Сервер"
+msgid "Mime-type"
+msgstr "Тип"
 
-#: plugins/admin/systems/servdb.tpl:100
+#: plugins/admin/systems/class_termDNS.inc:313
 #, fuzzy
-msgid "Logging database"
-msgstr "база пользователя"
+msgid "The required field 'IP-address' is not set."
+msgstr "Обязательное поле \"Основной адрес\" не заполнено."
 
-#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
-msgid "Logging DB user"
+#: plugins/admin/systems/class_termDNS.inc:319
+msgid "Wrong IP format in field IP-address."
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:119
-#, fuzzy
-msgid "Glpi database"
-msgstr "Базы данных"
-
-#: plugins/admin/systems/servdb.tpl:133
+#: plugins/admin/systems/class_termDNS.inc:325
 #, fuzzy
-msgid "Database"
-msgstr "Базы данных"
+msgid "The required field 'MAC-address' is not set."
+msgstr "Обязательное поле \"Основной адрес\" не заполнено."
 
-#: plugins/admin/systems/servnfs.tpl:1
-#, fuzzy
-msgid "Edit share"
-msgstr "Пользователи домена"
+#: plugins/admin/systems/class_termDNS.inc:331
+msgid ""
+"The given macaddress is invalid. There must be 6 1byte segments seperated by "
+"':'."
+msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:2
-msgid "NFS setup"
+#: plugins/admin/systems/class_termDNS.inc:346
+#, php-format
+msgid "Found duplicate value for record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:25
-msgid "Path"
+#: plugins/admin/systems/class_termDNS.inc:352
+#, php-format
+msgid "Found more than one entry for the uniqe record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:49
-#, fuzzy
-msgid "Codepage"
-msgstr "Домашняя страница"
+#: plugins/admin/systems/class_termDNS.inc:360
+#, php-format
+msgid ""
+"The device IP '%s' is added as 'A Record', this will be done automatically, "
+"please remove the record."
+msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:59
-#, fuzzy
-msgid "Option"
-msgstr "Параметры"
+#: plugins/admin/systems/class_termDNS.inc:366
+#: plugins/admin/systems/class_servDNSeditZone.inc:386
+#, php-format
+msgid "Only lowercase is allowed, please check your '%ss'."
+msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:115
+#: plugins/admin/systems/class_servRepository.inc:97
 #, fuzzy
-msgid "Remove Kolab extension"
+msgid "Remove FAI repository extension."
 msgstr "Удалить параметры"
 
-#: plugins/admin/systems/class_servKolab.inc:115
+#: plugins/admin/systems/class_servRepository.inc:98
 #, fuzzy
 msgid ""
-"This server has kolab features enabled. You can disable them by clicking "
-"below."
+"This server has FAI repository features enabled. You can disable them by "
+"clicking below."
 msgstr ""
 "В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_servKolab.inc:118
-#, fuzzy
-msgid "Add Kolab service"
-msgstr "Добавить сервис DNS"
+#: plugins/admin/systems/class_servRepository.inc:100
+msgid "Add FAI repository extension."
+msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:118
+#: plugins/admin/systems/class_servRepository.inc:101
 #, fuzzy
 msgid ""
-"This server has kolab features disabled. You can enable them by clicking "
-"below."
+"This server has FAI repository features disabled. You can enable them by "
+"clicking below."
 msgstr ""
 "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_servKolab.inc:146
+#: plugins/admin/systems/class_servRepository.inc:144
 #, php-format
-msgid "Include data from %s days in the past when creating free/busy lists"
+msgid ""
+"You can't delete this release, it is still used by these workstations [%s]. "
+"Please solve this dependencies first, to keep data base consistency."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:152
+#: plugins/admin/systems/class_servRepository.inc:176
 #, php-format
-msgid "Warn users when using more than %s%% of their mail quota"
+msgid ""
+"Be careful editing this release, it is still used by these workstations [%s]."
+msgstr ""
+
+#: plugins/admin/systems/class_servRepository.inc:243
+#: plugins/admin/systems/class_servRepository.inc:264
+#: plugins/admin/systems/servRepositorySetup.tpl:33
+#, fuzzy
+msgid "Sections"
+msgstr "Действие"
+
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
+msgid "Can't delete this entry, it is still in use."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:227
-msgid "Future days in Free/Busy settings must be set."
-msgstr ""
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:305
+#, fuzzy
+msgid "The selected name is already in use."
+msgstr "Указанное имя уже используется."
+
+#: plugins/admin/systems/servRepository.tpl:6
+#, fuzzy
+msgid "List of configured repositories."
+msgstr "Список групп"
+
+#: plugins/admin/systems/servRepository.tpl:11
+#, fuzzy
+msgid "Add repository"
+msgstr "Повторить"
 
-#: plugins/admin/systems/class_servKolab.inc:229
-msgid "Future days in Free/Busy settings must be a positive value."
+#: plugins/admin/systems/servRepository.tpl:29
+msgid "This menu allows you to create, delete and edit repository settings."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:233
-msgid "The given Quota settings value must be a number."
-msgstr ""
+#: plugins/admin/systems/servdnseditzone.tpl:7
+#, fuzzy
+msgid "Zone name"
+msgstr "Название"
 
-#: plugins/admin/systems/class_servKolab.inc:235
-msgid "Please choose a value between 1 and 100 for Quota settings."
-msgstr ""
+#: plugins/admin/systems/servdnseditzone.tpl:13
+#, fuzzy
+msgid "Network address"
+msgstr "Сетевые устройства"
 
-#: plugins/admin/systems/class_servKolab.inc:237
-msgid "Future days must be a value."
-msgstr ""
+#: plugins/admin/systems/servdnseditzone.tpl:24
+#, fuzzy
+msgid "Zone entries"
+msgstr "Настройки телефона"
 
-#: plugins/admin/systems/class_servKolab.inc:241
-msgid "No SMTP privileged networks set."
-msgstr ""
+#: plugins/admin/systems/servdnseditzone.tpl:35
+#, fuzzy
+msgid "SOA record"
+msgstr "Каталог"
 
-#: plugins/admin/systems/class_printGeneric.inc:177
-#: plugins/admin/systems/class_printGeneric.inc:184
-#: plugins/admin/systems/class_printGeneric.inc:219
-#: plugins/admin/systems/class_printGeneric.inc:240
-#: plugins/admin/systems/class_printGeneric.inc:243
-msgid "Add printer extension"
-msgstr ""
+#: plugins/admin/systems/servdnseditzone.tpl:41
+#, fuzzy
+msgid "Primary dns server for this zone"
+msgstr "Основной адрес эл. почты для этой общей папки"
 
-#: plugins/admin/systems/class_printGeneric.inc:178
-msgid "This is a workstation template, printer tab is disabled."
+#: plugins/admin/systems/servdnseditzone.tpl:53
+msgid "Serial number (automatically incremented)"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:185
-msgid "This is a terminal template, printer tab is disabled."
-msgstr ""
+#: plugins/admin/systems/servdnseditzone.tpl:69
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: ihtml/themes/altlinux/setup_finish.tpl:31
+#: ihtml/themes/default/setup_finish.tpl:31
+#: ihtml/themes/lhs/setup_finish.tpl:31
+msgid "Retry"
+msgstr "Повторить"
 
-#: plugins/admin/systems/class_printGeneric.inc:220
+#: plugins/admin/systems/servdnseditzone.tpl:75
 #, fuzzy
-msgid ""
-"This workstation has printer extension disabled. You can't enable it while "
-"'cn' is not present in entry. Possibly you are currently creating a new "
-"terminal template"
-msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
+msgid "Expire"
+msgstr "Экспорт"
 
-#: plugins/admin/systems/class_printGeneric.inc:232
-#: plugins/admin/systems/class_printGeneric.inc:235
+#: plugins/admin/systems/servdnseditzone.tpl:96
 #, fuzzy
-msgid "Remove printer extension"
-msgstr "Удалить параметры"
+msgid "MxRecords"
+msgstr "Каталог"
 
-#: plugins/admin/systems/class_printGeneric.inc:233
+#: plugins/admin/systems/servdnseditzone.tpl:108
 #, fuzzy
-msgid ""
-"This workstation has printer extension enabled.You can disable it by "
-"clicking below."
-msgstr ""
-"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
-"ниже."
+msgid "Zone records"
+msgstr "Каталог"
 
-#: plugins/admin/systems/class_printGeneric.inc:236
+#: plugins/admin/systems/class_glpiSelectUser.inc:140
 #, fuzzy
+msgid "use"
+msgstr "Мышь"
+
+#: plugins/admin/systems/glpiSelectUser.tpl:23
 msgid ""
-"This terminal has printer extension enabled. You can disable it by clicking "
-"below."
+"This dialog allows you to select a user as technical responsible person."
 msgstr ""
-"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
-"ниже."
 
-#: plugins/admin/systems/class_printGeneric.inc:241
+#: plugins/admin/systems/glpi_devices.tpl:2
 #, fuzzy
-msgid ""
-"This workstation has printer extension disabled. You can enable it by "
-"clicking below."
-msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
+msgid "Add/Edit monitor"
+msgstr "Редактиовать объект"
 
-#: plugins/admin/systems/class_printGeneric.inc:244
+#: plugins/admin/systems/glpi_devices.tpl:17
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
 #, fuzzy
-msgid ""
-"This terminal has printer extension disabled. You can enable it by clicking "
-"below."
-msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
+msgid "Comments"
+msgstr "Контакт"
 
-#: plugins/admin/systems/class_printGeneric.inc:283
-msgid "This 'dn' has no printer features."
-msgstr "Этот DN не имеет свойств принтера."
+#: plugins/admin/systems/glpi_devices.tpl:33
+#, fuzzy
+msgid "Monitor size"
+msgstr "Мониторинг"
 
-#: plugins/admin/systems/class_printGeneric.inc:419
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
+#: plugins/admin/systems/glpi_devices.tpl:36
+#, fuzzy
+msgid "Inch"
+msgstr "Французский"
+
+#: plugins/admin/systems/glpi_devices.tpl:44
+msgid "Integrated microphone"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:427
+#: plugins/admin/systems/glpi_devices.tpl:47
+#: plugins/admin/systems/glpi_devices.tpl:55
+#: plugins/admin/systems/glpi_devices.tpl:63
+#: plugins/admin/systems/glpi_devices.tpl:71
+#: plugins/admin/systems/glpi_devices.tpl:176
+#: plugins/admin/systems/glpi_devices.tpl:296
+#: plugins/admin/systems/glpi_devices.tpl:361
 #, fuzzy
-msgid "can't get ppd informations."
-msgstr "Системная информация"
+msgid "Yes"
+msgstr "Системы"
 
-#: plugins/admin/systems/class_printGeneric.inc:439
-#, php-format
-msgid "This printer belongs to terminal %s. You can't rename this printer."
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:48
+#: plugins/admin/systems/glpi_devices.tpl:56
+#: plugins/admin/systems/glpi_devices.tpl:64
+#: plugins/admin/systems/glpi_devices.tpl:72
+#: plugins/admin/systems/glpi_devices.tpl:177
+#: plugins/admin/systems/glpi_devices.tpl:297
+#: plugins/admin/systems/glpi_devices.tpl:362
+#, fuzzy
+msgid "No"
+msgstr "нет"
 
-#: plugins/admin/systems/class_printGeneric.inc:441
-#, php-format
-msgid "This printer belongs to workstation %s. You can't rename this printer."
+#: plugins/admin/systems/glpi_devices.tpl:52
+msgid "Integrated speakers"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:519
-msgid "You have no permissions to create a printer on this 'Base'."
-msgstr "У вас недостаточно прав для создания принтера в этой ветке."
+#: plugins/admin/systems/glpi_devices.tpl:60
+msgid "Sub-D"
+msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:14
-#, fuzzy
-msgid "POP3 service"
-msgstr "Служба печати"
+#: plugins/admin/systems/glpi_devices.tpl:68
+msgid "BNC"
+msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:22
+#: plugins/admin/systems/glpi_devices.tpl:76
 #, fuzzy
-msgid "POP3/SSL service"
-msgstr "Служба SSH"
+msgid "Serial number"
+msgstr "Терминал"
 
-#: plugins/admin/systems/servkolab.tpl:30
+#: plugins/admin/systems/glpi_devices.tpl:83
 #, fuzzy
-msgid "IMAP service"
-msgstr "LDAP-сервер"
+msgid "Additional serial number"
+msgstr "Серийный номер сертификата"
 
-#: plugins/admin/systems/servkolab.tpl:38
+#: plugins/admin/systems/glpi_devices.tpl:97
 #, fuzzy
-msgid "IMAP/SSL service"
-msgstr "Служба SSH"
+msgid "Add/Edit other device"
+msgstr "Звуковая карта"
 
-#: plugins/admin/systems/servkolab.tpl:46
-#, fuzzy
-msgid "Sieve service"
-msgstr "Служба SSH"
+#: plugins/admin/systems/glpi_devices.tpl:138
+msgid "Add/Edit power supply"
+msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:54
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+#: plugins/admin/systems/glpi_devices.tpl:173
+msgid "Atx"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:62
-msgid "HTTP FreeBusy service (legacy)"
+#: plugins/admin/systems/glpi_devices.tpl:181
+#, fuzzy
+msgid "Power"
+msgstr "Порт"
+
+#: plugins/admin/systems/glpi_devices.tpl:193
+msgid "Add/Edit graphic card"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:70
-msgid "Amavis email scanning (virus/spam)"
+#: plugins/admin/systems/glpi_devices.tpl:228
+#: plugins/admin/systems/glpi_devices.tpl:284
+#: plugins/admin/systems/glpi_devices.tpl:349
+msgid "Interface"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:81
+#: plugins/admin/systems/glpi_devices.tpl:237
 #, fuzzy
-msgid "Quota settings"
-msgstr "Настройки Samba"
+msgid "Ram"
+msgstr "Имя сервера"
 
-#: plugins/admin/systems/servkolab.tpl:97
+#: plugins/admin/systems/glpi_devices.tpl:249
 #, fuzzy
-msgid "Free/Busy settings"
-msgstr "Настройки факса"
+msgid "Add/Edit controller"
+msgstr "Номер телефона"
 
-#: plugins/admin/systems/servkolab.tpl:102
-msgid "Allow unauthenticated downloading of Free/Busy information"
+#: plugins/admin/systems/glpi_devices.tpl:307
+msgid "Add/Edit drive"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:117
-msgid "SMTP privileged networks"
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:342
+#, fuzzy
+msgid "Speed"
+msgstr "Пол"
+
+#: plugins/admin/systems/glpi_devices.tpl:358
+#, fuzzy
+msgid "Writeable"
+msgstr "запись"
 
-#: plugins/admin/systems/servkolab.tpl:122
-msgid "Hosts/networks allowed to relay"
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:371
+#, fuzzy
+msgid "Add/Edit harddisk"
+msgstr "Сервер"
 
-#: plugins/admin/systems/servkolab.tpl:125
-msgid "Enter multiple values, seperated with"
+#: plugins/admin/systems/glpi_devices.tpl:406
+msgid "Rpm"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:138
-msgid "SMTP smarthost/relayhost"
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:413
+#, fuzzy
+msgid "Cache"
+msgstr "Отмена"
 
-#: plugins/admin/systems/servkolab.tpl:144
-msgid "Enable MX lookup for relayhost"
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:443
+#, fuzzy
+msgid "Add/Edit memory"
+msgstr "Редактиовать объект"
 
-#: plugins/admin/systems/servkolab.tpl:149
-msgid "Host used to relay mails"
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:478
+#, fuzzy
+msgid "Frequenz"
+msgstr "Номер телефона"
 
-#: plugins/admin/systems/servkolab.tpl:163
-msgid "Accept Internet Mail"
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:507
+#, fuzzy
+msgid "Add/Edit sound card"
+msgstr "Новый пароль"
 
-#: plugins/admin/systems/servkolab.tpl:169
-msgid "Accept mail from other domains over non-authenticated SMTP"
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:553
+#, fuzzy
+msgid "Add/Edit network interface"
+msgstr "Сетевой принтер"
 
-#: plugins/admin/systems/phonesettings.tpl:1
+#: plugins/admin/systems/glpi_devices.tpl:589
 #, fuzzy
-msgid "Advanced phone settings"
-msgstr "Настройки телефона"
+msgid "MAC address"
+msgstr "MAC-адрес"
 
-#: plugins/admin/systems/phonesettings.tpl:6
+#: plugins/admin/systems/glpi_devices.tpl:607
 #, fuzzy
-msgid "Phone type"
-msgstr "Название"
+msgid "Add/Edit processor"
+msgstr "Новый пароль"
 
-#: plugins/admin/systems/phonesettings.tpl:7
-#: plugins/admin/systems/phonesettings.tpl:25
-#: plugins/admin/systems/phonesettings.tpl:35
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:78
-#: plugins/admin/systems/phonesettings.tpl:109
-#: plugins/admin/systems/phonesettings.tpl:156
+#: plugins/admin/systems/glpi_devices.tpl:642
 #, fuzzy
-msgid "Choose a phone type"
-msgstr "Выберите тип мыши"
+msgid "Frequence"
+msgstr "Номер телефона"
 
-#: plugins/admin/systems/phonesettings.tpl:10
-msgid "refresh"
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:649
+#, fuzzy
+msgid "Default frequence"
+msgstr "По умолчанию"
 
-#: plugins/admin/systems/phonesettings.tpl:32
+#: plugins/admin/systems/glpi_devices.tpl:661
 #, fuzzy
-msgid "DTMF mode"
-msgstr "Режим"
+msgid "Add/Edit motherboard"
+msgstr "Клавиатура"
 
-#: plugins/admin/systems/phonesettings.tpl:46
-#: plugins/admin/systems/phonesettings.tpl:85
+#: plugins/admin/systems/glpi_devices.tpl:696
 #, fuzzy
-msgid "Default IP"
-msgstr "по умолчанию"
+msgid "Chipset"
+msgstr "сброс"
 
-#: plugins/admin/systems/phonesettings.tpl:56
-#: plugins/admin/systems/phonesettings.tpl:93
-msgid "Response timeout"
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:707
+#, fuzzy
+msgid "Add/Edit computer case"
+msgstr "не полный"
 
-#: plugins/admin/systems/phonesettings.tpl:75
+#: plugins/admin/systems/glpi_devices.tpl:742
 #, fuzzy
-msgid "Modus"
-msgstr "Мышь"
+msgid "format"
+msgstr "Порт"
 
-#: plugins/admin/systems/phonesettings.tpl:106
-msgid "Authtype"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
+#, php-format
+msgid "Internal Error can't create device of type '%s'"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:116
-#, fuzzy
-msgid "Secret"
-msgstr "Улица"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
+#, fuzzy, php-format
+msgid "You're about to delete the glpi device '%s'."
+msgstr "Вы собираетесь удалить группу \"%s\"."
 
-#: plugins/admin/systems/phonesettings.tpl:124
-msgid "GoFonInkeys"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
+msgid "Can't detect object name."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:132
-msgid "GoFonOutKeys"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
+#, php-format
+msgid ""
+"You can't delete this device, it is still in use by these system(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:145
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
 #, fuzzy
-msgid "Account code"
-msgstr "Учетная запись"
+msgid "devices"
+msgstr "Устройства"
 
-#: plugins/admin/systems/phonesettings.tpl:153
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 #, fuzzy
-msgid "Trunk lines"
-msgstr "Тонкие клиенты"
+msgid "New mainbord"
+msgstr "Новый пароль"
 
-#: plugins/admin/systems/phonesettings.tpl:168
-msgid "Hosts that are allowed to connect"
-msgstr ""
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
+#, fuzzy
+msgid "New processor"
+msgstr "Новый пароль"
 
-#: plugins/admin/systems/phonesettings.tpl:183
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
 #, fuzzy
-msgid "Hosts that are not allowed to connect"
-msgstr "У вас недостаточно прав для удаления этого объекта!"
+msgid "New case"
+msgstr "пользователи"
 
-#: plugins/admin/systems/phonesettings.tpl:205
-msgid "MSN"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+msgid "C"
 msgstr ""
 
-#: plugins/admin/systems/wingeneric.tpl:6
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
 #, fuzzy
-msgid "Machine name"
-msgstr "Название"
-
-#: plugins/admin/systems/terminalService.tpl:141
-msgid "Remote desktop"
-msgstr "Удаленная рабочая станция"
-
-#: plugins/admin/systems/terminalService.tpl:145
-msgid "Connect method"
-msgstr "Способ подключения"
-
-#: plugins/admin/systems/terminalService.tpl:147
-msgid "Choose method to connect to terminal server"
-msgstr "Выберите способ подключения к серверу терминалов"
-
-#: plugins/admin/systems/terminalService.tpl:154
-msgid "Terminal server"
-msgstr "Терминал-сервер"
+msgid "New network interface"
+msgstr "Сетевой принтер"
 
-#: plugins/admin/systems/terminalService.tpl:156
-msgid "Select specific terminal server to use"
-msgstr "Выберите сервер терминалов"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+#, fuzzy
+msgid "NI"
+msgstr "Unix"
 
-#: plugins/admin/systems/terminalService.tpl:163
-msgid "Font server"
-msgstr "Сервер шрифтов"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+#, fuzzy
+msgid "New ram"
+msgstr "пользователи"
 
-#: plugins/admin/systems/terminalService.tpl:165
-msgid "Select specific font server to use"
-msgstr "Выберите сервер шрифтов"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+msgid "R"
+msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:181
-msgid "Print device"
-msgstr "Устройство печати"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+#, fuzzy
+msgid "New hard disk"
+msgstr "Сервер"
 
-#: plugins/admin/systems/terminalService.tpl:182
-msgid "Select to start IPP based printing service on terminal"
-msgstr "Выберите, чтобы запустить на терминале службу печати по протоколу IPP"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+msgid "HDD"
+msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:183
-msgid "Provide print services"
-msgstr "Предоставлять службу печати"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+#, fuzzy
+msgid "New drive"
+msgstr "Сервер"
 
-#: plugins/admin/systems/terminalService.tpl:189
-msgid "Spool server"
-msgstr "Сервер для хранения запросов и временных файлов"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+#, fuzzy
+msgid "D"
+msgstr "UID"
 
-#: plugins/admin/systems/terminalService.tpl:191
-msgid "Select NFS filesystem to place spool files on"
-msgstr "Выберите файловую систему NFS для хранения временных файлов"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+#, fuzzy
+msgid "New controller"
+msgstr "Номер телефона"
 
-#: plugins/admin/systems/terminalService.tpl:212
-msgid "Select scanner driver to use"
-msgstr "Выберите драйвер для используемого сканера"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+msgid "CS"
+msgstr ""
 
-#: plugins/admin/systems/remove.tpl:6
-msgid ""
-"This includes <b>all</b> system and setup informations. Please double check "
-"if your really want to do this since there is no way for GOsa to get your "
-"data back."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "New graphics card"
 msgstr ""
-"Сюда входит <b>вся</b> информация о системе и ее настройках. Подумайте еще "
-"раз, действительно ли вам нужно удаление, так как GOsa не сможет отменить "
-"результаты этой операции."
 
-#: plugins/admin/systems/headpage.tpl:6
-msgid "List of systems"
-msgstr "Список систем"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "GC"
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:24
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
 #, fuzzy
-msgid ""
-"This menu allows you to add, remove and change the properties of specific "
-"systems. You can only add systems which have already been started once."
+msgid "New sound card"
+msgstr "Новый пароль"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+msgid "SC"
 msgstr ""
-"С помощью этого меню вы можете добавлять, изменять и удалять свойства "
-"отдельных систем. Вы можете только добавлять системы которые однажды уже "
-"были запущены."
 
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
-msgstr "Показать серверы"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "New power supply"
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "PS"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
 #, fuzzy
-msgid "Select to see Linux terminals"
-msgstr "Выберите чтобы посмотреть терминалы"
+msgid "New misc device"
+msgstr "Сетевые устройства"
 
-#: plugins/admin/systems/headpage.tpl:39
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
-msgstr "Показать терминалы"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+msgid "OC"
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:346
 #, fuzzy
-msgid "Select to see Linux workstations"
-msgstr "Выберите чтобы посмотреть рабочие станции"
-
-#: plugins/admin/systems/headpage.tpl:40
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
-msgstr "Показать рабочие станции"
+msgid "You have to specify a valid name for this device."
+msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Select to see MicroSoft Windows based workstations"
-msgstr "Посмотреть рабочие станции с MicroSoft Windows"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:366
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:369
+#, fuzzy
+msgid "This device name is already in use."
+msgstr "Указанное имя уже используется."
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Show windows based workstations"
-msgstr "Показать рабочие станции с windows"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
+#, fuzzy
+msgid "Other"
+msgstr "Фильтры"
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Select to see network printers"
-msgstr "Выберите чтобы посмотреть сетевые принтеры"
+#: plugins/admin/systems/class_servService.inc:272
+msgid "Terminal server, must have fontpath specified."
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Show network printers"
-msgstr "Показать сетевые принтеры"
+#: plugins/admin/systems/servRepositorySetup.tpl:15
+#, fuzzy
+msgid "Parent server"
+msgstr "Служба печати"
 
-#: plugins/admin/systems/headpage.tpl:43
-msgid "Select to see VOIP phones"
-msgstr "Выберите чтобы посмотреть VOIP телефоны"
+#: plugins/admin/systems/servservice.tpl:37
+#, fuzzy
+msgid "Time Service"
+msgstr "Сервисы"
 
-#: plugins/admin/systems/headpage.tpl:43
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
-msgstr "Показать телефоны"
+#: plugins/admin/systems/servservice.tpl:61
+#, fuzzy
+msgid "LDAP Service"
+msgstr "LDAP-сервер"
 
-#: plugins/admin/systems/headpage.tpl:44
+#: plugins/admin/systems/servservice.tpl:72
 #, fuzzy
-msgid "Select to see network devices"
-msgstr "Выберите чтобы посмотреть сетевые принтеры"
+msgid "Terminal Service"
+msgstr "Терминальный сервер"
 
-#: plugins/admin/systems/headpage.tpl:44
+#: plugins/admin/systems/servservice.tpl:77
 #, fuzzy
-msgid "Show network devices"
-msgstr "Сетевые устройства"
+msgid "Temporary disable login"
+msgstr "Временно отключить использование факса"
 
-#: plugins/admin/systems/headpage.tpl:52
-msgid "Regular expression for matching system names"
-msgstr "Регулярное выражение, соответствующее именам систем"
+#: plugins/admin/systems/servservice.tpl:80
+#, fuzzy
+msgid "Font path"
+msgstr "Контакт"
 
-#: plugins/admin/systems/headpage.tpl:59
+#: plugins/admin/systems/servservice.tpl:93
 #, fuzzy
-msgid "Display systems of user"
-msgstr "Показать адреса пользователя"
+msgid "Syslog Service"
+msgstr "Сервер системных журналов"
 
-#: plugins/admin/systems/headpage.tpl:62
-msgid "User name of which terminal(s) are shown"
-msgstr "Имя пользователя, для которого перечисляются терминалы"
+#: plugins/admin/systems/servservice.tpl:101
+#, fuzzy
+msgid "Print Service"
+msgstr "Служба печати"
 
-#: plugins/admin/systems/class_componentGeneric.inc:138
+#: plugins/admin/systems/servservice.tpl:109
 #, fuzzy
-msgid "The required field 'Component name' is not set."
-msgstr "Обязательное поле \"Личное имя\" не заполнено."
+msgid "Mail server"
+msgstr "Сервер"
 
-#: plugins/admin/systems/terminalStartup.tpl:35
-msgid "Select if terminal supports graphical startup with progress bar"
+#: plugins/admin/systems/glpi_edit_os.tpl:1
+msgid "Manage OS-types"
 msgstr ""
-"Выберите, должен ли терминал подерживать загрузку в графическом режиме с "
-"показом индикатора состояния"
 
-#: plugins/admin/systems/terminalStartup.tpl:36
-msgid "use graphical bootup"
-msgstr "Загружать в графическом режиме"
+#: plugins/admin/systems/printerPPDDialog.tpl:1
+#, fuzzy
+msgid "Printer driver"
+msgstr "Устройство печати"
 
-#: plugins/admin/systems/terminalStartup.tpl:38
-msgid "Select if terminal should boot in text mode"
-msgstr "Выберите, должен ли терминал загружаться в текстовом режиме"
+#: plugins/admin/systems/printerPPDDialog.tpl:9
+#, fuzzy
+msgid "New driver"
+msgstr "Сервер"
 
-#: plugins/admin/systems/terminalStartup.tpl:39
-msgid "use standard linux textual bootup"
-msgstr "Загружать в стандартном текстовом режиме"
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
+msgstr "Название"
 
-#: plugins/admin/systems/terminalStartup.tpl:41
-msgid "Select to get more verbose output during startup"
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
+msgid "List of available cartridge type for this type of printer"
 msgstr ""
-"Выберите, нужно ли использовать подробный вывод информации при загрузке"
-
-#: plugins/admin/systems/terminalStartup.tpl:42
-msgid "use debug mode for startup"
-msgstr "Используйте отладочный режим"
 
-#: plugins/admin/systems/password.tpl:2
-#, fuzzy
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
 msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you "
-"wouldn't be able to log in."
+"This dialog allows you to create new types of cartridges, and select one or "
+"more types for your printer. Cartridge types depends on the printer type you "
+"have selected. For each selected cartridge type there will be a new "
+"cartridge created, this allows you to select the same cartridge type for "
+"more then one printer."
 msgstr ""
-"В полях ниже вы можете изменить пароль выбранного пользователя. Изменения "
-"вступят в силу немедленно. Пожалуйста, запомните новый пароль, так как иначе "
-"пользователь не сможет войти в систему."
 
-#: plugins/admin/systems/password.tpl:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr ""
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
+#, fuzzy
+msgid "Display cartridge types matching"
+msgstr "Показать совпадения номеров"
 
-#: plugins/admin/systems/password.tpl:9
-msgid "Changing the password impinges on authentification only."
-msgstr "Изменение пароля влияет только на аутентификацию в системе."
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
+#, fuzzy
+msgid "Regular expression for matching cartridge types"
+msgstr "Регулярное выражение для поиска адреса"
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
 #, fuzzy
-msgid "Printer ppd selection."
-msgstr "Настройки телефона"
+msgid "Reference"
+msgstr "Ссылки"
 
-#: plugins/admin/systems/servRepositorySetup.tpl:15
+#: plugins/admin/systems/class_terminalGeneric.inc:61
+msgid "text"
+msgstr "текст"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:62
+msgid "graphic"
+msgstr "графика"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:90
+#: plugins/admin/systems/class_servGeneric.inc:62
+#: plugins/admin/ogroups/class_termgroup.inc:64
+msgid "No WAKECMD definition found in your gosa.conf"
+msgstr "Определение WAKECMD в вашем файле gosa.conf не найдено"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:102
+#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/ogroups/class_termgroup.inc:76
+msgid "No REBOOTCMD definition found in your gosa.conf"
+msgstr "Определение REBOOTCMD в вашем файле gosa.conf не найдено"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:114
+#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/ogroups/class_termgroup.inc:88
+msgid "No HALTCMD definition found in your gosa.conf"
+msgstr "Определение HALTCMD в вашем файле gosa.conf не найдено"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:269
+msgid "You have no permissions to create a terminal on this 'Base'."
+msgstr "У вас недостаточно прав для создания терминала в этой ветке."
+
+#: plugins/admin/systems/class_terminalGeneric.inc:273
+msgid "The required field 'Terminal name' is not set."
+msgstr "Обязательное поле 'Название терминала' не заполнено."
+
+#: plugins/admin/systems/remove_glpi.tpl:10
 #, fuzzy
-msgid "Parent server"
-msgstr "Служба печати"
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your MySql database in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Лучше всего перед удалением сохранить резервную копию текущего дерева LDAP в "
+"файл. Если вы сделали это и действительно хотите выполнить удаление, нажмите "
+"<i>Удалить</i>, иначе нажмите <i>Отмена</i>."
 
-#: plugins/admin/systems/servRepositorySetup.tpl:33
-#: plugins/admin/systems/class_servRepository.inc:243
-#: plugins/admin/systems/class_servRepository.inc:264
+#: plugins/admin/systems/class_servGeneric.inc:52
 #, fuzzy
-msgid "Sections"
-msgstr "Действие"
+msgid "This 'dn' has no server features."
+msgstr "Этот DN не имеет свойств принтера."
+
+#: plugins/admin/systems/class_servGeneric.inc:191
+#, fuzzy
+msgid "The required field 'Server name' is not set."
+msgstr "Обязательное поле \"Личное имя\" не заполнено."
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:117
+#: plugins/admin/systems/class_servGeneric.inc:198
 #, fuzzy
-msgid "Please enter a value for 'release'."
-msgstr "Укажите корректный номер телефона."
+msgid "You have no permissions to create a server on this 'Base'."
+msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:121
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
 #, fuzzy
-msgid "Please specify a valid value for 'url'."
-msgstr "Укажите корректный номер телефона."
+msgid "Add/Edit manufacturer"
+msgstr "Редактиовать объект"
 
-#: plugins/admin/systems/servRepository.tpl:6
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
 #, fuzzy
-msgid "List of configured repositories."
-msgstr "Список групп"
+msgid "Website"
+msgstr "запись"
 
-#: plugins/admin/systems/servRepository.tpl:11
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
+#: plugins/admin/ogroups/class_mailogroup.inc:137
+#: plugins/admin/ogroups/class_phonequeue.inc:690
+#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
+#: html/getxls.php:236
 #, fuzzy
-msgid "Add repository"
-msgstr "Повторить"
+msgid "Phone number"
+msgstr "Телефонные номера"
 
-#: plugins/admin/systems/servRepository.tpl:29
-msgid "This menu allows you to create, delete and edit repository settings."
-msgstr ""
+#: plugins/admin/systems/class_servDHCP.inc:36
+msgid "Remove DHCP service"
+msgstr "Удалить сервис DHCP"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
+#: plugins/admin/systems/class_servDHCP.inc:37
 #, fuzzy
 msgid ""
-"This server has inventory features enabled. You can disable them by clicking "
+"This server has DHCP features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 "В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
+#: plugins/admin/systems/class_servDHCP.inc:39
+msgid "Add DHCP service"
+msgstr "Добавить сервис DHCP"
+
+#: plugins/admin/systems/class_servDHCP.inc:40
 #, fuzzy
 msgid ""
-"This server has inventory features disabled. You can enable them by clicking "
+"This server has DHCP features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
-#, php-format
-msgid ""
-"Can't rename given printer type to '%s', because this type name already "
-"exists."
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:32
+msgid "Systems"
+msgstr "Системы"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
-#, php-format
-msgid "Can't delete printer type, it is still in use by '%s'."
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:429
+msgid "You can't edit this object type yet!"
+msgstr "Вы не можете редактировать сейчас этот тип объекта!"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:750
-#, fuzzy
-msgid "since"
-msgstr "Работает с"
+#: plugins/admin/systems/class_systemManagement.inc:455
+msgid "Passwords entered as new and repeated do not match!"
+msgstr "Введенные пароли не совпадают!"
 
-#: plugins/admin/systems/glpi_edit_type.tpl:1
-#, fuzzy
-msgid "Manage System-types"
-msgstr "Системы"
+#: plugins/admin/systems/class_systemManagement.inc:472
+msgid "You are not allowed to set this systems password!"
+msgstr "У вас недостаточно прав для смены пароля этой системы!"
 
-#: plugins/admin/systems/glpi_edit_type.tpl:9
-#: plugins/admin/systems/glpi_edit_type.tpl:28
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
-#: plugins/admin/systems/glpi_edit_os.tpl:9
-#: plugins/admin/systems/glpi_edit_os.tpl:28
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:8
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:29
-#, fuzzy
-msgid "Rename"
-msgstr "Имя сервера"
+#: plugins/admin/systems/class_systemManagement.inc:526
+#, fuzzy, php-format
+msgid "You're about to delete all information about the component at '%s'."
+msgstr "Вы собираетесь удалить всю информацию о терминале (\"%s\")."
 
-#: plugins/admin/systems/glpi_edit_type.tpl:24
-#: plugins/admin/systems/glpi_edit_os.tpl:24
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:25
+#: plugins/admin/systems/class_systemManagement.inc:761
 #, fuzzy
-msgid "Please enter a new name"
-msgstr "Введите адрес сервера"
+msgid "New Terminal template"
+msgstr "Шаблон терминала"
 
-#: plugins/admin/systems/remove_glpi.tpl:10
+#: plugins/admin/systems/class_systemManagement.inc:761
+#: plugins/admin/systems/class_systemManagement.inc:925
 #, fuzzy
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your MySql database in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Лучше всего перед удалением сохранить резервную копию текущего дерева LDAP в "
-"файл. Если вы сделали это и действительно хотите выполнить удаление, нажмите "
-"<i>Удалить</i>, иначе нажмите <i>Отмена</i>."
+msgid "New Terminal"
+msgstr "Создать терминал"
 
-#: plugins/admin/systems/glpiManufacturer.tpl:1
+#: plugins/admin/systems/class_systemManagement.inc:763
 #, fuzzy
-msgid "Manage manufacturers"
-msgstr "Редактиовать объект"
+msgid "New Workstation template"
+msgstr "Шаблон рабочей станции"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
+#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/systems/class_systemManagement.inc:926
 #, fuzzy
-msgid "Reference"
-msgstr "Ссылки"
+msgid "New Workstation"
+msgstr "Новая рабочая станция"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
-#: plugins/admin/systems/glpi_devices.tpl:17
+#: plugins/admin/systems/class_systemManagement.inc:764
+#: plugins/admin/systems/class_systemManagement.inc:765
 #, fuzzy
-msgid "Comments"
-msgstr "Контакт"
+msgid "New Server"
+msgstr "Сервер"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
-#: plugins/admin/systems/glpi.tpl:63
-#: plugins/admin/systems/glpi_devices.tpl:112
-#: plugins/admin/systems/glpi_devices.tpl:153
-#: plugins/admin/systems/glpi_devices.tpl:208
-#: plugins/admin/systems/glpi_devices.tpl:264
-#: plugins/admin/systems/glpi_devices.tpl:322
-#: plugins/admin/systems/glpi_devices.tpl:386
-#: plugins/admin/systems/glpi_devices.tpl:458
-#: plugins/admin/systems/glpi_devices.tpl:522
-#: plugins/admin/systems/glpi_devices.tpl:569
-#: plugins/admin/systems/glpi_devices.tpl:622
-#: plugins/admin/systems/glpi_devices.tpl:676
-#: plugins/admin/systems/glpi_devices.tpl:722
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
+#: plugins/admin/systems/class_systemManagement.inc:766
+#: plugins/admin/systems/class_systemManagement.inc:767
 #, fuzzy
-msgid "Comment"
-msgstr "Контакт"
-
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
-#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
-#: plugins/admin/systems/glpi_devices.tpl:24
-#: plugins/admin/systems/glpi_devices.tpl:123
-#: plugins/admin/systems/glpi_devices.tpl:164
-#: plugins/admin/systems/glpi_devices.tpl:219
-#: plugins/admin/systems/glpi_devices.tpl:275
-#: plugins/admin/systems/glpi_devices.tpl:333
-#: plugins/admin/systems/glpi_devices.tpl:397
-#: plugins/admin/systems/glpi_devices.tpl:469
-#: plugins/admin/systems/glpi_devices.tpl:533
-#: plugins/admin/systems/glpi_devices.tpl:580
-#: plugins/admin/systems/glpi_devices.tpl:633
-#: plugins/admin/systems/glpi_devices.tpl:687
-#: plugins/admin/systems/glpi_devices.tpl:733
-msgid "Manufacturer"
-msgstr ""
-
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
-#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
-msgid "Technical responsible"
-msgstr ""
+msgid "New Printer"
+msgstr "Принтер"
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:140
+#: plugins/admin/systems/class_systemManagement.inc:768
+#: plugins/admin/systems/class_systemManagement.inc:769
 #, fuzzy
-msgid "use"
-msgstr "Мышь"
+msgid "New Phone"
+msgstr "Телефон"
 
-#: plugins/admin/systems/glpiSelectUser.tpl:23
-msgid ""
-"This dialog allows you to select a user as technical responsible person."
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:770
+#: plugins/admin/systems/class_systemManagement.inc:771
+#, fuzzy
+msgid "New Component"
+msgstr "Прочие сетевые компоненты"
 
-#: plugins/admin/systems/glpi_edit_os.tpl:1
-msgid "Manage OS-types"
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:781
+#, fuzzy
+msgid "Edit system"
+msgstr "Список систем"
 
-#: plugins/admin/systems/class_termDNS.inc:313
+#: plugins/admin/systems/class_systemManagement.inc:782
 #, fuzzy
-msgid "The required field 'IP-address' is not set."
-msgstr "Обязательное поле \"Основной адрес\" не заполнено."
+msgid "Delete system"
+msgstr "Удалить"
 
-#: plugins/admin/systems/class_termDNS.inc:319
-msgid "Wrong IP format in field IP-address."
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:792
+#, fuzzy
+msgid "System"
+msgstr "Системы"
 
-#: plugins/admin/systems/class_termDNS.inc:325
+#: plugins/admin/systems/class_systemManagement.inc:830
 #, fuzzy
-msgid "The required field 'MAC-address' is not set."
-msgstr "Обязательное поле \"Основной адрес\" не заполнено."
+msgid "Cups Server"
+msgstr "Сервер"
 
-#: plugins/admin/systems/class_termDNS.inc:331
-msgid ""
-"The given macaddress is invalid. There must be 6 1byte segments seperated by "
-"':'."
+#: plugins/admin/systems/class_systemManagement.inc:831
+msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:346
-#, php-format
-msgid "Found duplicate value for record type '%s'."
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:832
+#, fuzzy
+msgid "Syslog Server"
+msgstr "Сервер системных журналов"
 
-#: plugins/admin/systems/class_termDNS.inc:352
-#, php-format
-msgid "Found more than one entry for the uniqe record type '%s'."
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:833
+#, fuzzy
+msgid "Mail Server"
+msgstr "Сервер"
 
-#: plugins/admin/systems/class_termDNS.inc:360
-#, php-format
-msgid ""
-"The device IP '%s' is added as 'A Record', this will be done automatically, "
-"please remove the record."
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:834
+#, fuzzy
+msgid "Imap Server"
+msgstr "Сервер подкачки"
 
-#: plugins/admin/systems/class_termDNS.inc:366
-#: plugins/admin/systems/class_servDNSeditZone.inc:386
-#, php-format
-msgid "Only lowercase is allowed, please check your '%ss'."
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:835
+#, fuzzy
+msgid "Nfs Server"
+msgstr "Сервер"
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
+#: plugins/admin/systems/class_systemManagement.inc:836
 #, fuzzy
-msgid "Add/Edit manufacturer"
-msgstr "Редактиовать объект"
+msgid "Kerberos Server"
+msgstr "Kerberos"
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
+#: plugins/admin/systems/class_systemManagement.inc:837
 #, fuzzy
-msgid "Website"
-msgstr "запись"
+msgid "Asterisk Server"
+msgstr "Терминальный сервер"
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
-#: plugins/admin/ogroups/class_mailogroup.inc:137
-#: plugins/admin/ogroups/class_phonequeue.inc:690
-#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/admin/systems/class_systemManagement.inc:838
 #, fuzzy
-msgid "Phone number"
-msgstr "Телефонные номера"
+msgid "Fax Server"
+msgstr "Сервер"
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
-msgid "List of available cartridge type for this type of printer"
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:839
+#, fuzzy
+msgid "Ldap Server"
+msgstr "Сервер подкачки"
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
-msgid ""
-"This dialog allows you to create new types of cartridges, and select one or "
-"more types for your printer. Cartridge types depends on the printer type you "
-"have selected. For each selected cartridge type there will be a new "
-"cartridge created, this allows you to select the same cartridge type for "
-"more then one printer."
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:872
+#, fuzzy
+msgid "Set root password"
+msgstr "Изменить пароль"
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
+#: plugins/admin/systems/class_systemManagement.inc:917
 #, fuzzy
-msgid "Display cartridge types matching"
-msgstr "Показать совпадения номеров"
+msgid "New System from incoming"
+msgstr "Системная информация"
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
+#: plugins/admin/systems/class_systemManagement.inc:919
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:590
 #, fuzzy
-msgid "Regular expression for matching cartridge types"
-msgstr "Регулярное выражение для поиска адреса"
+msgid "Terminal"
+msgstr "Терминалы"
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:58
-#, php-format
-msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:920
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:589
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr "Рабочая станция"
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:104
+#: plugins/admin/systems/class_systemManagement.inc:923
 #, fuzzy
-msgid "Please specify a name."
-msgstr "Введите корректное имя пользователя!"
+msgid "Winstation"
+msgstr "Рабочая станция"
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:113
-#: plugins/admin/systems/class_glpiManufacturer.inc:119
+#: plugins/admin/systems/class_systemManagement.inc:924
 #, fuzzy
-msgid "Specified name is already in use, please choose another one."
-msgstr "Группа с таким именем уже существует."
+msgid "Network Device"
+msgstr "Сетевые устройства"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:6
-#, fuzzy
-msgid "List of attachments"
-msgstr "Список подразделений"
+#: plugins/admin/systems/class_systemManagement.inc:1147
+msgid "New terminal"
+msgstr "Создать терминал"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:23
-msgid ""
-"This dialog allow you to attach additional objects (like manuals, guides, "
-"etc.)  to your currently edited computer."
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:1149
+msgid "New workstation"
+msgstr "Новая рабочая станция"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:35
+#: plugins/admin/systems/class_systemManagement.inc:1151
 #, fuzzy
-msgid "Display attachments matching"
-msgstr "Шаблон для подразделений"
+msgid "New Device"
+msgstr "Сетевые устройства"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:37
+#: plugins/admin/systems/class_systemManagement.inc:1168
 #, fuzzy
-msgid "Regular expression for matching attachment names"
-msgstr "Регулярное выражение, соответствующее именам подразделений"
+msgid "Terminal template for"
+msgstr "Шаблон терминала"
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
-msgid "Can't delete this entry, it is still in use."
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:1180
+msgid "Workstation template for"
+msgstr "Шаблон рабочей станции для"
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:305
+#: plugins/admin/systems/class_servRepositorySetup.inc:117
 #, fuzzy
-msgid "The selected name is already in use."
-msgstr "Указанное имя уже используется."
+msgid "Please enter a value for 'release'."
+msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/glpi.tpl:9
-#: plugins/admin/systems/SelectDeviceType.tpl:20
+#: plugins/admin/systems/class_servRepositorySetup.inc:121
 #, fuzzy
-msgid "System type"
-msgstr "Системы"
+msgid "Please specify a valid value for 'url'."
+msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/glpi.tpl:19
+#: plugins/admin/systems/printer.tpl:6
 #, fuzzy
-msgid "Operating system"
-msgstr "Удалить"
+msgid "General"
+msgstr "Общее"
 
-#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
+#: plugins/admin/systems/printer.tpl:9
+msgid "Printer name"
+msgstr "Имя принтера"
+
+#: plugins/admin/systems/printer.tpl:31
+msgid "Details"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:34
 #, fuzzy
-msgid "Contacts"
-msgstr "Контакт"
+msgid "Printer location"
+msgstr "Настройки телефона"
 
-#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
+#: plugins/admin/systems/printer.tpl:38
+msgid "Printer URL"
+msgstr "URL принтера"
+
+#: plugins/admin/systems/printer.tpl:58
 #, fuzzy
-msgid "Contact person"
-msgstr "Контакт"
+msgid "Permissions"
+msgstr "Права для членов группы"
 
-#: plugins/admin/systems/glpi.tpl:78
+#: plugins/admin/systems/printer.tpl:65
 #, fuzzy
-msgid "Installed devices"
-msgstr "Клиентские устройства"
+msgid "Users which are allowed to use this printer"
+msgstr "У вас недостаточно прав для удаления этого объекта!"
 
-#: plugins/admin/systems/glpi.tpl:90
+#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
 #, fuzzy
-msgid "Trading"
-msgstr "Затенение"
+msgid "Add user"
+msgstr "Пользователи домена"
 
-#: plugins/admin/systems/glpi.tpl:91
+#: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
 #, fuzzy
-msgid "Software"
-msgstr "Адм. единица"
+msgid "Add group"
+msgstr "группы"
 
-#: plugins/admin/systems/glpi.tpl:92
+#: plugins/admin/systems/printer.tpl:81
 #, fuzzy
-msgid "Contracts"
-msgstr "Контакт"
+msgid "Users which are allowed to administrate this printer"
+msgstr "У вас недостаточно прав для удаления этого объекта!"
 
-#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
+#: plugins/admin/systems/printer.tpl:82
 #, fuzzy
-msgid "Attachments"
-msgstr "подразделения"
+msgid "Admins"
+msgstr "DN администратора"
 
-#: plugins/admin/systems/servdnseditzone.tpl:7
+#: plugins/admin/systems/class_servDNS.inc:181
+#: plugins/admin/systems/class_inventory.inc:36
+msgid "Remove DNS service"
+msgstr "Удалить сервис DNS"
+
+#: plugins/admin/systems/class_servDNS.inc:182
+#: plugins/admin/systems/class_inventory.inc:37
 #, fuzzy
-msgid "Zone name"
-msgstr "Название"
+msgid ""
+"This server has DNS features enabled. You can disable them by clicking below."
+msgstr ""
+"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
+"ниже."
 
-#: plugins/admin/systems/servdnseditzone.tpl:13
+#: plugins/admin/systems/class_servDNS.inc:184
+#: plugins/admin/systems/class_inventory.inc:39
+msgid "Add DNS service"
+msgstr "Добавить сервис DNS"
+
+#: plugins/admin/systems/class_servDNS.inc:185
+#: plugins/admin/systems/class_inventory.inc:40
 #, fuzzy
-msgid "Network address"
-msgstr "Сетевые устройства"
+msgid ""
+"This server has DNS features disabled. You can enable them by clicking below."
+msgstr ""
+"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+"ниже."
 
-#: plugins/admin/systems/servdnseditzone.tpl:24
+#: plugins/admin/systems/class_servDNS.inc:270
+#, php-format
+msgid ""
+"Can't delete the selected zone, because it is still in use by these entry/"
+"entries '%s'"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:297
 #, fuzzy
-msgid "Zone entries"
-msgstr "Настройки телефона"
+msgid "Reverse zone"
+msgstr "Ссылки"
 
-#: plugins/admin/systems/servdnseditzone.tpl:35
+#: plugins/admin/systems/class_servDNSeditZone.inc:336
 #, fuzzy
-msgid "SOA record"
-msgstr "Каталог"
+msgid "This zoneName is already in use"
+msgstr "Указанное имя уже используется."
 
-#: plugins/admin/systems/servdnseditzone.tpl:41
+#: plugins/admin/systems/class_servDNSeditZone.inc:339
 #, fuzzy
-msgid "Primary dns server for this zone"
-msgstr "Основной адрес эл. почты для этой общей папки"
+msgid "This reverse zone is already in use"
+msgstr "Указанное имя уже используется."
 
-#: plugins/admin/systems/servdnseditzone.tpl:53
-msgid "Serial number (automatically incremented)"
+#: plugins/admin/systems/class_servDNSeditZone.inc:344
+msgid "Primary dns server must end with '.' to be a valid entry."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:348
+msgid "Your specified mail address must end with '.' to be a valid record."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:352
+#: plugins/admin/systems/class_servDNSeditZone.inc:356
+msgid ""
+"Your mail address contains '@' replace this with '.' to enable GOsa to "
+"create a valid SOA record."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:360
+msgid "Only lowercase strings are allowed as zone name."
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:69
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/altlinux/setup_finish.tpl:31
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr "Повторить"
+#: plugins/admin/systems/class_servDNSeditZone.inc:364
+#, fuzzy
+msgid "Please specify a numeric value for serial number."
+msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/servdnseditzone.tpl:75
+#: plugins/admin/systems/class_servDNSeditZone.inc:368
 #, fuzzy
-msgid "Expire"
-msgstr "Экспорт"
+msgid "Please specify a numeric value for refresh."
+msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/servdnseditzone.tpl:96
+#: plugins/admin/systems/class_servDNSeditZone.inc:372
 #, fuzzy
-msgid "MxRecords"
-msgstr "Каталог"
+msgid "Please specify a numeric value for ttl."
+msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/servdnseditzone.tpl:108
+#: plugins/admin/systems/class_servDNSeditZone.inc:376
 #, fuzzy
-msgid "Zone records"
-msgstr "Каталог"
+msgid "Please specify a numeric value for expire."
+msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:6
+#: plugins/admin/systems/class_servDNSeditZone.inc:380
 #, fuzzy
-msgid "List of devices"
-msgstr "Список пользователей"
+msgid "Please specify a numeric value for retry."
+msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:23
-msgid ""
-"This dialog allows you to attach a device to your currently edited computer."
+#: plugins/admin/systems/servdb.tpl:6
+msgid "Kerberos kadmin access"
 msgstr ""
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:35
+#: plugins/admin/systems/servdb.tpl:10
 #, fuzzy
-msgid "Display devices matching"
-msgstr "Показать подходяшие адреса"
+msgid "Kerberos Realm"
+msgstr "Kerberos"
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:37
+#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
 #, fuzzy
-msgid "Regular expression for matching device names"
-msgstr "Регулярное выражение, соответствующее именам пользователей"
-
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:73
-#, fuzzy, php-format
-msgid "You're about to delete the glpi attachment component '%s'."
-msgstr "Вы собираетесь удалить приложение \"%s\"."
+msgid "Admin user"
+msgstr "Пользователи домена"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:112
-#, php-format
-msgid ""
-"You can't delete this attachment, it is still in use by these system(s) '%s'"
-msgstr ""
+#: plugins/admin/systems/servdb.tpl:26
+#, fuzzy
+msgid "FAX database"
+msgstr "Базы данных"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:124
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:128
+#: plugins/admin/systems/servdb.tpl:30
 #, fuzzy
-msgid "There is no valid file uploaded."
-msgstr "Файл небыл загружен"
+msgid "FAX DB user"
+msgstr "Показать пользователей факсов"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:131
+#: plugins/admin/systems/servdb.tpl:42
 #, fuzzy
-msgid "Upload wasn't successfull."
-msgstr "Экспорт успешен."
+msgid "Asterisk management"
+msgstr "Управление системами"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:134
-msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
+#: plugins/admin/systems/servdb.tpl:46
+msgid "Asterisk DB user"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:138
-#, fuzzy
-msgid "There is already a file with the same name uploaded."
+#: plugins/admin/systems/servdb.tpl:54
+msgid "Country dial prefix"
 msgstr ""
-"Пользователь с таким регистрационным именем в базе данных уже существует."
-
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:142
-#, fuzzy, php-format
-msgid "Can't create file '%s'."
-msgstr "Удалить"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:186
-msgid "File is available."
+#: plugins/admin/systems/servdb.tpl:58
+msgid "Local dial prefix"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:188
-msgid "File is not readable, possibly the file is missing."
+#: plugins/admin/systems/servdb.tpl:70
+msgid "IMAP admin access"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:191
+#: plugins/admin/systems/servdb.tpl:74
 #, fuzzy
-msgid "Currently no file uploaded."
-msgstr "Файл небыл загружен"
+msgid "Server identifier"
+msgstr "Номер дома"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:202
+#: plugins/admin/systems/servdb.tpl:78
 #, fuzzy
-msgid "Mime"
-msgstr "Мобильный"
-
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:205
-msgid "This table displays all available attachments."
-msgstr ""
+msgid "Connect URL"
+msgstr "Подключение"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:222
+#: plugins/admin/systems/servdb.tpl:91
 #, fuzzy
-msgid "empty"
-msgstr "Шаблон"
+msgid "Sieve port"
+msgstr "Сервер"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
+#: plugins/admin/systems/servdb.tpl:100
 #, fuzzy
-msgid "Create new attachment"
-msgstr "Подразделение"
+msgid "Logging database"
+msgstr "база пользователя"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
+#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
+msgid "Logging DB user"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:119
 #, fuzzy
-msgid "New Attachment"
-msgstr "подразделения"
+msgid "Glpi database"
+msgstr "Базы данных"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:352
+#: plugins/admin/systems/servdb.tpl:133
 #, fuzzy
-msgid "Please specify a valid name for this attachment."
-msgstr "Укажите корректный номер телефона."
+msgid "Database"
+msgstr "Базы данных"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
-#, php-format
-msgid "Internal Error can't create device of type '%s'"
+#: plugins/admin/systems/class_printGeneric.inc:177
+#: plugins/admin/systems/class_printGeneric.inc:184
+#: plugins/admin/systems/class_printGeneric.inc:219
+#: plugins/admin/systems/class_printGeneric.inc:240
+#: plugins/admin/systems/class_printGeneric.inc:243
+msgid "Add printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
-#, fuzzy, php-format
-msgid "You're about to delete the glpi device '%s'."
-msgstr "Вы собираетесь удалить группу \"%s\"."
+#: plugins/admin/systems/class_printGeneric.inc:178
+msgid "This is a workstation template, printer tab is disabled."
+msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
-msgid "Can't detect object name."
+#: plugins/admin/systems/class_printGeneric.inc:185
+msgid "This is a terminal template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
-#, php-format
+#: plugins/admin/systems/class_printGeneric.inc:220
+#, fuzzy
 msgid ""
-"You can't delete this device, it is still in use by these system(s) '%s'"
+"This workstation has printer extension disabled. You can't enable it while "
+"'cn' is not present in entry. Possibly you are currently creating a new "
+"terminal template"
 msgstr ""
+"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+"ниже."
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
+#: plugins/admin/systems/class_printGeneric.inc:232
+#: plugins/admin/systems/class_printGeneric.inc:235
 #, fuzzy
-msgid "devices"
-msgstr "Устройства"
+msgid "Remove printer extension"
+msgstr "Удалить параметры"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_printGeneric.inc:233
 #, fuzzy
-msgid "New monitor"
-msgstr "Новый пароль"
+msgid ""
+"This workstation has printer extension enabled.You can disable it by "
+"clicking below."
+msgstr ""
+"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
+"ниже."
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_printGeneric.inc:236
 #, fuzzy
-msgid "M"
-msgstr "Мб"
+msgid ""
+"This terminal has printer extension enabled. You can disable it by clicking "
+"below."
+msgstr ""
+"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
+"ниже."
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
+#: plugins/admin/systems/class_printGeneric.inc:241
 #, fuzzy
-msgid "New mainbord"
-msgstr "Новый пароль"
+msgid ""
+"This workstation has printer extension disabled. You can enable it by "
+"clicking below."
+msgstr ""
+"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+"ниже."
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
+#: plugins/admin/systems/class_printGeneric.inc:244
 #, fuzzy
-msgid "New processor"
-msgstr "Новый пароль"
+msgid ""
+"This terminal has printer extension disabled. You can enable it by clicking "
+"below."
+msgstr ""
+"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+"ниже."
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+#: plugins/admin/systems/class_printGeneric.inc:283
+msgid "This 'dn' has no printer features."
+msgstr "Этот DN не имеет свойств принтера."
+
+#: plugins/admin/systems/class_printGeneric.inc:419
+#, php-format
+msgid "Your currently selected PPD file '%s' doesn't exist."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:427
+#, fuzzy
+msgid "can't get ppd informations."
+msgstr "Системная информация"
+
+#: plugins/admin/systems/class_printGeneric.inc:439
+#, php-format
+msgid "This printer belongs to terminal %s. You can't rename this printer."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:441
+#, php-format
+msgid "This printer belongs to workstation %s. You can't rename this printer."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:519
+msgid "You have no permissions to create a printer on this 'Base'."
+msgstr "У вас недостаточно прав для создания принтера в этой ветке."
+
+#: plugins/admin/systems/servkolab.tpl:14
 #, fuzzy
-msgid "New case"
-msgstr "пользователи"
+msgid "POP3 service"
+msgstr "Служба печати"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
-msgid "C"
-msgstr ""
+#: plugins/admin/systems/servkolab.tpl:22
+#, fuzzy
+msgid "POP3/SSL service"
+msgstr "Служба SSH"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+#: plugins/admin/systems/servkolab.tpl:30
 #, fuzzy
-msgid "New network interface"
-msgstr "Сетевой принтер"
+msgid "IMAP service"
+msgstr "LDAP-сервер"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+#: plugins/admin/systems/servkolab.tpl:38
 #, fuzzy
-msgid "NI"
-msgstr "Unix"
+msgid "IMAP/SSL service"
+msgstr "Служба SSH"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+#: plugins/admin/systems/servkolab.tpl:46
 #, fuzzy
-msgid "New ram"
-msgstr "пользователи"
+msgid "Sieve service"
+msgstr "Служба SSH"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
-msgid "R"
+#: plugins/admin/systems/servkolab.tpl:54
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
-#, fuzzy
-msgid "New hard disk"
-msgstr "Сервер"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
-msgid "HDD"
+#: plugins/admin/systems/servkolab.tpl:62
+msgid "HTTP FreeBusy service (legacy)"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
-#, fuzzy
-msgid "New drive"
-msgstr "Сервер"
+#: plugins/admin/systems/servkolab.tpl:70
+msgid "Amavis email scanning (virus/spam)"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+#: plugins/admin/systems/servkolab.tpl:81
 #, fuzzy
-msgid "D"
-msgstr "UID"
+msgid "Quota settings"
+msgstr "Настройки Samba"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+#: plugins/admin/systems/servkolab.tpl:97
 #, fuzzy
-msgid "New controller"
-msgstr "Номер телефона"
+msgid "Free/Busy settings"
+msgstr "Настройки факса"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
-msgid "CS"
+#: plugins/admin/systems/servkolab.tpl:102
+msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
-msgid "New graphics card"
+#: plugins/admin/systems/servkolab.tpl:117
+msgid "SMTP privileged networks"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
-msgid "GC"
+#: plugins/admin/systems/servkolab.tpl:122
+msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
-#, fuzzy
-msgid "New sound card"
-msgstr "Новый пароль"
+#: plugins/admin/systems/servkolab.tpl:125
+msgid "Enter multiple values, seperated with"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
-msgid "SC"
+#: plugins/admin/systems/servkolab.tpl:138
+msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
-msgid "New power supply"
+#: plugins/admin/systems/servkolab.tpl:144
+msgid "Enable MX lookup for relayhost"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
-msgid "PS"
+#: plugins/admin/systems/servkolab.tpl:149
+msgid "Host used to relay mails"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
-#, fuzzy
-msgid "New misc device"
-msgstr "Сетевые устройства"
+#: plugins/admin/systems/servkolab.tpl:163
+msgid "Accept Internet Mail"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
-msgid "OC"
+#: plugins/admin/systems/servkolab.tpl:169
+msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:346
+#: plugins/admin/systems/phonesettings.tpl:1
 #, fuzzy
-msgid "You have to specify a valid name for this device."
-msgstr "Укажите корректный номер телефона."
+msgid "Advanced phone settings"
+msgstr "Настройки телефона"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:366
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:369
+#: plugins/admin/systems/phonesettings.tpl:6
 #, fuzzy
-msgid "This device name is already in use."
-msgstr "Указанное имя уже используется."
+msgid "Phone type"
+msgstr "Название"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
+#: plugins/admin/systems/phonesettings.tpl:7
+#: plugins/admin/systems/phonesettings.tpl:25
+#: plugins/admin/systems/phonesettings.tpl:35
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:78
+#: plugins/admin/systems/phonesettings.tpl:109
+#: plugins/admin/systems/phonesettings.tpl:156
 #, fuzzy
-msgid "Other"
-msgstr "Фильтры"
+msgid "Choose a phone type"
+msgstr "Выберите тип мыши"
 
-#: plugins/admin/systems/glpiPrinter.tpl:9
-#, fuzzy
-msgid "Printer type"
-msgstr "Имя принтера"
+#: plugins/admin/systems/phonesettings.tpl:10
+msgid "refresh"
+msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:31
+#: plugins/admin/systems/phonesettings.tpl:32
 #, fuzzy
-msgid "Supported interfaces"
-msgstr "Сетевой принтер"
+msgid "DTMF mode"
+msgstr "Режим"
 
-#: plugins/admin/systems/glpiPrinter.tpl:38
+#: plugins/admin/systems/phonesettings.tpl:46
+#: plugins/admin/systems/phonesettings.tpl:85
 #, fuzzy
-msgid "Serial"
-msgstr "терминалы"
+msgid "Default IP"
+msgstr "по умолчанию"
 
-#: plugins/admin/systems/glpiPrinter.tpl:46
+#: plugins/admin/systems/phonesettings.tpl:56
+#: plugins/admin/systems/phonesettings.tpl:93
+msgid "Response timeout"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:75
 #, fuzzy
-msgid "Parallel"
-msgstr "Переменная"
+msgid "Modus"
+msgstr "Мышь"
 
-#: plugins/admin/systems/glpiPrinter.tpl:54
-msgid "USB"
+#: plugins/admin/systems/phonesettings.tpl:106
+msgid "Authtype"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:114
+#: plugins/admin/systems/phonesettings.tpl:116
 #, fuzzy
-msgid "Installed cartridges"
-msgstr "Клиентские устройства"
-
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
-#, fuzzy, php-format
-msgid "You're about to delete the glpi cartridge type '%s'."
-msgstr "Вы собираетесь удалить приложение \"%s\"."
+msgid "Secret"
+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/phonesettings.tpl:124
+msgid "GoFonInkeys"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
-msgid "Cartridges"
+#: plugins/admin/systems/phonesettings.tpl:132
+msgid "GoFonOutKeys"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:2
-#, fuzzy
-msgid "Add/Edit monitor"
-msgstr "Редактиовать объект"
-
-#: plugins/admin/systems/glpi_devices.tpl:33
+#: plugins/admin/systems/phonesettings.tpl:145
 #, fuzzy
-msgid "Monitor size"
-msgstr "Мониторинг"
+msgid "Account code"
+msgstr "Учетная запись"
 
-#: plugins/admin/systems/glpi_devices.tpl:36
+#: plugins/admin/systems/phonesettings.tpl:153
 #, fuzzy
-msgid "Inch"
-msgstr "Французский"
+msgid "Trunk lines"
+msgstr "Тонкие клиенты"
 
-#: plugins/admin/systems/glpi_devices.tpl:44
-msgid "Integrated microphone"
+#: plugins/admin/systems/phonesettings.tpl:168
+msgid "Hosts that are allowed to connect"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:47
-#: plugins/admin/systems/glpi_devices.tpl:55
-#: plugins/admin/systems/glpi_devices.tpl:63
-#: plugins/admin/systems/glpi_devices.tpl:71
-#: plugins/admin/systems/glpi_devices.tpl:176
-#: plugins/admin/systems/glpi_devices.tpl:296
-#: plugins/admin/systems/glpi_devices.tpl:361
+#: plugins/admin/systems/phonesettings.tpl:183
 #, fuzzy
-msgid "Yes"
-msgstr "Системы"
+msgid "Hosts that are not allowed to connect"
+msgstr "У вас недостаточно прав для удаления этого объекта!"
 
-#: plugins/admin/systems/glpi_devices.tpl:48
-#: plugins/admin/systems/glpi_devices.tpl:56
-#: plugins/admin/systems/glpi_devices.tpl:64
-#: plugins/admin/systems/glpi_devices.tpl:72
-#: plugins/admin/systems/glpi_devices.tpl:177
-#: plugins/admin/systems/glpi_devices.tpl:297
-#: plugins/admin/systems/glpi_devices.tpl:362
+#: plugins/admin/systems/phonesettings.tpl:205
+msgid "MSN"
+msgstr ""
+
+#: plugins/admin/systems/wingeneric.tpl:6
 #, fuzzy
-msgid "No"
-msgstr "нет"
+msgid "Machine name"
+msgstr "Название"
 
-#: plugins/admin/systems/glpi_devices.tpl:52
-msgid "Integrated speakers"
+#: plugins/admin/systems/remove.tpl:6
+msgid ""
+"This includes <b>all</b> system and setup informations. Please double check "
+"if your really want to do this since there is no way for GOsa to get your "
+"data back."
 msgstr ""
+"Сюда входит <b>вся</b> информация о системе и ее настройках. Подумайте еще "
+"раз, действительно ли вам нужно удаление, так как GOsa не сможет отменить "
+"результаты этой операции."
 
-#: plugins/admin/systems/glpi_devices.tpl:60
-msgid "Sub-D"
-msgstr ""
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:73
+#, fuzzy, php-format
+msgid "You're about to delete the glpi attachment component '%s'."
+msgstr "Вы собираетесь удалить приложение \"%s\"."
 
-#: plugins/admin/systems/glpi_devices.tpl:68
-msgid "BNC"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:112
+#, php-format
+msgid ""
+"You can't delete this attachment, it is still in use by these system(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:76
-#, fuzzy
-msgid "Serial number"
-msgstr "Терминал"
-
-#: plugins/admin/systems/glpi_devices.tpl:83
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:124
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:128
 #, fuzzy
-msgid "Additional serial number"
-msgstr "Серийный номер сертификата"
+msgid "There is no valid file uploaded."
+msgstr "Файл небыл загружен"
 
-#: plugins/admin/systems/glpi_devices.tpl:97
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:131
 #, fuzzy
-msgid "Add/Edit other device"
-msgstr "Звуковая карта"
+msgid "Upload wasn't successfull."
+msgstr "Экспорт успешен."
 
-#: plugins/admin/systems/glpi_devices.tpl:138
-msgid "Add/Edit power supply"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:134
+msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:173
-msgid "Atx"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:138
+#, fuzzy
+msgid "There is already a file with the same name uploaded."
 msgstr ""
+"Пользователь с таким регистрационным именем в базе данных уже существует."
 
-#: plugins/admin/systems/glpi_devices.tpl:181
-#, fuzzy
-msgid "Power"
-msgstr "Порт"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:142
+#, fuzzy, php-format
+msgid "Can't create file '%s'."
+msgstr "Удалить"
 
-#: plugins/admin/systems/glpi_devices.tpl:193
-msgid "Add/Edit graphic card"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:186
+msgid "File is available."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:228
-#: plugins/admin/systems/glpi_devices.tpl:284
-#: plugins/admin/systems/glpi_devices.tpl:349
-msgid "Interface"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:188
+msgid "File is not readable, possibly the file is missing."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:237
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:191
 #, fuzzy
-msgid "Ram"
-msgstr "Имя сервера"
+msgid "Currently no file uploaded."
+msgstr "Файл небыл загружен"
 
-#: plugins/admin/systems/glpi_devices.tpl:249
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:202
 #, fuzzy
-msgid "Add/Edit controller"
-msgstr "Номер телефона"
+msgid "Mime"
+msgstr "Мобильный"
 
-#: plugins/admin/systems/glpi_devices.tpl:307
-msgid "Add/Edit drive"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:205
+msgid "This table displays all available attachments."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:342
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:222
 #, fuzzy
-msgid "Speed"
-msgstr "Пол"
+msgid "empty"
+msgstr "Шаблон"
 
-#: plugins/admin/systems/glpi_devices.tpl:358
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
 #, fuzzy
-msgid "Writeable"
-msgstr "запись"
+msgid "Create new attachment"
+msgstr "Подразделение"
 
-#: plugins/admin/systems/glpi_devices.tpl:371
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
 #, fuzzy
-msgid "Add/Edit harddisk"
-msgstr "Сервер"
+msgid "New Attachment"
+msgstr "подразделения"
 
-#: plugins/admin/systems/glpi_devices.tpl:406
-msgid "Rpm"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:352
+#, fuzzy
+msgid "Please specify a valid name for this attachment."
+msgstr "Укажите корректный номер телефона."
+
+#: plugins/admin/systems/headpage.tpl:6
+msgid "List of systems"
+msgstr "Список систем"
+
+#: plugins/admin/systems/headpage.tpl:24
+#, fuzzy
+msgid ""
+"This menu allows you to add, remove and change the properties of specific "
+"systems. You can only add systems which have already been started once."
 msgstr ""
+"С помощью этого меню вы можете добавлять, изменять и удалять свойства "
+"отдельных систем. Вы можете только добавлять системы которые однажды уже "
+"были запущены."
 
-#: plugins/admin/systems/glpi_devices.tpl:413
+#: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
+msgstr "Показать серверы"
+
+#: plugins/admin/systems/headpage.tpl:39
 #, fuzzy
-msgid "Cache"
-msgstr "Отмена"
+msgid "Select to see Linux terminals"
+msgstr "Выберите чтобы посмотреть терминалы"
 
-#: plugins/admin/systems/glpi_devices.tpl:443
+#: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
+msgstr "Показать терминалы"
+
+#: plugins/admin/systems/headpage.tpl:40
 #, fuzzy
-msgid "Add/Edit memory"
-msgstr "Редактиовать объект"
+msgid "Select to see Linux workstations"
+msgstr "Выберите чтобы посмотреть рабочие станции"
 
-#: plugins/admin/systems/glpi_devices.tpl:478
+#: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
+msgstr "Показать рабочие станции"
+
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Select to see MicroSoft Windows based workstations"
+msgstr "Посмотреть рабочие станции с MicroSoft Windows"
+
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Show windows based workstations"
+msgstr "Показать рабочие станции с windows"
+
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Select to see network printers"
+msgstr "Выберите чтобы посмотреть сетевые принтеры"
+
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Show network printers"
+msgstr "Показать сетевые принтеры"
+
+#: plugins/admin/systems/headpage.tpl:43
+msgid "Select to see VOIP phones"
+msgstr "Выберите чтобы посмотреть VOIP телефоны"
+
+#: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
+msgstr "Показать телефоны"
+
+#: plugins/admin/systems/headpage.tpl:44
 #, fuzzy
-msgid "Frequenz"
-msgstr "Номер телефона"
+msgid "Select to see network devices"
+msgstr "Выберите чтобы посмотреть сетевые принтеры"
 
-#: plugins/admin/systems/glpi_devices.tpl:507
+#: plugins/admin/systems/headpage.tpl:44
 #, fuzzy
-msgid "Add/Edit sound card"
-msgstr "Новый пароль"
+msgid "Show network devices"
+msgstr "Сетевые устройства"
 
-#: plugins/admin/systems/glpi_devices.tpl:553
+#: plugins/admin/systems/headpage.tpl:52
+msgid "Regular expression for matching system names"
+msgstr "Регулярное выражение, соответствующее именам систем"
+
+#: plugins/admin/systems/headpage.tpl:59
 #, fuzzy
-msgid "Add/Edit network interface"
-msgstr "Сетевой принтер"
+msgid "Display systems of user"
+msgstr "Показать адреса пользователя"
 
-#: plugins/admin/systems/glpi_devices.tpl:589
+#: plugins/admin/systems/headpage.tpl:62
+msgid "User name of which terminal(s) are shown"
+msgstr "Имя пользователя, для которого перечисляются терминалы"
+
+#: plugins/admin/systems/glpiAttachmentPool.tpl:6
 #, fuzzy
-msgid "MAC address"
-msgstr "MAC-адрес"
+msgid "List of attachments"
+msgstr "Список подразделений"
 
-#: plugins/admin/systems/glpi_devices.tpl:607
+#: plugins/admin/systems/glpiAttachmentPool.tpl:23
+msgid ""
+"This dialog allow you to attach additional objects (like manuals, guides, "
+"etc.)  to your currently edited computer."
+msgstr ""
+
+#: plugins/admin/systems/glpiAttachmentPool.tpl:35
 #, fuzzy
-msgid "Add/Edit processor"
-msgstr "Новый пароль"
+msgid "Display attachments matching"
+msgstr "Шаблон для подразделений"
 
-#: plugins/admin/systems/glpi_devices.tpl:642
+#: plugins/admin/systems/glpiAttachmentPool.tpl:37
 #, fuzzy
-msgid "Frequence"
-msgstr "Номер телефона"
+msgid "Regular expression for matching attachment names"
+msgstr "Регулярное выражение, соответствующее именам подразделений"
 
-#: plugins/admin/systems/glpi_devices.tpl:649
+#: plugins/admin/systems/password.tpl:2
 #, fuzzy
-msgid "Default frequence"
-msgstr "По умолчанию"
+msgid ""
+"To change the terminal root password use the fields below. The changes take "
+"effect during the next reboot. Please memorize the new password, because you "
+"wouldn't be able to log in."
+msgstr ""
+"В полях ниже вы можете изменить пароль выбранного пользователя. Изменения "
+"вступят в силу немедленно. Пожалуйста, запомните новый пароль, так как иначе "
+"пользователь не сможет войти в систему."
+
+#: plugins/admin/systems/password.tpl:5
+msgid "Leave fields blank for password inheritance from default entries."
+msgstr ""
+
+#: plugins/admin/systems/password.tpl:9
+msgid "Changing the password impinges on authentification only."
+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/glpi_devices.tpl:661
-#, fuzzy
-msgid "Add/Edit motherboard"
-msgstr "Клавиатура"
+#: plugins/admin/systems/chooser.tpl:11
+msgid "Network printer"
+msgstr "Сетевой принтер"
 
-#: plugins/admin/systems/glpi_devices.tpl:696
-#, fuzzy
-msgid "Chipset"
-msgstr "сброс"
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
+msgstr "Прочие сетевые компоненты"
 
-#: plugins/admin/systems/glpi_devices.tpl:707
-#, fuzzy
-msgid "Add/Edit computer case"
-msgstr "не полный"
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
+msgstr "Создать"
 
-#: plugins/admin/systems/glpi_devices.tpl:742
-#, fuzzy
-msgid "format"
-msgstr "Порт"
+#: plugins/admin/systems/class_glpiManufacturer.inc:58
+#, php-format
+msgid ""
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
+msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
+#: plugins/admin/systems/class_glpiManufacturer.inc:104
 #, fuzzy
-msgid "Attachment"
-msgstr "подразделения"
+msgid "Please specify a name."
+msgstr "Введите корректное имя пользователя!"
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
+#: plugins/admin/systems/class_glpiManufacturer.inc:113
+#: plugins/admin/systems/class_glpiManufacturer.inc:119
 #, fuzzy
-msgid "Filename"
-msgstr "Имя сервера"
+msgid "Specified name is already in use, please choose another one."
+msgstr "Группа с таким именем уже существует."
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
-#, fuzzy
-msgid "Mime-type"
-msgstr "Тип"
+#: plugins/admin/systems/class_phoneGeneric.inc:105
+msgid "This 'dn' has no phone features."
+msgstr "Этот DN не имеет свойств телефона."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:336
+#: plugins/admin/systems/class_phoneGeneric.inc:202
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
 #, fuzzy
-msgid "This zoneName is already in use"
-msgstr "Указанное имя уже используется."
+msgid "yes"
+msgstr "Системы"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:339
+#: plugins/admin/systems/class_phoneGeneric.inc:202
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
 #, fuzzy
-msgid "This reverse zone is already in use"
-msgstr "Указанное имя уже используется."
+msgid "no"
+msgstr "нет"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:344
-msgid "Primary dns server must end with '.' to be a valid entry."
+#: plugins/admin/systems/class_phoneGeneric.inc:223
+msgid "dynamic"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:348
-msgid "Your specified mail address must end with '.' to be a valid record."
-msgstr ""
+#: plugins/admin/systems/class_phoneGeneric.inc:223
+#, fuzzy
+msgid "Networksettings"
+msgstr "Сетевые настройки"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:352
-#: plugins/admin/systems/class_servDNSeditZone.inc:356
+#: plugins/admin/systems/class_phoneGeneric.inc:238
+#, php-format
 msgid ""
-"Your mail address contains '@' replace this with '.' to enable GOsa to "
-"create a valid SOA record."
+"Can't delete because there are user which are depending on this phone. One "
+"of them is user '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:360
-msgid "Only lowercase strings are allowed as zone name."
+#: plugins/admin/systems/class_phoneGeneric.inc:294
+#, fuzzy
+msgid "The required field 'Phone name' is not set."
+msgstr "Обязательное поле \"Личное имя\" не заполнено."
+
+#: plugins/admin/systems/class_phoneGeneric.inc:297
+msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:364
+#: plugins/admin/systems/class_phoneGeneric.inc:304
+msgid "You have no permissions to create a phone on this 'Base'."
+msgstr "У вас недостаточно прав для создания телефонов в этой ветке."
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
 #, fuzzy
-msgid "Please specify a numeric value for serial number."
-msgstr "Укажите корректный номер телефона."
+msgid "Printer ppd selection."
+msgstr "Настройки телефона"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:368
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
 #, fuzzy
-msgid "Please specify a numeric value for refresh."
-msgstr "Укажите корректный номер телефона."
+msgid "Select entries to add"
+msgstr "Выбрать пользователей для добавления"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:372
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
 #, fuzzy
-msgid "Please specify a numeric value for ttl."
-msgstr "Укажите корректный номер телефона."
+msgid "Display members of department"
+msgstr "Показать номера из подразделения"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:376
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
 #, fuzzy
-msgid "Please specify a numeric value for expire."
-msgstr "Укажите корректный номер телефона."
+msgid "Display members matching"
+msgstr "Показать совпадения номеров"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:380
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
 #, fuzzy
-msgid "Please specify a numeric value for retry."
-msgstr "Укажите корректный номер телефона."
+msgid "Regular expression for matching member names"
+msgstr "Регулярное выражение, соответствующее именам пользователей"
 
 #: plugins/admin/systems/SelectDeviceType.tpl:3
 msgid ""
@@ -10141,62 +10341,22 @@ msgstr "Метод '%s' не описан в вашем файле конфиг
 msgid "There is a duplicate entry in '%s' for '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:97
-#, fuzzy
-msgid "Remove FAI repository extension."
-msgstr "Удалить параметры"
-
-#: plugins/admin/systems/class_servRepository.inc:98
-#, fuzzy
-msgid ""
-"This server has FAI repository features enabled. You can disable them by "
-"clicking below."
-msgstr ""
-"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
-"ниже."
-
-#: plugins/admin/systems/class_servRepository.inc:100
-msgid "Add FAI repository extension."
-msgstr ""
-
-#: plugins/admin/systems/class_servRepository.inc:101
-#, fuzzy
-msgid ""
-"This server has FAI repository features disabled. You can enable them by "
-"clicking below."
-msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
-
-#: plugins/admin/systems/class_servRepository.inc:144
-#, php-format
-msgid ""
-"You can't delete this release, it is still used by these workstations [%s]. "
-"Please solve this dependencies first, to keep data base consistency."
-msgstr ""
-
-#: plugins/admin/systems/class_servRepository.inc:176
-#, php-format
-msgid ""
-"Be careful editing this release, it is still used by these workstations [%s]."
-msgstr ""
-
 #: plugins/admin/systems/class_baseSelectDialog.inc:23
 #, fuzzy
 msgid "Choose a base"
 msgstr "Выберите тип мыши"
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:33
+#: plugins/admin/systems/class_baseSelectDialog.inc:34
 msgid ""
 "Step in the prefered tree and click save to use the current subtree as base. "
 "Or click the image at the end of each entry."
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:50
+#: plugins/admin/systems/class_baseSelectDialog.inc:51
 msgid "Filter entries with this syntax"
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:114
+#: plugins/admin/systems/class_baseSelectDialog.inc:115
 #, fuzzy, php-format
 msgid "Select this base"
 msgstr "Удалить"
@@ -10301,54 +10461,6 @@ msgstr ""
 msgid "Select action to execute for this   group of terminals"
 msgstr "Выберите действие, которое нужно выполнить на этом терминале"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
-msgid "Object groups"
-msgstr "Объединения"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:54
-msgid "UNIX accounts"
-msgstr "UNIX аккаунт"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:58 html/getxls.php:149
-#: html/getxls.php:151 html/getxls.php:158 html/getxls.php:179
-#: html/getxls.php:245 html/getxls.php:316
-msgid "Servers"
-msgstr "Серверы"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:59
-msgid "Thin Clients"
-msgstr "Тонкие клиенты"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:60
-msgid "Workstations"
-msgstr "Рабочие станции"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:279
-#, php-format
-msgid "You're about to delete the object group '%s'."
-msgstr "Вы собираетесь удалить групповой объект \"%s\"."
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:285
-#: plugins/admin/ogroups/class_ogroupManagement.inc:311
-msgid "You are not allowed to delete this object group!"
-msgstr "У вас недостаточно прав для удаления этого группового объекта!"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:448
-#, fuzzy
-msgid "Create new object group"
-msgstr "Объект группы"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:492
-#, fuzzy
-msgid "Name of object groups"
-msgstr "Название группы"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:541
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
-msgstr "Объект группы"
-
 #: plugins/admin/ogroups/class_ogroup.inc:144
 msgid "This 'dn' is no object group."
 msgstr "Этот объект не является группой."
@@ -10407,10 +10519,58 @@ msgid "There is already an object with this cn."
 msgstr ""
 "Пользователь с таким регистрационным именем в базе данных уже существует."
 
-#: plugins/admin/ogroups/class_ogroup.inc:665
-msgid "You can combine two different object types at maximum only!"
-msgstr ""
-"Вы можете комбинировать не более двух различных классов в одном объекте!"
+#: plugins/admin/ogroups/class_ogroup.inc:665
+msgid "You can combine two different object types at maximum only!"
+msgstr ""
+"Вы можете комбинировать не более двух различных классов в одном объекте!"
+
+#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+msgid "Object groups"
+msgstr "Объединения"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:54
+msgid "UNIX accounts"
+msgstr "UNIX аккаунт"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:58 html/getxls.php:149
+#: html/getxls.php:151 html/getxls.php:158 html/getxls.php:179
+#: html/getxls.php:245 html/getxls.php:316
+msgid "Servers"
+msgstr "Серверы"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:59
+msgid "Thin Clients"
+msgstr "Тонкие клиенты"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:60
+msgid "Workstations"
+msgstr "Рабочие станции"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:279
+#, php-format
+msgid "You're about to delete the object group '%s'."
+msgstr "Вы собираетесь удалить групповой объект \"%s\"."
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:285
+#: plugins/admin/ogroups/class_ogroupManagement.inc:311
+msgid "You are not allowed to delete this object group!"
+msgstr "У вас недостаточно прав для удаления этого группового объекта!"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:449
+#, fuzzy
+msgid "Create new object group"
+msgstr "Объект группы"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:493
+#, fuzzy
+msgid "Name of object groups"
+msgstr "Название группы"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:542
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
+msgstr "Объект группы"
 
 #: plugins/admin/ogroups/generic.tpl:9
 msgid "Name of the group"
@@ -10745,6 +10905,80 @@ msgstr ""
 msgid "Ring instead of playing background music"
 msgstr ""
 
+#: plugins/gofon/fonreports/class_fonreport.inc:6
+msgid "Phone Reports"
+msgstr "Телефонные отчеты"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:96
+#: plugins/gofon/fonreports/class_fonreport.inc:106
+#, fuzzy
+msgid "Can't connect to phone database, no reports can be shown!"
+msgstr ""
+"Не удается подключиться к базе данных факсов, отчеты показаны не будут!"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:110
+#, fuzzy
+msgid "Can't select phone database for report generation!"
+msgstr "Не удается выбрать базу данных факсов для создания отчетов!"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:212
+msgid "Query for phone database failed!"
+msgstr "Запрос в базу телефонов не выполнен!"
+
+#: plugins/gofon/fonreports/contents.tpl:31
+msgid "Source"
+msgstr "Источник"
+
+#: plugins/gofon/fonreports/contents.tpl:32
+msgid "Destination"
+msgstr "Назначение"
+
+#: plugins/gofon/fonreports/contents.tpl:33
+msgid "Channel"
+msgstr "Канал"
+
+#: plugins/gofon/fonreports/contents.tpl:36
+msgid "Duration"
+msgstr "Продолжительность"
+
+#: plugins/gofon/fonreports/main.inc:5
+msgid "Phone reports"
+msgstr "Телефонные отчеты"
+
+#: plugins/gofon/macro/parameter.tpl:3
+#, fuzzy
+msgid "Argument"
+msgstr "подразделения"
+
+#: plugins/gofon/macro/parameter.tpl:7
+#, fuzzy
+msgid "type"
+msgstr "Тип"
+
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+#, fuzzy
+msgid "Macro name"
+msgstr "Название"
+
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
+msgstr ""
+
+#: plugins/gofon/macro/generic.tpl:22
+#, fuzzy
+msgid "Choose subtree to place macro in"
+msgstr "Выберите ветку для группы"
+
+#: plugins/gofon/macro/generic.tpl:43
+#, fuzzy
+msgid "Visible for user"
+msgstr "Список пользователей"
+
+#: plugins/gofon/macro/generic.tpl:52
+#, fuzzy
+msgid "Macro text"
+msgstr "Название"
+
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:25
 #, fuzzy
 msgid "Phone macros"
@@ -10761,31 +10995,31 @@ msgstr "Вы собираетесь удалить группу \"%s\"."
 msgid "You are not allowed to delete this macro!"
 msgstr "У вас недостаточно прав для удаления этой группы!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
 #, fuzzy
 msgid "Create new phone macro"
 msgstr "Создать телефонный аккаунт"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
 #, fuzzy
 msgid "Visible"
 msgstr "Переменная"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:348
 msgid "This table displays all phone macros, in the selected tree."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
 #, fuzzy
 msgid "Macro"
 msgstr "Название"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
 #, fuzzy
 msgid "visible"
 msgstr "Видимый всем"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
 #, fuzzy
 msgid "invisible"
 msgstr "Видимый всем"
@@ -10866,29 +11100,36 @@ msgstr ""
 msgid "Please choose a valid  base."
 msgstr "Пожалуйста, укажите корректную кадровую синхронизацию."
 
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+#: plugins/gofon/macro/headpage.tpl:6
 #, fuzzy
-msgid "Macro name"
-msgstr "Название"
+msgid "List of macros"
+msgstr "Список групп"
 
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
+#: plugins/gofon/macro/headpage.tpl:24
+#, fuzzy
+msgid ""
+"This menu allows you to add, edit and remove selected macros. You may want "
+"to use the range selector on top of the macro listbox, when working with a "
+"large number of macros."
 msgstr ""
+"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+"группы пользователей. Если у вас их достаточно большое количество, вы можете "
+"использовать групповое выделение."
 
-#: plugins/gofon/macro/generic.tpl:22
+#: plugins/gofon/macro/headpage.tpl:38
 #, fuzzy
-msgid "Choose subtree to place macro in"
-msgstr "Выберите ветку для группы"
+msgid "Display macros matching"
+msgstr "Шаблон для групп"
 
-#: plugins/gofon/macro/generic.tpl:43
+#: plugins/gofon/macro/headpage.tpl:38
 #, fuzzy
-msgid "Visible for user"
-msgstr "Список пользователей"
+msgid "Display macros  matching"
+msgstr "Шаблон для групп"
 
-#: plugins/gofon/macro/generic.tpl:52
+#: plugins/gofon/macro/headpage.tpl:41
 #, fuzzy
-msgid "Macro text"
-msgstr "Название"
+msgid "Regular expression for matching macro names"
+msgstr "Регулярное выражение, соответствующее именам групп"
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:245
 #, fuzzy
@@ -10931,51 +11172,15 @@ msgid ""
 "using this macro '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:6
-#, fuzzy
-msgid "List of macros"
-msgstr "Список групп"
-
-#: plugins/gofon/macro/headpage.tpl:24
-#, fuzzy
-msgid ""
-"This menu allows you to add, edit and remove selected macros. You may want "
-"to use the range selector on top of the macro listbox, when working with a "
-"large number of macros."
-msgstr ""
-"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
-"группы пользователей. Если у вас их достаточно большое количество, вы можете "
-"использовать групповое выделение."
-
-#: plugins/gofon/macro/headpage.tpl:38
-#, fuzzy
-msgid "Display macros matching"
-msgstr "Шаблон для групп"
-
-#: plugins/gofon/macro/headpage.tpl:38
-#, fuzzy
-msgid "Display macros  matching"
-msgstr "Шаблон для групп"
-
-#: plugins/gofon/macro/headpage.tpl:41
-#, fuzzy
-msgid "Regular expression for matching macro names"
-msgstr "Регулярное выражение, соответствующее именам групп"
-
 #: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
 #, fuzzy
 msgid "Phone macro management"
 msgstr "Управление системами"
 
-#: plugins/gofon/macro/parameter.tpl:3
-#, fuzzy
-msgid "Argument"
-msgstr "подразделения"
-
-#: plugins/gofon/macro/parameter.tpl:7
-#, fuzzy
-msgid "type"
-msgstr "Тип"
+#: plugins/gofon/phoneaccount/main.inc:122
+#: plugins/gofon/phoneaccount/paste_generic.tpl:1
+msgid "Phone settings"
+msgstr "Настройки телефона"
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:118
 #, fuzzy
@@ -11107,50 +11312,6 @@ msgstr "Телефон"
 msgid "Phone macro"
 msgstr "Телефонные отчеты"
 
-#: plugins/gofon/phoneaccount/main.inc:122
-#: plugins/gofon/phoneaccount/paste_generic.tpl:1
-msgid "Phone settings"
-msgstr "Настройки телефона"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
-#, fuzzy
-msgid "Phone conferences"
-msgstr "Номер телефона"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-#, fuzzy
-msgid "Management"
-msgstr "Название"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
-#, fuzzy
-msgid "Create new conference"
-msgstr "Создание нового объекта в"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
-#, fuzzy
-msgid "New conference"
-msgstr "Номер телефона"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
-msgid "This table displays all available conference rooms."
-msgstr ""
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:309
-#, fuzzy
-msgid "Name - Number"
-msgstr "Номер телефона"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
-#: plugins/gofon/conference/generic.tpl:107
-msgid "PIN"
-msgstr ""
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:365
-#, fuzzy
-msgid "Conference"
-msgstr "Ссылки"
-
 #: plugins/gofon/conference/generic.tpl:13
 #, fuzzy
 msgid "Conference name"
@@ -11176,6 +11337,11 @@ msgstr ""
 msgid "Preset PIN"
 msgstr "присутствует"
 
+#: plugins/gofon/conference/generic.tpl:107
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
+msgid "PIN"
+msgstr ""
+
 #: plugins/gofon/conference/generic.tpl:113
 #, fuzzy
 msgid "Record conference"
@@ -11189,19 +11355,74 @@ msgstr ""
 msgid "Play music on hold"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:144
+#: plugins/gofon/conference/generic.tpl:144
+#, fuzzy
+msgid "Activate session menu"
+msgstr "Включить автоответчик"
+
+#: plugins/gofon/conference/generic.tpl:150
+msgid "Announce users joining or leaving the conference"
+msgstr ""
+
+#: plugins/gofon/conference/generic.tpl:156
+#, fuzzy
+msgid "Count users"
+msgstr "Страна"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+#, fuzzy
+msgid "Phone conferences"
+msgstr "Номер телефона"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+#, fuzzy
+msgid "Management"
+msgstr "Название"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
+#, fuzzy
+msgid "Create new conference"
+msgstr "Создание нового объекта в"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
+#, fuzzy
+msgid "New conference"
+msgstr "Номер телефона"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:306
+msgid "This table displays all available conference rooms."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
+#, fuzzy
+msgid "Name - Number"
+msgstr "Номер телефона"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:366
+#, fuzzy
+msgid "Conference"
+msgstr "Ссылки"
+
+#: plugins/gofon/conference/headpage.tpl:6
 #, fuzzy
-msgid "Activate session menu"
-msgstr "Включить автоответчик"
+msgid "List of conference rooms"
+msgstr "Список групп"
 
-#: plugins/gofon/conference/generic.tpl:150
-msgid "Announce users joining or leaving the conference"
+#: plugins/gofon/conference/headpage.tpl:24
+#, fuzzy
+msgid ""
+"This menu allows you to create, delete and edit selected phone conferences. "
+"Having a large number of phone conferences, you might prefer the range "
+"selectors on top of the conferences list."
 msgstr ""
+"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+"подразделения. Если у вас достаточно большое количество подразделений, вы "
+"можете использовать групповое выделение."
 
-#: plugins/gofon/conference/generic.tpl:156
+#: plugins/gofon/conference/headpage.tpl:36
 #, fuzzy
-msgid "Count users"
-msgstr "Страна"
+msgid "Regular expression for        matching user names"
+msgstr "Регулярное выражение, соответствующее именам пользователей"
 
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
 msgid ""
@@ -11234,72 +11455,11 @@ msgid ""
 "extension available in your php setup."
 msgstr ""
 
-#: plugins/gofon/conference/headpage.tpl:6
-#, fuzzy
-msgid "List of conference rooms"
-msgstr "Список групп"
-
-#: plugins/gofon/conference/headpage.tpl:24
-#, fuzzy
-msgid ""
-"This menu allows you to create, delete and edit selected phone conferences. "
-"Having a large number of phone conferences, you might prefer the range "
-"selectors on top of the conferences list."
-msgstr ""
-"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
-"подразделения. Если у вас достаточно большое количество подразделений, вы "
-"можете использовать групповое выделение."
-
-#: plugins/gofon/conference/headpage.tpl:36
-#, fuzzy
-msgid "Regular expression for        matching user names"
-msgstr "Регулярное выражение, соответствующее именам пользователей"
-
 #: plugins/gofon/conference/main.inc:38 plugins/gofon/conference/main.inc:40
 #, fuzzy
 msgid "Conference management"
 msgstr "Управление подразделениями"
 
-#: plugins/gofon/fonreports/class_fonreport.inc:6
-msgid "Phone Reports"
-msgstr "Телефонные отчеты"
-
-#: plugins/gofon/fonreports/class_fonreport.inc:96
-#: plugins/gofon/fonreports/class_fonreport.inc:106
-#, fuzzy
-msgid "Can't connect to phone database, no reports can be shown!"
-msgstr ""
-"Не удается подключиться к базе данных факсов, отчеты показаны не будут!"
-
-#: plugins/gofon/fonreports/class_fonreport.inc:110
-#, fuzzy
-msgid "Can't select phone database for report generation!"
-msgstr "Не удается выбрать базу данных факсов для создания отчетов!"
-
-#: plugins/gofon/fonreports/class_fonreport.inc:212
-msgid "Query for phone database failed!"
-msgstr "Запрос в базу телефонов не выполнен!"
-
-#: plugins/gofon/fonreports/contents.tpl:31
-msgid "Source"
-msgstr "Источник"
-
-#: plugins/gofon/fonreports/contents.tpl:32
-msgid "Destination"
-msgstr "Назначение"
-
-#: plugins/gofon/fonreports/contents.tpl:33
-msgid "Channel"
-msgstr "Канал"
-
-#: plugins/gofon/fonreports/contents.tpl:36
-msgid "Duration"
-msgstr "Продолжительность"
-
-#: plugins/gofon/fonreports/main.inc:5
-msgid "Phone reports"
-msgstr "Телефонные отчеты"
-
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
 msgstr "Тонкий клиент"
@@ -11346,26 +11506,72 @@ msgstr "Команда разработчиков GOsa"
 msgid "Welcome %s!"
 msgstr "Добро пожаловать %s!"
 
-#: include/class_plugin.inc:465
-#, php-format
+#: include/class_mail-methods-cyrus.inc:39
 msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+"Warning: Account has an invalid mailserver string! Please check the mail "
+"server settings in the mail tab."
 msgstr ""
-"Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
 
-#: include/class_plugin.inc:493 include/class_password-methods.inc:181
-#, fuzzy, php-format
+#: include/class_mail-methods-cyrus.inc:52
 msgid ""
-"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+"Warning: IMAP Server cannot be reached! If you save this account, some mail "
+"settings will not be stored on your server!"
 msgstr ""
-"Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
+"Предупреждение: не удается получить доступ к серверу IMAP! Некоторые "
+"почтовые настройки не будут сохранены."
 
-#: include/class_plugin.inc:521
+#: include/class_mail-methods-cyrus.inc:115
 #, php-format
-msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgid "Can't create IMAP mailbox. Server says '%s'."
+msgstr "Не удается создать почтовый ящик IMAP. Ответ сервера: \"%s\"."
+
+#: include/class_mail-methods-cyrus.inc:131
+#, php-format
+msgid "Can't write IMAP quota. Server says '%s'."
+msgstr "Не удается создать квоту IMAP. Ответ сервера: \"%s\"."
+
+#: include/class_mail-methods-cyrus.inc:155
+#, fuzzy
+msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
 msgstr ""
-"Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
+"Предупреждение: функция imap_getacl не реализована, и вы не сможете менять "
+"права доступа к общим папкам."
+
+#: include/class_mail-methods-cyrus.inc:173
+msgid "Warning: imap_getacl is not available, can't get imap permissions!"
+msgstr ""
+"Предупреждение: функция imap_getacl недоступна, не удается считать права на "
+"доступ к папкам!"
+
+#: include/class_mail-methods-cyrus.inc:195
+#, php-format
+msgid "Can't remove IMAP mailbox. Server says '%s'."
+msgstr "Не удается удалить почтовый ящик IMAP. Ответ сервера: '%s'."
+
+#: include/class_mail-methods-cyrus.inc:223
+#, php-format
+msgid "Can't log into SIEVE server. Server says '%s'."
+msgstr "Невозможно зарегистрироваться на сервере SIEVE. Ответ сервера: \"%s\"."
+
+#: include/class_mail-methods-cyrus.inc:236
+#, php-format
+msgid "Can't get sieve script. Server says '%s'."
+msgstr "Невозможно получить сценарий SIEVE. Ответ сервера: \"%s\"."
+
+#: include/class_mail-methods-cyrus.inc:307
+#, php-format
+msgid "Can't send sieve script. Server says '%s'."
+msgstr "Невозможно отправить сценарий SIEVE. Ответ сервера: \"%s\"."
+
+#: include/class_mail-methods-cyrus.inc:311
+#, php-format
+msgid "Can't activate GOsa sieve script. Server says '%s'."
+msgstr "Невозможно активировать сценарий  GOsa SIEVE. Ответ сервера: \"%s\"."
+
+#: include/class_debconfTemplate.inc:250
+#, fuzzy
+msgid "This package has no debconf options."
+msgstr "В этой учетной записи нет атрибутов для телефона."
 
 #: include/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
@@ -11837,6 +12043,7 @@ msgstr "Невозможно зарегистрироваться на LDAP-се
 #: include/functions_setup.inc:1082 html/index.php:181
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
+#: ihtml/themes/lhs/setup_useradmin.tpl:6
 msgid ""
 "You're missing an administrative account for GOsa, you'll not be able to "
 "administrate anything!"
@@ -11849,6 +12056,13 @@ msgstr ""
 msgid "Setting the password failed. LDAP server says '%s'."
 msgstr "Ошибка при установке пароля. Ответ LDAP-сервера: \"%s\"."
 
+#: include/class_password-methods.inc:181 include/class_plugin.inc:493
+#, fuzzy, php-format
+msgid ""
+"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
+
 #: include/class_password-methods.inc:202
 msgid ""
 "Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
@@ -11887,22 +12101,6 @@ msgstr ""
 msgid "%s%% hit rate in file %s"
 msgstr ""
 
-#: include/class_password-methods-kerberos.inc:43
-msgid ""
-"Warning: Can't set kerberos password. Your PHP version has no kerberos "
-"support, password has not been changed."
-msgstr ""
-"Предупреждение: не удается создать пароль Kerberos. В вашей установке PHP "
-"нет поддержки Kerberos, пароль не был изменен."
-
-#: include/class_password-methods-kerberos.inc:52
-msgid "Kerberos database communication failed!"
-msgstr "Ошибка подключения к базе данных Kerberos!"
-
-#: include/class_password-methods-kerberos.inc:59
-msgid "Changing password in kerberos database failed!"
-msgstr "Ошибка смены пароля в базе данных Kerberos!"
-
 #: include/class_ppdManager.inc:13
 #, php-format
 msgid "PPD manager : The specified path '%s' doesn't exists."
@@ -11943,6 +12141,22 @@ msgstr ""
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 
+#: include/class_password-methods-kerberos.inc:43
+msgid ""
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
+msgstr ""
+"Предупреждение: не удается создать пароль Kerberos. В вашей установке PHP "
+"нет поддержки Kerberos, пароль не был изменен."
+
+#: include/class_password-methods-kerberos.inc:52
+msgid "Kerberos database communication failed!"
+msgstr "Ошибка подключения к базе данных Kerberos!"
+
+#: include/class_password-methods-kerberos.inc:59
+msgid "Changing password in kerberos database failed!"
+msgstr "Ошибка смены пароля в базе данных Kerberos!"
+
 #: include/class_certificate.inc:35
 msgid "Can't open specified file, check accessibility and or existence"
 msgstr ""
@@ -12146,6 +12360,7 @@ msgstr ""
 #: include/class_pluglist.inc:130 ihtml/themes/altlinux/framework.tpl:14
 #: ihtml/themes/altlinux/framework.tpl:24
 #: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
+#: ihtml/themes/lhs/framework.tpl:14 ihtml/themes/lhs/framework.tpl:24
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
 "changes?"
@@ -12167,123 +12382,79 @@ msgstr ""
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr "В вашем файле настройки отсутствуют значения SID и/или RIDBASE!"
 
-#: include/class_ldap.inc:406
+#: include/class_ldap.inc:405
 #, fuzzy, php-format
-msgid "Creating duplicate of %s in %s"
+msgid "Creating copy of %s"
 msgstr "Список пользователей"
 
-#: include/class_ldap.inc:409
+#: include/class_ldap.inc:408
 msgid "Processing"
 msgstr ""
 
-#: include/class_ldap.inc:515
+#: include/class_ldap.inc:448
+msgid "Error while fetching source dn - aborted!"
+msgstr ""
+
+#: include/class_ldap.inc:511
 #, fuzzy, php-format
 msgid "Unknown FAIstate %s"
 msgstr "состояние неизвестно"
 
-#: include/class_ldap.inc:558
-#, fuzzy
-msgid "Successfully finished"
-msgstr "Настройка завершена"
-
-#: include/class_ldap.inc:635
-#, php-format
-msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
-msgstr ""
-"Автоматическое создание типа \"%s\" не поддерживается. Пожалуйста, сообщите "
-"об этом команде разработчиков GOsa."
-
-#: include/class_ldap.inc:897
-#, php-format
-msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-
-#: include/class_ldap.inc:910
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
-msgstr ""
-
-#: include/class_ldap.inc:926
-#, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
-msgstr ""
-
-#: include/class_debconfTemplate.inc:250
-#, fuzzy
-msgid "This package has no debconf options."
-msgstr "В этой учетной записи нет атрибутов для телефона."
-
-#: include/class_mail-methods-cyrus.inc:39
-msgid ""
-"Warning: Account has an invalid mailserver string! Please check the mail "
-"server settings in the mail tab."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:52
-msgid ""
-"Warning: IMAP Server cannot be reached! If you save this account, some mail "
-"settings will not be stored on your server!"
-msgstr ""
-"Предупреждение: не удается получить доступ к серверу IMAP! Некоторые "
-"почтовые настройки не будут сохранены."
-
-#: include/class_mail-methods-cyrus.inc:115
-#, php-format
-msgid "Can't create IMAP mailbox. Server says '%s'."
-msgstr "Не удается создать почтовый ящик IMAP. Ответ сервера: \"%s\"."
-
-#: include/class_mail-methods-cyrus.inc:131
-#, php-format
-msgid "Can't write IMAP quota. Server says '%s'."
-msgstr "Не удается создать квоту IMAP. Ответ сервера: \"%s\"."
-
-#: include/class_mail-methods-cyrus.inc:155
-#, fuzzy
-msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
-msgstr ""
-"Предупреждение: функция imap_getacl не реализована, и вы не сможете менять "
-"права доступа к общим папкам."
-
-#: include/class_mail-methods-cyrus.inc:173
-msgid "Warning: imap_getacl is not available, can't get imap permissions!"
+#: include/class_ldap.inc:632
+#, php-format
+msgid ""
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
 msgstr ""
-"Предупреждение: функция imap_getacl недоступна, не удается считать права на "
-"доступ к папкам!"
+"Автоматическое создание типа \"%s\" не поддерживается. Пожалуйста, сообщите "
+"об этом команде разработчиков GOsa."
 
-#: include/class_mail-methods-cyrus.inc:195
+#: include/class_ldap.inc:894
 #, php-format
-msgid "Can't remove IMAP mailbox. Server says '%s'."
-msgstr "Не удается удалить почтовый ящик IMAP. Ответ сервера: '%s'."
+msgid ""
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
+msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:223
+#: include/class_ldap.inc:907
 #, php-format
-msgid "Can't log into SIEVE server. Server says '%s'."
-msgstr "Невозможно зарегистрироваться на сервере SIEVE. Ответ сервера: \"%s\"."
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:236
+#: include/class_ldap.inc:923
 #, php-format
-msgid "Can't get sieve script. Server says '%s'."
-msgstr "Невозможно получить сценарий SIEVE. Ответ сервера: \"%s\"."
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:307
+#: include/class_plugin.inc:465
 #, php-format
-msgid "Can't send sieve script. Server says '%s'."
-msgstr "Невозможно отправить сценарий SIEVE. Ответ сервера: \"%s\"."
+msgid ""
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
 
-#: include/class_mail-methods-cyrus.inc:311
+#: include/class_plugin.inc:521
 #, php-format
-msgid "Can't activate GOsa sieve script. Server says '%s'."
-msgstr "Невозможно активировать сценарий  GOsa SIEVE. Ответ сервера: \"%s\"."
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
 
 #: include/class_CopyPasteHandler.inc:172
 #, fuzzy, php-format
 msgid "You are going to copy the entry '%s'."
 msgstr "Вы собираетесь удалить объект %s."
 
+#: html/helpviewer.php:116
+#, fuzzy
+msgid "There is no helpfile specified for this class."
+msgstr "Метод '%s' не описан в вашем файле конфигурации."
+
+#: html/helpviewer.php:226
+#, php-format
+msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
+msgstr ""
+
 #: html/getvcard.php:36
 msgid "Error: getcvard.php needs a parameter to export a vcard!"
 msgstr ""
@@ -12464,16 +12635,6 @@ msgid ""
 "page before logging in!"
 msgstr ""
 
-#: html/helpviewer.php:116
-#, fuzzy
-msgid "There is no helpfile specified for this class."
-msgstr "Метод '%s' не описан в вашем файле конфигурации."
-
-#: html/helpviewer.php:226
-#, php-format
-msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
-msgstr ""
-
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
 msgstr "Невозможно подключиться к серверу базы данных!"
@@ -12486,6 +12647,16 @@ msgstr "Невозможно выбрать базу данных!"
 msgid "Database query failed!"
 msgstr "Невозможно выполнить запрос к базе данных!"
 
+#: html/getkiosk.php:25
+#, php-format
+msgid "Can't open file '%s', possibly the file does not exist."
+msgstr ""
+
+#: html/getkiosk.php:30
+#, fuzzy, php-format
+msgid "Can't read file '%s', check permissions."
+msgstr "Удалить"
+
 #: html/main.php:151
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
@@ -12509,16 +12680,6 @@ msgid ""
 "some errors!"
 msgstr ""
 
-#: html/getkiosk.php:25
-#, php-format
-msgid "Can't open file '%s', possibly the file does not exist."
-msgstr ""
-
-#: html/getkiosk.php:30
-#, fuzzy, php-format
-msgid "Can't read file '%s', check permissions."
-msgstr "Удалить"
-
 #: html/get_attachment.php:47
 #, fuzzy
 msgid ""
@@ -12541,11 +12702,47 @@ msgstr ""
 msgid "Can't open file '%s'."
 msgstr "Удалить"
 
+#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
+#: ihtml/themes/lhs/sizelimit.tpl:3
+msgid ""
+"The size limit option makes LDAP operations faster and saves the LDAP server "
+"from getting too much load. The easiest way to handle big databases without "
+"long timeouts would be to limit your search to smaller values and use "
+"filters to get the entries you are looking for."
+msgstr ""
+"Ограничение на количество возвращаемых объектов позволяет ускорить операции "
+"поиска и предохраняет сервер LDAP от большой нагрузки. Простейший способ "
+"снизить время обработки запроса при обслуживаии большой базы данных это "
+"установить минимальное значение. Кроме того, будет очень полезно "
+"использовать фильтры для просмотра только ограниченного количества объектов."
+
+#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
+#: ihtml/themes/lhs/sizelimit.tpl:6
+msgid "Please choose the way to react for this session"
+msgstr "Выберите тип реакции для данной сессии"
+
+#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
+#: ihtml/themes/lhs/sizelimit.tpl:9
+msgid "ignore this error and show all entries the LDAP server returns"
+msgstr "игнорировать ошибку и показать все найденые объекты"
+
+#: ihtml/themes/altlinux/sizelimit.tpl:10
+#: ihtml/themes/default/sizelimit.tpl:10 ihtml/themes/lhs/sizelimit.tpl:10
+#, fuzzy
+msgid ""
+"ignore this error and show all entries that fit into the defined sizelimit "
+"and let me use filters instead"
+msgstr ""
+"Игнорировать ошибку и показать все возвращаемые объекты в пределах лимита и "
+"позволить использовать фильтры"
+
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
+#: ihtml/themes/lhs/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr "Конфликт сеансов"
 
 #: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/default/conflict.tpl:6
+#: ihtml/themes/lhs/conflict.tpl:6
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
@@ -12559,6 +12756,7 @@ msgstr ""
 "завершите текущий сеанс."
 
 #: ihtml/themes/altlinux/conflict.tpl:10 ihtml/themes/default/conflict.tpl:10
+#: ihtml/themes/lhs/conflict.tpl:10
 msgid ""
 "Ignoring this message will change/destroy the data you're currently editing, "
 "so please close multiple windows and log in again."
@@ -12567,11 +12765,36 @@ msgstr ""
 "поэтому закройте все окна, кроме одного, и начните сеанс заново."
 
 #: ihtml/themes/altlinux/conflict.tpl:14 ihtml/themes/default/conflict.tpl:14
+#: ihtml/themes/lhs/conflict.tpl:14
 msgid "Logout"
 msgstr "Выход"
 
+#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
+#: ihtml/themes/lhs/login.tpl:17
+msgid "Please use your <i>username</i> and <i>password</i> to log in"
+msgstr ""
+"Чтобы войти в систему<br> введите свои <i>имя пользователя</i> и <i>пароль</"
+"i>."
+
+#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
+#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
+#: ihtml/themes/lhs/login.tpl:46 ihtml/themes/lhs/login.tpl:49
+msgid "Directory"
+msgstr "Каталог"
+
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:57
+#: ihtml/themes/lhs/login.tpl:57
+msgid "Sign in"
+msgstr "Войти"
+
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:58
+#: ihtml/themes/lhs/login.tpl:58
+msgid "Click here to log in"
+msgstr "Нажмите на эту кнопку, чтобы войти в систему"
+
 #: ihtml/themes/altlinux/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
+#: ihtml/themes/lhs/setup_introduction.tpl:1
 msgid "Welcome to the GOsa setup!"
 msgstr "Добро пожаловать в раздел настройки GOsa!"
 
@@ -12592,11 +12815,13 @@ msgstr ""
 
 #: ihtml/themes/altlinux/setup_useradmin.tpl:3
 #: ihtml/themes/default/setup_useradmin.tpl:3
+#: ihtml/themes/lhs/setup_useradmin.tpl:3
 msgid "You already have an Administrative Account and a Group."
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_useradmin.tpl:10
 #: ihtml/themes/default/setup_useradmin.tpl:10
+#: ihtml/themes/lhs/setup_useradmin.tpl:10
 msgid ""
 "To provide full administrative access to GOsa, you need to create a special "
 "group which contains the administrative user. The setup program can assist "
@@ -12604,101 +12829,38 @@ msgid ""
 "create the missing entries."
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
-msgid "Please use your <i>username</i> and <i>password</i> to log in"
-msgstr ""
-"Чтобы войти в систему<br> введите свои <i>имя пользователя</i> и <i>пароль</"
-"i>."
-
-#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
-#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
-msgid "Directory"
-msgstr "Каталог"
-
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:57
-msgid "Sign in"
-msgstr "Войти"
-
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:58
-msgid "Click here to log in"
-msgstr "Нажмите на эту кнопку, чтобы войти в систему"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
-msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
-"filters to get the entries you are looking for."
-msgstr ""
-"Ограничение на количество возвращаемых объектов позволяет ускорить операции "
-"поиска и предохраняет сервер LDAP от большой нагрузки. Простейший способ "
-"снизить время обработки запроса при обслуживаии большой базы данных это "
-"установить минимальное значение. Кроме того, будет очень полезно "
-"использовать фильтры для просмотра только ограниченного количества объектов."
-
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
-msgid "Please choose the way to react for this session"
-msgstr "Выберите тип реакции для данной сессии"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
-msgid "ignore this error and show all entries the LDAP server returns"
-msgstr "игнорировать ошибку и показать все найденые объекты"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:10
-#: ihtml/themes/default/sizelimit.tpl:10
-#, fuzzy
-msgid ""
-"ignore this error and show all entries that fit into the defined sizelimit "
-"and let me use filters instead"
-msgstr ""
-"Игнорировать ошибку и показать все возвращаемые объекты в пределах лимита и "
-"позволить использовать фильтры"
-
 #: ihtml/themes/altlinux/framework.tpl:15
-#: ihtml/themes/default/framework.tpl:15
+#: ihtml/themes/default/framework.tpl:15 ihtml/themes/lhs/framework.tpl:15
 msgid "Main"
 msgstr "Начало"
 
 #: ihtml/themes/altlinux/framework.tpl:20
-#: ihtml/themes/default/framework.tpl:20
+#: ihtml/themes/default/framework.tpl:20 ihtml/themes/lhs/framework.tpl:20
 msgid "Help"
 msgstr "Справка"
 
 #: ihtml/themes/altlinux/framework.tpl:25
-#: ihtml/themes/default/framework.tpl:25
+#: ihtml/themes/default/framework.tpl:25 ihtml/themes/lhs/framework.tpl:25
 msgid "Sign out"
 msgstr "Выход"
 
 #: ihtml/themes/altlinux/framework.tpl:33
-#: ihtml/themes/default/framework.tpl:33
+#: ihtml/themes/default/framework.tpl:33 ihtml/themes/lhs/framework.tpl:33
 msgid "Signed in:"
 msgstr "Пользователь:"
 
-#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
-msgid "Locking conflict detected"
-msgstr "Конфликт блокировок"
-
-#: ihtml/themes/altlinux/islocked.tpl:9
-msgid ""
-"If this lock detection is false, the other person has obviously closed the "
-"webbrowser during the edit operation. You may delete the lockfile in this "
-"case by pressing the <i>Remove</i> button."
-msgstr ""
-"Если результат этой проверки блокировки - ложь, очевидно, другой человек "
-"закрыл браузер во время редактирования данных. Вы можете удалить файл "
-"блокировки, нажав на кнопку <i>Удалить</i>."
-
 #: ihtml/themes/altlinux/setup_step2.tpl:1
 #: ihtml/themes/altlinux/setup_step3.tpl:1
 #: ihtml/themes/altlinux/setup_step4.tpl:1
 #: ihtml/themes/default/setup_step2.tpl:1
 #: ihtml/themes/default/setup_step3.tpl:1
-#: ihtml/themes/default/setup_step4.tpl:1
+#: ihtml/themes/default/setup_step4.tpl:1 ihtml/themes/lhs/setup_step2.tpl:1
+#: ihtml/themes/lhs/setup_step3.tpl:1 ihtml/themes/lhs/setup_step4.tpl:1
 msgid "Setup continued..."
 msgstr "Продолжение настройки..."
 
 #: ihtml/themes/altlinux/setup_step2.tpl:4
-#: ihtml/themes/default/setup_step2.tpl:4
+#: ihtml/themes/default/setup_step2.tpl:4 ihtml/themes/lhs/setup_step2.tpl:4
 msgid ""
 "Step two looks for a set of helper programms and checks if they have the "
 "correct minimum version."
@@ -12706,8 +12868,23 @@ msgstr ""
 "На втором шаге происходит поиск вспомогательных программ и проверка "
 "допустимости их версии."
 
+#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
+#: ihtml/themes/lhs/islocked.tpl:2
+msgid "Locking conflict detected"
+msgstr "Конфликт блокировок"
+
+#: ihtml/themes/altlinux/islocked.tpl:9 ihtml/themes/lhs/islocked.tpl:9
+msgid ""
+"If this lock detection is false, the other person has obviously closed the "
+"webbrowser during the edit operation. You may delete the lockfile in this "
+"case by pressing the <i>Remove</i> button."
+msgstr ""
+"Если результат этой проверки блокировки - ложь, очевидно, другой человек "
+"закрыл браузер во время редактирования данных. Вы можете удалить файл "
+"блокировки, нажав на кнопку <i>Удалить</i>."
+
 #: ihtml/themes/altlinux/setup_step3.tpl:4
-#: ihtml/themes/default/setup_step3.tpl:4
+#: ihtml/themes/default/setup_step3.tpl:4 ihtml/themes/lhs/setup_step3.tpl:4
 msgid ""
 "Now we're going include your LDAP server and create an initial "
 "configuration. After you've entered the server URI below, a quick check is "
@@ -12721,31 +12898,31 @@ msgstr ""
 "Подробности об организации вашего дерева LDAP понадобятся позже."
 
 #: ihtml/themes/altlinux/setup_step3.tpl:10
-#: ihtml/themes/default/setup_step3.tpl:10
+#: ihtml/themes/default/setup_step3.tpl:10 ihtml/themes/lhs/setup_step3.tpl:10
 msgid ""
 "Please enter the server URI to allow the setup to connect your LDAP server "
 "<i>(Example: ldap://your.server:389).</i>"
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:2
-#: ihtml/themes/default/setup_step4.tpl:2
+#: ihtml/themes/default/setup_step4.tpl:2 ihtml/themes/lhs/setup_step4.tpl:2
 msgid ""
 "The following fields allow the basic configuration of GOsa's behaviour and "
 "affect various properties in your main configuration."
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:7
-#: ihtml/themes/default/setup_step4.tpl:7
+#: ihtml/themes/default/setup_step4.tpl:7 ihtml/themes/lhs/setup_step4.tpl:7
 msgid "Enter a description for the location you're configuring here"
 msgstr "Введите описание владельца каталога"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:11
-#: ihtml/themes/default/setup_step4.tpl:11
+#: ihtml/themes/default/setup_step4.tpl:11 ihtml/themes/lhs/setup_step4.tpl:11
 msgid "Location name"
 msgstr "Местоположение"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:18
-#: ihtml/themes/default/setup_step4.tpl:18
+#: ihtml/themes/default/setup_step4.tpl:18 ihtml/themes/lhs/setup_step4.tpl:18
 #, fuzzy
 msgid ""
 "GOsa always acts as admin and manages access rights internally. This is a "
@@ -12760,17 +12937,17 @@ msgstr ""
 "пароль."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:23
-#: ihtml/themes/default/setup_step4.tpl:23
+#: ihtml/themes/default/setup_step4.tpl:23 ihtml/themes/lhs/setup_step4.tpl:23
 msgid "Admin DN"
 msgstr "DN администратора"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:27
-#: ihtml/themes/default/setup_step4.tpl:27
+#: ihtml/themes/default/setup_step4.tpl:27 ihtml/themes/lhs/setup_step4.tpl:27
 msgid "Admin password"
 msgstr "Пароль администратора"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:34
-#: ihtml/themes/default/setup_step4.tpl:34
+#: ihtml/themes/default/setup_step4.tpl:34 ihtml/themes/lhs/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
 "saves people and groups, including the way accounts get created. Check the "
@@ -12781,33 +12958,33 @@ msgstr ""
 "учетных записей. Проверьте, подходят ли вам значения, указанные ниже."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:39
-#: ihtml/themes/default/setup_step4.tpl:39
+#: ihtml/themes/default/setup_step4.tpl:39 ihtml/themes/lhs/setup_step4.tpl:39
 #, fuzzy
 msgid "Base "
 msgstr "Ветка"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:43
-#: ihtml/themes/default/setup_step4.tpl:43
+#: ihtml/themes/default/setup_step4.tpl:43 ihtml/themes/lhs/setup_step4.tpl:43
 msgid "People storage ou"
 msgstr "Структурная единица (OU) пользователей"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:47
-#: ihtml/themes/default/setup_step4.tpl:47
+#: ihtml/themes/default/setup_step4.tpl:47 ihtml/themes/lhs/setup_step4.tpl:47
 msgid "People dn attribute"
 msgstr "Атрибут DN пользователей"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:55
-#: ihtml/themes/default/setup_step4.tpl:55
+#: ihtml/themes/default/setup_step4.tpl:55 ihtml/themes/lhs/setup_step4.tpl:55
 msgid "Group storage ou"
 msgstr "OU групп"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:59
-#: ihtml/themes/default/setup_step4.tpl:59
+#: ihtml/themes/default/setup_step4.tpl:59 ihtml/themes/lhs/setup_step4.tpl:59
 msgid "ID base for users/groups"
 msgstr "База идентификаторов для пользователей/групп"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:67
-#: ihtml/themes/default/setup_step4.tpl:67
+#: ihtml/themes/default/setup_step4.tpl:67 ihtml/themes/lhs/setup_step4.tpl:67
 msgid ""
 "GOsa supports several encryption types for your passwords. Normally this is "
 "adjustable via user templates, but you can specify a default method to be "
@@ -12815,12 +12992,12 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:72
-#: ihtml/themes/default/setup_step4.tpl:72
+#: ihtml/themes/default/setup_step4.tpl:72 ihtml/themes/lhs/setup_step4.tpl:72
 msgid "Encryption algorithm"
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:83
-#: ihtml/themes/default/setup_step4.tpl:83
+#: ihtml/themes/default/setup_step4.tpl:83 ihtml/themes/lhs/setup_step4.tpl:83
 msgid ""
 "GOsa has modular support for several mail methods. These methods provide "
 "interfaces to users mailboxes and general handling for quotas. You can "
@@ -12828,7 +13005,7 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:88
-#: ihtml/themes/default/setup_step4.tpl:88
+#: ihtml/themes/default/setup_step4.tpl:88 ihtml/themes/lhs/setup_step4.tpl:88
 #, fuzzy
 msgid "Mail method"
 msgstr "Почтовые настройки"
@@ -12842,53 +13019,59 @@ msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:103
 #: ihtml/themes/default/setup_step4.tpl:104
+#: ihtml/themes/lhs/setup_step4.tpl:104
 #, fuzzy
 msgid "Display PHP errors"
 msgstr "Ошибка LDAP:"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:106
 #: ihtml/themes/default/setup_step4.tpl:107
+#: ihtml/themes/lhs/setup_step4.tpl:107
 #, fuzzy
 msgid "true"
 msgstr "Улица"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:107
 #: ihtml/themes/default/setup_step4.tpl:108
+#: ihtml/themes/lhs/setup_step4.tpl:108
 #, fuzzy
 msgid "false"
 msgstr "женский"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:115
 #: ihtml/themes/default/setup_step4.tpl:115
+#: ihtml/themes/lhs/setup_step4.tpl:115
 msgid "Check"
 msgstr "Проверить"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:1
-#: ihtml/themes/default/setup_finish.tpl:1
+#: ihtml/themes/default/setup_finish.tpl:1 ihtml/themes/lhs/setup_finish.tpl:1
 msgid "Setup finished"
 msgstr "Настройка завершена"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:3
-#: ihtml/themes/default/setup_finish.tpl:3
+#: ihtml/themes/default/setup_finish.tpl:3 ihtml/themes/lhs/setup_finish.tpl:3
 msgid ""
 "Basically the setup is finished. You can check the result of the schema "
 "check here and download the autogenerated gosa.conf below."
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_finish.tpl:7
-#: ihtml/themes/default/setup_finish.tpl:7
+#: ihtml/themes/default/setup_finish.tpl:7 ihtml/themes/lhs/setup_finish.tpl:7
 #, fuzzy
 msgid "Schema Configuration"
 msgstr "Системная информация"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:12
 #: ihtml/themes/default/setup_finish.tpl:12
+#: ihtml/themes/lhs/setup_finish.tpl:12
 #, fuzzy
 msgid "Configuration File"
 msgstr "Настроить"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:14
 #: ihtml/themes/default/setup_finish.tpl:14
+#: ihtml/themes/lhs/setup_finish.tpl:14
 msgid ""
 "GOsa setup has collected all data needed to create an initial configuration "
 "file. Save the the link below as your gosa.conf and place that file in /etc/"
@@ -12900,12 +13083,14 @@ msgstr ""
 
 #: ihtml/themes/altlinux/setup_finish.tpl:17
 #: ihtml/themes/default/setup_finish.tpl:17
+#: ihtml/themes/lhs/setup_finish.tpl:17
 #, fuzzy
 msgid "Download configuration"
 msgstr "Системная информация"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:20
 #: ihtml/themes/default/setup_finish.tpl:20
+#: ihtml/themes/lhs/setup_finish.tpl:20
 msgid ""
 "After placing the file under /etc/gosa, place make sure that the webserver "
 "user is able to read gosa.conf, while other users shouldn't. You may want to "
@@ -12915,7 +13100,16 @@ msgstr ""
 "пользователь веб-сервера может его читать. Для этого вам, возможно, "
 "понадобится выполнить следующие команды:"
 
+#: ihtml/themes/default/help.tpl:9 ihtml/themes/lhs/help.tpl:9
+msgid "GOsa help viewer"
+msgstr ""
+
+#: ihtml/themes/default/help.tpl:15 ihtml/themes/lhs/help.tpl:15
+msgid "Index"
+msgstr ""
+
 #: ihtml/themes/default/setup_introduction.tpl:4
+#: ihtml/themes/lhs/setup_introduction.tpl:4
 #, fuzzy
 msgid ""
 "It looks like you're calling GOsa for the first time - no configuration was "
@@ -12932,6 +13126,7 @@ msgstr ""
 "укажете параметры работы с LDAP-сервером, и мы проверим его настройку."
 
 #: ihtml/themes/default/setup_introduction.tpl:17
+#: ihtml/themes/lhs/setup_introduction.tpl:17
 msgid ""
 "You can also use the new and more-advanced way of inspecting your PHP-"
 "installation. It will give you information about the exact function that "
@@ -12940,17 +13135,26 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/setup_introduction.tpl:19
+#: ihtml/themes/lhs/setup_introduction.tpl:19
 msgid "Toggle Show/Hide"
 msgstr ""
 
-#: ihtml/themes/default/help.tpl:9
-msgid "GOsa help viewer"
+#: ihtml/themes/default/logout.tpl:5 ihtml/themes/lhs/logout.tpl:5
+msgid "Your GOsa session has expired!"
 msgstr ""
 
-#: ihtml/themes/default/help.tpl:15
-msgid "Index"
+#: ihtml/themes/default/logout.tpl:7 ihtml/themes/lhs/logout.tpl:7
+msgid ""
+"The last interaction with the GOsa web interface has been some time ago in "
+"the past. For security reasons, the session has been closed. To continue "
+"with administrative tasks, please sign in again."
 msgstr ""
 
+#: ihtml/themes/default/logout.tpl:10 ihtml/themes/lhs/logout.tpl:10
+#, fuzzy
+msgid "Sign in again"
+msgstr "Войти"
+
 #: ihtml/themes/default/islocked.tpl:9
 #, fuzzy
 msgid ""
@@ -12967,28 +13171,6 @@ msgstr ""
 msgid "Edit anyway"
 msgstr "Редактиовать объект"
 
-#: ihtml/themes/default/setup_step4.tpl:100
-msgid ""
-"GOsa may cause PHP interpreter errors, particularly in case of Beta "
-"versions. In some cases it would be helpful to enable the error reporting."
-msgstr ""
-
-#: ihtml/themes/default/logout.tpl:5
-msgid "Your GOsa session has expired!"
-msgstr ""
-
-#: ihtml/themes/default/logout.tpl:7
-msgid ""
-"The last interaction with the GOsa web interface has been some time ago in "
-"the past. For security reasons, the session has been closed. To continue "
-"with administrative tasks, please sign in again."
-msgstr ""
-
-#: ihtml/themes/default/logout.tpl:10
-#, fuzzy
-msgid "Sign in again"
-msgstr "Войти"
-
 #: ihtml/themes/default/copyPasteDialog.tpl:1
 msgid "Copy &amp; paste wizard"
 msgstr ""
@@ -13005,6 +13187,25 @@ msgstr ""
 msgid "Operation complete"
 msgstr "не полный"
 
+#: ihtml/themes/default/setup_step4.tpl:100
+#: ihtml/themes/lhs/setup_step4.tpl:100
+msgid ""
+"GOsa may cause PHP interpreter errors, particularly in case of Beta "
+"versions. In some cases it would be helpful to enable the error reporting."
+msgstr ""
+
+#, fuzzy
+#~ msgid "DFS shares"
+#~ msgstr "сброс"
+
+#, fuzzy
+#~ msgid "Complete"
+#~ msgstr "не полный"
+
+#, fuzzy
+#~ msgid "Successfully finished"
+#~ msgstr "Настройка завершена"
+
 #, fuzzy
 #~ msgid "Releases"
 #~ msgstr "Набор правил"
diff --git a/plugins/admin/applications/class_applicationManagement.inc b/plugins/admin/applications/class_applicationManagement.inc
index 362d575a1..18bec3eaf 100644
--- a/plugins/admin/applications/class_applicationManagement.inc
+++ b/plugins/admin/applications/class_applicationManagement.inc
@@ -469,9 +469,10 @@ class applicationManagement extends plugin
 
     // Managment
     $listhead = "<div style='background:#F0F0F9;padding:5px;'>".
-      " <input class='center' type='image' align='middle' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
       " <input class='center' type='image' src='images/list_root.png' align='middle' title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'>&nbsp;".
+      " <input class='center' type='image' align='middle' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
       " <input class='center' type='image' align='middle' src='images/list_home.png' title='"._("Go to users department")."' alt='"._("Home")."' name='dep_home'>&nbsp;".
+      " <input class='center' type='image' src='images/list_reload.png' align='middle' title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
       " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
       " <input class='center' type='image' align='middle' src='images/list_new_app.png' alt='"._("new")."' title='"._("Create new application")."' name='appl_new'>&nbsp;".
       $Copy_Paste.
diff --git a/plugins/admin/departments/class_departmentGeneric.inc b/plugins/admin/departments/class_departmentGeneric.inc
index a04e44da1..d062799a8 100644
--- a/plugins/admin/departments/class_departmentGeneric.inc
+++ b/plugins/admin/departments/class_departmentGeneric.inc
@@ -249,7 +249,7 @@ class department extends plugin
 	/* Move/Rename complete trees */
 	function recursive_move($src_dn, $dst_dn,$force = false)
 	{
-		if(! $force){
+		if(!$force){
 
 			$this->rec_cpy 	= true;
 			$this->rec_src	= $src_dn;
@@ -259,7 +259,7 @@ class department extends plugin
 
 			$smarty->assign("src","?plug=".$_GET['plug']."&PerformRecMove");
 
-			$display =  $smarty->fetch(get_template_path("recursive_moce.tpl",TRUE));
+			$display=  $smarty->fetch(get_template_path("recursive_move.tpl",TRUE));
 			return($display);
 			exit();
 		}else{
@@ -270,8 +270,12 @@ class department extends plugin
 			$src_dn = $this->rec_src;
 			$dst_dn = $this->rec_dst;
 
-			echo "<font style='font-size:11px;'><h4>".
-				sprintf(_("Moving %s in %s"),"<br><i>".$src_dn."</i><br>","<br><i>".$dst_dn."</i><br>")."</h4>";
+			/* Print header to have styles included */
+			$smarty= get_smarty();
+			echo "<!-- headers.tpl-->".$smarty->fetch(get_template_path('headers.tpl'));
+			echo "<body style='background-image:none;margin:3px;color:black'>";
+
+			echo "<h3>".sprintf(_("Moving %s to %s"),"<i>".$src_dn."</i>","<i>".$dst_dn."</i>")."</h3>";
 
 
 			/* Check if the destination entry exists */
@@ -280,9 +284,9 @@ class department extends plugin
 			/* Check if destination exists - abort */
 			$ldap->cat($dst_dn);
 			if ($ldap->fetch()){
-				trigger_error("recursive_move $dst_dn already exists.",
+				trigger_error("Recursive_move $dst_dn already exists.",
 						E_USER_WARNING);
-				echo "recursive_move :$dst_dn already exists.<br>"; 
+				echo "Recursive_move :$dst_dn already exists.<br>"; 
 				return (FALSE);
 			}
 	
@@ -307,23 +311,30 @@ class department extends plugin
 				$dst= preg_replace("/".str_replace("\\","\\\\",$src_dn)."$/", "$dst_dn", $object);
 				$dst= str_replace($src_dn,$dst_dn,$object);
 
-				echo "Moving    <b>".$src."</b>  to  <b>".$dst."</b><br>";
+				echo "<b>"._("Object").":</b> $src<br>";
 				
 				if (!$this->copy($src, $dst)){
 					echo "<font color='#FF0000'><br>".sprintf(_("FAILED to copy %s, aborting operation"),$src)."</font>";
 					return (FALSE);
 				}
+
+				flush();
 			}
 
 			/* Remove src_dn */
 			$ldap->cd($src_dn);
-			
-			echo "<br><b>"._("Complete")."</b>";
-
 			$ldap->recursive_remove();
 			$this->rec_src = $this->rec_dst = "";
 			$this->rec_cpy =false;
-			echo "</font>";
+
+			echo '<p class="seperator">&nbsp;</p>';
+
+			echo "<div style='width:100%;text-align:right;'><form name='form' method='post' action='?plug=".$_GET['plug']."' target='_parent'>
+				<br><input type='submit' name='back' value='"._("Continue")."'>
+				</form></div>";
+
+			echo "</body></html>";
+			
 			return (TRUE);
 		}
 	}
diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc
index fc920491e..bca4a4534 100644
--- a/plugins/admin/departments/class_departmentManagement.inc
+++ b/plugins/admin/departments/class_departmentManagement.inc
@@ -293,9 +293,10 @@ class departmentManagement extends plugin
 
 			/* Generate list head */
 			$listhead = "<div style='background:#F0F0F9;padding:5px;'>".
-						" <input type='image' class='center' src='images/list_up.png' align='middle' title='"._("Go up one department")."' name='dep_back' alt='"._("Up")."'>&nbsp;".
 						" <input type='image' class='center' src='images/list_root.png' align='middle' title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'>&nbsp;".
+						" <input type='image' class='center' src='images/list_up.png' align='middle' title='"._("Go up one department")."' name='dep_back' alt='"._("Up")."'>&nbsp;".
 						" <input type='image' class='center' src='images/list_home.png' align='middle' title='"._("Go to users home department")."' name='dep_home' alt='"._("Home")."'>&nbsp;".
+					        " <input class='center' type='image' src='images/list_reload.png' align='middle' title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
 						" <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
 						" <input class='center' type='image' src='images/list_new_department.png' align='middle' alt='"._("Create new department")."' name='dep_new'>&nbsp;".
 						" <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
diff --git a/plugins/admin/departments/recursive_moce.tpl b/plugins/admin/departments/recursive_moce.tpl
deleted file mode 100644
index df076df3a..000000000
--- a/plugins/admin/departments/recursive_moce.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<h2>{t}Processing requested operation, the status of this operation will be displayed in an iframe below.{/t}</h2>
-<iframe src="{$src}" style="width:100%;height:450px;background-color:#FFFFFF;" name="status">
-	{t}Your browser isn't able to display this iframe ... use the link below intead{/t}<br>
-	<a href="{$src}">{$src}</a>
-</iframe>
-
-<p class="seperator">&nbsp;</p>
-<div style="text-align:right;">
-	<p>
-		<input type="submit" name="back" value="{t}Back{/t}">
-	</p>
-</div>
diff --git a/plugins/admin/departments/recursive_move.tpl b/plugins/admin/departments/recursive_move.tpl
new file mode 100644
index 000000000..c936b22aa
--- /dev/null
+++ b/plugins/admin/departments/recursive_move.tpl
@@ -0,0 +1,21 @@
+<h2>{t}Processing the requested operation{/t}</h2>
+{t}As soon as the move operation has finished, you can scroll down to end of the page and press the 'Continue' button to continue with the department management dialog.{/t}
+<br>
+<br>
+<div style="margin:3px;background-color:white; border:1px solid #A0A0A0">
+<iframe src="{$src}" style="width:100%;height:450px;background-color:#FFFFFF;" name="status">
+	<p>{t}Your browser doesn't support iframes, please use this link to perform the requested operation.{/t}
+	<br>
+	<a href="{$src}">{$src}</a>
+	</p>
+</iframe>
+</div>
+
+<!--
+<p class="seperator">&nbsp;</p>
+<div style="text-align:right;">
+	<p>
+		<input type="submit" name="back" value="{t}Back{/t}">
+	</p>
+</div>
+-->
diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc
index 98b4ec3cc..344223c8c 100644
--- a/plugins/admin/fai/class_faiManagement.inc
+++ b/plugins/admin/fai/class_faiManagement.inc
@@ -90,9 +90,8 @@ class faiManagement extends plugin
 
 	function execute()
 	{
-
-	/* Call parent execute */
-	plugin::execute();
+    /* Call parent execute */
+    plugin::execute();
 
     $_SESSION['LOCK_VARS_TO_USE'] = array("/^edit_entry$/","/^id$/","/^entry_edit_/","/^entry_delete_/");
 
@@ -420,10 +419,13 @@ class faiManagement extends plugin
         $baseToUse = $_SESSION['faifilter']['branch'];
       }
 
-
       $appsrc = preg_replace("/ou=fai,ou=configs,ou=systems,/","ou=apps,",$baseToUse); 
       $appdst = preg_replace("/ou=fai,ou=configs,ou=systems,/","ou=apps,","ou=".$name.",".$baseToUse) ; 
 
+      /* Print header to have styles included */
+      echo "<!-- headers.tpl-->".$smarty->fetch(get_template_path('headers.tpl'));
+      echo "<body style='background-image:none;margin:3px;color:black'>";
+
       /* Duplicate applications 
        */
       $ldap->cd ($appdst);
@@ -439,9 +441,12 @@ class faiManagement extends plugin
       $ldap->copy_FAI_resource_recursive($baseToUse,"ou=".$name.",".$baseToUse,$type,true);
 
       echo "<div style='width:100%;text-align:right;'><form name='form' method='post' action='?plug=".$_GET['plug']."' target='_parent'>
-              <input type='submit' name='back' value='"._("Back")."'>
+              <br><input type='submit' name='back' value='"._("Continue")."'>
             </form></div>";
 
+      /* Print footer to have valid html */
+      echo "</body></html>";
+
       $this->dispNewFreeze = false; 
 
       /* Postcreate */ 
@@ -632,15 +637,17 @@ class faiManagement extends plugin
 		$faihead = 
 			"<div style='background:#F0F0F9;padding:5px;'>&nbsp;".
 
-			"<input class='center' type='image' src='images/list_up.png' align='middle' 
-			title='"._("Go up one department")."' name='dep_back' alt='"._("Up"). "'>&nbsp;".
-
 			"<input class='center' type='image' src='images/list_root.png' align='middle' 
 			title='"._("Go to root department")."' name='dep_root' alt='".      _("Root")."'>&nbsp;".
 
+			"<input class='center' type='image' src='images/list_up.png' align='middle' 
+			title='"._("Go up one department")."' name='dep_back' alt='"._("Up"). "'>&nbsp;".
+
 			"<input class='center' type='image' src='images/list_home.png' align='middle' 
 			title='"._("Go to users home department")."' name='dep_home' alt='"._("Home")."'>&nbsp;".
 
+      " <input class='center' type='image' src='images/list_reload.png' align='middle' title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
+
 			"<img class='center' src=\"images/list_seperator.png\" alt=\"\" align=\"middle\" height=\"16\" width=\"1\">&nbsp;".
 			
 			" <input class='center' type='image' src='images/fai_new_profile.png' align='middle' 
diff --git a/plugins/admin/fai/faiNewBranch.tpl b/plugins/admin/fai/faiNewBranch.tpl
index de54b285c..111fa80ed 100755
--- a/plugins/admin/fai/faiNewBranch.tpl
+++ b/plugins/admin/fai/faiNewBranch.tpl
@@ -30,13 +30,11 @@
 </script>
 {else}
 
-<h2>{t}Processing requested operation, the status of this operation will be displayed in an iframe below.{/t}</h2>
-{t}As soon as the operation has finished, you can scroll down to end of the page and press the 'Back' button to return to the fai management dialog.{/t}
+<h2>{t}Processing the requested operation{/t}</h2>
+{t}As soon as the copy operation has finished, you can scroll down to end of the page and press the 'Continue' button to continue with the fai management dialog.{/t}
 <br>
 <br>
-<p class='seperator'>&nbsp;</p>
-<br>
-<div>
+<div style="margin:3px;background-color:white; border:1px solid #A0A0A0">
 <iframe src="?plug={$plugID}&PerformBranch=1" width="100%" name="status" style="height:450px;background-color:#FFFFFF;">
 
 	<p>{t}Your browser doesn't support iframes, please use this link to perform the requested operation.{/t}
diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index 60cb12d9a..cffb0b77b 100644
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -448,9 +448,10 @@ class groupManagement extends plugin
 
     // Managment
     $listhead = "<div style='background:#F0F0F9;padding:5px;'>".
-      " <input type='image' class='center' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
       " <input type='image' class='center' src='images/list_root.png' title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'>&nbsp;".
+      " <input type='image' class='center' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
       " <input type='image' class='center' src='images/list_home.png' title='"._("Go to users department")."' alt='"._("Home")."' name='dep_home'>&nbsp;".
+      " <input class='center' type='image' src='images/list_reload.png' align='middle' title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
       " <img class='center' src='images/list_seperator.png' alt='' height='16' width='1'>&nbsp;".
       " <input type='image' class='center' src='images/list_new_group.png' title='"._("Create new group")."' alt='"._("New")."' name='group_new'>&nbsp;".
       $Copy_Paste.
diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc
index ecd339518..effe4d5e7 100644
--- a/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -439,11 +439,12 @@ class ogroupManagement extends plugin
 
     // Managment
     $listhead = "<div style='background:#F0F0F9;padding:5px;'>".
-      " <input class='center' type='image' align='middle' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
       " <input class='center' type='image' src='images/list_root.png' align='middle' title='"._("Go to root department")."'
 name='dep_root' alt='"._("Root")."'>&nbsp;".
+      " <input class='center' type='image' align='middle' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
       " <input class='center' type='image' align='middle' src='images/list_home.png' title='"._("Go to users department")."'
  alt='"._("Home")."' name='dep_home'>&nbsp;".
+       " <input class='center' type='image' src='images/list_reload.png' align='middle' title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
       " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
       " <input class='center' type='image' align='middle' src='images/list_new_ogroup.png' title='"._("Create new object group")."' alt='"._("new")."' name='group_new'>".
       $Copy_Paste.
diff --git a/plugins/admin/systems/class_baseSelectDialog.inc b/plugins/admin/systems/class_baseSelectDialog.inc
index 9aee7b3c4..f7b206b73 100644
--- a/plugins/admin/systems/class_baseSelectDialog.inc
+++ b/plugins/admin/systems/class_baseSelectDialog.inc
@@ -22,12 +22,13 @@ class baseSelectDialog extends MultiSelectWindow
     $this->SetTitle("Base");
     $this->SetSummary(_("Choose a base"));
     $this->SetListHeader("<div style='background:#F0F0F9;padding:5px;'>".
-        " <input class='center' type='image' align='middle' src='images/list_back.png'
-        title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
         " <input class='center' type='image' src='images/list_root.png' align='middle'
         title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'>&nbsp;".
+        " <input class='center' type='image' align='middle' src='images/list_back.png'
+        title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
         " <input class='center' type='image' align='middle' src='images/list_home.png'
         title='"._("Go to users department")."' alt='"._("Home")."' name='dep_home'>&nbsp;".
+        " <input class='center' type='image' src='images/list_reload.png' align='middle' title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
         "</div>");
 
     $this->SetInformation(_("Step in the prefered tree and click save to use the current subtree as base. Or click the image at the end of each entry."));
diff --git a/plugins/admin/systems/class_glpiSelectUser.inc b/plugins/admin/systems/class_glpiSelectUser.inc
index 42f353830..f25dce8d3 100644
--- a/plugins/admin/systems/class_glpiSelectUser.inc
+++ b/plugins/admin/systems/class_glpiSelectUser.inc
@@ -156,12 +156,13 @@ class glpiSelectUser extends plugin
     }
 
     $listhead = "<div style='background:#F0F0F9;padding:5px;'>".
-      " <input class='center' type='image' align='middle' 
-      src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
       " <input class='center' type='image' src='images/list_root.png' 
       align='middle' title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'>&nbsp;".
       " <input class='center' type='image' align='middle' 
+      src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
+      " <input class='center' type='image' align='middle' 
       src='images/list_home.png' title='"._("Go to users department")."' alt='"._("Home")."' name='dep_home'>&nbsp;".
+      " <input class='center' type='image' src='images/list_reload.png' align='middle' title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
 " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;"._("Base")."&nbsp;".
     " <select name='depselect' onChange='mainform.submit()' class='center'>$options</select>".
     " <input class='center' type='image' src='images/list_submit.png' align='middle'
diff --git a/plugins/admin/systems/class_servDNSeditZoneEntries.inc b/plugins/admin/systems/class_servDNSeditZoneEntries.inc
index 1b1f1f9b6..faf29d198 100644
--- a/plugins/admin/systems/class_servDNSeditZoneEntries.inc
+++ b/plugins/admin/systems/class_servDNSeditZoneEntries.inc
@@ -229,7 +229,7 @@ class servDNSeditZoneEntries extends plugin
     /* Set title 
      */
     if($obj['Type'] == "Free"){   
-      $str = "<h3>".sprintf(_("Settings for free host entry # %s"),($obj_dn +1))." : </h3>";
+      $str = "<h3>".sprintf(_("Settings for host entry #%s"),($obj_dn +1))." : </h3>";
     }else{
       $str = "<h3>".sprintf(_("Settings for '%s'"),$obj_dn)." : </h3>";
     }
@@ -398,7 +398,7 @@ class servDNSeditZoneEntries extends plugin
 
         $ldap->search("(cn=".$cn.")",array("cn"));
         if($ldap->count()){
-          $message[] = sprintf(_("The name '%s' can't be used as free hand entry, the name is already used in this ldap tree."),$cn);
+          $message[] = sprintf(_("The name '%s' can't be used as host entry, the name is already used in this ldap tree."),$cn);
         }
       }
 
diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc
index ed3e70dc1..1c65aafac 100644
--- a/plugins/admin/systems/class_systemManagement.inc
+++ b/plugins/admin/systems/class_systemManagement.inc
@@ -749,12 +749,13 @@ class systems extends plugin
     /* Create list header
      */
     $listhead = "<div style='background:#F0F0F9;padding:5px;'>".
-    " <input class='center' type='image' align='middle' src='images/list_back.png' 
-        title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
     " <input class='center' type='image' src='images/list_root.png' align='middle' 
         title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'>&nbsp;".
+    " <input class='center' type='image' align='middle' src='images/list_back.png' 
+        title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
     " <input class='center' type='image' align='middle' src='images/list_home.png' 
         title='"._("Go to users department")."' alt='"._("Home")."'                     name='dep_home'>&nbsp;".
+    " <input class='center' type='image' src='images/list_reload.png' align='middle' title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
     " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
     " <input class='center' type='image' align='middle' src='images/select_new_terminal.png'   
         name='newsystem_terminal'    alt='"._("New Terminal template")."' title='"._("New Terminal")."'>".
diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index 3970c7727..045740c18 100644
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -775,9 +775,10 @@ class userManagement extends plugin
 
     /* NEW LIST MANAGMENT */
     $listhead = "<div style='background:#F0F0F9;padding:5px;'>".
-      " <input class='center' type='image' align='middle' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
       " <input class='center' type='image' src='images/list_root.png' align='middle' title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'>&nbsp;".
+      " <input class='center' type='image' align='middle' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
       " <input class='center' type='image' align='middle' src='images/list_home.png' title='"._("Go to users department")."' alt='"._("Home")."' name='dep_home'>&nbsp;".
+      " <input class='center' type='image' src='images/list_reload.png' align='middle' title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
       " <img   class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
       " <input class='center' type='image' align='middle' src='images/list_new_user.png' title='"._("Create new user")."' alt='"._("New user")."' name='user_new'>&nbsp;".
       " <input class='center' type='image' align='middle' src='images/list_new.png' title='"._("Create new template")."' alt='"._("New template")."' name='user_tplnew'>&nbsp;".
diff --git a/plugins/gofax/blocklists/class_blocklistManagement.inc b/plugins/gofax/blocklists/class_blocklistManagement.inc
index 978732ccf..0e470ae16 100644
--- a/plugins/gofax/blocklists/class_blocklistManagement.inc
+++ b/plugins/gofax/blocklists/class_blocklistManagement.inc
@@ -304,9 +304,10 @@ class blocklist extends plugin
 
       /* NEW LIST MANAGMENT */
       $listhead = "<div style='background:#F0F0F9;padding:5px;'>".
-        " <input class='center' type='image' align='middle' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
         " <input class='center' type='image' src='images/list_root.png' align='middle' title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'>&nbsp;".
+        " <input class='center' type='image' align='middle' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
         " <input class='center' type='image' align='middle' src='images/list_home.png' title='"._("Go to users department")."' alt='"._("Home")."' name='dep_home'>&nbsp;".
+        " <input class='center' type='image' src='images/list_reload.png' align='middle' title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
         " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
         " <input class='center' type='image' align='middle' src='images/list_new_blocklist.png' title='"._("Create new blocklist")."' alt='"._("New Blocklist")."' name='user_new'>&nbsp;".
         " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;"._("Base")."&nbsp;<select name='depselect' onChange='mainform.submit()' class='center'>$options</select>".
diff --git a/plugins/gofon/conference/class_phoneConferenceManagment.inc b/plugins/gofon/conference/class_phoneConferenceManagment.inc
index 141451d51..37314a836 100644
--- a/plugins/gofon/conference/class_phoneConferenceManagment.inc
+++ b/plugins/gofon/conference/class_phoneConferenceManagment.inc
@@ -282,9 +282,10 @@ class phoneConferenceManagment extends plugin
     }
 
     $listhead = "<div style='background:#F0F0F9;padding:5px;'>".
-      " <input class='center' type='image' align='middle' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
       " <input class='center' type='image' src='images/list_root.png' align='middle' title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'>&nbsp;".
+      " <input class='center' type='image' align='middle' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
       " <input class='center' type='image' align='middle' src='images/list_home.png' title='"._("Go to users department")."' alt='"._("Home")."' name='dep_home'>&nbsp;".
+      " <input class='center' type='image' src='images/list_reload.png' align='middle' title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
       " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
       " <input class='center' type='image' align='middle' src='images/list_new_conference.png' title='"._("Create new conference")."' alt='"._("New conference")."' name='user_new'>&nbsp;".
       " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
diff --git a/plugins/gofon/macro/class_gofonMacroManagement.inc b/plugins/gofon/macro/class_gofonMacroManagement.inc
index aab916c22..a88498d72 100755
--- a/plugins/gofon/macro/class_gofonMacroManagement.inc
+++ b/plugins/gofon/macro/class_gofonMacroManagement.inc
@@ -321,9 +321,10 @@ class gofonMacro extends plugin
 
    /* NEW LIST MANAGMENT */
     $listhead = "<div style='background:#F0F0F9;padding:5px;'>".
-            " <input class='center' type='image' align='middle' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
             " <input class='center' type='image' src='images/list_root.png' align='middle' title='"._("Go to root department")."' name='dep_root' alt='"._("Root").        "'>&nbsp;".
+            " <input class='center' type='image' align='middle' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
             " <input class='center' type='image' align='middle' src='images/list_home.png' title='"._("Go to users department")."' alt='"._("Home")."'                     name='dep_home'>&nbsp;".
+            " <input class='center' type='image' src='images/list_reload.png' align='middle' title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
             " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
             " <input class='center' type='image' align='middle' src='images/list_new_macro.png' title='"._("Create new phone macro")."' alt='"._("New")."' name='user_new'>&nbsp;".
             " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".