From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 18 Jan 2010 11:02:22 +0000 (+0000)
Subject: Big locales flush
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a1118f2feee74b1b6d7b34d81600835429b58923;p=gosa.git

Big locales flush


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

diff --git a/gosa-plugins/addressbook/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/addressbook/locale/de/LC_MESSAGES/messages.po
index 356202c72..8bba4a14f 100644
--- a/gosa-plugins/addressbook/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/addressbook/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2009-03-03 14:53+0100\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -43,7 +43,7 @@ msgid "Name"
 msgstr "Name"
 
 #: addons/addressbook/address_info.tpl:32
-#: addons/addressbook/class_addressbook.inc:875
+#: addons/addressbook/class_addressbook.inc:877
 #: addons/addressbook/address_edit.tpl:48
 msgid "Initials"
 msgstr "Initialien"
@@ -96,7 +96,7 @@ msgid "Company"
 msgstr "Firma"
 
 #: addons/addressbook/address_info.tpl:117
-#: addons/addressbook/class_addressbook.inc:870
+#: addons/addressbook/class_addressbook.inc:872
 #: addons/addressbook/address_edit.tpl:155
 msgid "Department"
 msgstr "Abteilung"
@@ -123,7 +123,7 @@ msgstr "Fax"
 
 #: addons/addressbook/address_info.tpl:179
 #: addons/addressbook/class_addressbook.inc:728
-#: addons/addressbook/class_addressbook.inc:868
+#: addons/addressbook/class_addressbook.inc:870
 #: addons/addressbook/address_edit.tpl:246
 msgid "Pager"
 msgstr "Pager"
@@ -152,9 +152,9 @@ msgstr ""
 msgid "Dial connection..."
 msgstr "Wähle Verbindung..."
 
-#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:461
-#: addons/addressbook/class_addressbook.inc:468
-#: addons/addressbook/class_addressbook.inc:472
+#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:463
+#: addons/addressbook/class_addressbook.inc:470
+#: addons/addressbook/class_addressbook.inc:474
 #: addons/addressbook/class_addressbook.inc:598
 msgid "Dial"
 msgstr "Wählen"
@@ -162,9 +162,9 @@ msgstr "Wählen"
 #: addons/addressbook/class_addressbook.inc:11
 #: addons/addressbook/class_addressbook.inc:12
 #: addons/addressbook/class_addressbook.inc:23
-#: addons/addressbook/class_addressbook.inc:851
-#: addons/addressbook/class_addressbook.inc:852
-#: addons/addressbook/class_addressbook.inc:857 addons/addressbook/main.inc:43
+#: addons/addressbook/class_addressbook.inc:853
+#: addons/addressbook/class_addressbook.inc:854
+#: addons/addressbook/class_addressbook.inc:859 addons/addressbook/main.inc:43
 msgid "Addressbook"
 msgstr "Adressbuch"
 
@@ -180,38 +180,38 @@ msgstr "GOsa-bezogene Objekte"
 msgid "This does something"
 msgstr "Dies tut etwas"
 
-#: addons/addressbook/class_addressbook.inc:191
+#: addons/addressbook/class_addressbook.inc:193
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr "Soll von %s nach %s gewählt werden?"
 
-#: addons/addressbook/class_addressbook.inc:195
+#: addons/addressbook/class_addressbook.inc:197
 msgid "Error"
 msgstr "Fehler"
 
-#: addons/addressbook/class_addressbook.inc:195
+#: addons/addressbook/class_addressbook.inc:197
 msgid ""
 "You need to set your personal phone number in order to perform direct dials."
 msgstr ""
 "Um direkt wählen zu können müssen Sie zuerst Ihre persönliche Telefonnummer "
 "einstellen."
 
-#: addons/addressbook/class_addressbook.inc:223
+#: addons/addressbook/class_addressbook.inc:225
 #: addons/addressbook/class_addressbook.inc:799
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: addons/addressbook/class_addressbook.inc:231
-#: addons/addressbook/class_addressbook.inc:339
+#: addons/addressbook/class_addressbook.inc:233
+#: addons/addressbook/class_addressbook.inc:341
 msgid "Permission"
 msgstr "Berechtigung"
 
-#: addons/addressbook/class_addressbook.inc:478
+#: addons/addressbook/class_addressbook.inc:480
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "Speichere Kontakt für %s als vcard"
 
-#: addons/addressbook/class_addressbook.inc:484
+#: addons/addressbook/class_addressbook.inc:486
 #, php-format
 msgid "Send mail to %s"
 msgstr "Sende eine Mail an %s"
@@ -241,7 +241,7 @@ msgstr "Alle"
 #: addons/addressbook/class_addressbook.inc:702
 #: addons/addressbook/class_addressbook.inc:711
 #: addons/addressbook/class_addressbook.inc:732
-#: addons/addressbook/class_addressbook.inc:861
+#: addons/addressbook/class_addressbook.inc:863
 msgid "Given name"
 msgstr "Vorname"
 
@@ -277,72 +277,72 @@ msgstr ""
 "Es kann kein eindeutiger DN für diesen Eintrag erzeugt werden. Füllen Sie "
 "bitte weitere Felder aus."
 
-#: addons/addressbook/class_addressbook.inc:851
+#: addons/addressbook/class_addressbook.inc:853
 msgid "Addressbook entries"
 msgstr "Adressbuch-Einträge"
 
-#: addons/addressbook/class_addressbook.inc:852
+#: addons/addressbook/class_addressbook.inc:854
 msgid "Addressbook related objects"
 msgstr "Adressbuch-bezogene Objekte"
 
-#: addons/addressbook/class_addressbook.inc:856
+#: addons/addressbook/class_addressbook.inc:858
 msgid "Addons"
 msgstr "Zusätzliches"
 
-#: addons/addressbook/class_addressbook.inc:860
+#: addons/addressbook/class_addressbook.inc:862
 msgid "Surename"
 msgstr "Nachname"
 
-#: addons/addressbook/class_addressbook.inc:862
+#: addons/addressbook/class_addressbook.inc:864
 msgid "Telefon number"
 msgstr "Telefonnummer"
 
-#: addons/addressbook/class_addressbook.inc:863
+#: addons/addressbook/class_addressbook.inc:865
 msgid "Fax number"
 msgstr "Faxnummer"
 
-#: addons/addressbook/class_addressbook.inc:864
+#: addons/addressbook/class_addressbook.inc:866
 msgid "Mobile number"
 msgstr "Mobiltelefon"
 
-#: addons/addressbook/class_addressbook.inc:865
+#: addons/addressbook/class_addressbook.inc:867
 msgid "Home phone number"
 msgstr "Telefonnummer (privat)"
 
-#: addons/addressbook/class_addressbook.inc:866
+#: addons/addressbook/class_addressbook.inc:868
 msgid "User identification"
 msgstr "Benutzerkennung"
 
-#: addons/addressbook/class_addressbook.inc:867
+#: addons/addressbook/class_addressbook.inc:869
 msgid "Mail address"
 msgstr "Mail-Adresse"
 
-#: addons/addressbook/class_addressbook.inc:869
+#: addons/addressbook/class_addressbook.inc:871
 msgid "Organization"
 msgstr "Organisation"
 
-#: addons/addressbook/class_addressbook.inc:871
+#: addons/addressbook/class_addressbook.inc:873
 msgid "Location"
 msgstr "Ort"
 
-#: addons/addressbook/class_addressbook.inc:872
-#: addons/addressbook/class_addressbook.inc:873
+#: addons/addressbook/class_addressbook.inc:874
+#: addons/addressbook/class_addressbook.inc:875
 msgid "Postal address"
 msgstr "Adresse"
 
-#: addons/addressbook/class_addressbook.inc:874
+#: addons/addressbook/class_addressbook.inc:876
 msgid "State"
 msgstr "Land"
 
-#: addons/addressbook/class_addressbook.inc:876
+#: addons/addressbook/class_addressbook.inc:878
 msgid "Title"
 msgstr "Titel"
 
-#: addons/addressbook/class_addressbook.inc:877
+#: addons/addressbook/class_addressbook.inc:879
 msgid "Home postal address"
 msgstr "Private Adresse"
 
-#: addons/addressbook/class_addressbook.inc:878
+#: addons/addressbook/class_addressbook.inc:880
 msgid "Common name"
 msgstr "Name"
 
diff --git a/gosa-plugins/addressbook/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/addressbook/locale/es/LC_MESSAGES/messages.po
index d8538ec91..04d3afc1a 100644
--- a/gosa-plugins/addressbook/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/addressbook/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
@@ -43,7 +43,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #: addons/addressbook/address_info.tpl:32
-#: addons/addressbook/class_addressbook.inc:875
+#: addons/addressbook/class_addressbook.inc:877
 #: addons/addressbook/address_edit.tpl:48
 msgid "Initials"
 msgstr ""
@@ -100,7 +100,7 @@ msgid "Company"
 msgstr "Copiar"
 
 #: addons/addressbook/address_info.tpl:117
-#: addons/addressbook/class_addressbook.inc:870
+#: addons/addressbook/class_addressbook.inc:872
 #: addons/addressbook/address_edit.tpl:155
 msgid "Department"
 msgstr "Departamento"
@@ -127,7 +127,7 @@ msgstr "FAX"
 
 #: addons/addressbook/address_info.tpl:179
 #: addons/addressbook/class_addressbook.inc:728
-#: addons/addressbook/class_addressbook.inc:868
+#: addons/addressbook/class_addressbook.inc:870
 #: addons/addressbook/address_edit.tpl:246
 msgid "Pager"
 msgstr "Buscapersonas"
@@ -158,9 +158,9 @@ msgstr ""
 msgid "Dial connection..."
 msgstr "Conexión LDAP"
 
-#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:461
-#: addons/addressbook/class_addressbook.inc:468
-#: addons/addressbook/class_addressbook.inc:472
+#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:463
+#: addons/addressbook/class_addressbook.inc:470
+#: addons/addressbook/class_addressbook.inc:474
 #: addons/addressbook/class_addressbook.inc:598
 #, fuzzy
 msgid "Dial"
@@ -169,9 +169,9 @@ msgstr "Desactivado"
 #: addons/addressbook/class_addressbook.inc:11
 #: addons/addressbook/class_addressbook.inc:12
 #: addons/addressbook/class_addressbook.inc:23
-#: addons/addressbook/class_addressbook.inc:851
-#: addons/addressbook/class_addressbook.inc:852
-#: addons/addressbook/class_addressbook.inc:857 addons/addressbook/main.inc:43
+#: addons/addressbook/class_addressbook.inc:853
+#: addons/addressbook/class_addressbook.inc:854
+#: addons/addressbook/class_addressbook.inc:859 addons/addressbook/main.inc:43
 msgid "Addressbook"
 msgstr "Libreta direcciones"
 
@@ -189,39 +189,39 @@ msgstr "Crear objetos"
 msgid "This does something"
 msgstr "Mostrar objetos que coincidan"
 
-#: addons/addressbook/class_addressbook.inc:191
+#: addons/addressbook/class_addressbook.inc:193
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:195
+#: addons/addressbook/class_addressbook.inc:197
 msgid "Error"
 msgstr "Error"
 
-#: addons/addressbook/class_addressbook.inc:195
+#: addons/addressbook/class_addressbook.inc:197
 #, fuzzy
 msgid ""
 "You need to set your personal phone number in order to perform direct dials."
 msgstr "Necesita introducir su contraseña actual para continuar."
 
-#: addons/addressbook/class_addressbook.inc:223
+#: addons/addressbook/class_addressbook.inc:225
 #: addons/addressbook/class_addressbook.inc:799
 #, fuzzy
 msgid "LDAP error"
 msgstr "Servicio LDAP"
 
-#: addons/addressbook/class_addressbook.inc:231
-#: addons/addressbook/class_addressbook.inc:339
+#: addons/addressbook/class_addressbook.inc:233
+#: addons/addressbook/class_addressbook.inc:341
 #, fuzzy
 msgid "Permission"
 msgstr "Permisos"
 
-#: addons/addressbook/class_addressbook.inc:478
+#: addons/addressbook/class_addressbook.inc:480
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:484
+#: addons/addressbook/class_addressbook.inc:486
 #, php-format
 msgid "Send mail to %s"
 msgstr ""
@@ -255,7 +255,7 @@ msgstr "Acl"
 #: addons/addressbook/class_addressbook.inc:702
 #: addons/addressbook/class_addressbook.inc:711
 #: addons/addressbook/class_addressbook.inc:732
-#: addons/addressbook/class_addressbook.inc:861
+#: addons/addressbook/class_addressbook.inc:863
 msgid "Given name"
 msgstr "Nombre de pila"
 
@@ -293,76 +293,76 @@ msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:851
+#: addons/addressbook/class_addressbook.inc:853
 #, fuzzy
 msgid "Addressbook entries"
 msgstr "Libreta direcciones"
 
-#: addons/addressbook/class_addressbook.inc:852
+#: addons/addressbook/class_addressbook.inc:854
 #, fuzzy
 msgid "Addressbook related objects"
 msgstr "Crear objetos"
 
-#: addons/addressbook/class_addressbook.inc:856
+#: addons/addressbook/class_addressbook.inc:858
 #, fuzzy
 msgid "Addons"
 msgstr "Añadir"
 
-#: addons/addressbook/class_addressbook.inc:860
+#: addons/addressbook/class_addressbook.inc:862
 msgid "Surename"
 msgstr "Apellidos"
 
-#: addons/addressbook/class_addressbook.inc:862
+#: addons/addressbook/class_addressbook.inc:864
 msgid "Telefon number"
 msgstr "Número de teléfono"
 
-#: addons/addressbook/class_addressbook.inc:863
+#: addons/addressbook/class_addressbook.inc:865
 msgid "Fax number"
 msgstr "Número de Fax"
 
-#: addons/addressbook/class_addressbook.inc:864
+#: addons/addressbook/class_addressbook.inc:866
 msgid "Mobile number"
 msgstr "Teléfono móvil"
 
-#: addons/addressbook/class_addressbook.inc:865
+#: addons/addressbook/class_addressbook.inc:867
 msgid "Home phone number"
 msgstr "Número de teléfono personal"
 
-#: addons/addressbook/class_addressbook.inc:866
+#: addons/addressbook/class_addressbook.inc:868
 msgid "User identification"
 msgstr "Identificación de Usuario"
 
-#: addons/addressbook/class_addressbook.inc:867
+#: addons/addressbook/class_addressbook.inc:869
 msgid "Mail address"
 msgstr "Dirección correo electrónico"
 
-#: addons/addressbook/class_addressbook.inc:869
+#: addons/addressbook/class_addressbook.inc:871
 msgid "Organization"
 msgstr "Organización"
 
-#: addons/addressbook/class_addressbook.inc:871
+#: addons/addressbook/class_addressbook.inc:873
 msgid "Location"
 msgstr "Localización"
 
-#: addons/addressbook/class_addressbook.inc:872
-#: addons/addressbook/class_addressbook.inc:873
+#: addons/addressbook/class_addressbook.inc:874
+#: addons/addressbook/class_addressbook.inc:875
 msgid "Postal address"
 msgstr "Código Postal"
 
-#: addons/addressbook/class_addressbook.inc:874
+#: addons/addressbook/class_addressbook.inc:876
 msgid "State"
 msgstr "Provincia"
 
-#: addons/addressbook/class_addressbook.inc:876
+#: addons/addressbook/class_addressbook.inc:878
 #, fuzzy
 msgid "Title"
 msgstr "Archivo"
 
-#: addons/addressbook/class_addressbook.inc:877
+#: addons/addressbook/class_addressbook.inc:879
 msgid "Home postal address"
 msgstr "Dirección Postal personal"
 
-#: addons/addressbook/class_addressbook.inc:878
+#: addons/addressbook/class_addressbook.inc:880
 #, fuzzy
 msgid "Common name"
 msgstr "Nombre del País"
diff --git a/gosa-plugins/addressbook/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/addressbook/locale/fr/LC_MESSAGES/messages.po
index 859128027..2273fb62c 100644
--- a/gosa-plugins/addressbook/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/addressbook/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2009-02-28 13:55+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -37,7 +37,7 @@ msgid "Name"
 msgstr "Nom"
 
 #: addons/addressbook/address_info.tpl:32
-#: addons/addressbook/class_addressbook.inc:875
+#: addons/addressbook/class_addressbook.inc:877
 #: addons/addressbook/address_edit.tpl:48
 msgid "Initials"
 msgstr "Initiales"
@@ -90,7 +90,7 @@ msgid "Company"
 msgstr "Société"
 
 #: addons/addressbook/address_info.tpl:117
-#: addons/addressbook/class_addressbook.inc:870
+#: addons/addressbook/class_addressbook.inc:872
 #: addons/addressbook/address_edit.tpl:155
 msgid "Department"
 msgstr "Département"
@@ -117,7 +117,7 @@ msgstr "FAX"
 
 #: addons/addressbook/address_info.tpl:179
 #: addons/addressbook/class_addressbook.inc:728
-#: addons/addressbook/class_addressbook.inc:868
+#: addons/addressbook/class_addressbook.inc:870
 #: addons/addressbook/address_edit.tpl:246
 msgid "Pager"
 msgstr "Bip"
@@ -147,9 +147,9 @@ msgstr ""
 msgid "Dial connection..."
 msgstr "Appel en cours ..."
 
-#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:461
-#: addons/addressbook/class_addressbook.inc:468
-#: addons/addressbook/class_addressbook.inc:472
+#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:463
+#: addons/addressbook/class_addressbook.inc:470
+#: addons/addressbook/class_addressbook.inc:474
 #: addons/addressbook/class_addressbook.inc:598
 msgid "Dial"
 msgstr "Appeler"
@@ -157,9 +157,9 @@ msgstr "Appeler"
 #: addons/addressbook/class_addressbook.inc:11
 #: addons/addressbook/class_addressbook.inc:12
 #: addons/addressbook/class_addressbook.inc:23
-#: addons/addressbook/class_addressbook.inc:851
-#: addons/addressbook/class_addressbook.inc:852
-#: addons/addressbook/class_addressbook.inc:857 addons/addressbook/main.inc:43
+#: addons/addressbook/class_addressbook.inc:853
+#: addons/addressbook/class_addressbook.inc:854
+#: addons/addressbook/class_addressbook.inc:859 addons/addressbook/main.inc:43
 msgid "Addressbook"
 msgstr "Carnet d'adresses"
 
@@ -175,38 +175,38 @@ msgstr "Objets liés à GOsa"
 msgid "This does something"
 msgstr "Ceci fait quelque chose"
 
-#: addons/addressbook/class_addressbook.inc:191
+#: addons/addressbook/class_addressbook.inc:193
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr "Appeler de %s vers %s maintenant ?"
 
-#: addons/addressbook/class_addressbook.inc:195
+#: addons/addressbook/class_addressbook.inc:197
 msgid "Error"
 msgstr "Erreur"
 
-#: addons/addressbook/class_addressbook.inc:195
+#: addons/addressbook/class_addressbook.inc:197
 msgid ""
 "You need to set your personal phone number in order to perform direct dials."
 msgstr ""
 "Vous n'avez pas de numéro de téléphone personnel indiqué. Veuillez rectifier "
 "cela afin de pouvoir faire des appels directs."
 
-#: addons/addressbook/class_addressbook.inc:223
+#: addons/addressbook/class_addressbook.inc:225
 #: addons/addressbook/class_addressbook.inc:799
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: addons/addressbook/class_addressbook.inc:231
-#: addons/addressbook/class_addressbook.inc:339
+#: addons/addressbook/class_addressbook.inc:233
+#: addons/addressbook/class_addressbook.inc:341
 msgid "Permission"
 msgstr "Permissions"
 
-#: addons/addressbook/class_addressbook.inc:478
+#: addons/addressbook/class_addressbook.inc:480
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "Enregistrer le contact %s au format vcard"
 
-#: addons/addressbook/class_addressbook.inc:484
+#: addons/addressbook/class_addressbook.inc:486
 #, php-format
 msgid "Send mail to %s"
 msgstr "Envoyer un message à %s"
@@ -236,7 +236,7 @@ msgstr "Tout"
 #: addons/addressbook/class_addressbook.inc:702
 #: addons/addressbook/class_addressbook.inc:711
 #: addons/addressbook/class_addressbook.inc:732
-#: addons/addressbook/class_addressbook.inc:861
+#: addons/addressbook/class_addressbook.inc:863
 msgid "Given name"
 msgstr "Prénom"
 
@@ -272,72 +272,72 @@ msgstr ""
 "Impossible de créer un DN unique pour cette entrée. Veuillez remplir plus de "
 "champs."
 
-#: addons/addressbook/class_addressbook.inc:851
+#: addons/addressbook/class_addressbook.inc:853
 msgid "Addressbook entries"
 msgstr "Entrées du carnet d'adresses"
 
-#: addons/addressbook/class_addressbook.inc:852
+#: addons/addressbook/class_addressbook.inc:854
 msgid "Addressbook related objects"
 msgstr "objets liés au carnet d'adresse"
 
-#: addons/addressbook/class_addressbook.inc:856
+#: addons/addressbook/class_addressbook.inc:858
 msgid "Addons"
 msgstr "Extensions"
 
-#: addons/addressbook/class_addressbook.inc:860
+#: addons/addressbook/class_addressbook.inc:862
 msgid "Surename"
 msgstr "Nom de famille"
 
-#: addons/addressbook/class_addressbook.inc:862
+#: addons/addressbook/class_addressbook.inc:864
 msgid "Telefon number"
 msgstr "Numéro de téléphone"
 
-#: addons/addressbook/class_addressbook.inc:863
+#: addons/addressbook/class_addressbook.inc:865
 msgid "Fax number"
 msgstr "Numéro de fax"
 
-#: addons/addressbook/class_addressbook.inc:864
+#: addons/addressbook/class_addressbook.inc:866
 msgid "Mobile number"
 msgstr "Numéro de GSM"
 
-#: addons/addressbook/class_addressbook.inc:865
+#: addons/addressbook/class_addressbook.inc:867
 msgid "Home phone number"
 msgstr "Numéro de téléphone privé"
 
-#: addons/addressbook/class_addressbook.inc:866
+#: addons/addressbook/class_addressbook.inc:868
 msgid "User identification"
 msgstr "Information Utilisateur"
 
-#: addons/addressbook/class_addressbook.inc:867
+#: addons/addressbook/class_addressbook.inc:869
 msgid "Mail address"
 msgstr "Adresse de messagerie"
 
-#: addons/addressbook/class_addressbook.inc:869
+#: addons/addressbook/class_addressbook.inc:871
 msgid "Organization"
 msgstr "Entreprise"
 
-#: addons/addressbook/class_addressbook.inc:871
+#: addons/addressbook/class_addressbook.inc:873
 msgid "Location"
 msgstr "Lieu"
 
-#: addons/addressbook/class_addressbook.inc:872
-#: addons/addressbook/class_addressbook.inc:873
+#: addons/addressbook/class_addressbook.inc:874
+#: addons/addressbook/class_addressbook.inc:875
 msgid "Postal address"
 msgstr "Adresse postale"
 
-#: addons/addressbook/class_addressbook.inc:874
+#: addons/addressbook/class_addressbook.inc:876
 msgid "State"
 msgstr "Département"
 
-#: addons/addressbook/class_addressbook.inc:876
+#: addons/addressbook/class_addressbook.inc:878
 msgid "Title"
 msgstr "Titre"
 
-#: addons/addressbook/class_addressbook.inc:877
+#: addons/addressbook/class_addressbook.inc:879
 msgid "Home postal address"
 msgstr "Adresse postale personnelle"
 
-#: addons/addressbook/class_addressbook.inc:878
+#: addons/addressbook/class_addressbook.inc:880
 msgid "Common name"
 msgstr "Nom complet"
 
diff --git a/gosa-plugins/addressbook/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/addressbook/locale/it/LC_MESSAGES/messages.po
index 6a91fb1bb..22cda1326 100644
--- a/gosa-plugins/addressbook/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/addressbook/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -40,7 +40,7 @@ msgid "Name"
 msgstr "Cognome"
 
 #: addons/addressbook/address_info.tpl:32
-#: addons/addressbook/class_addressbook.inc:875
+#: addons/addressbook/class_addressbook.inc:877
 #: addons/addressbook/address_edit.tpl:48
 msgid "Initials"
 msgstr "Iniziali"
@@ -93,7 +93,7 @@ msgid "Company"
 msgstr "Azienda"
 
 #: addons/addressbook/address_info.tpl:117
-#: addons/addressbook/class_addressbook.inc:870
+#: addons/addressbook/class_addressbook.inc:872
 #: addons/addressbook/address_edit.tpl:155
 msgid "Department"
 msgstr "Dipartimento"
@@ -120,7 +120,7 @@ msgstr "FAX"
 
 #: addons/addressbook/address_info.tpl:179
 #: addons/addressbook/class_addressbook.inc:728
-#: addons/addressbook/class_addressbook.inc:868
+#: addons/addressbook/class_addressbook.inc:870
 #: addons/addressbook/address_edit.tpl:246
 msgid "Pager"
 msgstr "Pager"
@@ -148,9 +148,9 @@ msgstr ""
 msgid "Dial connection..."
 msgstr "Disconnessione "
 
-#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:461
-#: addons/addressbook/class_addressbook.inc:468
-#: addons/addressbook/class_addressbook.inc:472
+#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:463
+#: addons/addressbook/class_addressbook.inc:470
+#: addons/addressbook/class_addressbook.inc:474
 #: addons/addressbook/class_addressbook.inc:598
 #, fuzzy
 msgid "Dial"
@@ -159,9 +159,9 @@ msgstr "disabilitato"
 #: addons/addressbook/class_addressbook.inc:11
 #: addons/addressbook/class_addressbook.inc:12
 #: addons/addressbook/class_addressbook.inc:23
-#: addons/addressbook/class_addressbook.inc:851
-#: addons/addressbook/class_addressbook.inc:852
-#: addons/addressbook/class_addressbook.inc:857 addons/addressbook/main.inc:43
+#: addons/addressbook/class_addressbook.inc:853
+#: addons/addressbook/class_addressbook.inc:854
+#: addons/addressbook/class_addressbook.inc:859 addons/addressbook/main.inc:43
 msgid "Addressbook"
 msgstr "Rubrica"
 
@@ -178,39 +178,39 @@ msgstr "Gruppo di oggetti"
 msgid "This does something"
 msgstr "Questo fa qualcosa"
 
-#: addons/addressbook/class_addressbook.inc:191
+#: addons/addressbook/class_addressbook.inc:193
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:195
+#: addons/addressbook/class_addressbook.inc:197
 msgid "Error"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:195
+#: addons/addressbook/class_addressbook.inc:197
 #, fuzzy
 msgid ""
 "You need to set your personal phone number in order to perform direct dials."
 msgstr "Devi specificare la tua 'Password attuale' per procedere."
 
-#: addons/addressbook/class_addressbook.inc:223
+#: addons/addressbook/class_addressbook.inc:225
 #: addons/addressbook/class_addressbook.inc:799
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: addons/addressbook/class_addressbook.inc:231
-#: addons/addressbook/class_addressbook.inc:339
+#: addons/addressbook/class_addressbook.inc:233
+#: addons/addressbook/class_addressbook.inc:341
 #, fuzzy
 msgid "Permission"
 msgstr "Permessi"
 
-#: addons/addressbook/class_addressbook.inc:478
+#: addons/addressbook/class_addressbook.inc:480
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:484
+#: addons/addressbook/class_addressbook.inc:486
 #, php-format
 msgid "Send mail to %s"
 msgstr ""
@@ -242,7 +242,7 @@ msgstr ""
 #: addons/addressbook/class_addressbook.inc:702
 #: addons/addressbook/class_addressbook.inc:711
 #: addons/addressbook/class_addressbook.inc:732
-#: addons/addressbook/class_addressbook.inc:861
+#: addons/addressbook/class_addressbook.inc:863
 msgid "Given name"
 msgstr "Nome"
 
@@ -277,79 +277,79 @@ msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:851
+#: addons/addressbook/class_addressbook.inc:853
 #, fuzzy
 msgid "Addressbook entries"
 msgstr "Mostra contatti della rubrica"
 
-#: addons/addressbook/class_addressbook.inc:852
+#: addons/addressbook/class_addressbook.inc:854
 #, fuzzy
 msgid "Addressbook related objects"
 msgstr "Mostra contatti della rubrica"
 
-#: addons/addressbook/class_addressbook.inc:856
+#: addons/addressbook/class_addressbook.inc:858
 msgid "Addons"
 msgstr "Extra"
 
-#: addons/addressbook/class_addressbook.inc:860
+#: addons/addressbook/class_addressbook.inc:862
 msgid "Surename"
 msgstr "Cognome"
 
-#: addons/addressbook/class_addressbook.inc:862
+#: addons/addressbook/class_addressbook.inc:864
 #, fuzzy
 msgid "Telefon number"
 msgstr "Numero di telefono"
 
-#: addons/addressbook/class_addressbook.inc:863
+#: addons/addressbook/class_addressbook.inc:865
 #, fuzzy
 msgid "Fax number"
 msgstr "Numero di telefono"
 
-#: addons/addressbook/class_addressbook.inc:864
+#: addons/addressbook/class_addressbook.inc:866
 #, fuzzy
 msgid "Mobile number"
 msgstr "Cellulare"
 
-#: addons/addressbook/class_addressbook.inc:865
+#: addons/addressbook/class_addressbook.inc:867
 #, fuzzy
 msgid "Home phone number"
 msgstr "Numero di telefono"
 
-#: addons/addressbook/class_addressbook.inc:866
+#: addons/addressbook/class_addressbook.inc:868
 #, fuzzy
 msgid "User identification"
 msgstr "Amministrazione utenti"
 
-#: addons/addressbook/class_addressbook.inc:867
+#: addons/addressbook/class_addressbook.inc:869
 msgid "Mail address"
 msgstr "Indirizzo principale"
 
-#: addons/addressbook/class_addressbook.inc:869
+#: addons/addressbook/class_addressbook.inc:871
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: addons/addressbook/class_addressbook.inc:871
+#: addons/addressbook/class_addressbook.inc:873
 msgid "Location"
 msgstr "Località"
 
-#: addons/addressbook/class_addressbook.inc:872
-#: addons/addressbook/class_addressbook.inc:873
+#: addons/addressbook/class_addressbook.inc:874
+#: addons/addressbook/class_addressbook.inc:875
 msgid "Postal address"
 msgstr "CAP"
 
-#: addons/addressbook/class_addressbook.inc:874
+#: addons/addressbook/class_addressbook.inc:876
 msgid "State"
 msgstr "Stato"
 
-#: addons/addressbook/class_addressbook.inc:876
+#: addons/addressbook/class_addressbook.inc:878
 msgid "Title"
 msgstr "Titolo"
 
-#: addons/addressbook/class_addressbook.inc:877
+#: addons/addressbook/class_addressbook.inc:879
 msgid "Home postal address"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:878
+#: addons/addressbook/class_addressbook.inc:880
 msgid "Common name"
 msgstr "Nome comune"
 
diff --git a/gosa-plugins/addressbook/locale/messages.po b/gosa-plugins/addressbook/locale/messages.po
index 270754b93..c0621bb89 100644
--- a/gosa-plugins/addressbook/locale/messages.po
+++ b/gosa-plugins/addressbook/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,7 +39,7 @@ msgid "Name"
 msgstr ""
 
 #: addons/addressbook/address_info.tpl:32
-#: addons/addressbook/class_addressbook.inc:875
+#: addons/addressbook/class_addressbook.inc:877
 #: addons/addressbook/address_edit.tpl:48
 msgid "Initials"
 msgstr ""
@@ -92,7 +92,7 @@ msgid "Company"
 msgstr ""
 
 #: addons/addressbook/address_info.tpl:117
-#: addons/addressbook/class_addressbook.inc:870
+#: addons/addressbook/class_addressbook.inc:872
 #: addons/addressbook/address_edit.tpl:155
 msgid "Department"
 msgstr ""
@@ -119,7 +119,7 @@ msgstr ""
 
 #: addons/addressbook/address_info.tpl:179
 #: addons/addressbook/class_addressbook.inc:728
-#: addons/addressbook/class_addressbook.inc:868
+#: addons/addressbook/class_addressbook.inc:870
 #: addons/addressbook/address_edit.tpl:246
 msgid "Pager"
 msgstr ""
@@ -143,9 +143,9 @@ msgstr ""
 msgid "Dial connection..."
 msgstr ""
 
-#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:461
-#: addons/addressbook/class_addressbook.inc:468
-#: addons/addressbook/class_addressbook.inc:472
+#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:463
+#: addons/addressbook/class_addressbook.inc:470
+#: addons/addressbook/class_addressbook.inc:474
 #: addons/addressbook/class_addressbook.inc:598
 msgid "Dial"
 msgstr ""
@@ -153,9 +153,9 @@ msgstr ""
 #: addons/addressbook/class_addressbook.inc:11
 #: addons/addressbook/class_addressbook.inc:12
 #: addons/addressbook/class_addressbook.inc:23
-#: addons/addressbook/class_addressbook.inc:851
-#: addons/addressbook/class_addressbook.inc:852
-#: addons/addressbook/class_addressbook.inc:857 addons/addressbook/main.inc:43
+#: addons/addressbook/class_addressbook.inc:853
+#: addons/addressbook/class_addressbook.inc:854
+#: addons/addressbook/class_addressbook.inc:859 addons/addressbook/main.inc:43
 msgid "Addressbook"
 msgstr ""
 
@@ -171,36 +171,36 @@ msgstr ""
 msgid "This does something"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:191
+#: addons/addressbook/class_addressbook.inc:193
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:195
+#: addons/addressbook/class_addressbook.inc:197
 msgid "Error"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:195
+#: addons/addressbook/class_addressbook.inc:197
 msgid ""
 "You need to set your personal phone number in order to perform direct dials."
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:223
+#: addons/addressbook/class_addressbook.inc:225
 #: addons/addressbook/class_addressbook.inc:799
 msgid "LDAP error"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:231
-#: addons/addressbook/class_addressbook.inc:339
+#: addons/addressbook/class_addressbook.inc:233
+#: addons/addressbook/class_addressbook.inc:341
 msgid "Permission"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:478
+#: addons/addressbook/class_addressbook.inc:480
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:484
+#: addons/addressbook/class_addressbook.inc:486
 #, php-format
 msgid "Send mail to %s"
 msgstr ""
@@ -230,7 +230,7 @@ msgstr ""
 #: addons/addressbook/class_addressbook.inc:702
 #: addons/addressbook/class_addressbook.inc:711
 #: addons/addressbook/class_addressbook.inc:732
-#: addons/addressbook/class_addressbook.inc:861
+#: addons/addressbook/class_addressbook.inc:863
 msgid "Given name"
 msgstr ""
 
@@ -264,72 +264,72 @@ msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:851
+#: addons/addressbook/class_addressbook.inc:853
 msgid "Addressbook entries"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:852
+#: addons/addressbook/class_addressbook.inc:854
 msgid "Addressbook related objects"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:856
+#: addons/addressbook/class_addressbook.inc:858
 msgid "Addons"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:860
+#: addons/addressbook/class_addressbook.inc:862
 msgid "Surename"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:862
+#: addons/addressbook/class_addressbook.inc:864
 msgid "Telefon number"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:863
+#: addons/addressbook/class_addressbook.inc:865
 msgid "Fax number"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:864
+#: addons/addressbook/class_addressbook.inc:866
 msgid "Mobile number"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:865
+#: addons/addressbook/class_addressbook.inc:867
 msgid "Home phone number"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:866
+#: addons/addressbook/class_addressbook.inc:868
 msgid "User identification"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:867
+#: addons/addressbook/class_addressbook.inc:869
 msgid "Mail address"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:869
+#: addons/addressbook/class_addressbook.inc:871
 msgid "Organization"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:871
+#: addons/addressbook/class_addressbook.inc:873
 msgid "Location"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:872
-#: addons/addressbook/class_addressbook.inc:873
+#: addons/addressbook/class_addressbook.inc:874
+#: addons/addressbook/class_addressbook.inc:875
 msgid "Postal address"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:874
+#: addons/addressbook/class_addressbook.inc:876
 msgid "State"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:876
+#: addons/addressbook/class_addressbook.inc:878
 msgid "Title"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:877
+#: addons/addressbook/class_addressbook.inc:879
 msgid "Home postal address"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:878
+#: addons/addressbook/class_addressbook.inc:880
 msgid "Common name"
 msgstr ""
 
diff --git a/gosa-plugins/addressbook/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/addressbook/locale/nl/LC_MESSAGES/messages.po
index f3f7eefac..8fb4504ce 100644
--- a/gosa-plugins/addressbook/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/addressbook/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2008-06-09 17:54+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -44,7 +44,7 @@ msgid "Name"
 msgstr "Naam"
 
 #: addons/addressbook/address_info.tpl:32
-#: addons/addressbook/class_addressbook.inc:875
+#: addons/addressbook/class_addressbook.inc:877
 #: addons/addressbook/address_edit.tpl:48
 msgid "Initials"
 msgstr "Initialen"
@@ -97,7 +97,7 @@ msgid "Company"
 msgstr "Bedrijf"
 
 #: addons/addressbook/address_info.tpl:117
-#: addons/addressbook/class_addressbook.inc:870
+#: addons/addressbook/class_addressbook.inc:872
 #: addons/addressbook/address_edit.tpl:155
 msgid "Department"
 msgstr "Afdeling"
@@ -124,7 +124,7 @@ msgstr "Fax"
 
 #: addons/addressbook/address_info.tpl:179
 #: addons/addressbook/class_addressbook.inc:728
-#: addons/addressbook/class_addressbook.inc:868
+#: addons/addressbook/class_addressbook.inc:870
 #: addons/addressbook/address_edit.tpl:246
 msgid "Pager"
 msgstr "Pieper"
@@ -153,9 +153,9 @@ msgstr ""
 msgid "Dial connection..."
 msgstr "Bel..."
 
-#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:461
-#: addons/addressbook/class_addressbook.inc:468
-#: addons/addressbook/class_addressbook.inc:472
+#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:463
+#: addons/addressbook/class_addressbook.inc:470
+#: addons/addressbook/class_addressbook.inc:474
 #: addons/addressbook/class_addressbook.inc:598
 msgid "Dial"
 msgstr "Kies"
@@ -163,9 +163,9 @@ msgstr "Kies"
 #: addons/addressbook/class_addressbook.inc:11
 #: addons/addressbook/class_addressbook.inc:12
 #: addons/addressbook/class_addressbook.inc:23
-#: addons/addressbook/class_addressbook.inc:851
-#: addons/addressbook/class_addressbook.inc:852
-#: addons/addressbook/class_addressbook.inc:857 addons/addressbook/main.inc:43
+#: addons/addressbook/class_addressbook.inc:853
+#: addons/addressbook/class_addressbook.inc:854
+#: addons/addressbook/class_addressbook.inc:859 addons/addressbook/main.inc:43
 msgid "Addressbook"
 msgstr "Adresboek"
 
@@ -182,38 +182,38 @@ msgstr "Nieuw FAI object aanmaken"
 msgid "This does something"
 msgstr "Dit doet iets"
 
-#: addons/addressbook/class_addressbook.inc:191
+#: addons/addressbook/class_addressbook.inc:193
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr "Nu van %s naar %s bellen?"
 
-#: addons/addressbook/class_addressbook.inc:195
+#: addons/addressbook/class_addressbook.inc:197
 msgid "Error"
 msgstr "Fout"
 
-#: addons/addressbook/class_addressbook.inc:195
+#: addons/addressbook/class_addressbook.inc:197
 msgid ""
 "You need to set your personal phone number in order to perform direct dials."
 msgstr ""
 "Er moet een privé telefoonnummer opgegeven zijn om direkt te kunnen bellen"
 
-#: addons/addressbook/class_addressbook.inc:223
+#: addons/addressbook/class_addressbook.inc:225
 #: addons/addressbook/class_addressbook.inc:799
 msgid "LDAP error"
 msgstr "LDAP fout"
 
-#: addons/addressbook/class_addressbook.inc:231
-#: addons/addressbook/class_addressbook.inc:339
+#: addons/addressbook/class_addressbook.inc:233
+#: addons/addressbook/class_addressbook.inc:341
 #, fuzzy
 msgid "Permission"
 msgstr "Rechten"
 
-#: addons/addressbook/class_addressbook.inc:478
+#: addons/addressbook/class_addressbook.inc:480
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "Sla contact voor %s op als vcard"
 
-#: addons/addressbook/class_addressbook.inc:484
+#: addons/addressbook/class_addressbook.inc:486
 #, php-format
 msgid "Send mail to %s"
 msgstr "Stuur E-mail naar %s"
@@ -243,7 +243,7 @@ msgstr "Alle"
 #: addons/addressbook/class_addressbook.inc:702
 #: addons/addressbook/class_addressbook.inc:711
 #: addons/addressbook/class_addressbook.inc:732
-#: addons/addressbook/class_addressbook.inc:861
+#: addons/addressbook/class_addressbook.inc:863
 msgid "Given name"
 msgstr "Voornaam"
 
@@ -279,74 +279,74 @@ msgstr ""
 "Kan geen unieke DN aanmaken voor uw invoer. Vul a.u.b. meer formulier velden "
 "in."
 
-#: addons/addressbook/class_addressbook.inc:851
+#: addons/addressbook/class_addressbook.inc:853
 #, fuzzy
 msgid "Addressbook entries"
 msgstr "Toon adresboek regels"
 
-#: addons/addressbook/class_addressbook.inc:852
+#: addons/addressbook/class_addressbook.inc:854
 #, fuzzy
 msgid "Addressbook related objects"
 msgstr "Adresboek invoer ACLs"
 
-#: addons/addressbook/class_addressbook.inc:856
+#: addons/addressbook/class_addressbook.inc:858
 msgid "Addons"
 msgstr "Plugins"
 
-#: addons/addressbook/class_addressbook.inc:860
+#: addons/addressbook/class_addressbook.inc:862
 msgid "Surename"
 msgstr "Achternaam"
 
-#: addons/addressbook/class_addressbook.inc:862
+#: addons/addressbook/class_addressbook.inc:864
 msgid "Telefon number"
 msgstr "Telefoonnummer"
 
-#: addons/addressbook/class_addressbook.inc:863
+#: addons/addressbook/class_addressbook.inc:865
 msgid "Fax number"
 msgstr "FAX nummer"
 
-#: addons/addressbook/class_addressbook.inc:864
+#: addons/addressbook/class_addressbook.inc:866
 msgid "Mobile number"
 msgstr "GSM nummer"
 
-#: addons/addressbook/class_addressbook.inc:865
+#: addons/addressbook/class_addressbook.inc:867
 msgid "Home phone number"
 msgstr "Prive nummer"
 
-#: addons/addressbook/class_addressbook.inc:866
+#: addons/addressbook/class_addressbook.inc:868
 msgid "User identification"
 msgstr "Gebruiker identificatie"
 
-#: addons/addressbook/class_addressbook.inc:867
+#: addons/addressbook/class_addressbook.inc:869
 msgid "Mail address"
 msgstr "E-mail adres"
 
-#: addons/addressbook/class_addressbook.inc:869
+#: addons/addressbook/class_addressbook.inc:871
 msgid "Organization"
 msgstr "Organisatie"
 
-#: addons/addressbook/class_addressbook.inc:871
+#: addons/addressbook/class_addressbook.inc:873
 msgid "Location"
 msgstr "Plaats"
 
-#: addons/addressbook/class_addressbook.inc:872
-#: addons/addressbook/class_addressbook.inc:873
+#: addons/addressbook/class_addressbook.inc:874
+#: addons/addressbook/class_addressbook.inc:875
 msgid "Postal address"
 msgstr "Postadres"
 
-#: addons/addressbook/class_addressbook.inc:874
+#: addons/addressbook/class_addressbook.inc:876
 msgid "State"
 msgstr "Provincie"
 
-#: addons/addressbook/class_addressbook.inc:876
+#: addons/addressbook/class_addressbook.inc:878
 msgid "Title"
 msgstr "Titel"
 
-#: addons/addressbook/class_addressbook.inc:877
+#: addons/addressbook/class_addressbook.inc:879
 msgid "Home postal address"
 msgstr "Postadres thuis"
 
-#: addons/addressbook/class_addressbook.inc:878
+#: addons/addressbook/class_addressbook.inc:880
 msgid "Common name"
 msgstr "Algemene naam"
 
diff --git a/gosa-plugins/addressbook/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/addressbook/locale/pl/LC_MESSAGES/messages.po
index f86c8d69b..eb40a2df7 100644
--- a/gosa-plugins/addressbook/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/addressbook/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2009-09-05 15:16+0100\n"
 "Last-Translator: Piort Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -37,7 +37,7 @@ msgid "Name"
 msgstr "Imię"
 
 #: addons/addressbook/address_info.tpl:32
-#: addons/addressbook/class_addressbook.inc:875
+#: addons/addressbook/class_addressbook.inc:877
 #: addons/addressbook/address_edit.tpl:48
 msgid "Initials"
 msgstr "Inicjały"
@@ -90,7 +90,7 @@ msgid "Company"
 msgstr "Firma"
 
 #: addons/addressbook/address_info.tpl:117
-#: addons/addressbook/class_addressbook.inc:870
+#: addons/addressbook/class_addressbook.inc:872
 #: addons/addressbook/address_edit.tpl:155
 msgid "Department"
 msgstr "Departament"
@@ -117,7 +117,7 @@ msgstr "FAX"
 
 #: addons/addressbook/address_info.tpl:179
 #: addons/addressbook/class_addressbook.inc:728
-#: addons/addressbook/class_addressbook.inc:868
+#: addons/addressbook/class_addressbook.inc:870
 #: addons/addressbook/address_edit.tpl:246
 msgid "Pager"
 msgstr "Pager"
@@ -146,9 +146,9 @@ msgstr ""
 msgid "Dial connection..."
 msgstr "Połączenie dzwonienia..."
 
-#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:461
-#: addons/addressbook/class_addressbook.inc:468
-#: addons/addressbook/class_addressbook.inc:472
+#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:463
+#: addons/addressbook/class_addressbook.inc:470
+#: addons/addressbook/class_addressbook.inc:474
 #: addons/addressbook/class_addressbook.inc:598
 msgid "Dial"
 msgstr "Dzwonienie"
@@ -156,9 +156,9 @@ msgstr "Dzwonienie"
 #: addons/addressbook/class_addressbook.inc:11
 #: addons/addressbook/class_addressbook.inc:12
 #: addons/addressbook/class_addressbook.inc:23
-#: addons/addressbook/class_addressbook.inc:851
-#: addons/addressbook/class_addressbook.inc:852
-#: addons/addressbook/class_addressbook.inc:857 addons/addressbook/main.inc:43
+#: addons/addressbook/class_addressbook.inc:853
+#: addons/addressbook/class_addressbook.inc:854
+#: addons/addressbook/class_addressbook.inc:859 addons/addressbook/main.inc:43
 msgid "Addressbook"
 msgstr "Książka adresowa"
 
@@ -174,38 +174,38 @@ msgstr "Powiązane obiekty GOsa"
 msgid "This does something"
 msgstr "To robi coś"
 
-#: addons/addressbook/class_addressbook.inc:191
+#: addons/addressbook/class_addressbook.inc:193
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr "Zadzwonić teraz z '%s' do '%s'?"
 
-#: addons/addressbook/class_addressbook.inc:195
+#: addons/addressbook/class_addressbook.inc:197
 msgid "Error"
 msgstr "Błąd"
 
-#: addons/addressbook/class_addressbook.inc:195
+#: addons/addressbook/class_addressbook.inc:197
 msgid ""
 "You need to set your personal phone number in order to perform direct dials."
 msgstr ""
 "Musisz ustawić swój osobisty numer telefonu aby móc wykonywać bezpośrednie "
 "połączenia."
 
-#: addons/addressbook/class_addressbook.inc:223
+#: addons/addressbook/class_addressbook.inc:225
 #: addons/addressbook/class_addressbook.inc:799
 msgid "LDAP error"
 msgstr "błąd LDAP"
 
-#: addons/addressbook/class_addressbook.inc:231
-#: addons/addressbook/class_addressbook.inc:339
+#: addons/addressbook/class_addressbook.inc:233
+#: addons/addressbook/class_addressbook.inc:341
 msgid "Permission"
 msgstr "Uprawnienie"
 
-#: addons/addressbook/class_addressbook.inc:478
+#: addons/addressbook/class_addressbook.inc:480
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "Zapisz kontakt dla %s jako wizytówka"
 
-#: addons/addressbook/class_addressbook.inc:484
+#: addons/addressbook/class_addressbook.inc:486
 #, php-format
 msgid "Send mail to %s"
 msgstr "Wyślij email do %s"
@@ -235,7 +235,7 @@ msgstr "Wszystkie"
 #: addons/addressbook/class_addressbook.inc:702
 #: addons/addressbook/class_addressbook.inc:711
 #: addons/addressbook/class_addressbook.inc:732
-#: addons/addressbook/class_addressbook.inc:861
+#: addons/addressbook/class_addressbook.inc:863
 msgid "Given name"
 msgstr "Imię"
 
@@ -271,72 +271,72 @@ msgstr ""
 "Nie można utworzyć unikalnego DN dla tego elementu. Proszę wypełnić więcej "
 "pól formularza."
 
-#: addons/addressbook/class_addressbook.inc:851
+#: addons/addressbook/class_addressbook.inc:853
 msgid "Addressbook entries"
 msgstr "Wpisy książki adresowej"
 
-#: addons/addressbook/class_addressbook.inc:852
+#: addons/addressbook/class_addressbook.inc:854
 msgid "Addressbook related objects"
 msgstr "Powiązane obiekty książki adresowej"
 
-#: addons/addressbook/class_addressbook.inc:856
+#: addons/addressbook/class_addressbook.inc:858
 msgid "Addons"
 msgstr "Dodatki"
 
-#: addons/addressbook/class_addressbook.inc:860
+#: addons/addressbook/class_addressbook.inc:862
 msgid "Surename"
 msgstr "Nazwisko"
 
-#: addons/addressbook/class_addressbook.inc:862
+#: addons/addressbook/class_addressbook.inc:864
 msgid "Telefon number"
 msgstr "Numer telefonu"
 
-#: addons/addressbook/class_addressbook.inc:863
+#: addons/addressbook/class_addressbook.inc:865
 msgid "Fax number"
 msgstr "Numer fax"
 
-#: addons/addressbook/class_addressbook.inc:864
+#: addons/addressbook/class_addressbook.inc:866
 msgid "Mobile number"
 msgstr "Telefon komórkowy"
 
-#: addons/addressbook/class_addressbook.inc:865
+#: addons/addressbook/class_addressbook.inc:867
 msgid "Home phone number"
 msgstr "Numer telefonu domowego"
 
-#: addons/addressbook/class_addressbook.inc:866
+#: addons/addressbook/class_addressbook.inc:868
 msgid "User identification"
 msgstr "Identyfikacja użytkownika"
 
-#: addons/addressbook/class_addressbook.inc:867
+#: addons/addressbook/class_addressbook.inc:869
 msgid "Mail address"
 msgstr "Adres email"
 
-#: addons/addressbook/class_addressbook.inc:869
+#: addons/addressbook/class_addressbook.inc:871
 msgid "Organization"
 msgstr "Organizacja"
 
-#: addons/addressbook/class_addressbook.inc:871
+#: addons/addressbook/class_addressbook.inc:873
 msgid "Location"
 msgstr "Lokalizacja"
 
-#: addons/addressbook/class_addressbook.inc:872
-#: addons/addressbook/class_addressbook.inc:873
+#: addons/addressbook/class_addressbook.inc:874
+#: addons/addressbook/class_addressbook.inc:875
 msgid "Postal address"
 msgstr "Adres pocztowy"
 
-#: addons/addressbook/class_addressbook.inc:874
+#: addons/addressbook/class_addressbook.inc:876
 msgid "State"
 msgstr "Stan"
 
-#: addons/addressbook/class_addressbook.inc:876
+#: addons/addressbook/class_addressbook.inc:878
 msgid "Title"
 msgstr "Tytuł"
 
-#: addons/addressbook/class_addressbook.inc:877
+#: addons/addressbook/class_addressbook.inc:879
 msgid "Home postal address"
 msgstr "Adres domowy"
 
-#: addons/addressbook/class_addressbook.inc:878
+#: addons/addressbook/class_addressbook.inc:880
 msgid "Common name"
 msgstr "Nazwa potoczna"
 
diff --git a/gosa-plugins/addressbook/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/addressbook/locale/ru/LC_MESSAGES/messages.po
index 8a4ecee48..09f8bba02 100644
--- a/gosa-plugins/addressbook/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/addressbook/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -39,7 +39,7 @@ msgid "Name"
 msgstr "Фамилия"
 
 #: addons/addressbook/address_info.tpl:32
-#: addons/addressbook/class_addressbook.inc:875
+#: addons/addressbook/class_addressbook.inc:877
 #: addons/addressbook/address_edit.tpl:48
 msgid "Initials"
 msgstr "Отчество"
@@ -92,7 +92,7 @@ msgid "Company"
 msgstr "Компания"
 
 #: addons/addressbook/address_info.tpl:117
-#: addons/addressbook/class_addressbook.inc:870
+#: addons/addressbook/class_addressbook.inc:872
 #: addons/addressbook/address_edit.tpl:155
 msgid "Department"
 msgstr "Подразделение"
@@ -119,7 +119,7 @@ msgstr "Факс"
 
 #: addons/addressbook/address_info.tpl:179
 #: addons/addressbook/class_addressbook.inc:728
-#: addons/addressbook/class_addressbook.inc:868
+#: addons/addressbook/class_addressbook.inc:870
 #: addons/addressbook/address_edit.tpl:246
 msgid "Pager"
 msgstr "Пейджер"
@@ -148,9 +148,9 @@ msgstr ""
 msgid "Dial connection..."
 msgstr "Соединение..."
 
-#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:461
-#: addons/addressbook/class_addressbook.inc:468
-#: addons/addressbook/class_addressbook.inc:472
+#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:463
+#: addons/addressbook/class_addressbook.inc:470
+#: addons/addressbook/class_addressbook.inc:474
 #: addons/addressbook/class_addressbook.inc:598
 msgid "Dial"
 msgstr "Звонок"
@@ -158,9 +158,9 @@ msgstr "Звонок"
 #: addons/addressbook/class_addressbook.inc:11
 #: addons/addressbook/class_addressbook.inc:12
 #: addons/addressbook/class_addressbook.inc:23
-#: addons/addressbook/class_addressbook.inc:851
-#: addons/addressbook/class_addressbook.inc:852
-#: addons/addressbook/class_addressbook.inc:857 addons/addressbook/main.inc:43
+#: addons/addressbook/class_addressbook.inc:853
+#: addons/addressbook/class_addressbook.inc:854
+#: addons/addressbook/class_addressbook.inc:859 addons/addressbook/main.inc:43
 msgid "Addressbook"
 msgstr "Адресная книга"
 
@@ -177,40 +177,40 @@ msgstr "Объект группы"
 msgid "This does something"
 msgstr "Что-то будет"
 
-#: addons/addressbook/class_addressbook.inc:191
+#: addons/addressbook/class_addressbook.inc:193
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr "Звоним с %s на %s?"
 
-#: addons/addressbook/class_addressbook.inc:195
+#: addons/addressbook/class_addressbook.inc:197
 msgid "Error"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:195
+#: addons/addressbook/class_addressbook.inc:197
 #, fuzzy
 msgid ""
 "You need to set your personal phone number in order to perform direct dials."
 msgstr ""
 "У вас нет персонального набора телефонов. Настройте это прежде чем звонить."
 
-#: addons/addressbook/class_addressbook.inc:223
+#: addons/addressbook/class_addressbook.inc:225
 #: addons/addressbook/class_addressbook.inc:799
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
 
-#: addons/addressbook/class_addressbook.inc:231
-#: addons/addressbook/class_addressbook.inc:339
+#: addons/addressbook/class_addressbook.inc:233
+#: addons/addressbook/class_addressbook.inc:341
 #, fuzzy
 msgid "Permission"
 msgstr "Права для членов группы"
 
-#: addons/addressbook/class_addressbook.inc:478
+#: addons/addressbook/class_addressbook.inc:480
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "Сохранить контактную информацию %s в формате vcard"
 
-#: addons/addressbook/class_addressbook.inc:484
+#: addons/addressbook/class_addressbook.inc:486
 #, php-format
 msgid "Send mail to %s"
 msgstr "Отправить %s сообщение по эл. почте"
@@ -241,7 +241,7 @@ msgstr "Все"
 #: addons/addressbook/class_addressbook.inc:702
 #: addons/addressbook/class_addressbook.inc:711
 #: addons/addressbook/class_addressbook.inc:732
-#: addons/addressbook/class_addressbook.inc:861
+#: addons/addressbook/class_addressbook.inc:863
 msgid "Given name"
 msgstr "Имя"
 
@@ -277,83 +277,83 @@ msgid ""
 msgstr ""
 "Невозможно создать уникальный DN для объекта. Заполните все поля формы."
 
-#: addons/addressbook/class_addressbook.inc:851
+#: addons/addressbook/class_addressbook.inc:853
 #, fuzzy
 msgid "Addressbook entries"
 msgstr "Показать объекты адресной книги"
 
-#: addons/addressbook/class_addressbook.inc:852
+#: addons/addressbook/class_addressbook.inc:854
 #, fuzzy
 msgid "Addressbook related objects"
 msgstr "Показать объекты адресной книги"
 
-#: addons/addressbook/class_addressbook.inc:856
+#: addons/addressbook/class_addressbook.inc:858
 msgid "Addons"
 msgstr "Дополнительно"
 
-#: addons/addressbook/class_addressbook.inc:860
+#: addons/addressbook/class_addressbook.inc:862
 #, fuzzy
 msgid "Surename"
 msgstr "Имя сервера"
 
-#: addons/addressbook/class_addressbook.inc:862
+#: addons/addressbook/class_addressbook.inc:864
 #, fuzzy
 msgid "Telefon number"
 msgstr "Телефонные номера"
 
-#: addons/addressbook/class_addressbook.inc:863
+#: addons/addressbook/class_addressbook.inc:865
 #, fuzzy
 msgid "Fax number"
 msgstr "Терминал"
 
-#: addons/addressbook/class_addressbook.inc:864
+#: addons/addressbook/class_addressbook.inc:866
 #, fuzzy
 msgid "Mobile number"
 msgstr "Домашний телефон"
 
-#: addons/addressbook/class_addressbook.inc:865
+#: addons/addressbook/class_addressbook.inc:867
 #, fuzzy
 msgid "Home phone number"
 msgstr "Телефонные номера"
 
-#: addons/addressbook/class_addressbook.inc:866
+#: addons/addressbook/class_addressbook.inc:868
 #, fuzzy
 msgid "User identification"
 msgstr "Информация"
 
-#: addons/addressbook/class_addressbook.inc:867
+#: addons/addressbook/class_addressbook.inc:869
 #, fuzzy
 msgid "Mail address"
 msgstr "MAC-адрес"
 
-#: addons/addressbook/class_addressbook.inc:869
+#: addons/addressbook/class_addressbook.inc:871
 msgid "Organization"
 msgstr "Организация"
 
-#: addons/addressbook/class_addressbook.inc:871
+#: addons/addressbook/class_addressbook.inc:873
 msgid "Location"
 msgstr "Местоположение"
 
-#: addons/addressbook/class_addressbook.inc:872
-#: addons/addressbook/class_addressbook.inc:873
+#: addons/addressbook/class_addressbook.inc:874
+#: addons/addressbook/class_addressbook.inc:875
 #, fuzzy
 msgid "Postal address"
 msgstr "Почтовый индекс"
 
-#: addons/addressbook/class_addressbook.inc:874
+#: addons/addressbook/class_addressbook.inc:876
 msgid "State"
 msgstr "Адм. единица"
 
-#: addons/addressbook/class_addressbook.inc:876
+#: addons/addressbook/class_addressbook.inc:878
 #, fuzzy
 msgid "Title"
 msgstr "Файлы"
 
-#: addons/addressbook/class_addressbook.inc:877
+#: addons/addressbook/class_addressbook.inc:879
 msgid "Home postal address"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:878
+#: addons/addressbook/class_addressbook.inc:880
 #, fuzzy
 msgid "Common name"
 msgstr "Местоположение"
diff --git a/gosa-plugins/addressbook/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/addressbook/locale/zh/LC_MESSAGES/messages.po
index a4b0620e6..31adaa988 100644
--- a/gosa-plugins/addressbook/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/addressbook/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -41,7 +41,7 @@ msgid "Name"
 msgstr "名称"
 
 #: addons/addressbook/address_info.tpl:32
-#: addons/addressbook/class_addressbook.inc:875
+#: addons/addressbook/class_addressbook.inc:877
 #: addons/addressbook/address_edit.tpl:48
 msgid "Initials"
 msgstr "中间名"
@@ -94,7 +94,7 @@ msgid "Company"
 msgstr "公司"
 
 #: addons/addressbook/address_info.tpl:117
-#: addons/addressbook/class_addressbook.inc:870
+#: addons/addressbook/class_addressbook.inc:872
 #: addons/addressbook/address_edit.tpl:155
 msgid "Department"
 msgstr "部门"
@@ -121,7 +121,7 @@ msgstr "传真"
 
 #: addons/addressbook/address_info.tpl:179
 #: addons/addressbook/class_addressbook.inc:728
-#: addons/addressbook/class_addressbook.inc:868
+#: addons/addressbook/class_addressbook.inc:870
 #: addons/addressbook/address_edit.tpl:246
 msgid "Pager"
 msgstr "呼机"
@@ -147,9 +147,9 @@ msgstr "所以，如果您确定，请按“删除”继续，否则按“取消
 msgid "Dial connection..."
 msgstr "拨号中..."
 
-#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:461
-#: addons/addressbook/class_addressbook.inc:468
-#: addons/addressbook/class_addressbook.inc:472
+#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:463
+#: addons/addressbook/class_addressbook.inc:470
+#: addons/addressbook/class_addressbook.inc:474
 #: addons/addressbook/class_addressbook.inc:598
 msgid "Dial"
 msgstr "拨号"
@@ -157,9 +157,9 @@ msgstr "拨号"
 #: addons/addressbook/class_addressbook.inc:11
 #: addons/addressbook/class_addressbook.inc:12
 #: addons/addressbook/class_addressbook.inc:23
-#: addons/addressbook/class_addressbook.inc:851
-#: addons/addressbook/class_addressbook.inc:852
-#: addons/addressbook/class_addressbook.inc:857 addons/addressbook/main.inc:43
+#: addons/addressbook/class_addressbook.inc:853
+#: addons/addressbook/class_addressbook.inc:854
+#: addons/addressbook/class_addressbook.inc:859 addons/addressbook/main.inc:43
 msgid "Addressbook"
 msgstr "地址簿"
 
@@ -177,39 +177,39 @@ msgstr "创建新 FAI 对象"
 msgid "This does something"
 msgstr "******"
 
-#: addons/addressbook/class_addressbook.inc:191
+#: addons/addressbook/class_addressbook.inc:193
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr "现在从 %s 拨号到 %s 么？"
 
-#: addons/addressbook/class_addressbook.inc:195
+#: addons/addressbook/class_addressbook.inc:197
 msgid "Error"
 msgstr "错误"
 
-#: addons/addressbook/class_addressbook.inc:195
+#: addons/addressbook/class_addressbook.inc:197
 #, fuzzy
 msgid ""
 "You need to set your personal phone number in order to perform direct dials."
 msgstr "您尚未设置个人电话号码。要想使用直接拨号需要修改个人电话号码。"
 
-#: addons/addressbook/class_addressbook.inc:223
+#: addons/addressbook/class_addressbook.inc:225
 #: addons/addressbook/class_addressbook.inc:799
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
 
-#: addons/addressbook/class_addressbook.inc:231
-#: addons/addressbook/class_addressbook.inc:339
+#: addons/addressbook/class_addressbook.inc:233
+#: addons/addressbook/class_addressbook.inc:341
 #, fuzzy
 msgid "Permission"
 msgstr "允许"
 
-#: addons/addressbook/class_addressbook.inc:478
+#: addons/addressbook/class_addressbook.inc:480
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "保存 %s 的内容为 vcard"
 
-#: addons/addressbook/class_addressbook.inc:484
+#: addons/addressbook/class_addressbook.inc:486
 #, php-format
 msgid "Send mail to %s"
 msgstr "发送邮件到 %s"
@@ -239,7 +239,7 @@ msgstr "全部"
 #: addons/addressbook/class_addressbook.inc:702
 #: addons/addressbook/class_addressbook.inc:711
 #: addons/addressbook/class_addressbook.inc:732
-#: addons/addressbook/class_addressbook.inc:861
+#: addons/addressbook/class_addressbook.inc:863
 msgid "Given name"
 msgstr "名"
 
@@ -274,79 +274,79 @@ msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr "无法为您的条目创建一个唯一 DN。请填写更多字段。"
 
-#: addons/addressbook/class_addressbook.inc:851
+#: addons/addressbook/class_addressbook.inc:853
 #, fuzzy
 msgid "Addressbook entries"
 msgstr "显示地址簿记录"
 
-#: addons/addressbook/class_addressbook.inc:852
+#: addons/addressbook/class_addressbook.inc:854
 #, fuzzy
 msgid "Addressbook related objects"
 msgstr "保存地址簿条目失败"
 
-#: addons/addressbook/class_addressbook.inc:856
+#: addons/addressbook/class_addressbook.inc:858
 msgid "Addons"
 msgstr "插件"
 
-#: addons/addressbook/class_addressbook.inc:860
+#: addons/addressbook/class_addressbook.inc:862
 msgid "Surename"
 msgstr "姓"
 
-#: addons/addressbook/class_addressbook.inc:862
+#: addons/addressbook/class_addressbook.inc:864
 #, fuzzy
 msgid "Telefon number"
 msgstr "电话号码"
 
-#: addons/addressbook/class_addressbook.inc:863
+#: addons/addressbook/class_addressbook.inc:865
 #, fuzzy
 msgid "Fax number"
 msgstr "系列号"
 
-#: addons/addressbook/class_addressbook.inc:864
+#: addons/addressbook/class_addressbook.inc:866
 #, fuzzy
 msgid "Mobile number"
 msgstr "电话号码"
 
-#: addons/addressbook/class_addressbook.inc:865
+#: addons/addressbook/class_addressbook.inc:867
 #, fuzzy
 msgid "Home phone number"
 msgstr "电话号码"
 
-#: addons/addressbook/class_addressbook.inc:866
+#: addons/addressbook/class_addressbook.inc:868
 #, fuzzy
 msgid "User identification"
 msgstr "用户信息"
 
-#: addons/addressbook/class_addressbook.inc:867
+#: addons/addressbook/class_addressbook.inc:869
 msgid "Mail address"
 msgstr "邮件地址"
 
-#: addons/addressbook/class_addressbook.inc:869
+#: addons/addressbook/class_addressbook.inc:871
 msgid "Organization"
 msgstr "组织/公司"
 
-#: addons/addressbook/class_addressbook.inc:871
+#: addons/addressbook/class_addressbook.inc:873
 msgid "Location"
 msgstr "位置"
 
-#: addons/addressbook/class_addressbook.inc:872
-#: addons/addressbook/class_addressbook.inc:873
+#: addons/addressbook/class_addressbook.inc:874
+#: addons/addressbook/class_addressbook.inc:875
 msgid "Postal address"
 msgstr "地址"
 
-#: addons/addressbook/class_addressbook.inc:874
+#: addons/addressbook/class_addressbook.inc:876
 msgid "State"
 msgstr "州/省"
 
-#: addons/addressbook/class_addressbook.inc:876
+#: addons/addressbook/class_addressbook.inc:878
 msgid "Title"
 msgstr "称谓"
 
-#: addons/addressbook/class_addressbook.inc:877
+#: addons/addressbook/class_addressbook.inc:879
 msgid "Home postal address"
 msgstr "住宅地址"
 
-#: addons/addressbook/class_addressbook.inc:878
+#: addons/addressbook/class_addressbook.inc:880
 msgid "Common name"
 msgstr "常用名"
 
diff --git a/gosa-plugins/apache2/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/apache2/locale/de/LC_MESSAGES/messages.po
index 96bebbe70..4417d8b2d 100644
--- a/gosa-plugins/apache2/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/apache2/locale/de/LC_MESSAGES/messages.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2009-03-11 11:42+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
diff --git a/gosa-plugins/apache2/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/apache2/locale/es/LC_MESSAGES/messages.po
index 3fd4c90f5..06258d712 100644
--- a/gosa-plugins/apache2/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/apache2/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2008-12-08 11:29+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <kde-i18n-doc@lists.kde.org>\n"
diff --git a/gosa-plugins/apache2/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/apache2/locale/fr/LC_MESSAGES/messages.po
index 9b77adf12..7e006538e 100644
--- a/gosa-plugins/apache2/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/apache2/locale/fr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2009-06-30 10:43+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
diff --git a/gosa-plugins/apache2/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/apache2/locale/it/LC_MESSAGES/messages.po
index a46259041..bba847ad0 100644
--- a/gosa-plugins/apache2/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/apache2/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
diff --git a/gosa-plugins/apache2/locale/messages.po b/gosa-plugins/apache2/locale/messages.po
index 6a6ef858f..90875b4f0 100644
--- a/gosa-plugins/apache2/locale/messages.po
+++ b/gosa-plugins/apache2/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gosa-plugins/apache2/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/apache2/locale/nl/LC_MESSAGES/messages.po
index c879f6883..d66e1304f 100644
--- a/gosa-plugins/apache2/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/apache2/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
diff --git a/gosa-plugins/apache2/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/apache2/locale/pl/LC_MESSAGES/messages.po
index bd9e7bb60..62e1ac582 100644
--- a/gosa-plugins/apache2/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/apache2/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
diff --git a/gosa-plugins/apache2/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/apache2/locale/ru/LC_MESSAGES/messages.po
index ddb1794de..1328b2ff7 100644
--- a/gosa-plugins/apache2/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/apache2/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
diff --git a/gosa-plugins/apache2/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/apache2/locale/zh/LC_MESSAGES/messages.po
index 6019192c6..26fa22d74 100644
--- a/gosa-plugins/apache2/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/apache2/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
diff --git a/gosa-plugins/connectivity/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/connectivity/locale/de/LC_MESSAGES/messages.po
index ef14ebe57..16a1c23f8 100644
--- a/gosa-plugins/connectivity/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/connectivity/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2008-04-02 14:20+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
diff --git a/gosa-plugins/connectivity/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/connectivity/locale/es/LC_MESSAGES/messages.po
index b994e9bc4..5735ba07d 100644
--- a/gosa-plugins/connectivity/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/connectivity/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
diff --git a/gosa-plugins/connectivity/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/connectivity/locale/fr/LC_MESSAGES/messages.po
index 9001f9ea9..8ced7076e 100644
--- a/gosa-plugins/connectivity/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/connectivity/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2008-06-04 09:19+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
diff --git a/gosa-plugins/connectivity/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/connectivity/locale/it/LC_MESSAGES/messages.po
index 9aa52083f..0e714cf3f 100644
--- a/gosa-plugins/connectivity/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/connectivity/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
diff --git a/gosa-plugins/connectivity/locale/messages.po b/gosa-plugins/connectivity/locale/messages.po
index 7faee7492..ea7aaba89 100644
--- a/gosa-plugins/connectivity/locale/messages.po
+++ b/gosa-plugins/connectivity/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gosa-plugins/connectivity/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/connectivity/locale/nl/LC_MESSAGES/messages.po
index 97ea95eef..2272f2475 100644
--- a/gosa-plugins/connectivity/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/connectivity/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2008-06-09 17:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
diff --git a/gosa-plugins/connectivity/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/connectivity/locale/pl/LC_MESSAGES/messages.po
index 5a6ce6638..7d3f37350 100644
--- a/gosa-plugins/connectivity/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/connectivity/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2009-09-05 15:16+0100\n"
 "Last-Translator: Piort Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
diff --git a/gosa-plugins/connectivity/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/connectivity/locale/ru/LC_MESSAGES/messages.po
index ff910a034..a3a357016 100644
--- a/gosa-plugins/connectivity/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/connectivity/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
diff --git a/gosa-plugins/connectivity/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/connectivity/locale/zh/LC_MESSAGES/messages.po
index 1aa034f4c..92e9e9912 100644
--- a/gosa-plugins/connectivity/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/connectivity/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
diff --git a/gosa-plugins/dak/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/dak/locale/de/LC_MESSAGES/messages.po
index 3645d902c..529aa6159 100644
--- a/gosa-plugins/dak/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dak/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2008-12-03 15:39+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
diff --git a/gosa-plugins/dak/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/dak/locale/es/LC_MESSAGES/messages.po
index 434aab037..74102f79c 100644
--- a/gosa-plugins/dak/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dak/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
diff --git a/gosa-plugins/dak/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/dak/locale/fr/LC_MESSAGES/messages.po
index 01ed96343..5ad282313 100644
--- a/gosa-plugins/dak/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dak/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2008-07-23 22:13+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: french <fr@li.org>\n"
diff --git a/gosa-plugins/dak/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/dak/locale/it/LC_MESSAGES/messages.po
index 586f926a1..2524e5a36 100644
--- a/gosa-plugins/dak/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dak/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
diff --git a/gosa-plugins/dak/locale/messages.po b/gosa-plugins/dak/locale/messages.po
index 567328d25..f9ebe7942 100644
--- a/gosa-plugins/dak/locale/messages.po
+++ b/gosa-plugins/dak/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gosa-plugins/dak/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/dak/locale/nl/LC_MESSAGES/messages.po
index 13885f6de..f00d9bb90 100644
--- a/gosa-plugins/dak/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dak/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
diff --git a/gosa-plugins/dak/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/dak/locale/pl/LC_MESSAGES/messages.po
index 74602a42d..087be927d 100644
--- a/gosa-plugins/dak/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dak/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
diff --git a/gosa-plugins/dak/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/dak/locale/ru/LC_MESSAGES/messages.po
index 185f422cf..2bb02bfff 100644
--- a/gosa-plugins/dak/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dak/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
diff --git a/gosa-plugins/dak/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/dak/locale/zh/LC_MESSAGES/messages.po
index 27ac6e6f5..676fb7db3 100644
--- a/gosa-plugins/dak/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dak/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
diff --git a/gosa-plugins/dfs/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/dfs/locale/de/LC_MESSAGES/messages.po
index bc236d400..2e3d3a0b0 100644
--- a/gosa-plugins/dfs/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dfs/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2008-04-03 14:16+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
diff --git a/gosa-plugins/dfs/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/dfs/locale/es/LC_MESSAGES/messages.po
index 86bf1de04..05bf02498 100644
--- a/gosa-plugins/dfs/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dfs/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
diff --git a/gosa-plugins/dfs/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/dfs/locale/fr/LC_MESSAGES/messages.po
index f9608969d..c8139c4dc 100644
--- a/gosa-plugins/dfs/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dfs/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2008-06-04 09:22+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
diff --git a/gosa-plugins/dfs/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/dfs/locale/it/LC_MESSAGES/messages.po
index b3d67a1cb..150838c3e 100644
--- a/gosa-plugins/dfs/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dfs/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
diff --git a/gosa-plugins/dfs/locale/messages.po b/gosa-plugins/dfs/locale/messages.po
index 4fbacd294..8778bd718 100644
--- a/gosa-plugins/dfs/locale/messages.po
+++ b/gosa-plugins/dfs/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gosa-plugins/dfs/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/dfs/locale/nl/LC_MESSAGES/messages.po
index 1ac81bb09..aa5e78396 100644
--- a/gosa-plugins/dfs/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dfs/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2008-06-09 18:01+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
diff --git a/gosa-plugins/dfs/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/dfs/locale/pl/LC_MESSAGES/messages.po
index 0bdab8ea6..c29b43f18 100644
--- a/gosa-plugins/dfs/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dfs/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2009-09-05 15:17+0100\n"
 "Last-Translator: Piort Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
diff --git a/gosa-plugins/dfs/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/dfs/locale/ru/LC_MESSAGES/messages.po
index 44a0bef17..8c781f297 100644
--- a/gosa-plugins/dfs/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dfs/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
diff --git a/gosa-plugins/dfs/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/dfs/locale/zh/LC_MESSAGES/messages.po
index ac3f1acca..2a10d6ec7 100644
--- a/gosa-plugins/dfs/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dfs/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
diff --git a/gosa-plugins/dhcp/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/dhcp/locale/de/LC_MESSAGES/messages.po
index fdc403a0a..f59bc8b02 100644
--- a/gosa-plugins/dhcp/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dhcp/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2008-10-07 18:32+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team:  <de@li.org>\n"
@@ -44,9 +44,15 @@ msgstr "Token Ring"
 #: admin/systems/services/dhcp/class_dhcpPool.inc:101
 #: admin/systems/services/dhcp/class_dhcpPool.inc:109
 #: admin/systems/services/dhcp/dhcp_pool.tpl:6
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:84
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:87
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:95
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:84
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:87
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:95
+#: admin/systems/services/dhcp/class_dhcpClass.inc:84
+#: admin/systems/services/dhcp/class_dhcpClass.inc:87
+#: admin/systems/services/dhcp/class_dhcpClass.inc:95
 #: admin/systems/services/dhcp/dhcp_group.tpl:6
 msgid "Name"
 msgstr "Name"
@@ -64,7 +70,7 @@ msgstr "Netzwerk-Adresse"
 
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:155
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:190
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:194
 #: admin/systems/services/dhcp/dhcp_network.tpl:17
 #: admin/systems/services/dhcp/dhcp_subnet.tpl:16
 msgid "Netmask"
@@ -110,18 +116,18 @@ msgid "Maximum lease time"
 msgstr "Maximale Lease-Gültigkeit"
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
-#: admin/systems/services/dhcp/class_servDHCP.inc:700
+#: admin/systems/services/dhcp/class_servDHCP.inc:708
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:57
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:71
 msgid "Error"
 msgstr "Fehler"
 
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:190
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:194
 #: admin/systems/services/dhcp/dhcp_network.tpl:25
 msgid "Broadcast"
 msgstr "Broadcast"
 
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:195
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:199
 #, php-format
 msgid "Error in definition of '%s'!"
 msgstr "Fehler in Definition von '%s'!"
@@ -418,9 +424,9 @@ msgid "Allow booting"
 msgstr "Erlaube Booten"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:36
-#: admin/systems/services/dhcp/class_servDHCP.inc:711
-#: admin/systems/services/dhcp/class_servDHCP.inc:712
-#: admin/systems/services/dhcp/class_servDHCP.inc:758
+#: admin/systems/services/dhcp/class_servDHCP.inc:719
+#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:766
 msgid "DHCP service"
 msgstr "DHCP Dienst"
 
@@ -430,12 +436,13 @@ msgstr "Protokollierung"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:39
 #: admin/systems/services/dhcp/class_servDHCP.inc:309
-#: admin/systems/services/dhcp/class_servDHCP.inc:620
+#: admin/systems/services/dhcp/class_servDHCP.inc:628
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:26
 msgid "Global options"
 msgstr "Globale Optionen"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:40
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
 msgid "Class"
 msgstr "Klasse"
 
@@ -510,16 +517,16 @@ msgstr "Bearbeite DHCP-Sektion"
 msgid "Remove DHCP section"
 msgstr "Entferne DHCP-Sektion"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:394
-#: admin/systems/services/dhcp/class_servDHCP.inc:411
-#: admin/systems/services/dhcp/class_servDHCP.inc:466
-#: admin/systems/services/dhcp/class_servDHCP.inc:542
+#: admin/systems/services/dhcp/class_servDHCP.inc:402
+#: admin/systems/services/dhcp/class_servDHCP.inc:419
+#: admin/systems/services/dhcp/class_servDHCP.inc:474
 #: admin/systems/services/dhcp/class_servDHCP.inc:550
-#: admin/systems/services/dhcp/class_servDHCP.inc:577
+#: admin/systems/services/dhcp/class_servDHCP.inc:558
+#: admin/systems/services/dhcp/class_servDHCP.inc:585
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:700
+#: admin/systems/services/dhcp/class_servDHCP.inc:708
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
@@ -527,19 +534,19 @@ msgstr ""
 "Der DHCP-Konfigurationssatz ist unbekannt. Bitte benachrichtigen Sie Ihren "
 "System-Administrator."
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:712
+#: admin/systems/services/dhcp/class_servDHCP.inc:720
 msgid "Services"
 msgstr "Dienste"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:728
 msgid "Start service"
 msgstr "Dienst starten"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:721
+#: admin/systems/services/dhcp/class_servDHCP.inc:729
 msgid "Stop service"
 msgstr "Dienst stoppen"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:722
+#: admin/systems/services/dhcp/class_servDHCP.inc:730
 msgid "Restart service"
 msgstr "Dienst neustarten"
 
diff --git a/gosa-plugins/dhcp/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/dhcp/locale/es/LC_MESSAGES/messages.po
index d7d91ce17..8a6c2950e 100644
--- a/gosa-plugins/dhcp/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dhcp/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
@@ -41,9 +41,15 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpPool.inc:101
 #: admin/systems/services/dhcp/class_dhcpPool.inc:109
 #: admin/systems/services/dhcp/dhcp_pool.tpl:6
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:84
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:87
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:95
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:84
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:87
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:95
+#: admin/systems/services/dhcp/class_dhcpClass.inc:84
+#: admin/systems/services/dhcp/class_dhcpClass.inc:87
+#: admin/systems/services/dhcp/class_dhcpClass.inc:95
 #: admin/systems/services/dhcp/dhcp_group.tpl:6
 msgid "Name"
 msgstr "Nombre"
@@ -63,7 +69,7 @@ msgstr "Código Postal"
 
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:155
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:190
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:194
 #: admin/systems/services/dhcp/dhcp_network.tpl:17
 #: admin/systems/services/dhcp/dhcp_subnet.tpl:16
 #, fuzzy
@@ -116,18 +122,18 @@ msgid "Maximum lease time"
 msgstr "Tamaño máximo del archivo"
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
-#: admin/systems/services/dhcp/class_servDHCP.inc:700
+#: admin/systems/services/dhcp/class_servDHCP.inc:708
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:57
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:71
 msgid "Error"
 msgstr "Error"
 
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:190
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:194
 #: admin/systems/services/dhcp/dhcp_network.tpl:25
 msgid "Broadcast"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:195
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:199
 #, php-format
 msgid "Error in definition of '%s'!"
 msgstr ""
@@ -443,9 +449,9 @@ msgid "Allow booting"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:36
-#: admin/systems/services/dhcp/class_servDHCP.inc:711
-#: admin/systems/services/dhcp/class_servDHCP.inc:712
-#: admin/systems/services/dhcp/class_servDHCP.inc:758
+#: admin/systems/services/dhcp/class_servDHCP.inc:719
+#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:766
 #, fuzzy
 msgid "DHCP service"
 msgstr "Añadir servicio DHCP"
@@ -457,13 +463,14 @@ msgstr "Servicio de Registro de sistema"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:39
 #: admin/systems/services/dhcp/class_servDHCP.inc:309
-#: admin/systems/services/dhcp/class_servDHCP.inc:620
+#: admin/systems/services/dhcp/class_servDHCP.inc:628
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:26
 #, fuzzy
 msgid "Global options"
 msgstr "Eliminar opciones"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:40
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
 msgid "Class"
 msgstr "Clase"
 
@@ -545,17 +552,17 @@ msgstr "Inspección LDAP"
 msgid "Remove DHCP section"
 msgstr "Eliminar servicio DHCP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:394
-#: admin/systems/services/dhcp/class_servDHCP.inc:411
-#: admin/systems/services/dhcp/class_servDHCP.inc:466
-#: admin/systems/services/dhcp/class_servDHCP.inc:542
+#: admin/systems/services/dhcp/class_servDHCP.inc:402
+#: admin/systems/services/dhcp/class_servDHCP.inc:419
+#: admin/systems/services/dhcp/class_servDHCP.inc:474
 #: admin/systems/services/dhcp/class_servDHCP.inc:550
-#: admin/systems/services/dhcp/class_servDHCP.inc:577
+#: admin/systems/services/dhcp/class_servDHCP.inc:558
+#: admin/systems/services/dhcp/class_servDHCP.inc:585
 #, fuzzy
 msgid "LDAP error"
 msgstr "Servicio LDAP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:700
+#: admin/systems/services/dhcp/class_servDHCP.inc:708
 #, fuzzy
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
@@ -563,21 +570,21 @@ msgid ""
 msgstr ""
 "Cuenta bloqueada. ¡Por favor contacte con su administrador de sistemas!"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:712
+#: admin/systems/services/dhcp/class_servDHCP.inc:720
 msgid "Services"
 msgstr "Servicios"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:728
 #, fuzzy
 msgid "Start service"
 msgstr "Servicios"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:721
+#: admin/systems/services/dhcp/class_servDHCP.inc:729
 #, fuzzy
 msgid "Stop service"
 msgstr "Servicios"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:722
+#: admin/systems/services/dhcp/class_servDHCP.inc:730
 #, fuzzy
 msgid "Restart service"
 msgstr "Servidor NTP"
diff --git a/gosa-plugins/dhcp/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/dhcp/locale/fr/LC_MESSAGES/messages.po
index 49e607e6e..a08afa19c 100644
--- a/gosa-plugins/dhcp/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dhcp/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2009-02-28 13:57+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -37,9 +37,15 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpPool.inc:101
 #: admin/systems/services/dhcp/class_dhcpPool.inc:109
 #: admin/systems/services/dhcp/dhcp_pool.tpl:6
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:84
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:87
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:95
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:84
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:87
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:95
+#: admin/systems/services/dhcp/class_dhcpClass.inc:84
+#: admin/systems/services/dhcp/class_dhcpClass.inc:87
+#: admin/systems/services/dhcp/class_dhcpClass.inc:95
 #: admin/systems/services/dhcp/dhcp_group.tpl:6
 msgid "Name"
 msgstr "Nom"
@@ -57,7 +63,7 @@ msgstr "Adresse réseau"
 
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:155
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:190
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:194
 #: admin/systems/services/dhcp/dhcp_network.tpl:17
 #: admin/systems/services/dhcp/dhcp_subnet.tpl:16
 msgid "Netmask"
@@ -102,18 +108,18 @@ msgid "Maximum lease time"
 msgstr "Temps maximum du bail"
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
-#: admin/systems/services/dhcp/class_servDHCP.inc:700
+#: admin/systems/services/dhcp/class_servDHCP.inc:708
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:57
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:71
 msgid "Error"
 msgstr "Erreur"
 
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:190
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:194
 #: admin/systems/services/dhcp/dhcp_network.tpl:25
 msgid "Broadcast"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:195
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:199
 #, php-format
 msgid "Error in definition of '%s'!"
 msgstr "Erreur lors de la définition de '%s' !"
@@ -410,9 +416,9 @@ msgid "Allow booting"
 msgstr "Permettre le démarrage"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:36
-#: admin/systems/services/dhcp/class_servDHCP.inc:711
-#: admin/systems/services/dhcp/class_servDHCP.inc:712
-#: admin/systems/services/dhcp/class_servDHCP.inc:758
+#: admin/systems/services/dhcp/class_servDHCP.inc:719
+#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:766
 msgid "DHCP service"
 msgstr "Service DHCP"
 
@@ -422,12 +428,13 @@ msgstr "Journaux systèmes"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:39
 #: admin/systems/services/dhcp/class_servDHCP.inc:309
-#: admin/systems/services/dhcp/class_servDHCP.inc:620
+#: admin/systems/services/dhcp/class_servDHCP.inc:628
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:26
 msgid "Global options"
 msgstr "Options Globales"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:40
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
 msgid "Class"
 msgstr "Classe"
 
@@ -502,16 +509,16 @@ msgstr "Editer une section DHCP"
 msgid "Remove DHCP section"
 msgstr "Suppression d'une section DHCP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:394
-#: admin/systems/services/dhcp/class_servDHCP.inc:411
-#: admin/systems/services/dhcp/class_servDHCP.inc:466
-#: admin/systems/services/dhcp/class_servDHCP.inc:542
+#: admin/systems/services/dhcp/class_servDHCP.inc:402
+#: admin/systems/services/dhcp/class_servDHCP.inc:419
+#: admin/systems/services/dhcp/class_servDHCP.inc:474
 #: admin/systems/services/dhcp/class_servDHCP.inc:550
-#: admin/systems/services/dhcp/class_servDHCP.inc:577
+#: admin/systems/services/dhcp/class_servDHCP.inc:558
+#: admin/systems/services/dhcp/class_servDHCP.inc:585
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:700
+#: admin/systems/services/dhcp/class_servDHCP.inc:708
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
@@ -519,19 +526,19 @@ msgstr ""
 "La configuration DHCP est inconnue. Veuillez contacter votre administrateur "
 "système."
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:712
+#: admin/systems/services/dhcp/class_servDHCP.inc:720
 msgid "Services"
 msgstr "Services"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:728
 msgid "Start service"
 msgstr "Démarrer le service"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:721
+#: admin/systems/services/dhcp/class_servDHCP.inc:729
 msgid "Stop service"
 msgstr "Arrêter le service"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:722
+#: admin/systems/services/dhcp/class_servDHCP.inc:730
 msgid "Restart service"
 msgstr "Redémarrer le service"
 
diff --git a/gosa-plugins/dhcp/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/dhcp/locale/it/LC_MESSAGES/messages.po
index 192dc1223..78bd5b59b 100644
--- a/gosa-plugins/dhcp/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dhcp/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -39,9 +39,15 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpPool.inc:101
 #: admin/systems/services/dhcp/class_dhcpPool.inc:109
 #: admin/systems/services/dhcp/dhcp_pool.tpl:6
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:84
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:87
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:95
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:84
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:87
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:95
+#: admin/systems/services/dhcp/class_dhcpClass.inc:84
+#: admin/systems/services/dhcp/class_dhcpClass.inc:87
+#: admin/systems/services/dhcp/class_dhcpClass.inc:95
 #: admin/systems/services/dhcp/dhcp_group.tpl:6
 msgid "Name"
 msgstr "Cognome"
@@ -61,7 +67,7 @@ msgstr "Mostra dispositiva di rete"
 
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:155
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:190
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:194
 #: admin/systems/services/dhcp/dhcp_network.tpl:17
 #: admin/systems/services/dhcp/dhcp_subnet.tpl:16
 msgid "Netmask"
@@ -113,18 +119,18 @@ msgid "Maximum lease time"
 msgstr "Inoltra i messaggi a"
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
-#: admin/systems/services/dhcp/class_servDHCP.inc:700
+#: admin/systems/services/dhcp/class_servDHCP.inc:708
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:57
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:71
 msgid "Error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:190
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:194
 #: admin/systems/services/dhcp/dhcp_network.tpl:25
 msgid "Broadcast"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:195
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:199
 #, php-format
 msgid "Error in definition of '%s'!"
 msgstr ""
@@ -434,9 +440,9 @@ msgid "Allow booting"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:36
-#: admin/systems/services/dhcp/class_servDHCP.inc:711
-#: admin/systems/services/dhcp/class_servDHCP.inc:712
-#: admin/systems/services/dhcp/class_servDHCP.inc:758
+#: admin/systems/services/dhcp/class_servDHCP.inc:719
+#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:766
 #, fuzzy
 msgid "DHCP service"
 msgstr "Dispositivi"
@@ -448,13 +454,14 @@ msgstr "Nome utente"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:39
 #: admin/systems/services/dhcp/class_servDHCP.inc:309
-#: admin/systems/services/dhcp/class_servDHCP.inc:620
+#: admin/systems/services/dhcp/class_servDHCP.inc:628
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:26
 #, fuzzy
 msgid "Global options"
 msgstr "Opzioni di posta"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:40
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
 #, fuzzy
 msgid "Class"
 msgstr "classe"
@@ -538,17 +545,17 @@ msgstr "Ispezione della configurazione PHP"
 msgid "Remove DHCP section"
 msgstr "Elimina estensioni per le applicazioni"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:394
-#: admin/systems/services/dhcp/class_servDHCP.inc:411
-#: admin/systems/services/dhcp/class_servDHCP.inc:466
-#: admin/systems/services/dhcp/class_servDHCP.inc:542
+#: admin/systems/services/dhcp/class_servDHCP.inc:402
+#: admin/systems/services/dhcp/class_servDHCP.inc:419
+#: admin/systems/services/dhcp/class_servDHCP.inc:474
 #: admin/systems/services/dhcp/class_servDHCP.inc:550
-#: admin/systems/services/dhcp/class_servDHCP.inc:577
+#: admin/systems/services/dhcp/class_servDHCP.inc:558
+#: admin/systems/services/dhcp/class_servDHCP.inc:585
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:700
+#: admin/systems/services/dhcp/class_servDHCP.inc:708
 #, fuzzy
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
@@ -556,21 +563,21 @@ msgid ""
 msgstr ""
 "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:712
+#: admin/systems/services/dhcp/class_servDHCP.inc:720
 msgid "Services"
 msgstr "Servizi"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:728
 #, fuzzy
 msgid "Start service"
 msgstr "Servizi"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:721
+#: admin/systems/services/dhcp/class_servDHCP.inc:729
 #, fuzzy
 msgid "Stop service"
 msgstr "Servizi"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:722
+#: admin/systems/services/dhcp/class_servDHCP.inc:730
 #, fuzzy
 msgid "Restart service"
 msgstr "Servizi"
diff --git a/gosa-plugins/dhcp/locale/messages.po b/gosa-plugins/dhcp/locale/messages.po
index c7fed4fe0..24c739f54 100644
--- a/gosa-plugins/dhcp/locale/messages.po
+++ b/gosa-plugins/dhcp/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,9 +39,15 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpPool.inc:101
 #: admin/systems/services/dhcp/class_dhcpPool.inc:109
 #: admin/systems/services/dhcp/dhcp_pool.tpl:6
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:84
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:87
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:95
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:84
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:87
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:95
+#: admin/systems/services/dhcp/class_dhcpClass.inc:84
+#: admin/systems/services/dhcp/class_dhcpClass.inc:87
+#: admin/systems/services/dhcp/class_dhcpClass.inc:95
 #: admin/systems/services/dhcp/dhcp_group.tpl:6
 msgid "Name"
 msgstr ""
@@ -59,7 +65,7 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:155
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:190
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:194
 #: admin/systems/services/dhcp/dhcp_network.tpl:17
 #: admin/systems/services/dhcp/dhcp_subnet.tpl:16
 msgid "Netmask"
@@ -104,18 +110,18 @@ msgid "Maximum lease time"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
-#: admin/systems/services/dhcp/class_servDHCP.inc:700
+#: admin/systems/services/dhcp/class_servDHCP.inc:708
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:57
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:71
 msgid "Error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:190
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:194
 #: admin/systems/services/dhcp/dhcp_network.tpl:25
 msgid "Broadcast"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:195
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:199
 #, php-format
 msgid "Error in definition of '%s'!"
 msgstr ""
@@ -396,9 +402,9 @@ msgid "Allow booting"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:36
-#: admin/systems/services/dhcp/class_servDHCP.inc:711
-#: admin/systems/services/dhcp/class_servDHCP.inc:712
-#: admin/systems/services/dhcp/class_servDHCP.inc:758
+#: admin/systems/services/dhcp/class_servDHCP.inc:719
+#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:766
 msgid "DHCP service"
 msgstr ""
 
@@ -408,12 +414,13 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:39
 #: admin/systems/services/dhcp/class_servDHCP.inc:309
-#: admin/systems/services/dhcp/class_servDHCP.inc:620
+#: admin/systems/services/dhcp/class_servDHCP.inc:628
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:26
 msgid "Global options"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:40
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
 msgid "Class"
 msgstr ""
 
@@ -486,34 +493,34 @@ msgstr ""
 msgid "Remove DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:394
-#: admin/systems/services/dhcp/class_servDHCP.inc:411
-#: admin/systems/services/dhcp/class_servDHCP.inc:466
-#: admin/systems/services/dhcp/class_servDHCP.inc:542
+#: admin/systems/services/dhcp/class_servDHCP.inc:402
+#: admin/systems/services/dhcp/class_servDHCP.inc:419
+#: admin/systems/services/dhcp/class_servDHCP.inc:474
 #: admin/systems/services/dhcp/class_servDHCP.inc:550
-#: admin/systems/services/dhcp/class_servDHCP.inc:577
+#: admin/systems/services/dhcp/class_servDHCP.inc:558
+#: admin/systems/services/dhcp/class_servDHCP.inc:585
 msgid "LDAP error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:700
+#: admin/systems/services/dhcp/class_servDHCP.inc:708
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:712
+#: admin/systems/services/dhcp/class_servDHCP.inc:720
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:728
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:721
+#: admin/systems/services/dhcp/class_servDHCP.inc:729
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:722
+#: admin/systems/services/dhcp/class_servDHCP.inc:730
 msgid "Restart service"
 msgstr ""
 
diff --git a/gosa-plugins/dhcp/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/dhcp/locale/nl/LC_MESSAGES/messages.po
index 0d5065729..30a5d4022 100644
--- a/gosa-plugins/dhcp/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dhcp/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2008-06-09 18:26+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -42,9 +42,15 @@ msgstr "Token ring"
 #: admin/systems/services/dhcp/class_dhcpPool.inc:101
 #: admin/systems/services/dhcp/class_dhcpPool.inc:109
 #: admin/systems/services/dhcp/dhcp_pool.tpl:6
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:84
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:87
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:95
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:84
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:87
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:95
+#: admin/systems/services/dhcp/class_dhcpClass.inc:84
+#: admin/systems/services/dhcp/class_dhcpClass.inc:87
+#: admin/systems/services/dhcp/class_dhcpClass.inc:95
 #: admin/systems/services/dhcp/dhcp_group.tpl:6
 msgid "Name"
 msgstr "Naam"
@@ -62,7 +68,7 @@ msgstr "Netwerkadres"
 
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:155
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:190
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:194
 #: admin/systems/services/dhcp/dhcp_network.tpl:17
 #: admin/systems/services/dhcp/dhcp_subnet.tpl:16
 msgid "Netmask"
@@ -107,18 +113,18 @@ msgid "Maximum lease time"
 msgstr "Maximale leasetijd"
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
-#: admin/systems/services/dhcp/class_servDHCP.inc:700
+#: admin/systems/services/dhcp/class_servDHCP.inc:708
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:57
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:71
 msgid "Error"
 msgstr "Fout"
 
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:190
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:194
 #: admin/systems/services/dhcp/dhcp_network.tpl:25
 msgid "Broadcast"
 msgstr "Broadcast"
 
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:195
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:199
 #, php-format
 msgid "Error in definition of '%s'!"
 msgstr "Fout in definitie van '%s'!"
@@ -410,9 +416,9 @@ msgid "Allow booting"
 msgstr "Opstarten toestaan"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:36
-#: admin/systems/services/dhcp/class_servDHCP.inc:711
-#: admin/systems/services/dhcp/class_servDHCP.inc:712
-#: admin/systems/services/dhcp/class_servDHCP.inc:758
+#: admin/systems/services/dhcp/class_servDHCP.inc:719
+#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:766
 msgid "DHCP service"
 msgstr "DHCP service"
 
@@ -422,12 +428,13 @@ msgstr "Loggen"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:39
 #: admin/systems/services/dhcp/class_servDHCP.inc:309
-#: admin/systems/services/dhcp/class_servDHCP.inc:620
+#: admin/systems/services/dhcp/class_servDHCP.inc:628
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:26
 msgid "Global options"
 msgstr "Globale opties"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:40
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
 msgid "Class"
 msgstr "Klasse"
 
@@ -502,16 +509,16 @@ msgstr "Bewerk DCHP sectie"
 msgid "Remove DHCP section"
 msgstr "Verwijder DHCP sectie"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:394
-#: admin/systems/services/dhcp/class_servDHCP.inc:411
-#: admin/systems/services/dhcp/class_servDHCP.inc:466
-#: admin/systems/services/dhcp/class_servDHCP.inc:542
+#: admin/systems/services/dhcp/class_servDHCP.inc:402
+#: admin/systems/services/dhcp/class_servDHCP.inc:419
+#: admin/systems/services/dhcp/class_servDHCP.inc:474
 #: admin/systems/services/dhcp/class_servDHCP.inc:550
-#: admin/systems/services/dhcp/class_servDHCP.inc:577
+#: admin/systems/services/dhcp/class_servDHCP.inc:558
+#: admin/systems/services/dhcp/class_servDHCP.inc:585
 msgid "LDAP error"
 msgstr "LDAP fout"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:700
+#: admin/systems/services/dhcp/class_servDHCP.inc:708
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
@@ -519,21 +526,21 @@ msgstr ""
 "De ingestelde DHCP configuratie is onbekend. Neem contact op met uw "
 "systeembeheerder."
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:712
+#: admin/systems/services/dhcp/class_servDHCP.inc:720
 msgid "Services"
 msgstr "Services"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:728
 #, fuzzy
 msgid "Start service"
 msgstr "Services"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:721
+#: admin/systems/services/dhcp/class_servDHCP.inc:729
 #, fuzzy
 msgid "Stop service"
 msgstr "Services"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:722
+#: admin/systems/services/dhcp/class_servDHCP.inc:730
 #, fuzzy
 msgid "Restart service"
 msgstr "Volgende server"
diff --git a/gosa-plugins/dhcp/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/dhcp/locale/pl/LC_MESSAGES/messages.po
index f517b788d..b05a388aa 100644
--- a/gosa-plugins/dhcp/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dhcp/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -38,9 +38,15 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpPool.inc:101
 #: admin/systems/services/dhcp/class_dhcpPool.inc:109
 #: admin/systems/services/dhcp/dhcp_pool.tpl:6
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:84
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:87
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:95
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:84
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:87
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:95
+#: admin/systems/services/dhcp/class_dhcpClass.inc:84
+#: admin/systems/services/dhcp/class_dhcpClass.inc:87
+#: admin/systems/services/dhcp/class_dhcpClass.inc:95
 #: admin/systems/services/dhcp/dhcp_group.tpl:6
 msgid "Name"
 msgstr "Imię"
@@ -59,7 +65,7 @@ msgstr "Adres sieciowy"
 
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:155
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:190
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:194
 #: admin/systems/services/dhcp/dhcp_network.tpl:17
 #: admin/systems/services/dhcp/dhcp_subnet.tpl:16
 #, fuzzy
@@ -112,18 +118,18 @@ msgid "Maximum lease time"
 msgstr "Maksymalny rozmiar pliku"
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
-#: admin/systems/services/dhcp/class_servDHCP.inc:700
+#: admin/systems/services/dhcp/class_servDHCP.inc:708
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:57
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:71
 msgid "Error"
 msgstr "Błąd"
 
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:190
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:194
 #: admin/systems/services/dhcp/dhcp_network.tpl:25
 msgid "Broadcast"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:195
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:199
 #, php-format
 msgid "Error in definition of '%s'!"
 msgstr ""
@@ -439,9 +445,9 @@ msgid "Allow booting"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:36
-#: admin/systems/services/dhcp/class_servDHCP.inc:711
-#: admin/systems/services/dhcp/class_servDHCP.inc:712
-#: admin/systems/services/dhcp/class_servDHCP.inc:758
+#: admin/systems/services/dhcp/class_servDHCP.inc:719
+#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:766
 #, fuzzy
 msgid "DHCP service"
 msgstr "Dodaj usługę DHCP"
@@ -453,13 +459,14 @@ msgstr "Login"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:39
 #: admin/systems/services/dhcp/class_servDHCP.inc:309
-#: admin/systems/services/dhcp/class_servDHCP.inc:620
+#: admin/systems/services/dhcp/class_servDHCP.inc:628
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:26
 #, fuzzy
 msgid "Global options"
 msgstr "Opcje poczty"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:40
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
 msgid "Class"
 msgstr "Klasa"
 
@@ -542,38 +549,38 @@ msgstr "Inspekcja instalacji PHP"
 msgid "Remove DHCP section"
 msgstr "Wyłącz usługę DHCP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:394
-#: admin/systems/services/dhcp/class_servDHCP.inc:411
-#: admin/systems/services/dhcp/class_servDHCP.inc:466
-#: admin/systems/services/dhcp/class_servDHCP.inc:542
+#: admin/systems/services/dhcp/class_servDHCP.inc:402
+#: admin/systems/services/dhcp/class_servDHCP.inc:419
+#: admin/systems/services/dhcp/class_servDHCP.inc:474
 #: admin/systems/services/dhcp/class_servDHCP.inc:550
-#: admin/systems/services/dhcp/class_servDHCP.inc:577
+#: admin/systems/services/dhcp/class_servDHCP.inc:558
+#: admin/systems/services/dhcp/class_servDHCP.inc:585
 #, fuzzy
 msgid "LDAP error"
 msgstr "błąd LDAP:"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:700
+#: admin/systems/services/dhcp/class_servDHCP.inc:708
 #, fuzzy
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr "Konto zablokowane. Proszę skontaktować się z administratorem systemu."
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:712
+#: admin/systems/services/dhcp/class_servDHCP.inc:720
 msgid "Services"
 msgstr "Usługi"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:728
 #, fuzzy
 msgid "Start service"
 msgstr "Usługi"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:721
+#: admin/systems/services/dhcp/class_servDHCP.inc:729
 #, fuzzy
 msgid "Stop service"
 msgstr "Usługi"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:722
+#: admin/systems/services/dhcp/class_servDHCP.inc:730
 #, fuzzy
 msgid "Restart service"
 msgstr "Serwer NTP"
diff --git a/gosa-plugins/dhcp/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/dhcp/locale/ru/LC_MESSAGES/messages.po
index edb9bce8e..8f86d6b68 100644
--- a/gosa-plugins/dhcp/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dhcp/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -38,9 +38,15 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpPool.inc:101
 #: admin/systems/services/dhcp/class_dhcpPool.inc:109
 #: admin/systems/services/dhcp/dhcp_pool.tpl:6
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:84
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:87
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:95
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:84
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:87
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:95
+#: admin/systems/services/dhcp/class_dhcpClass.inc:84
+#: admin/systems/services/dhcp/class_dhcpClass.inc:87
+#: admin/systems/services/dhcp/class_dhcpClass.inc:95
 #: admin/systems/services/dhcp/dhcp_group.tpl:6
 msgid "Name"
 msgstr "Фамилия"
@@ -60,7 +66,7 @@ msgstr "Сетевые устройства"
 
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:155
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:190
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:194
 #: admin/systems/services/dhcp/dhcp_network.tpl:17
 #: admin/systems/services/dhcp/dhcp_subnet.tpl:16
 msgid "Netmask"
@@ -112,18 +118,18 @@ msgid "Maximum lease time"
 msgstr "Размер квоты"
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
-#: admin/systems/services/dhcp/class_servDHCP.inc:700
+#: admin/systems/services/dhcp/class_servDHCP.inc:708
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:57
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:71
 msgid "Error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:190
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:194
 #: admin/systems/services/dhcp/dhcp_network.tpl:25
 msgid "Broadcast"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:195
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:199
 #, php-format
 msgid "Error in definition of '%s'!"
 msgstr ""
@@ -444,9 +450,9 @@ msgid "Allow booting"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:36
-#: admin/systems/services/dhcp/class_servDHCP.inc:711
-#: admin/systems/services/dhcp/class_servDHCP.inc:712
-#: admin/systems/services/dhcp/class_servDHCP.inc:758
+#: admin/systems/services/dhcp/class_servDHCP.inc:719
+#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:766
 #, fuzzy
 msgid "DHCP service"
 msgstr "Добавить сервис DHCP"
@@ -458,13 +464,14 @@ msgstr "Имя пользователя"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:39
 #: admin/systems/services/dhcp/class_servDHCP.inc:309
-#: admin/systems/services/dhcp/class_servDHCP.inc:620
+#: admin/systems/services/dhcp/class_servDHCP.inc:628
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:26
 #, fuzzy
 msgid "Global options"
 msgstr "Почтовые настройки"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:40
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
 #, fuzzy
 msgid "Class"
 msgstr "Выберите тип мыши"
@@ -548,17 +555,17 @@ msgstr "Проверка конфигурации PHP"
 msgid "Remove DHCP section"
 msgstr "Удалить сервис DHCP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:394
-#: admin/systems/services/dhcp/class_servDHCP.inc:411
-#: admin/systems/services/dhcp/class_servDHCP.inc:466
-#: admin/systems/services/dhcp/class_servDHCP.inc:542
+#: admin/systems/services/dhcp/class_servDHCP.inc:402
+#: admin/systems/services/dhcp/class_servDHCP.inc:419
+#: admin/systems/services/dhcp/class_servDHCP.inc:474
 #: admin/systems/services/dhcp/class_servDHCP.inc:550
-#: admin/systems/services/dhcp/class_servDHCP.inc:577
+#: admin/systems/services/dhcp/class_servDHCP.inc:558
+#: admin/systems/services/dhcp/class_servDHCP.inc:585
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:700
+#: admin/systems/services/dhcp/class_servDHCP.inc:708
 #, fuzzy
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
@@ -567,21 +574,21 @@ msgstr ""
 "Не удается начать сеанс на LDAP-сервере. Обратитесь к системному "
 "администратору."
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:712
+#: admin/systems/services/dhcp/class_servDHCP.inc:720
 msgid "Services"
 msgstr "Сервисы"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:728
 #, fuzzy
 msgid "Start service"
 msgstr "Сервисы"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:721
+#: admin/systems/services/dhcp/class_servDHCP.inc:729
 #, fuzzy
 msgid "Stop service"
 msgstr "Сервисы"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:722
+#: admin/systems/services/dhcp/class_servDHCP.inc:730
 #, fuzzy
 msgid "Restart service"
 msgstr "Сервер NTP"
diff --git a/gosa-plugins/dhcp/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/dhcp/locale/zh/LC_MESSAGES/messages.po
index 799fd3791..31ec10ef9 100644
--- a/gosa-plugins/dhcp/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dhcp/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:03+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -40,9 +40,15 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpPool.inc:101
 #: admin/systems/services/dhcp/class_dhcpPool.inc:109
 #: admin/systems/services/dhcp/dhcp_pool.tpl:6
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:84
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:87
+#: admin/systems/services/dhcp/class_dhcpSubClass.inc:95
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:84
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:87
 #: admin/systems/services/dhcp/class_dhcpGroup.inc:95
+#: admin/systems/services/dhcp/class_dhcpClass.inc:84
+#: admin/systems/services/dhcp/class_dhcpClass.inc:87
+#: admin/systems/services/dhcp/class_dhcpClass.inc:95
 #: admin/systems/services/dhcp/dhcp_group.tpl:6
 msgid "Name"
 msgstr "名称"
@@ -61,7 +67,7 @@ msgstr "网络地址"
 
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:139
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:155
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:190
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:194
 #: admin/systems/services/dhcp/dhcp_network.tpl:17
 #: admin/systems/services/dhcp/dhcp_subnet.tpl:16
 #, fuzzy
@@ -113,18 +119,18 @@ msgid "Maximum lease time"
 msgstr "最大文件大小"
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
-#: admin/systems/services/dhcp/class_servDHCP.inc:700
+#: admin/systems/services/dhcp/class_servDHCP.inc:708
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:57
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:71
 msgid "Error"
 msgstr "错误"
 
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:190
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:194
 #: admin/systems/services/dhcp/dhcp_network.tpl:25
 msgid "Broadcast"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_dhcpNetwork.inc:195
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:199
 #, php-format
 msgid "Error in definition of '%s'!"
 msgstr ""
@@ -440,9 +446,9 @@ msgid "Allow booting"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:36
-#: admin/systems/services/dhcp/class_servDHCP.inc:711
-#: admin/systems/services/dhcp/class_servDHCP.inc:712
-#: admin/systems/services/dhcp/class_servDHCP.inc:758
+#: admin/systems/services/dhcp/class_servDHCP.inc:719
+#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:766
 #, fuzzy
 msgid "DHCP service"
 msgstr "添加 DHCP 服务"
@@ -454,13 +460,14 @@ msgstr "登录名"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:39
 #: admin/systems/services/dhcp/class_servDHCP.inc:309
-#: admin/systems/services/dhcp/class_servDHCP.inc:620
+#: admin/systems/services/dhcp/class_servDHCP.inc:628
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:26
 #, fuzzy
 msgid "Global options"
 msgstr "邮件选项"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:40
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
 msgid "Class"
 msgstr "ç±»"
 
@@ -543,38 +550,38 @@ msgstr "PHP 安装检查"
 msgid "Remove DHCP section"
 msgstr "删除 DHCP 服务"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:394
-#: admin/systems/services/dhcp/class_servDHCP.inc:411
-#: admin/systems/services/dhcp/class_servDHCP.inc:466
-#: admin/systems/services/dhcp/class_servDHCP.inc:542
+#: admin/systems/services/dhcp/class_servDHCP.inc:402
+#: admin/systems/services/dhcp/class_servDHCP.inc:419
+#: admin/systems/services/dhcp/class_servDHCP.inc:474
 #: admin/systems/services/dhcp/class_servDHCP.inc:550
-#: admin/systems/services/dhcp/class_servDHCP.inc:577
+#: admin/systems/services/dhcp/class_servDHCP.inc:558
+#: admin/systems/services/dhcp/class_servDHCP.inc:585
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:700
+#: admin/systems/services/dhcp/class_servDHCP.inc:708
 #, fuzzy
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr "账户锁定。请联系管理员。"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:712
+#: admin/systems/services/dhcp/class_servDHCP.inc:720
 msgid "Services"
 msgstr "服务"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:728
 #, fuzzy
 msgid "Start service"
 msgstr "服务"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:721
+#: admin/systems/services/dhcp/class_servDHCP.inc:729
 #, fuzzy
 msgid "Stop service"
 msgstr "服务"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:722
+#: admin/systems/services/dhcp/class_servDHCP.inc:730
 #, fuzzy
 msgid "Restart service"
 msgstr "NTP 服务器"
diff --git a/gosa-plugins/dns/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/dns/locale/de/LC_MESSAGES/messages.po
index 5b736f989..dac47d869 100644
--- a/gosa-plugins/dns/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dns/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2008-10-07 18:29+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team:  <de@li.org>\n"
@@ -51,8 +51,8 @@ msgid "Zones"
 msgstr "Zonen"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:249
-#: admin/systems/services/dns/class_servDNS.inc:184
-#: admin/systems/services/dns/class_servDNS.inc:345
+#: admin/systems/services/dns/class_servDNS.inc:174
+#: admin/systems/services/dns/class_servDNS.inc:335
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:220
 #: admin/systems/services/dns/class_DNS.inc:161
 #: admin/systems/services/dns/class_DNS.inc:166
@@ -69,21 +69,21 @@ msgid "Down"
 msgstr "Ab"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:350
-#: admin/systems/services/dns/class_servDNSeditZone.inc:586
+#: admin/systems/services/dns/class_servDNSeditZone.inc:588
 msgid "Delete"
 msgstr "Entfernen"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:412
 #: admin/systems/services/dns/class_servDNSeditZone.inc:417
 #: admin/systems/services/dns/class_servDNSeditZone.inc:425
-#: admin/systems/services/dns/class_servDNS.inc:592
+#: admin/systems/services/dns/class_servDNS.inc:582
 #: admin/systems/services/dns/servdnseditzone.tpl:7
 msgid "Zone name"
 msgstr "Zonenname"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:421
-#: admin/systems/services/dns/class_servDNS.inc:279
-#: admin/systems/services/dns/class_servDNS.inc:593
+#: admin/systems/services/dns/class_servDNS.inc:269
+#: admin/systems/services/dns/class_servDNS.inc:583
 msgid "Reverse zone"
 msgstr "Reverse Zone"
 
@@ -93,12 +93,12 @@ msgid "Only lowercase allowed"
 msgstr "Nur Kleinbuchstaben sind erlaubt."
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:429
-#: admin/systems/services/dns/class_servDNS.inc:598
+#: admin/systems/services/dns/class_servDNS.inc:588
 msgid "Serial"
 msgstr "Serial"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:433
-#: admin/systems/services/dns/class_servDNS.inc:599
+#: admin/systems/services/dns/class_servDNS.inc:589
 #: admin/systems/services/dns/servdnseditzone.tpl:102
 msgid "Refresh"
 msgstr "Aktualisieren"
@@ -108,13 +108,13 @@ msgid "Time to life"
 msgstr "Lebensdauer"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:441
-#: admin/systems/services/dns/class_servDNS.inc:601
+#: admin/systems/services/dns/class_servDNS.inc:591
 #: admin/systems/services/dns/servdnseditzone.tpl:120
 msgid "Expire"
 msgstr "Ablauf"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:445
-#: admin/systems/services/dns/class_servDNS.inc:600
+#: admin/systems/services/dns/class_servDNS.inc:590
 #: admin/systems/services/dns/servdnseditzone.tpl:111
 msgid "Retry"
 msgstr "Wiederholen"
@@ -136,12 +136,12 @@ msgstr ""
 "zueinander!"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:498
-#: admin/systems/services/dns/class_servDNS.inc:594
+#: admin/systems/services/dns/class_servDNS.inc:584
 msgid "Network class"
 msgstr "Netzwerk-Klasse"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:592
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:452
+#: admin/systems/services/dns/class_servDNSeditZone.inc:594
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:455
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -172,9 +172,9 @@ msgid "Create a new DNS zone entry"
 msgstr "Einen neuen DNS-Zonen-Eintrag erstellen"
 
 #: admin/systems/services/dns/class_servDNS.inc:31
-#: admin/systems/services/dns/class_servDNS.inc:550
-#: admin/systems/services/dns/class_servDNS.inc:579
-#: admin/systems/services/dns/class_servDNS.inc:580
+#: admin/systems/services/dns/class_servDNS.inc:540
+#: admin/systems/services/dns/class_servDNS.inc:569
+#: admin/systems/services/dns/class_servDNS.inc:570
 msgid "DNS service"
 msgstr "DNS-Dienst"
 
@@ -191,87 +191,66 @@ msgstr ""
 "Die Migration wird gestartet, sobald Sie das System speichern. Klicken Sie "
 "auf den Knopf 'Abbrechen', um abzubrechen."
 
-#: admin/systems/services/dns/class_servDNS.inc:166
-msgid "Remove DNS service"
-msgstr "DNS-Dienst entfernen"
-
-#: admin/systems/services/dns/class_servDNS.inc:167
-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."
-
-#: admin/systems/services/dns/class_servDNS.inc:169
-msgid "Add DNS service"
-msgstr "DNS-Dienst hinzufügen"
-
-#: admin/systems/services/dns/class_servDNS.inc:170
-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."
-
-#: admin/systems/services/dns/class_servDNS.inc:280
-#: admin/systems/services/dns/class_servDNS.inc:602
+#: admin/systems/services/dns/class_servDNS.inc:270
+#: admin/systems/services/dns/class_servDNS.inc:592
 #: admin/systems/services/dns/servdnseditzone.tpl:129
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/systems/services/dns/class_servDNS.inc:281
+#: admin/systems/services/dns/class_servDNS.inc:271
 msgid "Class"
 msgstr "Klasse"
 
-#: admin/systems/services/dns/class_servDNS.inc:345
+#: admin/systems/services/dns/class_servDNS.inc:335
 #, php-format
 msgid "Cannot delete the selected zone. It is still in use by '%s'"
 msgstr ""
 "Sie können die gewählte Zone nicht entfernen, sie wird noch von folgendem(n) "
 "Eintrag / Einträgen verwendet: '%s'"
 
-#: admin/systems/services/dns/class_servDNS.inc:455
-#: admin/systems/services/dns/class_servDNS.inc:471
-#: admin/systems/services/dns/class_servDNS.inc:496
-#: admin/systems/services/dns/class_servDNS.inc:507
-#: admin/systems/services/dns/class_servDNS.inc:540
+#: admin/systems/services/dns/class_servDNS.inc:445
+#: admin/systems/services/dns/class_servDNS.inc:461
+#: admin/systems/services/dns/class_servDNS.inc:486
+#: admin/systems/services/dns/class_servDNS.inc:497
+#: admin/systems/services/dns/class_servDNS.inc:530
+#: admin/systems/services/dns/class_DNS.inc:748
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: admin/systems/services/dns/class_servDNS.inc:580
+#: admin/systems/services/dns/class_servDNS.inc:570
 msgid "Services"
 msgstr "Dienste"
 
-#: admin/systems/services/dns/class_servDNS.inc:588
+#: admin/systems/services/dns/class_servDNS.inc:578
 msgid "Start service"
 msgstr "Dienst starten"
 
-#: admin/systems/services/dns/class_servDNS.inc:589
+#: admin/systems/services/dns/class_servDNS.inc:579
 msgid "Stop service"
 msgstr "Dienst stoppen"
 
-#: admin/systems/services/dns/class_servDNS.inc:590
+#: admin/systems/services/dns/class_servDNS.inc:580
 msgid "Restart service"
 msgstr "Dienst neustarten"
 
-#: admin/systems/services/dns/class_servDNS.inc:595
+#: admin/systems/services/dns/class_servDNS.inc:585
 msgid "Zone entry editor"
 msgstr "Zonen-Editor"
 
-#: admin/systems/services/dns/class_servDNS.inc:596
+#: admin/systems/services/dns/class_servDNS.inc:586
 msgid "Primary dns server"
 msgstr "Primärer DNS-Server"
 
-#: admin/systems/services/dns/class_servDNS.inc:597
+#: admin/systems/services/dns/class_servDNS.inc:587
 #: admin/systems/services/dns/servdnseditzone.tpl:80
 msgid "Mail address"
 msgstr "Mail-Adresse"
 
-#: admin/systems/services/dns/class_servDNS.inc:603
+#: admin/systems/services/dns/class_servDNS.inc:593
 msgid "MX records"
 msgstr "MX-Datensätze"
 
-#: admin/systems/services/dns/class_servDNS.inc:604
+#: admin/systems/services/dns/class_servDNS.inc:594
 #: admin/systems/services/dns/servdnseditzone.tpl:48
 msgid "Zone records"
 msgstr "Zonen-Datensätze"
@@ -303,25 +282,87 @@ msgstr "Kann '%s' nicht anlegen, der Eintrag wird bereits verwendet."
 msgid "Entry '%s' is used more than once."
 msgstr "Der Eintrag '%s' wird öfter als ein Mal verwendet."
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:299
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:302
 #, php-format
 msgid "%s records cannot be used more than once."
 msgstr "%s Datensätze können nicht öfter als ein Mal verwendet werden."
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:306
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:309
 #, php-format
 msgid "Please fix the empty %s record for entry '%s'."
 msgstr "Bitte beheben Sie den leeren Datensatz %s des Eintrags '%s'."
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:314
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:317
 #, php-format
 msgid "Please fix the duplicate %s record for entry '%s'."
 msgstr "Bitte beheben Sie den doppelten Datensatz %s des Eintrags '%s'."
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:454
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:457
 msgid "Remove"
 msgstr "Entfernen"
 
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:509
+#, php-format
+msgid "The syntax of entry %s (record type %s, value %s) is invalid!"
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:509
+msgid "Example"
+msgstr "Beispiel"
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:515
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:523
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:531
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:562
+msgid "Entry should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:518
+msgid "Value should be an IPv6 address."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:526
+msgid "Value should be an IPv4 address."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:534
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:552
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:557
+msgid "Value should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:541
+msgid "Value 1 should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:544
+msgid "Value 2 should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:547
+msgid "Value should be composed of 'preference target'."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:567
+msgid "Value 1 (priority) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:570
+msgid "Value 2 (weight) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:573
+msgid "Value 3 (port) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:576
+msgid "Value 4 (target) should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:579
+msgid "Value should be composed of 'priority weight port target'."
+msgstr ""
+
 #: admin/systems/services/dns/class_DNS.inc:161
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -383,3 +424,23 @@ msgstr "MX-Datensätze"
 #: admin/systems/services/dns/servdnseditzone.tpl:165
 msgid "Global zone records"
 msgstr "Globale Zonen-Datensätze"
+
+#~ msgid "Remove DNS service"
+#~ msgstr "DNS-Dienst entfernen"
+
+#~ 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."
+
+#~ msgid "Add DNS service"
+#~ msgstr "DNS-Dienst hinzufügen"
+
+#~ 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."
diff --git a/gosa-plugins/dns/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/dns/locale/es/LC_MESSAGES/messages.po
index c80d4650d..6e5c1051e 100644
--- a/gosa-plugins/dns/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dns/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
@@ -51,8 +51,8 @@ msgid "Zones"
 msgstr "teléfonos"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:249
-#: admin/systems/services/dns/class_servDNS.inc:184
-#: admin/systems/services/dns/class_servDNS.inc:345
+#: admin/systems/services/dns/class_servDNS.inc:174
+#: admin/systems/services/dns/class_servDNS.inc:335
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:220
 #: admin/systems/services/dns/class_DNS.inc:161
 #: admin/systems/services/dns/class_DNS.inc:166
@@ -69,21 +69,21 @@ msgid "Down"
 msgstr "Abajo"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:350
-#: admin/systems/services/dns/class_servDNSeditZone.inc:586
+#: admin/systems/services/dns/class_servDNSeditZone.inc:588
 msgid "Delete"
 msgstr "Eliminar"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:412
 #: admin/systems/services/dns/class_servDNSeditZone.inc:417
 #: admin/systems/services/dns/class_servDNSeditZone.inc:425
-#: admin/systems/services/dns/class_servDNS.inc:592
+#: admin/systems/services/dns/class_servDNS.inc:582
 #: admin/systems/services/dns/servdnseditzone.tpl:7
 msgid "Zone name"
 msgstr "Nombre de la zona"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:421
-#: admin/systems/services/dns/class_servDNS.inc:279
-#: admin/systems/services/dns/class_servDNS.inc:593
+#: admin/systems/services/dns/class_servDNS.inc:269
+#: admin/systems/services/dns/class_servDNS.inc:583
 msgid "Reverse zone"
 msgstr "Zona Inversa"
 
@@ -94,12 +94,12 @@ msgid "Only lowercase allowed"
 msgstr "Solo están permitidas minúsculas en el nombre de zona."
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:429
-#: admin/systems/services/dns/class_servDNS.inc:598
+#: admin/systems/services/dns/class_servDNS.inc:588
 msgid "Serial"
 msgstr "Serie"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:433
-#: admin/systems/services/dns/class_servDNS.inc:599
+#: admin/systems/services/dns/class_servDNS.inc:589
 #: admin/systems/services/dns/servdnseditzone.tpl:102
 msgid "Refresh"
 msgstr "Refresco"
@@ -110,13 +110,13 @@ msgid "Time to life"
 msgstr "Zona de uso horario"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:441
-#: admin/systems/services/dns/class_servDNS.inc:601
+#: admin/systems/services/dns/class_servDNS.inc:591
 #: admin/systems/services/dns/servdnseditzone.tpl:120
 msgid "Expire"
 msgstr "Expiración"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:445
-#: admin/systems/services/dns/class_servDNS.inc:600
+#: admin/systems/services/dns/class_servDNS.inc:590
 #: admin/systems/services/dns/servdnseditzone.tpl:111
 msgid "Retry"
 msgstr "Reintento"
@@ -137,12 +137,12 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:498
-#: admin/systems/services/dns/class_servDNS.inc:594
+#: admin/systems/services/dns/class_servDNS.inc:584
 msgid "Network class"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:592
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:452
+#: admin/systems/services/dns/class_servDNSeditZone.inc:594
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:455
 msgid "Add"
 msgstr "Añadir"
 
@@ -168,9 +168,9 @@ msgid "Create a new DNS zone entry"
 msgstr ""
 
 #: admin/systems/services/dns/class_servDNS.inc:31
-#: admin/systems/services/dns/class_servDNS.inc:550
-#: admin/systems/services/dns/class_servDNS.inc:579
-#: admin/systems/services/dns/class_servDNS.inc:580
+#: admin/systems/services/dns/class_servDNS.inc:540
+#: admin/systems/services/dns/class_servDNS.inc:569
+#: admin/systems/services/dns/class_servDNS.inc:570
 msgid "DNS service"
 msgstr "Servicio DNS"
 
@@ -185,93 +185,72 @@ msgid ""
 "action, use the cancel button below."
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNS.inc:166
-msgid "Remove DNS service"
-msgstr "Eliminar servicio DNS"
-
-#: admin/systems/services/dns/class_servDNS.inc:167
-msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
-msgstr ""
-"Esta servidor tiene la extensión DNS activada. Puede desactivarla pulsando "
-"aquí."
-
-#: admin/systems/services/dns/class_servDNS.inc:169
-msgid "Add DNS service"
-msgstr "Añadir servicio DNS"
-
-#: admin/systems/services/dns/class_servDNS.inc:170
-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í."
-
-#: admin/systems/services/dns/class_servDNS.inc:280
-#: admin/systems/services/dns/class_servDNS.inc:602
+#: admin/systems/services/dns/class_servDNS.inc:270
+#: admin/systems/services/dns/class_servDNS.inc:592
 #: admin/systems/services/dns/servdnseditzone.tpl:129
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/systems/services/dns/class_servDNS.inc:281
+#: admin/systems/services/dns/class_servDNS.inc:271
 msgid "Class"
 msgstr "Clase"
 
-#: admin/systems/services/dns/class_servDNS.inc:345
+#: admin/systems/services/dns/class_servDNS.inc:335
 #, fuzzy, php-format
 msgid "Cannot delete the selected zone. It is still in use by '%s'"
 msgstr ""
 "No se puede eliminar la zona seleccionada, porque está siendo usada por la "
 "entrada(s) '%s'"
 
-#: admin/systems/services/dns/class_servDNS.inc:455
-#: admin/systems/services/dns/class_servDNS.inc:471
-#: admin/systems/services/dns/class_servDNS.inc:496
-#: admin/systems/services/dns/class_servDNS.inc:507
-#: admin/systems/services/dns/class_servDNS.inc:540
+#: admin/systems/services/dns/class_servDNS.inc:445
+#: admin/systems/services/dns/class_servDNS.inc:461
+#: admin/systems/services/dns/class_servDNS.inc:486
+#: admin/systems/services/dns/class_servDNS.inc:497
+#: admin/systems/services/dns/class_servDNS.inc:530
+#: admin/systems/services/dns/class_DNS.inc:748
 #, fuzzy
 msgid "LDAP error"
 msgstr "Servicio LDAP"
 
-#: admin/systems/services/dns/class_servDNS.inc:580
+#: admin/systems/services/dns/class_servDNS.inc:570
 msgid "Services"
 msgstr "Servicios"
 
-#: admin/systems/services/dns/class_servDNS.inc:588
+#: admin/systems/services/dns/class_servDNS.inc:578
 #, fuzzy
 msgid "Start service"
 msgstr "Servicio DNS"
 
-#: admin/systems/services/dns/class_servDNS.inc:589
+#: admin/systems/services/dns/class_servDNS.inc:579
 #, fuzzy
 msgid "Stop service"
 msgstr "Servicio DNS"
 
-#: admin/systems/services/dns/class_servDNS.inc:590
+#: admin/systems/services/dns/class_servDNS.inc:580
 #, fuzzy
 msgid "Restart service"
 msgstr "Servicio DNS"
 
-#: admin/systems/services/dns/class_servDNS.inc:595
+#: admin/systems/services/dns/class_servDNS.inc:585
 #, fuzzy
 msgid "Zone entry editor"
 msgstr "Registros de zona"
 
-#: admin/systems/services/dns/class_servDNS.inc:596
+#: admin/systems/services/dns/class_servDNS.inc:586
 msgid "Primary dns server"
 msgstr "Servidor DNS primario"
 
-#: admin/systems/services/dns/class_servDNS.inc:597
+#: admin/systems/services/dns/class_servDNS.inc:587
 #: admin/systems/services/dns/servdnseditzone.tpl:80
 msgid "Mail address"
 msgstr "Dirección correo electrónico"
 
-#: admin/systems/services/dns/class_servDNS.inc:603
+#: admin/systems/services/dns/class_servDNS.inc:593
 #, fuzzy
 msgid "MX records"
 msgstr "Registros de zona"
 
-#: admin/systems/services/dns/class_servDNS.inc:604
+#: admin/systems/services/dns/class_servDNS.inc:594
 #: admin/systems/services/dns/servdnseditzone.tpl:48
 msgid "Zone records"
 msgstr "Registros de zona"
@@ -300,25 +279,87 @@ msgstr "No se puede crear '%s', el nombre de destino ya existe."
 msgid "Entry '%s' is used more than once."
 msgstr "El nombre '%s' esta siendo usado mas de una vez."
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:299
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:302
 #, fuzzy, php-format
 msgid "%s records cannot be used more than once."
 msgstr "El nombre '%s' esta siendo usado mas de una vez."
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:306
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:309
 #, fuzzy, php-format
 msgid "Please fix the empty %s record for entry '%s'."
 msgstr "Hay un '%s' vacío para el host '%s'."
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:314
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:317
 #, php-format
 msgid "Please fix the duplicate %s record for entry '%s'."
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:454
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:457
 msgid "Remove"
 msgstr "Eliminar"
 
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:509
+#, php-format
+msgid "The syntax of entry %s (record type %s, value %s) is invalid!"
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:509
+msgid "Example"
+msgstr "Ejemplo"
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:515
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:523
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:531
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:562
+msgid "Entry should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:518
+msgid "Value should be an IPv6 address."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:526
+msgid "Value should be an IPv4 address."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:534
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:552
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:557
+msgid "Value should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:541
+msgid "Value 1 should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:544
+msgid "Value 2 should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:547
+msgid "Value should be composed of 'preference target'."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:567
+msgid "Value 1 (priority) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:570
+msgid "Value 2 (weight) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:573
+msgid "Value 3 (port) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:576
+msgid "Value 4 (target) should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:579
+msgid "Value should be composed of 'priority weight port target'."
+msgstr ""
+
 #: admin/systems/services/dns/class_DNS.inc:161
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -375,6 +416,26 @@ msgstr ""
 msgid "Global zone records"
 msgstr ""
 
+#~ msgid "Remove DNS service"
+#~ msgstr "Eliminar servicio DNS"
+
+#~ msgid ""
+#~ "This server has DNS features enabled. You can disable them by clicking "
+#~ "below."
+#~ msgstr ""
+#~ "Esta servidor tiene la extensión DNS activada. Puede desactivarla "
+#~ "pulsando aquí."
+
+#~ msgid "Add DNS service"
+#~ msgstr "Añadir servicio DNS"
+
+#~ 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í."
+
 #, fuzzy
 #~ msgid "Service start"
 #~ msgstr "Servicios"
diff --git a/gosa-plugins/dns/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/dns/locale/fr/LC_MESSAGES/messages.po
index c96353aa6..9841cfecd 100644
--- a/gosa-plugins/dns/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dns/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2008-10-09 15:27+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: french <fr@li.org>\n"
@@ -43,8 +43,8 @@ msgid "Zones"
 msgstr "Zones"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:249
-#: admin/systems/services/dns/class_servDNS.inc:184
-#: admin/systems/services/dns/class_servDNS.inc:345
+#: admin/systems/services/dns/class_servDNS.inc:174
+#: admin/systems/services/dns/class_servDNS.inc:335
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:220
 #: admin/systems/services/dns/class_DNS.inc:161
 #: admin/systems/services/dns/class_DNS.inc:166
@@ -61,21 +61,21 @@ msgid "Down"
 msgstr "En bas"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:350
-#: admin/systems/services/dns/class_servDNSeditZone.inc:586
+#: admin/systems/services/dns/class_servDNSeditZone.inc:588
 msgid "Delete"
 msgstr "Supprimer"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:412
 #: admin/systems/services/dns/class_servDNSeditZone.inc:417
 #: admin/systems/services/dns/class_servDNSeditZone.inc:425
-#: admin/systems/services/dns/class_servDNS.inc:592
+#: admin/systems/services/dns/class_servDNS.inc:582
 #: admin/systems/services/dns/servdnseditzone.tpl:7
 msgid "Zone name"
 msgstr "Nom de la zone"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:421
-#: admin/systems/services/dns/class_servDNS.inc:279
-#: admin/systems/services/dns/class_servDNS.inc:593
+#: admin/systems/services/dns/class_servDNS.inc:269
+#: admin/systems/services/dns/class_servDNS.inc:583
 msgid "Reverse zone"
 msgstr "Zone inverse"
 
@@ -85,12 +85,12 @@ msgid "Only lowercase allowed"
 msgstr "Seule les minuscules sont autorisées."
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:429
-#: admin/systems/services/dns/class_servDNS.inc:598
+#: admin/systems/services/dns/class_servDNS.inc:588
 msgid "Serial"
 msgstr "Série"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:433
-#: admin/systems/services/dns/class_servDNS.inc:599
+#: admin/systems/services/dns/class_servDNS.inc:589
 #: admin/systems/services/dns/servdnseditzone.tpl:102
 msgid "Refresh"
 msgstr "Rafraîchir"
@@ -100,13 +100,13 @@ msgid "Time to life"
 msgstr "Temps de vie"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:441
-#: admin/systems/services/dns/class_servDNS.inc:601
+#: admin/systems/services/dns/class_servDNS.inc:591
 #: admin/systems/services/dns/servdnseditzone.tpl:120
 msgid "Expire"
 msgstr "Expirer"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:445
-#: admin/systems/services/dns/class_servDNS.inc:600
+#: admin/systems/services/dns/class_servDNS.inc:590
 #: admin/systems/services/dns/servdnseditzone.tpl:111
 msgid "Retry"
 msgstr "Réessayer"
@@ -127,12 +127,12 @@ msgstr ""
 "L'adresse réseau spécifiée et la classe réseau (%s/%s) ne concordent pas !"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:498
-#: admin/systems/services/dns/class_servDNS.inc:594
+#: admin/systems/services/dns/class_servDNS.inc:584
 msgid "Network class"
 msgstr "Classe réseau"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:592
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:452
+#: admin/systems/services/dns/class_servDNSeditZone.inc:594
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:455
 msgid "Add"
 msgstr "Ajouter"
 
@@ -162,9 +162,9 @@ msgid "Create a new DNS zone entry"
 msgstr "Créer une nouvelle zone DNS"
 
 #: admin/systems/services/dns/class_servDNS.inc:31
-#: admin/systems/services/dns/class_servDNS.inc:550
-#: admin/systems/services/dns/class_servDNS.inc:579
-#: admin/systems/services/dns/class_servDNS.inc:580
+#: admin/systems/services/dns/class_servDNS.inc:540
+#: admin/systems/services/dns/class_servDNS.inc:569
+#: admin/systems/services/dns/class_servDNS.inc:570
 msgid "DNS service"
 msgstr "Service DNS"
 
@@ -182,86 +182,65 @@ msgstr ""
 "La migration commencera quand vous sauverez ce système. Pour annuler cette "
 "action, utilisez le bouton annuler."
 
-#: admin/systems/services/dns/class_servDNS.inc:166
-msgid "Remove DNS service"
-msgstr "Suppression du service DNS"
-
-#: admin/systems/services/dns/class_servDNS.inc:167
-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."
-
-#: admin/systems/services/dns/class_servDNS.inc:169
-msgid "Add DNS service"
-msgstr "Ajouter un service DNS"
-
-#: admin/systems/services/dns/class_servDNS.inc:170
-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."
-
-#: admin/systems/services/dns/class_servDNS.inc:280
-#: admin/systems/services/dns/class_servDNS.inc:602
+#: admin/systems/services/dns/class_servDNS.inc:270
+#: admin/systems/services/dns/class_servDNS.inc:592
 #: admin/systems/services/dns/servdnseditzone.tpl:129
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/systems/services/dns/class_servDNS.inc:281
+#: admin/systems/services/dns/class_servDNS.inc:271
 msgid "Class"
 msgstr "Classe"
 
-#: admin/systems/services/dns/class_servDNS.inc:345
+#: admin/systems/services/dns/class_servDNS.inc:335
 #, php-format
 msgid "Cannot delete the selected zone. It is still in use by '%s'"
 msgstr ""
 "Vous ne pouvez pas effacer cette zone car elle est encore utilisée par '%s'"
 
-#: admin/systems/services/dns/class_servDNS.inc:455
-#: admin/systems/services/dns/class_servDNS.inc:471
-#: admin/systems/services/dns/class_servDNS.inc:496
-#: admin/systems/services/dns/class_servDNS.inc:507
-#: admin/systems/services/dns/class_servDNS.inc:540
+#: admin/systems/services/dns/class_servDNS.inc:445
+#: admin/systems/services/dns/class_servDNS.inc:461
+#: admin/systems/services/dns/class_servDNS.inc:486
+#: admin/systems/services/dns/class_servDNS.inc:497
+#: admin/systems/services/dns/class_servDNS.inc:530
+#: admin/systems/services/dns/class_DNS.inc:748
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: admin/systems/services/dns/class_servDNS.inc:580
+#: admin/systems/services/dns/class_servDNS.inc:570
 msgid "Services"
 msgstr "Services"
 
-#: admin/systems/services/dns/class_servDNS.inc:588
+#: admin/systems/services/dns/class_servDNS.inc:578
 msgid "Start service"
 msgstr "Démarrer le service"
 
-#: admin/systems/services/dns/class_servDNS.inc:589
+#: admin/systems/services/dns/class_servDNS.inc:579
 msgid "Stop service"
 msgstr "Arrêter le Service"
 
-#: admin/systems/services/dns/class_servDNS.inc:590
+#: admin/systems/services/dns/class_servDNS.inc:580
 msgid "Restart service"
 msgstr "Redémarrer le service"
 
-#: admin/systems/services/dns/class_servDNS.inc:595
+#: admin/systems/services/dns/class_servDNS.inc:585
 msgid "Zone entry editor"
 msgstr "Editeur de zone"
 
-#: admin/systems/services/dns/class_servDNS.inc:596
+#: admin/systems/services/dns/class_servDNS.inc:586
 msgid "Primary dns server"
 msgstr "Serveur dns primaire"
 
-#: admin/systems/services/dns/class_servDNS.inc:597
+#: admin/systems/services/dns/class_servDNS.inc:587
 #: admin/systems/services/dns/servdnseditzone.tpl:80
 msgid "Mail address"
 msgstr "Adresse de messagerie"
 
-#: admin/systems/services/dns/class_servDNS.inc:603
+#: admin/systems/services/dns/class_servDNS.inc:593
 msgid "MX records"
 msgstr "Enregistrements MX"
 
-#: admin/systems/services/dns/class_servDNS.inc:604
+#: admin/systems/services/dns/class_servDNS.inc:594
 #: admin/systems/services/dns/servdnseditzone.tpl:48
 msgid "Zone records"
 msgstr "Enregistrement de zone"
@@ -290,27 +269,89 @@ msgstr "Impossible de créer '%s'. Cet enregistrement existe déjà."
 msgid "Entry '%s' is used more than once."
 msgstr "L'entrée '%s' est utilisé plus d'une fois."
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:299
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:302
 #, php-format
 msgid "%s records cannot be used more than once."
 msgstr "Les enregistrements '%s' ne peuvent pas être utilisés plus d'une fois."
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:306
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:309
 #, php-format
 msgid "Please fix the empty %s record for entry '%s'."
 msgstr ""
 "Veuillez corriger l'enregistrement vide '%s' pour l'enregistrement '%s'."
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:314
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:317
 #, php-format
 msgid "Please fix the duplicate %s record for entry '%s'."
 msgstr ""
 "Veuillez corriger l'enregistrement double '%s' pour l'enregistrement '%s'."
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:454
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:457
 msgid "Remove"
 msgstr "Supprimer"
 
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:509
+#, php-format
+msgid "The syntax of entry %s (record type %s, value %s) is invalid!"
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:509
+msgid "Example"
+msgstr "Exemple"
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:515
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:523
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:531
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:562
+msgid "Entry should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:518
+msgid "Value should be an IPv6 address."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:526
+msgid "Value should be an IPv4 address."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:534
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:552
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:557
+msgid "Value should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:541
+msgid "Value 1 should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:544
+msgid "Value 2 should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:547
+msgid "Value should be composed of 'preference target'."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:567
+msgid "Value 1 (priority) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:570
+msgid "Value 2 (weight) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:573
+msgid "Value 3 (port) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:576
+msgid "Value 4 (target) should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:579
+msgid "Value should be composed of 'priority weight port target'."
+msgstr ""
+
 #: admin/systems/services/dns/class_DNS.inc:161
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -370,3 +411,23 @@ msgstr "Enregistrements mx"
 #: admin/systems/services/dns/servdnseditzone.tpl:165
 msgid "Global zone records"
 msgstr "Enregistrements pour la zone globale"
+
+#~ msgid "Remove DNS service"
+#~ msgstr "Suppression du service DNS"
+
+#~ 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."
+
+#~ msgid "Add DNS service"
+#~ msgstr "Ajouter un service DNS"
+
+#~ 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."
diff --git a/gosa-plugins/dns/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/dns/locale/it/LC_MESSAGES/messages.po
index fcf4ea53c..a85c41cb9 100644
--- a/gosa-plugins/dns/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dns/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -45,8 +45,8 @@ msgid "Zones"
 msgstr "telefoni"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:249
-#: admin/systems/services/dns/class_servDNS.inc:184
-#: admin/systems/services/dns/class_servDNS.inc:345
+#: admin/systems/services/dns/class_servDNS.inc:174
+#: admin/systems/services/dns/class_servDNS.inc:335
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:220
 #: admin/systems/services/dns/class_DNS.inc:161
 #: admin/systems/services/dns/class_DNS.inc:166
@@ -64,22 +64,22 @@ msgid "Down"
 msgstr "Dominio"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:350
-#: admin/systems/services/dns/class_servDNSeditZone.inc:586
+#: admin/systems/services/dns/class_servDNSeditZone.inc:588
 msgid "Delete"
 msgstr "Rimuovi"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:412
 #: admin/systems/services/dns/class_servDNSeditZone.inc:417
 #: admin/systems/services/dns/class_servDNSeditZone.inc:425
-#: admin/systems/services/dns/class_servDNS.inc:592
+#: admin/systems/services/dns/class_servDNS.inc:582
 #: admin/systems/services/dns/servdnseditzone.tpl:7
 #, fuzzy
 msgid "Zone name"
 msgstr "Nome comune"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:421
-#: admin/systems/services/dns/class_servDNS.inc:279
-#: admin/systems/services/dns/class_servDNS.inc:593
+#: admin/systems/services/dns/class_servDNS.inc:269
+#: admin/systems/services/dns/class_servDNS.inc:583
 #, fuzzy
 msgid "Reverse zone"
 msgstr "Riferimenti"
@@ -90,13 +90,13 @@ msgid "Only lowercase allowed"
 msgstr ""
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:429
-#: admin/systems/services/dns/class_servDNS.inc:598
+#: admin/systems/services/dns/class_servDNS.inc:588
 #, fuzzy
 msgid "Serial"
 msgstr "Terminali"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:433
-#: admin/systems/services/dns/class_servDNS.inc:599
+#: admin/systems/services/dns/class_servDNS.inc:589
 #: admin/systems/services/dns/servdnseditzone.tpl:102
 #, fuzzy
 msgid "Refresh"
@@ -108,14 +108,14 @@ msgid "Time to life"
 msgstr "Cellulare"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:441
-#: admin/systems/services/dns/class_servDNS.inc:601
+#: admin/systems/services/dns/class_servDNS.inc:591
 #: admin/systems/services/dns/servdnseditzone.tpl:120
 #, fuzzy
 msgid "Expire"
 msgstr "Esporta"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:445
-#: admin/systems/services/dns/class_servDNS.inc:600
+#: admin/systems/services/dns/class_servDNS.inc:590
 #: admin/systems/services/dns/servdnseditzone.tpl:111
 msgid "Retry"
 msgstr "Riprova"
@@ -136,13 +136,13 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:498
-#: admin/systems/services/dns/class_servDNS.inc:594
+#: admin/systems/services/dns/class_servDNS.inc:584
 #, fuzzy
 msgid "Network class"
 msgstr "Mostra dispositiva di rete"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:592
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:452
+#: admin/systems/services/dns/class_servDNSeditZone.inc:594
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:455
 msgid "Add"
 msgstr "Aggiungi"
 
@@ -170,9 +170,9 @@ msgid "Create a new DNS zone entry"
 msgstr "Crea in"
 
 #: admin/systems/services/dns/class_servDNS.inc:31
-#: admin/systems/services/dns/class_servDNS.inc:550
-#: admin/systems/services/dns/class_servDNS.inc:579
-#: admin/systems/services/dns/class_servDNS.inc:580
+#: admin/systems/services/dns/class_servDNS.inc:540
+#: admin/systems/services/dns/class_servDNS.inc:569
+#: admin/systems/services/dns/class_servDNS.inc:570
 #, fuzzy
 msgid "DNS service"
 msgstr "Mostra dispositiva di rete"
@@ -188,93 +188,72 @@ msgid ""
 "action, use the cancel button below."
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNS.inc:166
-#, fuzzy
-msgid "Remove DNS service"
-msgstr "Elimina foto"
-
-#: admin/systems/services/dns/class_servDNS.inc:167
-#, fuzzy
-msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
-msgstr "Questa identià possiede estensioni Unix."
-
-#: admin/systems/services/dns/class_servDNS.inc:169
-#, fuzzy
-msgid "Add DNS service"
-msgstr "Servizi"
-
-#: admin/systems/services/dns/class_servDNS.inc:170
-#, fuzzy
-msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
-msgstr "Questa identità non possiede estensioni Unix"
-
-#: admin/systems/services/dns/class_servDNS.inc:280
-#: admin/systems/services/dns/class_servDNS.inc:602
+#: admin/systems/services/dns/class_servDNS.inc:270
+#: admin/systems/services/dns/class_servDNS.inc:592
 #: admin/systems/services/dns/servdnseditzone.tpl:129
 msgid "TTL"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNS.inc:281
+#: admin/systems/services/dns/class_servDNS.inc:271
 #, fuzzy
 msgid "Class"
 msgstr "classe"
 
-#: admin/systems/services/dns/class_servDNS.inc:345
+#: admin/systems/services/dns/class_servDNS.inc:335
 #, php-format
 msgid "Cannot delete the selected zone. It is still in use by '%s'"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNS.inc:455
-#: admin/systems/services/dns/class_servDNS.inc:471
-#: admin/systems/services/dns/class_servDNS.inc:496
-#: admin/systems/services/dns/class_servDNS.inc:507
-#: admin/systems/services/dns/class_servDNS.inc:540
+#: admin/systems/services/dns/class_servDNS.inc:445
+#: admin/systems/services/dns/class_servDNS.inc:461
+#: admin/systems/services/dns/class_servDNS.inc:486
+#: admin/systems/services/dns/class_servDNS.inc:497
+#: admin/systems/services/dns/class_servDNS.inc:530
+#: admin/systems/services/dns/class_DNS.inc:748
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: admin/systems/services/dns/class_servDNS.inc:580
+#: admin/systems/services/dns/class_servDNS.inc:570
 msgid "Services"
 msgstr "Servizi"
 
-#: admin/systems/services/dns/class_servDNS.inc:588
+#: admin/systems/services/dns/class_servDNS.inc:578
 #, fuzzy
 msgid "Start service"
 msgstr "Mostra dispositiva di rete"
 
-#: admin/systems/services/dns/class_servDNS.inc:589
+#: admin/systems/services/dns/class_servDNS.inc:579
 #, fuzzy
 msgid "Stop service"
 msgstr "Mostra dispositiva di rete"
 
-#: admin/systems/services/dns/class_servDNS.inc:590
+#: admin/systems/services/dns/class_servDNS.inc:580
 #, fuzzy
 msgid "Restart service"
 msgstr "Mostra dispositiva di rete"
 
-#: admin/systems/services/dns/class_servDNS.inc:595
+#: admin/systems/services/dns/class_servDNS.inc:585
 #, fuzzy
 msgid "Zone entry editor"
 msgstr "Directory"
 
-#: admin/systems/services/dns/class_servDNS.inc:596
+#: admin/systems/services/dns/class_servDNS.inc:586
 #, fuzzy
 msgid "Primary dns server"
 msgstr "server"
 
-#: admin/systems/services/dns/class_servDNS.inc:597
+#: admin/systems/services/dns/class_servDNS.inc:587
 #: admin/systems/services/dns/servdnseditzone.tpl:80
 msgid "Mail address"
 msgstr "Indirizzo principale"
 
-#: admin/systems/services/dns/class_servDNS.inc:603
+#: admin/systems/services/dns/class_servDNS.inc:593
 #, fuzzy
 msgid "MX records"
 msgstr "Directory"
 
-#: admin/systems/services/dns/class_servDNS.inc:604
+#: admin/systems/services/dns/class_servDNS.inc:594
 #: admin/systems/services/dns/servdnseditzone.tpl:48
 #, fuzzy
 msgid "Zone records"
@@ -304,25 +283,87 @@ msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
 msgid "Entry '%s' is used more than once."
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:299
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:302
 #, php-format
 msgid "%s records cannot be used more than once."
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:306
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:309
 #, php-format
 msgid "Please fix the empty %s record for entry '%s'."
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:314
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:317
 #, php-format
 msgid "Please fix the duplicate %s record for entry '%s'."
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:454
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:457
 msgid "Remove"
 msgstr "Rimuovi"
 
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:509
+#, php-format
+msgid "The syntax of entry %s (record type %s, value %s) is invalid!"
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:509
+msgid "Example"
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:515
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:523
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:531
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:562
+msgid "Entry should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:518
+msgid "Value should be an IPv6 address."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:526
+msgid "Value should be an IPv4 address."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:534
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:552
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:557
+msgid "Value should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:541
+msgid "Value 1 should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:544
+msgid "Value 2 should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:547
+msgid "Value should be composed of 'preference target'."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:567
+msgid "Value 1 (priority) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:570
+msgid "Value 2 (weight) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:573
+msgid "Value 3 (port) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:576
+msgid "Value 4 (target) should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:579
+msgid "Value should be composed of 'priority weight port target'."
+msgstr ""
+
 #: admin/systems/services/dns/class_DNS.inc:161
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -381,6 +422,26 @@ msgstr "Directory"
 msgid "Global zone records"
 msgstr "Directory"
 
+#, fuzzy
+#~ msgid "Remove DNS service"
+#~ msgstr "Elimina foto"
+
+#, fuzzy
+#~ msgid ""
+#~ "This server has DNS features enabled. You can disable them by clicking "
+#~ "below."
+#~ msgstr "Questa identià possiede estensioni Unix."
+
+#, fuzzy
+#~ msgid "Add DNS service"
+#~ msgstr "Servizi"
+
+#, fuzzy
+#~ msgid ""
+#~ "This server has DNS features disabled. You can enable them by clicking "
+#~ "below."
+#~ msgstr "Questa identità non possiede estensioni Unix"
+
 #, fuzzy
 #~ msgid "Service start"
 #~ msgstr "Servizi"
diff --git a/gosa-plugins/dns/locale/messages.po b/gosa-plugins/dns/locale/messages.po
index a5a720aca..704dcd81e 100644
--- a/gosa-plugins/dns/locale/messages.po
+++ b/gosa-plugins/dns/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -43,8 +43,8 @@ msgid "Zones"
 msgstr ""
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:249
-#: admin/systems/services/dns/class_servDNS.inc:184
-#: admin/systems/services/dns/class_servDNS.inc:345
+#: admin/systems/services/dns/class_servDNS.inc:174
+#: admin/systems/services/dns/class_servDNS.inc:335
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:220
 #: admin/systems/services/dns/class_DNS.inc:161
 #: admin/systems/services/dns/class_DNS.inc:166
@@ -61,21 +61,21 @@ msgid "Down"
 msgstr ""
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:350
-#: admin/systems/services/dns/class_servDNSeditZone.inc:586
+#: admin/systems/services/dns/class_servDNSeditZone.inc:588
 msgid "Delete"
 msgstr ""
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:412
 #: admin/systems/services/dns/class_servDNSeditZone.inc:417
 #: admin/systems/services/dns/class_servDNSeditZone.inc:425
-#: admin/systems/services/dns/class_servDNS.inc:592
+#: admin/systems/services/dns/class_servDNS.inc:582
 #: admin/systems/services/dns/servdnseditzone.tpl:7
 msgid "Zone name"
 msgstr ""
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:421
-#: admin/systems/services/dns/class_servDNS.inc:279
-#: admin/systems/services/dns/class_servDNS.inc:593
+#: admin/systems/services/dns/class_servDNS.inc:269
+#: admin/systems/services/dns/class_servDNS.inc:583
 msgid "Reverse zone"
 msgstr ""
 
@@ -85,12 +85,12 @@ msgid "Only lowercase allowed"
 msgstr ""
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:429
-#: admin/systems/services/dns/class_servDNS.inc:598
+#: admin/systems/services/dns/class_servDNS.inc:588
 msgid "Serial"
 msgstr ""
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:433
-#: admin/systems/services/dns/class_servDNS.inc:599
+#: admin/systems/services/dns/class_servDNS.inc:589
 #: admin/systems/services/dns/servdnseditzone.tpl:102
 msgid "Refresh"
 msgstr ""
@@ -100,13 +100,13 @@ msgid "Time to life"
 msgstr ""
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:441
-#: admin/systems/services/dns/class_servDNS.inc:601
+#: admin/systems/services/dns/class_servDNS.inc:591
 #: admin/systems/services/dns/servdnseditzone.tpl:120
 msgid "Expire"
 msgstr ""
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:445
-#: admin/systems/services/dns/class_servDNS.inc:600
+#: admin/systems/services/dns/class_servDNS.inc:590
 #: admin/systems/services/dns/servdnseditzone.tpl:111
 msgid "Retry"
 msgstr ""
@@ -126,12 +126,12 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:498
-#: admin/systems/services/dns/class_servDNS.inc:594
+#: admin/systems/services/dns/class_servDNS.inc:584
 msgid "Network class"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:592
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:452
+#: admin/systems/services/dns/class_servDNSeditZone.inc:594
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:455
 msgid "Add"
 msgstr ""
 
@@ -157,9 +157,9 @@ msgid "Create a new DNS zone entry"
 msgstr ""
 
 #: admin/systems/services/dns/class_servDNS.inc:31
-#: admin/systems/services/dns/class_servDNS.inc:550
-#: admin/systems/services/dns/class_servDNS.inc:579
-#: admin/systems/services/dns/class_servDNS.inc:580
+#: admin/systems/services/dns/class_servDNS.inc:540
+#: admin/systems/services/dns/class_servDNS.inc:569
+#: admin/systems/services/dns/class_servDNS.inc:570
 msgid "DNS service"
 msgstr ""
 
@@ -174,81 +174,64 @@ msgid ""
 "action, use the cancel button below."
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNS.inc:166
-msgid "Remove DNS service"
-msgstr ""
-
-#: admin/systems/services/dns/class_servDNS.inc:167
-msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
-msgstr ""
-
-#: admin/systems/services/dns/class_servDNS.inc:169
-msgid "Add DNS service"
-msgstr ""
-
-#: admin/systems/services/dns/class_servDNS.inc:170
-msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
-msgstr ""
-
-#: admin/systems/services/dns/class_servDNS.inc:280
-#: admin/systems/services/dns/class_servDNS.inc:602
+#: admin/systems/services/dns/class_servDNS.inc:270
+#: admin/systems/services/dns/class_servDNS.inc:592
 #: admin/systems/services/dns/servdnseditzone.tpl:129
 msgid "TTL"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNS.inc:281
+#: admin/systems/services/dns/class_servDNS.inc:271
 msgid "Class"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNS.inc:345
+#: admin/systems/services/dns/class_servDNS.inc:335
 #, php-format
 msgid "Cannot delete the selected zone. It is still in use by '%s'"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNS.inc:455
-#: admin/systems/services/dns/class_servDNS.inc:471
-#: admin/systems/services/dns/class_servDNS.inc:496
-#: admin/systems/services/dns/class_servDNS.inc:507
-#: admin/systems/services/dns/class_servDNS.inc:540
+#: admin/systems/services/dns/class_servDNS.inc:445
+#: admin/systems/services/dns/class_servDNS.inc:461
+#: admin/systems/services/dns/class_servDNS.inc:486
+#: admin/systems/services/dns/class_servDNS.inc:497
+#: admin/systems/services/dns/class_servDNS.inc:530
+#: admin/systems/services/dns/class_DNS.inc:748
 msgid "LDAP error"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNS.inc:580
+#: admin/systems/services/dns/class_servDNS.inc:570
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNS.inc:588
+#: admin/systems/services/dns/class_servDNS.inc:578
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNS.inc:589
+#: admin/systems/services/dns/class_servDNS.inc:579
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNS.inc:590
+#: admin/systems/services/dns/class_servDNS.inc:580
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNS.inc:595
+#: admin/systems/services/dns/class_servDNS.inc:585
 msgid "Zone entry editor"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNS.inc:596
+#: admin/systems/services/dns/class_servDNS.inc:586
 msgid "Primary dns server"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNS.inc:597
+#: admin/systems/services/dns/class_servDNS.inc:587
 #: admin/systems/services/dns/servdnseditzone.tpl:80
 msgid "Mail address"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNS.inc:603
+#: admin/systems/services/dns/class_servDNS.inc:593
 msgid "MX records"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNS.inc:604
+#: admin/systems/services/dns/class_servDNS.inc:594
 #: admin/systems/services/dns/servdnseditzone.tpl:48
 msgid "Zone records"
 msgstr ""
@@ -277,25 +260,87 @@ msgstr ""
 msgid "Entry '%s' is used more than once."
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:299
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:302
 #, php-format
 msgid "%s records cannot be used more than once."
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:306
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:309
 #, php-format
 msgid "Please fix the empty %s record for entry '%s'."
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:314
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:317
 #, php-format
 msgid "Please fix the duplicate %s record for entry '%s'."
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:454
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:457
 msgid "Remove"
 msgstr ""
 
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:509
+#, php-format
+msgid "The syntax of entry %s (record type %s, value %s) is invalid!"
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:509
+msgid "Example"
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:515
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:523
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:531
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:562
+msgid "Entry should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:518
+msgid "Value should be an IPv6 address."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:526
+msgid "Value should be an IPv4 address."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:534
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:552
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:557
+msgid "Value should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:541
+msgid "Value 1 should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:544
+msgid "Value 2 should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:547
+msgid "Value should be composed of 'preference target'."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:567
+msgid "Value 1 (priority) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:570
+msgid "Value 2 (weight) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:573
+msgid "Value 3 (port) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:576
+msgid "Value 4 (target) should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:579
+msgid "Value should be composed of 'priority weight port target'."
+msgstr ""
+
 #: admin/systems/services/dns/class_DNS.inc:161
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
diff --git a/gosa-plugins/dns/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/dns/locale/nl/LC_MESSAGES/messages.po
index 8a6a02fe9..5f0872521 100644
--- a/gosa-plugins/dns/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dns/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -52,8 +52,8 @@ msgid "Zones"
 msgstr "Zones"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:249
-#: admin/systems/services/dns/class_servDNS.inc:184
-#: admin/systems/services/dns/class_servDNS.inc:345
+#: admin/systems/services/dns/class_servDNS.inc:174
+#: admin/systems/services/dns/class_servDNS.inc:335
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:220
 #: admin/systems/services/dns/class_DNS.inc:161
 #: admin/systems/services/dns/class_DNS.inc:166
@@ -70,21 +70,21 @@ msgid "Down"
 msgstr "Omlaag"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:350
-#: admin/systems/services/dns/class_servDNSeditZone.inc:586
+#: admin/systems/services/dns/class_servDNSeditZone.inc:588
 msgid "Delete"
 msgstr "Verwijderen"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:412
 #: admin/systems/services/dns/class_servDNSeditZone.inc:417
 #: admin/systems/services/dns/class_servDNSeditZone.inc:425
-#: admin/systems/services/dns/class_servDNS.inc:592
+#: admin/systems/services/dns/class_servDNS.inc:582
 #: admin/systems/services/dns/servdnseditzone.tpl:7
 msgid "Zone name"
 msgstr "Zone-naam"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:421
-#: admin/systems/services/dns/class_servDNS.inc:279
-#: admin/systems/services/dns/class_servDNS.inc:593
+#: admin/systems/services/dns/class_servDNS.inc:269
+#: admin/systems/services/dns/class_servDNS.inc:583
 msgid "Reverse zone"
 msgstr "Reverse zone"
 
@@ -95,12 +95,12 @@ msgid "Only lowercase allowed"
 msgstr "Hoofdletter zijn niet toegestaan voor de zone-naam."
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:429
-#: admin/systems/services/dns/class_servDNS.inc:598
+#: admin/systems/services/dns/class_servDNS.inc:588
 msgid "Serial"
 msgstr "Serieel"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:433
-#: admin/systems/services/dns/class_servDNS.inc:599
+#: admin/systems/services/dns/class_servDNS.inc:589
 #: admin/systems/services/dns/servdnseditzone.tpl:102
 msgid "Refresh"
 msgstr "Ververs"
@@ -111,13 +111,13 @@ msgid "Time to life"
 msgstr "Tijdzone"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:441
-#: admin/systems/services/dns/class_servDNS.inc:601
+#: admin/systems/services/dns/class_servDNS.inc:591
 #: admin/systems/services/dns/servdnseditzone.tpl:120
 msgid "Expire"
 msgstr "Vervaltijd"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:445
-#: admin/systems/services/dns/class_servDNS.inc:600
+#: admin/systems/services/dns/class_servDNS.inc:590
 #: admin/systems/services/dns/servdnseditzone.tpl:111
 msgid "Retry"
 msgstr "Opnieuw proberen"
@@ -137,13 +137,13 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:498
-#: admin/systems/services/dns/class_servDNS.inc:594
+#: admin/systems/services/dns/class_servDNS.inc:584
 #, fuzzy
 msgid "Network class"
 msgstr "Netwerkadres"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:592
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:452
+#: admin/systems/services/dns/class_servDNSeditZone.inc:594
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:455
 msgid "Add"
 msgstr "Toevoegen"
 
@@ -173,9 +173,9 @@ msgid "Create a new DNS zone entry"
 msgstr "Een nieuwe DNS zone regel aanmaken"
 
 #: admin/systems/services/dns/class_servDNS.inc:31
-#: admin/systems/services/dns/class_servDNS.inc:550
-#: admin/systems/services/dns/class_servDNS.inc:579
-#: admin/systems/services/dns/class_servDNS.inc:580
+#: admin/systems/services/dns/class_servDNS.inc:540
+#: admin/systems/services/dns/class_servDNS.inc:569
+#: admin/systems/services/dns/class_servDNS.inc:570
 #, fuzzy
 msgid "DNS service"
 msgstr "Voeg DNS service toe"
@@ -191,94 +191,73 @@ msgid ""
 "action, use the cancel button below."
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNS.inc:166
-msgid "Remove DNS service"
-msgstr "Verwijder DNS service"
-
-#: admin/systems/services/dns/class_servDNS.inc:167
-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."
-
-#: admin/systems/services/dns/class_servDNS.inc:169
-msgid "Add DNS service"
-msgstr "Voeg DNS service toe"
-
-#: admin/systems/services/dns/class_servDNS.inc:170
-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."
-
-#: admin/systems/services/dns/class_servDNS.inc:280
-#: admin/systems/services/dns/class_servDNS.inc:602
+#: admin/systems/services/dns/class_servDNS.inc:270
+#: admin/systems/services/dns/class_servDNS.inc:592
 #: admin/systems/services/dns/servdnseditzone.tpl:129
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/systems/services/dns/class_servDNS.inc:281
+#: admin/systems/services/dns/class_servDNS.inc:271
 msgid "Class"
 msgstr "Klasse"
 
-#: admin/systems/services/dns/class_servDNS.inc:345
+#: admin/systems/services/dns/class_servDNS.inc:335
 #, fuzzy, php-format
 msgid "Cannot delete the selected zone. It is still in use by '%s'"
 msgstr ""
 "Kan de geselecteerde zone niet verwijderen, aangezien deze nog gebruikt "
 "wordt door de volgende regel(s) '%s'"
 
-#: admin/systems/services/dns/class_servDNS.inc:455
-#: admin/systems/services/dns/class_servDNS.inc:471
-#: admin/systems/services/dns/class_servDNS.inc:496
-#: admin/systems/services/dns/class_servDNS.inc:507
-#: admin/systems/services/dns/class_servDNS.inc:540
+#: admin/systems/services/dns/class_servDNS.inc:445
+#: admin/systems/services/dns/class_servDNS.inc:461
+#: admin/systems/services/dns/class_servDNS.inc:486
+#: admin/systems/services/dns/class_servDNS.inc:497
+#: admin/systems/services/dns/class_servDNS.inc:530
+#: admin/systems/services/dns/class_DNS.inc:748
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP fout:"
 
-#: admin/systems/services/dns/class_servDNS.inc:580
+#: admin/systems/services/dns/class_servDNS.inc:570
 msgid "Services"
 msgstr "Services"
 
-#: admin/systems/services/dns/class_servDNS.inc:588
+#: admin/systems/services/dns/class_servDNS.inc:578
 #, fuzzy
 msgid "Start service"
 msgstr "Voeg DNS service toe"
 
-#: admin/systems/services/dns/class_servDNS.inc:589
+#: admin/systems/services/dns/class_servDNS.inc:579
 #, fuzzy
 msgid "Stop service"
 msgstr "Voeg DNS service toe"
 
-#: admin/systems/services/dns/class_servDNS.inc:590
+#: admin/systems/services/dns/class_servDNS.inc:580
 #, fuzzy
 msgid "Restart service"
 msgstr "Voeg DNS service toe"
 
-#: admin/systems/services/dns/class_servDNS.inc:595
+#: admin/systems/services/dns/class_servDNS.inc:585
 #, fuzzy
 msgid "Zone entry editor"
 msgstr "Zone records"
 
-#: admin/systems/services/dns/class_servDNS.inc:596
+#: admin/systems/services/dns/class_servDNS.inc:586
 #, fuzzy
 msgid "Primary dns server"
 msgstr "Primaire DNS server voor deze zone"
 
-#: admin/systems/services/dns/class_servDNS.inc:597
+#: admin/systems/services/dns/class_servDNS.inc:587
 #: admin/systems/services/dns/servdnseditzone.tpl:80
 msgid "Mail address"
 msgstr "E-mail adres"
 
-#: admin/systems/services/dns/class_servDNS.inc:603
+#: admin/systems/services/dns/class_servDNS.inc:593
 #, fuzzy
 msgid "MX records"
 msgstr "MX records"
 
-#: admin/systems/services/dns/class_servDNS.inc:604
+#: admin/systems/services/dns/class_servDNS.inc:594
 #: admin/systems/services/dns/servdnseditzone.tpl:48
 msgid "Zone records"
 msgstr "Zone records"
@@ -307,25 +286,87 @@ msgstr "Kan '%s' niet aanmaken. De gewenste naam bestaat al."
 msgid "Entry '%s' is used more than once."
 msgstr "De naam '%s' wordt meer dan een maal gebruikt."
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:299
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:302
 #, fuzzy, php-format
 msgid "%s records cannot be used more than once."
 msgstr "De naam '%s' wordt meer dan een maal gebruikt."
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:306
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:309
 #, fuzzy, php-format
 msgid "Please fix the empty %s record for entry '%s'."
 msgstr "Er is een lege '%s' voor host '%s'."
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:314
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:317
 #, php-format
 msgid "Please fix the duplicate %s record for entry '%s'."
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:454
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:457
 msgid "Remove"
 msgstr "Verwijderen"
 
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:509
+#, php-format
+msgid "The syntax of entry %s (record type %s, value %s) is invalid!"
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:509
+msgid "Example"
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:515
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:523
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:531
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:562
+msgid "Entry should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:518
+msgid "Value should be an IPv6 address."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:526
+msgid "Value should be an IPv4 address."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:534
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:552
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:557
+msgid "Value should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:541
+msgid "Value 1 should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:544
+msgid "Value 2 should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:547
+msgid "Value should be composed of 'preference target'."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:567
+msgid "Value 1 (priority) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:570
+msgid "Value 2 (weight) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:573
+msgid "Value 3 (port) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:576
+msgid "Value 4 (target) should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:579
+msgid "Value should be composed of 'priority weight port target'."
+msgstr ""
+
 #: admin/systems/services/dns/class_DNS.inc:161
 #, fuzzy, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -387,6 +428,26 @@ msgstr "MX records"
 msgid "Global zone records"
 msgstr "Globale zone records"
 
+#~ msgid "Remove DNS service"
+#~ msgstr "Verwijder DNS service"
+
+#~ 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."
+
+#~ msgid "Add DNS service"
+#~ msgstr "Voeg DNS service toe"
+
+#~ 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."
+
 #, fuzzy
 #~ msgid "Service start"
 #~ msgstr "Services"
diff --git a/gosa-plugins/dns/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/dns/locale/pl/LC_MESSAGES/messages.po
index 99230ef03..4f6cf234c 100644
--- a/gosa-plugins/dns/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dns/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2009-09-05 15:27+0100\n"
 "Last-Translator: Piort Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -43,8 +43,8 @@ msgid "Zones"
 msgstr "Strefy"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:249
-#: admin/systems/services/dns/class_servDNS.inc:184
-#: admin/systems/services/dns/class_servDNS.inc:345
+#: admin/systems/services/dns/class_servDNS.inc:174
+#: admin/systems/services/dns/class_servDNS.inc:335
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:220
 #: admin/systems/services/dns/class_DNS.inc:161
 #: admin/systems/services/dns/class_DNS.inc:166
@@ -61,21 +61,21 @@ msgid "Down"
 msgstr "W dół"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:350
-#: admin/systems/services/dns/class_servDNSeditZone.inc:586
+#: admin/systems/services/dns/class_servDNSeditZone.inc:588
 msgid "Delete"
 msgstr "Usuń"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:412
 #: admin/systems/services/dns/class_servDNSeditZone.inc:417
 #: admin/systems/services/dns/class_servDNSeditZone.inc:425
-#: admin/systems/services/dns/class_servDNS.inc:592
+#: admin/systems/services/dns/class_servDNS.inc:582
 #: admin/systems/services/dns/servdnseditzone.tpl:7
 msgid "Zone name"
 msgstr "Nazwa strefy"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:421
-#: admin/systems/services/dns/class_servDNS.inc:279
-#: admin/systems/services/dns/class_servDNS.inc:593
+#: admin/systems/services/dns/class_servDNS.inc:269
+#: admin/systems/services/dns/class_servDNS.inc:583
 msgid "Reverse zone"
 msgstr "Strefa odwrotna"
 
@@ -85,12 +85,12 @@ msgid "Only lowercase allowed"
 msgstr "Tylko małe liter są dozwolone"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:429
-#: admin/systems/services/dns/class_servDNS.inc:598
+#: admin/systems/services/dns/class_servDNS.inc:588
 msgid "Serial"
 msgstr "Szeregowy"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:433
-#: admin/systems/services/dns/class_servDNS.inc:599
+#: admin/systems/services/dns/class_servDNS.inc:589
 #: admin/systems/services/dns/servdnseditzone.tpl:102
 msgid "Refresh"
 msgstr "Odśwież"
@@ -100,13 +100,13 @@ msgid "Time to life"
 msgstr "Czas życia"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:441
-#: admin/systems/services/dns/class_servDNS.inc:601
+#: admin/systems/services/dns/class_servDNS.inc:591
 #: admin/systems/services/dns/servdnseditzone.tpl:120
 msgid "Expire"
 msgstr "Wygasa"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:445
-#: admin/systems/services/dns/class_servDNS.inc:600
+#: admin/systems/services/dns/class_servDNS.inc:590
 #: admin/systems/services/dns/servdnseditzone.tpl:111
 msgid "Retry"
 msgstr "Ponawia"
@@ -126,12 +126,12 @@ msgid ""
 msgstr "Podany adres sieciowe i klasa sieciowa (%s/%s) nie zgadzają się!"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:498
-#: admin/systems/services/dns/class_servDNS.inc:594
+#: admin/systems/services/dns/class_servDNS.inc:584
 msgid "Network class"
 msgstr "Klasa sieciowa"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:592
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:452
+#: admin/systems/services/dns/class_servDNSeditZone.inc:594
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:455
 msgid "Add"
 msgstr "Dodaj"
 
@@ -161,9 +161,9 @@ msgid "Create a new DNS zone entry"
 msgstr "Utwórz nowy wpis strefy DNS"
 
 #: admin/systems/services/dns/class_servDNS.inc:31
-#: admin/systems/services/dns/class_servDNS.inc:550
-#: admin/systems/services/dns/class_servDNS.inc:579
-#: admin/systems/services/dns/class_servDNS.inc:580
+#: admin/systems/services/dns/class_servDNS.inc:540
+#: admin/systems/services/dns/class_servDNS.inc:569
+#: admin/systems/services/dns/class_servDNS.inc:570
 msgid "DNS service"
 msgstr "Usługa DNS"
 
@@ -180,81 +180,64 @@ msgstr ""
 "Migracja rozpocznie się po zapisaniu tego systemu. Aby anulować użyj "
 "przycisku Anuluj poniżej."
 
-#: admin/systems/services/dns/class_servDNS.inc:166
-msgid "Remove DNS service"
-msgstr "Usuń usługę DNS"
-
-#: admin/systems/services/dns/class_servDNS.inc:167
-msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
-msgstr "Ten serwer posiada cechy DNS. Można je wyłączyć klikając poniżej"
-
-#: admin/systems/services/dns/class_servDNS.inc:169
-msgid "Add DNS service"
-msgstr "Dodaj usługę DNS"
-
-#: admin/systems/services/dns/class_servDNS.inc:170
-msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
-msgstr "Ten serwer nie posiada cech DNS. Można je włączyć klikając poniżej."
-
-#: admin/systems/services/dns/class_servDNS.inc:280
-#: admin/systems/services/dns/class_servDNS.inc:602
+#: admin/systems/services/dns/class_servDNS.inc:270
+#: admin/systems/services/dns/class_servDNS.inc:592
 #: admin/systems/services/dns/servdnseditzone.tpl:129
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/systems/services/dns/class_servDNS.inc:281
+#: admin/systems/services/dns/class_servDNS.inc:271
 msgid "Class"
 msgstr "Klasa"
 
-#: admin/systems/services/dns/class_servDNS.inc:345
+#: admin/systems/services/dns/class_servDNS.inc:335
 #, php-format
 msgid "Cannot delete the selected zone. It is still in use by '%s'"
 msgstr "Nie można usunąć wybranej strefy.Jest wciąż używana przez '%s'"
 
-#: admin/systems/services/dns/class_servDNS.inc:455
-#: admin/systems/services/dns/class_servDNS.inc:471
-#: admin/systems/services/dns/class_servDNS.inc:496
-#: admin/systems/services/dns/class_servDNS.inc:507
-#: admin/systems/services/dns/class_servDNS.inc:540
+#: admin/systems/services/dns/class_servDNS.inc:445
+#: admin/systems/services/dns/class_servDNS.inc:461
+#: admin/systems/services/dns/class_servDNS.inc:486
+#: admin/systems/services/dns/class_servDNS.inc:497
+#: admin/systems/services/dns/class_servDNS.inc:530
+#: admin/systems/services/dns/class_DNS.inc:748
 msgid "LDAP error"
 msgstr "błąd LDAP"
 
-#: admin/systems/services/dns/class_servDNS.inc:580
+#: admin/systems/services/dns/class_servDNS.inc:570
 msgid "Services"
 msgstr "Usługi"
 
-#: admin/systems/services/dns/class_servDNS.inc:588
+#: admin/systems/services/dns/class_servDNS.inc:578
 msgid "Start service"
 msgstr "Uruchom usługę"
 
-#: admin/systems/services/dns/class_servDNS.inc:589
+#: admin/systems/services/dns/class_servDNS.inc:579
 msgid "Stop service"
 msgstr "Zatrzymaj usługę"
 
-#: admin/systems/services/dns/class_servDNS.inc:590
+#: admin/systems/services/dns/class_servDNS.inc:580
 msgid "Restart service"
 msgstr "Restartuj usługę"
 
-#: admin/systems/services/dns/class_servDNS.inc:595
+#: admin/systems/services/dns/class_servDNS.inc:585
 msgid "Zone entry editor"
 msgstr "Edytor wpisów strefy"
 
-#: admin/systems/services/dns/class_servDNS.inc:596
+#: admin/systems/services/dns/class_servDNS.inc:586
 msgid "Primary dns server"
 msgstr "Podstawowy serwer DNS"
 
-#: admin/systems/services/dns/class_servDNS.inc:597
+#: admin/systems/services/dns/class_servDNS.inc:587
 #: admin/systems/services/dns/servdnseditzone.tpl:80
 msgid "Mail address"
 msgstr "Adres email"
 
-#: admin/systems/services/dns/class_servDNS.inc:603
+#: admin/systems/services/dns/class_servDNS.inc:593
 msgid "MX records"
 msgstr "Rekordy MX"
 
-#: admin/systems/services/dns/class_servDNS.inc:604
+#: admin/systems/services/dns/class_servDNS.inc:594
 #: admin/systems/services/dns/servdnseditzone.tpl:48
 msgid "Zone records"
 msgstr "Rekordy strefy"
@@ -283,25 +266,87 @@ msgstr "Nie można utworzyć '%s'. Nazwa już istnieje."
 msgid "Entry '%s' is used more than once."
 msgstr "Wpis '%s' jest użyty więcej niż raz."
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:299
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:302
 #, php-format
 msgid "%s records cannot be used more than once."
 msgstr "Rerkordy '%s' nie mogą być użyte więcej niż raz."
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:306
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:309
 #, php-format
 msgid "Please fix the empty %s record for entry '%s'."
 msgstr "Proszę naprawić pusty '%s' dla wpisu '%s'."
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:314
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:317
 #, php-format
 msgid "Please fix the duplicate %s record for entry '%s'."
 msgstr "Proszę naprawić zdublowany %s rekord dla wpisu '%s'."
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:454
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:457
 msgid "Remove"
 msgstr "Usuń"
 
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:509
+#, php-format
+msgid "The syntax of entry %s (record type %s, value %s) is invalid!"
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:509
+msgid "Example"
+msgstr "Przykład"
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:515
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:523
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:531
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:562
+msgid "Entry should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:518
+msgid "Value should be an IPv6 address."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:526
+msgid "Value should be an IPv4 address."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:534
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:552
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:557
+msgid "Value should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:541
+msgid "Value 1 should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:544
+msgid "Value 2 should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:547
+msgid "Value should be composed of 'preference target'."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:567
+msgid "Value 1 (priority) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:570
+msgid "Value 2 (weight) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:573
+msgid "Value 3 (port) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:576
+msgid "Value 4 (target) should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:579
+msgid "Value should be composed of 'priority weight port target'."
+msgstr ""
+
 #: admin/systems/services/dns/class_DNS.inc:161
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -361,6 +406,22 @@ msgstr "Rekordy MX"
 msgid "Global zone records"
 msgstr "Globalne rekordy strefy"
 
+#~ msgid "Remove DNS service"
+#~ msgstr "Usuń usługę DNS"
+
+#~ msgid ""
+#~ "This server has DNS features enabled. You can disable them by clicking "
+#~ "below."
+#~ msgstr "Ten serwer posiada cechy DNS. Można je wyłączyć klikając poniżej"
+
+#~ msgid "Add DNS service"
+#~ msgstr "Dodaj usługę DNS"
+
+#~ msgid ""
+#~ "This server has DNS features disabled. You can enable them by clicking "
+#~ "below."
+#~ msgstr "Ten serwer nie posiada cech DNS. Można je włączyć klikając poniżej."
+
 #, fuzzy
 #~ msgid "Service start"
 #~ msgstr "Usługi"
diff --git a/gosa-plugins/dns/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/dns/locale/ru/LC_MESSAGES/messages.po
index a22e1381d..383bc2c76 100644
--- a/gosa-plugins/dns/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dns/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -48,8 +48,8 @@ msgid "Zones"
 msgstr "телефоны"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:249
-#: admin/systems/services/dns/class_servDNS.inc:184
-#: admin/systems/services/dns/class_servDNS.inc:345
+#: admin/systems/services/dns/class_servDNS.inc:174
+#: admin/systems/services/dns/class_servDNS.inc:335
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:220
 #: admin/systems/services/dns/class_DNS.inc:161
 #: admin/systems/services/dns/class_DNS.inc:166
@@ -67,22 +67,22 @@ msgid "Down"
 msgstr "Домен"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:350
-#: admin/systems/services/dns/class_servDNSeditZone.inc:586
+#: admin/systems/services/dns/class_servDNSeditZone.inc:588
 msgid "Delete"
 msgstr "Удалить"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:412
 #: admin/systems/services/dns/class_servDNSeditZone.inc:417
 #: admin/systems/services/dns/class_servDNSeditZone.inc:425
-#: admin/systems/services/dns/class_servDNS.inc:592
+#: admin/systems/services/dns/class_servDNS.inc:582
 #: admin/systems/services/dns/servdnseditzone.tpl:7
 #, fuzzy
 msgid "Zone name"
 msgstr "Название"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:421
-#: admin/systems/services/dns/class_servDNS.inc:279
-#: admin/systems/services/dns/class_servDNS.inc:593
+#: admin/systems/services/dns/class_servDNS.inc:269
+#: admin/systems/services/dns/class_servDNS.inc:583
 #, fuzzy
 msgid "Reverse zone"
 msgstr "Ссылки"
@@ -93,13 +93,13 @@ msgid "Only lowercase allowed"
 msgstr ""
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:429
-#: admin/systems/services/dns/class_servDNS.inc:598
+#: admin/systems/services/dns/class_servDNS.inc:588
 #, fuzzy
 msgid "Serial"
 msgstr "терминалы"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:433
-#: admin/systems/services/dns/class_servDNS.inc:599
+#: admin/systems/services/dns/class_servDNS.inc:589
 #: admin/systems/services/dns/servdnseditzone.tpl:102
 #, fuzzy
 msgid "Refresh"
@@ -111,14 +111,14 @@ msgid "Time to life"
 msgstr "Мобильный"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:441
-#: admin/systems/services/dns/class_servDNS.inc:601
+#: admin/systems/services/dns/class_servDNS.inc:591
 #: admin/systems/services/dns/servdnseditzone.tpl:120
 #, fuzzy
 msgid "Expire"
 msgstr "Экспорт"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:445
-#: admin/systems/services/dns/class_servDNS.inc:600
+#: admin/systems/services/dns/class_servDNS.inc:590
 #: admin/systems/services/dns/servdnseditzone.tpl:111
 msgid "Retry"
 msgstr "Повторить"
@@ -139,13 +139,13 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:498
-#: admin/systems/services/dns/class_servDNS.inc:594
+#: admin/systems/services/dns/class_servDNS.inc:584
 #, fuzzy
 msgid "Network class"
 msgstr "Сетевые устройства"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:592
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:452
+#: admin/systems/services/dns/class_servDNSeditZone.inc:594
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:455
 msgid "Add"
 msgstr "Добавить"
 
@@ -173,9 +173,9 @@ msgid "Create a new DNS zone entry"
 msgstr "Создание нового объекта в"
 
 #: admin/systems/services/dns/class_servDNS.inc:31
-#: admin/systems/services/dns/class_servDNS.inc:550
-#: admin/systems/services/dns/class_servDNS.inc:579
-#: admin/systems/services/dns/class_servDNS.inc:580
+#: admin/systems/services/dns/class_servDNS.inc:540
+#: admin/systems/services/dns/class_servDNS.inc:569
+#: admin/systems/services/dns/class_servDNS.inc:570
 #, fuzzy
 msgid "DNS service"
 msgstr "Добавить сервис DNS"
@@ -191,96 +191,73 @@ msgid ""
 "action, use the cancel button below."
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNS.inc:166
-msgid "Remove DNS service"
-msgstr "Удалить сервис DNS"
-
-#: admin/systems/services/dns/class_servDNS.inc:167
-#, fuzzy
-msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
-msgstr ""
-"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
-"ниже."
-
-#: admin/systems/services/dns/class_servDNS.inc:169
-msgid "Add DNS service"
-msgstr "Добавить сервис DNS"
-
-#: admin/systems/services/dns/class_servDNS.inc:170
-#, fuzzy
-msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
-msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
-
-#: admin/systems/services/dns/class_servDNS.inc:280
-#: admin/systems/services/dns/class_servDNS.inc:602
+#: admin/systems/services/dns/class_servDNS.inc:270
+#: admin/systems/services/dns/class_servDNS.inc:592
 #: admin/systems/services/dns/servdnseditzone.tpl:129
 msgid "TTL"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNS.inc:281
+#: admin/systems/services/dns/class_servDNS.inc:271
 #, fuzzy
 msgid "Class"
 msgstr "Выберите тип мыши"
 
-#: admin/systems/services/dns/class_servDNS.inc:345
+#: admin/systems/services/dns/class_servDNS.inc:335
 #, php-format
 msgid "Cannot delete the selected zone. It is still in use by '%s'"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNS.inc:455
-#: admin/systems/services/dns/class_servDNS.inc:471
-#: admin/systems/services/dns/class_servDNS.inc:496
-#: admin/systems/services/dns/class_servDNS.inc:507
-#: admin/systems/services/dns/class_servDNS.inc:540
+#: admin/systems/services/dns/class_servDNS.inc:445
+#: admin/systems/services/dns/class_servDNS.inc:461
+#: admin/systems/services/dns/class_servDNS.inc:486
+#: admin/systems/services/dns/class_servDNS.inc:497
+#: admin/systems/services/dns/class_servDNS.inc:530
+#: admin/systems/services/dns/class_DNS.inc:748
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
 
-#: admin/systems/services/dns/class_servDNS.inc:580
+#: admin/systems/services/dns/class_servDNS.inc:570
 msgid "Services"
 msgstr "Сервисы"
 
-#: admin/systems/services/dns/class_servDNS.inc:588
+#: admin/systems/services/dns/class_servDNS.inc:578
 #, fuzzy
 msgid "Start service"
 msgstr "Добавить сервис DNS"
 
-#: admin/systems/services/dns/class_servDNS.inc:589
+#: admin/systems/services/dns/class_servDNS.inc:579
 #, fuzzy
 msgid "Stop service"
 msgstr "Добавить сервис DNS"
 
-#: admin/systems/services/dns/class_servDNS.inc:590
+#: admin/systems/services/dns/class_servDNS.inc:580
 #, fuzzy
 msgid "Restart service"
 msgstr "Добавить сервис DNS"
 
-#: admin/systems/services/dns/class_servDNS.inc:595
+#: admin/systems/services/dns/class_servDNS.inc:585
 #, fuzzy
 msgid "Zone entry editor"
 msgstr "Каталог"
 
-#: admin/systems/services/dns/class_servDNS.inc:596
+#: admin/systems/services/dns/class_servDNS.inc:586
 #, fuzzy
 msgid "Primary dns server"
 msgstr "Основной адрес эл. почты для этой общей папки"
 
-#: admin/systems/services/dns/class_servDNS.inc:597
+#: admin/systems/services/dns/class_servDNS.inc:587
 #: admin/systems/services/dns/servdnseditzone.tpl:80
 #, fuzzy
 msgid "Mail address"
 msgstr "MAC-адрес"
 
-#: admin/systems/services/dns/class_servDNS.inc:603
+#: admin/systems/services/dns/class_servDNS.inc:593
 #, fuzzy
 msgid "MX records"
 msgstr "Каталог"
 
-#: admin/systems/services/dns/class_servDNS.inc:604
+#: admin/systems/services/dns/class_servDNS.inc:594
 #: admin/systems/services/dns/servdnseditzone.tpl:48
 #, fuzzy
 msgid "Zone records"
@@ -310,25 +287,87 @@ msgstr "Подразделение с таким именем уже сущес
 msgid "Entry '%s' is used more than once."
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:299
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:302
 #, php-format
 msgid "%s records cannot be used more than once."
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:306
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:309
 #, fuzzy, php-format
 msgid "Please fix the empty %s record for entry '%s'."
 msgstr "Метод '%s' не описан в вашем файле конфигурации."
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:314
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:317
 #, php-format
 msgid "Please fix the duplicate %s record for entry '%s'."
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:454
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:457
 msgid "Remove"
 msgstr "Удалить"
 
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:509
+#, php-format
+msgid "The syntax of entry %s (record type %s, value %s) is invalid!"
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:509
+msgid "Example"
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:515
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:523
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:531
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:562
+msgid "Entry should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:518
+msgid "Value should be an IPv6 address."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:526
+msgid "Value should be an IPv4 address."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:534
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:552
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:557
+msgid "Value should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:541
+msgid "Value 1 should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:544
+msgid "Value 2 should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:547
+msgid "Value should be composed of 'preference target'."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:567
+msgid "Value 1 (priority) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:570
+msgid "Value 2 (weight) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:573
+msgid "Value 3 (port) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:576
+msgid "Value 4 (target) should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:579
+msgid "Value should be composed of 'priority weight port target'."
+msgstr ""
+
 #: admin/systems/services/dns/class_DNS.inc:161
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -388,6 +427,28 @@ msgstr "Каталог"
 msgid "Global zone records"
 msgstr "Каталог"
 
+#~ msgid "Remove DNS service"
+#~ msgstr "Удалить сервис DNS"
+
+#, fuzzy
+#~ msgid ""
+#~ "This server has DNS features enabled. You can disable them by clicking "
+#~ "below."
+#~ msgstr ""
+#~ "В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
+#~ "ниже."
+
+#~ msgid "Add DNS service"
+#~ msgstr "Добавить сервис DNS"
+
+#, fuzzy
+#~ msgid ""
+#~ "This server has DNS features disabled. You can enable them by clicking "
+#~ "below."
+#~ msgstr ""
+#~ "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+#~ "ниже."
+
 #, fuzzy
 #~ msgid "Service start"
 #~ msgstr "Сервисы"
diff --git a/gosa-plugins/dns/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/dns/locale/zh/LC_MESSAGES/messages.po
index 8fa87d3de..20d6f90f0 100644
--- a/gosa-plugins/dns/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dns/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -48,8 +48,8 @@ msgid "Zones"
 msgstr "域"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:249
-#: admin/systems/services/dns/class_servDNS.inc:184
-#: admin/systems/services/dns/class_servDNS.inc:345
+#: admin/systems/services/dns/class_servDNS.inc:174
+#: admin/systems/services/dns/class_servDNS.inc:335
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:220
 #: admin/systems/services/dns/class_DNS.inc:161
 #: admin/systems/services/dns/class_DNS.inc:166
@@ -66,21 +66,21 @@ msgid "Down"
 msgstr "关闭"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:350
-#: admin/systems/services/dns/class_servDNSeditZone.inc:586
+#: admin/systems/services/dns/class_servDNSeditZone.inc:588
 msgid "Delete"
 msgstr "删除"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:412
 #: admin/systems/services/dns/class_servDNSeditZone.inc:417
 #: admin/systems/services/dns/class_servDNSeditZone.inc:425
-#: admin/systems/services/dns/class_servDNS.inc:592
+#: admin/systems/services/dns/class_servDNS.inc:582
 #: admin/systems/services/dns/servdnseditzone.tpl:7
 msgid "Zone name"
 msgstr "域名称"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:421
-#: admin/systems/services/dns/class_servDNS.inc:279
-#: admin/systems/services/dns/class_servDNS.inc:593
+#: admin/systems/services/dns/class_servDNS.inc:269
+#: admin/systems/services/dns/class_servDNS.inc:583
 msgid "Reverse zone"
 msgstr "反向解析域"
 
@@ -91,12 +91,12 @@ msgid "Only lowercase allowed"
 msgstr "只有小写字符串被允许作为域名。"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:429
-#: admin/systems/services/dns/class_servDNS.inc:598
+#: admin/systems/services/dns/class_servDNS.inc:588
 msgid "Serial"
 msgstr "串行"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:433
-#: admin/systems/services/dns/class_servDNS.inc:599
+#: admin/systems/services/dns/class_servDNS.inc:589
 #: admin/systems/services/dns/servdnseditzone.tpl:102
 msgid "Refresh"
 msgstr "刷新"
@@ -107,13 +107,13 @@ msgid "Time to life"
 msgstr "用户时区"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:441
-#: admin/systems/services/dns/class_servDNS.inc:601
+#: admin/systems/services/dns/class_servDNS.inc:591
 #: admin/systems/services/dns/servdnseditzone.tpl:120
 msgid "Expire"
 msgstr "过期"
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:445
-#: admin/systems/services/dns/class_servDNS.inc:600
+#: admin/systems/services/dns/class_servDNS.inc:590
 #: admin/systems/services/dns/servdnseditzone.tpl:111
 msgid "Retry"
 msgstr "重试"
@@ -133,13 +133,13 @@ msgid ""
 msgstr ""
 
 #: admin/systems/services/dns/class_servDNSeditZone.inc:498
-#: admin/systems/services/dns/class_servDNS.inc:594
+#: admin/systems/services/dns/class_servDNS.inc:584
 #, fuzzy
 msgid "Network class"
 msgstr "网络地址"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:592
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:452
+#: admin/systems/services/dns/class_servDNSeditZone.inc:594
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:455
 msgid "Add"
 msgstr "添加"
 
@@ -167,9 +167,9 @@ msgid "Create a new DNS zone entry"
 msgstr "创建一个新 DNS zone 条目"
 
 #: admin/systems/services/dns/class_servDNS.inc:31
-#: admin/systems/services/dns/class_servDNS.inc:550
-#: admin/systems/services/dns/class_servDNS.inc:579
-#: admin/systems/services/dns/class_servDNS.inc:580
+#: admin/systems/services/dns/class_servDNS.inc:540
+#: admin/systems/services/dns/class_servDNS.inc:569
+#: admin/systems/services/dns/class_servDNS.inc:570
 #, fuzzy
 msgid "DNS service"
 msgstr "添加 DNS 服务"
@@ -185,88 +185,71 @@ msgid ""
 "action, use the cancel button below."
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNS.inc:166
-msgid "Remove DNS service"
-msgstr "删除 DNS 服务"
-
-#: admin/systems/services/dns/class_servDNS.inc:167
-msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
-msgstr "该账号已经启用 DNS 功能。您可以点击下面按钮禁用。"
-
-#: admin/systems/services/dns/class_servDNS.inc:169
-msgid "Add DNS service"
-msgstr "添加 DNS 服务"
-
-#: admin/systems/services/dns/class_servDNS.inc:170
-msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
-msgstr "该账号已经禁用 DNS 功能。您可以点击下面按钮启用。"
-
-#: admin/systems/services/dns/class_servDNS.inc:280
-#: admin/systems/services/dns/class_servDNS.inc:602
+#: admin/systems/services/dns/class_servDNS.inc:270
+#: admin/systems/services/dns/class_servDNS.inc:592
 #: admin/systems/services/dns/servdnseditzone.tpl:129
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/systems/services/dns/class_servDNS.inc:281
+#: admin/systems/services/dns/class_servDNS.inc:271
 msgid "Class"
 msgstr "ç±»"
 
-#: admin/systems/services/dns/class_servDNS.inc:345
+#: admin/systems/services/dns/class_servDNS.inc:335
 #, fuzzy, php-format
 msgid "Cannot delete the selected zone. It is still in use by '%s'"
 msgstr "不能删除所选的域，因为它仍然被这些条目使用 '%s'"
 
-#: admin/systems/services/dns/class_servDNS.inc:455
-#: admin/systems/services/dns/class_servDNS.inc:471
-#: admin/systems/services/dns/class_servDNS.inc:496
-#: admin/systems/services/dns/class_servDNS.inc:507
-#: admin/systems/services/dns/class_servDNS.inc:540
+#: admin/systems/services/dns/class_servDNS.inc:445
+#: admin/systems/services/dns/class_servDNS.inc:461
+#: admin/systems/services/dns/class_servDNS.inc:486
+#: admin/systems/services/dns/class_servDNS.inc:497
+#: admin/systems/services/dns/class_servDNS.inc:530
+#: admin/systems/services/dns/class_DNS.inc:748
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
 
-#: admin/systems/services/dns/class_servDNS.inc:580
+#: admin/systems/services/dns/class_servDNS.inc:570
 msgid "Services"
 msgstr "服务"
 
-#: admin/systems/services/dns/class_servDNS.inc:588
+#: admin/systems/services/dns/class_servDNS.inc:578
 #, fuzzy
 msgid "Start service"
 msgstr "添加 DNS 服务"
 
-#: admin/systems/services/dns/class_servDNS.inc:589
+#: admin/systems/services/dns/class_servDNS.inc:579
 #, fuzzy
 msgid "Stop service"
 msgstr "添加 DNS 服务"
 
-#: admin/systems/services/dns/class_servDNS.inc:590
+#: admin/systems/services/dns/class_servDNS.inc:580
 #, fuzzy
 msgid "Restart service"
 msgstr "添加 DNS 服务"
 
-#: admin/systems/services/dns/class_servDNS.inc:595
+#: admin/systems/services/dns/class_servDNS.inc:585
 #, fuzzy
 msgid "Zone entry editor"
 msgstr "域记录"
 
-#: admin/systems/services/dns/class_servDNS.inc:596
+#: admin/systems/services/dns/class_servDNS.inc:586
 #, fuzzy
 msgid "Primary dns server"
 msgstr "这个域的主要 dns 服务器"
 
-#: admin/systems/services/dns/class_servDNS.inc:597
+#: admin/systems/services/dns/class_servDNS.inc:587
 #: admin/systems/services/dns/servdnseditzone.tpl:80
 msgid "Mail address"
 msgstr "邮件地址"
 
-#: admin/systems/services/dns/class_servDNS.inc:603
+#: admin/systems/services/dns/class_servDNS.inc:593
 #, fuzzy
 msgid "MX records"
 msgstr "Mx记录"
 
-#: admin/systems/services/dns/class_servDNS.inc:604
+#: admin/systems/services/dns/class_servDNS.inc:594
 #: admin/systems/services/dns/servdnseditzone.tpl:48
 msgid "Zone records"
 msgstr "域记录"
@@ -295,25 +278,87 @@ msgstr "无法创建 '%s'，目标名称已经存在。"
 msgid "Entry '%s' is used more than once."
 msgstr "名称 '%s' 被使用超过了一次。"
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:299
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:302
 #, fuzzy, php-format
 msgid "%s records cannot be used more than once."
 msgstr "名称 '%s' 被使用超过了一次。"
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:306
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:309
 #, fuzzy, php-format
 msgid "Please fix the empty %s record for entry '%s'."
 msgstr "有一个空的 '%s'，为主机 '%s'。"
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:314
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:317
 #, php-format
 msgid "Please fix the duplicate %s record for entry '%s'."
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:454
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:457
 msgid "Remove"
 msgstr "删除"
 
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:509
+#, php-format
+msgid "The syntax of entry %s (record type %s, value %s) is invalid!"
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:509
+msgid "Example"
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:515
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:523
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:531
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:562
+msgid "Entry should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:518
+msgid "Value should be an IPv6 address."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:526
+msgid "Value should be an IPv4 address."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:534
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:552
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:557
+msgid "Value should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:541
+msgid "Value 1 should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:544
+msgid "Value 2 should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:547
+msgid "Value should be composed of 'preference target'."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:567
+msgid "Value 1 (priority) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:570
+msgid "Value 2 (weight) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:573
+msgid "Value 3 (port) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:576
+msgid "Value 4 (target) should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:579
+msgid "Value should be composed of 'priority weight port target'."
+msgstr ""
+
 #: admin/systems/services/dns/class_DNS.inc:161
 #, fuzzy, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -370,6 +415,22 @@ msgstr "Mx记录"
 msgid "Global zone records"
 msgstr "全局域记录"
 
+#~ msgid "Remove DNS service"
+#~ msgstr "删除 DNS 服务"
+
+#~ msgid ""
+#~ "This server has DNS features enabled. You can disable them by clicking "
+#~ "below."
+#~ msgstr "该账号已经启用 DNS 功能。您可以点击下面按钮禁用。"
+
+#~ msgid "Add DNS service"
+#~ msgstr "添加 DNS 服务"
+
+#~ msgid ""
+#~ "This server has DNS features disabled. You can enable them by clicking "
+#~ "below."
+#~ msgstr "该账号已经禁用 DNS 功能。您可以点击下面按钮启用。"
+
 #, fuzzy
 #~ msgid "Service start"
 #~ msgstr "服务"
diff --git a/gosa-plugins/fai/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/fai/locale/de/LC_MESSAGES/messages.po
index 2dc41a8da..ac8c16ac2 100644
--- a/gosa-plugins/fai/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/fai/locale/de/LC_MESSAGES/messages.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-19 14:24+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2009-08-04 13:57+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: de <kde-i18n-de@kde.org>\n"
@@ -50,11 +50,12 @@ msgstr "Ziel-Pfad"
 #: admin/fai/faiPartitionTableEntry.tpl:13 admin/fai/faiHookEntry.tpl:19
 #: admin/fai/class_faiVariableEntry.inc:138
 #: admin/fai/class_faiTemplate.inc:545 admin/fai/class_faiScript.inc:646
-#: admin/fai/class_faiScriptEntry.inc:190 admin/fai/faiTemplate.tpl:21
-#: admin/fai/class_faiPartitionTable.inc:789 admin/fai/faiVariableEntry.tpl:19
-#: admin/fai/class_faiHookEntry.inc:197 admin/fai/class_faiVariable.inc:398
-#: admin/fai/faiPartition.tpl:20 admin/fai/class_faiPackage.inc:658
-#: admin/fai/class_faiTemplateEntry.inc:300 admin/fai/faiPartitionTable.tpl:21
+#: admin/fai/class_faiScriptEntry.inc:190 admin/fai/fai-list.xml:49
+#: admin/fai/faiTemplate.tpl:21 admin/fai/class_faiPartitionTable.inc:789
+#: admin/fai/faiVariableEntry.tpl:19 admin/fai/class_faiHookEntry.inc:197
+#: admin/fai/class_faiVariable.inc:398 admin/fai/faiPartition.tpl:20
+#: admin/fai/class_faiPackage.inc:658 admin/fai/class_faiTemplateEntry.inc:300
+#: admin/fai/faiPartitionTable.tpl:21
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -141,21 +142,18 @@ msgstr "sticky"
 #: admin/fai/tabsScript.inc:33 admin/fai/tabsTemplate.inc:33
 #: admin/fai/class_faiHook.inc:239 admin/fai/class_faiDiskEntry.inc:427
 #: admin/fai/tabsPartition.inc:34 admin/fai/class_faiProfile.inc:262
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:636
-#: admin/fai/class_faiManagement.inc:642 admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiManagement.inc:972 admin/fai/class_faiManagement.inc:996
-#: admin/fai/class_faiManagement.inc:1245 admin/fai/class_faiTemplate.inc:212
-#: admin/fai/tabsVariable.inc:33 admin/fai/tabsPackage.inc:33
-#: admin/fai/class_faiScript.inc:229 admin/fai/class_FAI.inc:556
-#: admin/fai/class_faiScriptEntry.inc:59 admin/fai/class_faiScriptEntry.inc:62
-#: admin/fai/tabsHook.inc:32 admin/fai/class_faiPartitionTable.inc:244
+#: admin/fai/class_faiTemplate.inc:212 admin/fai/tabsVariable.inc:33
+#: admin/fai/tabsPackage.inc:33 admin/fai/class_faiScript.inc:229
+#: admin/fai/class_FAI.inc:556 admin/fai/class_faiScriptEntry.inc:59
+#: admin/fai/class_faiScriptEntry.inc:62 admin/fai/tabsHook.inc:32
+#: admin/fai/class_faiPartitionTable.inc:244
 #: admin/fai/class_faiPartitionTable.inc:307
 #: admin/fai/class_faiHookEntry.inc:62 admin/fai/class_faiHookEntry.inc:65
 #: admin/fai/class_faiVariable.inc:142 admin/fai/class_faiPackage.inc:348
 #: admin/fai/class_faiSummaryTab.inc:94 admin/fai/tabsProfile.inc:33
-#: admin/systems/services/repository/class_servRepository.inc:142
-#: admin/systems/services/repository/class_servRepository.inc:177
-#: admin/systems/services/repository/class_servRepository.inc:182
+#: admin/systems/services/repository/class_servRepository.inc:179
+#: admin/systems/services/repository/class_servRepository.inc:213
+#: admin/systems/services/repository/class_servRepository.inc:218
 #: admin/systems/services/repository/class_servRepositorySetup.inc:204
 msgid "Error"
 msgstr "Fehler"
@@ -177,8 +175,7 @@ msgstr ""
 "Die Datei-Kodierung hat sich von '%s' nach '%s' geändert. Wollen Sie sie "
 "speichern?"
 
-#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:542
-#: admin/fai/class_faiManagement.inc:1315 admin/fai/remove_branch.tpl:2
+#: admin/fai/remove.tpl:2 admin/fai/remove_branch.tpl:2
 msgid "Warning"
 msgstr "Warnung"
 
@@ -217,9 +214,7 @@ msgstr "Gerät"
 #: admin/fai/faiPackage.tpl:9 admin/fai/faiHook.tpl:9
 #: admin/fai/class_faiProfile.inc:395 admin/fai/class_faiProfile.inc:405
 #: admin/fai/class_faiProfile.inc:478 admin/fai/faiPartitionTableEntry.tpl:6
-#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiManagement.inc:636
-#: admin/fai/class_faiManagement.inc:642
-#: admin/fai/class_faiVariableEntry.inc:90
+#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiVariableEntry.inc:90
 #: admin/fai/class_faiVariableEntry.inc:99
 #: admin/fai/class_faiVariableEntry.inc:102
 #: admin/fai/class_faiVariableEntry.inc:137
@@ -230,8 +225,8 @@ msgstr "Gerät"
 #: admin/fai/class_faiScriptEntry.inc:137
 #: admin/fai/class_faiScriptEntry.inc:142
 #: admin/fai/class_faiScriptEntry.inc:145
-#: admin/fai/class_faiScriptEntry.inc:189 admin/fai/faiTemplate.tpl:9
-#: admin/fai/class_faiPartitionTable.inc:490
+#: admin/fai/class_faiScriptEntry.inc:189 admin/fai/fai-list.xml:41
+#: admin/fai/faiTemplate.tpl:9 admin/fai/class_faiPartitionTable.inc:490
 #: admin/fai/class_faiPartitionTable.inc:788 admin/fai/faiVariableEntry.tpl:9
 #: admin/fai/class_faiHookEntry.inc:145 admin/fai/class_faiHookEntry.inc:150
 #: admin/fai/class_faiHookEntry.inc:153 admin/fai/class_faiHookEntry.inc:196
@@ -240,7 +235,7 @@ msgstr "Gerät"
 #: admin/fai/class_faiPackage.inc:657 admin/fai/class_faiTemplateEntry.inc:233
 #: admin/fai/class_faiTemplateEntry.inc:299
 #: admin/fai/class_faiSummaryTab.inc:348 admin/fai/faiPartitionTable.tpl:9
-#: admin/systems/services/repository/class_servRepository.inc:177
+#: admin/systems/services/repository/class_servRepository.inc:213
 msgid "Name"
 msgstr "Name"
 
@@ -340,7 +335,7 @@ msgid "True"
 msgstr "wahr"
 
 #: admin/fai/class_faiPartitionTableEntry.inc:252
-#: admin/fai/class_faiPartitionTableEntry.inc:254
+#: admin/fai/class_faiPartitionTableEntry.inc:254 admin/fai/fai-list.xml:93
 #: admin/fai/class_divListFai.inc:178
 msgid "Remove"
 msgstr "Entfernen"
@@ -443,7 +438,7 @@ msgid "Choose a variable to delete or edit"
 msgstr "Wählen Sie eine Variable zum Entfernen oder Bearbeiten"
 
 #: admin/fai/faiVariable.tpl:53 admin/fai/class_faiHook.inc:312
-#: admin/fai/class_faiHook.inc:314
+#: admin/fai/class_faiHook.inc:314 admin/fai/fai-list.xml:86
 msgid "Edit"
 msgstr "Bearbeiten"
 
@@ -573,12 +568,12 @@ msgstr "Liste der Skripte"
 
 #: admin/fai/faiPackage.tpl:33
 #: admin/systems/services/repository/servRepositorySetup.tpl:1
-#: admin/systems/services/repository/class_servRepository.inc:343
+#: admin/systems/services/repository/class_servRepository.inc:406
 msgid "Repository"
 msgstr "Repository"
 
 #: admin/fai/faiPackage.tpl:37 admin/fai/branch_selector.tpl:25
-#: admin/fai/class_faiPackage.inc:663
+#: admin/fai/fai-filter.tpl:14 admin/fai/class_faiPackage.inc:663
 #: admin/systems/services/repository/class_divListRepositories.inc:23
 #: admin/systems/services/repository/servRepositorySetup.tpl:19
 #: admin/systems/services/repository/class_servRepositorySetup.inc:153
@@ -689,11 +684,19 @@ msgstr "Einen existierenden Task wählen"
 msgid "List of available packages"
 msgstr "Liste verfügbarer Pakete"
 
-#: admin/fai/faiPackageEntry.tpl:20 admin/fai/faiProfileEntry.tpl:21
+#: admin/fai/faiPackageEntry.tpl:17
+#, fuzzy
+msgid ""
+"The search returned too many results, only the first 200 entries are shown."
+msgstr ""
+"Die Suche ergab zu viele Treffer. Es werden nicht mehr als %s Einträge "
+"angezeigt!"
+
+#: admin/fai/faiPackageEntry.tpl:26 admin/fai/faiProfileEntry.tpl:21
 msgid "Information"
 msgstr "Information"
 
-#: admin/fai/faiPackageEntry.tpl:24
+#: admin/fai/faiPackageEntry.tpl:30
 msgid ""
 "This menu allows you to select multiple packages to add them to the "
 "currently edited package list."
@@ -701,141 +704,29 @@ msgstr ""
 "Dieses Menü erlaubt es Ihnen, Pakete auszuwählen und zur gegenwärtig "
 "bearbeiteten Paketliste hinzuzufügen."
 
-#: admin/fai/faiPackageEntry.tpl:30 admin/fai/faiProfileEntry.tpl:31
+#: admin/fai/faiPackageEntry.tpl:36 admin/fai/faiProfileEntry.tpl:31
 msgid "Filters"
 msgstr "Filter"
 
-#: admin/fai/faiPackageEntry.tpl:40 admin/fai/faiProfileEntry.tpl:54
+#: admin/fai/faiPackageEntry.tpl:46 admin/fai/faiProfileEntry.tpl:54
 #: admin/fai/faiProfileEntry.tpl:55
 msgid "Display objects matching"
 msgstr "Zeige die Objekte, auf die Folgendes passt"
 
-#: admin/fai/faiPackageEntry.tpl:44 admin/fai/faiProfileEntry.tpl:59
+#: admin/fai/faiPackageEntry.tpl:50 admin/fai/faiProfileEntry.tpl:59
 #: admin/systems/services/repository/class_divListRepositories.inc:26
 msgid "Regular expression for matching object names"
 msgstr "Regulärer Ausdruck zum Erkennen von Objekt-Namen"
 
-#: admin/fai/class_faiManagement.inc:25 admin/fai/main.inc:53
-#: admin/fai/main.inc:55
-msgid "Software deployment"
-msgstr "Software-Verteilung"
+#: admin/fai/class_faiManagement.inc:25
+#, fuzzy
+msgid "Roles"
+msgstr "Rolle"
 
 #: admin/fai/class_faiManagement.inc:26
-msgid "Manage software packages and deployment reciepes"
-msgstr "Software-Pakete und Installationsrichtlinien verwalten"
-
-#: admin/fai/class_faiManagement.inc:362 admin/fai/class_faiManagement.inc:524
-#: admin/fai/class_faiManagement.inc:671 admin/fai/class_faiManagement.inc:833
-#: admin/fai/class_faiManagement.inc:854 admin/fai/class_faiManagement.inc:898
-#: admin/fai/class_faiManagement.inc:915
-msgid "Permission error"
-msgstr "Berechtigungsfehler"
-
-#: admin/fai/class_faiManagement.inc:413
-msgid "Branch locked"
-msgstr "Teilbaum gesperrt"
-
-#: admin/fai/class_faiManagement.inc:413
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr ""
-"Die folgenden Einträge sind gesperrt, Sie können diese nicht entfernen: %s."
-
-#: admin/fai/class_faiManagement.inc:429
-msgid "FAI object"
-msgstr "FAI-Objekt"
-
-#: admin/fai/class_faiManagement.inc:521
-msgid "FAI branch/freeze"
-msgstr "FAI Teilbaum/Freeze"
-
-#: admin/fai/class_faiManagement.inc:524
-msgid "You have no permission to delete this release!"
-msgstr "Sie haben keine Berechtigung, dieses Release zu löschen!"
-
-#: admin/fai/class_faiManagement.inc:542
-msgid "Release remove aborted because the release name check failed!"
-msgstr ""
-"Das Entfernen der Release ist aufgrund einer fehlgeschlagenen "
-"Namensüberprüfung fehlgeschlagen!"
-
-#: admin/fai/class_faiManagement.inc:671 admin/fai/class_faiManagement.inc:833
-#: admin/fai/class_faiManagement.inc:854
-msgid "Branch"
-msgstr "Teilbaum"
-
-#: admin/fai/class_faiManagement.inc:779
-#: admin/fai/class_faiManagement.inc:1054
-#: admin/fai/class_faiManagement.inc:1060
-msgid "Continue"
-msgstr "Fortsetzen"
-
-#: admin/fai/class_faiManagement.inc:810
-#: admin/fai/class_faiPackageEntry.inc:53
-#: admin/fai/class_faiPackageEntry.inc:193 admin/fai/class_FAI.inc:574
-#: admin/fai/class_faiPackageConfiguration.inc:35
-#: admin/fai/class_faiPackage.inc:258 admin/fai/class_faiPackage.inc:554
-#: admin/systems/services/repository/class_servRepository.inc:326
-msgid "Service infrastructure"
-msgstr "Dienst-Infrastruktur"
-
-#: admin/fai/class_faiManagement.inc:815 admin/fai/class_FAI.inc:1178
-msgid "Fatal error"
-msgstr "Schwerer Fehler"
-
-#: admin/fai/class_faiManagement.inc:875
-msgid "partition table"
-msgstr "Partitionstabelle"
-
-#: admin/fai/class_faiManagement.inc:876
-msgid "script"
-msgstr "Skript"
-
-#: admin/fai/class_faiManagement.inc:877
-msgid "hook"
-msgstr "Hook"
-
-#: admin/fai/class_faiManagement.inc:878
-msgid "variable"
-msgstr "Variable"
-
-#: admin/fai/class_faiManagement.inc:879
-msgid "template"
-msgstr "Vorlage"
-
-#: admin/fai/class_faiManagement.inc:880
-msgid "package list"
-msgstr "Paketliste"
-
-#: admin/fai/class_faiManagement.inc:898 admin/fai/class_faiManagement.inc:915
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr ""
-"Sie besitzen keine Berechtigung, um ein Objekt des Typs '%s' zu erstellen!"
-
-#: admin/fai/class_faiManagement.inc:915
-msgid "profile"
-msgstr "Profil"
-
-#: admin/fai/class_faiManagement.inc:1315
-msgid ""
-"The selected release is not available anymore. All triggered actions are "
-"skipped."
-msgstr ""
-"Die ausgewählte Release ist nicht mehr verfügbar. Alle ausgelösten "
-"Ereignisse werden ignoriert."
-
-#: admin/fai/class_faiManagement.inc:1462
-msgid "FAI releases"
-msgstr "FAI Releases"
-
-#: admin/fai/class_faiManagement.inc:1463
-msgid "FAI release management"
-msgstr "FAI Release-Verwaltung"
-
-#: admin/fai/class_faiManagement.inc:1468
-msgid "FAI"
-msgstr "FAI"
+#, fuzzy
+msgid "Role management"
+msgstr "ACL-Verwaltung"
 
 #: admin/fai/class_faiVariableEntry.inc:94
 msgid "Content"
@@ -881,6 +772,14 @@ msgstr "Nur Lesen"
 msgid "Please enter your search string here"
 msgstr "Bitte geben Sie hier einen Such-Text ein."
 
+#: admin/fai/class_faiPackageEntry.inc:53
+#: admin/fai/class_faiPackageEntry.inc:195 admin/fai/class_FAI.inc:574
+#: admin/fai/class_faiPackageConfiguration.inc:35
+#: admin/fai/class_faiPackage.inc:258 admin/fai/class_faiPackage.inc:554
+#: admin/systems/services/repository/class_servRepository.inc:362
+msgid "Service infrastructure"
+msgstr "Dienst-Infrastruktur"
+
 #: admin/fai/class_faiPackageEntry.inc:103
 msgid ""
 "This list displays all assigned package names for this repository settings."
@@ -1064,6 +963,10 @@ msgstr ""
 msgid "Error while fetching source dn - aborted!"
 msgstr "Fehler beim Abrufen des Quell-DN, der Vorgang wurde abgebrochen!"
 
+#: admin/fai/class_FAI.inc:1178
+msgid "Fatal error"
+msgstr "Schwerer Fehler"
+
 #: admin/fai/class_FAI.inc:1179
 #, php-format
 msgid ""
@@ -1087,6 +990,37 @@ msgstr "FAI Skript-Eintrag"
 msgid "Script Priority"
 msgstr "Skript-Priorität"
 
+#: admin/fai/fai-list.xml:11
+msgid "List of fai stuff!!!!!"
+msgstr ""
+
+#: admin/fai/fai-list.xml:15
+msgid "FAI"
+msgstr "FAI"
+
+#: admin/fai/fai-list.xml:57 admin/fai/class_divListFai.inc:55
+#: admin/fai/class_divListFai.inc:138
+msgid "Actions"
+msgstr "Aktionen"
+
+#: admin/fai/fai-list.xml:68 admin/fai/class_divListFai.inc:140
+msgid "Create"
+msgstr "Anlegen"
+
+#: admin/fai/fai-list.xml:74
+msgid "Role"
+msgstr "Rolle"
+
+#: admin/fai/fai-list.xml:125
+#, fuzzy
+msgid "Edit role"
+msgstr "ACL-Rolle bearbeiten"
+
+#: admin/fai/fai-list.xml:138
+#, fuzzy
+msgid "Remove role"
+msgstr "Benutzer entfernen"
+
 #: admin/fai/faiSummary.tpl:4
 msgid "FAI object tree"
 msgstr "FAI-Objekthierarchie"
@@ -1246,7 +1180,7 @@ msgid "FAI partition table"
 msgstr "FAI-Partitionstabelle"
 
 #: admin/fai/branch_selector.tpl:2
-#: admin/systems/services/repository/class_servRepository.inc:358
+#: admin/systems/services/repository/class_servRepository.inc:421
 msgid "Releases"
 msgstr "Releases"
 
@@ -1416,10 +1350,6 @@ msgstr "Alles auswählen"
 msgid "Class types"
 msgstr "Klassen-Typen"
 
-#: admin/fai/class_divListFai.inc:55 admin/fai/class_divListFai.inc:138
-msgid "Actions"
-msgstr "Aktionen"
-
 #: admin/fai/class_divListFai.inc:57 admin/fai/class_divListFai.inc:59
 #: admin/fai/class_divListFai.inc:61 admin/fai/class_divListFai.inc:63
 #: admin/fai/class_divListFai.inc:65 admin/fai/class_divListFai.inc:67
@@ -1477,10 +1407,6 @@ msgstr "Zeige Localboot-Produkte"
 msgid "Display users matching"
 msgstr "Zeige die Benutzer, auf die Folgendes passt"
 
-#: admin/fai/class_divListFai.inc:140
-msgid "Create"
-msgstr "Anlegen"
-
 #: admin/fai/class_divListFai.inc:155
 msgid "PT"
 msgstr "PT"
@@ -1590,6 +1516,11 @@ msgstr "Verschlüsselt"
 msgid "Tune options"
 msgstr "Optimierungs-Optionen"
 
+#: admin/fai/fai-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filter"
+
 #: admin/fai/class_faiPackage.inc:220
 msgid "Invalid package names"
 msgstr "Ungültiger Paketname"
@@ -1761,7 +1692,7 @@ msgstr ""
 #: admin/systems/services/repository/class_divListRepositories.inc:24
 #: admin/systems/services/repository/class_divListRepositories.inc:64
 #: admin/systems/services/repository/servRepositorySetup.tpl:39
-#: admin/systems/services/repository/class_servRepository.inc:360
+#: admin/systems/services/repository/class_servRepository.inc:423
 msgid "Sections"
 msgstr "Sektionen"
 
@@ -1770,27 +1701,103 @@ msgid "Add repository"
 msgstr "Repository hinzufügen"
 
 #: admin/systems/services/repository/servRepositorySetup.tpl:8
-#: admin/systems/services/repository/class_servRepository.inc:357
+#: admin/systems/services/repository/class_servRepository.inc:420
 msgid "Parent server"
 msgstr "Quell-Server"
 
 #: admin/systems/services/repository/servRepositorySetup.tpl:28
-#: admin/systems/services/repository/class_servRepository.inc:359
+#: admin/systems/services/repository/class_servRepository.inc:422
 #: admin/systems/services/repository/class_servRepositorySetup.inc:157
 msgid "URL"
 msgstr "URL"
 
 #: admin/systems/services/repository/class_servRepository.inc:26
-#: admin/systems/services/repository/class_servRepository.inc:308
 #: admin/systems/services/repository/class_servRepository.inc:344
+#: admin/systems/services/repository/class_servRepository.inc:388
+#: admin/systems/services/repository/class_servRepository.inc:407
 #: admin/systems/services/repository/class_servRepositorySetup.inc:204
 msgid "Repository service"
 msgstr "Repositorien-Dienst"
 
-#: admin/systems/services/repository/class_servRepository.inc:142
+#: admin/systems/services/repository/class_servRepository.inc:179
 msgid "FAI release"
 msgstr "FAI Release"
 
-#: admin/systems/services/repository/class_servRepository.inc:344
+#: admin/systems/services/repository/class_servRepository.inc:407
 msgid "Services"
 msgstr "Dienste"
+
+#~ msgid "Software deployment"
+#~ msgstr "Software-Verteilung"
+
+#~ msgid "Manage software packages and deployment reciepes"
+#~ msgstr "Software-Pakete und Installationsrichtlinien verwalten"
+
+#~ msgid "Permission error"
+#~ msgstr "Berechtigungsfehler"
+
+#~ msgid "Branch locked"
+#~ msgstr "Teilbaum gesperrt"
+
+#~ msgid "The following entries are locked, you can't remove them %s."
+#~ msgstr ""
+#~ "Die folgenden Einträge sind gesperrt, Sie können diese nicht entfernen: %"
+#~ "s."
+
+#~ msgid "FAI object"
+#~ msgstr "FAI-Objekt"
+
+#~ msgid "FAI branch/freeze"
+#~ msgstr "FAI Teilbaum/Freeze"
+
+#~ msgid "You have no permission to delete this release!"
+#~ msgstr "Sie haben keine Berechtigung, dieses Release zu löschen!"
+
+#~ msgid "Release remove aborted because the release name check failed!"
+#~ msgstr ""
+#~ "Das Entfernen der Release ist aufgrund einer fehlgeschlagenen "
+#~ "Namensüberprüfung fehlgeschlagen!"
+
+#~ msgid "Branch"
+#~ msgstr "Teilbaum"
+
+#~ msgid "Continue"
+#~ msgstr "Fortsetzen"
+
+#~ msgid "partition table"
+#~ msgstr "Partitionstabelle"
+
+#~ msgid "script"
+#~ msgstr "Skript"
+
+#~ msgid "hook"
+#~ msgstr "Hook"
+
+#~ msgid "variable"
+#~ msgstr "Variable"
+
+#~ msgid "template"
+#~ msgstr "Vorlage"
+
+#~ msgid "package list"
+#~ msgstr "Paketliste"
+
+#~ msgid "You have no permission to create a new %s!"
+#~ msgstr ""
+#~ "Sie besitzen keine Berechtigung, um ein Objekt des Typs '%s' zu erstellen!"
+
+#~ msgid "profile"
+#~ msgstr "Profil"
+
+#~ msgid ""
+#~ "The selected release is not available anymore. All triggered actions are "
+#~ "skipped."
+#~ msgstr ""
+#~ "Die ausgewählte Release ist nicht mehr verfügbar. Alle ausgelösten "
+#~ "Ereignisse werden ignoriert."
+
+#~ msgid "FAI releases"
+#~ msgstr "FAI Releases"
+
+#~ msgid "FAI release management"
+#~ msgstr "FAI Release-Verwaltung"
diff --git a/gosa-plugins/fai/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/fai/locale/es/LC_MESSAGES/messages.po
index b5cacb9eb..184f5c5fb 100644
--- a/gosa-plugins/fai/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/fai/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-19 14:24+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
@@ -45,11 +45,12 @@ msgstr ""
 #: admin/fai/faiPartitionTableEntry.tpl:13 admin/fai/faiHookEntry.tpl:19
 #: admin/fai/class_faiVariableEntry.inc:138
 #: admin/fai/class_faiTemplate.inc:545 admin/fai/class_faiScript.inc:646
-#: admin/fai/class_faiScriptEntry.inc:190 admin/fai/faiTemplate.tpl:21
-#: admin/fai/class_faiPartitionTable.inc:789 admin/fai/faiVariableEntry.tpl:19
-#: admin/fai/class_faiHookEntry.inc:197 admin/fai/class_faiVariable.inc:398
-#: admin/fai/faiPartition.tpl:20 admin/fai/class_faiPackage.inc:658
-#: admin/fai/class_faiTemplateEntry.inc:300 admin/fai/faiPartitionTable.tpl:21
+#: admin/fai/class_faiScriptEntry.inc:190 admin/fai/fai-list.xml:49
+#: admin/fai/faiTemplate.tpl:21 admin/fai/class_faiPartitionTable.inc:789
+#: admin/fai/faiVariableEntry.tpl:19 admin/fai/class_faiHookEntry.inc:197
+#: admin/fai/class_faiVariable.inc:398 admin/fai/faiPartition.tpl:20
+#: admin/fai/class_faiPackage.inc:658 admin/fai/class_faiTemplateEntry.inc:300
+#: admin/fai/faiPartitionTable.tpl:21
 msgid "Description"
 msgstr "Descripción"
 
@@ -149,21 +150,18 @@ msgstr "estático"
 #: admin/fai/tabsScript.inc:33 admin/fai/tabsTemplate.inc:33
 #: admin/fai/class_faiHook.inc:239 admin/fai/class_faiDiskEntry.inc:427
 #: admin/fai/tabsPartition.inc:34 admin/fai/class_faiProfile.inc:262
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:636
-#: admin/fai/class_faiManagement.inc:642 admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiManagement.inc:972 admin/fai/class_faiManagement.inc:996
-#: admin/fai/class_faiManagement.inc:1245 admin/fai/class_faiTemplate.inc:212
-#: admin/fai/tabsVariable.inc:33 admin/fai/tabsPackage.inc:33
-#: admin/fai/class_faiScript.inc:229 admin/fai/class_FAI.inc:556
-#: admin/fai/class_faiScriptEntry.inc:59 admin/fai/class_faiScriptEntry.inc:62
-#: admin/fai/tabsHook.inc:32 admin/fai/class_faiPartitionTable.inc:244
+#: admin/fai/class_faiTemplate.inc:212 admin/fai/tabsVariable.inc:33
+#: admin/fai/tabsPackage.inc:33 admin/fai/class_faiScript.inc:229
+#: admin/fai/class_FAI.inc:556 admin/fai/class_faiScriptEntry.inc:59
+#: admin/fai/class_faiScriptEntry.inc:62 admin/fai/tabsHook.inc:32
+#: admin/fai/class_faiPartitionTable.inc:244
 #: admin/fai/class_faiPartitionTable.inc:307
 #: admin/fai/class_faiHookEntry.inc:62 admin/fai/class_faiHookEntry.inc:65
 #: admin/fai/class_faiVariable.inc:142 admin/fai/class_faiPackage.inc:348
 #: admin/fai/class_faiSummaryTab.inc:94 admin/fai/tabsProfile.inc:33
-#: admin/systems/services/repository/class_servRepository.inc:142
-#: admin/systems/services/repository/class_servRepository.inc:177
-#: admin/systems/services/repository/class_servRepository.inc:182
+#: admin/systems/services/repository/class_servRepository.inc:179
+#: admin/systems/services/repository/class_servRepository.inc:213
+#: admin/systems/services/repository/class_servRepository.inc:218
 #: admin/systems/services/repository/class_servRepositorySetup.inc:204
 msgid "Error"
 msgstr "Error"
@@ -183,8 +181,7 @@ msgid ""
 "The file encodig has changed from '%s' to '%s'. Do you really want to save?"
 msgstr ""
 
-#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:542
-#: admin/fai/class_faiManagement.inc:1315 admin/fai/remove_branch.tpl:2
+#: admin/fai/remove.tpl:2 admin/fai/remove_branch.tpl:2
 msgid "Warning"
 msgstr "Aviso"
 
@@ -226,9 +223,7 @@ msgstr "Dispositivos"
 #: admin/fai/faiPackage.tpl:9 admin/fai/faiHook.tpl:9
 #: admin/fai/class_faiProfile.inc:395 admin/fai/class_faiProfile.inc:405
 #: admin/fai/class_faiProfile.inc:478 admin/fai/faiPartitionTableEntry.tpl:6
-#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiManagement.inc:636
-#: admin/fai/class_faiManagement.inc:642
-#: admin/fai/class_faiVariableEntry.inc:90
+#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiVariableEntry.inc:90
 #: admin/fai/class_faiVariableEntry.inc:99
 #: admin/fai/class_faiVariableEntry.inc:102
 #: admin/fai/class_faiVariableEntry.inc:137
@@ -239,8 +234,8 @@ msgstr "Dispositivos"
 #: admin/fai/class_faiScriptEntry.inc:137
 #: admin/fai/class_faiScriptEntry.inc:142
 #: admin/fai/class_faiScriptEntry.inc:145
-#: admin/fai/class_faiScriptEntry.inc:189 admin/fai/faiTemplate.tpl:9
-#: admin/fai/class_faiPartitionTable.inc:490
+#: admin/fai/class_faiScriptEntry.inc:189 admin/fai/fai-list.xml:41
+#: admin/fai/faiTemplate.tpl:9 admin/fai/class_faiPartitionTable.inc:490
 #: admin/fai/class_faiPartitionTable.inc:788 admin/fai/faiVariableEntry.tpl:9
 #: admin/fai/class_faiHookEntry.inc:145 admin/fai/class_faiHookEntry.inc:150
 #: admin/fai/class_faiHookEntry.inc:153 admin/fai/class_faiHookEntry.inc:196
@@ -249,7 +244,7 @@ msgstr "Dispositivos"
 #: admin/fai/class_faiPackage.inc:657 admin/fai/class_faiTemplateEntry.inc:233
 #: admin/fai/class_faiTemplateEntry.inc:299
 #: admin/fai/class_faiSummaryTab.inc:348 admin/fai/faiPartitionTable.tpl:9
-#: admin/systems/services/repository/class_servRepository.inc:177
+#: admin/systems/services/repository/class_servRepository.inc:213
 msgid "Name"
 msgstr "Nombre"
 
@@ -362,7 +357,7 @@ msgid "True"
 msgstr "Verdadero"
 
 #: admin/fai/class_faiPartitionTableEntry.inc:252
-#: admin/fai/class_faiPartitionTableEntry.inc:254
+#: admin/fai/class_faiPartitionTableEntry.inc:254 admin/fai/fai-list.xml:93
 #: admin/fai/class_divListFai.inc:178
 msgid "Remove"
 msgstr "Eliminar"
@@ -463,7 +458,7 @@ msgid "Choose a variable to delete or edit"
 msgstr ""
 
 #: admin/fai/faiVariable.tpl:53 admin/fai/class_faiHook.inc:312
-#: admin/fai/class_faiHook.inc:314
+#: admin/fai/class_faiHook.inc:314 admin/fai/fai-list.xml:86
 msgid "Edit"
 msgstr "Editar"
 
@@ -596,12 +591,12 @@ msgstr "Lista de usuarios"
 
 #: admin/fai/faiPackage.tpl:33
 #: admin/systems/services/repository/servRepositorySetup.tpl:1
-#: admin/systems/services/repository/class_servRepository.inc:343
+#: admin/systems/services/repository/class_servRepository.inc:406
 msgid "Repository"
 msgstr "Repositorio"
 
 #: admin/fai/faiPackage.tpl:37 admin/fai/branch_selector.tpl:25
-#: admin/fai/class_faiPackage.inc:663
+#: admin/fai/fai-filter.tpl:14 admin/fai/class_faiPackage.inc:663
 #: admin/systems/services/repository/class_divListRepositories.inc:23
 #: admin/systems/services/repository/servRepositorySetup.tpl:19
 #: admin/systems/services/repository/class_servRepositorySetup.inc:153
@@ -721,161 +716,48 @@ msgstr ""
 msgid "List of available packages"
 msgstr "Lista de categorías ACL disponibles"
 
-#: admin/fai/faiPackageEntry.tpl:20 admin/fai/faiProfileEntry.tpl:21
+#: admin/fai/faiPackageEntry.tpl:17
+#, fuzzy
+msgid ""
+"The search returned too many results, only the first 200 entries are shown."
+msgstr ""
+"La busqueda ha devuelto demasiados reultados.¡No se muestran mas de %s "
+"entradas!"
+
+#: admin/fai/faiPackageEntry.tpl:26 admin/fai/faiProfileEntry.tpl:21
 msgid "Information"
 msgstr "Información"
 
-#: admin/fai/faiPackageEntry.tpl:24
+#: admin/fai/faiPackageEntry.tpl:30
 #, fuzzy
 msgid ""
 "This menu allows you to select multiple packages to add them to the "
 "currently edited package list."
 msgstr "Este menú le permite editar y eliminar las acl seleccionadas."
 
-#: admin/fai/faiPackageEntry.tpl:30 admin/fai/faiProfileEntry.tpl:31
+#: admin/fai/faiPackageEntry.tpl:36 admin/fai/faiProfileEntry.tpl:31
 msgid "Filters"
 msgstr "Filtros"
 
-#: admin/fai/faiPackageEntry.tpl:40 admin/fai/faiProfileEntry.tpl:54
+#: admin/fai/faiPackageEntry.tpl:46 admin/fai/faiProfileEntry.tpl:54
 #: admin/fai/faiProfileEntry.tpl:55
 msgid "Display objects matching"
 msgstr "Mostrar objetos que coincidan"
 
-#: admin/fai/faiPackageEntry.tpl:44 admin/fai/faiProfileEntry.tpl:59
+#: admin/fai/faiPackageEntry.tpl:50 admin/fai/faiProfileEntry.tpl:59
 #: admin/systems/services/repository/class_divListRepositories.inc:26
 msgid "Regular expression for matching object names"
 msgstr "Expresiones regulares para buscar nombre de objetos"
 
-#: admin/fai/class_faiManagement.inc:25 admin/fai/main.inc:53
-#: admin/fai/main.inc:55
+#: admin/fai/class_faiManagement.inc:25
 #, fuzzy
-msgid "Software deployment"
-msgstr "Sistema / Departamento"
+msgid "Roles"
+msgstr "Rol"
 
 #: admin/fai/class_faiManagement.inc:26
-msgid "Manage software packages and deployment reciepes"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:362 admin/fai/class_faiManagement.inc:524
-#: admin/fai/class_faiManagement.inc:671 admin/fai/class_faiManagement.inc:833
-#: admin/fai/class_faiManagement.inc:854 admin/fai/class_faiManagement.inc:898
-#: admin/fai/class_faiManagement.inc:915
-#, fuzzy
-msgid "Permission error"
-msgstr "Permisos"
-
-#: admin/fai/class_faiManagement.inc:413
-#, fuzzy
-msgid "Branch locked"
-msgstr "Francés"
-
-#: admin/fai/class_faiManagement.inc:413
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:429
-#, fuzzy
-msgid "FAI object"
-msgstr "Objeto"
-
-#: admin/fai/class_faiManagement.inc:521
-msgid "FAI branch/freeze"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:524
-#, fuzzy
-msgid "You have no permission to delete this release!"
-msgstr "¡No tiene permisos para eliminar este componente!"
-
-#: admin/fai/class_faiManagement.inc:542
-msgid "Release remove aborted because the release name check failed!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:671 admin/fai/class_faiManagement.inc:833
-#: admin/fai/class_faiManagement.inc:854
-#, fuzzy
-msgid "Branch"
-msgstr "Francés"
-
-#: admin/fai/class_faiManagement.inc:779
-#: admin/fai/class_faiManagement.inc:1054
-#: admin/fai/class_faiManagement.inc:1060
-msgid "Continue"
-msgstr "Continuar"
-
-#: admin/fai/class_faiManagement.inc:810
-#: admin/fai/class_faiPackageEntry.inc:53
-#: admin/fai/class_faiPackageEntry.inc:193 admin/fai/class_FAI.inc:574
-#: admin/fai/class_faiPackageConfiguration.inc:35
-#: admin/fai/class_faiPackage.inc:258 admin/fai/class_faiPackage.inc:554
-#: admin/systems/services/repository/class_servRepository.inc:326
-#, fuzzy
-msgid "Service infrastructure"
-msgstr "error de infraestructura"
-
-#: admin/fai/class_faiManagement.inc:815 admin/fai/class_FAI.inc:1178
-#, fuzzy
-msgid "Fatal error"
-msgstr "Insertar separador"
-
-#: admin/fai/class_faiManagement.inc:875
-#, fuzzy
-msgid "partition table"
-msgstr "Variable"
-
-#: admin/fai/class_faiManagement.inc:876
-#, fuzzy
-msgid "script"
-msgstr "Descripción"
-
-#: admin/fai/class_faiManagement.inc:877
-msgid "hook"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:878
 #, fuzzy
-msgid "variable"
-msgstr "Variable"
-
-#: admin/fai/class_faiManagement.inc:879
-#, fuzzy
-msgid "template"
-msgstr "Plantilla"
-
-#: admin/fai/class_faiManagement.inc:880
-msgid "package list"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:898 admin/fai/class_faiManagement.inc:915
-#, fuzzy, php-format
-msgid "You have no permission to create a new %s!"
-msgstr "No tiene permisos para eliminar este departamento."
-
-#: admin/fai/class_faiManagement.inc:915
-#, fuzzy
-msgid "profile"
-msgstr "Abril"
-
-#: admin/fai/class_faiManagement.inc:1315
-msgid ""
-"The selected release is not available anymore. All triggered actions are "
-"skipped."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:1462
-msgid "FAI releases"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:1463
-#, fuzzy
-msgid "FAI release management"
-msgstr "Activar gestión de versiones FAI"
-
-#: admin/fai/class_faiManagement.inc:1468
-#, fuzzy
-msgid "FAI"
-msgstr "FAX"
+msgid "Role management"
+msgstr "Administración de ACL"
 
 #: admin/fai/class_faiVariableEntry.inc:94
 #, fuzzy
@@ -926,6 +808,15 @@ msgstr "Solo lectura"
 msgid "Please enter your search string here"
 msgstr "Por favor seleccione su idioma preferido"
 
+#: admin/fai/class_faiPackageEntry.inc:53
+#: admin/fai/class_faiPackageEntry.inc:195 admin/fai/class_FAI.inc:574
+#: admin/fai/class_faiPackageConfiguration.inc:35
+#: admin/fai/class_faiPackage.inc:258 admin/fai/class_faiPackage.inc:554
+#: admin/systems/services/repository/class_servRepository.inc:362
+#, fuzzy
+msgid "Service infrastructure"
+msgstr "error de infraestructura"
+
 #: admin/fai/class_faiPackageEntry.inc:103
 msgid ""
 "This list displays all assigned package names for this repository settings."
@@ -1119,6 +1010,11 @@ msgstr "No se puede crear '%s', el nombre de destino ya existe."
 msgid "Error while fetching source dn - aborted!"
 msgstr ""
 
+#: admin/fai/class_FAI.inc:1178
+#, fuzzy
+msgid "Fatal error"
+msgstr "Insertar separador"
+
 #: admin/fai/class_FAI.inc:1179
 #, php-format
 msgid ""
@@ -1143,6 +1039,38 @@ msgstr ""
 msgid "Script Priority"
 msgstr ""
 
+#: admin/fai/fai-list.xml:11
+msgid "List of fai stuff!!!!!"
+msgstr ""
+
+#: admin/fai/fai-list.xml:15
+#, fuzzy
+msgid "FAI"
+msgstr "FAX"
+
+#: admin/fai/fai-list.xml:57 admin/fai/class_divListFai.inc:55
+#: admin/fai/class_divListFai.inc:138
+msgid "Actions"
+msgstr "Acciones"
+
+#: admin/fai/fai-list.xml:68 admin/fai/class_divListFai.inc:140
+msgid "Create"
+msgstr "Crear"
+
+#: admin/fai/fai-list.xml:74
+msgid "Role"
+msgstr "Rol"
+
+#: admin/fai/fai-list.xml:125
+#, fuzzy
+msgid "Edit role"
+msgstr "Editar rol"
+
+#: admin/fai/fai-list.xml:138
+#, fuzzy
+msgid "Remove role"
+msgstr "Eliminar foto"
+
 #: admin/fai/faiSummary.tpl:4
 msgid "FAI object tree"
 msgstr ""
@@ -1307,7 +1235,7 @@ msgid "FAI partition table"
 msgstr ""
 
 #: admin/fai/branch_selector.tpl:2
-#: admin/systems/services/repository/class_servRepository.inc:358
+#: admin/systems/services/repository/class_servRepository.inc:421
 #, fuzzy
 msgid "Releases"
 msgstr "Versión"
@@ -1471,10 +1399,6 @@ msgstr "Seleccione todos"
 msgid "Class types"
 msgstr "Clase"
 
-#: admin/fai/class_divListFai.inc:55 admin/fai/class_divListFai.inc:138
-msgid "Actions"
-msgstr "Acciones"
-
 #: admin/fai/class_divListFai.inc:57 admin/fai/class_divListFai.inc:59
 #: admin/fai/class_divListFai.inc:61 admin/fai/class_divListFai.inc:63
 #: admin/fai/class_divListFai.inc:65 admin/fai/class_divListFai.inc:67
@@ -1541,10 +1465,6 @@ msgstr "Editar acl"
 msgid "Display users matching"
 msgstr "Mostrar usuarios que coincidan con"
 
-#: admin/fai/class_divListFai.inc:140
-msgid "Create"
-msgstr "Crear"
-
 #: admin/fai/class_divListFai.inc:155
 msgid "PT"
 msgstr ""
@@ -1667,6 +1587,11 @@ msgstr ""
 msgid "Tune options"
 msgstr "Opciones de registro de eventos"
 
+#: admin/fai/fai-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filtros"
+
 #: admin/fai/class_faiPackage.inc:220
 msgid "Invalid package names"
 msgstr ""
@@ -1853,7 +1778,7 @@ msgstr "Este menú le permite editar y eliminar las acl seleccionadas."
 #: admin/systems/services/repository/class_divListRepositories.inc:24
 #: admin/systems/services/repository/class_divListRepositories.inc:64
 #: admin/systems/services/repository/servRepositorySetup.tpl:39
-#: admin/systems/services/repository/class_servRepository.inc:360
+#: admin/systems/services/repository/class_servRepository.inc:423
 #, fuzzy
 msgid "Sections"
 msgstr "Sección"
@@ -1864,34 +1789,90 @@ msgid "Add repository"
 msgstr "Repositorio"
 
 #: admin/systems/services/repository/servRepositorySetup.tpl:8
-#: admin/systems/services/repository/class_servRepository.inc:357
+#: admin/systems/services/repository/class_servRepository.inc:420
 #, fuzzy
 msgid "Parent server"
 msgstr "Servidor"
 
 #: admin/systems/services/repository/servRepositorySetup.tpl:28
-#: admin/systems/services/repository/class_servRepository.inc:359
+#: admin/systems/services/repository/class_servRepository.inc:422
 #: admin/systems/services/repository/class_servRepositorySetup.inc:157
 msgid "URL"
 msgstr ""
 
 #: admin/systems/services/repository/class_servRepository.inc:26
-#: admin/systems/services/repository/class_servRepository.inc:308
 #: admin/systems/services/repository/class_servRepository.inc:344
+#: admin/systems/services/repository/class_servRepository.inc:388
+#: admin/systems/services/repository/class_servRepository.inc:407
 #: admin/systems/services/repository/class_servRepositorySetup.inc:204
 #, fuzzy
 msgid "Repository service"
 msgstr "Repositorio"
 
-#: admin/systems/services/repository/class_servRepository.inc:142
+#: admin/systems/services/repository/class_servRepository.inc:179
 #, fuzzy
 msgid "FAI release"
 msgstr "Clases FAI"
 
-#: admin/systems/services/repository/class_servRepository.inc:344
+#: admin/systems/services/repository/class_servRepository.inc:407
 msgid "Services"
 msgstr "Servicios"
 
+#, fuzzy
+#~ msgid "Software deployment"
+#~ msgstr "Sistema / Departamento"
+
+#, fuzzy
+#~ msgid "Permission error"
+#~ msgstr "Permisos"
+
+#, fuzzy
+#~ msgid "Branch locked"
+#~ msgstr "Francés"
+
+#, fuzzy
+#~ msgid "FAI object"
+#~ msgstr "Objeto"
+
+#, fuzzy
+#~ msgid "You have no permission to delete this release!"
+#~ msgstr "¡No tiene permisos para eliminar este componente!"
+
+#, fuzzy
+#~ msgid "Branch"
+#~ msgstr "Francés"
+
+#~ msgid "Continue"
+#~ msgstr "Continuar"
+
+#, fuzzy
+#~ msgid "partition table"
+#~ msgstr "Variable"
+
+#, fuzzy
+#~ msgid "script"
+#~ msgstr "Descripción"
+
+#, fuzzy
+#~ msgid "variable"
+#~ msgstr "Variable"
+
+#, fuzzy
+#~ msgid "template"
+#~ msgstr "Plantilla"
+
+#, fuzzy
+#~ msgid "You have no permission to create a new %s!"
+#~ msgstr "No tiene permisos para eliminar este departamento."
+
+#, fuzzy
+#~ msgid "profile"
+#~ msgstr "Abril"
+
+#, fuzzy
+#~ msgid "FAI release management"
+#~ msgstr "Activar gestión de versiones FAI"
+
 #, fuzzy
 #~ msgid "Partition start size"
 #~ msgstr "Variable"
diff --git a/gosa-plugins/fai/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/fai/locale/fr/LC_MESSAGES/messages.po
index 029230211..6fe77133b 100644
--- a/gosa-plugins/fai/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/fai/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-19 14:24+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2009-10-20 11:32+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -41,11 +41,12 @@ msgstr "Répertoire de destination"
 #: admin/fai/faiPartitionTableEntry.tpl:13 admin/fai/faiHookEntry.tpl:19
 #: admin/fai/class_faiVariableEntry.inc:138
 #: admin/fai/class_faiTemplate.inc:545 admin/fai/class_faiScript.inc:646
-#: admin/fai/class_faiScriptEntry.inc:190 admin/fai/faiTemplate.tpl:21
-#: admin/fai/class_faiPartitionTable.inc:789 admin/fai/faiVariableEntry.tpl:19
-#: admin/fai/class_faiHookEntry.inc:197 admin/fai/class_faiVariable.inc:398
-#: admin/fai/faiPartition.tpl:20 admin/fai/class_faiPackage.inc:658
-#: admin/fai/class_faiTemplateEntry.inc:300 admin/fai/faiPartitionTable.tpl:21
+#: admin/fai/class_faiScriptEntry.inc:190 admin/fai/fai-list.xml:49
+#: admin/fai/faiTemplate.tpl:21 admin/fai/class_faiPartitionTable.inc:789
+#: admin/fai/faiVariableEntry.tpl:19 admin/fai/class_faiHookEntry.inc:197
+#: admin/fai/class_faiVariable.inc:398 admin/fai/faiPartition.tpl:20
+#: admin/fai/class_faiPackage.inc:658 admin/fai/class_faiTemplateEntry.inc:300
+#: admin/fai/faiPartitionTable.tpl:21
 msgid "Description"
 msgstr "Description"
 
@@ -132,21 +133,18 @@ msgstr "permanent"
 #: admin/fai/tabsScript.inc:33 admin/fai/tabsTemplate.inc:33
 #: admin/fai/class_faiHook.inc:239 admin/fai/class_faiDiskEntry.inc:427
 #: admin/fai/tabsPartition.inc:34 admin/fai/class_faiProfile.inc:262
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:636
-#: admin/fai/class_faiManagement.inc:642 admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiManagement.inc:972 admin/fai/class_faiManagement.inc:996
-#: admin/fai/class_faiManagement.inc:1245 admin/fai/class_faiTemplate.inc:212
-#: admin/fai/tabsVariable.inc:33 admin/fai/tabsPackage.inc:33
-#: admin/fai/class_faiScript.inc:229 admin/fai/class_FAI.inc:556
-#: admin/fai/class_faiScriptEntry.inc:59 admin/fai/class_faiScriptEntry.inc:62
-#: admin/fai/tabsHook.inc:32 admin/fai/class_faiPartitionTable.inc:244
+#: admin/fai/class_faiTemplate.inc:212 admin/fai/tabsVariable.inc:33
+#: admin/fai/tabsPackage.inc:33 admin/fai/class_faiScript.inc:229
+#: admin/fai/class_FAI.inc:556 admin/fai/class_faiScriptEntry.inc:59
+#: admin/fai/class_faiScriptEntry.inc:62 admin/fai/tabsHook.inc:32
+#: admin/fai/class_faiPartitionTable.inc:244
 #: admin/fai/class_faiPartitionTable.inc:307
 #: admin/fai/class_faiHookEntry.inc:62 admin/fai/class_faiHookEntry.inc:65
 #: admin/fai/class_faiVariable.inc:142 admin/fai/class_faiPackage.inc:348
 #: admin/fai/class_faiSummaryTab.inc:94 admin/fai/tabsProfile.inc:33
-#: admin/systems/services/repository/class_servRepository.inc:142
-#: admin/systems/services/repository/class_servRepository.inc:177
-#: admin/systems/services/repository/class_servRepository.inc:182
+#: admin/systems/services/repository/class_servRepository.inc:179
+#: admin/systems/services/repository/class_servRepository.inc:213
+#: admin/systems/services/repository/class_servRepository.inc:218
 #: admin/systems/services/repository/class_servRepositorySetup.inc:204
 msgid "Error"
 msgstr "Erreur"
@@ -162,13 +160,13 @@ msgstr ""
 
 #: admin/fai/class_faiTemplateEdit.inc:60
 #, php-format
-msgid "The file encodig has changed from '%s' to '%s'. Do you really want to save?"
+msgid ""
+"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
 msgstr ""
 "L'encodage du fichier à changé de '%s' vers '%s', voulez vous réellement le "
 "sauver ?"
 
-#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:542
-#: admin/fai/class_faiManagement.inc:1315 admin/fai/remove_branch.tpl:2
+#: admin/fai/remove.tpl:2 admin/fai/remove_branch.tpl:2
 msgid "Warning"
 msgstr "Avertissement"
 
@@ -208,9 +206,7 @@ msgstr "Périphérique"
 #: admin/fai/faiPackage.tpl:9 admin/fai/faiHook.tpl:9
 #: admin/fai/class_faiProfile.inc:395 admin/fai/class_faiProfile.inc:405
 #: admin/fai/class_faiProfile.inc:478 admin/fai/faiPartitionTableEntry.tpl:6
-#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiManagement.inc:636
-#: admin/fai/class_faiManagement.inc:642
-#: admin/fai/class_faiVariableEntry.inc:90
+#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiVariableEntry.inc:90
 #: admin/fai/class_faiVariableEntry.inc:99
 #: admin/fai/class_faiVariableEntry.inc:102
 #: admin/fai/class_faiVariableEntry.inc:137
@@ -221,8 +217,8 @@ msgstr "Périphérique"
 #: admin/fai/class_faiScriptEntry.inc:137
 #: admin/fai/class_faiScriptEntry.inc:142
 #: admin/fai/class_faiScriptEntry.inc:145
-#: admin/fai/class_faiScriptEntry.inc:189 admin/fai/faiTemplate.tpl:9
-#: admin/fai/class_faiPartitionTable.inc:490
+#: admin/fai/class_faiScriptEntry.inc:189 admin/fai/fai-list.xml:41
+#: admin/fai/faiTemplate.tpl:9 admin/fai/class_faiPartitionTable.inc:490
 #: admin/fai/class_faiPartitionTable.inc:788 admin/fai/faiVariableEntry.tpl:9
 #: admin/fai/class_faiHookEntry.inc:145 admin/fai/class_faiHookEntry.inc:150
 #: admin/fai/class_faiHookEntry.inc:153 admin/fai/class_faiHookEntry.inc:196
@@ -231,7 +227,7 @@ msgstr "Périphérique"
 #: admin/fai/class_faiPackage.inc:657 admin/fai/class_faiTemplateEntry.inc:233
 #: admin/fai/class_faiTemplateEntry.inc:299
 #: admin/fai/class_faiSummaryTab.inc:348 admin/fai/faiPartitionTable.tpl:9
-#: admin/systems/services/repository/class_servRepository.inc:177
+#: admin/systems/services/repository/class_servRepository.inc:213
 msgid "Name"
 msgstr "Nom"
 
@@ -331,7 +327,7 @@ msgid "True"
 msgstr "Vrai"
 
 #: admin/fai/class_faiPartitionTableEntry.inc:252
-#: admin/fai/class_faiPartitionTableEntry.inc:254
+#: admin/fai/class_faiPartitionTableEntry.inc:254 admin/fai/fai-list.xml:93
 #: admin/fai/class_divListFai.inc:178
 msgid "Remove"
 msgstr "Supprimer"
@@ -434,7 +430,7 @@ msgid "Choose a variable to delete or edit"
 msgstr "Choisissez une variable à effacer ou éditer"
 
 #: admin/fai/faiVariable.tpl:53 admin/fai/class_faiHook.inc:312
-#: admin/fai/class_faiHook.inc:314
+#: admin/fai/class_faiHook.inc:314 admin/fai/fai-list.xml:86
 msgid "Edit"
 msgstr "Editer"
 
@@ -481,7 +477,8 @@ msgstr "Taille"
 #: admin/fai/class_faiDiskEntry.inc:428
 #: admin/fai/class_faiPartitionTable.inc:245
 #, php-format
-msgid "The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
 msgstr ""
 "Ce disque ne peut pas être supprimé car il est utilisé par la définition de "
 "disque '%s' !"
@@ -560,12 +557,12 @@ msgstr "Liste des scripts"
 
 #: admin/fai/faiPackage.tpl:33
 #: admin/systems/services/repository/servRepositorySetup.tpl:1
-#: admin/systems/services/repository/class_servRepository.inc:343
+#: admin/systems/services/repository/class_servRepository.inc:406
 msgid "Repository"
 msgstr "Dépôt"
 
 #: admin/fai/faiPackage.tpl:37 admin/fai/branch_selector.tpl:25
-#: admin/fai/class_faiPackage.inc:663
+#: admin/fai/fai-filter.tpl:14 admin/fai/class_faiPackage.inc:663
 #: admin/systems/services/repository/class_divListRepositories.inc:23
 #: admin/systems/services/repository/servRepositorySetup.tpl:19
 #: admin/systems/services/repository/class_servRepositorySetup.inc:153
@@ -676,11 +673,18 @@ msgstr "Choisissez une tâche FAI existante"
 msgid "List of available packages"
 msgstr "Liste des paquets disponibles"
 
-#: admin/fai/faiPackageEntry.tpl:20 admin/fai/faiProfileEntry.tpl:21
+#: admin/fai/faiPackageEntry.tpl:17
+#, fuzzy
+msgid ""
+"The search returned too many results, only the first 200 entries are shown."
+msgstr ""
+"La recherche à retourné trop de résultats. Je n'affiche que %s entr§es !"
+
+#: admin/fai/faiPackageEntry.tpl:26 admin/fai/faiProfileEntry.tpl:21
 msgid "Information"
 msgstr "Information"
 
-#: admin/fai/faiPackageEntry.tpl:24
+#: admin/fai/faiPackageEntry.tpl:30
 msgid ""
 "This menu allows you to select multiple packages to add them to the "
 "currently edited package list."
@@ -688,139 +692,29 @@ msgstr ""
 "Ce menu vous permet de sélectionner de multiples paquets à ajouter a la "
 "liste en cours d'édition."
 
-#: admin/fai/faiPackageEntry.tpl:30 admin/fai/faiProfileEntry.tpl:31
+#: admin/fai/faiPackageEntry.tpl:36 admin/fai/faiProfileEntry.tpl:31
 msgid "Filters"
 msgstr "Filtres"
 
-#: admin/fai/faiPackageEntry.tpl:40 admin/fai/faiProfileEntry.tpl:54
+#: admin/fai/faiPackageEntry.tpl:46 admin/fai/faiProfileEntry.tpl:54
 #: admin/fai/faiProfileEntry.tpl:55
 msgid "Display objects matching"
 msgstr "Afficher les objets correspondants"
 
-#: admin/fai/faiPackageEntry.tpl:44 admin/fai/faiProfileEntry.tpl:59
+#: admin/fai/faiPackageEntry.tpl:50 admin/fai/faiProfileEntry.tpl:59
 #: admin/systems/services/repository/class_divListRepositories.inc:26
 msgid "Regular expression for matching object names"
 msgstr "Expression régulière pour trouver les objets correspondants"
 
-#: admin/fai/class_faiManagement.inc:25 admin/fai/main.inc:53
-#: admin/fai/main.inc:55
-msgid "Software deployment"
-msgstr "Déploiement de logiciels"
+#: admin/fai/class_faiManagement.inc:25
+#, fuzzy
+msgid "Roles"
+msgstr "Rôle"
 
 #: admin/fai/class_faiManagement.inc:26
-msgid "Manage software packages and deployment reciepes"
-msgstr "Gestion des paquets logiciels et des recettes de déploiement"
-
-#: admin/fai/class_faiManagement.inc:362 admin/fai/class_faiManagement.inc:524
-#: admin/fai/class_faiManagement.inc:671 admin/fai/class_faiManagement.inc:833
-#: admin/fai/class_faiManagement.inc:854 admin/fai/class_faiManagement.inc:898
-#: admin/fai/class_faiManagement.inc:915
-msgid "Permission error"
-msgstr "Erreur de permission"
-
-#: admin/fai/class_faiManagement.inc:413
-msgid "Branch locked"
-msgstr "Branche verrouillée"
-
-#: admin/fai/class_faiManagement.inc:413
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr "Les entrées suivantes %s sont vérouillées, vous ne pouvez pas les effacer."
-
-#: admin/fai/class_faiManagement.inc:429
-msgid "FAI object"
-msgstr "Objet FAI"
-
-#: admin/fai/class_faiManagement.inc:521
-msgid "FAI branch/freeze"
-msgstr "FAI branche/vérrouillée"
-
-#: admin/fai/class_faiManagement.inc:524
-msgid "You have no permission to delete this release!"
-msgstr "Vous n'êtes pas autorisé à supprimer cette version !"
-
-#: admin/fai/class_faiManagement.inc:542
-msgid "Release remove aborted because the release name check failed!"
-msgstr ""
-"Echec de l'effacement de la version, la vérification du nom de la version à "
-"échoué !"
-
-#: admin/fai/class_faiManagement.inc:671 admin/fai/class_faiManagement.inc:833
-#: admin/fai/class_faiManagement.inc:854
-msgid "Branch"
-msgstr "Branche"
-
-#: admin/fai/class_faiManagement.inc:779
-#: admin/fai/class_faiManagement.inc:1054
-#: admin/fai/class_faiManagement.inc:1060
-msgid "Continue"
-msgstr "Continuer"
-
-#: admin/fai/class_faiManagement.inc:810
-#: admin/fai/class_faiPackageEntry.inc:53
-#: admin/fai/class_faiPackageEntry.inc:193 admin/fai/class_FAI.inc:574
-#: admin/fai/class_faiPackageConfiguration.inc:35
-#: admin/fai/class_faiPackage.inc:258 admin/fai/class_faiPackage.inc:554
-#: admin/systems/services/repository/class_servRepository.inc:326
-msgid "Service infrastructure"
-msgstr "Service d'infrastructure"
-
-#: admin/fai/class_faiManagement.inc:815 admin/fai/class_FAI.inc:1178
-msgid "Fatal error"
-msgstr "Erreur Fatale"
-
-#: admin/fai/class_faiManagement.inc:875
-msgid "partition table"
-msgstr "table des partitions"
-
-#: admin/fai/class_faiManagement.inc:876
-msgid "script"
-msgstr "script"
-
-#: admin/fai/class_faiManagement.inc:877
-msgid "hook"
-msgstr "connexions"
-
-#: admin/fai/class_faiManagement.inc:878
-msgid "variable"
-msgstr "variable"
-
-#: admin/fai/class_faiManagement.inc:879
-msgid "template"
-msgstr "modèle"
-
-#: admin/fai/class_faiManagement.inc:880
-msgid "package list"
-msgstr "liste des paquets"
-
-#: admin/fai/class_faiManagement.inc:898 admin/fai/class_faiManagement.inc:915
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr "Vous n'êtes pas autorisé à créer un nouveau %s !."
-
-#: admin/fai/class_faiManagement.inc:915
-msgid "profile"
-msgstr "profil"
-
-#: admin/fai/class_faiManagement.inc:1315
-msgid ""
-"The selected release is not available anymore. All triggered actions are "
-"skipped."
-msgstr ""
-"La version sélectionnée n'est plus disponible. Toute les actions sont "
-"annulées."
-
-#: admin/fai/class_faiManagement.inc:1462
-msgid "FAI releases"
-msgstr "Versions FAI"
-
-#: admin/fai/class_faiManagement.inc:1463
-msgid "FAI release management"
-msgstr "Gestion des versions FAI"
-
-#: admin/fai/class_faiManagement.inc:1468
-msgid "FAI"
-msgstr "FAI"
+#, fuzzy
+msgid "Role management"
+msgstr "Gestion des ACL"
 
 #: admin/fai/class_faiVariableEntry.inc:94
 msgid "Content"
@@ -866,8 +760,17 @@ msgstr "Lecture seule"
 msgid "Please enter your search string here"
 msgstr "Veuillez indiquer une chaîne de caractères a rechercher"
 
+#: admin/fai/class_faiPackageEntry.inc:53
+#: admin/fai/class_faiPackageEntry.inc:195 admin/fai/class_FAI.inc:574
+#: admin/fai/class_faiPackageConfiguration.inc:35
+#: admin/fai/class_faiPackage.inc:258 admin/fai/class_faiPackage.inc:554
+#: admin/systems/services/repository/class_servRepository.inc:362
+msgid "Service infrastructure"
+msgstr "Service d'infrastructure"
+
 #: admin/fai/class_faiPackageEntry.inc:103
-msgid "This list displays all assigned package names for this repository settings."
+msgid ""
+"This list displays all assigned package names for this repository settings."
 msgstr "Cette liste affiche tout les paquets assigné à ce dépôt."
 
 #: admin/fai/paste_generic.tpl:1
@@ -1042,15 +945,21 @@ msgstr "Traitement en cours"
 
 #: admin/fai/class_FAI.inc:1084
 msgid "Could not create new release, the destination dn is already in use."
-msgstr "Impossible de créer une nouvelle version, le dn de destination existe déjà."
+msgstr ""
+"Impossible de créer une nouvelle version, le dn de destination existe déjà."
 
 #: admin/fai/class_FAI.inc:1097
 msgid "Error while fetching source dn - aborted!"
 msgstr "Une erreur s'est produite lors de la récupération du dn - Arrêt !"
 
+#: admin/fai/class_FAI.inc:1178
+msgid "Fatal error"
+msgstr "Erreur Fatale"
+
 #: admin/fai/class_FAI.inc:1179
 #, php-format
-msgid "Release creation failed due to ldap errors. Additional informations '%s'."
+msgid ""
+"Release creation failed due to ldap errors. Additional informations '%s'."
 msgstr ""
 "La création de la version à échoué du à des erreurs ldap. Information "
 "additionnelles '%s'."
@@ -1072,6 +981,37 @@ msgstr "Script FAI"
 msgid "Script Priority"
 msgstr "Priorité du script"
 
+#: admin/fai/fai-list.xml:11
+msgid "List of fai stuff!!!!!"
+msgstr ""
+
+#: admin/fai/fai-list.xml:15
+msgid "FAI"
+msgstr "FAI"
+
+#: admin/fai/fai-list.xml:57 admin/fai/class_divListFai.inc:55
+#: admin/fai/class_divListFai.inc:138
+msgid "Actions"
+msgstr "Actions"
+
+#: admin/fai/fai-list.xml:68 admin/fai/class_divListFai.inc:140
+msgid "Create"
+msgstr "Créer"
+
+#: admin/fai/fai-list.xml:74
+msgid "Role"
+msgstr "Rôle"
+
+#: admin/fai/fai-list.xml:125
+#, fuzzy
+msgid "Edit role"
+msgstr "Editer un rôle acl"
+
+#: admin/fai/fai-list.xml:138
+#, fuzzy
+msgid "Remove role"
+msgstr "Suppression de l'utilisateur"
+
 #: admin/fai/faiSummary.tpl:4
 msgid "FAI object tree"
 msgstr "Liste des objets FAI"
@@ -1220,7 +1160,8 @@ msgid "Raid arrays must contain at least two partitions!"
 msgstr "Les ensembles RAID doit contenir au moins 2 partitions !"
 
 #: admin/fai/class_faiPartition.inc:406
-msgid "Raid 0 arrays can only be realized with a combination of two partitions!"
+msgid ""
+"Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr "Les ensembles RAID 0 ne peuvent être réalisé qu'avec deux partitions !"
 
 #: admin/fai/class_faiPartitionTable.inc:781
@@ -1228,7 +1169,7 @@ msgid "FAI partition table"
 msgstr "Table des partitions FAI"
 
 #: admin/fai/branch_selector.tpl:2
-#: admin/systems/services/repository/class_servRepository.inc:358
+#: admin/systems/services/repository/class_servRepository.inc:421
 msgid "Releases"
 msgstr "Versions"
 
@@ -1396,10 +1337,6 @@ msgstr "Tout sélectionner"
 msgid "Class types"
 msgstr "Type de classes"
 
-#: admin/fai/class_divListFai.inc:55 admin/fai/class_divListFai.inc:138
-msgid "Actions"
-msgstr "Actions"
-
 #: admin/fai/class_divListFai.inc:57 admin/fai/class_divListFai.inc:59
 #: admin/fai/class_divListFai.inc:61 admin/fai/class_divListFai.inc:63
 #: admin/fai/class_divListFai.inc:65 admin/fai/class_divListFai.inc:67
@@ -1457,10 +1394,6 @@ msgstr "Montrer les produits localboot"
 msgid "Display users matching"
 msgstr "Afficher les utilisateurs correspondants"
 
-#: admin/fai/class_divListFai.inc:140
-msgid "Create"
-msgstr "Créer"
-
 #: admin/fai/class_divListFai.inc:155
 msgid "PT"
 msgstr "PT"
@@ -1570,6 +1503,11 @@ msgstr "Crypté"
 msgid "Tune options"
 msgstr "Options de tuning"
 
+#: admin/fai/fai-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filtres"
+
 #: admin/fai/class_faiPackage.inc:220
 msgid "Invalid package names"
 msgstr "Nom de paquets non valides"
@@ -1604,7 +1542,8 @@ msgid "Please select a least one package!"
 msgstr "Veuillez sélectionner au moins un paquet !"
 
 #: admin/fai/class_faiPackage.inc:522
-msgid "Please choose a valid release/section combination for your repository setup!"
+msgid ""
+"Please choose a valid release/section combination for your repository setup!"
 msgstr ""
 "Veuillez choisir une combinaison valable version/section pour la création de "
 "votre dépôt de paquets !"
@@ -1669,7 +1608,8 @@ msgstr "Source d'information FAI inconnue !"
 #: admin/fai/class_faiSummaryTab.inc:183
 #: admin/systems/services/repository/class_servRepository.inc:93
 msgid "You can't use this plugin until FAI is activated."
-msgstr "Vous ne pouvez pas utiliser cette extension tant que FAI n'est pas activé."
+msgstr ""
+"Vous ne pouvez pas utiliser cette extension tant que FAI n'est pas activé."
 
 #: admin/fai/class_faiSummaryTab.inc:225
 msgid "This object has no FAI classes assigned."
@@ -1721,7 +1661,11 @@ msgid ""
 "and requires choosing between specific options which cannot be presented "
 "here. The entered text needs to be one of the valid choices in order to take "
 "effect."
-msgstr "Cette question debconf est générée dynamiquement pendant l'installation du paquet et nécessite le choix entre différentes options qui ne peuvent pas être affichées ici. Le texte entré doit être un de ces choix pour être valide."
+msgstr ""
+"Cette question debconf est générée dynamiquement pendant l'installation du "
+"paquet et nécessite le choix entre différentes options qui ne peuvent pas "
+"être affichées ici. Le texte entré doit être un de ces choix pour être "
+"valide."
 
 #: admin/systems/services/repository/class_divListRepositories.inc:19
 msgid "List of configured repositories"
@@ -1729,12 +1673,13 @@ msgstr "Liste des dépôts configurés."
 
 #: admin/systems/services/repository/class_divListRepositories.inc:20
 msgid "This menu allows you to create, delete and edit repository settings."
-msgstr "Ce menu vous permet de créer, effacer et éditer les paramètres des dépôts."
+msgstr ""
+"Ce menu vous permet de créer, effacer et éditer les paramètres des dépôts."
 
 #: admin/systems/services/repository/class_divListRepositories.inc:24
 #: admin/systems/services/repository/class_divListRepositories.inc:64
 #: admin/systems/services/repository/servRepositorySetup.tpl:39
-#: admin/systems/services/repository/class_servRepository.inc:360
+#: admin/systems/services/repository/class_servRepository.inc:423
 msgid "Sections"
 msgstr "Sections"
 
@@ -1743,28 +1688,101 @@ msgid "Add repository"
 msgstr "Ajouter un dépôt"
 
 #: admin/systems/services/repository/servRepositorySetup.tpl:8
-#: admin/systems/services/repository/class_servRepository.inc:357
+#: admin/systems/services/repository/class_servRepository.inc:420
 msgid "Parent server"
 msgstr "Serveur parent"
 
 #: admin/systems/services/repository/servRepositorySetup.tpl:28
-#: admin/systems/services/repository/class_servRepository.inc:359
+#: admin/systems/services/repository/class_servRepository.inc:422
 #: admin/systems/services/repository/class_servRepositorySetup.inc:157
 msgid "URL"
 msgstr "URL"
 
 #: admin/systems/services/repository/class_servRepository.inc:26
-#: admin/systems/services/repository/class_servRepository.inc:308
 #: admin/systems/services/repository/class_servRepository.inc:344
+#: admin/systems/services/repository/class_servRepository.inc:388
+#: admin/systems/services/repository/class_servRepository.inc:407
 #: admin/systems/services/repository/class_servRepositorySetup.inc:204
 msgid "Repository service"
 msgstr "Service de dépôt"
 
-#: admin/systems/services/repository/class_servRepository.inc:142
+#: admin/systems/services/repository/class_servRepository.inc:179
 msgid "FAI release"
 msgstr "Version FAI"
 
-#: admin/systems/services/repository/class_servRepository.inc:344
+#: admin/systems/services/repository/class_servRepository.inc:407
 msgid "Services"
 msgstr "Services"
 
+#~ msgid "Software deployment"
+#~ msgstr "Déploiement de logiciels"
+
+#~ msgid "Manage software packages and deployment reciepes"
+#~ msgstr "Gestion des paquets logiciels et des recettes de déploiement"
+
+#~ msgid "Permission error"
+#~ msgstr "Erreur de permission"
+
+#~ msgid "Branch locked"
+#~ msgstr "Branche verrouillée"
+
+#~ msgid "The following entries are locked, you can't remove them %s."
+#~ msgstr ""
+#~ "Les entrées suivantes %s sont vérouillées, vous ne pouvez pas les effacer."
+
+#~ msgid "FAI object"
+#~ msgstr "Objet FAI"
+
+#~ msgid "FAI branch/freeze"
+#~ msgstr "FAI branche/vérrouillée"
+
+#~ msgid "You have no permission to delete this release!"
+#~ msgstr "Vous n'êtes pas autorisé à supprimer cette version !"
+
+#~ msgid "Release remove aborted because the release name check failed!"
+#~ msgstr ""
+#~ "Echec de l'effacement de la version, la vérification du nom de la version "
+#~ "à échoué !"
+
+#~ msgid "Branch"
+#~ msgstr "Branche"
+
+#~ msgid "Continue"
+#~ msgstr "Continuer"
+
+#~ msgid "partition table"
+#~ msgstr "table des partitions"
+
+#~ msgid "script"
+#~ msgstr "script"
+
+#~ msgid "hook"
+#~ msgstr "connexions"
+
+#~ msgid "variable"
+#~ msgstr "variable"
+
+#~ msgid "template"
+#~ msgstr "modèle"
+
+#~ msgid "package list"
+#~ msgstr "liste des paquets"
+
+#~ msgid "You have no permission to create a new %s!"
+#~ msgstr "Vous n'êtes pas autorisé à créer un nouveau %s !."
+
+#~ msgid "profile"
+#~ msgstr "profil"
+
+#~ msgid ""
+#~ "The selected release is not available anymore. All triggered actions are "
+#~ "skipped."
+#~ msgstr ""
+#~ "La version sélectionnée n'est plus disponible. Toute les actions sont "
+#~ "annulées."
+
+#~ msgid "FAI releases"
+#~ msgstr "Versions FAI"
+
+#~ msgid "FAI release management"
+#~ msgstr "Gestion des versions FAI"
diff --git a/gosa-plugins/fai/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/fai/locale/it/LC_MESSAGES/messages.po
index 0107353ff..e43c097b6 100644
--- a/gosa-plugins/fai/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/fai/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-19 14:24+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -44,11 +44,12 @@ msgstr "Destinazione"
 #: admin/fai/faiPartitionTableEntry.tpl:13 admin/fai/faiHookEntry.tpl:19
 #: admin/fai/class_faiVariableEntry.inc:138
 #: admin/fai/class_faiTemplate.inc:545 admin/fai/class_faiScript.inc:646
-#: admin/fai/class_faiScriptEntry.inc:190 admin/fai/faiTemplate.tpl:21
-#: admin/fai/class_faiPartitionTable.inc:789 admin/fai/faiVariableEntry.tpl:19
-#: admin/fai/class_faiHookEntry.inc:197 admin/fai/class_faiVariable.inc:398
-#: admin/fai/faiPartition.tpl:20 admin/fai/class_faiPackage.inc:658
-#: admin/fai/class_faiTemplateEntry.inc:300 admin/fai/faiPartitionTable.tpl:21
+#: admin/fai/class_faiScriptEntry.inc:190 admin/fai/fai-list.xml:49
+#: admin/fai/faiTemplate.tpl:21 admin/fai/class_faiPartitionTable.inc:789
+#: admin/fai/faiVariableEntry.tpl:19 admin/fai/class_faiHookEntry.inc:197
+#: admin/fai/class_faiVariable.inc:398 admin/fai/faiPartition.tpl:20
+#: admin/fai/class_faiPackage.inc:658 admin/fai/class_faiTemplateEntry.inc:300
+#: admin/fai/faiPartitionTable.tpl:21
 msgid "Description"
 msgstr "Descrizione"
 
@@ -149,21 +150,18 @@ msgstr "statico"
 #: admin/fai/tabsScript.inc:33 admin/fai/tabsTemplate.inc:33
 #: admin/fai/class_faiHook.inc:239 admin/fai/class_faiDiskEntry.inc:427
 #: admin/fai/tabsPartition.inc:34 admin/fai/class_faiProfile.inc:262
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:636
-#: admin/fai/class_faiManagement.inc:642 admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiManagement.inc:972 admin/fai/class_faiManagement.inc:996
-#: admin/fai/class_faiManagement.inc:1245 admin/fai/class_faiTemplate.inc:212
-#: admin/fai/tabsVariable.inc:33 admin/fai/tabsPackage.inc:33
-#: admin/fai/class_faiScript.inc:229 admin/fai/class_FAI.inc:556
-#: admin/fai/class_faiScriptEntry.inc:59 admin/fai/class_faiScriptEntry.inc:62
-#: admin/fai/tabsHook.inc:32 admin/fai/class_faiPartitionTable.inc:244
+#: admin/fai/class_faiTemplate.inc:212 admin/fai/tabsVariable.inc:33
+#: admin/fai/tabsPackage.inc:33 admin/fai/class_faiScript.inc:229
+#: admin/fai/class_FAI.inc:556 admin/fai/class_faiScriptEntry.inc:59
+#: admin/fai/class_faiScriptEntry.inc:62 admin/fai/tabsHook.inc:32
+#: admin/fai/class_faiPartitionTable.inc:244
 #: admin/fai/class_faiPartitionTable.inc:307
 #: admin/fai/class_faiHookEntry.inc:62 admin/fai/class_faiHookEntry.inc:65
 #: admin/fai/class_faiVariable.inc:142 admin/fai/class_faiPackage.inc:348
 #: admin/fai/class_faiSummaryTab.inc:94 admin/fai/tabsProfile.inc:33
-#: admin/systems/services/repository/class_servRepository.inc:142
-#: admin/systems/services/repository/class_servRepository.inc:177
-#: admin/systems/services/repository/class_servRepository.inc:182
+#: admin/systems/services/repository/class_servRepository.inc:179
+#: admin/systems/services/repository/class_servRepository.inc:213
+#: admin/systems/services/repository/class_servRepository.inc:218
 #: admin/systems/services/repository/class_servRepositorySetup.inc:204
 msgid "Error"
 msgstr ""
@@ -181,8 +179,7 @@ msgid ""
 "The file encodig has changed from '%s' to '%s'. Do you really want to save?"
 msgstr ""
 
-#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:542
-#: admin/fai/class_faiManagement.inc:1315 admin/fai/remove_branch.tpl:2
+#: admin/fai/remove.tpl:2 admin/fai/remove_branch.tpl:2
 msgid "Warning"
 msgstr "Attenzione"
 
@@ -217,9 +214,7 @@ msgstr "Dispositivi"
 #: admin/fai/faiPackage.tpl:9 admin/fai/faiHook.tpl:9
 #: admin/fai/class_faiProfile.inc:395 admin/fai/class_faiProfile.inc:405
 #: admin/fai/class_faiProfile.inc:478 admin/fai/faiPartitionTableEntry.tpl:6
-#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiManagement.inc:636
-#: admin/fai/class_faiManagement.inc:642
-#: admin/fai/class_faiVariableEntry.inc:90
+#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiVariableEntry.inc:90
 #: admin/fai/class_faiVariableEntry.inc:99
 #: admin/fai/class_faiVariableEntry.inc:102
 #: admin/fai/class_faiVariableEntry.inc:137
@@ -230,8 +225,8 @@ msgstr "Dispositivi"
 #: admin/fai/class_faiScriptEntry.inc:137
 #: admin/fai/class_faiScriptEntry.inc:142
 #: admin/fai/class_faiScriptEntry.inc:145
-#: admin/fai/class_faiScriptEntry.inc:189 admin/fai/faiTemplate.tpl:9
-#: admin/fai/class_faiPartitionTable.inc:490
+#: admin/fai/class_faiScriptEntry.inc:189 admin/fai/fai-list.xml:41
+#: admin/fai/faiTemplate.tpl:9 admin/fai/class_faiPartitionTable.inc:490
 #: admin/fai/class_faiPartitionTable.inc:788 admin/fai/faiVariableEntry.tpl:9
 #: admin/fai/class_faiHookEntry.inc:145 admin/fai/class_faiHookEntry.inc:150
 #: admin/fai/class_faiHookEntry.inc:153 admin/fai/class_faiHookEntry.inc:196
@@ -240,7 +235,7 @@ msgstr "Dispositivi"
 #: admin/fai/class_faiPackage.inc:657 admin/fai/class_faiTemplateEntry.inc:233
 #: admin/fai/class_faiTemplateEntry.inc:299
 #: admin/fai/class_faiSummaryTab.inc:348 admin/fai/faiPartitionTable.tpl:9
-#: admin/systems/services/repository/class_servRepository.inc:177
+#: admin/systems/services/repository/class_servRepository.inc:213
 msgid "Name"
 msgstr "Cognome"
 
@@ -357,7 +352,7 @@ msgid "True"
 msgstr "Futuro"
 
 #: admin/fai/class_faiPartitionTableEntry.inc:252
-#: admin/fai/class_faiPartitionTableEntry.inc:254
+#: admin/fai/class_faiPartitionTableEntry.inc:254 admin/fai/fai-list.xml:93
 #: admin/fai/class_divListFai.inc:178
 msgid "Remove"
 msgstr "Rimuovi"
@@ -464,7 +459,7 @@ msgid "Choose a variable to delete or edit"
 msgstr ""
 
 #: admin/fai/faiVariable.tpl:53 admin/fai/class_faiHook.inc:312
-#: admin/fai/class_faiHook.inc:314
+#: admin/fai/class_faiHook.inc:314 admin/fai/fai-list.xml:86
 msgid "Edit"
 msgstr "Modifica"
 
@@ -598,13 +593,13 @@ msgstr "Lista degli utenti"
 
 #: admin/fai/faiPackage.tpl:33
 #: admin/systems/services/repository/servRepositorySetup.tpl:1
-#: admin/systems/services/repository/class_servRepository.inc:343
+#: admin/systems/services/repository/class_servRepository.inc:406
 #, fuzzy
 msgid "Repository"
 msgstr "Riprova"
 
 #: admin/fai/faiPackage.tpl:37 admin/fai/branch_selector.tpl:25
-#: admin/fai/class_faiPackage.inc:663
+#: admin/fai/fai-filter.tpl:14 admin/fai/class_faiPackage.inc:663
 #: admin/systems/services/repository/class_divListRepositories.inc:23
 #: admin/systems/services/repository/servRepositorySetup.tpl:19
 #: admin/systems/services/repository/class_servRepositorySetup.inc:153
@@ -731,164 +726,45 @@ msgstr ""
 msgid "List of available packages"
 msgstr "Scegli il tuo numero di telefono personale"
 
-#: admin/fai/faiPackageEntry.tpl:20 admin/fai/faiProfileEntry.tpl:21
+#: admin/fai/faiPackageEntry.tpl:17
+msgid ""
+"The search returned too many results, only the first 200 entries are shown."
+msgstr ""
+
+#: admin/fai/faiPackageEntry.tpl:26 admin/fai/faiProfileEntry.tpl:21
 msgid "Information"
 msgstr "Informazioni"
 
-#: admin/fai/faiPackageEntry.tpl:24
+#: admin/fai/faiPackageEntry.tpl:30
 msgid ""
 "This menu allows you to select multiple packages to add them to the "
 "currently edited package list."
 msgstr ""
 
-#: admin/fai/faiPackageEntry.tpl:30 admin/fai/faiProfileEntry.tpl:31
+#: admin/fai/faiPackageEntry.tpl:36 admin/fai/faiProfileEntry.tpl:31
 msgid "Filters"
 msgstr "Filtri"
 
-#: admin/fai/faiPackageEntry.tpl:40 admin/fai/faiProfileEntry.tpl:54
+#: admin/fai/faiPackageEntry.tpl:46 admin/fai/faiProfileEntry.tpl:54
 #: admin/fai/faiProfileEntry.tpl:55
 msgid "Display objects matching"
 msgstr ""
 
-#: admin/fai/faiPackageEntry.tpl:44 admin/fai/faiProfileEntry.tpl:59
+#: admin/fai/faiPackageEntry.tpl:50 admin/fai/faiProfileEntry.tpl:59
 #: admin/systems/services/repository/class_divListRepositories.inc:26
 msgid "Regular expression for matching object names"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:25 admin/fai/main.inc:53
-#: admin/fai/main.inc:55
+#: admin/fai/class_faiManagement.inc:25
 #, fuzzy
-msgid "Software deployment"
-msgstr "Dipartimento"
+msgid "Roles"
+msgstr "Ruolo"
 
 #: admin/fai/class_faiManagement.inc:26
-msgid "Manage software packages and deployment reciepes"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:362 admin/fai/class_faiManagement.inc:524
-#: admin/fai/class_faiManagement.inc:671 admin/fai/class_faiManagement.inc:833
-#: admin/fai/class_faiManagement.inc:854 admin/fai/class_faiManagement.inc:898
-#: admin/fai/class_faiManagement.inc:915
-#, fuzzy
-msgid "Permission error"
-msgstr "Permessi"
-
-#: admin/fai/class_faiManagement.inc:413
-#, fuzzy
-msgid "Branch locked"
-msgstr "Annulla"
-
-#: admin/fai/class_faiManagement.inc:413
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:429
-#, fuzzy
-msgid "FAI object"
-msgstr "Gruppo di oggetti"
-
-#: admin/fai/class_faiManagement.inc:521
-msgid "FAI branch/freeze"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:524
 #, fuzzy
-msgid "You have no permission to delete this release!"
-msgstr "Non hai il permesso di cambiare la tua password."
-
-#: admin/fai/class_faiManagement.inc:542
-msgid "Release remove aborted because the release name check failed!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:671 admin/fai/class_faiManagement.inc:833
-#: admin/fai/class_faiManagement.inc:854
-#, fuzzy
-msgid "Branch"
-msgstr "Annulla"
-
-#: admin/fai/class_faiManagement.inc:779
-#: admin/fai/class_faiManagement.inc:1054
-#: admin/fai/class_faiManagement.inc:1060
-msgid "Continue"
-msgstr "Continua"
-
-#: admin/fai/class_faiManagement.inc:810
-#: admin/fai/class_faiPackageEntry.inc:53
-#: admin/fai/class_faiPackageEntry.inc:193 admin/fai/class_FAI.inc:574
-#: admin/fai/class_faiPackageConfiguration.inc:35
-#: admin/fai/class_faiPackage.inc:258 admin/fai/class_faiPackage.inc:554
-#: admin/systems/services/repository/class_servRepository.inc:326
-#, fuzzy
-msgid "Service infrastructure"
-msgstr "Seleziona per mostrare le applicazioni"
-
-#: admin/fai/class_faiManagement.inc:815 admin/fai/class_FAI.inc:1178
-#, fuzzy
-msgid "Fatal error"
-msgstr "Terminal Server"
-
-#: admin/fai/class_faiManagement.inc:875
-#, fuzzy
-msgid "partition table"
-msgstr "Stampante"
-
-#: admin/fai/class_faiManagement.inc:876
-#, fuzzy
-msgid "script"
-msgstr "Script"
-
-#: admin/fai/class_faiManagement.inc:877
-#, fuzzy
-msgid "hook"
-msgstr "Mostra errori PHP"
-
-#: admin/fai/class_faiManagement.inc:878
-#, fuzzy
-msgid "variable"
-msgstr "Variabili"
-
-#: admin/fai/class_faiManagement.inc:879
-#, fuzzy
-msgid "template"
-msgstr "Template"
-
-#: admin/fai/class_faiManagement.inc:880
-#, fuzzy
-msgid "package list"
-msgstr "Liste di blocco"
-
-#: admin/fai/class_faiManagement.inc:898 admin/fai/class_faiManagement.inc:915
-#, fuzzy, php-format
-msgid "You have no permission to create a new %s!"
-msgstr "Non hai il permesso di cambiare la tua password."
-
-#: admin/fai/class_faiManagement.inc:915
-#, fuzzy
-msgid "profile"
-msgstr "Path del profilo"
-
-#: admin/fai/class_faiManagement.inc:1315
-msgid ""
-"The selected release is not available anymore. All triggered actions are "
-"skipped."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:1462
-#, fuzzy
-msgid "FAI releases"
-msgstr "Scegli il tuo numero di telefono personale"
-
-#: admin/fai/class_faiManagement.inc:1463
-#, fuzzy
-msgid "FAI release management"
+msgid "Role management"
 msgstr "Riferimenti"
 
-#: admin/fai/class_faiManagement.inc:1468
-#, fuzzy
-msgid "FAI"
-msgstr "FAX"
-
 #: admin/fai/class_faiVariableEntry.inc:94
 #, fuzzy
 msgid "Content"
@@ -940,6 +816,15 @@ msgstr "leggere"
 msgid "Please enter your search string here"
 msgstr "Prego inserire un numero di telefono valido!"
 
+#: admin/fai/class_faiPackageEntry.inc:53
+#: admin/fai/class_faiPackageEntry.inc:195 admin/fai/class_FAI.inc:574
+#: admin/fai/class_faiPackageConfiguration.inc:35
+#: admin/fai/class_faiPackage.inc:258 admin/fai/class_faiPackage.inc:554
+#: admin/systems/services/repository/class_servRepository.inc:362
+#, fuzzy
+msgid "Service infrastructure"
+msgstr "Seleziona per mostrare le applicazioni"
+
 #: admin/fai/class_faiPackageEntry.inc:103
 msgid ""
 "This list displays all assigned package names for this repository settings."
@@ -1132,6 +1017,11 @@ msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
 msgid "Error while fetching source dn - aborted!"
 msgstr ""
 
+#: admin/fai/class_FAI.inc:1178
+#, fuzzy
+msgid "Fatal error"
+msgstr "Terminal Server"
+
 #: admin/fai/class_FAI.inc:1179
 #, php-format
 msgid ""
@@ -1159,6 +1049,38 @@ msgstr "Mostra stampanti"
 msgid "Script Priority"
 msgstr "Script path"
 
+#: admin/fai/fai-list.xml:11
+msgid "List of fai stuff!!!!!"
+msgstr ""
+
+#: admin/fai/fai-list.xml:15
+#, fuzzy
+msgid "FAI"
+msgstr "FAX"
+
+#: admin/fai/fai-list.xml:57 admin/fai/class_divListFai.inc:55
+#: admin/fai/class_divListFai.inc:138
+msgid "Actions"
+msgstr "Azioni"
+
+#: admin/fai/fai-list.xml:68 admin/fai/class_divListFai.inc:140
+msgid "Create"
+msgstr "Creare"
+
+#: admin/fai/fai-list.xml:74
+msgid "Role"
+msgstr "Ruolo"
+
+#: admin/fai/fai-list.xml:125
+#, fuzzy
+msgid "Edit role"
+msgstr "Modifica contatto"
+
+#: admin/fai/fai-list.xml:138
+#, fuzzy
+msgid "Remove role"
+msgstr "Oggetti membri"
+
 #: admin/fai/faiSummary.tpl:4
 msgid "FAI object tree"
 msgstr ""
@@ -1324,7 +1246,7 @@ msgid "FAI partition table"
 msgstr "Stampante"
 
 #: admin/fai/branch_selector.tpl:2
-#: admin/systems/services/repository/class_servRepository.inc:358
+#: admin/systems/services/repository/class_servRepository.inc:421
 #, fuzzy
 msgid "Releases"
 msgstr "Rimuovi"
@@ -1492,10 +1414,6 @@ msgstr "Rimuovi"
 msgid "Class types"
 msgstr "Scegli il tuo numero di telefono personale"
 
-#: admin/fai/class_divListFai.inc:55 admin/fai/class_divListFai.inc:138
-msgid "Actions"
-msgstr "Azioni"
-
 #: admin/fai/class_divListFai.inc:57 admin/fai/class_divListFai.inc:59
 #: admin/fai/class_divListFai.inc:61 admin/fai/class_divListFai.inc:63
 #: admin/fai/class_divListFai.inc:65 admin/fai/class_divListFai.inc:67
@@ -1563,10 +1481,6 @@ msgstr "Gruppi di oggetti"
 msgid "Display users matching"
 msgstr "Mostra utenti che corrispondono a"
 
-#: admin/fai/class_divListFai.inc:140
-msgid "Create"
-msgstr "Creare"
-
 #: admin/fai/class_divListFai.inc:155
 msgid "PT"
 msgstr ""
@@ -1692,6 +1606,11 @@ msgstr ""
 msgid "Tune options"
 msgstr "Opzioni di posta"
 
+#: admin/fai/fai-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filtri"
+
 #: admin/fai/class_faiPackage.inc:220
 msgid "Invalid package names"
 msgstr ""
@@ -1878,7 +1797,7 @@ msgstr ""
 #: admin/systems/services/repository/class_divListRepositories.inc:24
 #: admin/systems/services/repository/class_divListRepositories.inc:64
 #: admin/systems/services/repository/servRepositorySetup.tpl:39
-#: admin/systems/services/repository/class_servRepository.inc:360
+#: admin/systems/services/repository/class_servRepository.inc:423
 #, fuzzy
 msgid "Sections"
 msgstr "Azione"
@@ -1889,34 +1808,102 @@ msgid "Add repository"
 msgstr "Directory"
 
 #: admin/systems/services/repository/servRepositorySetup.tpl:8
-#: admin/systems/services/repository/class_servRepository.inc:357
+#: admin/systems/services/repository/class_servRepository.inc:420
 #, fuzzy
 msgid "Parent server"
 msgstr "server"
 
 #: admin/systems/services/repository/servRepositorySetup.tpl:28
-#: admin/systems/services/repository/class_servRepository.inc:359
+#: admin/systems/services/repository/class_servRepository.inc:422
 #: admin/systems/services/repository/class_servRepositorySetup.inc:157
 msgid "URL"
 msgstr ""
 
 #: admin/systems/services/repository/class_servRepository.inc:26
-#: admin/systems/services/repository/class_servRepository.inc:308
 #: admin/systems/services/repository/class_servRepository.inc:344
+#: admin/systems/services/repository/class_servRepository.inc:388
+#: admin/systems/services/repository/class_servRepository.inc:407
 #: admin/systems/services/repository/class_servRepositorySetup.inc:204
 #, fuzzy
 msgid "Repository service"
 msgstr "Riprova"
 
-#: admin/systems/services/repository/class_servRepository.inc:142
+#: admin/systems/services/repository/class_servRepository.inc:179
 #, fuzzy
 msgid "FAI release"
 msgstr "Scegli il tuo numero di telefono personale"
 
-#: admin/systems/services/repository/class_servRepository.inc:344
+#: admin/systems/services/repository/class_servRepository.inc:407
 msgid "Services"
 msgstr "Servizi"
 
+#, fuzzy
+#~ msgid "Software deployment"
+#~ msgstr "Dipartimento"
+
+#, fuzzy
+#~ msgid "Permission error"
+#~ msgstr "Permessi"
+
+#, fuzzy
+#~ msgid "Branch locked"
+#~ msgstr "Annulla"
+
+#, fuzzy
+#~ msgid "FAI object"
+#~ msgstr "Gruppo di oggetti"
+
+#, fuzzy
+#~ msgid "You have no permission to delete this release!"
+#~ msgstr "Non hai il permesso di cambiare la tua password."
+
+#, fuzzy
+#~ msgid "Branch"
+#~ msgstr "Annulla"
+
+#~ msgid "Continue"
+#~ msgstr "Continua"
+
+#, fuzzy
+#~ msgid "partition table"
+#~ msgstr "Stampante"
+
+#, fuzzy
+#~ msgid "script"
+#~ msgstr "Script"
+
+#, fuzzy
+#~ msgid "hook"
+#~ msgstr "Mostra errori PHP"
+
+#, fuzzy
+#~ msgid "variable"
+#~ msgstr "Variabili"
+
+#, fuzzy
+#~ msgid "template"
+#~ msgstr "Template"
+
+#, fuzzy
+#~ msgid "package list"
+#~ msgstr "Liste di blocco"
+
+#, fuzzy
+#~ msgid "You have no permission to create a new %s!"
+#~ msgstr "Non hai il permesso di cambiare la tua password."
+
+#, fuzzy
+#~ msgid "profile"
+#~ msgstr "Path del profilo"
+
+#, fuzzy
+#~ msgid "FAI releases"
+#~ msgstr "Scegli il tuo numero di telefono personale"
+
+#, fuzzy
+#~ msgid "FAI release management"
+#~ msgstr "Riferimenti"
+
 #, fuzzy
 #~ msgid "Partition start size"
 #~ msgstr "Partizioni"
diff --git a/gosa-plugins/fai/locale/messages.po b/gosa-plugins/fai/locale/messages.po
index 0a0791421..d64d1ba8f 100644
--- a/gosa-plugins/fai/locale/messages.po
+++ b/gosa-plugins/fai/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-19 14:24+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -43,11 +43,12 @@ msgstr ""
 #: admin/fai/faiPartitionTableEntry.tpl:13 admin/fai/faiHookEntry.tpl:19
 #: admin/fai/class_faiVariableEntry.inc:138
 #: admin/fai/class_faiTemplate.inc:545 admin/fai/class_faiScript.inc:646
-#: admin/fai/class_faiScriptEntry.inc:190 admin/fai/faiTemplate.tpl:21
-#: admin/fai/class_faiPartitionTable.inc:789 admin/fai/faiVariableEntry.tpl:19
-#: admin/fai/class_faiHookEntry.inc:197 admin/fai/class_faiVariable.inc:398
-#: admin/fai/faiPartition.tpl:20 admin/fai/class_faiPackage.inc:658
-#: admin/fai/class_faiTemplateEntry.inc:300 admin/fai/faiPartitionTable.tpl:21
+#: admin/fai/class_faiScriptEntry.inc:190 admin/fai/fai-list.xml:49
+#: admin/fai/faiTemplate.tpl:21 admin/fai/class_faiPartitionTable.inc:789
+#: admin/fai/faiVariableEntry.tpl:19 admin/fai/class_faiHookEntry.inc:197
+#: admin/fai/class_faiVariable.inc:398 admin/fai/faiPartition.tpl:20
+#: admin/fai/class_faiPackage.inc:658 admin/fai/class_faiTemplateEntry.inc:300
+#: admin/fai/faiPartitionTable.tpl:21
 msgid "Description"
 msgstr ""
 
@@ -134,21 +135,18 @@ msgstr ""
 #: admin/fai/tabsScript.inc:33 admin/fai/tabsTemplate.inc:33
 #: admin/fai/class_faiHook.inc:239 admin/fai/class_faiDiskEntry.inc:427
 #: admin/fai/tabsPartition.inc:34 admin/fai/class_faiProfile.inc:262
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:636
-#: admin/fai/class_faiManagement.inc:642 admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiManagement.inc:972 admin/fai/class_faiManagement.inc:996
-#: admin/fai/class_faiManagement.inc:1245 admin/fai/class_faiTemplate.inc:212
-#: admin/fai/tabsVariable.inc:33 admin/fai/tabsPackage.inc:33
-#: admin/fai/class_faiScript.inc:229 admin/fai/class_FAI.inc:556
-#: admin/fai/class_faiScriptEntry.inc:59 admin/fai/class_faiScriptEntry.inc:62
-#: admin/fai/tabsHook.inc:32 admin/fai/class_faiPartitionTable.inc:244
+#: admin/fai/class_faiTemplate.inc:212 admin/fai/tabsVariable.inc:33
+#: admin/fai/tabsPackage.inc:33 admin/fai/class_faiScript.inc:229
+#: admin/fai/class_FAI.inc:556 admin/fai/class_faiScriptEntry.inc:59
+#: admin/fai/class_faiScriptEntry.inc:62 admin/fai/tabsHook.inc:32
+#: admin/fai/class_faiPartitionTable.inc:244
 #: admin/fai/class_faiPartitionTable.inc:307
 #: admin/fai/class_faiHookEntry.inc:62 admin/fai/class_faiHookEntry.inc:65
 #: admin/fai/class_faiVariable.inc:142 admin/fai/class_faiPackage.inc:348
 #: admin/fai/class_faiSummaryTab.inc:94 admin/fai/tabsProfile.inc:33
-#: admin/systems/services/repository/class_servRepository.inc:142
-#: admin/systems/services/repository/class_servRepository.inc:177
-#: admin/systems/services/repository/class_servRepository.inc:182
+#: admin/systems/services/repository/class_servRepository.inc:179
+#: admin/systems/services/repository/class_servRepository.inc:213
+#: admin/systems/services/repository/class_servRepository.inc:218
 #: admin/systems/services/repository/class_servRepositorySetup.inc:204
 msgid "Error"
 msgstr ""
@@ -166,8 +164,7 @@ msgid ""
 "The file encodig has changed from '%s' to '%s'. Do you really want to save?"
 msgstr ""
 
-#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:542
-#: admin/fai/class_faiManagement.inc:1315 admin/fai/remove_branch.tpl:2
+#: admin/fai/remove.tpl:2 admin/fai/remove_branch.tpl:2
 msgid "Warning"
 msgstr ""
 
@@ -201,9 +198,7 @@ msgstr ""
 #: admin/fai/faiPackage.tpl:9 admin/fai/faiHook.tpl:9
 #: admin/fai/class_faiProfile.inc:395 admin/fai/class_faiProfile.inc:405
 #: admin/fai/class_faiProfile.inc:478 admin/fai/faiPartitionTableEntry.tpl:6
-#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiManagement.inc:636
-#: admin/fai/class_faiManagement.inc:642
-#: admin/fai/class_faiVariableEntry.inc:90
+#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiVariableEntry.inc:90
 #: admin/fai/class_faiVariableEntry.inc:99
 #: admin/fai/class_faiVariableEntry.inc:102
 #: admin/fai/class_faiVariableEntry.inc:137
@@ -214,8 +209,8 @@ msgstr ""
 #: admin/fai/class_faiScriptEntry.inc:137
 #: admin/fai/class_faiScriptEntry.inc:142
 #: admin/fai/class_faiScriptEntry.inc:145
-#: admin/fai/class_faiScriptEntry.inc:189 admin/fai/faiTemplate.tpl:9
-#: admin/fai/class_faiPartitionTable.inc:490
+#: admin/fai/class_faiScriptEntry.inc:189 admin/fai/fai-list.xml:41
+#: admin/fai/faiTemplate.tpl:9 admin/fai/class_faiPartitionTable.inc:490
 #: admin/fai/class_faiPartitionTable.inc:788 admin/fai/faiVariableEntry.tpl:9
 #: admin/fai/class_faiHookEntry.inc:145 admin/fai/class_faiHookEntry.inc:150
 #: admin/fai/class_faiHookEntry.inc:153 admin/fai/class_faiHookEntry.inc:196
@@ -224,7 +219,7 @@ msgstr ""
 #: admin/fai/class_faiPackage.inc:657 admin/fai/class_faiTemplateEntry.inc:233
 #: admin/fai/class_faiTemplateEntry.inc:299
 #: admin/fai/class_faiSummaryTab.inc:348 admin/fai/faiPartitionTable.tpl:9
-#: admin/systems/services/repository/class_servRepository.inc:177
+#: admin/systems/services/repository/class_servRepository.inc:213
 msgid "Name"
 msgstr ""
 
@@ -324,7 +319,7 @@ msgid "True"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTableEntry.inc:252
-#: admin/fai/class_faiPartitionTableEntry.inc:254
+#: admin/fai/class_faiPartitionTableEntry.inc:254 admin/fai/fai-list.xml:93
 #: admin/fai/class_divListFai.inc:178
 msgid "Remove"
 msgstr ""
@@ -421,7 +416,7 @@ msgid "Choose a variable to delete or edit"
 msgstr ""
 
 #: admin/fai/faiVariable.tpl:53 admin/fai/class_faiHook.inc:312
-#: admin/fai/class_faiHook.inc:314
+#: admin/fai/class_faiHook.inc:314 admin/fai/fai-list.xml:86
 msgid "Edit"
 msgstr ""
 
@@ -542,12 +537,12 @@ msgstr ""
 
 #: admin/fai/faiPackage.tpl:33
 #: admin/systems/services/repository/servRepositorySetup.tpl:1
-#: admin/systems/services/repository/class_servRepository.inc:343
+#: admin/systems/services/repository/class_servRepository.inc:406
 msgid "Repository"
 msgstr ""
 
 #: admin/fai/faiPackage.tpl:37 admin/fai/branch_selector.tpl:25
-#: admin/fai/class_faiPackage.inc:663
+#: admin/fai/fai-filter.tpl:14 admin/fai/class_faiPackage.inc:663
 #: admin/systems/services/repository/class_divListRepositories.inc:23
 #: admin/systems/services/repository/servRepositorySetup.tpl:19
 #: admin/systems/services/repository/class_servRepositorySetup.inc:153
@@ -658,144 +653,41 @@ msgstr ""
 msgid "List of available packages"
 msgstr ""
 
-#: admin/fai/faiPackageEntry.tpl:20 admin/fai/faiProfileEntry.tpl:21
+#: admin/fai/faiPackageEntry.tpl:17
+msgid ""
+"The search returned too many results, only the first 200 entries are shown."
+msgstr ""
+
+#: admin/fai/faiPackageEntry.tpl:26 admin/fai/faiProfileEntry.tpl:21
 msgid "Information"
 msgstr ""
 
-#: admin/fai/faiPackageEntry.tpl:24
+#: admin/fai/faiPackageEntry.tpl:30
 msgid ""
 "This menu allows you to select multiple packages to add them to the "
 "currently edited package list."
 msgstr ""
 
-#: admin/fai/faiPackageEntry.tpl:30 admin/fai/faiProfileEntry.tpl:31
+#: admin/fai/faiPackageEntry.tpl:36 admin/fai/faiProfileEntry.tpl:31
 msgid "Filters"
 msgstr ""
 
-#: admin/fai/faiPackageEntry.tpl:40 admin/fai/faiProfileEntry.tpl:54
+#: admin/fai/faiPackageEntry.tpl:46 admin/fai/faiProfileEntry.tpl:54
 #: admin/fai/faiProfileEntry.tpl:55
 msgid "Display objects matching"
 msgstr ""
 
-#: admin/fai/faiPackageEntry.tpl:44 admin/fai/faiProfileEntry.tpl:59
+#: admin/fai/faiPackageEntry.tpl:50 admin/fai/faiProfileEntry.tpl:59
 #: admin/systems/services/repository/class_divListRepositories.inc:26
 msgid "Regular expression for matching object names"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:25 admin/fai/main.inc:53
-#: admin/fai/main.inc:55
-msgid "Software deployment"
+#: admin/fai/class_faiManagement.inc:25
+msgid "Roles"
 msgstr ""
 
 #: admin/fai/class_faiManagement.inc:26
-msgid "Manage software packages and deployment reciepes"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:362 admin/fai/class_faiManagement.inc:524
-#: admin/fai/class_faiManagement.inc:671 admin/fai/class_faiManagement.inc:833
-#: admin/fai/class_faiManagement.inc:854 admin/fai/class_faiManagement.inc:898
-#: admin/fai/class_faiManagement.inc:915
-msgid "Permission error"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:413
-msgid "Branch locked"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:413
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:429
-msgid "FAI object"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:521
-msgid "FAI branch/freeze"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:524
-msgid "You have no permission to delete this release!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:542
-msgid "Release remove aborted because the release name check failed!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:671 admin/fai/class_faiManagement.inc:833
-#: admin/fai/class_faiManagement.inc:854
-msgid "Branch"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:779
-#: admin/fai/class_faiManagement.inc:1054
-#: admin/fai/class_faiManagement.inc:1060
-msgid "Continue"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:810
-#: admin/fai/class_faiPackageEntry.inc:53
-#: admin/fai/class_faiPackageEntry.inc:193 admin/fai/class_FAI.inc:574
-#: admin/fai/class_faiPackageConfiguration.inc:35
-#: admin/fai/class_faiPackage.inc:258 admin/fai/class_faiPackage.inc:554
-#: admin/systems/services/repository/class_servRepository.inc:326
-msgid "Service infrastructure"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:815 admin/fai/class_FAI.inc:1178
-msgid "Fatal error"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:875
-msgid "partition table"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:876
-msgid "script"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:877
-msgid "hook"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:878
-msgid "variable"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:879
-msgid "template"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:880
-msgid "package list"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:898 admin/fai/class_faiManagement.inc:915
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:915
-msgid "profile"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:1315
-msgid ""
-"The selected release is not available anymore. All triggered actions are "
-"skipped."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:1462
-msgid "FAI releases"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:1463
-msgid "FAI release management"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:1468
-msgid "FAI"
+msgid "Role management"
 msgstr ""
 
 #: admin/fai/class_faiVariableEntry.inc:94
@@ -842,6 +734,14 @@ msgstr ""
 msgid "Please enter your search string here"
 msgstr ""
 
+#: admin/fai/class_faiPackageEntry.inc:53
+#: admin/fai/class_faiPackageEntry.inc:195 admin/fai/class_FAI.inc:574
+#: admin/fai/class_faiPackageConfiguration.inc:35
+#: admin/fai/class_faiPackage.inc:258 admin/fai/class_faiPackage.inc:554
+#: admin/systems/services/repository/class_servRepository.inc:362
+msgid "Service infrastructure"
+msgstr ""
+
 #: admin/fai/class_faiPackageEntry.inc:103
 msgid ""
 "This list displays all assigned package names for this repository settings."
@@ -1017,6 +917,10 @@ msgstr ""
 msgid "Error while fetching source dn - aborted!"
 msgstr ""
 
+#: admin/fai/class_FAI.inc:1178
+msgid "Fatal error"
+msgstr ""
+
 #: admin/fai/class_FAI.inc:1179
 #, php-format
 msgid ""
@@ -1040,6 +944,35 @@ msgstr ""
 msgid "Script Priority"
 msgstr ""
 
+#: admin/fai/fai-list.xml:11
+msgid "List of fai stuff!!!!!"
+msgstr ""
+
+#: admin/fai/fai-list.xml:15
+msgid "FAI"
+msgstr ""
+
+#: admin/fai/fai-list.xml:57 admin/fai/class_divListFai.inc:55
+#: admin/fai/class_divListFai.inc:138
+msgid "Actions"
+msgstr ""
+
+#: admin/fai/fai-list.xml:68 admin/fai/class_divListFai.inc:140
+msgid "Create"
+msgstr ""
+
+#: admin/fai/fai-list.xml:74
+msgid "Role"
+msgstr ""
+
+#: admin/fai/fai-list.xml:125
+msgid "Edit role"
+msgstr ""
+
+#: admin/fai/fai-list.xml:138
+msgid "Remove role"
+msgstr ""
+
 #: admin/fai/faiSummary.tpl:4
 msgid "FAI object tree"
 msgstr ""
@@ -1195,7 +1128,7 @@ msgid "FAI partition table"
 msgstr ""
 
 #: admin/fai/branch_selector.tpl:2
-#: admin/systems/services/repository/class_servRepository.inc:358
+#: admin/systems/services/repository/class_servRepository.inc:421
 msgid "Releases"
 msgstr ""
 
@@ -1342,10 +1275,6 @@ msgstr ""
 msgid "Class types"
 msgstr ""
 
-#: admin/fai/class_divListFai.inc:55 admin/fai/class_divListFai.inc:138
-msgid "Actions"
-msgstr ""
-
 #: admin/fai/class_divListFai.inc:57 admin/fai/class_divListFai.inc:59
 #: admin/fai/class_divListFai.inc:61 admin/fai/class_divListFai.inc:63
 #: admin/fai/class_divListFai.inc:65 admin/fai/class_divListFai.inc:67
@@ -1403,10 +1332,6 @@ msgstr ""
 msgid "Display users matching"
 msgstr ""
 
-#: admin/fai/class_divListFai.inc:140
-msgid "Create"
-msgstr ""
-
 #: admin/fai/class_divListFai.inc:155
 msgid "PT"
 msgstr ""
@@ -1516,6 +1441,10 @@ msgstr ""
 msgid "Tune options"
 msgstr ""
 
+#: admin/fai/fai-filter.tpl:3
+msgid "Filter"
+msgstr ""
+
 #: admin/fai/class_faiPackage.inc:220
 msgid "Invalid package names"
 msgstr ""
@@ -1679,7 +1608,7 @@ msgstr ""
 #: admin/systems/services/repository/class_divListRepositories.inc:24
 #: admin/systems/services/repository/class_divListRepositories.inc:64
 #: admin/systems/services/repository/servRepositorySetup.tpl:39
-#: admin/systems/services/repository/class_servRepository.inc:360
+#: admin/systems/services/repository/class_servRepository.inc:423
 msgid "Sections"
 msgstr ""
 
@@ -1688,27 +1617,28 @@ msgid "Add repository"
 msgstr ""
 
 #: admin/systems/services/repository/servRepositorySetup.tpl:8
-#: admin/systems/services/repository/class_servRepository.inc:357
+#: admin/systems/services/repository/class_servRepository.inc:420
 msgid "Parent server"
 msgstr ""
 
 #: admin/systems/services/repository/servRepositorySetup.tpl:28
-#: admin/systems/services/repository/class_servRepository.inc:359
+#: admin/systems/services/repository/class_servRepository.inc:422
 #: admin/systems/services/repository/class_servRepositorySetup.inc:157
 msgid "URL"
 msgstr ""
 
 #: admin/systems/services/repository/class_servRepository.inc:26
-#: admin/systems/services/repository/class_servRepository.inc:308
 #: admin/systems/services/repository/class_servRepository.inc:344
+#: admin/systems/services/repository/class_servRepository.inc:388
+#: admin/systems/services/repository/class_servRepository.inc:407
 #: admin/systems/services/repository/class_servRepositorySetup.inc:204
 msgid "Repository service"
 msgstr ""
 
-#: admin/systems/services/repository/class_servRepository.inc:142
+#: admin/systems/services/repository/class_servRepository.inc:179
 msgid "FAI release"
 msgstr ""
 
-#: admin/systems/services/repository/class_servRepository.inc:344
+#: admin/systems/services/repository/class_servRepository.inc:407
 msgid "Services"
 msgstr ""
diff --git a/gosa-plugins/fai/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/fai/locale/nl/LC_MESSAGES/messages.po
index 4ab5844b4..dcf4c9b7a 100644
--- a/gosa-plugins/fai/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/fai/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-19 14:24+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -47,11 +47,12 @@ msgstr "Doelpad"
 #: admin/fai/faiPartitionTableEntry.tpl:13 admin/fai/faiHookEntry.tpl:19
 #: admin/fai/class_faiVariableEntry.inc:138
 #: admin/fai/class_faiTemplate.inc:545 admin/fai/class_faiScript.inc:646
-#: admin/fai/class_faiScriptEntry.inc:190 admin/fai/faiTemplate.tpl:21
-#: admin/fai/class_faiPartitionTable.inc:789 admin/fai/faiVariableEntry.tpl:19
-#: admin/fai/class_faiHookEntry.inc:197 admin/fai/class_faiVariable.inc:398
-#: admin/fai/faiPartition.tpl:20 admin/fai/class_faiPackage.inc:658
-#: admin/fai/class_faiTemplateEntry.inc:300 admin/fai/faiPartitionTable.tpl:21
+#: admin/fai/class_faiScriptEntry.inc:190 admin/fai/fai-list.xml:49
+#: admin/fai/faiTemplate.tpl:21 admin/fai/class_faiPartitionTable.inc:789
+#: admin/fai/faiVariableEntry.tpl:19 admin/fai/class_faiHookEntry.inc:197
+#: admin/fai/class_faiVariable.inc:398 admin/fai/faiPartition.tpl:20
+#: admin/fai/class_faiPackage.inc:658 admin/fai/class_faiTemplateEntry.inc:300
+#: admin/fai/faiPartitionTable.tpl:21
 msgid "Description"
 msgstr "Omschrijving"
 
@@ -140,21 +141,18 @@ msgstr "sticky"
 #: admin/fai/tabsScript.inc:33 admin/fai/tabsTemplate.inc:33
 #: admin/fai/class_faiHook.inc:239 admin/fai/class_faiDiskEntry.inc:427
 #: admin/fai/tabsPartition.inc:34 admin/fai/class_faiProfile.inc:262
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:636
-#: admin/fai/class_faiManagement.inc:642 admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiManagement.inc:972 admin/fai/class_faiManagement.inc:996
-#: admin/fai/class_faiManagement.inc:1245 admin/fai/class_faiTemplate.inc:212
-#: admin/fai/tabsVariable.inc:33 admin/fai/tabsPackage.inc:33
-#: admin/fai/class_faiScript.inc:229 admin/fai/class_FAI.inc:556
-#: admin/fai/class_faiScriptEntry.inc:59 admin/fai/class_faiScriptEntry.inc:62
-#: admin/fai/tabsHook.inc:32 admin/fai/class_faiPartitionTable.inc:244
+#: admin/fai/class_faiTemplate.inc:212 admin/fai/tabsVariable.inc:33
+#: admin/fai/tabsPackage.inc:33 admin/fai/class_faiScript.inc:229
+#: admin/fai/class_FAI.inc:556 admin/fai/class_faiScriptEntry.inc:59
+#: admin/fai/class_faiScriptEntry.inc:62 admin/fai/tabsHook.inc:32
+#: admin/fai/class_faiPartitionTable.inc:244
 #: admin/fai/class_faiPartitionTable.inc:307
 #: admin/fai/class_faiHookEntry.inc:62 admin/fai/class_faiHookEntry.inc:65
 #: admin/fai/class_faiVariable.inc:142 admin/fai/class_faiPackage.inc:348
 #: admin/fai/class_faiSummaryTab.inc:94 admin/fai/tabsProfile.inc:33
-#: admin/systems/services/repository/class_servRepository.inc:142
-#: admin/systems/services/repository/class_servRepository.inc:177
-#: admin/systems/services/repository/class_servRepository.inc:182
+#: admin/systems/services/repository/class_servRepository.inc:179
+#: admin/systems/services/repository/class_servRepository.inc:213
+#: admin/systems/services/repository/class_servRepository.inc:218
 #: admin/systems/services/repository/class_servRepositorySetup.inc:204
 msgid "Error"
 msgstr "Fout"
@@ -175,8 +173,7 @@ msgid ""
 "The file encodig has changed from '%s' to '%s'. Do you really want to save?"
 msgstr ""
 
-#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:542
-#: admin/fai/class_faiManagement.inc:1315 admin/fai/remove_branch.tpl:2
+#: admin/fai/remove.tpl:2 admin/fai/remove_branch.tpl:2
 msgid "Warning"
 msgstr "Waarschuwing"
 
@@ -215,9 +212,7 @@ msgstr "Apparaat"
 #: admin/fai/faiPackage.tpl:9 admin/fai/faiHook.tpl:9
 #: admin/fai/class_faiProfile.inc:395 admin/fai/class_faiProfile.inc:405
 #: admin/fai/class_faiProfile.inc:478 admin/fai/faiPartitionTableEntry.tpl:6
-#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiManagement.inc:636
-#: admin/fai/class_faiManagement.inc:642
-#: admin/fai/class_faiVariableEntry.inc:90
+#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiVariableEntry.inc:90
 #: admin/fai/class_faiVariableEntry.inc:99
 #: admin/fai/class_faiVariableEntry.inc:102
 #: admin/fai/class_faiVariableEntry.inc:137
@@ -228,8 +223,8 @@ msgstr "Apparaat"
 #: admin/fai/class_faiScriptEntry.inc:137
 #: admin/fai/class_faiScriptEntry.inc:142
 #: admin/fai/class_faiScriptEntry.inc:145
-#: admin/fai/class_faiScriptEntry.inc:189 admin/fai/faiTemplate.tpl:9
-#: admin/fai/class_faiPartitionTable.inc:490
+#: admin/fai/class_faiScriptEntry.inc:189 admin/fai/fai-list.xml:41
+#: admin/fai/faiTemplate.tpl:9 admin/fai/class_faiPartitionTable.inc:490
 #: admin/fai/class_faiPartitionTable.inc:788 admin/fai/faiVariableEntry.tpl:9
 #: admin/fai/class_faiHookEntry.inc:145 admin/fai/class_faiHookEntry.inc:150
 #: admin/fai/class_faiHookEntry.inc:153 admin/fai/class_faiHookEntry.inc:196
@@ -238,7 +233,7 @@ msgstr "Apparaat"
 #: admin/fai/class_faiPackage.inc:657 admin/fai/class_faiTemplateEntry.inc:233
 #: admin/fai/class_faiTemplateEntry.inc:299
 #: admin/fai/class_faiSummaryTab.inc:348 admin/fai/faiPartitionTable.tpl:9
-#: admin/systems/services/repository/class_servRepository.inc:177
+#: admin/systems/services/repository/class_servRepository.inc:213
 msgid "Name"
 msgstr "Naam"
 
@@ -345,7 +340,7 @@ msgid "True"
 msgstr "Ja"
 
 #: admin/fai/class_faiPartitionTableEntry.inc:252
-#: admin/fai/class_faiPartitionTableEntry.inc:254
+#: admin/fai/class_faiPartitionTableEntry.inc:254 admin/fai/fai-list.xml:93
 #: admin/fai/class_divListFai.inc:178
 msgid "Remove"
 msgstr "Verwijderen"
@@ -456,7 +451,7 @@ msgid "Choose a variable to delete or edit"
 msgstr "Kies een te bewerken of verwijderen variabele"
 
 #: admin/fai/faiVariable.tpl:53 admin/fai/class_faiHook.inc:312
-#: admin/fai/class_faiHook.inc:314
+#: admin/fai/class_faiHook.inc:314 admin/fai/fai-list.xml:86
 msgid "Edit"
 msgstr "Bewerken"
 
@@ -590,12 +585,12 @@ msgstr "Lijst met scripts"
 
 #: admin/fai/faiPackage.tpl:33
 #: admin/systems/services/repository/servRepositorySetup.tpl:1
-#: admin/systems/services/repository/class_servRepository.inc:343
+#: admin/systems/services/repository/class_servRepository.inc:406
 msgid "Repository"
 msgstr "Verzamelplaats"
 
 #: admin/fai/faiPackage.tpl:37 admin/fai/branch_selector.tpl:25
-#: admin/fai/class_faiPackage.inc:663
+#: admin/fai/fai-filter.tpl:14 admin/fai/class_faiPackage.inc:663
 #: admin/systems/services/repository/class_divListRepositories.inc:23
 #: admin/systems/services/repository/servRepositorySetup.tpl:19
 #: admin/systems/services/repository/class_servRepositorySetup.inc:153
@@ -709,11 +704,20 @@ msgstr "Kies een bestaande FAI taak"
 msgid "List of available packages"
 msgstr "Lijst met beschikbare pakketten"
 
-#: admin/fai/faiPackageEntry.tpl:20 admin/fai/faiProfileEntry.tpl:21
+#: admin/fai/faiPackageEntry.tpl:17
+#, fuzzy
+msgid ""
+"The search returned too many results, only the first 200 entries are shown."
+msgstr ""
+"De door u opgegeven zoekopdracht '%s' gaf teveel resultaten terug. Om het "
+"geheugengebruik laag te houden worden alleen de eerste 200 resultaten "
+"getoond."
+
+#: admin/fai/faiPackageEntry.tpl:26 admin/fai/faiProfileEntry.tpl:21
 msgid "Information"
 msgstr "Informatie"
 
-#: admin/fai/faiPackageEntry.tpl:24
+#: admin/fai/faiPackageEntry.tpl:30
 msgid ""
 "This menu allows you to select multiple packages to add them to the "
 "currently edited package list."
@@ -721,153 +725,30 @@ msgstr ""
 "Dit menu maakt het mogelijk om meerdere pakketten toe te voegen aan de op "
 "dit moment bewerkte pakketlijst."
 
-#: admin/fai/faiPackageEntry.tpl:30 admin/fai/faiProfileEntry.tpl:31
+#: admin/fai/faiPackageEntry.tpl:36 admin/fai/faiProfileEntry.tpl:31
 msgid "Filters"
 msgstr "Filters"
 
-#: admin/fai/faiPackageEntry.tpl:40 admin/fai/faiProfileEntry.tpl:54
+#: admin/fai/faiPackageEntry.tpl:46 admin/fai/faiProfileEntry.tpl:54
 #: admin/fai/faiProfileEntry.tpl:55
 msgid "Display objects matching"
 msgstr "Toon overeenkomende objecten"
 
-#: admin/fai/faiPackageEntry.tpl:44 admin/fai/faiProfileEntry.tpl:59
+#: admin/fai/faiPackageEntry.tpl:50 admin/fai/faiProfileEntry.tpl:59
 #: admin/systems/services/repository/class_divListRepositories.inc:26
 msgid "Regular expression for matching object names"
 msgstr "Reguliere expressie voor overeenkomende objectnamen"
 
-#: admin/fai/class_faiManagement.inc:25 admin/fai/main.inc:53
-#: admin/fai/main.inc:55
+#: admin/fai/class_faiManagement.inc:25
 #, fuzzy
-msgid "Software deployment"
-msgstr "Systeembeheer"
+msgid "Roles"
+msgstr "Funktie"
 
 #: admin/fai/class_faiManagement.inc:26
-msgid "Manage software packages and deployment reciepes"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:362 admin/fai/class_faiManagement.inc:524
-#: admin/fai/class_faiManagement.inc:671 admin/fai/class_faiManagement.inc:833
-#: admin/fai/class_faiManagement.inc:854 admin/fai/class_faiManagement.inc:898
-#: admin/fai/class_faiManagement.inc:915
-#, fuzzy
-msgid "Permission error"
-msgstr "Rechten"
-
-#: admin/fai/class_faiManagement.inc:413
-#, fuzzy
-msgid "Branch locked"
-msgstr "Aftakkingen"
-
-#: admin/fai/class_faiManagement.inc:413
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:429
-#, fuzzy
-msgid "FAI object"
-msgstr "FAI objectlijst"
-
-#: admin/fai/class_faiManagement.inc:521
-msgid "FAI branch/freeze"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:524
-#, fuzzy
-msgid "You have no permission to delete this release!"
-msgstr "U heeft geen toestemming om deze uitgave te verwijderen!"
-
-#: admin/fai/class_faiManagement.inc:542
-msgid "Release remove aborted because the release name check failed!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:671 admin/fai/class_faiManagement.inc:833
-#: admin/fai/class_faiManagement.inc:854
-#, fuzzy
-msgid "Branch"
-msgstr "Aftakkingen"
-
-#: admin/fai/class_faiManagement.inc:779
-#: admin/fai/class_faiManagement.inc:1054
-#: admin/fai/class_faiManagement.inc:1060
-msgid "Continue"
-msgstr "Doorgaan"
-
-#: admin/fai/class_faiManagement.inc:810
-#: admin/fai/class_faiPackageEntry.inc:53
-#: admin/fai/class_faiPackageEntry.inc:193 admin/fai/class_FAI.inc:574
-#: admin/fai/class_faiPackageConfiguration.inc:35
-#: admin/fai/class_faiPackage.inc:258 admin/fai/class_faiPackage.inc:554
-#: admin/systems/services/repository/class_servRepository.inc:326
-#, fuzzy
-msgid "Service infrastructure"
-msgstr "Zoek binnen subtree"
-
-#: admin/fai/class_faiManagement.inc:815 admin/fai/class_FAI.inc:1178
-#, fuzzy
-msgid "Fatal error"
-msgstr "Terminal server"
-
-#: admin/fai/class_faiManagement.inc:875
-#, fuzzy
-msgid "partition table"
-msgstr "Partitietabel"
-
-#: admin/fai/class_faiManagement.inc:876
-#, fuzzy
-msgid "script"
-msgstr "Script"
-
-#: admin/fai/class_faiManagement.inc:877
-#, fuzzy
-msgid "hook"
-msgstr "Inhakers"
-
-#: admin/fai/class_faiManagement.inc:878
 #, fuzzy
-msgid "variable"
-msgstr "Variabele"
-
-#: admin/fai/class_faiManagement.inc:879
-#, fuzzy
-msgid "template"
-msgstr "Sjabloon"
-
-#: admin/fai/class_faiManagement.inc:880
-#, fuzzy
-msgid "package list"
-msgstr "Pakketlijst"
-
-#: admin/fai/class_faiManagement.inc:898 admin/fai/class_faiManagement.inc:915
-#, fuzzy, php-format
-msgid "You have no permission to create a new %s!"
-msgstr "U heeft geen toestemming deze objectgroep te verwijderen!"
-
-#: admin/fai/class_faiManagement.inc:915
-#, fuzzy
-msgid "profile"
-msgstr "Profielen"
-
-#: admin/fai/class_faiManagement.inc:1315
-msgid ""
-"The selected release is not available anymore. All triggered actions are "
-"skipped."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:1462
-#, fuzzy
-msgid "FAI releases"
-msgstr "FAI klassen"
-
-#: admin/fai/class_faiManagement.inc:1463
-#, fuzzy
-msgid "FAI release management"
+msgid "Role management"
 msgstr "Blokkeerlijst beheer"
 
-#: admin/fai/class_faiManagement.inc:1468
-msgid "FAI"
-msgstr "FAI"
-
 #: admin/fai/class_faiVariableEntry.inc:94
 #, fuzzy
 msgid "Content"
@@ -917,6 +798,15 @@ msgstr "Lezen"
 msgid "Please enter your search string here"
 msgstr "Geef hier uw zoekwaarde op"
 
+#: admin/fai/class_faiPackageEntry.inc:53
+#: admin/fai/class_faiPackageEntry.inc:195 admin/fai/class_FAI.inc:574
+#: admin/fai/class_faiPackageConfiguration.inc:35
+#: admin/fai/class_faiPackage.inc:258 admin/fai/class_faiPackage.inc:554
+#: admin/systems/services/repository/class_servRepository.inc:362
+#, fuzzy
+msgid "Service infrastructure"
+msgstr "Zoek binnen subtree"
+
 #: admin/fai/class_faiPackageEntry.inc:103
 msgid ""
 "This list displays all assigned package names for this repository settings."
@@ -1106,6 +996,11 @@ msgstr "Kan '%s' niet aanmaken. De gewenste naam bestaat al."
 msgid "Error while fetching source dn - aborted!"
 msgstr "Fout bij het ophalen van de bron dn - afgebroken!"
 
+#: admin/fai/class_FAI.inc:1178
+#, fuzzy
+msgid "Fatal error"
+msgstr "Terminal server"
+
 #: admin/fai/class_FAI.inc:1179
 #, php-format
 msgid ""
@@ -1133,6 +1028,37 @@ msgstr "Importeer script"
 msgid "Script Priority"
 msgstr "Inlogscript"
 
+#: admin/fai/fai-list.xml:11
+msgid "List of fai stuff!!!!!"
+msgstr ""
+
+#: admin/fai/fai-list.xml:15
+msgid "FAI"
+msgstr "FAI"
+
+#: admin/fai/fai-list.xml:57 admin/fai/class_divListFai.inc:55
+#: admin/fai/class_divListFai.inc:138
+msgid "Actions"
+msgstr "Acties"
+
+#: admin/fai/fai-list.xml:68 admin/fai/class_divListFai.inc:140
+msgid "Create"
+msgstr "Aanmaken"
+
+#: admin/fai/fai-list.xml:74
+msgid "Role"
+msgstr "Funktie"
+
+#: admin/fai/fai-list.xml:125
+#, fuzzy
+msgid "Edit role"
+msgstr "Bewerk share"
+
+#: admin/fai/fai-list.xml:138
+#, fuzzy
+msgid "Remove role"
+msgstr "Lidmaatschap objecten"
+
 #: admin/fai/faiSummary.tpl:4
 msgid "FAI object tree"
 msgstr "FAI objectlijst"
@@ -1297,7 +1223,7 @@ msgid "FAI partition table"
 msgstr "Nieuwe partitietabel"
 
 #: admin/fai/branch_selector.tpl:2
-#: admin/systems/services/repository/class_servRepository.inc:358
+#: admin/systems/services/repository/class_servRepository.inc:421
 #, fuzzy
 msgid "Releases"
 msgstr "Distributie versie"
@@ -1474,10 +1400,6 @@ msgstr "Selecteer"
 msgid "Class types"
 msgstr "Klasse type"
 
-#: admin/fai/class_divListFai.inc:55 admin/fai/class_divListFai.inc:138
-msgid "Actions"
-msgstr "Acties"
-
 #: admin/fai/class_divListFai.inc:57 admin/fai/class_divListFai.inc:59
 #: admin/fai/class_divListFai.inc:61 admin/fai/class_divListFai.inc:63
 #: admin/fai/class_divListFai.inc:65 admin/fai/class_divListFai.inc:67
@@ -1539,10 +1461,6 @@ msgstr "Objectgroepen"
 msgid "Display users matching"
 msgstr "Toon overeenkomende gebruikers"
 
-#: admin/fai/class_divListFai.inc:140
-msgid "Create"
-msgstr "Aanmaken"
-
 #: admin/fai/class_divListFai.inc:155
 msgid "PT"
 msgstr "PT"
@@ -1669,6 +1587,11 @@ msgstr ""
 msgid "Tune options"
 msgstr "Koppelopties"
 
+#: admin/fai/fai-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filters"
+
 #: admin/fai/class_faiPackage.inc:220
 msgid "Invalid package names"
 msgstr ""
@@ -1854,7 +1777,7 @@ msgstr ""
 #: admin/systems/services/repository/class_divListRepositories.inc:24
 #: admin/systems/services/repository/class_divListRepositories.inc:64
 #: admin/systems/services/repository/servRepositorySetup.tpl:39
-#: admin/systems/services/repository/class_servRepository.inc:360
+#: admin/systems/services/repository/class_servRepository.inc:423
 #, fuzzy
 msgid "Sections"
 msgstr "Sectie"
@@ -1865,34 +1788,102 @@ msgid "Add repository"
 msgstr "Directory"
 
 #: admin/systems/services/repository/servRepositorySetup.tpl:8
-#: admin/systems/services/repository/class_servRepository.inc:357
+#: admin/systems/services/repository/class_servRepository.inc:420
 #, fuzzy
 msgid "Parent server"
 msgstr "Bewaar"
 
 #: admin/systems/services/repository/servRepositorySetup.tpl:28
-#: admin/systems/services/repository/class_servRepository.inc:359
+#: admin/systems/services/repository/class_servRepository.inc:422
 #: admin/systems/services/repository/class_servRepositorySetup.inc:157
 msgid "URL"
 msgstr ""
 
 #: admin/systems/services/repository/class_servRepository.inc:26
-#: admin/systems/services/repository/class_servRepository.inc:308
 #: admin/systems/services/repository/class_servRepository.inc:344
+#: admin/systems/services/repository/class_servRepository.inc:388
+#: admin/systems/services/repository/class_servRepository.inc:407
 #: admin/systems/services/repository/class_servRepositorySetup.inc:204
 #, fuzzy
 msgid "Repository service"
 msgstr "Verzamelplaats"
 
-#: admin/systems/services/repository/class_servRepository.inc:142
+#: admin/systems/services/repository/class_servRepository.inc:179
 #, fuzzy
 msgid "FAI release"
 msgstr "FAI klassen"
 
-#: admin/systems/services/repository/class_servRepository.inc:344
+#: admin/systems/services/repository/class_servRepository.inc:407
 msgid "Services"
 msgstr "Services"
 
+#, fuzzy
+#~ msgid "Software deployment"
+#~ msgstr "Systeembeheer"
+
+#, fuzzy
+#~ msgid "Permission error"
+#~ msgstr "Rechten"
+
+#, fuzzy
+#~ msgid "Branch locked"
+#~ msgstr "Aftakkingen"
+
+#, fuzzy
+#~ msgid "FAI object"
+#~ msgstr "FAI objectlijst"
+
+#, fuzzy
+#~ msgid "You have no permission to delete this release!"
+#~ msgstr "U heeft geen toestemming om deze uitgave te verwijderen!"
+
+#, fuzzy
+#~ msgid "Branch"
+#~ msgstr "Aftakkingen"
+
+#~ msgid "Continue"
+#~ msgstr "Doorgaan"
+
+#, fuzzy
+#~ msgid "partition table"
+#~ msgstr "Partitietabel"
+
+#, fuzzy
+#~ msgid "script"
+#~ msgstr "Script"
+
+#, fuzzy
+#~ msgid "hook"
+#~ msgstr "Inhakers"
+
+#, fuzzy
+#~ msgid "variable"
+#~ msgstr "Variabele"
+
+#, fuzzy
+#~ msgid "template"
+#~ msgstr "Sjabloon"
+
+#, fuzzy
+#~ msgid "package list"
+#~ msgstr "Pakketlijst"
+
+#, fuzzy
+#~ msgid "You have no permission to create a new %s!"
+#~ msgstr "U heeft geen toestemming deze objectgroep te verwijderen!"
+
+#, fuzzy
+#~ msgid "profile"
+#~ msgstr "Profielen"
+
+#, fuzzy
+#~ msgid "FAI releases"
+#~ msgstr "FAI klassen"
+
+#, fuzzy
+#~ msgid "FAI release management"
+#~ msgstr "Blokkeerlijst beheer"
+
 #, fuzzy
 #~ msgid "Partition start size"
 #~ msgstr "Partities"
@@ -2599,11 +2590,3 @@ msgstr "Services"
 #, fuzzy
 #~ msgid "There is already a FAI object with this class name defined."
 #~ msgstr "Er bestaat al een profiel met deze klassenaam."
-
-#~ 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."
diff --git a/gosa-plugins/fai/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/fai/locale/pl/LC_MESSAGES/messages.po
index bedec209d..1e77f571d 100644
--- a/gosa-plugins/fai/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/fai/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-19 14:24+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -42,11 +42,12 @@ msgstr "Ścieżka docelowa"
 #: admin/fai/faiPartitionTableEntry.tpl:13 admin/fai/faiHookEntry.tpl:19
 #: admin/fai/class_faiVariableEntry.inc:138
 #: admin/fai/class_faiTemplate.inc:545 admin/fai/class_faiScript.inc:646
-#: admin/fai/class_faiScriptEntry.inc:190 admin/fai/faiTemplate.tpl:21
-#: admin/fai/class_faiPartitionTable.inc:789 admin/fai/faiVariableEntry.tpl:19
-#: admin/fai/class_faiHookEntry.inc:197 admin/fai/class_faiVariable.inc:398
-#: admin/fai/faiPartition.tpl:20 admin/fai/class_faiPackage.inc:658
-#: admin/fai/class_faiTemplateEntry.inc:300 admin/fai/faiPartitionTable.tpl:21
+#: admin/fai/class_faiScriptEntry.inc:190 admin/fai/fai-list.xml:49
+#: admin/fai/faiTemplate.tpl:21 admin/fai/class_faiPartitionTable.inc:789
+#: admin/fai/faiVariableEntry.tpl:19 admin/fai/class_faiHookEntry.inc:197
+#: admin/fai/class_faiVariable.inc:398 admin/fai/faiPartition.tpl:20
+#: admin/fai/class_faiPackage.inc:658 admin/fai/class_faiTemplateEntry.inc:300
+#: admin/fai/faiPartitionTable.tpl:21
 msgid "Description"
 msgstr "Opis"
 
@@ -135,21 +136,18 @@ msgstr "sticky"
 #: admin/fai/tabsScript.inc:33 admin/fai/tabsTemplate.inc:33
 #: admin/fai/class_faiHook.inc:239 admin/fai/class_faiDiskEntry.inc:427
 #: admin/fai/tabsPartition.inc:34 admin/fai/class_faiProfile.inc:262
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:636
-#: admin/fai/class_faiManagement.inc:642 admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiManagement.inc:972 admin/fai/class_faiManagement.inc:996
-#: admin/fai/class_faiManagement.inc:1245 admin/fai/class_faiTemplate.inc:212
-#: admin/fai/tabsVariable.inc:33 admin/fai/tabsPackage.inc:33
-#: admin/fai/class_faiScript.inc:229 admin/fai/class_FAI.inc:556
-#: admin/fai/class_faiScriptEntry.inc:59 admin/fai/class_faiScriptEntry.inc:62
-#: admin/fai/tabsHook.inc:32 admin/fai/class_faiPartitionTable.inc:244
+#: admin/fai/class_faiTemplate.inc:212 admin/fai/tabsVariable.inc:33
+#: admin/fai/tabsPackage.inc:33 admin/fai/class_faiScript.inc:229
+#: admin/fai/class_FAI.inc:556 admin/fai/class_faiScriptEntry.inc:59
+#: admin/fai/class_faiScriptEntry.inc:62 admin/fai/tabsHook.inc:32
+#: admin/fai/class_faiPartitionTable.inc:244
 #: admin/fai/class_faiPartitionTable.inc:307
 #: admin/fai/class_faiHookEntry.inc:62 admin/fai/class_faiHookEntry.inc:65
 #: admin/fai/class_faiVariable.inc:142 admin/fai/class_faiPackage.inc:348
 #: admin/fai/class_faiSummaryTab.inc:94 admin/fai/tabsProfile.inc:33
-#: admin/systems/services/repository/class_servRepository.inc:142
-#: admin/systems/services/repository/class_servRepository.inc:177
-#: admin/systems/services/repository/class_servRepository.inc:182
+#: admin/systems/services/repository/class_servRepository.inc:179
+#: admin/systems/services/repository/class_servRepository.inc:213
+#: admin/systems/services/repository/class_servRepository.inc:218
 #: admin/systems/services/repository/class_servRepositorySetup.inc:204
 msgid "Error"
 msgstr "Błąd"
@@ -170,8 +168,7 @@ msgid ""
 "The file encodig has changed from '%s' to '%s'. Do you really want to save?"
 msgstr ""
 
-#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:542
-#: admin/fai/class_faiManagement.inc:1315 admin/fai/remove_branch.tpl:2
+#: admin/fai/remove.tpl:2 admin/fai/remove_branch.tpl:2
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
@@ -209,9 +206,7 @@ msgstr "Urządzenie"
 #: admin/fai/faiPackage.tpl:9 admin/fai/faiHook.tpl:9
 #: admin/fai/class_faiProfile.inc:395 admin/fai/class_faiProfile.inc:405
 #: admin/fai/class_faiProfile.inc:478 admin/fai/faiPartitionTableEntry.tpl:6
-#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiManagement.inc:636
-#: admin/fai/class_faiManagement.inc:642
-#: admin/fai/class_faiVariableEntry.inc:90
+#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiVariableEntry.inc:90
 #: admin/fai/class_faiVariableEntry.inc:99
 #: admin/fai/class_faiVariableEntry.inc:102
 #: admin/fai/class_faiVariableEntry.inc:137
@@ -222,8 +217,8 @@ msgstr "Urządzenie"
 #: admin/fai/class_faiScriptEntry.inc:137
 #: admin/fai/class_faiScriptEntry.inc:142
 #: admin/fai/class_faiScriptEntry.inc:145
-#: admin/fai/class_faiScriptEntry.inc:189 admin/fai/faiTemplate.tpl:9
-#: admin/fai/class_faiPartitionTable.inc:490
+#: admin/fai/class_faiScriptEntry.inc:189 admin/fai/fai-list.xml:41
+#: admin/fai/faiTemplate.tpl:9 admin/fai/class_faiPartitionTable.inc:490
 #: admin/fai/class_faiPartitionTable.inc:788 admin/fai/faiVariableEntry.tpl:9
 #: admin/fai/class_faiHookEntry.inc:145 admin/fai/class_faiHookEntry.inc:150
 #: admin/fai/class_faiHookEntry.inc:153 admin/fai/class_faiHookEntry.inc:196
@@ -232,7 +227,7 @@ msgstr "Urządzenie"
 #: admin/fai/class_faiPackage.inc:657 admin/fai/class_faiTemplateEntry.inc:233
 #: admin/fai/class_faiTemplateEntry.inc:299
 #: admin/fai/class_faiSummaryTab.inc:348 admin/fai/faiPartitionTable.tpl:9
-#: admin/systems/services/repository/class_servRepository.inc:177
+#: admin/systems/services/repository/class_servRepository.inc:213
 msgid "Name"
 msgstr "Imię"
 
@@ -337,7 +332,7 @@ msgid "True"
 msgstr "Tak"
 
 #: admin/fai/class_faiPartitionTableEntry.inc:252
-#: admin/fai/class_faiPartitionTableEntry.inc:254
+#: admin/fai/class_faiPartitionTableEntry.inc:254 admin/fai/fai-list.xml:93
 #: admin/fai/class_divListFai.inc:178
 msgid "Remove"
 msgstr "Usuń"
@@ -442,7 +437,7 @@ msgid "Choose a variable to delete or edit"
 msgstr "Wybierz zmienną do usunięcia lub edycji"
 
 #: admin/fai/faiVariable.tpl:53 admin/fai/class_faiHook.inc:312
-#: admin/fai/class_faiHook.inc:314
+#: admin/fai/class_faiHook.inc:314 admin/fai/fai-list.xml:86
 msgid "Edit"
 msgstr "Edytuj"
 
@@ -574,12 +569,12 @@ msgstr "Lista skryptów"
 
 #: admin/fai/faiPackage.tpl:33
 #: admin/systems/services/repository/servRepositorySetup.tpl:1
-#: admin/systems/services/repository/class_servRepository.inc:343
+#: admin/systems/services/repository/class_servRepository.inc:406
 msgid "Repository"
 msgstr "Repozytorium"
 
 #: admin/fai/faiPackage.tpl:37 admin/fai/branch_selector.tpl:25
-#: admin/fai/class_faiPackage.inc:663
+#: admin/fai/fai-filter.tpl:14 admin/fai/class_faiPackage.inc:663
 #: admin/systems/services/repository/class_divListRepositories.inc:23
 #: admin/systems/services/repository/servRepositorySetup.tpl:19
 #: admin/systems/services/repository/class_servRepositorySetup.inc:153
@@ -691,11 +686,19 @@ msgstr "Proszę wybrać istniejące zadanie FAI"
 msgid "List of available packages"
 msgstr "Lista dostępnych pakietów"
 
-#: admin/fai/faiPackageEntry.tpl:20 admin/fai/faiProfileEntry.tpl:21
+#: admin/fai/faiPackageEntry.tpl:17
+#, fuzzy
+msgid ""
+"The search returned too many results, only the first 200 entries are shown."
+msgstr ""
+"Szukany ciąg znaków '%s' zwrócił za dużo wyników. Pokazanych jest tylko "
+"pierwsze 200 elementów aby zaoszczędzić pamięć. "
+
+#: admin/fai/faiPackageEntry.tpl:26 admin/fai/faiProfileEntry.tpl:21
 msgid "Information"
 msgstr "Informacja"
 
-#: admin/fai/faiPackageEntry.tpl:24
+#: admin/fai/faiPackageEntry.tpl:30
 msgid ""
 "This menu allows you to select multiple packages to add them to the "
 "currently edited package list."
@@ -703,152 +706,29 @@ msgstr ""
 "To menu umożliwia wybieranie wielu pakietów i dodawanie ich do obecnie "
 "edytowanej listy pakietów."
 
-#: admin/fai/faiPackageEntry.tpl:30 admin/fai/faiProfileEntry.tpl:31
+#: admin/fai/faiPackageEntry.tpl:36 admin/fai/faiProfileEntry.tpl:31
 msgid "Filters"
 msgstr "Filtry"
 
-#: admin/fai/faiPackageEntry.tpl:40 admin/fai/faiProfileEntry.tpl:54
+#: admin/fai/faiPackageEntry.tpl:46 admin/fai/faiProfileEntry.tpl:54
 #: admin/fai/faiProfileEntry.tpl:55
 msgid "Display objects matching"
 msgstr "Wyświetl obiekty pasujące"
 
-#: admin/fai/faiPackageEntry.tpl:44 admin/fai/faiProfileEntry.tpl:59
+#: admin/fai/faiPackageEntry.tpl:50 admin/fai/faiProfileEntry.tpl:59
 #: admin/systems/services/repository/class_divListRepositories.inc:26
 msgid "Regular expression for matching object names"
 msgstr "Wyrażenie regularne dla dopasowania nazw obiektów"
 
-#: admin/fai/class_faiManagement.inc:25 admin/fai/main.inc:53
-#: admin/fai/main.inc:55
+#: admin/fai/class_faiManagement.inc:25
 #, fuzzy
-msgid "Software deployment"
-msgstr "Zarządzanie systemem"
+msgid "Roles"
+msgstr "Pełniona funkcja"
 
 #: admin/fai/class_faiManagement.inc:26
-msgid "Manage software packages and deployment reciepes"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:362 admin/fai/class_faiManagement.inc:524
-#: admin/fai/class_faiManagement.inc:671 admin/fai/class_faiManagement.inc:833
-#: admin/fai/class_faiManagement.inc:854 admin/fai/class_faiManagement.inc:898
-#: admin/fai/class_faiManagement.inc:915
-#, fuzzy
-msgid "Permission error"
-msgstr "Uprawnienia"
-
-#: admin/fai/class_faiManagement.inc:413
-#, fuzzy
-msgid "Branch locked"
-msgstr "Gałęzie"
-
-#: admin/fai/class_faiManagement.inc:413
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:429
-#, fuzzy
-msgid "FAI object"
-msgstr "Drzewo obiektów FAI"
-
-#: admin/fai/class_faiManagement.inc:521
-msgid "FAI branch/freeze"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:524
 #, fuzzy
-msgid "You have no permission to delete this release!"
-msgstr "Brak uprawnień do usunięcia tego wydania!"
-
-#: admin/fai/class_faiManagement.inc:542
-msgid "Release remove aborted because the release name check failed!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:671 admin/fai/class_faiManagement.inc:833
-#: admin/fai/class_faiManagement.inc:854
-#, fuzzy
-msgid "Branch"
-msgstr "Gałęzie"
-
-#: admin/fai/class_faiManagement.inc:779
-#: admin/fai/class_faiManagement.inc:1054
-#: admin/fai/class_faiManagement.inc:1060
-msgid "Continue"
-msgstr "Kontynuuj"
-
-#: admin/fai/class_faiManagement.inc:810
-#: admin/fai/class_faiPackageEntry.inc:53
-#: admin/fai/class_faiPackageEntry.inc:193 admin/fai/class_FAI.inc:574
-#: admin/fai/class_faiPackageConfiguration.inc:35
-#: admin/fai/class_faiPackage.inc:258 admin/fai/class_faiPackage.inc:554
-#: admin/systems/services/repository/class_servRepository.inc:326
-#, fuzzy
-msgid "Service infrastructure"
-msgstr "Szukaj wewnątrz tego poddrzewa"
-
-#: admin/fai/class_faiManagement.inc:815 admin/fai/class_FAI.inc:1178
-#, fuzzy
-msgid "Fatal error"
-msgstr "Terminal Server"
-
-#: admin/fai/class_faiManagement.inc:875
-#, fuzzy
-msgid "partition table"
-msgstr "Tablica partycji"
-
-#: admin/fai/class_faiManagement.inc:876
-#, fuzzy
-msgid "script"
-msgstr "Skrypt"
-
-#: admin/fai/class_faiManagement.inc:877
-#, fuzzy
-msgid "hook"
-msgstr "Zaczep"
-
-#: admin/fai/class_faiManagement.inc:878
-#, fuzzy
-msgid "variable"
-msgstr "Zmienna"
-
-#: admin/fai/class_faiManagement.inc:879
-#, fuzzy
-msgid "template"
-msgstr "Szablon"
-
-#: admin/fai/class_faiManagement.inc:880
-#, fuzzy
-msgid "package list"
-msgstr "Lista pakietów"
-
-#: admin/fai/class_faiManagement.inc:898 admin/fai/class_faiManagement.inc:915
-#, fuzzy, php-format
-msgid "You have no permission to create a new %s!"
-msgstr "Brak uprawnień do usunięcia grupy obiektowej."
-
-#: admin/fai/class_faiManagement.inc:915
-#, fuzzy
-msgid "profile"
-msgstr "Profile"
-
-#: admin/fai/class_faiManagement.inc:1315
-msgid ""
-"The selected release is not available anymore. All triggered actions are "
-"skipped."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:1462
-#, fuzzy
-msgid "FAI releases"
-msgstr "Klasy FAI"
-
-#: admin/fai/class_faiManagement.inc:1463
-#, fuzzy
-msgid "FAI release management"
-msgstr "Zarządzanie FAI"
-
-#: admin/fai/class_faiManagement.inc:1468
-msgid "FAI"
-msgstr "FAI"
+msgid "Role management"
+msgstr "Zarządzanie ACL"
 
 #: admin/fai/class_faiVariableEntry.inc:94
 #, fuzzy
@@ -898,6 +778,15 @@ msgstr "Odczyt"
 msgid "Please enter your search string here"
 msgstr "Proszę podać szukany ciąg znaków"
 
+#: admin/fai/class_faiPackageEntry.inc:53
+#: admin/fai/class_faiPackageEntry.inc:195 admin/fai/class_FAI.inc:574
+#: admin/fai/class_faiPackageConfiguration.inc:35
+#: admin/fai/class_faiPackage.inc:258 admin/fai/class_faiPackage.inc:554
+#: admin/systems/services/repository/class_servRepository.inc:362
+#, fuzzy
+msgid "Service infrastructure"
+msgstr "Szukaj wewnątrz tego poddrzewa"
+
 #: admin/fai/class_faiPackageEntry.inc:103
 msgid ""
 "This list displays all assigned package names for this repository settings."
@@ -1086,6 +975,11 @@ msgstr "Nie można utworzyć '%s', nazwa docelowa już istnieje."
 msgid "Error while fetching source dn - aborted!"
 msgstr "Błąd podczas pobierania źródłowego dn - anulowano!"
 
+#: admin/fai/class_FAI.inc:1178
+#, fuzzy
+msgid "Fatal error"
+msgstr "Terminal Server"
+
 #: admin/fai/class_FAI.inc:1179
 #, php-format
 msgid ""
@@ -1113,6 +1007,37 @@ msgstr "Skrypt FAI"
 msgid "Script Priority"
 msgstr "Priorytet skryptu"
 
+#: admin/fai/fai-list.xml:11
+msgid "List of fai stuff!!!!!"
+msgstr ""
+
+#: admin/fai/fai-list.xml:15
+msgid "FAI"
+msgstr "FAI"
+
+#: admin/fai/fai-list.xml:57 admin/fai/class_divListFai.inc:55
+#: admin/fai/class_divListFai.inc:138
+msgid "Actions"
+msgstr "Akcje"
+
+#: admin/fai/fai-list.xml:68 admin/fai/class_divListFai.inc:140
+msgid "Create"
+msgstr "Utwórz"
+
+#: admin/fai/fai-list.xml:74
+msgid "Role"
+msgstr "Pełniona funkcja"
+
+#: admin/fai/fai-list.xml:125
+#, fuzzy
+msgid "Edit role"
+msgstr "Edytuj makro"
+
+#: admin/fai/fai-list.xml:138
+#, fuzzy
+msgid "Remove role"
+msgstr "Usuń obiekt"
+
 #: admin/fai/faiSummary.tpl:4
 msgid "FAI object tree"
 msgstr "Drzewo obiektów FAI"
@@ -1276,7 +1201,7 @@ msgid "FAI partition table"
 msgstr "Tablica partycji FAI"
 
 #: admin/fai/branch_selector.tpl:2
-#: admin/systems/services/repository/class_servRepository.inc:358
+#: admin/systems/services/repository/class_servRepository.inc:421
 #, fuzzy
 msgid "Releases"
 msgstr "Wersja"
@@ -1448,10 +1373,6 @@ msgstr "Wybierz"
 msgid "Class types"
 msgstr "Typ klasy"
 
-#: admin/fai/class_divListFai.inc:55 admin/fai/class_divListFai.inc:138
-msgid "Actions"
-msgstr "Akcje"
-
 #: admin/fai/class_divListFai.inc:57 admin/fai/class_divListFai.inc:59
 #: admin/fai/class_divListFai.inc:61 admin/fai/class_divListFai.inc:63
 #: admin/fai/class_divListFai.inc:65 admin/fai/class_divListFai.inc:67
@@ -1513,10 +1434,6 @@ msgstr "Grupy obiektów"
 msgid "Display users matching"
 msgstr "Wyświetl użytkowników pasujących"
 
-#: admin/fai/class_divListFai.inc:140
-msgid "Create"
-msgstr "Utwórz"
-
 #: admin/fai/class_divListFai.inc:155
 msgid "PT"
 msgstr "PT"
@@ -1643,6 +1560,11 @@ msgstr ""
 msgid "Tune options"
 msgstr "Opcje montowania"
 
+#: admin/fai/fai-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filtry"
+
 #: admin/fai/class_faiPackage.inc:220
 msgid "Invalid package names"
 msgstr ""
@@ -1819,7 +1741,7 @@ msgstr "To menu umożliwia tworzenie, usuwanie oraz edycję klas FAI."
 #: admin/systems/services/repository/class_divListRepositories.inc:24
 #: admin/systems/services/repository/class_divListRepositories.inc:64
 #: admin/systems/services/repository/servRepositorySetup.tpl:39
-#: admin/systems/services/repository/class_servRepository.inc:360
+#: admin/systems/services/repository/class_servRepository.inc:423
 #, fuzzy
 msgid "Sections"
 msgstr "Sekcja"
@@ -1830,34 +1752,102 @@ msgid "Add repository"
 msgstr "Katalog"
 
 #: admin/systems/services/repository/servRepositorySetup.tpl:8
-#: admin/systems/services/repository/class_servRepository.inc:357
+#: admin/systems/services/repository/class_servRepository.inc:420
 #, fuzzy
 msgid "Parent server"
 msgstr "Zachowaj"
 
 #: admin/systems/services/repository/servRepositorySetup.tpl:28
-#: admin/systems/services/repository/class_servRepository.inc:359
+#: admin/systems/services/repository/class_servRepository.inc:422
 #: admin/systems/services/repository/class_servRepositorySetup.inc:157
 msgid "URL"
 msgstr ""
 
 #: admin/systems/services/repository/class_servRepository.inc:26
-#: admin/systems/services/repository/class_servRepository.inc:308
 #: admin/systems/services/repository/class_servRepository.inc:344
+#: admin/systems/services/repository/class_servRepository.inc:388
+#: admin/systems/services/repository/class_servRepository.inc:407
 #: admin/systems/services/repository/class_servRepositorySetup.inc:204
 #, fuzzy
 msgid "Repository service"
 msgstr "Repozytorium"
 
-#: admin/systems/services/repository/class_servRepository.inc:142
+#: admin/systems/services/repository/class_servRepository.inc:179
 #, fuzzy
 msgid "FAI release"
 msgstr "Klasy FAI"
 
-#: admin/systems/services/repository/class_servRepository.inc:344
+#: admin/systems/services/repository/class_servRepository.inc:407
 msgid "Services"
 msgstr "Usługi"
 
+#, fuzzy
+#~ msgid "Software deployment"
+#~ msgstr "Zarządzanie systemem"
+
+#, fuzzy
+#~ msgid "Permission error"
+#~ msgstr "Uprawnienia"
+
+#, fuzzy
+#~ msgid "Branch locked"
+#~ msgstr "Gałęzie"
+
+#, fuzzy
+#~ msgid "FAI object"
+#~ msgstr "Drzewo obiektów FAI"
+
+#, fuzzy
+#~ msgid "You have no permission to delete this release!"
+#~ msgstr "Brak uprawnień do usunięcia tego wydania!"
+
+#, fuzzy
+#~ msgid "Branch"
+#~ msgstr "Gałęzie"
+
+#~ msgid "Continue"
+#~ msgstr "Kontynuuj"
+
+#, fuzzy
+#~ msgid "partition table"
+#~ msgstr "Tablica partycji"
+
+#, fuzzy
+#~ msgid "script"
+#~ msgstr "Skrypt"
+
+#, fuzzy
+#~ msgid "hook"
+#~ msgstr "Zaczep"
+
+#, fuzzy
+#~ msgid "variable"
+#~ msgstr "Zmienna"
+
+#, fuzzy
+#~ msgid "template"
+#~ msgstr "Szablon"
+
+#, fuzzy
+#~ msgid "package list"
+#~ msgstr "Lista pakietów"
+
+#, fuzzy
+#~ msgid "You have no permission to create a new %s!"
+#~ msgstr "Brak uprawnień do usunięcia grupy obiektowej."
+
+#, fuzzy
+#~ msgid "profile"
+#~ msgstr "Profile"
+
+#, fuzzy
+#~ msgid "FAI releases"
+#~ msgstr "Klasy FAI"
+
+#, fuzzy
+#~ msgid "FAI release management"
+#~ msgstr "Zarządzanie FAI"
+
 #, fuzzy
 #~ msgid "Partition start size"
 #~ msgstr "Rozmiar partycji"
@@ -2559,10 +2549,3 @@ msgstr "Usługi"
 #, fuzzy
 #~ msgid "There is already a FAI object with this class name defined."
 #~ msgstr "Już istnieje profil ze zdefiniowaną tą nazwą klasy."
-
-#~ msgid ""
-#~ "Your specified search string '%s' returned too many results. Only the "
-#~ "first 200 entries are shown, to keep the memory usage low."
-#~ msgstr ""
-#~ "Szukany ciąg znaków '%s' zwrócił za dużo wyników. Pokazanych jest tylko "
-#~ "pierwsze 200 elementów aby zaoszczędzić pamięć. "
diff --git a/gosa-plugins/fai/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/fai/locale/ru/LC_MESSAGES/messages.po
index ddaf18a27..76159c0a3 100644
--- a/gosa-plugins/fai/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/fai/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-19 14:24+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -43,11 +43,12 @@ msgstr "Назначение"
 #: admin/fai/faiPartitionTableEntry.tpl:13 admin/fai/faiHookEntry.tpl:19
 #: admin/fai/class_faiVariableEntry.inc:138
 #: admin/fai/class_faiTemplate.inc:545 admin/fai/class_faiScript.inc:646
-#: admin/fai/class_faiScriptEntry.inc:190 admin/fai/faiTemplate.tpl:21
-#: admin/fai/class_faiPartitionTable.inc:789 admin/fai/faiVariableEntry.tpl:19
-#: admin/fai/class_faiHookEntry.inc:197 admin/fai/class_faiVariable.inc:398
-#: admin/fai/faiPartition.tpl:20 admin/fai/class_faiPackage.inc:658
-#: admin/fai/class_faiTemplateEntry.inc:300 admin/fai/faiPartitionTable.tpl:21
+#: admin/fai/class_faiScriptEntry.inc:190 admin/fai/fai-list.xml:49
+#: admin/fai/faiTemplate.tpl:21 admin/fai/class_faiPartitionTable.inc:789
+#: admin/fai/faiVariableEntry.tpl:19 admin/fai/class_faiHookEntry.inc:197
+#: admin/fai/class_faiVariable.inc:398 admin/fai/faiPartition.tpl:20
+#: admin/fai/class_faiPackage.inc:658 admin/fai/class_faiTemplateEntry.inc:300
+#: admin/fai/faiPartitionTable.tpl:21
 msgid "Description"
 msgstr "Описание"
 
@@ -149,21 +150,18 @@ msgstr "Состояние"
 #: admin/fai/tabsScript.inc:33 admin/fai/tabsTemplate.inc:33
 #: admin/fai/class_faiHook.inc:239 admin/fai/class_faiDiskEntry.inc:427
 #: admin/fai/tabsPartition.inc:34 admin/fai/class_faiProfile.inc:262
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:636
-#: admin/fai/class_faiManagement.inc:642 admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiManagement.inc:972 admin/fai/class_faiManagement.inc:996
-#: admin/fai/class_faiManagement.inc:1245 admin/fai/class_faiTemplate.inc:212
-#: admin/fai/tabsVariable.inc:33 admin/fai/tabsPackage.inc:33
-#: admin/fai/class_faiScript.inc:229 admin/fai/class_FAI.inc:556
-#: admin/fai/class_faiScriptEntry.inc:59 admin/fai/class_faiScriptEntry.inc:62
-#: admin/fai/tabsHook.inc:32 admin/fai/class_faiPartitionTable.inc:244
+#: admin/fai/class_faiTemplate.inc:212 admin/fai/tabsVariable.inc:33
+#: admin/fai/tabsPackage.inc:33 admin/fai/class_faiScript.inc:229
+#: admin/fai/class_FAI.inc:556 admin/fai/class_faiScriptEntry.inc:59
+#: admin/fai/class_faiScriptEntry.inc:62 admin/fai/tabsHook.inc:32
+#: admin/fai/class_faiPartitionTable.inc:244
 #: admin/fai/class_faiPartitionTable.inc:307
 #: admin/fai/class_faiHookEntry.inc:62 admin/fai/class_faiHookEntry.inc:65
 #: admin/fai/class_faiVariable.inc:142 admin/fai/class_faiPackage.inc:348
 #: admin/fai/class_faiSummaryTab.inc:94 admin/fai/tabsProfile.inc:33
-#: admin/systems/services/repository/class_servRepository.inc:142
-#: admin/systems/services/repository/class_servRepository.inc:177
-#: admin/systems/services/repository/class_servRepository.inc:182
+#: admin/systems/services/repository/class_servRepository.inc:179
+#: admin/systems/services/repository/class_servRepository.inc:213
+#: admin/systems/services/repository/class_servRepository.inc:218
 #: admin/systems/services/repository/class_servRepositorySetup.inc:204
 msgid "Error"
 msgstr ""
@@ -181,8 +179,7 @@ msgid ""
 "The file encodig has changed from '%s' to '%s'. Do you really want to save?"
 msgstr ""
 
-#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:542
-#: admin/fai/class_faiManagement.inc:1315 admin/fai/remove_branch.tpl:2
+#: admin/fai/remove.tpl:2 admin/fai/remove_branch.tpl:2
 msgid "Warning"
 msgstr "Предупреждение"
 
@@ -225,9 +222,7 @@ msgstr "Устройства"
 #: admin/fai/faiPackage.tpl:9 admin/fai/faiHook.tpl:9
 #: admin/fai/class_faiProfile.inc:395 admin/fai/class_faiProfile.inc:405
 #: admin/fai/class_faiProfile.inc:478 admin/fai/faiPartitionTableEntry.tpl:6
-#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiManagement.inc:636
-#: admin/fai/class_faiManagement.inc:642
-#: admin/fai/class_faiVariableEntry.inc:90
+#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiVariableEntry.inc:90
 #: admin/fai/class_faiVariableEntry.inc:99
 #: admin/fai/class_faiVariableEntry.inc:102
 #: admin/fai/class_faiVariableEntry.inc:137
@@ -238,8 +233,8 @@ msgstr "Устройства"
 #: admin/fai/class_faiScriptEntry.inc:137
 #: admin/fai/class_faiScriptEntry.inc:142
 #: admin/fai/class_faiScriptEntry.inc:145
-#: admin/fai/class_faiScriptEntry.inc:189 admin/fai/faiTemplate.tpl:9
-#: admin/fai/class_faiPartitionTable.inc:490
+#: admin/fai/class_faiScriptEntry.inc:189 admin/fai/fai-list.xml:41
+#: admin/fai/faiTemplate.tpl:9 admin/fai/class_faiPartitionTable.inc:490
 #: admin/fai/class_faiPartitionTable.inc:788 admin/fai/faiVariableEntry.tpl:9
 #: admin/fai/class_faiHookEntry.inc:145 admin/fai/class_faiHookEntry.inc:150
 #: admin/fai/class_faiHookEntry.inc:153 admin/fai/class_faiHookEntry.inc:196
@@ -248,7 +243,7 @@ msgstr "Устройства"
 #: admin/fai/class_faiPackage.inc:657 admin/fai/class_faiTemplateEntry.inc:233
 #: admin/fai/class_faiTemplateEntry.inc:299
 #: admin/fai/class_faiSummaryTab.inc:348 admin/fai/faiPartitionTable.tpl:9
-#: admin/systems/services/repository/class_servRepository.inc:177
+#: admin/systems/services/repository/class_servRepository.inc:213
 msgid "Name"
 msgstr "Фамилия"
 
@@ -365,7 +360,7 @@ msgid "True"
 msgstr "Улица"
 
 #: admin/fai/class_faiPartitionTableEntry.inc:252
-#: admin/fai/class_faiPartitionTableEntry.inc:254
+#: admin/fai/class_faiPartitionTableEntry.inc:254 admin/fai/fai-list.xml:93
 #: admin/fai/class_divListFai.inc:178
 msgid "Remove"
 msgstr "Удалить"
@@ -472,7 +467,7 @@ msgid "Choose a variable to delete or edit"
 msgstr ""
 
 #: admin/fai/faiVariable.tpl:53 admin/fai/class_faiHook.inc:312
-#: admin/fai/class_faiHook.inc:314
+#: admin/fai/class_faiHook.inc:314 admin/fai/fai-list.xml:86
 msgid "Edit"
 msgstr "Изменить"
 
@@ -607,13 +602,13 @@ msgstr "Список пользователей"
 
 #: admin/fai/faiPackage.tpl:33
 #: admin/systems/services/repository/servRepositorySetup.tpl:1
-#: admin/systems/services/repository/class_servRepository.inc:343
+#: admin/systems/services/repository/class_servRepository.inc:406
 #, fuzzy
 msgid "Repository"
 msgstr "Повторить"
 
 #: admin/fai/faiPackage.tpl:37 admin/fai/branch_selector.tpl:25
-#: admin/fai/class_faiPackage.inc:663
+#: admin/fai/fai-filter.tpl:14 admin/fai/class_faiPackage.inc:663
 #: admin/systems/services/repository/class_divListRepositories.inc:23
 #: admin/systems/services/repository/servRepositorySetup.tpl:19
 #: admin/systems/services/repository/class_servRepositorySetup.inc:153
@@ -740,11 +735,16 @@ msgstr ""
 msgid "List of available packages"
 msgstr "Выберите тип мыши"
 
-#: admin/fai/faiPackageEntry.tpl:20 admin/fai/faiProfileEntry.tpl:21
+#: admin/fai/faiPackageEntry.tpl:17
+msgid ""
+"The search returned too many results, only the first 200 entries are shown."
+msgstr ""
+
+#: admin/fai/faiPackageEntry.tpl:26 admin/fai/faiProfileEntry.tpl:21
 msgid "Information"
 msgstr "Информация"
 
-#: admin/fai/faiPackageEntry.tpl:24
+#: admin/fai/faiPackageEntry.tpl:30
 #, fuzzy
 msgid ""
 "This menu allows you to select multiple packages to add them to the "
@@ -754,154 +754,30 @@ msgstr ""
 "листы. Если у вас достаточно большое количество списков, вы можете "
 "использовать групповое выделение."
 
-#: admin/fai/faiPackageEntry.tpl:30 admin/fai/faiProfileEntry.tpl:31
+#: admin/fai/faiPackageEntry.tpl:36 admin/fai/faiProfileEntry.tpl:31
 msgid "Filters"
 msgstr "Фильтры"
 
-#: admin/fai/faiPackageEntry.tpl:40 admin/fai/faiProfileEntry.tpl:54
+#: admin/fai/faiPackageEntry.tpl:46 admin/fai/faiProfileEntry.tpl:54
 #: admin/fai/faiProfileEntry.tpl:55
 msgid "Display objects matching"
 msgstr "Показать совпадения объектов"
 
-#: admin/fai/faiPackageEntry.tpl:44 admin/fai/faiProfileEntry.tpl:59
+#: admin/fai/faiPackageEntry.tpl:50 admin/fai/faiProfileEntry.tpl:59
 #: admin/systems/services/repository/class_divListRepositories.inc:26
 msgid "Regular expression for matching object names"
 msgstr "Регулярное выражение, соответствующее именам объектов"
 
-#: admin/fai/class_faiManagement.inc:25 admin/fai/main.inc:53
-#: admin/fai/main.inc:55
+#: admin/fai/class_faiManagement.inc:25
 #, fuzzy
-msgid "Software deployment"
-msgstr "Управление системами"
+msgid "Roles"
+msgstr "Роль"
 
 #: admin/fai/class_faiManagement.inc:26
-msgid "Manage software packages and deployment reciepes"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:362 admin/fai/class_faiManagement.inc:524
-#: admin/fai/class_faiManagement.inc:671 admin/fai/class_faiManagement.inc:833
-#: admin/fai/class_faiManagement.inc:854 admin/fai/class_faiManagement.inc:898
-#: admin/fai/class_faiManagement.inc:915
-#, fuzzy
-msgid "Permission error"
-msgstr "Права для членов группы"
-
-#: admin/fai/class_faiManagement.inc:413
-#, fuzzy
-msgid "Branch locked"
-msgstr "Отмена"
-
-#: admin/fai/class_faiManagement.inc:413
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:429
-#, fuzzy
-msgid "FAI object"
-msgstr "Имя объекта"
-
-#: admin/fai/class_faiManagement.inc:521
-msgid "FAI branch/freeze"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:524
 #, fuzzy
-msgid "You have no permission to delete this release!"
-msgstr "У вас недостаточно прав для удаления этого пользователя!"
-
-#: admin/fai/class_faiManagement.inc:542
-msgid "Release remove aborted because the release name check failed!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:671 admin/fai/class_faiManagement.inc:833
-#: admin/fai/class_faiManagement.inc:854
-#, fuzzy
-msgid "Branch"
-msgstr "Отмена"
-
-#: admin/fai/class_faiManagement.inc:779
-#: admin/fai/class_faiManagement.inc:1054
-#: admin/fai/class_faiManagement.inc:1060
-msgid "Continue"
-msgstr "Продолжить"
-
-#: admin/fai/class_faiManagement.inc:810
-#: admin/fai/class_faiPackageEntry.inc:53
-#: admin/fai/class_faiPackageEntry.inc:193 admin/fai/class_FAI.inc:574
-#: admin/fai/class_faiPackageConfiguration.inc:35
-#: admin/fai/class_faiPackage.inc:258 admin/fai/class_faiPackage.inc:554
-#: admin/systems/services/repository/class_servRepository.inc:326
-#, fuzzy
-msgid "Service infrastructure"
-msgstr "Искать в поддеревьях"
-
-#: admin/fai/class_faiManagement.inc:815 admin/fai/class_FAI.inc:1178
-#, fuzzy
-msgid "Fatal error"
-msgstr "Терминал-сервер"
-
-#: admin/fai/class_faiManagement.inc:875
-#, fuzzy
-msgid "partition table"
-msgstr "Переменная"
-
-#: admin/fai/class_faiManagement.inc:876
-#, fuzzy
-msgid "script"
-msgstr "Путь к сценариям"
-
-#: admin/fai/class_faiManagement.inc:877
-#, fuzzy
-msgid "hook"
-msgstr "Ошибка LDAP:"
-
-#: admin/fai/class_faiManagement.inc:878
-#, fuzzy
-msgid "variable"
-msgstr "Переменная"
-
-#: admin/fai/class_faiManagement.inc:879
-#, fuzzy
-msgid "template"
-msgstr "Шаблон"
-
-#: admin/fai/class_faiManagement.inc:880
-#, fuzzy
-msgid "package list"
-msgstr "Число страниц"
-
-#: admin/fai/class_faiManagement.inc:898 admin/fai/class_faiManagement.inc:915
-#, fuzzy, php-format
-msgid "You have no permission to create a new %s!"
-msgstr "У вас недостаточно прав для удаления этого группового объекта!"
-
-#: admin/fai/class_faiManagement.inc:915
-#, fuzzy
-msgid "profile"
-msgstr "Путь к профилю"
-
-#: admin/fai/class_faiManagement.inc:1315
-msgid ""
-"The selected release is not available anymore. All triggered actions are "
-"skipped."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:1462
-#, fuzzy
-msgid "FAI releases"
-msgstr "Выберите тип мыши"
-
-#: admin/fai/class_faiManagement.inc:1463
-#, fuzzy
-msgid "FAI release management"
+msgid "Role management"
 msgstr "Управление подразделениями"
 
-#: admin/fai/class_faiManagement.inc:1468
-#, fuzzy
-msgid "FAI"
-msgstr "Идентификатор факса"
-
 #: admin/fai/class_faiVariableEntry.inc:94
 #, fuzzy
 msgid "Content"
@@ -955,6 +831,15 @@ msgstr "чтение"
 msgid "Please enter your search string here"
 msgstr "Введите корректный серийный номер"
 
+#: admin/fai/class_faiPackageEntry.inc:53
+#: admin/fai/class_faiPackageEntry.inc:195 admin/fai/class_FAI.inc:574
+#: admin/fai/class_faiPackageConfiguration.inc:35
+#: admin/fai/class_faiPackage.inc:258 admin/fai/class_faiPackage.inc:554
+#: admin/systems/services/repository/class_servRepository.inc:362
+#, fuzzy
+msgid "Service infrastructure"
+msgstr "Искать в поддеревьях"
+
 #: admin/fai/class_faiPackageEntry.inc:103
 msgid ""
 "This list displays all assigned package names for this repository settings."
@@ -1158,6 +1043,11 @@ msgstr "Подразделение с таким именем уже сущес
 msgid "Error while fetching source dn - aborted!"
 msgstr ""
 
+#: admin/fai/class_FAI.inc:1178
+#, fuzzy
+msgid "Fatal error"
+msgstr "Терминал-сервер"
+
 #: admin/fai/class_FAI.inc:1179
 #, php-format
 msgid ""
@@ -1185,6 +1075,38 @@ msgstr "Показать хосты"
 msgid "Script Priority"
 msgstr "Путь к сценариям"
 
+#: admin/fai/fai-list.xml:11
+msgid "List of fai stuff!!!!!"
+msgstr ""
+
+#: admin/fai/fai-list.xml:15
+#, fuzzy
+msgid "FAI"
+msgstr "Идентификатор факса"
+
+#: admin/fai/fai-list.xml:57 admin/fai/class_divListFai.inc:55
+#: admin/fai/class_divListFai.inc:138
+msgid "Actions"
+msgstr "Действия"
+
+#: admin/fai/fai-list.xml:68 admin/fai/class_divListFai.inc:140
+msgid "Create"
+msgstr "Создать"
+
+#: admin/fai/fai-list.xml:74
+msgid "Role"
+msgstr "Роль"
+
+#: admin/fai/fai-list.xml:125
+#, fuzzy
+msgid "Edit role"
+msgstr "Пользователи домена"
+
+#: admin/fai/fai-list.xml:138
+#, fuzzy
+msgid "Remove role"
+msgstr "Включаемые объекты"
+
 #: admin/fai/faiSummary.tpl:4
 #, fuzzy
 msgid "FAI object tree"
@@ -1352,7 +1274,7 @@ msgid "FAI partition table"
 msgstr "Принтер"
 
 #: admin/fai/branch_selector.tpl:2
-#: admin/systems/services/repository/class_servRepository.inc:358
+#: admin/systems/services/repository/class_servRepository.inc:421
 #, fuzzy
 msgid "Releases"
 msgstr "Набор правил"
@@ -1519,10 +1441,6 @@ msgstr "Удалить"
 msgid "Class types"
 msgstr "Выберите тип мыши"
 
-#: admin/fai/class_divListFai.inc:55 admin/fai/class_divListFai.inc:138
-msgid "Actions"
-msgstr "Действия"
-
 #: admin/fai/class_divListFai.inc:57 admin/fai/class_divListFai.inc:59
 #: admin/fai/class_divListFai.inc:61 admin/fai/class_divListFai.inc:63
 #: admin/fai/class_divListFai.inc:65 admin/fai/class_divListFai.inc:67
@@ -1590,10 +1508,6 @@ msgstr "Объединения"
 msgid "Display users matching"
 msgstr "Фильтр"
 
-#: admin/fai/class_divListFai.inc:140
-msgid "Create"
-msgstr "Создать"
-
 #: admin/fai/class_divListFai.inc:155
 msgid "PT"
 msgstr ""
@@ -1720,6 +1634,11 @@ msgstr ""
 msgid "Tune options"
 msgstr "Дополнительные параметры"
 
+#: admin/fai/fai-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Фильтры"
+
 #: admin/fai/class_faiPackage.inc:220
 msgid "Invalid package names"
 msgstr ""
@@ -1913,7 +1832,7 @@ msgstr ""
 #: admin/systems/services/repository/class_divListRepositories.inc:24
 #: admin/systems/services/repository/class_divListRepositories.inc:64
 #: admin/systems/services/repository/servRepositorySetup.tpl:39
-#: admin/systems/services/repository/class_servRepository.inc:360
+#: admin/systems/services/repository/class_servRepository.inc:423
 #, fuzzy
 msgid "Sections"
 msgstr "Действие"
@@ -1924,34 +1843,102 @@ msgid "Add repository"
 msgstr "Каталог"
 
 #: admin/systems/services/repository/servRepositorySetup.tpl:8
-#: admin/systems/services/repository/class_servRepository.inc:357
+#: admin/systems/services/repository/class_servRepository.inc:420
 #, fuzzy
 msgid "Parent server"
 msgstr "серверы"
 
 #: admin/systems/services/repository/servRepositorySetup.tpl:28
-#: admin/systems/services/repository/class_servRepository.inc:359
+#: admin/systems/services/repository/class_servRepository.inc:422
 #: admin/systems/services/repository/class_servRepositorySetup.inc:157
 msgid "URL"
 msgstr ""
 
 #: admin/systems/services/repository/class_servRepository.inc:26
-#: admin/systems/services/repository/class_servRepository.inc:308
 #: admin/systems/services/repository/class_servRepository.inc:344
+#: admin/systems/services/repository/class_servRepository.inc:388
+#: admin/systems/services/repository/class_servRepository.inc:407
 #: admin/systems/services/repository/class_servRepositorySetup.inc:204
 #, fuzzy
 msgid "Repository service"
 msgstr "Повторить"
 
-#: admin/systems/services/repository/class_servRepository.inc:142
+#: admin/systems/services/repository/class_servRepository.inc:179
 #, fuzzy
 msgid "FAI release"
 msgstr "Выберите тип мыши"
 
-#: admin/systems/services/repository/class_servRepository.inc:344
+#: admin/systems/services/repository/class_servRepository.inc:407
 msgid "Services"
 msgstr "Сервисы"
 
+#, fuzzy
+#~ msgid "Software deployment"
+#~ msgstr "Управление системами"
+
+#, fuzzy
+#~ msgid "Permission error"
+#~ msgstr "Права для членов группы"
+
+#, fuzzy
+#~ msgid "Branch locked"
+#~ msgstr "Отмена"
+
+#, fuzzy
+#~ msgid "FAI object"
+#~ msgstr "Имя объекта"
+
+#, fuzzy
+#~ msgid "You have no permission to delete this release!"
+#~ msgstr "У вас недостаточно прав для удаления этого пользователя!"
+
+#, fuzzy
+#~ msgid "Branch"
+#~ msgstr "Отмена"
+
+#~ msgid "Continue"
+#~ msgstr "Продолжить"
+
+#, fuzzy
+#~ msgid "partition table"
+#~ msgstr "Переменная"
+
+#, fuzzy
+#~ msgid "script"
+#~ msgstr "Путь к сценариям"
+
+#, fuzzy
+#~ msgid "hook"
+#~ msgstr "Ошибка LDAP:"
+
+#, fuzzy
+#~ msgid "variable"
+#~ msgstr "Переменная"
+
+#, fuzzy
+#~ msgid "template"
+#~ msgstr "Шаблон"
+
+#, fuzzy
+#~ msgid "package list"
+#~ msgstr "Число страниц"
+
+#, fuzzy
+#~ msgid "You have no permission to create a new %s!"
+#~ msgstr "У вас недостаточно прав для удаления этого группового объекта!"
+
+#, fuzzy
+#~ msgid "profile"
+#~ msgstr "Путь к профилю"
+
+#, fuzzy
+#~ msgid "FAI releases"
+#~ msgstr "Выберите тип мыши"
+
+#, fuzzy
+#~ msgid "FAI release management"
+#~ msgstr "Управление подразделениями"
+
 #, fuzzy
 #~ msgid "Partition start size"
 #~ msgstr "Назначение"
diff --git a/gosa-plugins/fai/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/fai/locale/zh/LC_MESSAGES/messages.po
index bd4d7ef54..00e2c4edb 100644
--- a/gosa-plugins/fai/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/fai/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-19 14:24+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -44,11 +44,12 @@ msgstr "目标路径"
 #: admin/fai/faiPartitionTableEntry.tpl:13 admin/fai/faiHookEntry.tpl:19
 #: admin/fai/class_faiVariableEntry.inc:138
 #: admin/fai/class_faiTemplate.inc:545 admin/fai/class_faiScript.inc:646
-#: admin/fai/class_faiScriptEntry.inc:190 admin/fai/faiTemplate.tpl:21
-#: admin/fai/class_faiPartitionTable.inc:789 admin/fai/faiVariableEntry.tpl:19
-#: admin/fai/class_faiHookEntry.inc:197 admin/fai/class_faiVariable.inc:398
-#: admin/fai/faiPartition.tpl:20 admin/fai/class_faiPackage.inc:658
-#: admin/fai/class_faiTemplateEntry.inc:300 admin/fai/faiPartitionTable.tpl:21
+#: admin/fai/class_faiScriptEntry.inc:190 admin/fai/fai-list.xml:49
+#: admin/fai/faiTemplate.tpl:21 admin/fai/class_faiPartitionTable.inc:789
+#: admin/fai/faiVariableEntry.tpl:19 admin/fai/class_faiHookEntry.inc:197
+#: admin/fai/class_faiVariable.inc:398 admin/fai/faiPartition.tpl:20
+#: admin/fai/class_faiPackage.inc:658 admin/fai/class_faiTemplateEntry.inc:300
+#: admin/fai/faiPartitionTable.tpl:21
 msgid "Description"
 msgstr "描述"
 
@@ -137,21 +138,18 @@ msgstr "置顶"
 #: admin/fai/tabsScript.inc:33 admin/fai/tabsTemplate.inc:33
 #: admin/fai/class_faiHook.inc:239 admin/fai/class_faiDiskEntry.inc:427
 #: admin/fai/tabsPartition.inc:34 admin/fai/class_faiProfile.inc:262
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:636
-#: admin/fai/class_faiManagement.inc:642 admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiManagement.inc:972 admin/fai/class_faiManagement.inc:996
-#: admin/fai/class_faiManagement.inc:1245 admin/fai/class_faiTemplate.inc:212
-#: admin/fai/tabsVariable.inc:33 admin/fai/tabsPackage.inc:33
-#: admin/fai/class_faiScript.inc:229 admin/fai/class_FAI.inc:556
-#: admin/fai/class_faiScriptEntry.inc:59 admin/fai/class_faiScriptEntry.inc:62
-#: admin/fai/tabsHook.inc:32 admin/fai/class_faiPartitionTable.inc:244
+#: admin/fai/class_faiTemplate.inc:212 admin/fai/tabsVariable.inc:33
+#: admin/fai/tabsPackage.inc:33 admin/fai/class_faiScript.inc:229
+#: admin/fai/class_FAI.inc:556 admin/fai/class_faiScriptEntry.inc:59
+#: admin/fai/class_faiScriptEntry.inc:62 admin/fai/tabsHook.inc:32
+#: admin/fai/class_faiPartitionTable.inc:244
 #: admin/fai/class_faiPartitionTable.inc:307
 #: admin/fai/class_faiHookEntry.inc:62 admin/fai/class_faiHookEntry.inc:65
 #: admin/fai/class_faiVariable.inc:142 admin/fai/class_faiPackage.inc:348
 #: admin/fai/class_faiSummaryTab.inc:94 admin/fai/tabsProfile.inc:33
-#: admin/systems/services/repository/class_servRepository.inc:142
-#: admin/systems/services/repository/class_servRepository.inc:177
-#: admin/systems/services/repository/class_servRepository.inc:182
+#: admin/systems/services/repository/class_servRepository.inc:179
+#: admin/systems/services/repository/class_servRepository.inc:213
+#: admin/systems/services/repository/class_servRepository.inc:218
 #: admin/systems/services/repository/class_servRepositorySetup.inc:204
 msgid "Error"
 msgstr "错误"
@@ -170,8 +168,7 @@ msgid ""
 "The file encodig has changed from '%s' to '%s'. Do you really want to save?"
 msgstr ""
 
-#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:542
-#: admin/fai/class_faiManagement.inc:1315 admin/fai/remove_branch.tpl:2
+#: admin/fai/remove.tpl:2 admin/fai/remove_branch.tpl:2
 msgid "Warning"
 msgstr "警告"
 
@@ -209,9 +206,7 @@ msgstr "设备"
 #: admin/fai/faiPackage.tpl:9 admin/fai/faiHook.tpl:9
 #: admin/fai/class_faiProfile.inc:395 admin/fai/class_faiProfile.inc:405
 #: admin/fai/class_faiProfile.inc:478 admin/fai/faiPartitionTableEntry.tpl:6
-#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiManagement.inc:636
-#: admin/fai/class_faiManagement.inc:642
-#: admin/fai/class_faiVariableEntry.inc:90
+#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiVariableEntry.inc:90
 #: admin/fai/class_faiVariableEntry.inc:99
 #: admin/fai/class_faiVariableEntry.inc:102
 #: admin/fai/class_faiVariableEntry.inc:137
@@ -222,8 +217,8 @@ msgstr "设备"
 #: admin/fai/class_faiScriptEntry.inc:137
 #: admin/fai/class_faiScriptEntry.inc:142
 #: admin/fai/class_faiScriptEntry.inc:145
-#: admin/fai/class_faiScriptEntry.inc:189 admin/fai/faiTemplate.tpl:9
-#: admin/fai/class_faiPartitionTable.inc:490
+#: admin/fai/class_faiScriptEntry.inc:189 admin/fai/fai-list.xml:41
+#: admin/fai/faiTemplate.tpl:9 admin/fai/class_faiPartitionTable.inc:490
 #: admin/fai/class_faiPartitionTable.inc:788 admin/fai/faiVariableEntry.tpl:9
 #: admin/fai/class_faiHookEntry.inc:145 admin/fai/class_faiHookEntry.inc:150
 #: admin/fai/class_faiHookEntry.inc:153 admin/fai/class_faiHookEntry.inc:196
@@ -232,7 +227,7 @@ msgstr "设备"
 #: admin/fai/class_faiPackage.inc:657 admin/fai/class_faiTemplateEntry.inc:233
 #: admin/fai/class_faiTemplateEntry.inc:299
 #: admin/fai/class_faiSummaryTab.inc:348 admin/fai/faiPartitionTable.tpl:9
-#: admin/systems/services/repository/class_servRepository.inc:177
+#: admin/systems/services/repository/class_servRepository.inc:213
 msgid "Name"
 msgstr "名称"
 
@@ -337,7 +332,7 @@ msgid "True"
 msgstr "真"
 
 #: admin/fai/class_faiPartitionTableEntry.inc:252
-#: admin/fai/class_faiPartitionTableEntry.inc:254
+#: admin/fai/class_faiPartitionTableEntry.inc:254 admin/fai/fai-list.xml:93
 #: admin/fai/class_divListFai.inc:178
 msgid "Remove"
 msgstr "删除"
@@ -442,7 +437,7 @@ msgid "Choose a variable to delete or edit"
 msgstr "选择一个要删除或修改的变量"
 
 #: admin/fai/faiVariable.tpl:53 admin/fai/class_faiHook.inc:312
-#: admin/fai/class_faiHook.inc:314
+#: admin/fai/class_faiHook.inc:314 admin/fai/fai-list.xml:86
 msgid "Edit"
 msgstr "编辑"
 
@@ -572,12 +567,12 @@ msgstr "脚本列表"
 
 #: admin/fai/faiPackage.tpl:33
 #: admin/systems/services/repository/servRepositorySetup.tpl:1
-#: admin/systems/services/repository/class_servRepository.inc:343
+#: admin/systems/services/repository/class_servRepository.inc:406
 msgid "Repository"
 msgstr "仓库"
 
 #: admin/fai/faiPackage.tpl:37 admin/fai/branch_selector.tpl:25
-#: admin/fai/class_faiPackage.inc:663
+#: admin/fai/fai-filter.tpl:14 admin/fai/class_faiPackage.inc:663
 #: admin/systems/services/repository/class_divListRepositories.inc:23
 #: admin/systems/services/repository/servRepositorySetup.tpl:19
 #: admin/systems/services/repository/class_servRepositorySetup.inc:153
@@ -691,162 +686,45 @@ msgstr "选择一个已存在的 FAI 任务"
 msgid "List of available packages"
 msgstr "可用软件包列表"
 
-#: admin/fai/faiPackageEntry.tpl:20 admin/fai/faiProfileEntry.tpl:21
+#: admin/fai/faiPackageEntry.tpl:17
+#, fuzzy
+msgid ""
+"The search returned too many results, only the first 200 entries are shown."
+msgstr "您提供的查询字符串 '%s' 返回太多结果。为减少内存占用，只显示前200条。"
+
+#: admin/fai/faiPackageEntry.tpl:26 admin/fai/faiProfileEntry.tpl:21
 msgid "Information"
 msgstr "提示信息"
 
-#: admin/fai/faiPackageEntry.tpl:24
+#: admin/fai/faiPackageEntry.tpl:30
 msgid ""
 "This menu allows you to select multiple packages to add them to the "
 "currently edited package list."
 msgstr "这个菜单允许您为当前编辑的软件包列表添加多个软件包。"
 
-#: admin/fai/faiPackageEntry.tpl:30 admin/fai/faiProfileEntry.tpl:31
+#: admin/fai/faiPackageEntry.tpl:36 admin/fai/faiProfileEntry.tpl:31
 msgid "Filters"
 msgstr "过滤器"
 
-#: admin/fai/faiPackageEntry.tpl:40 admin/fai/faiProfileEntry.tpl:54
+#: admin/fai/faiPackageEntry.tpl:46 admin/fai/faiProfileEntry.tpl:54
 #: admin/fai/faiProfileEntry.tpl:55
 msgid "Display objects matching"
 msgstr "显示匹配对象"
 
-#: admin/fai/faiPackageEntry.tpl:44 admin/fai/faiProfileEntry.tpl:59
+#: admin/fai/faiPackageEntry.tpl:50 admin/fai/faiProfileEntry.tpl:59
 #: admin/systems/services/repository/class_divListRepositories.inc:26
 msgid "Regular expression for matching object names"
 msgstr "匹配对象名的正则表达式"
 
-#: admin/fai/class_faiManagement.inc:25 admin/fai/main.inc:53
-#: admin/fai/main.inc:55
+#: admin/fai/class_faiManagement.inc:25
 #, fuzzy
-msgid "Software deployment"
-msgstr "系统管理"
+msgid "Roles"
+msgstr "角色"
 
 #: admin/fai/class_faiManagement.inc:26
-msgid "Manage software packages and deployment reciepes"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:362 admin/fai/class_faiManagement.inc:524
-#: admin/fai/class_faiManagement.inc:671 admin/fai/class_faiManagement.inc:833
-#: admin/fai/class_faiManagement.inc:854 admin/fai/class_faiManagement.inc:898
-#: admin/fai/class_faiManagement.inc:915
 #, fuzzy
-msgid "Permission error"
-msgstr "允许"
-
-#: admin/fai/class_faiManagement.inc:413
-#, fuzzy
-msgid "Branch locked"
-msgstr "分支"
-
-#: admin/fai/class_faiManagement.inc:413
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:429
-#, fuzzy
-msgid "FAI object"
-msgstr "自动化安装（FAI）对象树"
-
-#: admin/fai/class_faiManagement.inc:521
-msgid "FAI branch/freeze"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:524
-#, fuzzy
-msgid "You have no permission to delete this release!"
-msgstr "您无权删除这个发行版！"
-
-#: admin/fai/class_faiManagement.inc:542
-msgid "Release remove aborted because the release name check failed!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:671 admin/fai/class_faiManagement.inc:833
-#: admin/fai/class_faiManagement.inc:854
-#, fuzzy
-msgid "Branch"
-msgstr "分支"
-
-#: admin/fai/class_faiManagement.inc:779
-#: admin/fai/class_faiManagement.inc:1054
-#: admin/fai/class_faiManagement.inc:1060
-msgid "Continue"
-msgstr "继续"
-
-#: admin/fai/class_faiManagement.inc:810
-#: admin/fai/class_faiPackageEntry.inc:53
-#: admin/fai/class_faiPackageEntry.inc:193 admin/fai/class_FAI.inc:574
-#: admin/fai/class_faiPackageConfiguration.inc:35
-#: admin/fai/class_faiPackage.inc:258 admin/fai/class_faiPackage.inc:554
-#: admin/systems/services/repository/class_servRepository.inc:326
-#, fuzzy
-msgid "Service infrastructure"
-msgstr "在子树中查找"
-
-#: admin/fai/class_faiManagement.inc:815 admin/fai/class_FAI.inc:1178
-#, fuzzy
-msgid "Fatal error"
-msgstr "终端服务器"
-
-#: admin/fai/class_faiManagement.inc:875
-#, fuzzy
-msgid "partition table"
-msgstr "分区表"
-
-#: admin/fai/class_faiManagement.inc:876
-#, fuzzy
-msgid "script"
-msgstr "脚本"
-
-#: admin/fai/class_faiManagement.inc:877
-#, fuzzy
-msgid "hook"
-msgstr "钩子"
-
-#: admin/fai/class_faiManagement.inc:878
-#, fuzzy
-msgid "variable"
-msgstr "变量"
-
-#: admin/fai/class_faiManagement.inc:879
-#, fuzzy
-msgid "template"
-msgstr "模板"
-
-#: admin/fai/class_faiManagement.inc:880
-#, fuzzy
-msgid "package list"
-msgstr "软件包列表"
-
-#: admin/fai/class_faiManagement.inc:898 admin/fai/class_faiManagement.inc:915
-#, fuzzy, php-format
-msgid "You have no permission to create a new %s!"
-msgstr "您无权删除这个对象组！"
-
-#: admin/fai/class_faiManagement.inc:915
-#, fuzzy
-msgid "profile"
-msgstr "Profiles"
-
-#: admin/fai/class_faiManagement.inc:1315
-msgid ""
-"The selected release is not available anymore. All triggered actions are "
-"skipped."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:1462
-#, fuzzy
-msgid "FAI releases"
-msgstr "自动化安装（FAI）类"
-
-#: admin/fai/class_faiManagement.inc:1463
-#, fuzzy
-msgid "FAI release management"
-msgstr "Asterisk 管理"
-
-#: admin/fai/class_faiManagement.inc:1468
-msgid "FAI"
-msgstr "自动化安装"
+msgid "Role management"
+msgstr "管理"
 
 #: admin/fai/class_faiVariableEntry.inc:94
 #, fuzzy
@@ -897,6 +775,15 @@ msgstr "读"
 msgid "Please enter your search string here"
 msgstr "请在这里输入您的查询字符串"
 
+#: admin/fai/class_faiPackageEntry.inc:53
+#: admin/fai/class_faiPackageEntry.inc:195 admin/fai/class_FAI.inc:574
+#: admin/fai/class_faiPackageConfiguration.inc:35
+#: admin/fai/class_faiPackage.inc:258 admin/fai/class_faiPackage.inc:554
+#: admin/systems/services/repository/class_servRepository.inc:362
+#, fuzzy
+msgid "Service infrastructure"
+msgstr "在子树中查找"
+
 #: admin/fai/class_faiPackageEntry.inc:103
 msgid ""
 "This list displays all assigned package names for this repository settings."
@@ -1079,6 +966,11 @@ msgstr "无法创建 '%s'，目标名称已经存在。"
 msgid "Error while fetching source dn - aborted!"
 msgstr "当获取源 dn 时错误──退出！"
 
+#: admin/fai/class_FAI.inc:1178
+#, fuzzy
+msgid "Fatal error"
+msgstr "终端服务器"
+
 #: admin/fai/class_FAI.inc:1179
 #, php-format
 msgid ""
@@ -1106,6 +998,37 @@ msgstr "编辑记录"
 msgid "Script Priority"
 msgstr "优先级"
 
+#: admin/fai/fai-list.xml:11
+msgid "List of fai stuff!!!!!"
+msgstr ""
+
+#: admin/fai/fai-list.xml:15
+msgid "FAI"
+msgstr "自动化安装"
+
+#: admin/fai/fai-list.xml:57 admin/fai/class_divListFai.inc:55
+#: admin/fai/class_divListFai.inc:138
+msgid "Actions"
+msgstr "动作"
+
+#: admin/fai/fai-list.xml:68 admin/fai/class_divListFai.inc:140
+msgid "Create"
+msgstr "创建"
+
+#: admin/fai/fai-list.xml:74
+msgid "Role"
+msgstr "角色"
+
+#: admin/fai/fai-list.xml:125
+#, fuzzy
+msgid "Edit role"
+msgstr "编辑宏"
+
+#: admin/fai/fai-list.xml:138
+#, fuzzy
+msgid "Remove role"
+msgstr "成员对象"
+
 #: admin/fai/faiSummary.tpl:4
 msgid "FAI object tree"
 msgstr "自动化安装（FAI）对象树"
@@ -1270,7 +1193,7 @@ msgid "FAI partition table"
 msgstr "新分区表"
 
 #: admin/fai/branch_selector.tpl:2
-#: admin/systems/services/repository/class_servRepository.inc:358
+#: admin/systems/services/repository/class_servRepository.inc:421
 #, fuzzy
 msgid "Releases"
 msgstr "发行"
@@ -1438,10 +1361,6 @@ msgstr "选择"
 msgid "Class types"
 msgstr "分类类型"
 
-#: admin/fai/class_divListFai.inc:55 admin/fai/class_divListFai.inc:138
-msgid "Actions"
-msgstr "动作"
-
 #: admin/fai/class_divListFai.inc:57 admin/fai/class_divListFai.inc:59
 #: admin/fai/class_divListFai.inc:61 admin/fai/class_divListFai.inc:63
 #: admin/fai/class_divListFai.inc:65 admin/fai/class_divListFai.inc:67
@@ -1503,10 +1422,6 @@ msgstr "对象组"
 msgid "Display users matching"
 msgstr "显示匹配的用户"
 
-#: admin/fai/class_divListFai.inc:140
-msgid "Create"
-msgstr "创建"
-
 #: admin/fai/class_divListFai.inc:155
 msgid "PT"
 msgstr "PT"
@@ -1633,6 +1548,11 @@ msgstr ""
 msgid "Tune options"
 msgstr "挂载选项"
 
+#: admin/fai/fai-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "过滤器"
+
 #: admin/fai/class_faiPackage.inc:220
 msgid "Invalid package names"
 msgstr ""
@@ -1815,7 +1735,7 @@ msgstr "这个菜单允许您创建，删除和修改 FAI 分类。"
 #: admin/systems/services/repository/class_divListRepositories.inc:24
 #: admin/systems/services/repository/class_divListRepositories.inc:64
 #: admin/systems/services/repository/servRepositorySetup.tpl:39
-#: admin/systems/services/repository/class_servRepository.inc:360
+#: admin/systems/services/repository/class_servRepository.inc:423
 #, fuzzy
 msgid "Sections"
 msgstr "节"
@@ -1826,34 +1746,102 @@ msgid "Add repository"
 msgstr "目录"
 
 #: admin/systems/services/repository/servRepositorySetup.tpl:8
-#: admin/systems/services/repository/class_servRepository.inc:357
+#: admin/systems/services/repository/class_servRepository.inc:420
 #, fuzzy
 msgid "Parent server"
 msgstr "保留"
 
 #: admin/systems/services/repository/servRepositorySetup.tpl:28
-#: admin/systems/services/repository/class_servRepository.inc:359
+#: admin/systems/services/repository/class_servRepository.inc:422
 #: admin/systems/services/repository/class_servRepositorySetup.inc:157
 msgid "URL"
 msgstr ""
 
 #: admin/systems/services/repository/class_servRepository.inc:26
-#: admin/systems/services/repository/class_servRepository.inc:308
 #: admin/systems/services/repository/class_servRepository.inc:344
+#: admin/systems/services/repository/class_servRepository.inc:388
+#: admin/systems/services/repository/class_servRepository.inc:407
 #: admin/systems/services/repository/class_servRepositorySetup.inc:204
 #, fuzzy
 msgid "Repository service"
 msgstr "仓库"
 
-#: admin/systems/services/repository/class_servRepository.inc:142
+#: admin/systems/services/repository/class_servRepository.inc:179
 #, fuzzy
 msgid "FAI release"
 msgstr "自动化安装（FAI）类"
 
-#: admin/systems/services/repository/class_servRepository.inc:344
+#: admin/systems/services/repository/class_servRepository.inc:407
 msgid "Services"
 msgstr "服务"
 
+#, fuzzy
+#~ msgid "Software deployment"
+#~ msgstr "系统管理"
+
+#, fuzzy
+#~ msgid "Permission error"
+#~ msgstr "允许"
+
+#, fuzzy
+#~ msgid "Branch locked"
+#~ msgstr "分支"
+
+#, fuzzy
+#~ msgid "FAI object"
+#~ msgstr "自动化安装（FAI）对象树"
+
+#, fuzzy
+#~ msgid "You have no permission to delete this release!"
+#~ msgstr "您无权删除这个发行版！"
+
+#, fuzzy
+#~ msgid "Branch"
+#~ msgstr "分支"
+
+#~ msgid "Continue"
+#~ msgstr "继续"
+
+#, fuzzy
+#~ msgid "partition table"
+#~ msgstr "分区表"
+
+#, fuzzy
+#~ msgid "script"
+#~ msgstr "脚本"
+
+#, fuzzy
+#~ msgid "hook"
+#~ msgstr "钩子"
+
+#, fuzzy
+#~ msgid "variable"
+#~ msgstr "变量"
+
+#, fuzzy
+#~ msgid "template"
+#~ msgstr "模板"
+
+#, fuzzy
+#~ msgid "package list"
+#~ msgstr "软件包列表"
+
+#, fuzzy
+#~ msgid "You have no permission to create a new %s!"
+#~ msgstr "您无权删除这个对象组！"
+
+#, fuzzy
+#~ msgid "profile"
+#~ msgstr "Profiles"
+
+#, fuzzy
+#~ msgid "FAI releases"
+#~ msgstr "自动化安装（FAI）类"
+
+#, fuzzy
+#~ msgid "FAI release management"
+#~ msgstr "Asterisk 管理"
+
 #, fuzzy
 #~ msgid "Partition start size"
 #~ msgstr "分区"
@@ -2549,9 +2537,3 @@ msgstr "服务"
 #, fuzzy
 #~ msgid "There is already a FAI object with this class name defined."
 #~ msgstr "已经有一个 profile 使用了这个类名。"
-
-#~ msgid ""
-#~ "Your specified search string '%s' returned too many results. Only the "
-#~ "first 200 entries are shown, to keep the memory usage low."
-#~ msgstr ""
-#~ "您提供的查询字符串 '%s' 返回太多结果。为减少内存占用，只显示前200条。"
diff --git a/gosa-plugins/glpi/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/glpi/locale/de/LC_MESSAGES/messages.po
index 50f80d8e8..a8c883615 100644
--- a/gosa-plugins/glpi/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/glpi/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2008-04-03 16:07+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
diff --git a/gosa-plugins/glpi/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/glpi/locale/es/LC_MESSAGES/messages.po
index 8d5eab2c9..7b045fcbf 100644
--- a/gosa-plugins/glpi/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/glpi/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
diff --git a/gosa-plugins/glpi/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/glpi/locale/fr/LC_MESSAGES/messages.po
index b89e866f2..b519d5267 100644
--- a/gosa-plugins/glpi/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/glpi/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2008-07-23 23:06+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: french <fr@li.org>\n"
diff --git a/gosa-plugins/glpi/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/glpi/locale/it/LC_MESSAGES/messages.po
index 21119fa90..c1a433298 100644
--- a/gosa-plugins/glpi/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/glpi/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
diff --git a/gosa-plugins/glpi/locale/messages.po b/gosa-plugins/glpi/locale/messages.po
index e540ca33c..fe86d73dd 100644
--- a/gosa-plugins/glpi/locale/messages.po
+++ b/gosa-plugins/glpi/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gosa-plugins/glpi/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/glpi/locale/nl/LC_MESSAGES/messages.po
index 138dd2672..6013a0d8f 100644
--- a/gosa-plugins/glpi/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/glpi/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
diff --git a/gosa-plugins/glpi/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/glpi/locale/pl/LC_MESSAGES/messages.po
index cc6c0dc5b..c86398513 100644
--- a/gosa-plugins/glpi/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/glpi/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2009-09-05 15:29+0100\n"
 "Last-Translator: Piort Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
diff --git a/gosa-plugins/glpi/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/glpi/locale/ru/LC_MESSAGES/messages.po
index a1ee15931..5558e0c16 100644
--- a/gosa-plugins/glpi/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/glpi/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
diff --git a/gosa-plugins/glpi/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/glpi/locale/zh/LC_MESSAGES/messages.po
index a9420957c..805e25174 100644
--- a/gosa-plugins/glpi/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/glpi/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
diff --git a/gosa-plugins/gofax/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/gofax/locale/de/LC_MESSAGES/messages.po
index e5eb2010a..90065023f 100644
--- a/gosa-plugins/gofax/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofax/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2008-07-28 08:45+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -90,7 +90,7 @@ msgstr "# Seiten"
 msgid "FAX reports"
 msgstr "Fax-Berichte"
 
-#: gofax/faxreports/contents.tpl:2
+#: gofax/faxreports/contents.tpl:2 gofax/blocklists/blocklist-filter.tpl:3
 msgid "Filter"
 msgstr "Filter"
 
@@ -139,7 +139,6 @@ msgid "FAX Reports"
 msgstr "Fax-Berichte"
 
 #: gofax/faxreports/class_faxreport.inc:7
-#: gofax/blocklists/class_blocklistManagement.inc:6
 #: gofax/blocklists/class_blocklistGeneric.inc:10
 #: gofax/faxaccount/class_gofaxAccount.inc:7
 msgid "This does something"
@@ -190,8 +189,6 @@ msgstr "Konnte %s Datenbank nicht abfragen!"
 
 #: gofax/faxreports/class_faxreport.inc:167
 #: gofax/faxreports/class_faxreport.inc:177
-#: gofax/blocklists/class_blocklistManagement.inc:269
-#: gofax/blocklists/class_blocklistManagement.inc:326
 msgid "Permission error"
 msgstr "Berechtigungsfehler"
 
@@ -252,10 +249,10 @@ msgstr "Warnung"
 
 #: gofax/blocklists/remove.tpl:6
 msgid ""
-"Please double check if your really want to do this since there is no way for "
+"Please double check if you 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 "
+"Bitte überprüfen Sie genau was Sie tun, weil GOsa keine Möglichkeit hat, die "
 "Daten wiederherzustellen."
 
 #: gofax/blocklists/remove.tpl:10
@@ -264,6 +261,19 @@ msgstr ""
 "Wenn Sie sicher sind, drücken Sie 'Entfernen' um fortzufahren oder "
 "'Abbrechen' zum Abbruch."
 
+#: gofax/blocklists/blocklist-list.tpl:13 gofax/blocklists/generic.tpl:17
+#: gofax/blocklists/class_blocklistGeneric.inc:387
+msgid "Base"
+msgstr "Basis"
+
+#: gofax/blocklists/blocklist-list.tpl:13
+msgid "Update"
+msgstr "Aktualisieren"
+
+#: gofax/blocklists/blocklist-list.tpl:13
+msgid "Submit"
+msgstr "Übertragen"
+
 #: gofax/blocklists/generic.tpl:1 gofax/faxaccount/generic.tpl:6
 #: gofax/faxaccount/paste_generic.tpl:4
 msgid "Generic"
@@ -277,12 +287,6 @@ msgstr "Listenname"
 msgid "Name of blocklist"
 msgstr "Name der Sperrliste"
 
-#: gofax/blocklists/generic.tpl:17
-#: gofax/blocklists/class_divListBlocklists.inc:86
-#: gofax/blocklists/class_blocklistGeneric.inc:387
-msgid "Base"
-msgstr "Basis"
-
 #: gofax/blocklists/generic.tpl:20
 msgid "Choose subtree to place group in"
 msgstr "Wählen Sie den Teilbaum, in den die Gruppe eingepflegt werden soll"
@@ -299,7 +303,7 @@ msgstr "Typ"
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr "Wählen Sie, ob ein- oder abgehende Rufe gefiltert werden sollen"
 
-#: gofax/blocklists/generic.tpl:51
+#: gofax/blocklists/generic.tpl:51 gofax/blocklists/blocklist-list.xml:57
 #: gofax/blocklists/class_blocklistGeneric.inc:386
 msgid "Description"
 msgstr "Beschreibung"
@@ -320,16 +324,21 @@ msgstr "Information"
 msgid "Numbers can also contain wild cards."
 msgstr "Nummern können auch Platzhalter enthalten."
 
-#: gofax/blocklists/class_divListBlocklists.inc:31
-#: gofax/blocklists/class_divListBlocklists.inc:32
+#: gofax/blocklists/blocklist-list.xml:11
 msgid "List of blocklists"
 msgstr "Liste der Sperrlisten"
 
-#: gofax/blocklists/class_divListBlocklists.inc:50
-msgid "Select all"
-msgstr "Alle auswählen"
+#: gofax/blocklists/blocklist-list.xml:15
+#: gofax/faxaccount/class_gofaxAccount.inc:881
+msgid "Send blocklist"
+msgstr "Sende-Sperrliste"
+
+#: gofax/blocklists/blocklist-list.xml:23
+#: gofax/faxaccount/class_gofaxAccount.inc:880
+msgid "Receive blocklist"
+msgstr "Emfangs-Sperrliste"
 
-#: gofax/blocklists/class_divListBlocklists.inc:56
+#: gofax/blocklists/blocklist-list.xml:49
 #: gofax/blocklists/class_blocklistGeneric.inc:219
 #: gofax/blocklists/class_blocklistGeneric.inc:222
 #: gofax/blocklists/class_blocklistGeneric.inc:229
@@ -337,102 +346,36 @@ msgstr "Alle auswählen"
 msgid "Name"
 msgstr "Name"
 
-#: gofax/blocklists/class_divListBlocklists.inc:56
-msgid "Department"
-msgstr "Abteilung"
-
-#: gofax/blocklists/class_divListBlocklists.inc:57
-#: gofax/blocklists/class_divListBlocklists.inc:91
+#: gofax/blocklists/blocklist-list.xml:65
 msgid "Actions"
 msgstr "Aktionen"
 
-#: gofax/blocklists/class_divListBlocklists.inc:60
-#: gofax/faxaccount/class_gofaxAccount.inc:881
-msgid "Send blocklist"
-msgstr "Sende-Sperrliste"
-
-#: gofax/blocklists/class_divListBlocklists.inc:60
-msgid "Show send blocklists"
-msgstr "Zeige Sperrlisten für abgehende Rufe"
-
-#: gofax/blocklists/class_divListBlocklists.inc:61
-#: gofax/faxaccount/class_gofaxAccount.inc:880
-msgid "Receive blocklist"
-msgstr "Emfangs-Sperrliste"
-
-#: gofax/blocklists/class_divListBlocklists.inc:61
-msgid "Show receive blocklists"
-msgstr "Zeige eingehende Sperrlisten"
-
-#: gofax/blocklists/class_divListBlocklists.inc:67
-msgid "Regular expression for matching list names"
-msgstr "Regulärer Ausdruck zum Erkennen von Sperrlisten-Namen"
-
-#: gofax/blocklists/class_divListBlocklists.inc:88
-msgid "Submit department"
-msgstr "Aktualisieren"
-
-#: gofax/blocklists/class_divListBlocklists.inc:88
-msgid "Submit"
-msgstr "Übertragen"
-
-#: gofax/blocklists/class_divListBlocklists.inc:96
+#: gofax/blocklists/blocklist-list.xml:76
 msgid "Create"
 msgstr "Anlegen"
 
-#: gofax/blocklists/class_divListBlocklists.inc:98
+#: gofax/blocklists/blocklist-list.xml:82
 #: gofax/blocklists/class_blocklistGeneric.inc:388
 msgid "Blocklist"
 msgstr "Sperrliste"
 
-#: gofax/blocklists/class_divListBlocklists.inc:104
-msgid "Remove"
-msgstr "Entfernen"
-
-#: gofax/blocklists/class_divListBlocklists.inc:151
-msgid "edit"
+#: gofax/blocklists/blocklist-list.xml:94
+#: gofax/blocklists/blocklist-list.xml:133 gofax/faxaccount/generic.tpl:128
+#: gofax/faxaccount/generic.tpl:136
+msgid "Edit"
 msgstr "Bearbeiten"
 
-#: gofax/blocklists/class_divListBlocklists.inc:151
-msgid "Edit user"
-msgstr "Benutzer bearbeiten"
-
-#: gofax/blocklists/class_divListBlocklists.inc:158
-msgid "delete"
+#: gofax/blocklists/blocklist-list.xml:101
+#: gofax/blocklists/blocklist-list.xml:146
+msgid "Remove"
 msgstr "Entfernen"
 
-#: gofax/blocklists/class_divListBlocklists.inc:158
-msgid "Delete user"
-msgstr "Benutzer entfernen"
-
-#: gofax/blocklists/class_divListBlocklists.inc:195
-#: gofax/blocklists/class_divListBlocklists.inc:196
-#, php-format
-msgid "Number of listed '%s'"
-msgstr "Anzahl der angezeigen '%s'"
-
-#: gofax/blocklists/class_divListBlocklists.inc:195
-msgid "blocklists"
+#: gofax/blocklists/class_blocklistManagement.inc:25
+#: gofax/faxaccount/generic.tpl:122
+msgid "Blocklists"
 msgstr "Sperrlisten"
 
-#: gofax/blocklists/class_divListBlocklists.inc:196
-msgid "departments"
-msgstr "Abteilungen"
-
-#: gofax/blocklists/class_blocklistManagement.inc:5
-msgid "FAX blocklists"
-msgstr "Fax-Sperrlisten"
-
-#: gofax/blocklists/class_blocklistManagement.inc:230
-msgid "Permission"
-msgstr "Berechtigung"
-
-#: gofax/blocklists/class_blocklistManagement.inc:246
-#: gofax/blocklists/class_blocklistManagement.inc:307
-msgid "blocklist"
-msgstr "Sperrliste"
-
-#: gofax/blocklists/main.inc:35 gofax/blocklists/main.inc:37
+#: gofax/blocklists/class_blocklistManagement.inc:26
 msgid "Blocklist management"
 msgstr "Sperrlistenverwaltung"
 
@@ -557,18 +500,10 @@ msgstr "Alternative Fax-Nummern"
 msgid "Add local"
 msgstr "Lokale hinzufügen"
 
-#: gofax/faxaccount/generic.tpl:122
-msgid "Blocklists"
-msgstr "Sperrlisten"
-
 #: gofax/faxaccount/generic.tpl:125
 msgid "Blocklists for incoming fax"
 msgstr "Sperrlisten für eingehendes Fax"
 
-#: gofax/faxaccount/generic.tpl:128 gofax/faxaccount/generic.tpl:136
-msgid "Edit"
-msgstr "Bearbeiten"
-
 #: gofax/faxaccount/generic.tpl:133
 msgid "Blocklists for outgoing fax"
 msgstr "Sperrlisten für abgehendes Fax"
@@ -691,6 +626,61 @@ msgstr "Informationen der Fax-Datenbank"
 msgid "FAX DB user"
 msgstr "Fax-DB Benutzer"
 
+#~ 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."
+
+#~ msgid "Select all"
+#~ msgstr "Alle auswählen"
+
+#~ msgid "Department"
+#~ msgstr "Abteilung"
+
+#~ msgid "Show send blocklists"
+#~ msgstr "Zeige Sperrlisten für abgehende Rufe"
+
+#~ msgid "Show receive blocklists"
+#~ msgstr "Zeige eingehende Sperrlisten"
+
+#~ msgid "Regular expression for matching list names"
+#~ msgstr "Regulärer Ausdruck zum Erkennen von Sperrlisten-Namen"
+
+#~ msgid "Submit department"
+#~ msgstr "Aktualisieren"
+
+#~ msgid "edit"
+#~ msgstr "Bearbeiten"
+
+#~ msgid "Edit user"
+#~ msgstr "Benutzer bearbeiten"
+
+#~ msgid "delete"
+#~ msgstr "Entfernen"
+
+#~ msgid "Delete user"
+#~ msgstr "Benutzer entfernen"
+
+#~ msgid "Number of listed '%s'"
+#~ msgstr "Anzahl der angezeigen '%s'"
+
+#~ msgid "blocklists"
+#~ msgstr "Sperrlisten"
+
+#~ msgid "departments"
+#~ msgstr "Abteilungen"
+
+#~ msgid "FAX blocklists"
+#~ msgstr "Fax-Sperrlisten"
+
+#~ msgid "Permission"
+#~ msgstr "Berechtigung"
+
+#~ msgid "blocklist"
+#~ msgstr "Sperrliste"
+
 #~ msgid "Copy"
 #~ msgstr "Kopieren"
 
diff --git a/gosa-plugins/gofax/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/gofax/locale/es/LC_MESSAGES/messages.po
index b80900140..5a84c131f 100644
--- a/gosa-plugins/gofax/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofax/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
@@ -96,7 +96,7 @@ msgstr ""
 msgid "FAX reports"
 msgstr ""
 
-#: gofax/faxreports/contents.tpl:2
+#: gofax/faxreports/contents.tpl:2 gofax/blocklists/blocklist-filter.tpl:3
 #, fuzzy
 msgid "Filter"
 msgstr "Filtros"
@@ -153,7 +153,6 @@ msgid "FAX Reports"
 msgstr ""
 
 #: gofax/faxreports/class_faxreport.inc:7
-#: gofax/blocklists/class_blocklistManagement.inc:6
 #: gofax/blocklists/class_blocklistGeneric.inc:10
 #: gofax/faxaccount/class_gofaxAccount.inc:7
 #, fuzzy
@@ -209,8 +208,6 @@ msgstr ""
 
 #: gofax/faxreports/class_faxreport.inc:167
 #: gofax/faxreports/class_faxreport.inc:177
-#: gofax/blocklists/class_blocklistManagement.inc:269
-#: gofax/blocklists/class_blocklistManagement.inc:326
 #, fuzzy
 msgid "Permission error"
 msgstr "Permisos"
@@ -278,9 +275,8 @@ msgid "Warning"
 msgstr "Aviso"
 
 #: gofax/blocklists/remove.tpl:6
-#, fuzzy
 msgid ""
-"Please double check if your really want to do this since there is no way for "
+"Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
 msgstr ""
 "Si está seguro de lo que quiere hacer pulse dos veces, ya que no hay forma "
@@ -292,6 +288,19 @@ msgstr ""
 "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o "
 "<i>Cancelar</i> para Abortar."
 
+#: gofax/blocklists/blocklist-list.tpl:13 gofax/blocklists/generic.tpl:17
+#: gofax/blocklists/class_blocklistGeneric.inc:387
+msgid "Base"
+msgstr "Base"
+
+#: gofax/blocklists/blocklist-list.tpl:13
+msgid "Update"
+msgstr ""
+
+#: gofax/blocklists/blocklist-list.tpl:13
+msgid "Submit"
+msgstr "Enviar"
+
 #: gofax/blocklists/generic.tpl:1 gofax/faxaccount/generic.tpl:6
 #: gofax/faxaccount/paste_generic.tpl:4
 msgid "Generic"
@@ -307,12 +316,6 @@ msgstr "Apellido"
 msgid "Name of blocklist"
 msgstr "Nombre de la localidad a crear"
 
-#: gofax/blocklists/generic.tpl:17
-#: gofax/blocklists/class_divListBlocklists.inc:86
-#: gofax/blocklists/class_blocklistGeneric.inc:387
-msgid "Base"
-msgstr "Base"
-
 #: gofax/blocklists/generic.tpl:20
 msgid "Choose subtree to place group in"
 msgstr "Elija el subárbol donde colocar el grupo"
@@ -329,7 +332,7 @@ msgstr "Tipo"
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr ""
 
-#: gofax/blocklists/generic.tpl:51
+#: gofax/blocklists/generic.tpl:51 gofax/blocklists/blocklist-list.xml:57
 #: gofax/blocklists/class_blocklistGeneric.inc:386
 msgid "Description"
 msgstr "Descripción"
@@ -352,126 +355,61 @@ msgstr "Información"
 msgid "Numbers can also contain wild cards."
 msgstr ""
 
-#: gofax/blocklists/class_divListBlocklists.inc:31
-#: gofax/blocklists/class_divListBlocklists.inc:32
+#: gofax/blocklists/blocklist-list.xml:11
 #, fuzzy
 msgid "List of blocklists"
 msgstr "Lista de acls"
 
-#: gofax/blocklists/class_divListBlocklists.inc:50
-msgid "Select all"
-msgstr "Seleccione todos"
-
-#: gofax/blocklists/class_divListBlocklists.inc:56
-#: gofax/blocklists/class_blocklistGeneric.inc:219
-#: gofax/blocklists/class_blocklistGeneric.inc:222
-#: gofax/blocklists/class_blocklistGeneric.inc:229
-#: gofax/blocklists/class_blocklistGeneric.inc:385
-msgid "Name"
-msgstr "Nombre"
-
-#: gofax/blocklists/class_divListBlocklists.inc:56
-msgid "Department"
-msgstr "Departamento"
-
-#: gofax/blocklists/class_divListBlocklists.inc:57
-#: gofax/blocklists/class_divListBlocklists.inc:91
-msgid "Actions"
-msgstr "Acciones"
-
-#: gofax/blocklists/class_divListBlocklists.inc:60
+#: gofax/blocklists/blocklist-list.xml:15
 #: gofax/faxaccount/class_gofaxAccount.inc:881
 #, fuzzy
 msgid "Send blocklist"
 msgstr "Lugar de residencia"
 
-#: gofax/blocklists/class_divListBlocklists.inc:60
-msgid "Show send blocklists"
-msgstr ""
-
-#: gofax/blocklists/class_divListBlocklists.inc:61
+#: gofax/blocklists/blocklist-list.xml:23
 #: gofax/faxaccount/class_gofaxAccount.inc:880
 msgid "Receive blocklist"
 msgstr ""
 
-#: gofax/blocklists/class_divListBlocklists.inc:61
-msgid "Show receive blocklists"
-msgstr ""
-
-#: gofax/blocklists/class_divListBlocklists.inc:67
-#, fuzzy
-msgid "Regular expression for matching list names"
-msgstr "Expresiones regulares para buscar nombre de usuarios"
-
-#: gofax/blocklists/class_divListBlocklists.inc:88
-msgid "Submit department"
-msgstr "Enviar departamento"
+#: gofax/blocklists/blocklist-list.xml:49
+#: gofax/blocklists/class_blocklistGeneric.inc:219
+#: gofax/blocklists/class_blocklistGeneric.inc:222
+#: gofax/blocklists/class_blocklistGeneric.inc:229
+#: gofax/blocklists/class_blocklistGeneric.inc:385
+msgid "Name"
+msgstr "Nombre"
 
-#: gofax/blocklists/class_divListBlocklists.inc:88
-msgid "Submit"
-msgstr "Enviar"
+#: gofax/blocklists/blocklist-list.xml:65
+msgid "Actions"
+msgstr "Acciones"
 
-#: gofax/blocklists/class_divListBlocklists.inc:96
+#: gofax/blocklists/blocklist-list.xml:76
 msgid "Create"
 msgstr "Crear"
 
-#: gofax/blocklists/class_divListBlocklists.inc:98
+#: gofax/blocklists/blocklist-list.xml:82
 #: gofax/blocklists/class_blocklistGeneric.inc:388
 #, fuzzy
 msgid "Blocklist"
 msgstr "Recargar lista"
 
-#: gofax/blocklists/class_divListBlocklists.inc:104
+#: gofax/blocklists/blocklist-list.xml:94
+#: gofax/blocklists/blocklist-list.xml:133 gofax/faxaccount/generic.tpl:128
+#: gofax/faxaccount/generic.tpl:136
+msgid "Edit"
+msgstr "Editar"
+
+#: gofax/blocklists/blocklist-list.xml:101
+#: gofax/blocklists/blocklist-list.xml:146
 msgid "Remove"
 msgstr "Eliminar"
 
-#: gofax/blocklists/class_divListBlocklists.inc:151
-msgid "edit"
-msgstr "editar"
-
-#: gofax/blocklists/class_divListBlocklists.inc:151
-msgid "Edit user"
-msgstr "Editar usuario"
-
-#: gofax/blocklists/class_divListBlocklists.inc:158
-msgid "delete"
-msgstr "eliminar"
-
-#: gofax/blocklists/class_divListBlocklists.inc:158
-msgid "Delete user"
-msgstr "Eliminar usuario"
-
-#: gofax/blocklists/class_divListBlocklists.inc:195
-#: gofax/blocklists/class_divListBlocklists.inc:196
-#, fuzzy, php-format
-msgid "Number of listed '%s'"
-msgstr "Eliminar departamentos seleccionados"
-
-#: gofax/blocklists/class_divListBlocklists.inc:195
-msgid "blocklists"
-msgstr ""
-
-#: gofax/blocklists/class_divListBlocklists.inc:196
-#, fuzzy
-msgid "departments"
-msgstr "Departamento"
-
-#: gofax/blocklists/class_blocklistManagement.inc:5
-msgid "FAX blocklists"
+#: gofax/blocklists/class_blocklistManagement.inc:25
+#: gofax/faxaccount/generic.tpl:122
+msgid "Blocklists"
 msgstr ""
 
-#: gofax/blocklists/class_blocklistManagement.inc:230
-#, fuzzy
-msgid "Permission"
-msgstr "Permisos"
-
-#: gofax/blocklists/class_blocklistManagement.inc:246
-#: gofax/blocklists/class_blocklistManagement.inc:307
-#, fuzzy
-msgid "blocklist"
-msgstr "Recargar lista"
-
-#: gofax/blocklists/main.inc:35 gofax/blocklists/main.inc:37
+#: gofax/blocklists/class_blocklistManagement.inc:26
 #, fuzzy
 msgid "Blocklist management"
 msgstr "Administración sistema de correo"
@@ -609,18 +547,10 @@ msgstr "Número de serie del certificado"
 msgid "Add local"
 msgstr ""
 
-#: gofax/faxaccount/generic.tpl:122
-msgid "Blocklists"
-msgstr ""
-
 #: gofax/faxaccount/generic.tpl:125
 msgid "Blocklists for incoming fax"
 msgstr ""
 
-#: gofax/faxaccount/generic.tpl:128 gofax/faxaccount/generic.tpl:136
-msgid "Edit"
-msgstr "Editar"
-
 #: gofax/faxaccount/generic.tpl:133
 msgid "Blocklists for outgoing fax"
 msgstr ""
@@ -749,6 +679,55 @@ msgstr "mostrar información"
 msgid "FAX DB user"
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "Please double check if your really want to do this since there is no way "
+#~ "for GOsa to get your data back."
+#~ msgstr ""
+#~ "Si está seguro de lo que quiere hacer pulse dos veces, ya que no hay "
+#~ "forma de que GOsa pueda recuperar posteriormente esa información"
+
+#~ msgid "Select all"
+#~ msgstr "Seleccione todos"
+
+#~ msgid "Department"
+#~ msgstr "Departamento"
+
+#, fuzzy
+#~ msgid "Regular expression for matching list names"
+#~ msgstr "Expresiones regulares para buscar nombre de usuarios"
+
+#~ msgid "Submit department"
+#~ msgstr "Enviar departamento"
+
+#~ msgid "edit"
+#~ msgstr "editar"
+
+#~ msgid "Edit user"
+#~ msgstr "Editar usuario"
+
+#~ msgid "delete"
+#~ msgstr "eliminar"
+
+#~ msgid "Delete user"
+#~ msgstr "Eliminar usuario"
+
+#, fuzzy
+#~ msgid "Number of listed '%s'"
+#~ msgstr "Eliminar departamentos seleccionados"
+
+#, fuzzy
+#~ msgid "departments"
+#~ msgstr "Departamento"
+
+#, fuzzy
+#~ msgid "Permission"
+#~ msgstr "Permisos"
+
+#, fuzzy
+#~ msgid "blocklist"
+#~ msgstr "Recargar lista"
+
 #, fuzzy
 #~ msgid "Copy"
 #~ msgstr "copiar"
diff --git a/gosa-plugins/gofax/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/gofax/locale/fr/LC_MESSAGES/messages.po
index 7e5d637a4..3e1d1c0cd 100644
--- a/gosa-plugins/gofax/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofax/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2008-07-23 23:10+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: french <fr@li.org>\n"
@@ -84,7 +84,7 @@ msgstr "# pages"
 msgid "FAX reports"
 msgstr "Rapports des Fax"
 
-#: gofax/faxreports/contents.tpl:2
+#: gofax/faxreports/contents.tpl:2 gofax/blocklists/blocklist-filter.tpl:3
 msgid "Filter"
 msgstr "Filtre"
 
@@ -133,7 +133,6 @@ msgid "FAX Reports"
 msgstr "Rapports des Fax"
 
 #: gofax/faxreports/class_faxreport.inc:7
-#: gofax/blocklists/class_blocklistManagement.inc:6
 #: gofax/blocklists/class_blocklistGeneric.inc:10
 #: gofax/faxaccount/class_gofaxAccount.inc:7
 msgid "This does something"
@@ -184,8 +183,6 @@ msgstr "Impossible d'interroger la base de données %s !"
 
 #: gofax/faxreports/class_faxreport.inc:167
 #: gofax/faxreports/class_faxreport.inc:177
-#: gofax/blocklists/class_blocklistManagement.inc:269
-#: gofax/blocklists/class_blocklistManagement.inc:326
 msgid "Permission error"
 msgstr "Erreur de permissions"
 
@@ -246,12 +243,12 @@ msgstr "Avertissement"
 
 #: gofax/blocklists/remove.tpl:6
 msgid ""
-"Please double check if your really want to do this since there is no way for "
+"Please double check if you 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."
+"Veuillez vérifier que vous voulez effectuer cette action. Toutes les données "
+"seront perdues étant donné qu'il est impossible pour GOsa de récupérer vos "
+"données."
 
 #: gofax/blocklists/remove.tpl:10
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
@@ -259,6 +256,19 @@ msgstr ""
 "D'accord - si vous êtes sur - cliquez sur 'Supprimer' pour continuer ou sur "
 "'Annuler' pour abandonner."
 
+#: gofax/blocklists/blocklist-list.tpl:13 gofax/blocklists/generic.tpl:17
+#: gofax/blocklists/class_blocklistGeneric.inc:387
+msgid "Base"
+msgstr "Base"
+
+#: gofax/blocklists/blocklist-list.tpl:13
+msgid "Update"
+msgstr "Mise à jour"
+
+#: gofax/blocklists/blocklist-list.tpl:13
+msgid "Submit"
+msgstr "Soumettre"
+
 #: gofax/blocklists/generic.tpl:1 gofax/faxaccount/generic.tpl:6
 #: gofax/faxaccount/paste_generic.tpl:4
 msgid "Generic"
@@ -272,12 +282,6 @@ msgstr "Liste des noms"
 msgid "Name of blocklist"
 msgstr "Nom de la liste rouge"
 
-#: gofax/blocklists/generic.tpl:17
-#: gofax/blocklists/class_divListBlocklists.inc:86
-#: gofax/blocklists/class_blocklistGeneric.inc:387
-msgid "Base"
-msgstr "Base"
-
 #: gofax/blocklists/generic.tpl:20
 msgid "Choose subtree to place group in"
 msgstr "Sélectionnez la branche où sera placée le groupe"
@@ -295,7 +299,7 @@ msgid "Select wether to filter incoming or outgoing calls"
 msgstr ""
 "Veuillez sélectionner si il faut filtrer sur les appels entrants ou sortants"
 
-#: gofax/blocklists/generic.tpl:51
+#: gofax/blocklists/generic.tpl:51 gofax/blocklists/blocklist-list.xml:57
 #: gofax/blocklists/class_blocklistGeneric.inc:386
 msgid "Description"
 msgstr "Description"
@@ -316,16 +320,21 @@ msgstr "Information"
 msgid "Numbers can also contain wild cards."
 msgstr "Les nombres peuvent aussi contenir des jokers."
 
-#: gofax/blocklists/class_divListBlocklists.inc:31
-#: gofax/blocklists/class_divListBlocklists.inc:32
+#: gofax/blocklists/blocklist-list.xml:11
 msgid "List of blocklists"
 msgstr "Liste des listes rouges"
 
-#: gofax/blocklists/class_divListBlocklists.inc:50
-msgid "Select all"
-msgstr "Sélectionner tout"
+#: gofax/blocklists/blocklist-list.xml:15
+#: gofax/faxaccount/class_gofaxAccount.inc:881
+msgid "Send blocklist"
+msgstr "Afficher les listes rouges en envoi"
+
+#: gofax/blocklists/blocklist-list.xml:23
+#: gofax/faxaccount/class_gofaxAccount.inc:880
+msgid "Receive blocklist"
+msgstr "Afficher les listes rouges en réception"
 
-#: gofax/blocklists/class_divListBlocklists.inc:56
+#: gofax/blocklists/blocklist-list.xml:49
 #: gofax/blocklists/class_blocklistGeneric.inc:219
 #: gofax/blocklists/class_blocklistGeneric.inc:222
 #: gofax/blocklists/class_blocklistGeneric.inc:229
@@ -333,102 +342,36 @@ msgstr "Sélectionner tout"
 msgid "Name"
 msgstr "Nom"
 
-#: gofax/blocklists/class_divListBlocklists.inc:56
-msgid "Department"
-msgstr "Département"
-
-#: gofax/blocklists/class_divListBlocklists.inc:57
-#: gofax/blocklists/class_divListBlocklists.inc:91
+#: gofax/blocklists/blocklist-list.xml:65
 msgid "Actions"
 msgstr "Actions"
 
-#: gofax/blocklists/class_divListBlocklists.inc:60
-#: gofax/faxaccount/class_gofaxAccount.inc:881
-msgid "Send blocklist"
-msgstr "Afficher les listes rouges en envoi"
-
-#: gofax/blocklists/class_divListBlocklists.inc:60
-msgid "Show send blocklists"
-msgstr "Afficher les numéros d'appels de la liste rouge"
-
-#: gofax/blocklists/class_divListBlocklists.inc:61
-#: gofax/faxaccount/class_gofaxAccount.inc:880
-msgid "Receive blocklist"
-msgstr "Afficher les listes rouges en réception"
-
-#: gofax/blocklists/class_divListBlocklists.inc:61
-msgid "Show receive blocklists"
-msgstr "Afficher les listes rouges de correspondants"
-
-#: gofax/blocklists/class_divListBlocklists.inc:67
-msgid "Regular expression for matching list names"
-msgstr "Expression régulière pour trouver des listes correspondantes"
-
-#: gofax/blocklists/class_divListBlocklists.inc:88
-msgid "Submit department"
-msgstr "Soumettre le département"
-
-#: gofax/blocklists/class_divListBlocklists.inc:88
-msgid "Submit"
-msgstr "Soumettre"
-
-#: gofax/blocklists/class_divListBlocklists.inc:96
+#: gofax/blocklists/blocklist-list.xml:76
 msgid "Create"
 msgstr "Créer"
 
-#: gofax/blocklists/class_divListBlocklists.inc:98
+#: gofax/blocklists/blocklist-list.xml:82
 #: gofax/blocklists/class_blocklistGeneric.inc:388
 msgid "Blocklist"
 msgstr "Listes Rouges"
 
-#: gofax/blocklists/class_divListBlocklists.inc:104
+#: gofax/blocklists/blocklist-list.xml:94
+#: gofax/blocklists/blocklist-list.xml:133 gofax/faxaccount/generic.tpl:128
+#: gofax/faxaccount/generic.tpl:136
+msgid "Edit"
+msgstr "Editer"
+
+#: gofax/blocklists/blocklist-list.xml:101
+#: gofax/blocklists/blocklist-list.xml:146
 msgid "Remove"
 msgstr "Supprimer"
 
-#: gofax/blocklists/class_divListBlocklists.inc:151
-msgid "edit"
-msgstr "éditer"
-
-#: gofax/blocklists/class_divListBlocklists.inc:151
-msgid "Edit user"
-msgstr "Editer un utilisateur"
-
-#: gofax/blocklists/class_divListBlocklists.inc:158
-msgid "delete"
-msgstr "supprimer"
-
-#: gofax/blocklists/class_divListBlocklists.inc:158
-msgid "Delete user"
-msgstr "Supprimer un utilisateur"
-
-#: gofax/blocklists/class_divListBlocklists.inc:195
-#: gofax/blocklists/class_divListBlocklists.inc:196
-#, php-format
-msgid "Number of listed '%s'"
-msgstr "Nombre de '%s'"
-
-#: gofax/blocklists/class_divListBlocklists.inc:195
-msgid "blocklists"
-msgstr "Listes Rouges"
-
-#: gofax/blocklists/class_divListBlocklists.inc:196
-msgid "departments"
-msgstr "département"
-
-#: gofax/blocklists/class_blocklistManagement.inc:5
-msgid "FAX blocklists"
-msgstr "Liste Rouge des Fax"
-
-#: gofax/blocklists/class_blocklistManagement.inc:230
-msgid "Permission"
-msgstr "Permissions"
-
-#: gofax/blocklists/class_blocklistManagement.inc:246
-#: gofax/blocklists/class_blocklistManagement.inc:307
-msgid "blocklist"
+#: gofax/blocklists/class_blocklistManagement.inc:25
+#: gofax/faxaccount/generic.tpl:122
+msgid "Blocklists"
 msgstr "Listes Rouges"
 
-#: gofax/blocklists/main.inc:35 gofax/blocklists/main.inc:37
+#: gofax/blocklists/class_blocklistManagement.inc:26
 msgid "Blocklist management"
 msgstr "Configuration des listes rouges"
 
@@ -557,18 +500,10 @@ msgstr "Numéros de fax alternatif"
 msgid "Add local"
 msgstr "Ajouter en local"
 
-#: gofax/faxaccount/generic.tpl:122
-msgid "Blocklists"
-msgstr "Listes Rouges"
-
 #: gofax/faxaccount/generic.tpl:125
 msgid "Blocklists for incoming fax"
 msgstr "Listes rouges pour les fax entrant"
 
-#: gofax/faxaccount/generic.tpl:128 gofax/faxaccount/generic.tpl:136
-msgid "Edit"
-msgstr "Editer"
-
 #: gofax/faxaccount/generic.tpl:133
 msgid "Blocklists for outgoing fax"
 msgstr "Listes rouges pour les fax sortant"
@@ -692,3 +627,59 @@ msgstr "Base de données des FAX"
 #: admin/systems/services/gofax/goFaxServer.tpl:4
 msgid "FAX DB user"
 msgstr "utilisateur de la base de données du FAX"
+
+#~ 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."
+
+#~ msgid "Select all"
+#~ msgstr "Sélectionner tout"
+
+#~ msgid "Department"
+#~ msgstr "Département"
+
+#~ msgid "Show send blocklists"
+#~ msgstr "Afficher les numéros d'appels de la liste rouge"
+
+#~ msgid "Show receive blocklists"
+#~ msgstr "Afficher les listes rouges de correspondants"
+
+#~ msgid "Regular expression for matching list names"
+#~ msgstr "Expression régulière pour trouver des listes correspondantes"
+
+#~ msgid "Submit department"
+#~ msgstr "Soumettre le département"
+
+#~ msgid "edit"
+#~ msgstr "éditer"
+
+#~ msgid "Edit user"
+#~ msgstr "Editer un utilisateur"
+
+#~ msgid "delete"
+#~ msgstr "supprimer"
+
+#~ msgid "Delete user"
+#~ msgstr "Supprimer un utilisateur"
+
+#~ msgid "Number of listed '%s'"
+#~ msgstr "Nombre de '%s'"
+
+#~ msgid "blocklists"
+#~ msgstr "Listes Rouges"
+
+#~ msgid "departments"
+#~ msgstr "département"
+
+#~ msgid "FAX blocklists"
+#~ msgstr "Liste Rouge des Fax"
+
+#~ msgid "Permission"
+#~ msgstr "Permissions"
+
+#~ msgid "blocklist"
+#~ msgstr "Listes Rouges"
diff --git a/gosa-plugins/gofax/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/gofax/locale/it/LC_MESSAGES/messages.po
index f0175ea5a..23020b276 100644
--- a/gosa-plugins/gofax/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofax/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -89,7 +89,7 @@ msgstr ""
 msgid "FAX reports"
 msgstr "Rapporti FAX"
 
-#: gofax/faxreports/contents.tpl:2
+#: gofax/faxreports/contents.tpl:2 gofax/blocklists/blocklist-filter.tpl:3
 msgid "Filter"
 msgstr "Filtro"
 
@@ -143,7 +143,6 @@ msgid "FAX Reports"
 msgstr "Rapporti FAX"
 
 #: gofax/faxreports/class_faxreport.inc:7
-#: gofax/blocklists/class_blocklistManagement.inc:6
 #: gofax/blocklists/class_blocklistGeneric.inc:10
 #: gofax/faxaccount/class_gofaxAccount.inc:7
 msgid "This does something"
@@ -195,8 +194,6 @@ msgstr "Impossibile selezionare il database!"
 
 #: gofax/faxreports/class_faxreport.inc:167
 #: gofax/faxreports/class_faxreport.inc:177
-#: gofax/blocklists/class_blocklistManagement.inc:269
-#: gofax/blocklists/class_blocklistManagement.inc:326
 #, fuzzy
 msgid "Permission error"
 msgstr "Permessi"
@@ -269,7 +266,7 @@ msgstr "Attenzione"
 
 #: gofax/blocklists/remove.tpl:6
 msgid ""
-"Please double check if your really want to do this since there is no way for "
+"Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
 msgstr ""
 
@@ -280,6 +277,19 @@ msgstr ""
 "Quindi - Se sei sicuro - premi <i>Rimuovi</i> per continuare o <i>Annulla</"
 "i> per abortire."
 
+#: gofax/blocklists/blocklist-list.tpl:13 gofax/blocklists/generic.tpl:17
+#: gofax/blocklists/class_blocklistGeneric.inc:387
+msgid "Base"
+msgstr "Base"
+
+#: gofax/blocklists/blocklist-list.tpl:13
+msgid "Update"
+msgstr ""
+
+#: gofax/blocklists/blocklist-list.tpl:13
+msgid "Submit"
+msgstr ""
+
 #: gofax/blocklists/generic.tpl:1 gofax/faxaccount/generic.tpl:6
 #: gofax/faxaccount/paste_generic.tpl:4
 msgid "Generic"
@@ -295,12 +305,6 @@ msgstr "Scegli il tuo numero di telefono personale"
 msgid "Name of blocklist"
 msgstr "Data di nascita"
 
-#: gofax/blocklists/generic.tpl:17
-#: gofax/blocklists/class_divListBlocklists.inc:86
-#: gofax/blocklists/class_blocklistGeneric.inc:387
-msgid "Base"
-msgstr "Base"
-
 #: gofax/blocklists/generic.tpl:20
 msgid "Choose subtree to place group in"
 msgstr "Scegli il subtree dove mettere il gruppo"
@@ -318,7 +322,7 @@ msgstr "Tipo"
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr ""
 
-#: gofax/blocklists/generic.tpl:51
+#: gofax/blocklists/generic.tpl:51 gofax/blocklists/blocklist-list.xml:57
 #: gofax/blocklists/class_blocklistGeneric.inc:386
 msgid "Description"
 msgstr "Descrizione"
@@ -341,131 +345,61 @@ msgstr "Informazioni"
 msgid "Numbers can also contain wild cards."
 msgstr ""
 
-#: gofax/blocklists/class_divListBlocklists.inc:31
-#: gofax/blocklists/class_divListBlocklists.inc:32
+#: gofax/blocklists/blocklist-list.xml:11
 msgid "List of blocklists"
 msgstr "Lista delle liste di blocchi"
 
-#: gofax/blocklists/class_divListBlocklists.inc:50
-#, fuzzy
-msgid "Select all"
-msgstr "Rimuovi"
-
-#: gofax/blocklists/class_divListBlocklists.inc:56
-#: gofax/blocklists/class_blocklistGeneric.inc:219
-#: gofax/blocklists/class_blocklistGeneric.inc:222
-#: gofax/blocklists/class_blocklistGeneric.inc:229
-#: gofax/blocklists/class_blocklistGeneric.inc:385
-msgid "Name"
-msgstr "Cognome"
-
-#: gofax/blocklists/class_divListBlocklists.inc:56
-msgid "Department"
-msgstr "Dipartimento"
-
-#: gofax/blocklists/class_divListBlocklists.inc:57
-#: gofax/blocklists/class_divListBlocklists.inc:91
-msgid "Actions"
-msgstr "Azioni"
-
-#: gofax/blocklists/class_divListBlocklists.inc:60
+#: gofax/blocklists/blocklist-list.xml:15
 #: gofax/faxaccount/class_gofaxAccount.inc:881
 #, fuzzy
 msgid "Send blocklist"
 msgstr "Liste di blocco"
 
-#: gofax/blocklists/class_divListBlocklists.inc:60
-msgid "Show send blocklists"
-msgstr ""
-
-#: gofax/blocklists/class_divListBlocklists.inc:61
+#: gofax/blocklists/blocklist-list.xml:23
 #: gofax/faxaccount/class_gofaxAccount.inc:880
 #, fuzzy
 msgid "Receive blocklist"
 msgstr "Lista delle liste di blocchi"
 
-#: gofax/blocklists/class_divListBlocklists.inc:61
-msgid "Show receive blocklists"
-msgstr ""
-
-#: gofax/blocklists/class_divListBlocklists.inc:67
-#, fuzzy
-msgid "Regular expression for matching list names"
-msgstr "Espressioni regolare per selezionare il nome del gruppo"
-
-#: gofax/blocklists/class_divListBlocklists.inc:88
-msgid "Submit department"
-msgstr "Imposta dipartimento"
+#: gofax/blocklists/blocklist-list.xml:49
+#: gofax/blocklists/class_blocklistGeneric.inc:219
+#: gofax/blocklists/class_blocklistGeneric.inc:222
+#: gofax/blocklists/class_blocklistGeneric.inc:229
+#: gofax/blocklists/class_blocklistGeneric.inc:385
+msgid "Name"
+msgstr "Cognome"
 
-#: gofax/blocklists/class_divListBlocklists.inc:88
-msgid "Submit"
-msgstr ""
+#: gofax/blocklists/blocklist-list.xml:65
+msgid "Actions"
+msgstr "Azioni"
 
-#: gofax/blocklists/class_divListBlocklists.inc:96
+#: gofax/blocklists/blocklist-list.xml:76
 msgid "Create"
 msgstr "Creare"
 
-#: gofax/blocklists/class_divListBlocklists.inc:98
+#: gofax/blocklists/blocklist-list.xml:82
 #: gofax/blocklists/class_blocklistGeneric.inc:388
 #, fuzzy
 msgid "Blocklist"
 msgstr "Liste di blocco"
 
-#: gofax/blocklists/class_divListBlocklists.inc:104
-msgid "Remove"
-msgstr "Rimuovi"
-
-#: gofax/blocklists/class_divListBlocklists.inc:151
-msgid "edit"
-msgstr "modifica"
-
-#: gofax/blocklists/class_divListBlocklists.inc:151
-#, fuzzy
-msgid "Edit user"
-msgstr "Modifica contatto"
-
-#: gofax/blocklists/class_divListBlocklists.inc:158
-msgid "delete"
-msgstr "elimina"
+#: gofax/blocklists/blocklist-list.xml:94
+#: gofax/blocklists/blocklist-list.xml:133 gofax/faxaccount/generic.tpl:128
+#: gofax/faxaccount/generic.tpl:136
+msgid "Edit"
+msgstr "Modifica"
 
-#: gofax/blocklists/class_divListBlocklists.inc:158
-#, fuzzy
-msgid "Delete user"
+#: gofax/blocklists/blocklist-list.xml:101
+#: gofax/blocklists/blocklist-list.xml:146
+msgid "Remove"
 msgstr "Rimuovi"
 
-#: gofax/blocklists/class_divListBlocklists.inc:195
-#: gofax/blocklists/class_divListBlocklists.inc:196
-#, fuzzy, php-format
-msgid "Number of listed '%s'"
-msgstr "Lista delle liste di blocchi"
-
-#: gofax/blocklists/class_divListBlocklists.inc:195
-#, fuzzy
-msgid "blocklists"
-msgstr "Liste di blocco"
-
-#: gofax/blocklists/class_divListBlocklists.inc:196
-#, fuzzy
-msgid "departments"
-msgstr "Dipartimento"
-
-#: gofax/blocklists/class_blocklistManagement.inc:5
-#, fuzzy
-msgid "FAX blocklists"
-msgstr "Liste blocco FAX"
-
-#: gofax/blocklists/class_blocklistManagement.inc:230
-#, fuzzy
-msgid "Permission"
-msgstr "Permessi"
-
-#: gofax/blocklists/class_blocklistManagement.inc:246
-#: gofax/blocklists/class_blocklistManagement.inc:307
-#, fuzzy
-msgid "blocklist"
+#: gofax/blocklists/class_blocklistManagement.inc:25
+#: gofax/faxaccount/generic.tpl:122
+msgid "Blocklists"
 msgstr "Liste di blocco"
 
-#: gofax/blocklists/main.inc:35 gofax/blocklists/main.inc:37
+#: gofax/blocklists/class_blocklistManagement.inc:26
 #, fuzzy
 msgid "Blocklist management"
 msgstr "Riferimenti"
@@ -600,18 +534,10 @@ msgstr "Numeri di Fax alternativi"
 msgid "Add local"
 msgstr "Aggiungi localmente"
 
-#: gofax/faxaccount/generic.tpl:122
-msgid "Blocklists"
-msgstr "Liste di blocco"
-
 #: gofax/faxaccount/generic.tpl:125
 msgid "Blocklists for incoming fax"
 msgstr "Liste di blocco per i Fax in arrivo"
 
-#: gofax/faxaccount/generic.tpl:128 gofax/faxaccount/generic.tpl:136
-msgid "Edit"
-msgstr "Modifica"
-
 #: gofax/faxaccount/generic.tpl:133
 msgid "Blocklists for outgoing fax"
 msgstr "Liste di blocco per i Fax in partenza"
@@ -744,6 +670,58 @@ msgstr "Informazioni organizzazione"
 msgid "FAX DB user"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Select all"
+#~ msgstr "Rimuovi"
+
+#~ msgid "Department"
+#~ msgstr "Dipartimento"
+
+#, fuzzy
+#~ msgid "Regular expression for matching list names"
+#~ msgstr "Espressioni regolare per selezionare il nome del gruppo"
+
+#~ msgid "Submit department"
+#~ msgstr "Imposta dipartimento"
+
+#~ msgid "edit"
+#~ msgstr "modifica"
+
+#, fuzzy
+#~ msgid "Edit user"
+#~ msgstr "Modifica contatto"
+
+#~ msgid "delete"
+#~ msgstr "elimina"
+
+#, fuzzy
+#~ msgid "Delete user"
+#~ msgstr "Rimuovi"
+
+#, fuzzy
+#~ msgid "Number of listed '%s'"
+#~ msgstr "Lista delle liste di blocchi"
+
+#, fuzzy
+#~ msgid "blocklists"
+#~ msgstr "Liste di blocco"
+
+#, fuzzy
+#~ msgid "departments"
+#~ msgstr "Dipartimento"
+
+#, fuzzy
+#~ msgid "FAX blocklists"
+#~ msgstr "Liste blocco FAX"
+
+#, fuzzy
+#~ msgid "Permission"
+#~ msgstr "Permessi"
+
+#, fuzzy
+#~ msgid "blocklist"
+#~ msgstr "Liste di blocco"
+
 #, fuzzy
 #~ msgid "Copy"
 #~ msgstr "Azienda"
diff --git a/gosa-plugins/gofax/locale/messages.po b/gosa-plugins/gofax/locale/messages.po
index 5fc83f80c..60f7ca73b 100644
--- a/gosa-plugins/gofax/locale/messages.po
+++ b/gosa-plugins/gofax/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -86,7 +86,7 @@ msgstr ""
 msgid "FAX reports"
 msgstr ""
 
-#: gofax/faxreports/contents.tpl:2
+#: gofax/faxreports/contents.tpl:2 gofax/blocklists/blocklist-filter.tpl:3
 msgid "Filter"
 msgstr ""
 
@@ -135,7 +135,6 @@ msgid "FAX Reports"
 msgstr ""
 
 #: gofax/faxreports/class_faxreport.inc:7
-#: gofax/blocklists/class_blocklistManagement.inc:6
 #: gofax/blocklists/class_blocklistGeneric.inc:10
 #: gofax/faxaccount/class_gofaxAccount.inc:7
 msgid "This does something"
@@ -186,8 +185,6 @@ msgstr ""
 
 #: gofax/faxreports/class_faxreport.inc:167
 #: gofax/faxreports/class_faxreport.inc:177
-#: gofax/blocklists/class_blocklistManagement.inc:269
-#: gofax/blocklists/class_blocklistManagement.inc:326
 msgid "Permission error"
 msgstr ""
 
@@ -248,7 +245,7 @@ msgstr ""
 
 #: gofax/blocklists/remove.tpl:6
 msgid ""
-"Please double check if your really want to do this since there is no way for "
+"Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
 msgstr ""
 
@@ -256,6 +253,19 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
+#: gofax/blocklists/blocklist-list.tpl:13 gofax/blocklists/generic.tpl:17
+#: gofax/blocklists/class_blocklistGeneric.inc:387
+msgid "Base"
+msgstr ""
+
+#: gofax/blocklists/blocklist-list.tpl:13
+msgid "Update"
+msgstr ""
+
+#: gofax/blocklists/blocklist-list.tpl:13
+msgid "Submit"
+msgstr ""
+
 #: gofax/blocklists/generic.tpl:1 gofax/faxaccount/generic.tpl:6
 #: gofax/faxaccount/paste_generic.tpl:4
 msgid "Generic"
@@ -269,12 +279,6 @@ msgstr ""
 msgid "Name of blocklist"
 msgstr ""
 
-#: gofax/blocklists/generic.tpl:17
-#: gofax/blocklists/class_divListBlocklists.inc:86
-#: gofax/blocklists/class_blocklistGeneric.inc:387
-msgid "Base"
-msgstr ""
-
 #: gofax/blocklists/generic.tpl:20
 msgid "Choose subtree to place group in"
 msgstr ""
@@ -291,7 +295,7 @@ msgstr ""
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr ""
 
-#: gofax/blocklists/generic.tpl:51
+#: gofax/blocklists/generic.tpl:51 gofax/blocklists/blocklist-list.xml:57
 #: gofax/blocklists/class_blocklistGeneric.inc:386
 msgid "Description"
 msgstr ""
@@ -312,119 +316,58 @@ msgstr ""
 msgid "Numbers can also contain wild cards."
 msgstr ""
 
-#: gofax/blocklists/class_divListBlocklists.inc:31
-#: gofax/blocklists/class_divListBlocklists.inc:32
+#: gofax/blocklists/blocklist-list.xml:11
 msgid "List of blocklists"
 msgstr ""
 
-#: gofax/blocklists/class_divListBlocklists.inc:50
-msgid "Select all"
-msgstr ""
-
-#: gofax/blocklists/class_divListBlocklists.inc:56
-#: gofax/blocklists/class_blocklistGeneric.inc:219
-#: gofax/blocklists/class_blocklistGeneric.inc:222
-#: gofax/blocklists/class_blocklistGeneric.inc:229
-#: gofax/blocklists/class_blocklistGeneric.inc:385
-msgid "Name"
-msgstr ""
-
-#: gofax/blocklists/class_divListBlocklists.inc:56
-msgid "Department"
-msgstr ""
-
-#: gofax/blocklists/class_divListBlocklists.inc:57
-#: gofax/blocklists/class_divListBlocklists.inc:91
-msgid "Actions"
-msgstr ""
-
-#: gofax/blocklists/class_divListBlocklists.inc:60
+#: gofax/blocklists/blocklist-list.xml:15
 #: gofax/faxaccount/class_gofaxAccount.inc:881
 msgid "Send blocklist"
 msgstr ""
 
-#: gofax/blocklists/class_divListBlocklists.inc:60
-msgid "Show send blocklists"
-msgstr ""
-
-#: gofax/blocklists/class_divListBlocklists.inc:61
+#: gofax/blocklists/blocklist-list.xml:23
 #: gofax/faxaccount/class_gofaxAccount.inc:880
 msgid "Receive blocklist"
 msgstr ""
 
-#: gofax/blocklists/class_divListBlocklists.inc:61
-msgid "Show receive blocklists"
-msgstr ""
-
-#: gofax/blocklists/class_divListBlocklists.inc:67
-msgid "Regular expression for matching list names"
-msgstr ""
-
-#: gofax/blocklists/class_divListBlocklists.inc:88
-msgid "Submit department"
+#: gofax/blocklists/blocklist-list.xml:49
+#: gofax/blocklists/class_blocklistGeneric.inc:219
+#: gofax/blocklists/class_blocklistGeneric.inc:222
+#: gofax/blocklists/class_blocklistGeneric.inc:229
+#: gofax/blocklists/class_blocklistGeneric.inc:385
+msgid "Name"
 msgstr ""
 
-#: gofax/blocklists/class_divListBlocklists.inc:88
-msgid "Submit"
+#: gofax/blocklists/blocklist-list.xml:65
+msgid "Actions"
 msgstr ""
 
-#: gofax/blocklists/class_divListBlocklists.inc:96
+#: gofax/blocklists/blocklist-list.xml:76
 msgid "Create"
 msgstr ""
 
-#: gofax/blocklists/class_divListBlocklists.inc:98
+#: gofax/blocklists/blocklist-list.xml:82
 #: gofax/blocklists/class_blocklistGeneric.inc:388
 msgid "Blocklist"
 msgstr ""
 
-#: gofax/blocklists/class_divListBlocklists.inc:104
-msgid "Remove"
-msgstr ""
-
-#: gofax/blocklists/class_divListBlocklists.inc:151
-msgid "edit"
-msgstr ""
-
-#: gofax/blocklists/class_divListBlocklists.inc:151
-msgid "Edit user"
-msgstr ""
-
-#: gofax/blocklists/class_divListBlocklists.inc:158
-msgid "delete"
-msgstr ""
-
-#: gofax/blocklists/class_divListBlocklists.inc:158
-msgid "Delete user"
-msgstr ""
-
-#: gofax/blocklists/class_divListBlocklists.inc:195
-#: gofax/blocklists/class_divListBlocklists.inc:196
-#, php-format
-msgid "Number of listed '%s'"
-msgstr ""
-
-#: gofax/blocklists/class_divListBlocklists.inc:195
-msgid "blocklists"
-msgstr ""
-
-#: gofax/blocklists/class_divListBlocklists.inc:196
-msgid "departments"
-msgstr ""
-
-#: gofax/blocklists/class_blocklistManagement.inc:5
-msgid "FAX blocklists"
+#: gofax/blocklists/blocklist-list.xml:94
+#: gofax/blocklists/blocklist-list.xml:133 gofax/faxaccount/generic.tpl:128
+#: gofax/faxaccount/generic.tpl:136
+msgid "Edit"
 msgstr ""
 
-#: gofax/blocklists/class_blocklistManagement.inc:230
-msgid "Permission"
+#: gofax/blocklists/blocklist-list.xml:101
+#: gofax/blocklists/blocklist-list.xml:146
+msgid "Remove"
 msgstr ""
 
-#: gofax/blocklists/class_blocklistManagement.inc:246
-#: gofax/blocklists/class_blocklistManagement.inc:307
-msgid "blocklist"
+#: gofax/blocklists/class_blocklistManagement.inc:25
+#: gofax/faxaccount/generic.tpl:122
+msgid "Blocklists"
 msgstr ""
 
-#: gofax/blocklists/main.inc:35 gofax/blocklists/main.inc:37
+#: gofax/blocklists/class_blocklistManagement.inc:26
 msgid "Blocklist management"
 msgstr ""
 
@@ -549,18 +492,10 @@ msgstr ""
 msgid "Add local"
 msgstr ""
 
-#: gofax/faxaccount/generic.tpl:122
-msgid "Blocklists"
-msgstr ""
-
 #: gofax/faxaccount/generic.tpl:125
 msgid "Blocklists for incoming fax"
 msgstr ""
 
-#: gofax/faxaccount/generic.tpl:128 gofax/faxaccount/generic.tpl:136
-msgid "Edit"
-msgstr ""
-
 #: gofax/faxaccount/generic.tpl:133
 msgid "Blocklists for outgoing fax"
 msgstr ""
diff --git a/gosa-plugins/gofax/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/gofax/locale/nl/LC_MESSAGES/messages.po
index 04d232e8c..7c2636a90 100644
--- a/gosa-plugins/gofax/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofax/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -89,7 +89,7 @@ msgstr "# pagina's"
 msgid "FAX reports"
 msgstr "Fax rapporten"
 
-#: gofax/faxreports/contents.tpl:2
+#: gofax/faxreports/contents.tpl:2 gofax/blocklists/blocklist-filter.tpl:3
 msgid "Filter"
 msgstr "Filter"
 
@@ -138,7 +138,6 @@ msgid "FAX Reports"
 msgstr "Fax rapporten"
 
 #: gofax/faxreports/class_faxreport.inc:7
-#: gofax/blocklists/class_blocklistManagement.inc:6
 #: gofax/blocklists/class_blocklistGeneric.inc:10
 #: gofax/faxaccount/class_gofaxAccount.inc:7
 msgid "This does something"
@@ -191,8 +190,6 @@ msgstr "De opgegeven database kon niet geselecteerd worden!"
 
 #: gofax/faxreports/class_faxreport.inc:167
 #: gofax/faxreports/class_faxreport.inc:177
-#: gofax/blocklists/class_blocklistManagement.inc:269
-#: gofax/blocklists/class_blocklistManagement.inc:326
 #, fuzzy
 msgid "Permission error"
 msgstr "Rechten"
@@ -266,11 +263,11 @@ msgstr "Waarschuwing"
 
 #: gofax/blocklists/remove.tpl:6
 msgid ""
-"Please double check if your really want to do this since there is no way for "
+"Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
 msgstr ""
-"Verzeker u ervan dat u dit daadwerkelijk wil doorvoeren, aangezien het "
-"onmogelijk is voor GOsa om de data terug te halen."
+"Controleer a.u.b. of u dit daadwerkelijk wil doen, aangezien er geen "
+"mogelijkheid voor GOsa is om uw data terug te krijgen."
 
 #: gofax/blocklists/remove.tpl:10
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
@@ -278,6 +275,19 @@ msgstr ""
 "Indien u zeker bent drukt u dan 'Verwijderen' om door te gaan of 'Annuleren' "
 "om te annuleren."
 
+#: gofax/blocklists/blocklist-list.tpl:13 gofax/blocklists/generic.tpl:17
+#: gofax/blocklists/class_blocklistGeneric.inc:387
+msgid "Base"
+msgstr "Basis"
+
+#: gofax/blocklists/blocklist-list.tpl:13
+msgid "Update"
+msgstr ""
+
+#: gofax/blocklists/blocklist-list.tpl:13
+msgid "Submit"
+msgstr "Verwerk"
+
 #: gofax/blocklists/generic.tpl:1 gofax/faxaccount/generic.tpl:6
 #: gofax/faxaccount/paste_generic.tpl:4
 msgid "Generic"
@@ -291,12 +301,6 @@ msgstr "Lijstnaam"
 msgid "Name of blocklist"
 msgstr "Naam van de blokkeerlijst"
 
-#: gofax/blocklists/generic.tpl:17
-#: gofax/blocklists/class_divListBlocklists.inc:86
-#: gofax/blocklists/class_blocklistGeneric.inc:387
-msgid "Base"
-msgstr "Basis"
-
 #: gofax/blocklists/generic.tpl:20
 msgid "Choose subtree to place group in"
 msgstr "Selecteer de subtree waaronder deze groep geplaatst wordt"
@@ -313,7 +317,7 @@ msgstr "Type"
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr "Selecteer of inkomende en uitgaande gesprekken gefilterd moeten worden"
 
-#: gofax/blocklists/generic.tpl:51
+#: gofax/blocklists/generic.tpl:51 gofax/blocklists/blocklist-list.xml:57
 #: gofax/blocklists/class_blocklistGeneric.inc:386
 msgid "Description"
 msgstr "Omschrijving"
@@ -334,128 +338,61 @@ msgstr "Informatie"
 msgid "Numbers can also contain wild cards."
 msgstr "Nummers kunnen ook wildcards (*?) bevatten."
 
-#: gofax/blocklists/class_divListBlocklists.inc:31
-#: gofax/blocklists/class_divListBlocklists.inc:32
+#: gofax/blocklists/blocklist-list.xml:11
 msgid "List of blocklists"
 msgstr "Lijst met blokkeerlijsten"
 
-#: gofax/blocklists/class_divListBlocklists.inc:50
-#, fuzzy
-msgid "Select all"
-msgstr "Selecteer"
-
-#: gofax/blocklists/class_divListBlocklists.inc:56
-#: gofax/blocklists/class_blocklistGeneric.inc:219
-#: gofax/blocklists/class_blocklistGeneric.inc:222
-#: gofax/blocklists/class_blocklistGeneric.inc:229
-#: gofax/blocklists/class_blocklistGeneric.inc:385
-msgid "Name"
-msgstr "Naam"
-
-#: gofax/blocklists/class_divListBlocklists.inc:56
-msgid "Department"
-msgstr "Afdeling"
-
-#: gofax/blocklists/class_divListBlocklists.inc:57
-#: gofax/blocklists/class_divListBlocklists.inc:91
-msgid "Actions"
-msgstr "Acties"
-
-#: gofax/blocklists/class_divListBlocklists.inc:60
+#: gofax/blocklists/blocklist-list.xml:15
 #: gofax/faxaccount/class_gofaxAccount.inc:881
 #, fuzzy
 msgid "Send blocklist"
 msgstr "Toon verstuur blokkeerlijsten"
 
-#: gofax/blocklists/class_divListBlocklists.inc:60
-msgid "Show send blocklists"
-msgstr "Toon verstuur blokkeerlijsten"
-
-#: gofax/blocklists/class_divListBlocklists.inc:61
+#: gofax/blocklists/blocklist-list.xml:23
 #: gofax/faxaccount/class_gofaxAccount.inc:880
 #, fuzzy
 msgid "Receive blocklist"
 msgstr "Toon ontvangst blokkeerlijsten"
 
-#: gofax/blocklists/class_divListBlocklists.inc:61
-msgid "Show receive blocklists"
-msgstr "Toon ontvangst blokkeerlijsten"
-
-#: gofax/blocklists/class_divListBlocklists.inc:67
-msgid "Regular expression for matching list names"
-msgstr "Reguliere expressie voor overeenkomende lijstnamen"
-
-#: gofax/blocklists/class_divListBlocklists.inc:88
-msgid "Submit department"
-msgstr "Verwerk afdeling"
+#: gofax/blocklists/blocklist-list.xml:49
+#: gofax/blocklists/class_blocklistGeneric.inc:219
+#: gofax/blocklists/class_blocklistGeneric.inc:222
+#: gofax/blocklists/class_blocklistGeneric.inc:229
+#: gofax/blocklists/class_blocklistGeneric.inc:385
+msgid "Name"
+msgstr "Naam"
 
-#: gofax/blocklists/class_divListBlocklists.inc:88
-msgid "Submit"
-msgstr "Verwerk"
+#: gofax/blocklists/blocklist-list.xml:65
+msgid "Actions"
+msgstr "Acties"
 
-#: gofax/blocklists/class_divListBlocklists.inc:96
+#: gofax/blocklists/blocklist-list.xml:76
 msgid "Create"
 msgstr "Aanmaken"
 
-#: gofax/blocklists/class_divListBlocklists.inc:98
+#: gofax/blocklists/blocklist-list.xml:82
 #: gofax/blocklists/class_blocklistGeneric.inc:388
 #, fuzzy
 msgid "Blocklist"
 msgstr "Blokkeerlijsten"
 
-#: gofax/blocklists/class_divListBlocklists.inc:104
+#: gofax/blocklists/blocklist-list.xml:94
+#: gofax/blocklists/blocklist-list.xml:133 gofax/faxaccount/generic.tpl:128
+#: gofax/faxaccount/generic.tpl:136
+msgid "Edit"
+msgstr "Bewerken"
+
+#: gofax/blocklists/blocklist-list.xml:101
+#: gofax/blocklists/blocklist-list.xml:146
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: gofax/blocklists/class_divListBlocklists.inc:151
-msgid "edit"
-msgstr "Bewerk"
-
-#: gofax/blocklists/class_divListBlocklists.inc:151
-msgid "Edit user"
-msgstr "Bewerk gebruiker"
-
-#: gofax/blocklists/class_divListBlocklists.inc:158
-msgid "delete"
-msgstr "Verwijder"
-
-#: gofax/blocklists/class_divListBlocklists.inc:158
-msgid "Delete user"
-msgstr "Verwijder gebruiker"
-
-#: gofax/blocklists/class_divListBlocklists.inc:195
-#: gofax/blocklists/class_divListBlocklists.inc:196
-#, fuzzy, php-format
-msgid "Number of listed '%s'"
-msgstr "Naam van de blokkeerlijst"
-
-#: gofax/blocklists/class_divListBlocklists.inc:195
-#, fuzzy
-msgid "blocklists"
-msgstr "Blokkeerlijsten"
-
-#: gofax/blocklists/class_divListBlocklists.inc:196
-#, fuzzy
-msgid "departments"
-msgstr "Afdeling"
-
-#: gofax/blocklists/class_blocklistManagement.inc:5
-#, fuzzy
-msgid "FAX blocklists"
-msgstr "Fax blokkades"
-
-#: gofax/blocklists/class_blocklistManagement.inc:230
-#, fuzzy
-msgid "Permission"
-msgstr "Rechten"
-
-#: gofax/blocklists/class_blocklistManagement.inc:246
-#: gofax/blocklists/class_blocklistManagement.inc:307
-#, fuzzy
-msgid "blocklist"
+#: gofax/blocklists/class_blocklistManagement.inc:25
+#: gofax/faxaccount/generic.tpl:122
+msgid "Blocklists"
 msgstr "Blokkeerlijsten"
 
-#: gofax/blocklists/main.inc:35 gofax/blocklists/main.inc:37
+#: gofax/blocklists/class_blocklistManagement.inc:26
 msgid "Blocklist management"
 msgstr "Blokkeerlijst beheer"
 
@@ -584,18 +521,10 @@ msgstr "Alternatieve Fax nummers"
 msgid "Add local"
 msgstr "Lokaal toevoegen"
 
-#: gofax/faxaccount/generic.tpl:122
-msgid "Blocklists"
-msgstr "Blokkeerlijsten"
-
 #: gofax/faxaccount/generic.tpl:125
 msgid "Blocklists for incoming fax"
 msgstr "Blokkeerlijsten voor te ontvangen Faxen"
 
-#: gofax/faxaccount/generic.tpl:128 gofax/faxaccount/generic.tpl:136
-msgid "Edit"
-msgstr "Bewerken"
-
 #: gofax/faxaccount/generic.tpl:133
 msgid "Blocklists for outgoing fax"
 msgstr "Blokkeerlijsten voor te versturen Faxen"
@@ -728,6 +657,68 @@ msgstr "Free Busy informatie"
 msgid "FAX DB user"
 msgstr "FAX DB gebruiker"
 
+#~ msgid ""
+#~ "Please double check if your really want to do this since there is no way "
+#~ "for GOsa to get your data back."
+#~ msgstr ""
+#~ "Verzeker u ervan dat u dit daadwerkelijk wil doorvoeren, aangezien het "
+#~ "onmogelijk is voor GOsa om de data terug te halen."
+
+#, fuzzy
+#~ msgid "Select all"
+#~ msgstr "Selecteer"
+
+#~ msgid "Department"
+#~ msgstr "Afdeling"
+
+#~ msgid "Show send blocklists"
+#~ msgstr "Toon verstuur blokkeerlijsten"
+
+#~ msgid "Show receive blocklists"
+#~ msgstr "Toon ontvangst blokkeerlijsten"
+
+#~ msgid "Regular expression for matching list names"
+#~ msgstr "Reguliere expressie voor overeenkomende lijstnamen"
+
+#~ msgid "Submit department"
+#~ msgstr "Verwerk afdeling"
+
+#~ msgid "edit"
+#~ msgstr "Bewerk"
+
+#~ msgid "Edit user"
+#~ msgstr "Bewerk gebruiker"
+
+#~ msgid "delete"
+#~ msgstr "Verwijder"
+
+#~ msgid "Delete user"
+#~ msgstr "Verwijder gebruiker"
+
+#, fuzzy
+#~ msgid "Number of listed '%s'"
+#~ msgstr "Naam van de blokkeerlijst"
+
+#, fuzzy
+#~ msgid "blocklists"
+#~ msgstr "Blokkeerlijsten"
+
+#, fuzzy
+#~ msgid "departments"
+#~ msgstr "Afdeling"
+
+#, fuzzy
+#~ msgid "FAX blocklists"
+#~ msgstr "Fax blokkades"
+
+#, fuzzy
+#~ msgid "Permission"
+#~ msgstr "Rechten"
+
+#, fuzzy
+#~ msgid "blocklist"
+#~ msgstr "Blokkeerlijsten"
+
 #, fuzzy
 #~ msgid "Copy"
 #~ msgstr "kopieer"
diff --git a/gosa-plugins/gofax/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/gofax/locale/pl/LC_MESSAGES/messages.po
index 788cc031f..4e44a5bd2 100644
--- a/gosa-plugins/gofax/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofax/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -84,7 +84,7 @@ msgstr "# stron"
 msgid "FAX reports"
 msgstr "Raporty FAX"
 
-#: gofax/faxreports/contents.tpl:2
+#: gofax/faxreports/contents.tpl:2 gofax/blocklists/blocklist-filter.tpl:3
 msgid "Filter"
 msgstr "Filtr"
 
@@ -133,7 +133,6 @@ msgid "FAX Reports"
 msgstr "Raporty FAX"
 
 #: gofax/faxreports/class_faxreport.inc:7
-#: gofax/blocklists/class_blocklistManagement.inc:6
 #: gofax/blocklists/class_blocklistGeneric.inc:10
 #: gofax/faxaccount/class_gofaxAccount.inc:7
 msgid "This does something"
@@ -185,8 +184,6 @@ msgstr "Nie można wybrać bazy danych!"
 
 #: gofax/faxreports/class_faxreport.inc:167
 #: gofax/faxreports/class_faxreport.inc:177
-#: gofax/blocklists/class_blocklistManagement.inc:269
-#: gofax/blocklists/class_blocklistManagement.inc:326
 #, fuzzy
 msgid "Permission error"
 msgstr "Uprawnienia"
@@ -257,11 +254,9 @@ msgstr "Ostrzeżenie"
 
 #: gofax/blocklists/remove.tpl:6
 msgid ""
-"Please double check if your really want to do this since there is no way for "
+"Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
-msgstr ""
-"Proszę upewnić się, że faktycznie chcesz wykonać tą operację. Nie ma "
-"możliwości odwrócenia tego procesu."
+msgstr "Proszę upewnić się czy kontynuować, gdyż nie ma możliwości powrotu."
 
 #: gofax/blocklists/remove.tpl:10
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
@@ -269,6 +264,19 @@ msgstr ""
 "Jeśli jesteś pewien - naciśnij 'Usuń' aby kontynuować lub 'Anuluj' aby "
 "anulować."
 
+#: gofax/blocklists/blocklist-list.tpl:13 gofax/blocklists/generic.tpl:17
+#: gofax/blocklists/class_blocklistGeneric.inc:387
+msgid "Base"
+msgstr "Kontener"
+
+#: gofax/blocklists/blocklist-list.tpl:13
+msgid "Update"
+msgstr "Aktualizuj"
+
+#: gofax/blocklists/blocklist-list.tpl:13
+msgid "Submit"
+msgstr "Wyślij"
+
 #: gofax/blocklists/generic.tpl:1 gofax/faxaccount/generic.tpl:6
 #: gofax/faxaccount/paste_generic.tpl:4
 msgid "Generic"
@@ -282,12 +290,6 @@ msgstr "Nazwa listy"
 msgid "Name of blocklist"
 msgstr "Nazwa bloklisty"
 
-#: gofax/blocklists/generic.tpl:17
-#: gofax/blocklists/class_divListBlocklists.inc:86
-#: gofax/blocklists/class_blocklistGeneric.inc:387
-msgid "Base"
-msgstr "Kontener"
-
 #: gofax/blocklists/generic.tpl:20
 msgid "Choose subtree to place group in"
 msgstr "Wybierz poddrzewo do umieszczenia grupy"
@@ -304,7 +306,7 @@ msgstr "Typ"
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr "Wybierz, czy filtrować nadchodzące czy przychodzące rozmowy"
 
-#: gofax/blocklists/generic.tpl:51
+#: gofax/blocklists/generic.tpl:51 gofax/blocklists/blocklist-list.xml:57
 #: gofax/blocklists/class_blocklistGeneric.inc:386
 msgid "Description"
 msgstr "Opis"
@@ -325,17 +327,21 @@ msgstr "Informacja"
 msgid "Numbers can also contain wild cards."
 msgstr "Numery mogą również zawierać maski"
 
-#: gofax/blocklists/class_divListBlocklists.inc:31
-#: gofax/blocklists/class_divListBlocklists.inc:32
+#: gofax/blocklists/blocklist-list.xml:11
 msgid "List of blocklists"
 msgstr "Lista bloklist"
 
-#: gofax/blocklists/class_divListBlocklists.inc:50
-#, fuzzy
-msgid "Select all"
-msgstr "Wybierz"
+#: gofax/blocklists/blocklist-list.xml:15
+#: gofax/faxaccount/class_gofaxAccount.inc:881
+msgid "Send blocklist"
+msgstr "Bloklista wysyłania"
+
+#: gofax/blocklists/blocklist-list.xml:23
+#: gofax/faxaccount/class_gofaxAccount.inc:880
+msgid "Receive blocklist"
+msgstr "Bloklista otrzymywania"
 
-#: gofax/blocklists/class_divListBlocklists.inc:56
+#: gofax/blocklists/blocklist-list.xml:49
 #: gofax/blocklists/class_blocklistGeneric.inc:219
 #: gofax/blocklists/class_blocklistGeneric.inc:222
 #: gofax/blocklists/class_blocklistGeneric.inc:229
@@ -343,108 +349,37 @@ msgstr "Wybierz"
 msgid "Name"
 msgstr "Imię"
 
-#: gofax/blocklists/class_divListBlocklists.inc:56
-msgid "Department"
-msgstr "Departament"
-
-#: gofax/blocklists/class_divListBlocklists.inc:57
-#: gofax/blocklists/class_divListBlocklists.inc:91
+#: gofax/blocklists/blocklist-list.xml:65
 msgid "Actions"
 msgstr "Akcje"
 
-#: gofax/blocklists/class_divListBlocklists.inc:60
-#: gofax/faxaccount/class_gofaxAccount.inc:881
-msgid "Send blocklist"
-msgstr "Bloklista wysyłania"
-
-#: gofax/blocklists/class_divListBlocklists.inc:60
-msgid "Show send blocklists"
-msgstr "Pokaż bloklisty wysyłania"
-
-#: gofax/blocklists/class_divListBlocklists.inc:61
-#: gofax/faxaccount/class_gofaxAccount.inc:880
-msgid "Receive blocklist"
-msgstr "Bloklista otrzymywania"
-
-#: gofax/blocklists/class_divListBlocklists.inc:61
-msgid "Show receive blocklists"
-msgstr "Pokaż bloklisty otrzymywania"
-
-#: gofax/blocklists/class_divListBlocklists.inc:67
-msgid "Regular expression for matching list names"
-msgstr "Wyrażenie regularne do dopasowania nazw list"
-
-#: gofax/blocklists/class_divListBlocklists.inc:88
-msgid "Submit department"
-msgstr "Zatwierdź departament"
-
-#: gofax/blocklists/class_divListBlocklists.inc:88
-msgid "Submit"
-msgstr "Wyślij"
-
-#: gofax/blocklists/class_divListBlocklists.inc:96
+#: gofax/blocklists/blocklist-list.xml:76
 msgid "Create"
 msgstr "Utwórz"
 
-#: gofax/blocklists/class_divListBlocklists.inc:98
+#: gofax/blocklists/blocklist-list.xml:82
 #: gofax/blocklists/class_blocklistGeneric.inc:388
 #, fuzzy
 msgid "Blocklist"
 msgstr "Bloklisty"
 
-#: gofax/blocklists/class_divListBlocklists.inc:104
-msgid "Remove"
-msgstr "Usuń"
-
-#: gofax/blocklists/class_divListBlocklists.inc:151
-msgid "edit"
-msgstr "edytuj"
-
-#: gofax/blocklists/class_divListBlocklists.inc:151
-msgid "Edit user"
-msgstr "Edytuj użytkownika"
+#: gofax/blocklists/blocklist-list.xml:94
+#: gofax/blocklists/blocklist-list.xml:133 gofax/faxaccount/generic.tpl:128
+#: gofax/faxaccount/generic.tpl:136
+msgid "Edit"
+msgstr "Edytuj"
 
-#: gofax/blocklists/class_divListBlocklists.inc:158
-msgid "delete"
+#: gofax/blocklists/blocklist-list.xml:101
+#: gofax/blocklists/blocklist-list.xml:146
+msgid "Remove"
 msgstr "Usuń"
 
-#: gofax/blocklists/class_divListBlocklists.inc:158
-msgid "Delete user"
-msgstr "Usuń użytkownika"
-
-#: gofax/blocklists/class_divListBlocklists.inc:195
-#: gofax/blocklists/class_divListBlocklists.inc:196
-#, fuzzy, php-format
-msgid "Number of listed '%s'"
-msgstr "Nazwa bloklisty"
-
-#: gofax/blocklists/class_divListBlocklists.inc:195
-#, fuzzy
-msgid "blocklists"
-msgstr "Bloklisty"
-
-#: gofax/blocklists/class_divListBlocklists.inc:196
-#, fuzzy
-msgid "departments"
-msgstr "Departament"
-
-#: gofax/blocklists/class_blocklistManagement.inc:5
-#, fuzzy
-msgid "FAX blocklists"
-msgstr "Bloklisty FAX"
-
-#: gofax/blocklists/class_blocklistManagement.inc:230
-#, fuzzy
-msgid "Permission"
-msgstr "Uprawnienia"
-
-#: gofax/blocklists/class_blocklistManagement.inc:246
-#: gofax/blocklists/class_blocklistManagement.inc:307
-#, fuzzy
-msgid "blocklist"
+#: gofax/blocklists/class_blocklistManagement.inc:25
+#: gofax/faxaccount/generic.tpl:122
+msgid "Blocklists"
 msgstr "Bloklisty"
 
-#: gofax/blocklists/main.inc:35 gofax/blocklists/main.inc:37
+#: gofax/blocklists/class_blocklistManagement.inc:26
 msgid "Blocklist management"
 msgstr "Zarządzanie bloklistą"
 
@@ -572,18 +507,10 @@ msgstr "Alternatywne numery faxu"
 msgid "Add local"
 msgstr "Dodaj lokalne"
 
-#: gofax/faxaccount/generic.tpl:122
-msgid "Blocklists"
-msgstr "Bloklisty"
-
 #: gofax/faxaccount/generic.tpl:125
 msgid "Blocklists for incoming fax"
 msgstr "Bloklisty dla nadchodzących faxów"
 
-#: gofax/faxaccount/generic.tpl:128 gofax/faxaccount/generic.tpl:136
-msgid "Edit"
-msgstr "Edytuj"
-
 #: gofax/faxaccount/generic.tpl:133
 msgid "Blocklists for outgoing fax"
 msgstr "Bloklisty dla wychodzących faxów"
@@ -709,6 +636,68 @@ msgstr "Informacje bazy FAX"
 msgid "FAX DB user"
 msgstr "Użytkownik bazy FAX"
 
+#~ msgid ""
+#~ "Please double check if your really want to do this since there is no way "
+#~ "for GOsa to get your data back."
+#~ msgstr ""
+#~ "Proszę upewnić się, że faktycznie chcesz wykonać tą operację. Nie ma "
+#~ "możliwości odwrócenia tego procesu."
+
+#, fuzzy
+#~ msgid "Select all"
+#~ msgstr "Wybierz"
+
+#~ msgid "Department"
+#~ msgstr "Departament"
+
+#~ msgid "Show send blocklists"
+#~ msgstr "Pokaż bloklisty wysyłania"
+
+#~ msgid "Show receive blocklists"
+#~ msgstr "Pokaż bloklisty otrzymywania"
+
+#~ msgid "Regular expression for matching list names"
+#~ msgstr "Wyrażenie regularne do dopasowania nazw list"
+
+#~ msgid "Submit department"
+#~ msgstr "Zatwierdź departament"
+
+#~ msgid "edit"
+#~ msgstr "edytuj"
+
+#~ msgid "Edit user"
+#~ msgstr "Edytuj użytkownika"
+
+#~ msgid "delete"
+#~ msgstr "Usuń"
+
+#~ msgid "Delete user"
+#~ msgstr "Usuń użytkownika"
+
+#, fuzzy
+#~ msgid "Number of listed '%s'"
+#~ msgstr "Nazwa bloklisty"
+
+#, fuzzy
+#~ msgid "blocklists"
+#~ msgstr "Bloklisty"
+
+#, fuzzy
+#~ msgid "departments"
+#~ msgstr "Departament"
+
+#, fuzzy
+#~ msgid "FAX blocklists"
+#~ msgstr "Bloklisty FAX"
+
+#, fuzzy
+#~ msgid "Permission"
+#~ msgstr "Uprawnienia"
+
+#, fuzzy
+#~ msgid "blocklist"
+#~ msgstr "Bloklisty"
+
 #, fuzzy
 #~ msgid "Copy"
 #~ msgstr "kopiuj"
diff --git a/gosa-plugins/gofax/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/gofax/locale/ru/LC_MESSAGES/messages.po
index 8655628ed..73b65ef46 100644
--- a/gosa-plugins/gofax/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofax/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -84,7 +84,7 @@ msgstr "Число страниц"
 msgid "FAX reports"
 msgstr "Отчеты о факсах"
 
-#: gofax/faxreports/contents.tpl:2
+#: gofax/faxreports/contents.tpl:2 gofax/blocklists/blocklist-filter.tpl:3
 msgid "Filter"
 msgstr "Фильтр"
 
@@ -133,7 +133,6 @@ msgid "FAX Reports"
 msgstr "Отчеты о факсах"
 
 #: gofax/faxreports/class_faxreport.inc:7
-#: gofax/blocklists/class_blocklistManagement.inc:6
 #: gofax/blocklists/class_blocklistGeneric.inc:10
 #: gofax/faxaccount/class_gofaxAccount.inc:7
 msgid "This does something"
@@ -186,8 +185,6 @@ msgstr "Невозможно выбрать базу данных!"
 
 #: gofax/faxreports/class_faxreport.inc:167
 #: gofax/faxreports/class_faxreport.inc:177
-#: gofax/blocklists/class_blocklistManagement.inc:269
-#: gofax/blocklists/class_blocklistManagement.inc:326
 #, fuzzy
 msgid "Permission error"
 msgstr "Права для членов группы"
@@ -260,11 +257,11 @@ msgstr "Предупреждение"
 
 #: gofax/blocklists/remove.tpl:6
 msgid ""
-"Please double check if your really want to do this since there is no way for "
+"Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
 msgstr ""
 "Подумайте еще раз, действительно ли вам нужно удаление, так как GOsa не "
-"сможет отменить результаты этой операции."
+"сможет восстановить эти данные."
 
 #: gofax/blocklists/remove.tpl:10
 #, fuzzy
@@ -273,6 +270,19 @@ msgstr ""
 "Если вы уверены в своих действиях, нажмите на кнопку <i>Удалить</i>, иначе "
 "нажмите <i>Отмена</i>."
 
+#: gofax/blocklists/blocklist-list.tpl:13 gofax/blocklists/generic.tpl:17
+#: gofax/blocklists/class_blocklistGeneric.inc:387
+msgid "Base"
+msgstr "Ветка"
+
+#: gofax/blocklists/blocklist-list.tpl:13
+msgid "Update"
+msgstr ""
+
+#: gofax/blocklists/blocklist-list.tpl:13
+msgid "Submit"
+msgstr ""
+
 #: gofax/blocklists/generic.tpl:1 gofax/faxaccount/generic.tpl:6
 #: gofax/faxaccount/paste_generic.tpl:4
 msgid "Generic"
@@ -286,12 +296,6 @@ msgstr "Список"
 msgid "Name of blocklist"
 msgstr "Имя стоп-листа"
 
-#: gofax/blocklists/generic.tpl:17
-#: gofax/blocklists/class_divListBlocklists.inc:86
-#: gofax/blocklists/class_blocklistGeneric.inc:387
-msgid "Base"
-msgstr "Ветка"
-
 #: gofax/blocklists/generic.tpl:20
 msgid "Choose subtree to place group in"
 msgstr "Выберите ветку для группы"
@@ -309,7 +313,7 @@ msgstr "Тип"
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr "Выберите, нужно ли фильтровать входящие или исходящие звонки"
 
-#: gofax/blocklists/generic.tpl:51
+#: gofax/blocklists/generic.tpl:51 gofax/blocklists/blocklist-list.xml:57
 #: gofax/blocklists/class_blocklistGeneric.inc:386
 msgid "Description"
 msgstr "Описание"
@@ -330,133 +334,61 @@ msgstr "Информация"
 msgid "Numbers can also contain wild cards."
 msgstr "Вместо точных номеров можно использовать шаблоны."
 
-#: gofax/blocklists/class_divListBlocklists.inc:31
-#: gofax/blocklists/class_divListBlocklists.inc:32
+#: gofax/blocklists/blocklist-list.xml:11
 msgid "List of blocklists"
 msgstr "Стоп-листы"
 
-#: gofax/blocklists/class_divListBlocklists.inc:50
-#, fuzzy
-msgid "Select all"
-msgstr "Удалить"
-
-#: gofax/blocklists/class_divListBlocklists.inc:56
-#: gofax/blocklists/class_blocklistGeneric.inc:219
-#: gofax/blocklists/class_blocklistGeneric.inc:222
-#: gofax/blocklists/class_blocklistGeneric.inc:229
-#: gofax/blocklists/class_blocklistGeneric.inc:385
-msgid "Name"
-msgstr "Фамилия"
-
-#: gofax/blocklists/class_divListBlocklists.inc:56
-msgid "Department"
-msgstr "Подразделение"
-
-#: gofax/blocklists/class_divListBlocklists.inc:57
-#: gofax/blocklists/class_divListBlocklists.inc:91
-msgid "Actions"
-msgstr "Действия"
-
-#: gofax/blocklists/class_divListBlocklists.inc:60
+#: gofax/blocklists/blocklist-list.xml:15
 #: gofax/faxaccount/class_gofaxAccount.inc:881
 #, fuzzy
 msgid "Send blocklist"
 msgstr "Показать стоп-листы отправки"
 
-#: gofax/blocklists/class_divListBlocklists.inc:60
-msgid "Show send blocklists"
-msgstr "Показать стоп-листы отправки"
-
-#: gofax/blocklists/class_divListBlocklists.inc:61
+#: gofax/blocklists/blocklist-list.xml:23
 #: gofax/faxaccount/class_gofaxAccount.inc:880
 #, fuzzy
 msgid "Receive blocklist"
 msgstr "Показать стоп-листы получения"
 
-#: gofax/blocklists/class_divListBlocklists.inc:61
-msgid "Show receive blocklists"
-msgstr "Показать стоп-листы получения"
-
-#: gofax/blocklists/class_divListBlocklists.inc:67
-msgid "Regular expression for matching list names"
-msgstr "Регулярное выражение, соответствующее именам списков"
-
-#: gofax/blocklists/class_divListBlocklists.inc:88
-#, fuzzy
-msgid "Submit department"
-msgstr "Показать подразделения"
+#: gofax/blocklists/blocklist-list.xml:49
+#: gofax/blocklists/class_blocklistGeneric.inc:219
+#: gofax/blocklists/class_blocklistGeneric.inc:222
+#: gofax/blocklists/class_blocklistGeneric.inc:229
+#: gofax/blocklists/class_blocklistGeneric.inc:385
+msgid "Name"
+msgstr "Фамилия"
 
-#: gofax/blocklists/class_divListBlocklists.inc:88
-msgid "Submit"
-msgstr ""
+#: gofax/blocklists/blocklist-list.xml:65
+msgid "Actions"
+msgstr "Действия"
 
-#: gofax/blocklists/class_divListBlocklists.inc:96
+#: gofax/blocklists/blocklist-list.xml:76
 msgid "Create"
 msgstr "Создать"
 
-#: gofax/blocklists/class_divListBlocklists.inc:98
+#: gofax/blocklists/blocklist-list.xml:82
 #: gofax/blocklists/class_blocklistGeneric.inc:388
 #, fuzzy
 msgid "Blocklist"
 msgstr "\"Черные списки\""
 
-#: gofax/blocklists/class_divListBlocklists.inc:104
-msgid "Remove"
-msgstr "Удалить"
-
-#: gofax/blocklists/class_divListBlocklists.inc:151
-#, fuzzy
-msgid "edit"
+#: gofax/blocklists/blocklist-list.xml:94
+#: gofax/blocklists/blocklist-list.xml:133 gofax/faxaccount/generic.tpl:128
+#: gofax/faxaccount/generic.tpl:136
+msgid "Edit"
 msgstr "Изменить"
 
-#: gofax/blocklists/class_divListBlocklists.inc:151
-#, fuzzy
-msgid "Edit user"
-msgstr "Пользователи домена"
-
-#: gofax/blocklists/class_divListBlocklists.inc:158
-#, fuzzy
-msgid "delete"
-msgstr "Удалить"
-
-#: gofax/blocklists/class_divListBlocklists.inc:158
-#, fuzzy
-msgid "Delete user"
+#: gofax/blocklists/blocklist-list.xml:101
+#: gofax/blocklists/blocklist-list.xml:146
+msgid "Remove"
 msgstr "Удалить"
 
-#: gofax/blocklists/class_divListBlocklists.inc:195
-#: gofax/blocklists/class_divListBlocklists.inc:196
-#, fuzzy, php-format
-msgid "Number of listed '%s'"
-msgstr "Имя стоп-листа"
-
-#: gofax/blocklists/class_divListBlocklists.inc:195
-#, fuzzy
-msgid "blocklists"
-msgstr "\"Черные списки\""
-
-#: gofax/blocklists/class_divListBlocklists.inc:196
-#, fuzzy
-msgid "departments"
-msgstr "Подразделение"
-
-#: gofax/blocklists/class_blocklistManagement.inc:5
-#, fuzzy
-msgid "FAX blocklists"
-msgstr "Стоп-лист номеров (факсы)"
-
-#: gofax/blocklists/class_blocklistManagement.inc:230
-#, fuzzy
-msgid "Permission"
-msgstr "Права для членов группы"
-
-#: gofax/blocklists/class_blocklistManagement.inc:246
-#: gofax/blocklists/class_blocklistManagement.inc:307
-#, fuzzy
-msgid "blocklist"
+#: gofax/blocklists/class_blocklistManagement.inc:25
+#: gofax/faxaccount/generic.tpl:122
+msgid "Blocklists"
 msgstr "\"Черные списки\""
 
-#: gofax/blocklists/main.inc:35 gofax/blocklists/main.inc:37
+#: gofax/blocklists/class_blocklistManagement.inc:26
 msgid "Blocklist management"
 msgstr "Управление \"черными списками\""
 
@@ -587,18 +519,10 @@ msgstr "Альтернативные номера факсов"
 msgid "Add local"
 msgstr "Добавить локально"
 
-#: gofax/faxaccount/generic.tpl:122
-msgid "Blocklists"
-msgstr "\"Черные списки\""
-
 #: gofax/faxaccount/generic.tpl:125
 msgid "Blocklists for incoming fax"
 msgstr "\"Черные списки\" для входящих факсов"
 
-#: gofax/faxaccount/generic.tpl:128 gofax/faxaccount/generic.tpl:136
-msgid "Edit"
-msgstr "Изменить"
-
 #: gofax/faxaccount/generic.tpl:133
 msgid "Blocklists for outgoing fax"
 msgstr "\"Черные списки\" для исходящих факсов"
@@ -732,6 +656,73 @@ msgstr "Базы данных"
 msgid "FAX DB user"
 msgstr "Показать пользователей факсов"
 
+#~ 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 не "
+#~ "сможет отменить результаты этой операции."
+
+#, fuzzy
+#~ msgid "Select all"
+#~ msgstr "Удалить"
+
+#~ msgid "Department"
+#~ msgstr "Подразделение"
+
+#~ msgid "Show send blocklists"
+#~ msgstr "Показать стоп-листы отправки"
+
+#~ msgid "Show receive blocklists"
+#~ msgstr "Показать стоп-листы получения"
+
+#~ msgid "Regular expression for matching list names"
+#~ msgstr "Регулярное выражение, соответствующее именам списков"
+
+#, fuzzy
+#~ msgid "Submit department"
+#~ msgstr "Показать подразделения"
+
+#, fuzzy
+#~ msgid "edit"
+#~ msgstr "Изменить"
+
+#, fuzzy
+#~ msgid "Edit user"
+#~ msgstr "Пользователи домена"
+
+#, fuzzy
+#~ msgid "delete"
+#~ msgstr "Удалить"
+
+#, fuzzy
+#~ msgid "Delete user"
+#~ msgstr "Удалить"
+
+#, fuzzy
+#~ msgid "Number of listed '%s'"
+#~ msgstr "Имя стоп-листа"
+
+#, fuzzy
+#~ msgid "blocklists"
+#~ msgstr "\"Черные списки\""
+
+#, fuzzy
+#~ msgid "departments"
+#~ msgstr "Подразделение"
+
+#, fuzzy
+#~ msgid "FAX blocklists"
+#~ msgstr "Стоп-лист номеров (факсы)"
+
+#, fuzzy
+#~ msgid "Permission"
+#~ msgstr "Права для членов группы"
+
+#, fuzzy
+#~ msgid "blocklist"
+#~ msgstr "\"Черные списки\""
+
 #, fuzzy
 #~ msgid "Copy"
 #~ msgstr "Компания"
diff --git a/gosa-plugins/gofax/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/gofax/locale/zh/LC_MESSAGES/messages.po
index 1b9fa842b..5bf64958a 100644
--- a/gosa-plugins/gofax/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofax/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -86,7 +86,7 @@ msgstr "# 页"
 msgid "FAX reports"
 msgstr "传真记录"
 
-#: gofax/faxreports/contents.tpl:2
+#: gofax/faxreports/contents.tpl:2 gofax/blocklists/blocklist-filter.tpl:3
 msgid "Filter"
 msgstr "过滤器"
 
@@ -135,7 +135,6 @@ msgid "FAX Reports"
 msgstr "传真记录"
 
 #: gofax/faxreports/class_faxreport.inc:7
-#: gofax/blocklists/class_blocklistManagement.inc:6
 #: gofax/blocklists/class_blocklistGeneric.inc:10
 #: gofax/faxaccount/class_gofaxAccount.inc:7
 #, fuzzy
@@ -188,8 +187,6 @@ msgstr "无法选择数据库！"
 
 #: gofax/faxreports/class_faxreport.inc:167
 #: gofax/faxreports/class_faxreport.inc:177
-#: gofax/blocklists/class_blocklistManagement.inc:269
-#: gofax/blocklists/class_blocklistManagement.inc:326
 #, fuzzy
 msgid "Permission error"
 msgstr "允许"
@@ -262,14 +259,27 @@ msgstr "警告"
 
 #: gofax/blocklists/remove.tpl:6
 msgid ""
-"Please double check if your really want to do this since there is no way for "
+"Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
-msgstr "请再次检查您是否要这么做，因为 GOsa 将没有办法将您的数据找回。"
+msgstr "请再次检查您是否要这么做，因为 GOsa 没有办法将您的数据找回。"
 
 #: gofax/blocklists/remove.tpl:10
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "所以，如果您确定，请按“删除”继续，否则按“取消”退出。"
 
+#: gofax/blocklists/blocklist-list.tpl:13 gofax/blocklists/generic.tpl:17
+#: gofax/blocklists/class_blocklistGeneric.inc:387
+msgid "Base"
+msgstr "位置"
+
+#: gofax/blocklists/blocklist-list.tpl:13
+msgid "Update"
+msgstr ""
+
+#: gofax/blocklists/blocklist-list.tpl:13
+msgid "Submit"
+msgstr "提交"
+
 #: gofax/blocklists/generic.tpl:1 gofax/faxaccount/generic.tpl:6
 #: gofax/faxaccount/paste_generic.tpl:4
 msgid "Generic"
@@ -283,12 +293,6 @@ msgstr "列表名称"
 msgid "Name of blocklist"
 msgstr "黑名单名称"
 
-#: gofax/blocklists/generic.tpl:17
-#: gofax/blocklists/class_divListBlocklists.inc:86
-#: gofax/blocklists/class_blocklistGeneric.inc:387
-msgid "Base"
-msgstr "位置"
-
 #: gofax/blocklists/generic.tpl:20
 msgid "Choose subtree to place group in"
 msgstr "选择来放置组的子树"
@@ -305,7 +309,7 @@ msgstr "类型"
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr "选择过滤打入电话还是打出电话"
 
-#: gofax/blocklists/generic.tpl:51
+#: gofax/blocklists/generic.tpl:51 gofax/blocklists/blocklist-list.xml:57
 #: gofax/blocklists/class_blocklistGeneric.inc:386
 msgid "Description"
 msgstr "描述"
@@ -326,128 +330,61 @@ msgstr "提示信息"
 msgid "Numbers can also contain wild cards."
 msgstr "数字也可以包含通配符。"
 
-#: gofax/blocklists/class_divListBlocklists.inc:31
-#: gofax/blocklists/class_divListBlocklists.inc:32
+#: gofax/blocklists/blocklist-list.xml:11
 msgid "List of blocklists"
 msgstr "黑名单列表"
 
-#: gofax/blocklists/class_divListBlocklists.inc:50
-#, fuzzy
-msgid "Select all"
-msgstr "选择"
-
-#: gofax/blocklists/class_divListBlocklists.inc:56
-#: gofax/blocklists/class_blocklistGeneric.inc:219
-#: gofax/blocklists/class_blocklistGeneric.inc:222
-#: gofax/blocklists/class_blocklistGeneric.inc:229
-#: gofax/blocklists/class_blocklistGeneric.inc:385
-msgid "Name"
-msgstr "名称"
-
-#: gofax/blocklists/class_divListBlocklists.inc:56
-msgid "Department"
-msgstr "部门"
-
-#: gofax/blocklists/class_divListBlocklists.inc:57
-#: gofax/blocklists/class_divListBlocklists.inc:91
-msgid "Actions"
-msgstr "动作"
-
-#: gofax/blocklists/class_divListBlocklists.inc:60
+#: gofax/blocklists/blocklist-list.xml:15
 #: gofax/faxaccount/class_gofaxAccount.inc:881
 #, fuzzy
 msgid "Send blocklist"
 msgstr "显示发送黑名单"
 
-#: gofax/blocklists/class_divListBlocklists.inc:60
-msgid "Show send blocklists"
-msgstr "显示发送黑名单"
-
-#: gofax/blocklists/class_divListBlocklists.inc:61
+#: gofax/blocklists/blocklist-list.xml:23
 #: gofax/faxaccount/class_gofaxAccount.inc:880
 #, fuzzy
 msgid "Receive blocklist"
 msgstr "显示接收黑名单"
 
-#: gofax/blocklists/class_divListBlocklists.inc:61
-msgid "Show receive blocklists"
-msgstr "显示接收黑名单"
-
-#: gofax/blocklists/class_divListBlocklists.inc:67
-msgid "Regular expression for matching list names"
-msgstr "匹配列表名称的正则表达式"
-
-#: gofax/blocklists/class_divListBlocklists.inc:88
-msgid "Submit department"
-msgstr "提交部门"
+#: gofax/blocklists/blocklist-list.xml:49
+#: gofax/blocklists/class_blocklistGeneric.inc:219
+#: gofax/blocklists/class_blocklistGeneric.inc:222
+#: gofax/blocklists/class_blocklistGeneric.inc:229
+#: gofax/blocklists/class_blocklistGeneric.inc:385
+msgid "Name"
+msgstr "名称"
 
-#: gofax/blocklists/class_divListBlocklists.inc:88
-msgid "Submit"
-msgstr "提交"
+#: gofax/blocklists/blocklist-list.xml:65
+msgid "Actions"
+msgstr "动作"
 
-#: gofax/blocklists/class_divListBlocklists.inc:96
+#: gofax/blocklists/blocklist-list.xml:76
 msgid "Create"
 msgstr "创建"
 
-#: gofax/blocklists/class_divListBlocklists.inc:98
+#: gofax/blocklists/blocklist-list.xml:82
 #: gofax/blocklists/class_blocklistGeneric.inc:388
 #, fuzzy
 msgid "Blocklist"
 msgstr "黑名单"
 
-#: gofax/blocklists/class_divListBlocklists.inc:104
-msgid "Remove"
-msgstr "删除"
-
-#: gofax/blocklists/class_divListBlocklists.inc:151
-msgid "edit"
+#: gofax/blocklists/blocklist-list.xml:94
+#: gofax/blocklists/blocklist-list.xml:133 gofax/faxaccount/generic.tpl:128
+#: gofax/faxaccount/generic.tpl:136
+msgid "Edit"
 msgstr "编辑"
 
-#: gofax/blocklists/class_divListBlocklists.inc:151
-msgid "Edit user"
-msgstr "编辑用户"
-
-#: gofax/blocklists/class_divListBlocklists.inc:158
-msgid "delete"
+#: gofax/blocklists/blocklist-list.xml:101
+#: gofax/blocklists/blocklist-list.xml:146
+msgid "Remove"
 msgstr "删除"
 
-#: gofax/blocklists/class_divListBlocklists.inc:158
-msgid "Delete user"
-msgstr "删除用户"
-
-#: gofax/blocklists/class_divListBlocklists.inc:195
-#: gofax/blocklists/class_divListBlocklists.inc:196
-#, fuzzy, php-format
-msgid "Number of listed '%s'"
-msgstr "黑名单名称"
-
-#: gofax/blocklists/class_divListBlocklists.inc:195
-#, fuzzy
-msgid "blocklists"
-msgstr "黑名单"
-
-#: gofax/blocklists/class_divListBlocklists.inc:196
-#, fuzzy
-msgid "departments"
-msgstr "部门"
-
-#: gofax/blocklists/class_blocklistManagement.inc:5
-#, fuzzy
-msgid "FAX blocklists"
-msgstr "传真黑名单"
-
-#: gofax/blocklists/class_blocklistManagement.inc:230
-#, fuzzy
-msgid "Permission"
-msgstr "允许"
-
-#: gofax/blocklists/class_blocklistManagement.inc:246
-#: gofax/blocklists/class_blocklistManagement.inc:307
-#, fuzzy
-msgid "blocklist"
+#: gofax/blocklists/class_blocklistManagement.inc:25
+#: gofax/faxaccount/generic.tpl:122
+msgid "Blocklists"
 msgstr "黑名单"
 
-#: gofax/blocklists/main.inc:35 gofax/blocklists/main.inc:37
+#: gofax/blocklists/class_blocklistManagement.inc:26
 msgid "Blocklist management"
 msgstr "黑名单管理"
 
@@ -576,18 +513,10 @@ msgstr "替代传真号码"
 msgid "Add local"
 msgstr "添加本地"
 
-#: gofax/faxaccount/generic.tpl:122
-msgid "Blocklists"
-msgstr "黑名单"
-
 #: gofax/faxaccount/generic.tpl:125
 msgid "Blocklists for incoming fax"
 msgstr "输入传真黑名单"
 
-#: gofax/faxaccount/generic.tpl:128 gofax/faxaccount/generic.tpl:136
-msgid "Edit"
-msgstr "编辑"
-
 #: gofax/faxaccount/generic.tpl:133
 msgid "Blocklists for outgoing fax"
 msgstr "外发传真黑名单"
@@ -717,6 +646,66 @@ msgstr "系统信息"
 msgid "FAX DB user"
 msgstr "传真数据库用户名"
 
+#~ 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 将没有办法将您的数据找回。"
+
+#, fuzzy
+#~ msgid "Select all"
+#~ msgstr "选择"
+
+#~ msgid "Department"
+#~ msgstr "部门"
+
+#~ msgid "Show send blocklists"
+#~ msgstr "显示发送黑名单"
+
+#~ msgid "Show receive blocklists"
+#~ msgstr "显示接收黑名单"
+
+#~ msgid "Regular expression for matching list names"
+#~ msgstr "匹配列表名称的正则表达式"
+
+#~ msgid "Submit department"
+#~ msgstr "提交部门"
+
+#~ msgid "edit"
+#~ msgstr "编辑"
+
+#~ msgid "Edit user"
+#~ msgstr "编辑用户"
+
+#~ msgid "delete"
+#~ msgstr "删除"
+
+#~ msgid "Delete user"
+#~ msgstr "删除用户"
+
+#, fuzzy
+#~ msgid "Number of listed '%s'"
+#~ msgstr "黑名单名称"
+
+#, fuzzy
+#~ msgid "blocklists"
+#~ msgstr "黑名单"
+
+#, fuzzy
+#~ msgid "departments"
+#~ msgstr "部门"
+
+#, fuzzy
+#~ msgid "FAX blocklists"
+#~ msgstr "传真黑名单"
+
+#, fuzzy
+#~ msgid "Permission"
+#~ msgstr "允许"
+
+#, fuzzy
+#~ msgid "blocklist"
+#~ msgstr "黑名单"
+
 #, fuzzy
 #~ msgid "Copy"
 #~ msgstr "复制"
diff --git a/gosa-plugins/gofon/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/de/LC_MESSAGES/messages.po
index 4c9dae73c..e476a5597 100644
--- a/gosa-plugins/gofon/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 16:06+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2008-07-28 08:22+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -61,7 +61,7 @@ msgstr "Optionen"
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1413
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1788
 #: gofon/phoneaccount/class_phoneAccount.inc:1413
-#: gofon/phoneaccount/class_phoneAccount.inc:1788
+#: gofon/phoneaccount/class_phoneAccount.inc:1809
 #: gofon/conference/generic.tpl:68
 #: gofon/conference/class_phoneConferenceGeneric.inc:853
 msgid "Home server"
@@ -262,7 +262,6 @@ msgstr "Größe der Warteschlange"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:323
 #: gofon/conference/class_phoneConferenceGeneric.inc:392
-#: gofon/conference/class_divListConferences.inc:56
 msgid "Number"
 msgstr "Nummer"
 
@@ -279,10 +278,10 @@ msgstr "Asterisk"
 #: gofon/phoneaccount/class_phoneAccount.inc:431
 #: gofon/phoneaccount/class_phoneAccount.inc:1109
 #: gofon/conference/class_phoneConferenceGeneric.inc:430
-#: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:176
-#: gofon/fonreports/class_fonreport.inc:180
-#: gofon/fonreports/class_fonreport.inc:198
+#: gofon/fonreports/class_fonreport.inc:196
+#: gofon/fonreports/class_fonreport.inc:200
+#: gofon/fonreports/class_fonreport.inc:217
 msgid "GOfon"
 msgstr "GOfon"
 
@@ -325,16 +324,16 @@ msgstr "Telefonnummer"
 #: gofon/phoneaccount/class_phoneAccount.inc:1211
 #: gofon/phoneaccount/class_phoneAccount.inc:1217
 #: gofon/phoneaccount/class_phoneAccount.inc:1431
-#: gofon/phoneaccount/class_phoneAccount.inc:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1571
-#: gofon/phoneaccount/class_phoneAccount.inc:1581
-#: gofon/phoneaccount/class_phoneAccount.inc:1628
+#: gofon/phoneaccount/class_phoneAccount.inc:1513
+#: gofon/phoneaccount/class_phoneAccount.inc:1592
+#: gofon/phoneaccount/class_phoneAccount.inc:1602
+#: gofon/phoneaccount/class_phoneAccount.inc:1649
 #: gofon/conference/class_phoneConferenceGeneric.inc:260
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #: gofon/conference/class_phoneConferenceGeneric.inc:618
-#: gofon/fonreports/class_fonreport.inc:176
-#: gofon/fonreports/class_fonreport.inc:180
-#: gofon/fonreports/class_fonreport.inc:198
+#: gofon/fonreports/class_fonreport.inc:196
+#: gofon/fonreports/class_fonreport.inc:200
+#: gofon/fonreports/class_fonreport.inc:217
 msgid "Error"
 msgstr "Fehler"
 
@@ -350,13 +349,14 @@ msgstr "Fehler"
 #: gofon/macro/class_gofonMacro.inc:526
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
-#: gofon/phoneaccount/class_phoneAccount.inc:1518
-#: gofon/phoneaccount/class_phoneAccount.inc:1689
+#: gofon/phoneaccount/class_phoneAccount.inc:1539
+#: gofon/phoneaccount/class_phoneAccount.inc:1710
 #: gofon/conference/class_phoneConferenceGeneric.inc:789
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:901
+#: gofon/phoneaccount/class_phoneAccount.inc:1457
 #: gofon/conference/generic.tpl:120 gofon/conference/paste_generic.tpl:15
 msgid "Phone number"
 msgstr "Telefonnummer"
@@ -374,7 +374,7 @@ msgstr "Telefonnummer"
 #: gofon/phoneaccount/class_phoneAccount.inc:1072
 #: gofon/phoneaccount/class_phoneAccount.inc:1076
 #: gofon/phoneaccount/class_phoneAccount.inc:1079
-#: gofon/phoneaccount/class_phoneAccount.inc:1773
+#: gofon/phoneaccount/class_phoneAccount.inc:1794
 msgid "Phone"
 msgstr "Telefon"
 
@@ -603,10 +603,10 @@ msgstr "Telefon-Name"
 
 #: admin/systems/gofon/phone.tpl:17
 #: admin/systems/gofon/class_phoneGeneric.inc:517
-#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/class_divListMacros.inc:79
-#: gofon/macro/generic.tpl:27 gofon/conference/generic.tpl:49
+#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/generic.tpl:27
+#: gofon/macro/macro-list.tpl:13 gofon/conference/generic.tpl:49
 #: gofon/conference/class_phoneConferenceGeneric.inc:847
-#: gofon/conference/class_divListConferences.inc:83
+#: gofon/conference/conf-list.tpl:13
 msgid "Base"
 msgstr "Basis"
 
@@ -622,7 +622,8 @@ msgstr "Wählen Sie eine Basis"
 #: admin/systems/gofon/phone.tpl:34
 #: admin/systems/gofon/class_phoneGeneric.inc:518
 #: gofon/macro/class_gofonMacro.inc:574 gofon/macro/generic.tpl:49
-#: gofon/conference/generic.tpl:98
+#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:98
+#: gofon/conference/conf-list.xml:49
 #: gofon/conference/class_phoneConferenceGeneric.inc:848
 msgid "Description"
 msgstr "Beschreibung"
@@ -632,12 +633,10 @@ msgid "phone"
 msgstr "Telefon"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:235
-#: gofon/macro/class_divListMacros.inc:121
 msgid "yes"
 msgstr "ja"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:235
-#: gofon/macro/class_divListMacros.inc:122
 msgid "no"
 msgstr "nein"
 
@@ -666,11 +665,11 @@ msgstr "IP-Adresse"
 #: admin/systems/gofon/class_phoneGeneric.inc:362
 #: admin/systems/gofon/class_phoneGeneric.inc:516
 #: gofon/macro/class_gofonMacro.inc:406 gofon/macro/class_gofonMacro.inc:412
-#: gofon/macro/class_divListMacros.inc:56 gofon/macro/parameter.tpl:6
+#: gofon/macro/macro-list.xml:41 gofon/macro/parameter.tpl:6
+#: gofon/conference/conf-list.xml:41
 #: gofon/conference/class_phoneConferenceGeneric.inc:388
 #: gofon/conference/class_phoneConferenceGeneric.inc:410
 #: gofon/conference/class_phoneConferenceGeneric.inc:846
-#: gofon/conference/class_divListConferences.inc:56
 msgid "Name"
 msgstr "Name"
 
@@ -685,7 +684,7 @@ msgstr "Telefon (Allgemein)"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:513
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
-#: gofon/phoneaccount/class_phoneAccount.inc:1787
+#: gofon/phoneaccount/class_phoneAccount.inc:1808
 msgid "Phone hardware"
 msgstr "Telefon-Hardware"
 
@@ -737,44 +736,6 @@ msgstr "CAPI MSN"
 msgid "Hardware type"
 msgstr "Hardware-Typ"
 
-#: gofon/macro/headpage.tpl:6 gofon/macro/class_divListMacros.inc:31
-#: gofon/macro/class_divListMacros.inc:32
-msgid "List of macros"
-msgstr "Liste der Makros"
-
-#: gofon/macro/headpage.tpl:20 gofon/macro/class_gofonMacroParameters.inc:374
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1680
-#: gofon/conference/headpage.tpl:20
-msgid "Information"
-msgstr "Information"
-
-#: 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."
-
-#: gofon/macro/headpage.tpl:29 gofon/conference/headpage.tpl:29
-msgid "Filters"
-msgstr "Filter"
-
-#: gofon/macro/headpage.tpl:38
-msgid "Display macros matching"
-msgstr "Zeige Makros, auf die zutrifft"
-
-#: gofon/macro/headpage.tpl:38
-msgid "Display macros  matching"
-msgstr "Zeige Makros, auf die zutrifft"
-
-#: gofon/macro/headpage.tpl:41 gofon/macro/class_divListMacros.inc:64
-msgid "Regular expression for matching macro names"
-msgstr "Regulärer Ausdruck zum Erkennen von Makro-Namen"
-
 #: gofon/macro/remove.tpl:2 gofon/phoneaccount/.svn/tmp/tempfile.tmp:328
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:611
@@ -785,23 +746,22 @@ msgstr "Regulärer Ausdruck zum Erkennen von Makro-Namen"
 #: gofon/phoneaccount/class_phoneAccount.inc:342
 #: gofon/phoneaccount/class_phoneAccount.inc:611
 #: gofon/phoneaccount/class_phoneAccount.inc:677
-#: gofon/phoneaccount/class_phoneAccount.inc:1561
-#: gofon/phoneaccount/class_phoneAccount.inc:1938
+#: gofon/phoneaccount/class_phoneAccount.inc:1582
+#: gofon/phoneaccount/class_phoneAccount.inc:1959
 #: gofon/conference/remove.tpl:2
 #: gofon/conference/class_phoneConferenceGeneric.inc:463
 msgid "Warning"
 msgstr "Warnung"
 
-#: gofon/macro/remove.tpl:6
+#: gofon/macro/remove.tpl:6 gofon/conference/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."
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
 msgstr ""
-"Dieser Eintrag wird unter Umständen von verschiedenen Gruppen genutzt. Bitte "
-"überprüfen Sie genau was Sie tun, da GOsa keine Möglichkeit hat, die Daten "
-"wiederherzustellen."
+"Bitte überprüfen Sie genau was Sie tun, weil GOsa keine Möglichkeit hat, die "
+"Daten wiederherzustellen."
 
-#: gofon/macro/remove.tpl:9
+#: gofon/macro/remove.tpl:10 gofon/conference/remove.tpl:10
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 "Wenn Sie sicher sind, drücken Sie 'Entfernen' um fortzufahren oder "
@@ -840,6 +800,12 @@ msgstr ""
 msgid "Parameter %s is invalid!"
 msgstr "Der Parameter %s ist ungültig!"
 
+#: gofon/macro/class_gofonMacroParameters.inc:374
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1701
+msgid "Information"
+msgstr "Information"
+
 #: gofon/macro/class_gofonMacroParameters.inc:374
 msgid ""
 "Number of parameters for this macro has changed. Please update all users "
@@ -878,9 +844,9 @@ msgstr "Das Makro ist leer!"
 #: gofon/phoneaccount/class_phoneAccount.inc:431
 #: gofon/phoneaccount/class_phoneAccount.inc:439
 #: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:1647
-#: gofon/fonreports/class_fonreport.inc:166
-#: gofon/fonreports/class_fonreport.inc:169
+#: gofon/phoneaccount/class_phoneAccount.inc:1668
+#: gofon/fonreports/class_fonreport.inc:176
+#: gofon/fonreports/class_fonreport.inc:179
 msgid "Configuration error"
 msgstr "Konfigurationsfehler"
 
@@ -910,132 +876,55 @@ msgstr "Makro-Inhalt und Parameter"
 msgid "Visibility flag"
 msgstr "Sichtbarkeits-Flag"
 
-#: gofon/macro/class_divListMacros.inc:50
-#: gofon/conference/class_divListConferences.inc:50
-msgid "Select all"
-msgstr "Alle auswählen"
-
-#: gofon/macro/class_divListMacros.inc:56
-msgid "Department"
-msgstr "Abteilung"
-
-#: gofon/macro/class_divListMacros.inc:57
-msgid "Visible"
-msgstr "Sichtbar"
-
-#: gofon/macro/class_divListMacros.inc:58
-#: gofon/macro/class_divListMacros.inc:84
-#: gofon/conference/class_divListConferences.inc:59
-#: gofon/conference/class_divListConferences.inc:88
-msgid "Actions"
-msgstr "Aktionen"
+#: gofon/macro/generic.tpl:18
+msgid "Macro name to be displayed"
+msgstr "Makro-Name der angezeigt wird"
 
-#: gofon/macro/class_divListMacros.inc:81
-#: gofon/conference/class_divListConferences.inc:85
-msgid "Submit department"
-msgstr "Aktualisieren"
+#: gofon/macro/generic.tpl:60
+msgid "Visible for user"
+msgstr "Sichtbar für Benutzer"
 
-#: gofon/macro/class_divListMacros.inc:81
-#: gofon/conference/class_divListConferences.inc:85
-msgid "Submit"
-msgstr "Übertragen"
+#: gofon/macro/generic.tpl:70
+msgid "Macro text"
+msgstr "Makro-Inhalt"
 
-#: gofon/macro/class_divListMacros.inc:89
-#: gofon/conference/class_divListConferences.inc:93
-msgid "Create"
-msgstr "Anlegen"
+#: gofon/macro/macro-list.xml:11
+msgid "List of macros"
+msgstr "Liste der Makros"
 
-#: gofon/macro/class_divListMacros.inc:91
-#: gofon/macro/class_divListMacros.inc:120
+#: gofon/macro/macro-list.xml:15 gofon/macro/macro-list.xml:74
 msgid "Macro"
 msgstr "Makro"
 
-#: gofon/macro/class_divListMacros.inc:97
-#: gofon/conference/class_divListConferences.inc:101
-msgid "Remove"
-msgstr "Entfernen"
-
-#: gofon/macro/class_divListMacros.inc:121
-msgid "visible"
-msgstr "sichtbar"
+#: gofon/macro/macro-list.xml:57 gofon/conference/conf-list.xml:57
+msgid "Actions"
+msgstr "Aktionen"
 
-#: gofon/macro/class_divListMacros.inc:122
-msgid "invisible"
-msgstr "unsichtbar"
+#: gofon/macro/macro-list.xml:68 gofon/conference/conf-list.xml:68
+msgid "Create"
+msgstr "Anlegen"
 
-#: gofon/macro/class_divListMacros.inc:146
-#: gofon/conference/class_divListConferences.inc:150
-msgid "edit"
+#: gofon/macro/macro-list.xml:86 gofon/macro/macro-list.xml:125
+#: gofon/conference/conf-list.xml:86 gofon/conference/conf-list.xml:125
+msgid "Edit"
 msgstr "Bearbeiten"
 
-#: gofon/macro/class_divListMacros.inc:147
-msgid "Edit macro"
-msgstr "Makro bearbeiten"
-
-#: gofon/macro/class_divListMacros.inc:153
-#: gofon/conference/class_divListConferences.inc:158
-msgid "delete"
+#: gofon/macro/macro-list.xml:93 gofon/macro/macro-list.xml:138
+#: gofon/conference/conf-list.xml:93 gofon/conference/conf-list.xml:138
+msgid "Remove"
 msgstr "Entfernen"
 
-#: gofon/macro/class_divListMacros.inc:154
-msgid "Delete macro"
-msgstr "Makro entfernen"
-
-#: gofon/macro/class_divListMacros.inc:202
-#: gofon/macro/class_divListMacros.inc:203
-#, php-format
-msgid "Number of listed %s"
-msgstr "Anzahl der angezeigten %s"
-
-#: gofon/macro/class_divListMacros.inc:202
-msgid "macros"
-msgstr "Makros"
-
-#: gofon/macro/class_divListMacros.inc:203
-#: gofon/conference/class_divListConferences.inc:226
-msgid "departments"
-msgstr "Abteilungen"
-
-#: gofon/macro/generic.tpl:18
-msgid "Macro name to be displayed"
-msgstr "Makro-Name der angezeigt wird"
-
-#: gofon/macro/generic.tpl:60
-msgid "Visible for user"
-msgstr "Sichtbar für Benutzer"
-
-#: gofon/macro/generic.tpl:70
-msgid "Macro text"
-msgstr "Makro-Inhalt"
-
-#: gofon/macro/class_gofonMacroManagement.inc:24
-msgid "Phone macros"
-msgstr "Telefon-Makros"
+#: gofon/macro/macro-filter.tpl:3 gofon/conference/conf-filter.tpl:3
+#: gofon/fonreports/contents.tpl:2
+msgid "Filter"
+msgstr "Filter"
 
 #: gofon/macro/class_gofonMacroManagement.inc:25
-#: gofon/phoneaccount/class_phoneAccount.inc:7
-#: gofon/fonreports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Dies tut etwas"
-
-#: gofon/macro/class_gofonMacroManagement.inc:273
-#: gofon/conference/class_phoneConferenceManagment.inc:187
-msgid "Permission"
-msgstr "Berechtigung"
-
-#: gofon/macro/class_gofonMacroManagement.inc:320
-#: gofon/macro/class_gofonMacroManagement.inc:373
-#: gofon/macro/class_gofonMacroManagement.inc:397
-#: gofon/conference/class_phoneConferenceManagment.inc:228
-#: gofon/conference/class_phoneConferenceManagment.inc:288
-msgid "Permission error"
-msgstr "Berechtigungsfehler"
-
-#: gofon/macro/class_gofonMacroManagement.inc:366
-msgid "macro"
+#, fuzzy
+msgid "Macros"
 msgstr "Makro"
 
-#: gofon/macro/main.inc:51 gofon/macro/main.inc:55
+#: gofon/macro/class_gofonMacroManagement.inc:26
 msgid "Phone macro management"
 msgstr "Telefon-Makro-Verwaltung"
 
@@ -1056,6 +945,14 @@ msgid "You are not allowed to view the macro parameter settings"
 msgstr ""
 "Sie haben keine Berechtigung, die Makro-Parameter Einstellungen anzuzeigen."
 
+#: gofon/macro/macro-list.tpl:13 gofon/conference/conf-list.tpl:13
+msgid "Update"
+msgstr "Aktualisieren"
+
+#: gofon/macro/macro-list.tpl:13 gofon/conference/conf-list.tpl:13
+msgid "Submit"
+msgstr "Übertragen"
+
 #: gofon/phoneaccount/generic.tpl:42 gofon/phoneaccount/paste_generic.tpl:27
 msgid "Telephone hardware"
 msgstr "Telefon-Hardware"
@@ -1144,7 +1041,7 @@ msgstr ""
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1562
 #: gofon/phoneaccount/class_phoneAccount.inc:612
 #: gofon/phoneaccount/class_phoneAccount.inc:678
-#: gofon/phoneaccount/class_phoneAccount.inc:1562
+#: gofon/phoneaccount/class_phoneAccount.inc:1583
 #, php-format
 msgid "GOsa identified problems with your MySQL table definition!"
 msgstr "GOsa hat Probleme mit der Datenbank-Definition festgestellt!"
@@ -1154,7 +1051,7 @@ msgstr "GOsa hat Probleme mit der Datenbank-Definition festgestellt!"
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1630
 #: gofon/phoneaccount/class_phoneAccount.inc:651
 #: gofon/phoneaccount/class_phoneAccount.inc:973
-#: gofon/phoneaccount/class_phoneAccount.inc:1630
+#: gofon/phoneaccount/class_phoneAccount.inc:1651
 #: gofon/conference/class_phoneConferenceGeneric.inc:620
 msgid "Please activate debugging for details!"
 msgstr "Bitte Aktivieren Sie das Debuggung für mehr Informationen!"
@@ -1206,33 +1103,33 @@ msgid "Between 1-4 charactes"
 msgstr "1-4 Zeichen"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
-#: gofon/phoneaccount/class_phoneAccount.inc:1444
+#: gofon/phoneaccount/class_phoneAccount.inc:1465
 #, php-format
 msgid "macro parameter %s"
 msgstr "Makro-Parameter %s"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1513
 msgid "An error occured while updating the database entries!"
 msgstr ""
 "Es ist ein Fehler beim Aktualisieren der Datenbankeinträge aufgetreten!"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1701
 #, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr "Benutzer '%s' aus Warteschlange '%s' entfernt."
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
-#: gofon/phoneaccount/class_phoneAccount.inc:1717
-#: gofon/phoneaccount/class_phoneAccount.inc:1719
+#: gofon/phoneaccount/class_phoneAccount.inc:1738
+#: gofon/phoneaccount/class_phoneAccount.inc:1740
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr "Die angegebene Telefonnummer '%s' wird bereits von '%s' verwendet."
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
-#: gofon/phoneaccount/class_phoneAccount.inc:1765
+#: gofon/phoneaccount/class_phoneAccount.inc:1786
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -1242,73 +1139,73 @@ msgstr ""
 "Entfernen wurde abgebrochen."
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
-#: gofon/phoneaccount/class_phoneAccount.inc:1774
+#: gofon/phoneaccount/class_phoneAccount.inc:1795
 msgid "Phone account settings"
 msgstr "Telefon-Konto-Einstellungen"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
-#: gofon/phoneaccount/class_phoneAccount.inc:1778
+#: gofon/phoneaccount/class_phoneAccount.inc:1799
 msgid "My account"
 msgstr "Mein Konto"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
-#: gofon/phoneaccount/class_phoneAccount.inc:1785
+#: gofon/phoneaccount/class_phoneAccount.inc:1806
 #: gofon/conference/class_phoneConferenceGeneric.inc:864
 msgid "Telephone number"
 msgstr "Telefonnummer"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1807
 msgid "Macro settings"
 msgstr "Makro-Einstellungen"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
-#: gofon/phoneaccount/class_phoneAccount.inc:1789
+#: gofon/phoneaccount/class_phoneAccount.inc:1810
 msgid "Phone context"
 msgstr "Telefon-Kontext"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
-#: gofon/phoneaccount/class_phoneAccount.inc:1790
+#: gofon/phoneaccount/class_phoneAccount.inc:1811
 msgid "Voice mail context"
 msgstr "Voicemail-Kontext"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
-#: gofon/phoneaccount/class_phoneAccount.inc:1791
+#: gofon/phoneaccount/class_phoneAccount.inc:1812
 msgid "Telephone pin"
 msgstr "Telefon-PIN"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
-#: gofon/phoneaccount/class_phoneAccount.inc:1792
+#: gofon/phoneaccount/class_phoneAccount.inc:1813
 msgid "Voicemail pin"
 msgstr "Voicemail-PIN"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
-#: gofon/phoneaccount/class_phoneAccount.inc:1874
+#: gofon/phoneaccount/class_phoneAccount.inc:1895
 msgid "There is currently no asterisk server defined!"
 msgstr "Es ist momentan kein Asterisk-Server definiert!"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
-#: gofon/phoneaccount/class_phoneAccount.inc:1878
+#: gofon/phoneaccount/class_phoneAccount.inc:1899
 msgid "Asterisk server is invalid!"
 msgstr "Der Asterisk-Server ist ungültig!"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
-#: gofon/phoneaccount/class_phoneAccount.inc:1884
+#: gofon/phoneaccount/class_phoneAccount.inc:1905
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr "Die Voicemail-PIN muss 4 Zeichen lang sein!"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
-#: gofon/phoneaccount/class_phoneAccount.inc:1887
+#: gofon/phoneaccount/class_phoneAccount.inc:1908
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "Die Voicemail-PIN enthält ungültige Zeichen!"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
-#: gofon/phoneaccount/class_phoneAccount.inc:1892
+#: gofon/phoneaccount/class_phoneAccount.inc:1913
 msgid "Phone pin contains invalid characters!"
 msgstr "Die Telefon-PIN enthält ungültige Zeichen!"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
-#: gofon/phoneaccount/class_phoneAccount.inc:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1920
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
@@ -1321,67 +1218,18 @@ msgstr ""
 "Betätigen sie den 'Bearbeiten'-Schalter unten um Informationen in diesem "
 "Dialog zu ändern"
 
-#: gofon/conference/headpage.tpl:6
-#: gofon/conference/class_divListConferences.inc:31
-#: gofon/conference/class_divListConferences.inc:32
-msgid "List of conference rooms"
-msgstr "Liste der Konferenz-Räume"
-
-#: 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."
-
-#: gofon/conference/headpage.tpl:35
-msgid "Display users matching"
-msgstr "Zeige die Benutzer, auf die Folgendes passt"
-
-#: gofon/conference/headpage.tpl:36
-msgid "Regular expression for        matching user names"
-msgstr "Regulärer Ausdruck zum Erkennen von Benutzernamen"
-
-#: gofon/conference/remove.tpl:6
-msgid ""
-"This includes 'all' accounts, systems, etc. in this subtree. 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' Konten, System- und Setup-Informationen dieses "
-"Teilbaums. Bitte prüfen Sie genau, da es keine Möglichkeit für GOsa gibt, "
-"die Daten wiederherzustellen. "
-
-#: 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 'Entfernen' um Fortzufahren oder 'Abbrechen', um den "
-"Vorgang abzubrechen."
-
-#: gofon/conference/class_phoneConferenceManagment.inc:24
-msgid "Phone conferences"
-msgstr "Telefon-Konferenzen"
+#: gofon/phoneaccount/class_phoneAccount.inc:7
+#: gofon/fonreports/class_fonreport.inc:7
+msgid "This does something"
+msgstr "Dies tut etwas"
 
 #: gofon/conference/class_phoneConferenceManagment.inc:25
-msgid "Management"
-msgstr "Verwaltung"
-
-#: gofon/conference/class_phoneConferenceManagment.inc:206
-#: gofon/conference/class_phoneConferenceManagment.inc:267
-msgid "conference"
-msgstr "Konferenz"
+msgid "conferences"
+msgstr "Konferenzen"
 
-#: gofon/conference/class_phoneConferenceManagment.inc:228
-#: gofon/conference/class_phoneConferenceManagment.inc:288
-msgid "You have not permission to delete this entry!"
-msgstr "Sie haben keine Berechtigung, diesen Eintrag zu entfernen!"
+#: gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Conference management"
+msgstr "Konferenz-Verwaltung"
 
 #: gofon/conference/generic.tpl:5
 msgid "Properties"
@@ -1422,7 +1270,6 @@ msgstr "PIN voreinstellen"
 
 #: gofon/conference/generic.tpl:165
 #: gofon/conference/class_phoneConferenceGeneric.inc:384
-#: gofon/conference/class_divListConferences.inc:58
 msgid "PIN"
 msgstr "PIN"
 
@@ -1456,6 +1303,15 @@ msgstr "Benachrichtige über Abgang/Zugang von Teilnehmern"
 msgid "Count users"
 msgstr "Zähle Benutzer"
 
+#: gofon/conference/conf-list.xml:11
+msgid "List of conference rooms"
+msgstr "Liste der Konferenz-Räume"
+
+#: gofon/conference/conf-list.xml:15 gofon/conference/conf-list.xml:74
+#: gofon/conference/class_phoneConferenceGeneric.inc:836
+msgid "Conference"
+msgstr "Konferenz"
+
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #, php-format
 msgid "Cannot delete entry from server '%s' because it seems to be removed!"
@@ -1490,12 +1346,6 @@ msgstr ""
 msgid "'%s' is already assigned to '%s'!"
 msgstr "'%s' wird bereits von '%s' verwendet!"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:836
-#: gofon/conference/class_divListConferences.inc:95
-#: gofon/conference/class_divListConferences.inc:208
-msgid "Conference"
-msgstr "Konferenz"
-
 #: gofon/conference/class_phoneConferenceGeneric.inc:837
 msgid "Phone conference management"
 msgstr "Telefonkonferenz-Verwaltung"
@@ -1529,94 +1379,59 @@ msgid "Format"
 msgstr "Format"
 
 #: gofon/conference/class_phoneConferenceGeneric.inc:865
-#: gofon/conference/class_divListConferences.inc:57
 msgid "Owner"
 msgstr "Besitzer"
 
-#: gofon/conference/main.inc:48 gofon/conference/main.inc:50
-msgid "Conference management"
-msgstr "Konferenz-Verwaltung"
-
-#: gofon/conference/class_divListConferences.inc:65
-msgid "Regular expression for matching conference names"
-msgstr "Regulärer Ausdruck zum Erkennen von Konferenznamen"
-
-#: gofon/conference/class_divListConferences.inc:150
-msgid "Edit this entry"
-msgstr "Diesen Eintrag bearbeiten"
-
-#: gofon/conference/class_divListConferences.inc:158
-msgid "Delete this entry"
-msgstr "Diesen Eintrag entfernen"
-
-#: gofon/conference/class_divListConferences.inc:185
-msgid "Unknown"
-msgstr "Unbekannt"
-
-#: gofon/conference/class_divListConferences.inc:225
-#: gofon/conference/class_divListConferences.inc:226
-#, php-format
-msgid "Number of listed '%s'"
-msgstr "Anzahl der angezeigten '%s'"
-
-#: gofon/conference/class_divListConferences.inc:225
-msgid "conferences"
-msgstr "Konferenzen"
-
 #: gofon/fonreports/class_fonreport.inc:6
 msgid "Phone Reports"
 msgstr "Telefon-Berichte"
 
-#: gofon/fonreports/class_fonreport.inc:210
+#: gofon/fonreports/class_fonreport.inc:229
 msgid "Insufficient permissions"
 msgstr "Unzureichende Berechtigungen"
 
-#: gofon/fonreports/class_fonreport.inc:229
+#: gofon/fonreports/class_fonreport.inc:248
 msgid "Y-M-D"
 msgstr "D.M.Y"
 
-#: gofon/fonreports/class_fonreport.inc:396
-#: gofon/fonreports/class_fonreport.inc:397
-#: gofon/fonreports/class_fonreport.inc:404 gofon/fonreports/main.inc:22
+#: gofon/fonreports/class_fonreport.inc:415
+#: gofon/fonreports/class_fonreport.inc:416
+#: gofon/fonreports/class_fonreport.inc:423 gofon/fonreports/main.inc:22
 msgid "Phone reports"
 msgstr "Telefon-Berichte"
 
-#: gofon/fonreports/class_fonreport.inc:397
+#: gofon/fonreports/class_fonreport.inc:416
 msgid "All entries are readonly"
 msgstr "Alle Einträge sind nur lesbar"
 
-#: gofon/fonreports/class_fonreport.inc:409 gofon/fonreports/contents.tpl:30
+#: gofon/fonreports/class_fonreport.inc:428 gofon/fonreports/contents.tpl:34
 msgid "Date"
 msgstr "Datum"
 
-#: gofon/fonreports/class_fonreport.inc:410 gofon/fonreports/contents.tpl:31
+#: gofon/fonreports/class_fonreport.inc:429 gofon/fonreports/contents.tpl:35
 msgid "Source"
 msgstr "Quelle"
 
-#: gofon/fonreports/class_fonreport.inc:411 gofon/fonreports/contents.tpl:32
+#: gofon/fonreports/class_fonreport.inc:430 gofon/fonreports/contents.tpl:36
 msgid "Destination"
 msgstr "Ziel"
 
-#: gofon/fonreports/class_fonreport.inc:412 gofon/fonreports/contents.tpl:33
+#: gofon/fonreports/class_fonreport.inc:431 gofon/fonreports/contents.tpl:37
 msgid "Channel"
 msgstr "Kanal"
 
-#: gofon/fonreports/class_fonreport.inc:413
+#: gofon/fonreports/class_fonreport.inc:432
 msgid "Application called"
 msgstr "Name der Anwendung"
 
-#: gofon/fonreports/class_fonreport.inc:414
+#: gofon/fonreports/class_fonreport.inc:433
 msgid "Disposition"
 msgstr "Disposition"
 
-#: gofon/fonreports/class_fonreport.inc:415 gofon/fonreports/contents.tpl:36
+#: gofon/fonreports/class_fonreport.inc:434 gofon/fonreports/contents.tpl:40
 msgid "Duration"
 msgstr "Dauer"
 
-#: gofon/fonreports/contents.tpl:2
-msgid "Filter"
-msgstr "Filter"
-
 #: gofon/fonreports/contents.tpl:6
 msgid "Search for"
 msgstr "Suche nach"
@@ -1625,7 +1440,7 @@ msgstr "Suche nach"
 msgid "Enter user name to search for"
 msgstr "Benutzername, nach dem gesucht werden soll"
 
-#: gofon/fonreports/contents.tpl:8 gofon/fonreports/contents.tpl:16
+#: gofon/fonreports/contents.tpl:8 gofon/fonreports/contents.tpl:20
 msgid "in"
 msgstr "in"
 
@@ -1634,21 +1449,171 @@ msgid "Select subtree to base search on"
 msgstr "Wählen Sie den Teilbaum, in dem gesucht werden soll"
 
 #: gofon/fonreports/contents.tpl:12
+#, fuzzy
+msgid "on"
+msgstr "Ab"
+
+#: gofon/fonreports/contents.tpl:13
+#, fuzzy
+msgid "Select server to search on"
+msgstr "Wählen Sie den Teilbaum, in dem gesucht werden soll"
+
+#: gofon/fonreports/contents.tpl:16
 msgid "during"
 msgstr "während"
 
-#: gofon/fonreports/contents.tpl:21
+#: gofon/fonreports/contents.tpl:25
 msgid "Search"
 msgstr "Suchen"
 
-#: gofon/fonreports/contents.tpl:34
+#: gofon/fonreports/contents.tpl:38
 msgid "Application"
 msgstr "Anwendung"
 
-#: gofon/fonreports/contents.tpl:35
+#: gofon/fonreports/contents.tpl:39
 msgid "Status"
 msgstr "Status"
 
-#: gofon/fonreports/contents.tpl:51
+#: gofon/fonreports/contents.tpl:55
 msgid "Search returned no results..."
 msgstr "Die Suche verlief ergebnislos..."
+
+#~ 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."
+
+#~ msgid "Filters"
+#~ msgstr "Filter"
+
+#~ msgid "Display macros matching"
+#~ msgstr "Zeige Makros, auf die zutrifft"
+
+#~ msgid "Display macros  matching"
+#~ msgstr "Zeige Makros, auf die zutrifft"
+
+#~ msgid "Regular expression for matching macro names"
+#~ msgstr "Regulärer Ausdruck zum Erkennen von Makro-Namen"
+
+#~ 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 ""
+#~ "Dieser Eintrag wird unter Umständen von verschiedenen Gruppen genutzt. "
+#~ "Bitte überprüfen Sie genau was Sie tun, da GOsa keine Möglichkeit hat, "
+#~ "die Daten wiederherzustellen."
+
+#~ msgid "Select all"
+#~ msgstr "Alle auswählen"
+
+#~ msgid "Department"
+#~ msgstr "Abteilung"
+
+#~ msgid "Visible"
+#~ msgstr "Sichtbar"
+
+#~ msgid "Submit department"
+#~ msgstr "Aktualisieren"
+
+#~ msgid "visible"
+#~ msgstr "sichtbar"
+
+#~ msgid "invisible"
+#~ msgstr "unsichtbar"
+
+#~ msgid "edit"
+#~ msgstr "Bearbeiten"
+
+#~ msgid "Edit macro"
+#~ msgstr "Makro bearbeiten"
+
+#~ msgid "delete"
+#~ msgstr "Entfernen"
+
+#~ msgid "Delete macro"
+#~ msgstr "Makro entfernen"
+
+#~ msgid "Number of listed %s"
+#~ msgstr "Anzahl der angezeigten %s"
+
+#~ msgid "macros"
+#~ msgstr "Makros"
+
+#~ msgid "departments"
+#~ msgstr "Abteilungen"
+
+#~ msgid "Phone macros"
+#~ msgstr "Telefon-Makros"
+
+#~ msgid "Permission"
+#~ msgstr "Berechtigung"
+
+#~ msgid "Permission error"
+#~ msgstr "Berechtigungsfehler"
+
+#~ msgid "macro"
+#~ msgstr "Makro"
+
+#~ 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."
+
+#~ msgid "Display users matching"
+#~ msgstr "Zeige die Benutzer, auf die Folgendes passt"
+
+#~ msgid "Regular expression for        matching user names"
+#~ msgstr "Regulärer Ausdruck zum Erkennen von Benutzernamen"
+
+#~ msgid ""
+#~ "This includes 'all' accounts, systems, etc. in this subtree. 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' Konten, System- und Setup-Informationen dieses "
+#~ "Teilbaums. Bitte prüfen Sie genau, da es keine Möglichkeit für GOsa gibt, "
+#~ "die Daten wiederherzustellen. "
+
+#~ 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 'Entfernen' um Fortzufahren oder 'Abbrechen', um den "
+#~ "Vorgang abzubrechen."
+
+#~ msgid "Phone conferences"
+#~ msgstr "Telefon-Konferenzen"
+
+#~ msgid "Management"
+#~ msgstr "Verwaltung"
+
+#~ msgid "conference"
+#~ msgstr "Konferenz"
+
+#~ msgid "You have not permission to delete this entry!"
+#~ msgstr "Sie haben keine Berechtigung, diesen Eintrag zu entfernen!"
+
+#~ msgid "Regular expression for matching conference names"
+#~ msgstr "Regulärer Ausdruck zum Erkennen von Konferenznamen"
+
+#~ msgid "Edit this entry"
+#~ msgstr "Diesen Eintrag bearbeiten"
+
+#~ msgid "Delete this entry"
+#~ msgstr "Diesen Eintrag entfernen"
+
+#~ msgid "Unknown"
+#~ msgstr "Unbekannt"
+
+#~ msgid "Number of listed '%s'"
+#~ msgstr "Anzahl der angezeigten '%s'"
diff --git a/gosa-plugins/gofon/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/es/LC_MESSAGES/messages.po
index 2b8df9922..9c3941e2a 100644
--- a/gosa-plugins/gofon/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 16:06+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
@@ -59,7 +59,7 @@ msgstr "Opciones"
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1413
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1788
 #: gofon/phoneaccount/class_phoneAccount.inc:1413
-#: gofon/phoneaccount/class_phoneAccount.inc:1788
+#: gofon/phoneaccount/class_phoneAccount.inc:1809
 #: gofon/conference/generic.tpl:68
 #: gofon/conference/class_phoneConferenceGeneric.inc:853
 #, fuzzy
@@ -269,7 +269,6 @@ msgstr ""
 
 #: admin/ogroups/gofon/class_phonequeue.inc:323
 #: gofon/conference/class_phoneConferenceGeneric.inc:392
-#: gofon/conference/class_divListConferences.inc:56
 #, fuzzy
 msgid "Number"
 msgstr "Nombre"
@@ -288,10 +287,10 @@ msgstr "Usuarios"
 #: gofon/phoneaccount/class_phoneAccount.inc:431
 #: gofon/phoneaccount/class_phoneAccount.inc:1109
 #: gofon/conference/class_phoneConferenceGeneric.inc:430
-#: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:176
-#: gofon/fonreports/class_fonreport.inc:180
-#: gofon/fonreports/class_fonreport.inc:198
+#: gofon/fonreports/class_fonreport.inc:196
+#: gofon/fonreports/class_fonreport.inc:200
+#: gofon/fonreports/class_fonreport.inc:217
 msgid "GOfon"
 msgstr ""
 
@@ -335,16 +334,16 @@ msgstr "Teléfono"
 #: gofon/phoneaccount/class_phoneAccount.inc:1211
 #: gofon/phoneaccount/class_phoneAccount.inc:1217
 #: gofon/phoneaccount/class_phoneAccount.inc:1431
-#: gofon/phoneaccount/class_phoneAccount.inc:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1571
-#: gofon/phoneaccount/class_phoneAccount.inc:1581
-#: gofon/phoneaccount/class_phoneAccount.inc:1628
+#: gofon/phoneaccount/class_phoneAccount.inc:1513
+#: gofon/phoneaccount/class_phoneAccount.inc:1592
+#: gofon/phoneaccount/class_phoneAccount.inc:1602
+#: gofon/phoneaccount/class_phoneAccount.inc:1649
 #: gofon/conference/class_phoneConferenceGeneric.inc:260
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #: gofon/conference/class_phoneConferenceGeneric.inc:618
-#: gofon/fonreports/class_fonreport.inc:176
-#: gofon/fonreports/class_fonreport.inc:180
-#: gofon/fonreports/class_fonreport.inc:198
+#: gofon/fonreports/class_fonreport.inc:196
+#: gofon/fonreports/class_fonreport.inc:200
+#: gofon/fonreports/class_fonreport.inc:217
 msgid "Error"
 msgstr "Error"
 
@@ -360,14 +359,15 @@ msgstr "Error"
 #: gofon/macro/class_gofonMacro.inc:526
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
-#: gofon/phoneaccount/class_phoneAccount.inc:1518
-#: gofon/phoneaccount/class_phoneAccount.inc:1689
+#: gofon/phoneaccount/class_phoneAccount.inc:1539
+#: gofon/phoneaccount/class_phoneAccount.inc:1710
 #: gofon/conference/class_phoneConferenceGeneric.inc:789
 #, fuzzy
 msgid "LDAP error"
 msgstr "Servicio LDAP"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:901
+#: gofon/phoneaccount/class_phoneAccount.inc:1457
 #: gofon/conference/generic.tpl:120 gofon/conference/paste_generic.tpl:15
 #, fuzzy
 msgid "Phone number"
@@ -386,7 +386,7 @@ msgstr "Número de teléfono personal"
 #: gofon/phoneaccount/class_phoneAccount.inc:1072
 #: gofon/phoneaccount/class_phoneAccount.inc:1076
 #: gofon/phoneaccount/class_phoneAccount.inc:1079
-#: gofon/phoneaccount/class_phoneAccount.inc:1773
+#: gofon/phoneaccount/class_phoneAccount.inc:1794
 msgid "Phone"
 msgstr "Teléfono"
 
@@ -633,10 +633,10 @@ msgstr "Número de teléfono"
 
 #: admin/systems/gofon/phone.tpl:17
 #: admin/systems/gofon/class_phoneGeneric.inc:517
-#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/class_divListMacros.inc:79
-#: gofon/macro/generic.tpl:27 gofon/conference/generic.tpl:49
+#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/generic.tpl:27
+#: gofon/macro/macro-list.tpl:13 gofon/conference/generic.tpl:49
 #: gofon/conference/class_phoneConferenceGeneric.inc:847
-#: gofon/conference/class_divListConferences.inc:83
+#: gofon/conference/conf-list.tpl:13
 msgid "Base"
 msgstr "Base"
 
@@ -652,7 +652,8 @@ msgstr "Seleccione una base"
 #: admin/systems/gofon/phone.tpl:34
 #: admin/systems/gofon/class_phoneGeneric.inc:518
 #: gofon/macro/class_gofonMacro.inc:574 gofon/macro/generic.tpl:49
-#: gofon/conference/generic.tpl:98
+#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:98
+#: gofon/conference/conf-list.xml:49
 #: gofon/conference/class_phoneConferenceGeneric.inc:848
 msgid "Description"
 msgstr "Descripción"
@@ -663,12 +664,10 @@ msgid "phone"
 msgstr "Teléfono"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:235
-#: gofon/macro/class_divListMacros.inc:121
 msgid "yes"
 msgstr "si"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:235
-#: gofon/macro/class_divListMacros.inc:122
 msgid "no"
 msgstr "no"
 
@@ -698,11 +697,11 @@ msgstr "Código Postal"
 #: admin/systems/gofon/class_phoneGeneric.inc:362
 #: admin/systems/gofon/class_phoneGeneric.inc:516
 #: gofon/macro/class_gofonMacro.inc:406 gofon/macro/class_gofonMacro.inc:412
-#: gofon/macro/class_divListMacros.inc:56 gofon/macro/parameter.tpl:6
+#: gofon/macro/macro-list.xml:41 gofon/macro/parameter.tpl:6
+#: gofon/conference/conf-list.xml:41
 #: gofon/conference/class_phoneConferenceGeneric.inc:388
 #: gofon/conference/class_phoneConferenceGeneric.inc:410
 #: gofon/conference/class_phoneConferenceGeneric.inc:846
-#: gofon/conference/class_divListConferences.inc:56
 msgid "Name"
 msgstr "Nombre"
 
@@ -717,7 +716,7 @@ msgstr "Teléfono genérico"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:513
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
-#: gofon/phoneaccount/class_phoneAccount.inc:1787
+#: gofon/phoneaccount/class_phoneAccount.inc:1808
 msgid "Phone hardware"
 msgstr "Teléfono hardware"
 
@@ -769,49 +768,6 @@ msgstr "CAPI MSN"
 msgid "Hardware type"
 msgstr "Tipo de hardware"
 
-#: gofon/macro/headpage.tpl:6 gofon/macro/class_divListMacros.inc:31
-#: gofon/macro/class_divListMacros.inc:32
-#, fuzzy
-msgid "List of macros"
-msgstr "Lista de acls"
-
-#: gofon/macro/headpage.tpl:20 gofon/macro/class_gofonMacroParameters.inc:374
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1680
-#: gofon/conference/headpage.tpl:20
-msgid "Information"
-msgstr "Información"
-
-#: 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ú le permite añadir, editar o eliminar los grupos seleccionados. "
-"Cuando trabaje con un gran número de grupos puede usar el selector de rango "
-"en la parte superior de la lista de grupos,."
-
-#: gofon/macro/headpage.tpl:29 gofon/conference/headpage.tpl:29
-msgid "Filters"
-msgstr "Filtros"
-
-#: gofon/macro/headpage.tpl:38
-#, fuzzy
-msgid "Display macros matching"
-msgstr "Mostrar las acl que coincidan con"
-
-#: gofon/macro/headpage.tpl:38
-#, fuzzy
-msgid "Display macros  matching"
-msgstr "Mostrar las acl que coincidan con"
-
-#: gofon/macro/headpage.tpl:41 gofon/macro/class_divListMacros.inc:64
-#, fuzzy
-msgid "Regular expression for matching macro names"
-msgstr "Expresión regular para buscar nombres de grupos"
-
 #: gofon/macro/remove.tpl:2 gofon/phoneaccount/.svn/tmp/tempfile.tmp:328
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:611
@@ -822,23 +778,22 @@ msgstr "Expresión regular para buscar nombres de grupos"
 #: gofon/phoneaccount/class_phoneAccount.inc:342
 #: gofon/phoneaccount/class_phoneAccount.inc:611
 #: gofon/phoneaccount/class_phoneAccount.inc:677
-#: gofon/phoneaccount/class_phoneAccount.inc:1561
-#: gofon/phoneaccount/class_phoneAccount.inc:1938
+#: gofon/phoneaccount/class_phoneAccount.inc:1582
+#: gofon/phoneaccount/class_phoneAccount.inc:1959
 #: gofon/conference/remove.tpl:2
 #: gofon/conference/class_phoneConferenceGeneric.inc:463
 msgid "Warning"
 msgstr "Aviso"
 
-#: gofon/macro/remove.tpl:6
+#: gofon/macro/remove.tpl:6 gofon/conference/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."
+"Please double check if you 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. Si está seguro de lo que quiere "
-"hacer pulse dos veces, ya que no hay manera de que GOsa recupere "
-"posteriormente la información."
+"Si está seguro de lo que quiere hacer pulse dos veces, ya que no hay forma "
+"de que GOsa pueda recuperar posteriormente esa información"
 
-#: gofon/macro/remove.tpl:9
+#: gofon/macro/remove.tpl:10 gofon/conference/remove.tpl:10
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o "
@@ -878,6 +833,12 @@ msgstr "¡El campo '%s' tiene caracteres no validos!"
 msgid "Parameter %s is invalid!"
 msgstr "¡'%s' comando (%s) no es válido!"
 
+#: gofon/macro/class_gofonMacroParameters.inc:374
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1701
+msgid "Information"
+msgstr "Información"
+
 #: gofon/macro/class_gofonMacroParameters.inc:374
 msgid ""
 "Number of parameters for this macro has changed. Please update all users "
@@ -916,9 +877,9 @@ msgstr "¡El certificado esta vacío!"
 #: gofon/phoneaccount/class_phoneAccount.inc:431
 #: gofon/phoneaccount/class_phoneAccount.inc:439
 #: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:1647
-#: gofon/fonreports/class_fonreport.inc:166
-#: gofon/fonreports/class_fonreport.inc:169
+#: gofon/phoneaccount/class_phoneAccount.inc:1668
+#: gofon/fonreports/class_fonreport.inc:176
+#: gofon/fonreports/class_fonreport.inc:179
 #, fuzzy
 msgid "Configuration error"
 msgstr "Se puede escribir en la configuración"
@@ -952,99 +913,6 @@ msgstr ""
 msgid "Visibility flag"
 msgstr ""
 
-#: gofon/macro/class_divListMacros.inc:50
-#: gofon/conference/class_divListConferences.inc:50
-msgid "Select all"
-msgstr "Seleccione todos"
-
-#: gofon/macro/class_divListMacros.inc:56
-msgid "Department"
-msgstr "Departamento"
-
-#: gofon/macro/class_divListMacros.inc:57
-#, fuzzy
-msgid "Visible"
-msgstr "desactivado"
-
-#: gofon/macro/class_divListMacros.inc:58
-#: gofon/macro/class_divListMacros.inc:84
-#: gofon/conference/class_divListConferences.inc:59
-#: gofon/conference/class_divListConferences.inc:88
-msgid "Actions"
-msgstr "Acciones"
-
-#: gofon/macro/class_divListMacros.inc:81
-#: gofon/conference/class_divListConferences.inc:85
-msgid "Submit department"
-msgstr "Enviar departamento"
-
-#: gofon/macro/class_divListMacros.inc:81
-#: gofon/conference/class_divListConferences.inc:85
-msgid "Submit"
-msgstr "Enviar"
-
-#: gofon/macro/class_divListMacros.inc:89
-#: gofon/conference/class_divListConferences.inc:93
-msgid "Create"
-msgstr "Crear"
-
-#: gofon/macro/class_divListMacros.inc:91
-#: gofon/macro/class_divListMacros.inc:120
-#, fuzzy
-msgid "Macro"
-msgstr "Marzo"
-
-#: gofon/macro/class_divListMacros.inc:97
-#: gofon/conference/class_divListConferences.inc:101
-msgid "Remove"
-msgstr "Eliminar"
-
-#: gofon/macro/class_divListMacros.inc:121
-#, fuzzy
-msgid "visible"
-msgstr "desactivado"
-
-#: gofon/macro/class_divListMacros.inc:122
-#, fuzzy
-msgid "invisible"
-msgstr "Visible por todos"
-
-#: gofon/macro/class_divListMacros.inc:146
-#: gofon/conference/class_divListConferences.inc:150
-msgid "edit"
-msgstr "editar"
-
-#: gofon/macro/class_divListMacros.inc:147
-#, fuzzy
-msgid "Edit macro"
-msgstr "Editar rol"
-
-#: gofon/macro/class_divListMacros.inc:153
-#: gofon/conference/class_divListConferences.inc:158
-msgid "delete"
-msgstr "eliminar"
-
-#: gofon/macro/class_divListMacros.inc:154
-#, fuzzy
-msgid "Delete macro"
-msgstr "Eliminar acl"
-
-#: gofon/macro/class_divListMacros.inc:202
-#: gofon/macro/class_divListMacros.inc:203
-#, fuzzy, php-format
-msgid "Number of listed %s"
-msgstr "Eliminar departamentos seleccionados"
-
-#: gofon/macro/class_divListMacros.inc:202
-msgid "macros"
-msgstr ""
-
-#: gofon/macro/class_divListMacros.inc:203
-#: gofon/conference/class_divListConferences.inc:226
-#, fuzzy
-msgid "departments"
-msgstr "Departamento"
-
 #: gofon/macro/generic.tpl:18
 msgid "Macro name to be displayed"
 msgstr ""
@@ -1058,38 +926,46 @@ msgstr "Lista de usuarios"
 msgid "Macro text"
 msgstr ""
 
-#: gofon/macro/class_gofonMacroManagement.inc:24
+#: gofon/macro/macro-list.xml:11
 #, fuzzy
-msgid "Phone macros"
-msgstr "Número de teléfono"
+msgid "List of macros"
+msgstr "Lista de acls"
 
-#: gofon/macro/class_gofonMacroManagement.inc:25
-#: gofon/phoneaccount/class_phoneAccount.inc:7
-#: gofon/fonreports/class_fonreport.inc:7
+#: gofon/macro/macro-list.xml:15 gofon/macro/macro-list.xml:74
 #, fuzzy
-msgid "This does something"
-msgstr "Mostrar objetos que coincidan"
+msgid "Macro"
+msgstr "Marzo"
 
-#: gofon/macro/class_gofonMacroManagement.inc:273
-#: gofon/conference/class_phoneConferenceManagment.inc:187
-#, fuzzy
-msgid "Permission"
-msgstr "Permisos"
+#: gofon/macro/macro-list.xml:57 gofon/conference/conf-list.xml:57
+msgid "Actions"
+msgstr "Acciones"
+
+#: gofon/macro/macro-list.xml:68 gofon/conference/conf-list.xml:68
+msgid "Create"
+msgstr "Crear"
+
+#: gofon/macro/macro-list.xml:86 gofon/macro/macro-list.xml:125
+#: gofon/conference/conf-list.xml:86 gofon/conference/conf-list.xml:125
+msgid "Edit"
+msgstr "Editar"
 
-#: gofon/macro/class_gofonMacroManagement.inc:320
-#: gofon/macro/class_gofonMacroManagement.inc:373
-#: gofon/macro/class_gofonMacroManagement.inc:397
-#: gofon/conference/class_phoneConferenceManagment.inc:228
-#: gofon/conference/class_phoneConferenceManagment.inc:288
+#: gofon/macro/macro-list.xml:93 gofon/macro/macro-list.xml:138
+#: gofon/conference/conf-list.xml:93 gofon/conference/conf-list.xml:138
+msgid "Remove"
+msgstr "Eliminar"
+
+#: gofon/macro/macro-filter.tpl:3 gofon/conference/conf-filter.tpl:3
+#: gofon/fonreports/contents.tpl:2
 #, fuzzy
-msgid "Permission error"
-msgstr "Permisos"
+msgid "Filter"
+msgstr "Filtros"
 
-#: gofon/macro/class_gofonMacroManagement.inc:366
-msgid "macro"
-msgstr ""
+#: gofon/macro/class_gofonMacroManagement.inc:25
+#, fuzzy
+msgid "Macros"
+msgstr "Marzo"
 
-#: gofon/macro/main.inc:51 gofon/macro/main.inc:55
+#: gofon/macro/class_gofonMacroManagement.inc:26
 #, fuzzy
 msgid "Phone macro management"
 msgstr "Administración Samba"
@@ -1113,6 +989,14 @@ msgstr "Valor por defecto"
 msgid "You are not allowed to view the macro parameter settings"
 msgstr "No tiene permisos para editar esta acl."
 
+#: gofon/macro/macro-list.tpl:13 gofon/conference/conf-list.tpl:13
+msgid "Update"
+msgstr ""
+
+#: gofon/macro/macro-list.tpl:13 gofon/conference/conf-list.tpl:13
+msgid "Submit"
+msgstr "Enviar"
+
 #: gofon/phoneaccount/generic.tpl:42 gofon/phoneaccount/paste_generic.tpl:27
 msgid "Telephone hardware"
 msgstr "Teléfono hardware"
@@ -1203,7 +1087,7 @@ msgstr ""
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1562
 #: gofon/phoneaccount/class_phoneAccount.inc:612
 #: gofon/phoneaccount/class_phoneAccount.inc:678
-#: gofon/phoneaccount/class_phoneAccount.inc:1562
+#: gofon/phoneaccount/class_phoneAccount.inc:1583
 #, php-format
 msgid "GOsa identified problems with your MySQL table definition!"
 msgstr ""
@@ -1213,7 +1097,7 @@ msgstr ""
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1630
 #: gofon/phoneaccount/class_phoneAccount.inc:651
 #: gofon/phoneaccount/class_phoneAccount.inc:973
-#: gofon/phoneaccount/class_phoneAccount.inc:1630
+#: gofon/phoneaccount/class_phoneAccount.inc:1651
 #: gofon/conference/class_phoneConferenceGeneric.inc:620
 msgid "Please activate debugging for details!"
 msgstr ""
@@ -1267,32 +1151,32 @@ msgid "Between 1-4 charactes"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
-#: gofon/phoneaccount/class_phoneAccount.inc:1444
+#: gofon/phoneaccount/class_phoneAccount.inc:1465
 #, php-format
 msgid "macro parameter %s"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1513
 msgid "An error occured while updating the database entries!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1701
 #, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
-#: gofon/phoneaccount/class_phoneAccount.inc:1717
-#: gofon/phoneaccount/class_phoneAccount.inc:1719
+#: gofon/phoneaccount/class_phoneAccount.inc:1738
+#: gofon/phoneaccount/class_phoneAccount.inc:1740
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
-#: gofon/phoneaccount/class_phoneAccount.inc:1765
+#: gofon/phoneaccount/class_phoneAccount.inc:1786
 #, fuzzy, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -1300,80 +1184,80 @@ msgid ""
 msgstr "El método de contraseña seleccionado no está disponible."
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
-#: gofon/phoneaccount/class_phoneAccount.inc:1774
+#: gofon/phoneaccount/class_phoneAccount.inc:1795
 #, fuzzy
 msgid "Phone account settings"
 msgstr "Parámetros genéricos del grupo"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
-#: gofon/phoneaccount/class_phoneAccount.inc:1778
+#: gofon/phoneaccount/class_phoneAccount.inc:1799
 msgid "My account"
 msgstr "Mi cuenta"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
-#: gofon/phoneaccount/class_phoneAccount.inc:1785
+#: gofon/phoneaccount/class_phoneAccount.inc:1806
 #: gofon/conference/class_phoneConferenceGeneric.inc:864
 #, fuzzy
 msgid "Telephone number"
 msgstr "Número de teléfono"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1807
 #, fuzzy
 msgid "Macro settings"
 msgstr "Parámetros de correo"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
-#: gofon/phoneaccount/class_phoneAccount.inc:1789
+#: gofon/phoneaccount/class_phoneAccount.inc:1810
 #, fuzzy
 msgid "Phone context"
 msgstr "Teléfono genérico"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
-#: gofon/phoneaccount/class_phoneAccount.inc:1790
+#: gofon/phoneaccount/class_phoneAccount.inc:1811
 msgid "Voice mail context"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
-#: gofon/phoneaccount/class_phoneAccount.inc:1791
+#: gofon/phoneaccount/class_phoneAccount.inc:1812
 #, fuzzy
 msgid "Telephone pin"
 msgstr "Teléfono"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
-#: gofon/phoneaccount/class_phoneAccount.inc:1792
+#: gofon/phoneaccount/class_phoneAccount.inc:1813
 msgid "Voicemail pin"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
-#: gofon/phoneaccount/class_phoneAccount.inc:1874
+#: gofon/phoneaccount/class_phoneAccount.inc:1895
 msgid "There is currently no asterisk server defined!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
-#: gofon/phoneaccount/class_phoneAccount.inc:1878
+#: gofon/phoneaccount/class_phoneAccount.inc:1899
 msgid "Asterisk server is invalid!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
-#: gofon/phoneaccount/class_phoneAccount.inc:1884
+#: gofon/phoneaccount/class_phoneAccount.inc:1905
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
-#: gofon/phoneaccount/class_phoneAccount.inc:1887
+#: gofon/phoneaccount/class_phoneAccount.inc:1908
 #, fuzzy
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "El atributo contraseña está vacío o tiene caracteres no validos"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
-#: gofon/phoneaccount/class_phoneAccount.inc:1892
+#: gofon/phoneaccount/class_phoneAccount.inc:1913
 #, fuzzy
 msgid "Phone pin contains invalid characters!"
 msgstr "El atributo contraseña está vacío o tiene caracteres no validos"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
-#: gofon/phoneaccount/class_phoneAccount.inc:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1920
 #, fuzzy, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr "El campo '%s' tiene caracteres no validos."
@@ -1383,74 +1267,21 @@ msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 "Pulse en el botón - Editar - para cambiar la información en esta ventana"
 
-#: gofon/conference/headpage.tpl:6
-#: gofon/conference/class_divListConferences.inc:31
-#: gofon/conference/class_divListConferences.inc:32
-#, fuzzy
-msgid "List of conference rooms"
-msgstr "Lista del grupo de objetos"
-
-#: 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ú le permitirá crear, eliminar, y editar los departamentos "
-"seleccionados. Puede preferir el selector de rango en la parte superior de "
-"la lista de departamentos cuando maneje un gran número de departamentos."
-
-#: gofon/conference/headpage.tpl:35
-msgid "Display users matching"
-msgstr "Mostrar usuarios que coincidan con"
-
-#: gofon/conference/headpage.tpl:36
-#, fuzzy
-msgid "Regular expression for        matching user names"
-msgstr "Expresiones regulares para buscar nombre de usuarios"
-
-#: gofon/conference/remove.tpl:6
-msgid ""
-"This includes 'all' accounts, systems, etc. in this subtree. 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 'todas' las cuentas, sistemas, etc. en este subárbol. Por favor "
-"pulse dos veces si quiere realmente hacer esto, ya que no hay forma de que "
-"GOsa recupere la información posteriormente."
-
-#: 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 ""
-"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 entonces - presione "
-"'Eliminar' para continuar o 'Cancelar' para abortar."
-
-#: gofon/conference/class_phoneConferenceManagment.inc:24
+#: gofon/phoneaccount/class_phoneAccount.inc:7
+#: gofon/fonreports/class_fonreport.inc:7
 #, fuzzy
-msgid "Phone conferences"
-msgstr "Referencias"
+msgid "This does something"
+msgstr "Mostrar objetos que coincidan"
 
 #: gofon/conference/class_phoneConferenceManagment.inc:25
 #, fuzzy
-msgid "Management"
-msgstr "Administración de ACL"
-
-#: gofon/conference/class_phoneConferenceManagment.inc:206
-#: gofon/conference/class_phoneConferenceManagment.inc:267
-#, fuzzy
-msgid "conference"
+msgid "conferences"
 msgstr "Referencias"
 
-#: gofon/conference/class_phoneConferenceManagment.inc:228
-#: gofon/conference/class_phoneConferenceManagment.inc:288
+#: gofon/conference/class_phoneConferenceManagment.inc:26
 #, fuzzy
-msgid "You have not permission to delete this entry!"
-msgstr "No tiene permisos para eliminar este departamento."
+msgid "Conference management"
+msgstr "Administración de departamento"
 
 #: gofon/conference/generic.tpl:5
 msgid "Properties"
@@ -1495,7 +1326,6 @@ msgstr ""
 
 #: gofon/conference/generic.tpl:165
 #: gofon/conference/class_phoneConferenceGeneric.inc:384
-#: gofon/conference/class_divListConferences.inc:58
 msgid "PIN"
 msgstr ""
 
@@ -1531,6 +1361,17 @@ msgstr ""
 msgid "Count users"
 msgstr "Usuarios del dominio"
 
+#: gofon/conference/conf-list.xml:11
+#, fuzzy
+msgid "List of conference rooms"
+msgstr "Lista del grupo de objetos"
+
+#: gofon/conference/conf-list.xml:15 gofon/conference/conf-list.xml:74
+#: gofon/conference/class_phoneConferenceGeneric.inc:836
+#, fuzzy
+msgid "Conference"
+msgstr "Referencias"
+
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #, php-format
 msgid "Cannot delete entry from server '%s' because it seems to be removed!"
@@ -1560,13 +1401,6 @@ msgstr ""
 msgid "'%s' is already assigned to '%s'!"
 msgstr "El objeto '%s' está ya marcado"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:836
-#: gofon/conference/class_divListConferences.inc:95
-#: gofon/conference/class_divListConferences.inc:208
-#, fuzzy
-msgid "Conference"
-msgstr "Referencias"
-
 #: gofon/conference/class_phoneConferenceGeneric.inc:837
 #, fuzzy
 msgid "Phone conference management"
@@ -1602,107 +1436,68 @@ msgid "Format"
 msgstr ""
 
 #: gofon/conference/class_phoneConferenceGeneric.inc:865
-#: gofon/conference/class_divListConferences.inc:57
 msgid "Owner"
 msgstr ""
 
-#: gofon/conference/main.inc:48 gofon/conference/main.inc:50
-#, fuzzy
-msgid "Conference management"
-msgstr "Administración de departamento"
-
-#: gofon/conference/class_divListConferences.inc:65
-#, fuzzy
-msgid "Regular expression for matching conference names"
-msgstr "Expresiones regulares para buscar nombre de objetos"
-
-#: gofon/conference/class_divListConferences.inc:150
-msgid "Edit this entry"
-msgstr "Editar esta entrada"
-
-#: gofon/conference/class_divListConferences.inc:158
-msgid "Delete this entry"
-msgstr "Eliminar esta entrada"
-
-#: gofon/conference/class_divListConferences.inc:185
-msgid "Unknown"
-msgstr "Desconocido"
-
-#: gofon/conference/class_divListConferences.inc:225
-#: gofon/conference/class_divListConferences.inc:226
-#, fuzzy, php-format
-msgid "Number of listed '%s'"
-msgstr "Eliminar departamentos seleccionados"
-
-#: gofon/conference/class_divListConferences.inc:225
-#, fuzzy
-msgid "conferences"
-msgstr "Referencias"
-
 #: gofon/fonreports/class_fonreport.inc:6
 #, fuzzy
 msgid "Phone Reports"
 msgstr "Número de teléfono"
 
-#: gofon/fonreports/class_fonreport.inc:210
+#: gofon/fonreports/class_fonreport.inc:229
 msgid "Insufficient permissions"
 msgstr "Permisos insuficientes"
 
-#: gofon/fonreports/class_fonreport.inc:229
+#: gofon/fonreports/class_fonreport.inc:248
 msgid "Y-M-D"
 msgstr ""
 
-#: gofon/fonreports/class_fonreport.inc:396
-#: gofon/fonreports/class_fonreport.inc:397
-#: gofon/fonreports/class_fonreport.inc:404 gofon/fonreports/main.inc:22
+#: gofon/fonreports/class_fonreport.inc:415
+#: gofon/fonreports/class_fonreport.inc:416
+#: gofon/fonreports/class_fonreport.inc:423 gofon/fonreports/main.inc:22
 #, fuzzy
 msgid "Phone reports"
 msgstr "Número de teléfono"
 
-#: gofon/fonreports/class_fonreport.inc:397
+#: gofon/fonreports/class_fonreport.inc:416
 msgid "All entries are readonly"
 msgstr ""
 
-#: gofon/fonreports/class_fonreport.inc:409 gofon/fonreports/contents.tpl:30
+#: gofon/fonreports/class_fonreport.inc:428 gofon/fonreports/contents.tpl:34
 #, fuzzy
 msgid "Date"
 msgstr "Provincia"
 
-#: gofon/fonreports/class_fonreport.inc:410 gofon/fonreports/contents.tpl:31
+#: gofon/fonreports/class_fonreport.inc:429 gofon/fonreports/contents.tpl:35
 #, fuzzy
 msgid "Source"
 msgstr "Apellido"
 
-#: gofon/fonreports/class_fonreport.inc:411 gofon/fonreports/contents.tpl:32
+#: gofon/fonreports/class_fonreport.inc:430 gofon/fonreports/contents.tpl:36
 #, fuzzy
 msgid "Destination"
 msgstr "Descripción"
 
-#: gofon/fonreports/class_fonreport.inc:412 gofon/fonreports/contents.tpl:33
+#: gofon/fonreports/class_fonreport.inc:431 gofon/fonreports/contents.tpl:37
 #, fuzzy
 msgid "Channel"
 msgstr "Cancelar"
 
-#: gofon/fonreports/class_fonreport.inc:413
+#: gofon/fonreports/class_fonreport.inc:432
 #, fuzzy
 msgid "Application called"
 msgstr "Aplicación"
 
-#: gofon/fonreports/class_fonreport.inc:414
+#: gofon/fonreports/class_fonreport.inc:433
 #, fuzzy
 msgid "Disposition"
 msgstr "Descripción"
 
-#: gofon/fonreports/class_fonreport.inc:415 gofon/fonreports/contents.tpl:36
+#: gofon/fonreports/class_fonreport.inc:434 gofon/fonreports/contents.tpl:40
 #, fuzzy
 msgid "Duration"
 msgstr "Configuración"
 
-#: gofon/fonreports/contents.tpl:2
-#, fuzzy
-msgid "Filter"
-msgstr "Filtros"
-
 #: gofon/fonreports/contents.tpl:6
 #, fuzzy
 msgid "Search for"
@@ -1712,7 +1507,7 @@ msgstr "Buscar"
 msgid "Enter user name to search for"
 msgstr ""
 
-#: gofon/fonreports/contents.tpl:8 gofon/fonreports/contents.tpl:16
+#: gofon/fonreports/contents.tpl:8 gofon/fonreports/contents.tpl:20
 #, fuzzy
 msgid "in"
 msgstr "Linea"
@@ -1724,25 +1519,192 @@ msgstr "Elija el subárbol donde colocar al usuario"
 
 #: gofon/fonreports/contents.tpl:12
 #, fuzzy
+msgid "on"
+msgstr "Abajo"
+
+#: gofon/fonreports/contents.tpl:13
+#, fuzzy
+msgid "Select server to search on"
+msgstr "Elija el subárbol donde colocar al usuario"
+
+#: gofon/fonreports/contents.tpl:16
+#, fuzzy
 msgid "during"
 msgstr "Aviso"
 
-#: gofon/fonreports/contents.tpl:21
+#: gofon/fonreports/contents.tpl:25
 msgid "Search"
 msgstr "Buscar"
 
-#: gofon/fonreports/contents.tpl:34
+#: gofon/fonreports/contents.tpl:38
 msgid "Application"
 msgstr "Aplicación"
 
-#: gofon/fonreports/contents.tpl:35
+#: gofon/fonreports/contents.tpl:39
 msgid "Status"
 msgstr "Estado"
 
-#: gofon/fonreports/contents.tpl:51
+#: gofon/fonreports/contents.tpl:55
 msgid "Search returned no results..."
 msgstr ""
 
+#, 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ú le permite añadir, editar o eliminar los grupos seleccionados. "
+#~ "Cuando trabaje con un gran número de grupos puede usar el selector de "
+#~ "rango en la parte superior de la lista de grupos,."
+
+#~ msgid "Filters"
+#~ msgstr "Filtros"
+
+#, fuzzy
+#~ msgid "Display macros matching"
+#~ msgstr "Mostrar las acl que coincidan con"
+
+#, fuzzy
+#~ msgid "Display macros  matching"
+#~ msgstr "Mostrar las acl que coincidan con"
+
+#, fuzzy
+#~ msgid "Regular expression for matching macro names"
+#~ msgstr "Expresión regular para buscar nombres de grupos"
+
+#~ 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. Si está seguro de lo que quiere "
+#~ "hacer pulse dos veces, ya que no hay manera de que GOsa recupere "
+#~ "posteriormente la información."
+
+#~ msgid "Select all"
+#~ msgstr "Seleccione todos"
+
+#~ msgid "Department"
+#~ msgstr "Departamento"
+
+#, fuzzy
+#~ msgid "Visible"
+#~ msgstr "desactivado"
+
+#~ msgid "Submit department"
+#~ msgstr "Enviar departamento"
+
+#, fuzzy
+#~ msgid "visible"
+#~ msgstr "desactivado"
+
+#, fuzzy
+#~ msgid "invisible"
+#~ msgstr "Visible por todos"
+
+#~ msgid "edit"
+#~ msgstr "editar"
+
+#, fuzzy
+#~ msgid "Edit macro"
+#~ msgstr "Editar rol"
+
+#~ msgid "delete"
+#~ msgstr "eliminar"
+
+#, fuzzy
+#~ msgid "Delete macro"
+#~ msgstr "Eliminar acl"
+
+#, fuzzy
+#~ msgid "Number of listed %s"
+#~ msgstr "Eliminar departamentos seleccionados"
+
+#, fuzzy
+#~ msgid "departments"
+#~ msgstr "Departamento"
+
+#, fuzzy
+#~ msgid "Phone macros"
+#~ msgstr "Número de teléfono"
+
+#, fuzzy
+#~ msgid "Permission"
+#~ msgstr "Permisos"
+
+#, fuzzy
+#~ msgid "Permission error"
+#~ msgstr "Permisos"
+
+#, 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ú le permitirá crear, eliminar, y editar los departamentos "
+#~ "seleccionados. Puede preferir el selector de rango en la parte superior "
+#~ "de la lista de departamentos cuando maneje un gran número de "
+#~ "departamentos."
+
+#~ msgid "Display users matching"
+#~ msgstr "Mostrar usuarios que coincidan con"
+
+#, fuzzy
+#~ msgid "Regular expression for        matching user names"
+#~ msgstr "Expresiones regulares para buscar nombre de usuarios"
+
+#~ msgid ""
+#~ "This includes 'all' accounts, systems, etc. in this subtree. 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 'todas' las cuentas, sistemas, etc. en este subárbol. Por "
+#~ "favor pulse dos veces si quiere realmente hacer esto, ya que no hay forma "
+#~ "de que GOsa recupere la información posteriormente."
+
+#~ 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 "
+#~ "entonces - presione 'Eliminar' para continuar o 'Cancelar' para abortar."
+
+#, fuzzy
+#~ msgid "Phone conferences"
+#~ msgstr "Referencias"
+
+#, fuzzy
+#~ msgid "Management"
+#~ msgstr "Administración de ACL"
+
+#, fuzzy
+#~ msgid "conference"
+#~ msgstr "Referencias"
+
+#, fuzzy
+#~ msgid "You have not permission to delete this entry!"
+#~ msgstr "No tiene permisos para eliminar este departamento."
+
+#, fuzzy
+#~ msgid "Regular expression for matching conference names"
+#~ msgstr "Expresiones regulares para buscar nombre de objetos"
+
+#~ msgid "Edit this entry"
+#~ msgstr "Editar esta entrada"
+
+#~ msgid "Delete this entry"
+#~ msgstr "Eliminar esta entrada"
+
+#~ msgid "Unknown"
+#~ msgstr "Desconocido"
+
+#, fuzzy
+#~ msgid "Number of listed '%s'"
+#~ msgstr "Eliminar departamentos seleccionados"
+
 #, fuzzy
 #~ msgid "Copy"
 #~ msgstr "copiar"
@@ -1787,9 +1749,6 @@ msgstr ""
 #~ msgid "Add"
 #~ msgstr "Añadir"
 
-#~ msgid "Edit"
-#~ msgstr "Editar"
-
 #, fuzzy
 #~ msgid "You're about to delete the following macro(s) %s"
 #~ msgstr "Ha decidido eliminar todo el subárbol LDAP colocado debajo de '%s'."
diff --git a/gosa-plugins/gofon/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/fr/LC_MESSAGES/messages.po
index 336b29d00..b57209e13 100644
--- a/gosa-plugins/gofon/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 16:06+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2009-10-06 13:10+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -15,7 +15,8 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
 #: admin/ogroups/gofon/phonequeue.tpl:2
-msgid "Only users with the same asterisk home server will be included to this queue."
+msgid ""
+"Only users with the same asterisk home server will be included to this queue."
 msgstr ""
 "Seulement les utilisateurs du même serveur asterisk seront inclus dans cette "
 "queue."
@@ -54,7 +55,7 @@ msgstr "Options"
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1413
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1788
 #: gofon/phoneaccount/class_phoneAccount.inc:1413
-#: gofon/phoneaccount/class_phoneAccount.inc:1788
+#: gofon/phoneaccount/class_phoneAccount.inc:1809
 #: gofon/conference/generic.tpl:68
 #: gofon/conference/class_phoneConferenceGeneric.inc:853
 msgid "Home server"
@@ -255,7 +256,6 @@ msgstr "taille de la queue"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:323
 #: gofon/conference/class_phoneConferenceGeneric.inc:392
-#: gofon/conference/class_divListConferences.inc:56
 msgid "Number"
 msgstr "Numéro"
 
@@ -272,10 +272,10 @@ msgstr "asterisk"
 #: gofon/phoneaccount/class_phoneAccount.inc:431
 #: gofon/phoneaccount/class_phoneAccount.inc:1109
 #: gofon/conference/class_phoneConferenceGeneric.inc:430
-#: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:176
-#: gofon/fonreports/class_fonreport.inc:180
-#: gofon/fonreports/class_fonreport.inc:198
+#: gofon/fonreports/class_fonreport.inc:196
+#: gofon/fonreports/class_fonreport.inc:200
+#: gofon/fonreports/class_fonreport.inc:217
 msgid "GOfon"
 msgstr "Gofon"
 
@@ -318,16 +318,16 @@ msgstr "numéro de téléphone"
 #: gofon/phoneaccount/class_phoneAccount.inc:1211
 #: gofon/phoneaccount/class_phoneAccount.inc:1217
 #: gofon/phoneaccount/class_phoneAccount.inc:1431
-#: gofon/phoneaccount/class_phoneAccount.inc:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1571
-#: gofon/phoneaccount/class_phoneAccount.inc:1581
-#: gofon/phoneaccount/class_phoneAccount.inc:1628
+#: gofon/phoneaccount/class_phoneAccount.inc:1513
+#: gofon/phoneaccount/class_phoneAccount.inc:1592
+#: gofon/phoneaccount/class_phoneAccount.inc:1602
+#: gofon/phoneaccount/class_phoneAccount.inc:1649
 #: gofon/conference/class_phoneConferenceGeneric.inc:260
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #: gofon/conference/class_phoneConferenceGeneric.inc:618
-#: gofon/fonreports/class_fonreport.inc:176
-#: gofon/fonreports/class_fonreport.inc:180
-#: gofon/fonreports/class_fonreport.inc:198
+#: gofon/fonreports/class_fonreport.inc:196
+#: gofon/fonreports/class_fonreport.inc:200
+#: gofon/fonreports/class_fonreport.inc:217
 msgid "Error"
 msgstr "Erreur"
 
@@ -343,13 +343,14 @@ msgstr "Erreur"
 #: gofon/macro/class_gofonMacro.inc:526
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
-#: gofon/phoneaccount/class_phoneAccount.inc:1518
-#: gofon/phoneaccount/class_phoneAccount.inc:1689
+#: gofon/phoneaccount/class_phoneAccount.inc:1539
+#: gofon/phoneaccount/class_phoneAccount.inc:1710
 #: gofon/conference/class_phoneConferenceGeneric.inc:789
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:901
+#: gofon/phoneaccount/class_phoneAccount.inc:1457
 #: gofon/conference/generic.tpl:120 gofon/conference/paste_generic.tpl:15
 msgid "Phone number"
 msgstr "Numéro de téléphone"
@@ -367,7 +368,7 @@ msgstr "Numéro de téléphone"
 #: gofon/phoneaccount/class_phoneAccount.inc:1072
 #: gofon/phoneaccount/class_phoneAccount.inc:1076
 #: gofon/phoneaccount/class_phoneAccount.inc:1079
-#: gofon/phoneaccount/class_phoneAccount.inc:1773
+#: gofon/phoneaccount/class_phoneAccount.inc:1794
 msgid "Phone"
 msgstr "Téléphone"
 
@@ -596,10 +597,10 @@ msgstr "Nom du téléphone"
 
 #: admin/systems/gofon/phone.tpl:17
 #: admin/systems/gofon/class_phoneGeneric.inc:517
-#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/class_divListMacros.inc:79
-#: gofon/macro/generic.tpl:27 gofon/conference/generic.tpl:49
+#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/generic.tpl:27
+#: gofon/macro/macro-list.tpl:13 gofon/conference/generic.tpl:49
 #: gofon/conference/class_phoneConferenceGeneric.inc:847
-#: gofon/conference/class_divListConferences.inc:83
+#: gofon/conference/conf-list.tpl:13
 msgid "Base"
 msgstr "Base"
 
@@ -615,7 +616,8 @@ msgstr "Sélectionnez une base"
 #: admin/systems/gofon/phone.tpl:34
 #: admin/systems/gofon/class_phoneGeneric.inc:518
 #: gofon/macro/class_gofonMacro.inc:574 gofon/macro/generic.tpl:49
-#: gofon/conference/generic.tpl:98
+#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:98
+#: gofon/conference/conf-list.xml:49
 #: gofon/conference/class_phoneConferenceGeneric.inc:848
 msgid "Description"
 msgstr "Description"
@@ -625,12 +627,10 @@ msgid "phone"
 msgstr "téléphone"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:235
-#: gofon/macro/class_divListMacros.inc:121
 msgid "yes"
 msgstr "oui"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:235
-#: gofon/macro/class_divListMacros.inc:122
 msgid "no"
 msgstr "non"
 
@@ -646,7 +646,8 @@ msgstr "Configuration réseau"
 #: gofon/macro/class_gofonMacro.inc:458
 #, php-format
 msgid "Cannot delete entry because it is still in use by '%s'!"
-msgstr "Impossible d'éffacer l'entrée parcequ'elle est encore utilisée par '%s' !"
+msgstr ""
+"Impossible d'éffacer l'entrée parcequ'elle est encore utilisée par '%s' !"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:331
 #: admin/systems/gofon/class_phoneGeneric.inc:334
@@ -659,11 +660,11 @@ msgstr "Adresse ip"
 #: admin/systems/gofon/class_phoneGeneric.inc:362
 #: admin/systems/gofon/class_phoneGeneric.inc:516
 #: gofon/macro/class_gofonMacro.inc:406 gofon/macro/class_gofonMacro.inc:412
-#: gofon/macro/class_divListMacros.inc:56 gofon/macro/parameter.tpl:6
+#: gofon/macro/macro-list.xml:41 gofon/macro/parameter.tpl:6
+#: gofon/conference/conf-list.xml:41
 #: gofon/conference/class_phoneConferenceGeneric.inc:388
 #: gofon/conference/class_phoneConferenceGeneric.inc:410
 #: gofon/conference/class_phoneConferenceGeneric.inc:846
-#: gofon/conference/class_divListConferences.inc:56
 msgid "Name"
 msgstr "Nom"
 
@@ -678,7 +679,7 @@ msgstr "Téléphone générique"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:513
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
-#: gofon/phoneaccount/class_phoneAccount.inc:1787
+#: gofon/phoneaccount/class_phoneAccount.inc:1808
 msgid "Phone hardware"
 msgstr "Matériel téléphonique"
 
@@ -730,44 +731,6 @@ msgstr "MSN CAPI"
 msgid "Hardware type"
 msgstr "Type de matériel"
 
-#: gofon/macro/headpage.tpl:6 gofon/macro/class_divListMacros.inc:31
-#: gofon/macro/class_divListMacros.inc:32
-msgid "List of macros"
-msgstr "Liste des macros"
-
-#: gofon/macro/headpage.tpl:20 gofon/macro/class_gofonMacroParameters.inc:374
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1680
-#: gofon/conference/headpage.tpl:20
-msgid "Information"
-msgstr "Information"
-
-#: 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."
-
-#: gofon/macro/headpage.tpl:29 gofon/conference/headpage.tpl:29
-msgid "Filters"
-msgstr "Filtres"
-
-#: gofon/macro/headpage.tpl:38
-msgid "Display macros matching"
-msgstr "Afficher les macros correspondantes"
-
-#: gofon/macro/headpage.tpl:38
-msgid "Display macros  matching"
-msgstr "Afficher les macros correspondantes"
-
-#: gofon/macro/headpage.tpl:41 gofon/macro/class_divListMacros.inc:64
-msgid "Regular expression for matching macro names"
-msgstr "Expression régulière correspondant à des noms de macro"
-
 #: gofon/macro/remove.tpl:2 gofon/phoneaccount/.svn/tmp/tempfile.tmp:328
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:611
@@ -778,23 +741,23 @@ msgstr "Expression régulière correspondant à des noms de macro"
 #: gofon/phoneaccount/class_phoneAccount.inc:342
 #: gofon/phoneaccount/class_phoneAccount.inc:611
 #: gofon/phoneaccount/class_phoneAccount.inc:677
-#: gofon/phoneaccount/class_phoneAccount.inc:1561
-#: gofon/phoneaccount/class_phoneAccount.inc:1938
+#: gofon/phoneaccount/class_phoneAccount.inc:1582
+#: gofon/phoneaccount/class_phoneAccount.inc:1959
 #: gofon/conference/remove.tpl:2
 #: gofon/conference/class_phoneConferenceGeneric.inc:463
 msgid "Warning"
 msgstr "Avertissement"
 
-#: gofon/macro/remove.tpl:6
+#: gofon/macro/remove.tpl:6 gofon/conference/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."
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
 msgstr ""
-"Cela peut être utilisé par plusieurs groupes. 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."
+"Veuillez vérifier que vous voulez effectuer cette action. Toutes les données "
+"seront perdues étant donné qu'il est impossible pour GOsa de récupérer vos "
+"données."
 
-#: gofon/macro/remove.tpl:9
+#: gofon/macro/remove.tpl:10 gofon/conference/remove.tpl:10
 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 "
@@ -833,6 +796,12 @@ msgstr ""
 msgid "Parameter %s is invalid!"
 msgstr "Le paramètre %s est non valide !"
 
+#: gofon/macro/class_gofonMacroParameters.inc:374
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1701
+msgid "Information"
+msgstr "Information"
+
 #: gofon/macro/class_gofonMacroParameters.inc:374
 msgid ""
 "Number of parameters for this macro has changed. Please update all users "
@@ -871,9 +840,9 @@ msgstr "La macro est vide !"
 #: gofon/phoneaccount/class_phoneAccount.inc:431
 #: gofon/phoneaccount/class_phoneAccount.inc:439
 #: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:1647
-#: gofon/fonreports/class_fonreport.inc:166
-#: gofon/fonreports/class_fonreport.inc:169
+#: gofon/phoneaccount/class_phoneAccount.inc:1668
+#: gofon/fonreports/class_fonreport.inc:176
+#: gofon/fonreports/class_fonreport.inc:179
 msgid "Configuration error"
 msgstr "Erreur de configuration"
 
@@ -903,92 +872,6 @@ msgstr "Contenu et paramètre des macros"
 msgid "Visibility flag"
 msgstr "Etat de visibilité"
 
-#: gofon/macro/class_divListMacros.inc:50
-#: gofon/conference/class_divListConferences.inc:50
-msgid "Select all"
-msgstr "Sélectionner tout"
-
-#: gofon/macro/class_divListMacros.inc:56
-msgid "Department"
-msgstr "Département"
-
-#: gofon/macro/class_divListMacros.inc:57
-msgid "Visible"
-msgstr "Visible"
-
-#: gofon/macro/class_divListMacros.inc:58
-#: gofon/macro/class_divListMacros.inc:84
-#: gofon/conference/class_divListConferences.inc:59
-#: gofon/conference/class_divListConferences.inc:88
-msgid "Actions"
-msgstr "Actions"
-
-#: gofon/macro/class_divListMacros.inc:81
-#: gofon/conference/class_divListConferences.inc:85
-msgid "Submit department"
-msgstr "Soumettre le département"
-
-#: gofon/macro/class_divListMacros.inc:81
-#: gofon/conference/class_divListConferences.inc:85
-msgid "Submit"
-msgstr "Soumettre"
-
-#: gofon/macro/class_divListMacros.inc:89
-#: gofon/conference/class_divListConferences.inc:93
-msgid "Create"
-msgstr "Créer"
-
-#: gofon/macro/class_divListMacros.inc:91
-#: gofon/macro/class_divListMacros.inc:120
-msgid "Macro"
-msgstr "Macro"
-
-#: gofon/macro/class_divListMacros.inc:97
-#: gofon/conference/class_divListConferences.inc:101
-msgid "Remove"
-msgstr "Supprimer"
-
-#: gofon/macro/class_divListMacros.inc:121
-msgid "visible"
-msgstr "visible"
-
-#: gofon/macro/class_divListMacros.inc:122
-msgid "invisible"
-msgstr "invisible"
-
-#: gofon/macro/class_divListMacros.inc:146
-#: gofon/conference/class_divListConferences.inc:150
-msgid "edit"
-msgstr "éditer"
-
-#: gofon/macro/class_divListMacros.inc:147
-msgid "Edit macro"
-msgstr "Editer une macro"
-
-#: gofon/macro/class_divListMacros.inc:153
-#: gofon/conference/class_divListConferences.inc:158
-msgid "delete"
-msgstr "supprimer"
-
-#: gofon/macro/class_divListMacros.inc:154
-msgid "Delete macro"
-msgstr "Supprimer une macro"
-
-#: gofon/macro/class_divListMacros.inc:202
-#: gofon/macro/class_divListMacros.inc:203
-#, php-format
-msgid "Number of listed %s"
-msgstr "Nombre de '%s' listés"
-
-#: gofon/macro/class_divListMacros.inc:202
-msgid "macros"
-msgstr "macros"
-
-#: gofon/macro/class_divListMacros.inc:203
-#: gofon/conference/class_divListConferences.inc:226
-msgid "departments"
-msgstr "Départements"
-
 #: gofon/macro/generic.tpl:18
 msgid "Macro name to be displayed"
 msgstr "Nom d'affichage de la macro"
@@ -1001,34 +884,43 @@ msgstr "Visible pour l'utilisateur"
 msgid "Macro text"
 msgstr "Texte de la macro"
 
-#: gofon/macro/class_gofonMacroManagement.inc:24
-msgid "Phone macros"
-msgstr "Macros téléphoniques"
+#: gofon/macro/macro-list.xml:11
+msgid "List of macros"
+msgstr "Liste des macros"
 
-#: gofon/macro/class_gofonMacroManagement.inc:25
-#: gofon/phoneaccount/class_phoneAccount.inc:7
-#: gofon/fonreports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Ceci fait quelque chose"
+#: gofon/macro/macro-list.xml:15 gofon/macro/macro-list.xml:74
+msgid "Macro"
+msgstr "Macro"
 
-#: gofon/macro/class_gofonMacroManagement.inc:273
-#: gofon/conference/class_phoneConferenceManagment.inc:187
-msgid "Permission"
-msgstr "Permissions"
+#: gofon/macro/macro-list.xml:57 gofon/conference/conf-list.xml:57
+msgid "Actions"
+msgstr "Actions"
 
-#: gofon/macro/class_gofonMacroManagement.inc:320
-#: gofon/macro/class_gofonMacroManagement.inc:373
-#: gofon/macro/class_gofonMacroManagement.inc:397
-#: gofon/conference/class_phoneConferenceManagment.inc:228
-#: gofon/conference/class_phoneConferenceManagment.inc:288
-msgid "Permission error"
-msgstr "Erreur de permissions"
+#: gofon/macro/macro-list.xml:68 gofon/conference/conf-list.xml:68
+msgid "Create"
+msgstr "Créer"
+
+#: gofon/macro/macro-list.xml:86 gofon/macro/macro-list.xml:125
+#: gofon/conference/conf-list.xml:86 gofon/conference/conf-list.xml:125
+msgid "Edit"
+msgstr "Editer"
 
-#: gofon/macro/class_gofonMacroManagement.inc:366
-msgid "macro"
-msgstr "macro"
+#: gofon/macro/macro-list.xml:93 gofon/macro/macro-list.xml:138
+#: gofon/conference/conf-list.xml:93 gofon/conference/conf-list.xml:138
+msgid "Remove"
+msgstr "Supprimer"
 
-#: gofon/macro/main.inc:51 gofon/macro/main.inc:55
+#: gofon/macro/macro-filter.tpl:3 gofon/conference/conf-filter.tpl:3
+#: gofon/fonreports/contents.tpl:2
+msgid "Filter"
+msgstr "Filtre"
+
+#: gofon/macro/class_gofonMacroManagement.inc:25
+#, fuzzy
+msgid "Macros"
+msgstr "Macro"
+
+#: gofon/macro/class_gofonMacroManagement.inc:26
 msgid "Phone macro management"
 msgstr "Administration des macros téléphoniques"
 
@@ -1048,6 +940,14 @@ msgstr "Valeur par défaut"
 msgid "You are not allowed to view the macro parameter settings"
 msgstr "Vous n'êtes pas autorisé à voir les paramètres de cette macro."
 
+#: gofon/macro/macro-list.tpl:13 gofon/conference/conf-list.tpl:13
+msgid "Update"
+msgstr "Mise à jour"
+
+#: gofon/macro/macro-list.tpl:13 gofon/conference/conf-list.tpl:13
+msgid "Submit"
+msgstr "Soumettre"
+
 #: gofon/phoneaccount/generic.tpl:42 gofon/phoneaccount/paste_generic.tpl:27
 msgid "Telephone hardware"
 msgstr "Matériel téléphonique"
@@ -1113,7 +1013,8 @@ msgstr "non défini"
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
 #: gofon/phoneaccount/class_phoneAccount.inc:342
 #, php-format
-msgid "Cannot identify telephone extension in database, please try to save again."
+msgid ""
+"Cannot identify telephone extension in database, please try to save again."
 msgstr ""
 "Impossible d'identifier l'extension téléphonique dans la base de données, "
 "veuillez essayer de sauver à nouveau."
@@ -1136,17 +1037,18 @@ msgstr ""
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1562
 #: gofon/phoneaccount/class_phoneAccount.inc:612
 #: gofon/phoneaccount/class_phoneAccount.inc:678
-#: gofon/phoneaccount/class_phoneAccount.inc:1562
+#: gofon/phoneaccount/class_phoneAccount.inc:1583
 #, php-format
 msgid "GOsa identified problems with your MySQL table definition!"
-msgstr "GOsa à identifié des problèmes dans les définitions de vos tables MySQL !"
+msgstr ""
+"GOsa à identifié des problèmes dans les définitions de vos tables MySQL !"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:651
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:973
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1630
 #: gofon/phoneaccount/class_phoneAccount.inc:651
 #: gofon/phoneaccount/class_phoneAccount.inc:973
-#: gofon/phoneaccount/class_phoneAccount.inc:1630
+#: gofon/phoneaccount/class_phoneAccount.inc:1651
 #: gofon/conference/class_phoneConferenceGeneric.inc:620
 msgid "Please activate debugging for details!"
 msgstr "Veuillez activer le mode debug pour plus de détail !"
@@ -1198,32 +1100,32 @@ msgid "Between 1-4 charactes"
 msgstr "Entre 1-4 caractères."
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
-#: gofon/phoneaccount/class_phoneAccount.inc:1444
+#: gofon/phoneaccount/class_phoneAccount.inc:1465
 #, php-format
 msgid "macro parameter %s"
 msgstr "paramètre de la macro %s"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1513
 msgid "An error occured while updating the database entries!"
 msgstr "Une erreur est survenue lors de la mise à jour de la base de données !"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1701
 #, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr "L'utilisateur '%s' à été enlevé de la queue '%s'."
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
-#: gofon/phoneaccount/class_phoneAccount.inc:1717
-#: gofon/phoneaccount/class_phoneAccount.inc:1719
+#: gofon/phoneaccount/class_phoneAccount.inc:1738
+#: gofon/phoneaccount/class_phoneAccount.inc:1740
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr "Le numéro de téléphone %s est déjà utilisé par '%s'."
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
-#: gofon/phoneaccount/class_phoneAccount.inc:1765
+#: gofon/phoneaccount/class_phoneAccount.inc:1786
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -1233,73 +1135,73 @@ msgstr ""
 "Effacement interrompu."
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
-#: gofon/phoneaccount/class_phoneAccount.inc:1774
+#: gofon/phoneaccount/class_phoneAccount.inc:1795
 msgid "Phone account settings"
 msgstr "Paramètres compte téléphonique"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
-#: gofon/phoneaccount/class_phoneAccount.inc:1778
+#: gofon/phoneaccount/class_phoneAccount.inc:1799
 msgid "My account"
 msgstr "Mon Compte"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
-#: gofon/phoneaccount/class_phoneAccount.inc:1785
+#: gofon/phoneaccount/class_phoneAccount.inc:1806
 #: gofon/conference/class_phoneConferenceGeneric.inc:864
 msgid "Telephone number"
 msgstr "Numéro de téléphone"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1807
 msgid "Macro settings"
 msgstr "Paramètres des macros"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
-#: gofon/phoneaccount/class_phoneAccount.inc:1789
+#: gofon/phoneaccount/class_phoneAccount.inc:1810
 msgid "Phone context"
 msgstr "Contexte téléphonique"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
-#: gofon/phoneaccount/class_phoneAccount.inc:1790
+#: gofon/phoneaccount/class_phoneAccount.inc:1811
 msgid "Voice mail context"
 msgstr "Contexte de la boite vocale"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
-#: gofon/phoneaccount/class_phoneAccount.inc:1791
+#: gofon/phoneaccount/class_phoneAccount.inc:1812
 msgid "Telephone pin"
 msgstr "Code PIN du téléphone"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
-#: gofon/phoneaccount/class_phoneAccount.inc:1792
+#: gofon/phoneaccount/class_phoneAccount.inc:1813
 msgid "Voicemail pin"
 msgstr "Code PIN de la boite vocale"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
-#: gofon/phoneaccount/class_phoneAccount.inc:1874
+#: gofon/phoneaccount/class_phoneAccount.inc:1895
 msgid "There is currently no asterisk server defined!"
 msgstr "Il n'y a pas de serveur asterisk défini !"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
-#: gofon/phoneaccount/class_phoneAccount.inc:1878
+#: gofon/phoneaccount/class_phoneAccount.inc:1899
 msgid "Asterisk server is invalid!"
 msgstr "Le serveur Asterisk est non valide !"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
-#: gofon/phoneaccount/class_phoneAccount.inc:1884
+#: gofon/phoneaccount/class_phoneAccount.inc:1905
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr "Le code pin de la boîte vocale doit être long de 4 caractères."
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
-#: gofon/phoneaccount/class_phoneAccount.inc:1887
+#: gofon/phoneaccount/class_phoneAccount.inc:1908
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "Le code pin de la boîte vocale contient des caractères non valides !"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
-#: gofon/phoneaccount/class_phoneAccount.inc:1892
+#: gofon/phoneaccount/class_phoneAccount.inc:1913
 msgid "Phone pin contains invalid characters!"
 msgstr "Le mot de passe contient des caractères invalides."
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
-#: gofon/phoneaccount/class_phoneAccount.inc:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1920
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
@@ -1312,67 +1214,18 @@ msgstr ""
 "Cliquez sur le bouton 'Editer' ci-dessous pour changer les informations dans "
 "cette boite de dialogue"
 
-#: gofon/conference/headpage.tpl:6
-#: gofon/conference/class_divListConferences.inc:31
-#: gofon/conference/class_divListConferences.inc:32
-msgid "List of conference rooms"
-msgstr "Liste des salles de conférence"
-
-#: 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."
-
-#: gofon/conference/headpage.tpl:35
-msgid "Display users matching"
-msgstr "Afficher les utilisateurs correspondants"
-
-#: gofon/conference/headpage.tpl:36
-msgid "Regular expression for        matching user names"
-msgstr "Expression régulière concordant avec les noms des utilisateurs"
-
-#: gofon/conference/remove.tpl:6
-msgid ""
-"This includes 'all' accounts, systems, etc. in this subtree. Please double "
-"check if your really want to do this since there is no way for GOsa to get "
-"your data back."
-msgstr ""
-"Ceci inclus tous les comptes systèmes, etc... dans cette branche. Veuillez "
-"vérifier si vous voulez réaliser cette opération étant donné qu'il est "
-"impossible pour GOsa de récupérer vos données."
-
-#: 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."
-
-#: gofon/conference/class_phoneConferenceManagment.inc:24
-msgid "Phone conferences"
-msgstr "Conférences téléphoniques"
+#: gofon/phoneaccount/class_phoneAccount.inc:7
+#: gofon/fonreports/class_fonreport.inc:7
+msgid "This does something"
+msgstr "Ceci fait quelque chose"
 
 #: gofon/conference/class_phoneConferenceManagment.inc:25
-msgid "Management"
-msgstr "Gestion"
-
-#: gofon/conference/class_phoneConferenceManagment.inc:206
-#: gofon/conference/class_phoneConferenceManagment.inc:267
-msgid "conference"
-msgstr "Conférence"
+msgid "conferences"
+msgstr "Conférences"
 
-#: gofon/conference/class_phoneConferenceManagment.inc:228
-#: gofon/conference/class_phoneConferenceManagment.inc:288
-msgid "You have not permission to delete this entry!"
-msgstr "Vous n'avez pas les droits nécessaires pour supprimer cette entrée !"
+#: gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Conference management"
+msgstr "Gestion des conférences"
 
 #: gofon/conference/generic.tpl:5
 msgid "Properties"
@@ -1413,7 +1266,6 @@ msgstr "Code PIN préselectionné"
 
 #: gofon/conference/generic.tpl:165
 #: gofon/conference/class_phoneConferenceGeneric.inc:384
-#: gofon/conference/class_divListConferences.inc:58
 msgid "PIN"
 msgstr "Code PIN"
 
@@ -1449,6 +1301,15 @@ msgstr "Annoncer les nouveaux utilisateurs et ceux qui quittent"
 msgid "Count users"
 msgstr "Compter les utilisateurs"
 
+#: gofon/conference/conf-list.xml:11
+msgid "List of conference rooms"
+msgstr "Liste des salles de conférence"
+
+#: gofon/conference/conf-list.xml:15 gofon/conference/conf-list.xml:74
+#: gofon/conference/class_phoneConferenceGeneric.inc:836
+msgid "Conference"
+msgstr "Conférence"
+
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #, php-format
 msgid "Cannot delete entry from server '%s' because it seems to be removed!"
@@ -1458,7 +1319,8 @@ msgstr ""
 
 #: gofon/conference/class_phoneConferenceGeneric.inc:379
 #, php-format
-msgid "The previously selected asterisk home server '%s' is no longer available!"
+msgid ""
+"The previously selected asterisk home server '%s' is no longer available!"
 msgstr ""
 "Le serveur asterisk primaire (%s) précédemment sélectionné n'est plus "
 "disponible !"
@@ -1483,12 +1345,6 @@ msgstr ""
 msgid "'%s' is already assigned to '%s'!"
 msgstr "'%s' est déjà utilisé par '%s' !"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:836
-#: gofon/conference/class_divListConferences.inc:95
-#: gofon/conference/class_divListConferences.inc:208
-msgid "Conference"
-msgstr "Conférence"
-
 #: gofon/conference/class_phoneConferenceGeneric.inc:837
 msgid "Phone conference management"
 msgstr "Gestion des conférences téléphoniques"
@@ -1522,94 +1378,59 @@ msgid "Format"
 msgstr "Format"
 
 #: gofon/conference/class_phoneConferenceGeneric.inc:865
-#: gofon/conference/class_divListConferences.inc:57
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: gofon/conference/main.inc:48 gofon/conference/main.inc:50
-msgid "Conference management"
-msgstr "Gestion des conférences"
-
-#: gofon/conference/class_divListConferences.inc:65
-msgid "Regular expression for matching conference names"
-msgstr "Expression régulière concordant avec les noms des conférences"
-
-#: gofon/conference/class_divListConferences.inc:150
-msgid "Edit this entry"
-msgstr "Editer cette entrée"
-
-#: gofon/conference/class_divListConferences.inc:158
-msgid "Delete this entry"
-msgstr "Supprimer cette entrée"
-
-#: gofon/conference/class_divListConferences.inc:185
-msgid "Unknown"
-msgstr "Inconnu"
-
-#: gofon/conference/class_divListConferences.inc:225
-#: gofon/conference/class_divListConferences.inc:226
-#, php-format
-msgid "Number of listed '%s'"
-msgstr "Nombre de '%s' listés"
-
-#: gofon/conference/class_divListConferences.inc:225
-msgid "conferences"
-msgstr "Conférences"
-
 #: gofon/fonreports/class_fonreport.inc:6
 msgid "Phone Reports"
 msgstr "Rapports téléphoniques"
 
-#: gofon/fonreports/class_fonreport.inc:210
+#: gofon/fonreports/class_fonreport.inc:229
 msgid "Insufficient permissions"
 msgstr "Permission insuffisantes"
 
-#: gofon/fonreports/class_fonreport.inc:229
+#: gofon/fonreports/class_fonreport.inc:248
 msgid "Y-M-D"
 msgstr "A-M-J"
 
-#: gofon/fonreports/class_fonreport.inc:396
-#: gofon/fonreports/class_fonreport.inc:397
-#: gofon/fonreports/class_fonreport.inc:404 gofon/fonreports/main.inc:22
+#: gofon/fonreports/class_fonreport.inc:415
+#: gofon/fonreports/class_fonreport.inc:416
+#: gofon/fonreports/class_fonreport.inc:423 gofon/fonreports/main.inc:22
 msgid "Phone reports"
 msgstr "Rapports téléphoniques"
 
-#: gofon/fonreports/class_fonreport.inc:397
+#: gofon/fonreports/class_fonreport.inc:416
 msgid "All entries are readonly"
 msgstr "Tous les champs sont en lecture seule"
 
-#: gofon/fonreports/class_fonreport.inc:409 gofon/fonreports/contents.tpl:30
+#: gofon/fonreports/class_fonreport.inc:428 gofon/fonreports/contents.tpl:34
 msgid "Date"
 msgstr "Date"
 
-#: gofon/fonreports/class_fonreport.inc:410 gofon/fonreports/contents.tpl:31
+#: gofon/fonreports/class_fonreport.inc:429 gofon/fonreports/contents.tpl:35
 msgid "Source"
 msgstr "Emetteur"
 
-#: gofon/fonreports/class_fonreport.inc:411 gofon/fonreports/contents.tpl:32
+#: gofon/fonreports/class_fonreport.inc:430 gofon/fonreports/contents.tpl:36
 msgid "Destination"
 msgstr "Destinataire"
 
-#: gofon/fonreports/class_fonreport.inc:412 gofon/fonreports/contents.tpl:33
+#: gofon/fonreports/class_fonreport.inc:431 gofon/fonreports/contents.tpl:37
 msgid "Channel"
 msgstr "Canal"
 
-#: gofon/fonreports/class_fonreport.inc:413
+#: gofon/fonreports/class_fonreport.inc:432
 msgid "Application called"
 msgstr "Application appelée"
 
-#: gofon/fonreports/class_fonreport.inc:414
+#: gofon/fonreports/class_fonreport.inc:433
 msgid "Disposition"
 msgstr "Disposition"
 
-#: gofon/fonreports/class_fonreport.inc:415 gofon/fonreports/contents.tpl:36
+#: gofon/fonreports/class_fonreport.inc:434 gofon/fonreports/contents.tpl:40
 msgid "Duration"
 msgstr "Durée"
 
-#: gofon/fonreports/contents.tpl:2
-msgid "Filter"
-msgstr "Filtre"
-
 #: gofon/fonreports/contents.tpl:6
 msgid "Search for"
 msgstr "Recherche de"
@@ -1618,7 +1439,7 @@ msgstr "Recherche de"
 msgid "Enter user name to search for"
 msgstr "Entrez le nom recherché"
 
-#: gofon/fonreports/contents.tpl:8 gofon/fonreports/contents.tpl:16
+#: gofon/fonreports/contents.tpl:8 gofon/fonreports/contents.tpl:20
 msgid "in"
 msgstr "dans"
 
@@ -1627,22 +1448,172 @@ msgid "Select subtree to base search on"
 msgstr "Sélectionnez la branche de l'annuaire où sera effectuée la recherche"
 
 #: gofon/fonreports/contents.tpl:12
+#, fuzzy
+msgid "on"
+msgstr "En bas"
+
+#: gofon/fonreports/contents.tpl:13
+#, fuzzy
+msgid "Select server to search on"
+msgstr "Sélectionnez la branche de l'annuaire où sera effectuée la recherche"
+
+#: gofon/fonreports/contents.tpl:16
 msgid "during"
 msgstr "pendant"
 
-#: gofon/fonreports/contents.tpl:21
+#: gofon/fonreports/contents.tpl:25
 msgid "Search"
 msgstr "Recherche"
 
-#: gofon/fonreports/contents.tpl:34
+#: gofon/fonreports/contents.tpl:38
 msgid "Application"
 msgstr "Applications"
 
-#: gofon/fonreports/contents.tpl:35
+#: gofon/fonreports/contents.tpl:39
 msgid "Status"
 msgstr "Statut"
 
-#: gofon/fonreports/contents.tpl:51
+#: gofon/fonreports/contents.tpl:55
 msgid "Search returned no results..."
 msgstr "La recherche n'a renvoyé aucun résultat..."
 
+#~ 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."
+
+#~ msgid "Filters"
+#~ msgstr "Filtres"
+
+#~ msgid "Display macros matching"
+#~ msgstr "Afficher les macros correspondantes"
+
+#~ msgid "Display macros  matching"
+#~ msgstr "Afficher les macros correspondantes"
+
+#~ msgid "Regular expression for matching macro names"
+#~ msgstr "Expression régulière correspondant à des noms de macro"
+
+#~ 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 ""
+#~ "Cela peut être utilisé par plusieurs groupes. 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."
+
+#~ msgid "Select all"
+#~ msgstr "Sélectionner tout"
+
+#~ msgid "Department"
+#~ msgstr "Département"
+
+#~ msgid "Visible"
+#~ msgstr "Visible"
+
+#~ msgid "Submit department"
+#~ msgstr "Soumettre le département"
+
+#~ msgid "visible"
+#~ msgstr "visible"
+
+#~ msgid "invisible"
+#~ msgstr "invisible"
+
+#~ msgid "edit"
+#~ msgstr "éditer"
+
+#~ msgid "Edit macro"
+#~ msgstr "Editer une macro"
+
+#~ msgid "delete"
+#~ msgstr "supprimer"
+
+#~ msgid "Delete macro"
+#~ msgstr "Supprimer une macro"
+
+#~ msgid "Number of listed %s"
+#~ msgstr "Nombre de '%s' listés"
+
+#~ msgid "macros"
+#~ msgstr "macros"
+
+#~ msgid "departments"
+#~ msgstr "Départements"
+
+#~ msgid "Phone macros"
+#~ msgstr "Macros téléphoniques"
+
+#~ msgid "Permission"
+#~ msgstr "Permissions"
+
+#~ msgid "Permission error"
+#~ msgstr "Erreur de permissions"
+
+#~ msgid "macro"
+#~ msgstr "macro"
+
+#~ 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."
+
+#~ msgid "Display users matching"
+#~ msgstr "Afficher les utilisateurs correspondants"
+
+#~ msgid "Regular expression for        matching user names"
+#~ msgstr "Expression régulière concordant avec les noms des utilisateurs"
+
+#~ msgid ""
+#~ "This includes 'all' accounts, systems, etc. in this subtree. Please "
+#~ "double check if your really want to do this since there is no way for "
+#~ "GOsa to get your data back."
+#~ msgstr ""
+#~ "Ceci inclus tous les comptes systèmes, etc... dans cette branche. "
+#~ "Veuillez vérifier si vous voulez réaliser cette opération étant donné "
+#~ "qu'il est impossible pour GOsa de récupérer vos données."
+
+#~ 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."
+
+#~ msgid "Phone conferences"
+#~ msgstr "Conférences téléphoniques"
+
+#~ msgid "Management"
+#~ msgstr "Gestion"
+
+#~ msgid "conference"
+#~ msgstr "Conférence"
+
+#~ msgid "You have not permission to delete this entry!"
+#~ msgstr ""
+#~ "Vous n'avez pas les droits nécessaires pour supprimer cette entrée !"
+
+#~ msgid "Regular expression for matching conference names"
+#~ msgstr "Expression régulière concordant avec les noms des conférences"
+
+#~ msgid "Edit this entry"
+#~ msgstr "Editer cette entrée"
+
+#~ msgid "Delete this entry"
+#~ msgstr "Supprimer cette entrée"
+
+#~ msgid "Unknown"
+#~ msgstr "Inconnu"
+
+#~ msgid "Number of listed '%s'"
+#~ msgstr "Nombre de '%s' listés"
diff --git a/gosa-plugins/gofon/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/it/LC_MESSAGES/messages.po
index 1f94de51f..221bf259b 100644
--- a/gosa-plugins/gofon/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 16:06+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -57,7 +57,7 @@ msgstr "Opzioni"
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1413
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1788
 #: gofon/phoneaccount/class_phoneAccount.inc:1413
-#: gofon/phoneaccount/class_phoneAccount.inc:1788
+#: gofon/phoneaccount/class_phoneAccount.inc:1809
 #: gofon/conference/generic.tpl:68
 #: gofon/conference/class_phoneConferenceGeneric.inc:853
 #, fuzzy
@@ -270,7 +270,6 @@ msgstr "Impostazioni FAX"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:323
 #: gofon/conference/class_phoneConferenceGeneric.inc:392
-#: gofon/conference/class_divListConferences.inc:56
 #, fuzzy
 msgid "Number"
 msgstr "Nome - Numero"
@@ -289,10 +288,10 @@ msgstr "Data"
 #: gofon/phoneaccount/class_phoneAccount.inc:431
 #: gofon/phoneaccount/class_phoneAccount.inc:1109
 #: gofon/conference/class_phoneConferenceGeneric.inc:430
-#: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:176
-#: gofon/fonreports/class_fonreport.inc:180
-#: gofon/fonreports/class_fonreport.inc:198
+#: gofon/fonreports/class_fonreport.inc:196
+#: gofon/fonreports/class_fonreport.inc:200
+#: gofon/fonreports/class_fonreport.inc:217
 #, fuzzy
 msgid "GOfon"
 msgstr "Rapporti telefono"
@@ -337,16 +336,16 @@ msgstr "Numero di telefono"
 #: gofon/phoneaccount/class_phoneAccount.inc:1211
 #: gofon/phoneaccount/class_phoneAccount.inc:1217
 #: gofon/phoneaccount/class_phoneAccount.inc:1431
-#: gofon/phoneaccount/class_phoneAccount.inc:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1571
-#: gofon/phoneaccount/class_phoneAccount.inc:1581
-#: gofon/phoneaccount/class_phoneAccount.inc:1628
+#: gofon/phoneaccount/class_phoneAccount.inc:1513
+#: gofon/phoneaccount/class_phoneAccount.inc:1592
+#: gofon/phoneaccount/class_phoneAccount.inc:1602
+#: gofon/phoneaccount/class_phoneAccount.inc:1649
 #: gofon/conference/class_phoneConferenceGeneric.inc:260
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #: gofon/conference/class_phoneConferenceGeneric.inc:618
-#: gofon/fonreports/class_fonreport.inc:176
-#: gofon/fonreports/class_fonreport.inc:180
-#: gofon/fonreports/class_fonreport.inc:198
+#: gofon/fonreports/class_fonreport.inc:196
+#: gofon/fonreports/class_fonreport.inc:200
+#: gofon/fonreports/class_fonreport.inc:217
 msgid "Error"
 msgstr ""
 
@@ -362,14 +361,15 @@ msgstr ""
 #: gofon/macro/class_gofonMacro.inc:526
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
-#: gofon/phoneaccount/class_phoneAccount.inc:1518
-#: gofon/phoneaccount/class_phoneAccount.inc:1689
+#: gofon/phoneaccount/class_phoneAccount.inc:1539
+#: gofon/phoneaccount/class_phoneAccount.inc:1710
 #: gofon/conference/class_phoneConferenceGeneric.inc:789
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:901
+#: gofon/phoneaccount/class_phoneAccount.inc:1457
 #: gofon/conference/generic.tpl:120 gofon/conference/paste_generic.tpl:15
 msgid "Phone number"
 msgstr "Numero di telefono"
@@ -387,7 +387,7 @@ msgstr "Numero di telefono"
 #: gofon/phoneaccount/class_phoneAccount.inc:1072
 #: gofon/phoneaccount/class_phoneAccount.inc:1076
 #: gofon/phoneaccount/class_phoneAccount.inc:1079
-#: gofon/phoneaccount/class_phoneAccount.inc:1773
+#: gofon/phoneaccount/class_phoneAccount.inc:1794
 msgid "Phone"
 msgstr "Telefono"
 
@@ -644,10 +644,10 @@ msgstr "Numero di telefono"
 
 #: admin/systems/gofon/phone.tpl:17
 #: admin/systems/gofon/class_phoneGeneric.inc:517
-#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/class_divListMacros.inc:79
-#: gofon/macro/generic.tpl:27 gofon/conference/generic.tpl:49
+#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/generic.tpl:27
+#: gofon/macro/macro-list.tpl:13 gofon/conference/generic.tpl:49
 #: gofon/conference/class_phoneConferenceGeneric.inc:847
-#: gofon/conference/class_divListConferences.inc:83
+#: gofon/conference/conf-list.tpl:13
 msgid "Base"
 msgstr "Base"
 
@@ -664,7 +664,8 @@ msgstr "Rimuovi"
 #: admin/systems/gofon/phone.tpl:34
 #: admin/systems/gofon/class_phoneGeneric.inc:518
 #: gofon/macro/class_gofonMacro.inc:574 gofon/macro/generic.tpl:49
-#: gofon/conference/generic.tpl:98
+#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:98
+#: gofon/conference/conf-list.xml:49
 #: gofon/conference/class_phoneConferenceGeneric.inc:848
 msgid "Description"
 msgstr "Descrizione"
@@ -675,13 +676,11 @@ msgid "phone"
 msgstr "Telefono"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:235
-#: gofon/macro/class_divListMacros.inc:121
 #, fuzzy
 msgid "yes"
 msgstr "Sistemi"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:235
-#: gofon/macro/class_divListMacros.inc:122
 #, fuzzy
 msgid "no"
 msgstr "nessuno"
@@ -713,11 +712,11 @@ msgstr "CAP"
 #: admin/systems/gofon/class_phoneGeneric.inc:362
 #: admin/systems/gofon/class_phoneGeneric.inc:516
 #: gofon/macro/class_gofonMacro.inc:406 gofon/macro/class_gofonMacro.inc:412
-#: gofon/macro/class_divListMacros.inc:56 gofon/macro/parameter.tpl:6
+#: gofon/macro/macro-list.xml:41 gofon/macro/parameter.tpl:6
+#: gofon/conference/conf-list.xml:41
 #: gofon/conference/class_phoneConferenceGeneric.inc:388
 #: gofon/conference/class_phoneConferenceGeneric.inc:410
 #: gofon/conference/class_phoneConferenceGeneric.inc:846
-#: gofon/conference/class_divListConferences.inc:56
 msgid "Name"
 msgstr "Cognome"
 
@@ -733,7 +732,7 @@ msgstr "Numero di telefono"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:513
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
-#: gofon/phoneaccount/class_phoneAccount.inc:1787
+#: gofon/phoneaccount/class_phoneAccount.inc:1808
 #, fuzzy
 msgid "Phone hardware"
 msgstr "Dispositivo telefonico"
@@ -792,49 +791,6 @@ msgstr ""
 msgid "Hardware type"
 msgstr ""
 
-#: gofon/macro/headpage.tpl:6 gofon/macro/class_divListMacros.inc:31
-#: gofon/macro/class_divListMacros.inc:32
-#, fuzzy
-msgid "List of macros"
-msgstr "Lista dei gruppi"
-
-#: gofon/macro/headpage.tpl:20 gofon/macro/class_gofonMacroParameters.inc:374
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1680
-#: gofon/conference/headpage.tpl:20
-msgid "Information"
-msgstr "Informazioni"
-
-#: 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."
-
-#: gofon/macro/headpage.tpl:29 gofon/conference/headpage.tpl:29
-msgid "Filters"
-msgstr "Filtri"
-
-#: gofon/macro/headpage.tpl:38
-#, fuzzy
-msgid "Display macros matching"
-msgstr "Mosra gruppi corrispondenti a"
-
-#: gofon/macro/headpage.tpl:38
-#, fuzzy
-msgid "Display macros  matching"
-msgstr "Mosra gruppi corrispondenti a"
-
-#: gofon/macro/headpage.tpl:41 gofon/macro/class_divListMacros.inc:64
-#, fuzzy
-msgid "Regular expression for matching macro names"
-msgstr "Espressioni regolare per selezionare il nome del gruppo"
-
 #: gofon/macro/remove.tpl:2 gofon/phoneaccount/.svn/tmp/tempfile.tmp:328
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:611
@@ -845,20 +801,20 @@ msgstr "Espressioni regolare per selezionare il nome del gruppo"
 #: gofon/phoneaccount/class_phoneAccount.inc:342
 #: gofon/phoneaccount/class_phoneAccount.inc:611
 #: gofon/phoneaccount/class_phoneAccount.inc:677
-#: gofon/phoneaccount/class_phoneAccount.inc:1561
-#: gofon/phoneaccount/class_phoneAccount.inc:1938
+#: gofon/phoneaccount/class_phoneAccount.inc:1582
+#: gofon/phoneaccount/class_phoneAccount.inc:1959
 #: gofon/conference/remove.tpl:2
 #: gofon/conference/class_phoneConferenceGeneric.inc:463
 msgid "Warning"
 msgstr "Attenzione"
 
-#: gofon/macro/remove.tpl:6
+#: gofon/macro/remove.tpl:6 gofon/conference/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."
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
 msgstr ""
 
-#: gofon/macro/remove.tpl:9
+#: gofon/macro/remove.tpl:10 gofon/conference/remove.tpl:10
 #, fuzzy
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
@@ -898,6 +854,12 @@ msgstr ""
 msgid "Parameter %s is invalid!"
 msgstr "Il valore specificato per l'UID non è valido."
 
+#: gofon/macro/class_gofonMacroParameters.inc:374
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1701
+msgid "Information"
+msgstr "Informazioni"
+
 #: gofon/macro/class_gofonMacroParameters.inc:374
 msgid ""
 "Number of parameters for this macro has changed. Please update all users "
@@ -936,9 +898,9 @@ msgstr "Nome gruppo"
 #: gofon/phoneaccount/class_phoneAccount.inc:431
 #: gofon/phoneaccount/class_phoneAccount.inc:439
 #: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:1647
-#: gofon/fonreports/class_fonreport.inc:166
-#: gofon/fonreports/class_fonreport.inc:169
+#: gofon/phoneaccount/class_phoneAccount.inc:1668
+#: gofon/fonreports/class_fonreport.inc:176
+#: gofon/fonreports/class_fonreport.inc:179
 #, fuzzy
 msgid "Configuration error"
 msgstr "File di configurazione"
@@ -973,101 +935,6 @@ msgstr "Nome gruppo"
 msgid "Visibility flag"
 msgstr ""
 
-#: gofon/macro/class_divListMacros.inc:50
-#: gofon/conference/class_divListConferences.inc:50
-#, fuzzy
-msgid "Select all"
-msgstr "Rimuovi"
-
-#: gofon/macro/class_divListMacros.inc:56
-msgid "Department"
-msgstr "Dipartimento"
-
-#: gofon/macro/class_divListMacros.inc:57
-#, fuzzy
-msgid "Visible"
-msgstr "disabilitato"
-
-#: gofon/macro/class_divListMacros.inc:58
-#: gofon/macro/class_divListMacros.inc:84
-#: gofon/conference/class_divListConferences.inc:59
-#: gofon/conference/class_divListConferences.inc:88
-msgid "Actions"
-msgstr "Azioni"
-
-#: gofon/macro/class_divListMacros.inc:81
-#: gofon/conference/class_divListConferences.inc:85
-msgid "Submit department"
-msgstr "Imposta dipartimento"
-
-#: gofon/macro/class_divListMacros.inc:81
-#: gofon/conference/class_divListConferences.inc:85
-msgid "Submit"
-msgstr ""
-
-#: gofon/macro/class_divListMacros.inc:89
-#: gofon/conference/class_divListConferences.inc:93
-msgid "Create"
-msgstr "Creare"
-
-#: gofon/macro/class_divListMacros.inc:91
-#: gofon/macro/class_divListMacros.inc:120
-#, fuzzy
-msgid "Macro"
-msgstr "Nome gruppo"
-
-#: gofon/macro/class_divListMacros.inc:97
-#: gofon/conference/class_divListConferences.inc:101
-msgid "Remove"
-msgstr "Rimuovi"
-
-#: gofon/macro/class_divListMacros.inc:121
-#, fuzzy
-msgid "visible"
-msgstr "Pubblico"
-
-#: gofon/macro/class_divListMacros.inc:122
-#, fuzzy
-msgid "invisible"
-msgstr "Pubblico"
-
-#: gofon/macro/class_divListMacros.inc:146
-#: gofon/conference/class_divListConferences.inc:150
-msgid "edit"
-msgstr "modifica"
-
-#: gofon/macro/class_divListMacros.inc:147
-#, fuzzy
-msgid "Edit macro"
-msgstr "Modifica contatto"
-
-#: gofon/macro/class_divListMacros.inc:153
-#: gofon/conference/class_divListConferences.inc:158
-msgid "delete"
-msgstr "elimina"
-
-#: gofon/macro/class_divListMacros.inc:154
-#, fuzzy
-msgid "Delete macro"
-msgstr "Rimuovi"
-
-#: gofon/macro/class_divListMacros.inc:202
-#: gofon/macro/class_divListMacros.inc:203
-#, fuzzy, php-format
-msgid "Number of listed %s"
-msgstr "Rimuovi"
-
-#: gofon/macro/class_divListMacros.inc:202
-#, fuzzy
-msgid "macros"
-msgstr "Nome gruppo"
-
-#: gofon/macro/class_divListMacros.inc:203
-#: gofon/conference/class_divListConferences.inc:226
-#, fuzzy
-msgid "departments"
-msgstr "Dipartimento"
-
 #: gofon/macro/generic.tpl:18
 msgid "Macro name to be displayed"
 msgstr ""
@@ -1082,37 +949,45 @@ msgstr "Lista degli utenti"
 msgid "Macro text"
 msgstr "Nome gruppo"
 
-#: gofon/macro/class_gofonMacroManagement.inc:24
-msgid "Phone macros"
-msgstr "Macro telefiche"
-
-#: gofon/macro/class_gofonMacroManagement.inc:25
-#: gofon/phoneaccount/class_phoneAccount.inc:7
-#: gofon/fonreports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Questo fa qualcosa"
-
-#: gofon/macro/class_gofonMacroManagement.inc:273
-#: gofon/conference/class_phoneConferenceManagment.inc:187
+#: gofon/macro/macro-list.xml:11
 #, fuzzy
-msgid "Permission"
-msgstr "Permessi"
+msgid "List of macros"
+msgstr "Lista dei gruppi"
 
-#: gofon/macro/class_gofonMacroManagement.inc:320
-#: gofon/macro/class_gofonMacroManagement.inc:373
-#: gofon/macro/class_gofonMacroManagement.inc:397
-#: gofon/conference/class_phoneConferenceManagment.inc:228
-#: gofon/conference/class_phoneConferenceManagment.inc:288
+#: gofon/macro/macro-list.xml:15 gofon/macro/macro-list.xml:74
 #, fuzzy
-msgid "Permission error"
-msgstr "Permessi"
+msgid "Macro"
+msgstr "Nome gruppo"
+
+#: gofon/macro/macro-list.xml:57 gofon/conference/conf-list.xml:57
+msgid "Actions"
+msgstr "Azioni"
+
+#: gofon/macro/macro-list.xml:68 gofon/conference/conf-list.xml:68
+msgid "Create"
+msgstr "Creare"
+
+#: gofon/macro/macro-list.xml:86 gofon/macro/macro-list.xml:125
+#: gofon/conference/conf-list.xml:86 gofon/conference/conf-list.xml:125
+msgid "Edit"
+msgstr "Modifica"
+
+#: gofon/macro/macro-list.xml:93 gofon/macro/macro-list.xml:138
+#: gofon/conference/conf-list.xml:93 gofon/conference/conf-list.xml:138
+msgid "Remove"
+msgstr "Rimuovi"
+
+#: gofon/macro/macro-filter.tpl:3 gofon/conference/conf-filter.tpl:3
+#: gofon/fonreports/contents.tpl:2
+msgid "Filter"
+msgstr "Filtro"
 
-#: gofon/macro/class_gofonMacroManagement.inc:366
+#: gofon/macro/class_gofonMacroManagement.inc:25
 #, fuzzy
-msgid "macro"
+msgid "Macros"
 msgstr "Nome gruppo"
 
-#: gofon/macro/main.inc:51 gofon/macro/main.inc:55
+#: gofon/macro/class_gofonMacroManagement.inc:26
 #, fuzzy
 msgid "Phone macro management"
 msgstr "Dirigenza"
@@ -1137,6 +1012,14 @@ msgstr "Rimuovi"
 msgid "You are not allowed to view the macro parameter settings"
 msgstr "Non hai il permesso di cambiare la tua password."
 
+#: gofon/macro/macro-list.tpl:13 gofon/conference/conf-list.tpl:13
+msgid "Update"
+msgstr ""
+
+#: gofon/macro/macro-list.tpl:13 gofon/conference/conf-list.tpl:13
+msgid "Submit"
+msgstr ""
+
 #: gofon/phoneaccount/generic.tpl:42 gofon/phoneaccount/paste_generic.tpl:27
 msgid "Telephone hardware"
 msgstr "Dispositivo telefonico"
@@ -1230,7 +1113,7 @@ msgstr ""
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1562
 #: gofon/phoneaccount/class_phoneAccount.inc:612
 #: gofon/phoneaccount/class_phoneAccount.inc:678
-#: gofon/phoneaccount/class_phoneAccount.inc:1562
+#: gofon/phoneaccount/class_phoneAccount.inc:1583
 #, php-format
 msgid "GOsa identified problems with your MySQL table definition!"
 msgstr ""
@@ -1240,7 +1123,7 @@ msgstr ""
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1630
 #: gofon/phoneaccount/class_phoneAccount.inc:651
 #: gofon/phoneaccount/class_phoneAccount.inc:973
-#: gofon/phoneaccount/class_phoneAccount.inc:1630
+#: gofon/phoneaccount/class_phoneAccount.inc:1651
 #: gofon/conference/class_phoneConferenceGeneric.inc:620
 msgid "Please activate debugging for details!"
 msgstr ""
@@ -1291,32 +1174,32 @@ msgid "Between 1-4 charactes"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
-#: gofon/phoneaccount/class_phoneAccount.inc:1444
+#: gofon/phoneaccount/class_phoneAccount.inc:1465
 #, fuzzy, php-format
 msgid "macro parameter %s"
 msgstr "Nome gruppo"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1513
 msgid "An error occured while updating the database entries!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1701
 #, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
-#: gofon/phoneaccount/class_phoneAccount.inc:1717
-#: gofon/phoneaccount/class_phoneAccount.inc:1719
+#: gofon/phoneaccount/class_phoneAccount.inc:1738
+#: gofon/phoneaccount/class_phoneAccount.inc:1740
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
-#: gofon/phoneaccount/class_phoneAccount.inc:1765
+#: gofon/phoneaccount/class_phoneAccount.inc:1786
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -1324,80 +1207,80 @@ msgid ""
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
-#: gofon/phoneaccount/class_phoneAccount.inc:1774
+#: gofon/phoneaccount/class_phoneAccount.inc:1795
 #, fuzzy
 msgid "Phone account settings"
 msgstr "Opzioni di posta dell'identità"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
-#: gofon/phoneaccount/class_phoneAccount.inc:1778
+#: gofon/phoneaccount/class_phoneAccount.inc:1799
 msgid "My account"
 msgstr "Identità"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
-#: gofon/phoneaccount/class_phoneAccount.inc:1785
+#: gofon/phoneaccount/class_phoneAccount.inc:1806
 #: gofon/conference/class_phoneConferenceGeneric.inc:864
 #, fuzzy
 msgid "Telephone number"
 msgstr "Numero di telefono"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1807
 #, fuzzy
 msgid "Macro settings"
 msgstr "Opzioni di posta dell'identità"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
-#: gofon/phoneaccount/class_phoneAccount.inc:1789
+#: gofon/phoneaccount/class_phoneAccount.inc:1810
 #, fuzzy
 msgid "Phone context"
 msgstr "Telefono"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
-#: gofon/phoneaccount/class_phoneAccount.inc:1790
+#: gofon/phoneaccount/class_phoneAccount.inc:1811
 msgid "Voice mail context"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
-#: gofon/phoneaccount/class_phoneAccount.inc:1791
+#: gofon/phoneaccount/class_phoneAccount.inc:1812
 #, fuzzy
 msgid "Telephone pin"
 msgstr "Telefono"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
-#: gofon/phoneaccount/class_phoneAccount.inc:1792
+#: gofon/phoneaccount/class_phoneAccount.inc:1813
 msgid "Voicemail pin"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
-#: gofon/phoneaccount/class_phoneAccount.inc:1874
+#: gofon/phoneaccount/class_phoneAccount.inc:1895
 msgid "There is currently no asterisk server defined!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
-#: gofon/phoneaccount/class_phoneAccount.inc:1878
+#: gofon/phoneaccount/class_phoneAccount.inc:1899
 msgid "Asterisk server is invalid!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
-#: gofon/phoneaccount/class_phoneAccount.inc:1884
+#: gofon/phoneaccount/class_phoneAccount.inc:1905
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
-#: gofon/phoneaccount/class_phoneAccount.inc:1887
+#: gofon/phoneaccount/class_phoneAccount.inc:1908
 #, fuzzy
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
-#: gofon/phoneaccount/class_phoneAccount.inc:1892
+#: gofon/phoneaccount/class_phoneAccount.inc:1913
 #, fuzzy
 msgid "Phone pin contains invalid characters!"
 msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
-#: gofon/phoneaccount/class_phoneAccount.inc:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1920
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
@@ -1408,66 +1291,20 @@ msgstr ""
 "Click sul bottone 'Modifica' qui sotto per cambiare le informazioni in "
 "questo dialogo"
 
-#: gofon/conference/headpage.tpl:6
-#: gofon/conference/class_divListConferences.inc:31
-#: gofon/conference/class_divListConferences.inc:32
-#, fuzzy
-msgid "List of conference rooms"
-msgstr "Lista dei gruppi"
-
-#: 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 ""
-"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."
-
-#: gofon/conference/headpage.tpl:35
-msgid "Display users matching"
-msgstr "Mostra utenti che corrispondono a"
-
-#: gofon/conference/headpage.tpl:36
-#, fuzzy
-msgid "Regular expression for        matching user names"
-msgstr "Espressioni regolare per selezionare il nome del gruppo"
-
-#: gofon/conference/remove.tpl:6
-msgid ""
-"This includes 'all' accounts, systems, etc. in this subtree. Please double "
-"check if your really want to do this since there is no way for GOsa to get "
-"your data back."
-msgstr ""
-
-#: 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 ""
-
-#: gofon/conference/class_phoneConferenceManagment.inc:24
-msgid "Phone conferences"
-msgstr "Conferenze telefoniche"
+#: gofon/phoneaccount/class_phoneAccount.inc:7
+#: gofon/fonreports/class_fonreport.inc:7
+msgid "This does something"
+msgstr "Questo fa qualcosa"
 
 #: gofon/conference/class_phoneConferenceManagment.inc:25
-msgid "Management"
-msgstr "Dirigenza"
-
-#: gofon/conference/class_phoneConferenceManagment.inc:206
-#: gofon/conference/class_phoneConferenceManagment.inc:267
 #, fuzzy
-msgid "conference"
+msgid "conferences"
 msgstr "Conferenza"
 
-#: gofon/conference/class_phoneConferenceManagment.inc:228
-#: gofon/conference/class_phoneConferenceManagment.inc:288
+#: gofon/conference/class_phoneConferenceManagment.inc:26
 #, fuzzy
-msgid "You have not permission to delete this entry!"
-msgstr "Non hai il permesso di cambiare la tua password."
+msgid "Conference management"
+msgstr "Riferimenti"
 
 #: gofon/conference/generic.tpl:5
 msgid "Properties"
@@ -1513,7 +1350,6 @@ msgstr "presente"
 
 #: gofon/conference/generic.tpl:165
 #: gofon/conference/class_phoneConferenceGeneric.inc:384
-#: gofon/conference/class_divListConferences.inc:58
 msgid "PIN"
 msgstr ""
 
@@ -1550,6 +1386,16 @@ msgstr ""
 msgid "Count users"
 msgstr "Paese"
 
+#: gofon/conference/conf-list.xml:11
+#, fuzzy
+msgid "List of conference rooms"
+msgstr "Lista dei gruppi"
+
+#: gofon/conference/conf-list.xml:15 gofon/conference/conf-list.xml:74
+#: gofon/conference/class_phoneConferenceGeneric.inc:836
+msgid "Conference"
+msgstr "Conferenza"
+
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #, php-format
 msgid "Cannot delete entry from server '%s' because it seems to be removed!"
@@ -1579,12 +1425,6 @@ msgstr ""
 msgid "'%s' is already assigned to '%s'!"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:836
-#: gofon/conference/class_divListConferences.inc:95
-#: gofon/conference/class_divListConferences.inc:208
-msgid "Conference"
-msgstr "Conferenza"
-
 #: gofon/conference/class_phoneConferenceGeneric.inc:837
 #, fuzzy
 msgid "Phone conference management"
@@ -1625,102 +1465,64 @@ msgid "Format"
 msgstr "Informazioni"
 
 #: gofon/conference/class_phoneConferenceGeneric.inc:865
-#: gofon/conference/class_divListConferences.inc:57
 msgid "Owner"
 msgstr ""
 
-#: gofon/conference/main.inc:48 gofon/conference/main.inc:50
-#, fuzzy
-msgid "Conference management"
-msgstr "Riferimenti"
-
-#: gofon/conference/class_divListConferences.inc:65
-#, fuzzy
-msgid "Regular expression for matching conference names"
-msgstr "Espressioni regolare per selezionare il nome del gruppo"
-
-#: gofon/conference/class_divListConferences.inc:150
-msgid "Edit this entry"
-msgstr "Modifica questo record"
-
-#: gofon/conference/class_divListConferences.inc:158
-msgid "Delete this entry"
-msgstr "Elimina questo record"
-
-#: gofon/conference/class_divListConferences.inc:185
-msgid "Unknown"
-msgstr ""
-
-#: gofon/conference/class_divListConferences.inc:225
-#: gofon/conference/class_divListConferences.inc:226
-#, fuzzy, php-format
-msgid "Number of listed '%s'"
-msgstr "Rimuovi"
-
-#: gofon/conference/class_divListConferences.inc:225
-#, fuzzy
-msgid "conferences"
-msgstr "Conferenza"
-
 #: gofon/fonreports/class_fonreport.inc:6
 msgid "Phone Reports"
 msgstr "Rapporti telefono"
 
-#: gofon/fonreports/class_fonreport.inc:210
+#: gofon/fonreports/class_fonreport.inc:229
 #, fuzzy
 msgid "Insufficient permissions"
 msgstr "Permessi"
 
-#: gofon/fonreports/class_fonreport.inc:229
+#: gofon/fonreports/class_fonreport.inc:248
 msgid "Y-M-D"
 msgstr ""
 
-#: gofon/fonreports/class_fonreport.inc:396
-#: gofon/fonreports/class_fonreport.inc:397
-#: gofon/fonreports/class_fonreport.inc:404 gofon/fonreports/main.inc:22
+#: gofon/fonreports/class_fonreport.inc:415
+#: gofon/fonreports/class_fonreport.inc:416
+#: gofon/fonreports/class_fonreport.inc:423 gofon/fonreports/main.inc:22
 msgid "Phone reports"
 msgstr "Rapporti telefono"
 
-#: gofon/fonreports/class_fonreport.inc:397
+#: gofon/fonreports/class_fonreport.inc:416
 #, fuzzy
 msgid "All entries are readonly"
 msgstr "Tutti i campi sono scrivibili"
 
-#: gofon/fonreports/class_fonreport.inc:409 gofon/fonreports/contents.tpl:30
+#: gofon/fonreports/class_fonreport.inc:428 gofon/fonreports/contents.tpl:34
 msgid "Date"
 msgstr "Data"
 
-#: gofon/fonreports/class_fonreport.inc:410 gofon/fonreports/contents.tpl:31
+#: gofon/fonreports/class_fonreport.inc:429 gofon/fonreports/contents.tpl:35
 msgid "Source"
 msgstr "Sorgente"
 
-#: gofon/fonreports/class_fonreport.inc:411 gofon/fonreports/contents.tpl:32
+#: gofon/fonreports/class_fonreport.inc:430 gofon/fonreports/contents.tpl:36
 msgid "Destination"
 msgstr "Destinazione"
 
-#: gofon/fonreports/class_fonreport.inc:412 gofon/fonreports/contents.tpl:33
+#: gofon/fonreports/class_fonreport.inc:431 gofon/fonreports/contents.tpl:37
 #, fuzzy
 msgid "Channel"
 msgstr "Annulla"
 
-#: gofon/fonreports/class_fonreport.inc:413
+#: gofon/fonreports/class_fonreport.inc:432
 #, fuzzy
 msgid "Application called"
 msgstr "Nome applicazione"
 
-#: gofon/fonreports/class_fonreport.inc:414
+#: gofon/fonreports/class_fonreport.inc:433
 #, fuzzy
 msgid "Disposition"
 msgstr "Disconnessione "
 
-#: gofon/fonreports/class_fonreport.inc:415 gofon/fonreports/contents.tpl:36
+#: gofon/fonreports/class_fonreport.inc:434 gofon/fonreports/contents.tpl:40
 msgid "Duration"
 msgstr "Durata"
 
-#: gofon/fonreports/contents.tpl:2
-msgid "Filter"
-msgstr "Filtro"
-
 #: gofon/fonreports/contents.tpl:6
 msgid "Search for"
 msgstr "Cerca"
@@ -1729,7 +1531,7 @@ msgstr "Cerca"
 msgid "Enter user name to search for"
 msgstr ""
 
-#: gofon/fonreports/contents.tpl:8 gofon/fonreports/contents.tpl:16
+#: gofon/fonreports/contents.tpl:8 gofon/fonreports/contents.tpl:20
 #, fuzzy
 msgid "in"
 msgstr "Principale"
@@ -1741,25 +1543,168 @@ msgstr "Scegli il subtree per l'utente"
 
 #: gofon/fonreports/contents.tpl:12
 #, fuzzy
+msgid "on"
+msgstr "Dominio"
+
+#: gofon/fonreports/contents.tpl:13
+#, fuzzy
+msgid "Select server to search on"
+msgstr "Scegli il subtree per l'utente"
+
+#: gofon/fonreports/contents.tpl:16
+#, fuzzy
 msgid "during"
 msgstr "Attenzione"
 
-#: gofon/fonreports/contents.tpl:21
+#: gofon/fonreports/contents.tpl:25
 msgid "Search"
 msgstr "Cerca"
 
-#: gofon/fonreports/contents.tpl:34
+#: gofon/fonreports/contents.tpl:38
 msgid "Application"
 msgstr "Applicazione"
 
-#: gofon/fonreports/contents.tpl:35
+#: gofon/fonreports/contents.tpl:39
 msgid "Status"
 msgstr "Stato"
 
-#: gofon/fonreports/contents.tpl:51
+#: gofon/fonreports/contents.tpl:55
 msgid "Search returned no results..."
 msgstr ""
 
+#, 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."
+
+#~ msgid "Filters"
+#~ msgstr "Filtri"
+
+#, fuzzy
+#~ msgid "Display macros matching"
+#~ msgstr "Mosra gruppi corrispondenti a"
+
+#, fuzzy
+#~ msgid "Display macros  matching"
+#~ msgstr "Mosra gruppi corrispondenti a"
+
+#, fuzzy
+#~ msgid "Regular expression for matching macro names"
+#~ msgstr "Espressioni regolare per selezionare il nome del gruppo"
+
+#, fuzzy
+#~ msgid "Select all"
+#~ msgstr "Rimuovi"
+
+#~ msgid "Department"
+#~ msgstr "Dipartimento"
+
+#, fuzzy
+#~ msgid "Visible"
+#~ msgstr "disabilitato"
+
+#~ msgid "Submit department"
+#~ msgstr "Imposta dipartimento"
+
+#, fuzzy
+#~ msgid "visible"
+#~ msgstr "Pubblico"
+
+#, fuzzy
+#~ msgid "invisible"
+#~ msgstr "Pubblico"
+
+#~ msgid "edit"
+#~ msgstr "modifica"
+
+#, fuzzy
+#~ msgid "Edit macro"
+#~ msgstr "Modifica contatto"
+
+#~ msgid "delete"
+#~ msgstr "elimina"
+
+#, fuzzy
+#~ msgid "Delete macro"
+#~ msgstr "Rimuovi"
+
+#, fuzzy
+#~ msgid "Number of listed %s"
+#~ msgstr "Rimuovi"
+
+#, fuzzy
+#~ msgid "macros"
+#~ msgstr "Nome gruppo"
+
+#, fuzzy
+#~ msgid "departments"
+#~ msgstr "Dipartimento"
+
+#~ msgid "Phone macros"
+#~ msgstr "Macro telefiche"
+
+#, fuzzy
+#~ msgid "Permission"
+#~ msgstr "Permessi"
+
+#, fuzzy
+#~ msgid "Permission error"
+#~ msgstr "Permessi"
+
+#, fuzzy
+#~ msgid "macro"
+#~ msgstr "Nome gruppo"
+
+#, 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 ""
+#~ "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."
+
+#~ msgid "Display users matching"
+#~ msgstr "Mostra utenti che corrispondono a"
+
+#, fuzzy
+#~ msgid "Regular expression for        matching user names"
+#~ msgstr "Espressioni regolare per selezionare il nome del gruppo"
+
+#~ msgid "Phone conferences"
+#~ msgstr "Conferenze telefoniche"
+
+#~ msgid "Management"
+#~ msgstr "Dirigenza"
+
+#, fuzzy
+#~ msgid "conference"
+#~ msgstr "Conferenza"
+
+#, fuzzy
+#~ msgid "You have not permission to delete this entry!"
+#~ msgstr "Non hai il permesso di cambiare la tua password."
+
+#, fuzzy
+#~ msgid "Regular expression for matching conference names"
+#~ msgstr "Espressioni regolare per selezionare il nome del gruppo"
+
+#~ msgid "Edit this entry"
+#~ msgstr "Modifica questo record"
+
+#~ msgid "Delete this entry"
+#~ msgstr "Elimina questo record"
+
+#, fuzzy
+#~ msgid "Number of listed '%s'"
+#~ msgstr "Rimuovi"
+
 #~ msgid "Addons"
 #~ msgstr "Extra"
 
@@ -1873,9 +1818,6 @@ msgstr ""
 #~ msgid "Add"
 #~ msgstr "Aggiungi"
 
-#~ msgid "Edit"
-#~ msgstr "Modifica"
-
 #, fuzzy
 #~ msgid "You're about to delete the following macro(s) %s"
 #~ msgstr "Non hai il permesso di cambiare la tua password."
diff --git a/gosa-plugins/gofon/locale/messages.po b/gosa-plugins/gofon/locale/messages.po
index 74fb1e7ce..8cff6a80d 100644
--- a/gosa-plugins/gofon/locale/messages.po
+++ b/gosa-plugins/gofon/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 16:06+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,7 +55,7 @@ msgstr ""
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1413
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1788
 #: gofon/phoneaccount/class_phoneAccount.inc:1413
-#: gofon/phoneaccount/class_phoneAccount.inc:1788
+#: gofon/phoneaccount/class_phoneAccount.inc:1809
 #: gofon/conference/generic.tpl:68
 #: gofon/conference/class_phoneConferenceGeneric.inc:853
 msgid "Home server"
@@ -252,7 +252,6 @@ msgstr ""
 
 #: admin/ogroups/gofon/class_phonequeue.inc:323
 #: gofon/conference/class_phoneConferenceGeneric.inc:392
-#: gofon/conference/class_divListConferences.inc:56
 msgid "Number"
 msgstr ""
 
@@ -269,10 +268,10 @@ msgstr ""
 #: gofon/phoneaccount/class_phoneAccount.inc:431
 #: gofon/phoneaccount/class_phoneAccount.inc:1109
 #: gofon/conference/class_phoneConferenceGeneric.inc:430
-#: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:176
-#: gofon/fonreports/class_fonreport.inc:180
-#: gofon/fonreports/class_fonreport.inc:198
+#: gofon/fonreports/class_fonreport.inc:196
+#: gofon/fonreports/class_fonreport.inc:200
+#: gofon/fonreports/class_fonreport.inc:217
 msgid "GOfon"
 msgstr ""
 
@@ -313,16 +312,16 @@ msgstr ""
 #: gofon/phoneaccount/class_phoneAccount.inc:1211
 #: gofon/phoneaccount/class_phoneAccount.inc:1217
 #: gofon/phoneaccount/class_phoneAccount.inc:1431
-#: gofon/phoneaccount/class_phoneAccount.inc:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1571
-#: gofon/phoneaccount/class_phoneAccount.inc:1581
-#: gofon/phoneaccount/class_phoneAccount.inc:1628
+#: gofon/phoneaccount/class_phoneAccount.inc:1513
+#: gofon/phoneaccount/class_phoneAccount.inc:1592
+#: gofon/phoneaccount/class_phoneAccount.inc:1602
+#: gofon/phoneaccount/class_phoneAccount.inc:1649
 #: gofon/conference/class_phoneConferenceGeneric.inc:260
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #: gofon/conference/class_phoneConferenceGeneric.inc:618
-#: gofon/fonreports/class_fonreport.inc:176
-#: gofon/fonreports/class_fonreport.inc:180
-#: gofon/fonreports/class_fonreport.inc:198
+#: gofon/fonreports/class_fonreport.inc:196
+#: gofon/fonreports/class_fonreport.inc:200
+#: gofon/fonreports/class_fonreport.inc:217
 msgid "Error"
 msgstr ""
 
@@ -338,13 +337,14 @@ msgstr ""
 #: gofon/macro/class_gofonMacro.inc:526
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
-#: gofon/phoneaccount/class_phoneAccount.inc:1518
-#: gofon/phoneaccount/class_phoneAccount.inc:1689
+#: gofon/phoneaccount/class_phoneAccount.inc:1539
+#: gofon/phoneaccount/class_phoneAccount.inc:1710
 #: gofon/conference/class_phoneConferenceGeneric.inc:789
 msgid "LDAP error"
 msgstr ""
 
 #: admin/ogroups/gofon/class_phonequeue.inc:901
+#: gofon/phoneaccount/class_phoneAccount.inc:1457
 #: gofon/conference/generic.tpl:120 gofon/conference/paste_generic.tpl:15
 msgid "Phone number"
 msgstr ""
@@ -362,7 +362,7 @@ msgstr ""
 #: gofon/phoneaccount/class_phoneAccount.inc:1072
 #: gofon/phoneaccount/class_phoneAccount.inc:1076
 #: gofon/phoneaccount/class_phoneAccount.inc:1079
-#: gofon/phoneaccount/class_phoneAccount.inc:1773
+#: gofon/phoneaccount/class_phoneAccount.inc:1794
 msgid "Phone"
 msgstr ""
 
@@ -589,10 +589,10 @@ msgstr ""
 
 #: admin/systems/gofon/phone.tpl:17
 #: admin/systems/gofon/class_phoneGeneric.inc:517
-#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/class_divListMacros.inc:79
-#: gofon/macro/generic.tpl:27 gofon/conference/generic.tpl:49
+#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/generic.tpl:27
+#: gofon/macro/macro-list.tpl:13 gofon/conference/generic.tpl:49
 #: gofon/conference/class_phoneConferenceGeneric.inc:847
-#: gofon/conference/class_divListConferences.inc:83
+#: gofon/conference/conf-list.tpl:13
 msgid "Base"
 msgstr ""
 
@@ -608,7 +608,8 @@ msgstr ""
 #: admin/systems/gofon/phone.tpl:34
 #: admin/systems/gofon/class_phoneGeneric.inc:518
 #: gofon/macro/class_gofonMacro.inc:574 gofon/macro/generic.tpl:49
-#: gofon/conference/generic.tpl:98
+#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:98
+#: gofon/conference/conf-list.xml:49
 #: gofon/conference/class_phoneConferenceGeneric.inc:848
 msgid "Description"
 msgstr ""
@@ -618,12 +619,10 @@ msgid "phone"
 msgstr ""
 
 #: admin/systems/gofon/class_phoneGeneric.inc:235
-#: gofon/macro/class_divListMacros.inc:121
 msgid "yes"
 msgstr ""
 
 #: admin/systems/gofon/class_phoneGeneric.inc:235
-#: gofon/macro/class_divListMacros.inc:122
 msgid "no"
 msgstr ""
 
@@ -652,11 +651,11 @@ msgstr ""
 #: admin/systems/gofon/class_phoneGeneric.inc:362
 #: admin/systems/gofon/class_phoneGeneric.inc:516
 #: gofon/macro/class_gofonMacro.inc:406 gofon/macro/class_gofonMacro.inc:412
-#: gofon/macro/class_divListMacros.inc:56 gofon/macro/parameter.tpl:6
+#: gofon/macro/macro-list.xml:41 gofon/macro/parameter.tpl:6
+#: gofon/conference/conf-list.xml:41
 #: gofon/conference/class_phoneConferenceGeneric.inc:388
 #: gofon/conference/class_phoneConferenceGeneric.inc:410
 #: gofon/conference/class_phoneConferenceGeneric.inc:846
-#: gofon/conference/class_divListConferences.inc:56
 msgid "Name"
 msgstr ""
 
@@ -671,7 +670,7 @@ msgstr ""
 
 #: admin/systems/gofon/class_phoneGeneric.inc:513
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
-#: gofon/phoneaccount/class_phoneAccount.inc:1787
+#: gofon/phoneaccount/class_phoneAccount.inc:1808
 msgid "Phone hardware"
 msgstr ""
 
@@ -723,41 +722,6 @@ msgstr ""
 msgid "Hardware type"
 msgstr ""
 
-#: gofon/macro/headpage.tpl:6 gofon/macro/class_divListMacros.inc:31
-#: gofon/macro/class_divListMacros.inc:32
-msgid "List of macros"
-msgstr ""
-
-#: gofon/macro/headpage.tpl:20 gofon/macro/class_gofonMacroParameters.inc:374
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1680
-#: gofon/conference/headpage.tpl:20
-msgid "Information"
-msgstr ""
-
-#: 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 ""
-
-#: gofon/macro/headpage.tpl:29 gofon/conference/headpage.tpl:29
-msgid "Filters"
-msgstr ""
-
-#: gofon/macro/headpage.tpl:38
-msgid "Display macros matching"
-msgstr ""
-
-#: gofon/macro/headpage.tpl:38
-msgid "Display macros  matching"
-msgstr ""
-
-#: gofon/macro/headpage.tpl:41 gofon/macro/class_divListMacros.inc:64
-msgid "Regular expression for matching macro names"
-msgstr ""
-
 #: gofon/macro/remove.tpl:2 gofon/phoneaccount/.svn/tmp/tempfile.tmp:328
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:611
@@ -768,20 +732,20 @@ msgstr ""
 #: gofon/phoneaccount/class_phoneAccount.inc:342
 #: gofon/phoneaccount/class_phoneAccount.inc:611
 #: gofon/phoneaccount/class_phoneAccount.inc:677
-#: gofon/phoneaccount/class_phoneAccount.inc:1561
-#: gofon/phoneaccount/class_phoneAccount.inc:1938
+#: gofon/phoneaccount/class_phoneAccount.inc:1582
+#: gofon/phoneaccount/class_phoneAccount.inc:1959
 #: gofon/conference/remove.tpl:2
 #: gofon/conference/class_phoneConferenceGeneric.inc:463
 msgid "Warning"
 msgstr ""
 
-#: gofon/macro/remove.tpl:6
+#: gofon/macro/remove.tpl:6 gofon/conference/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."
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
 msgstr ""
 
-#: gofon/macro/remove.tpl:9
+#: gofon/macro/remove.tpl:10 gofon/conference/remove.tpl:10
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
@@ -816,6 +780,12 @@ msgstr ""
 msgid "Parameter %s is invalid!"
 msgstr ""
 
+#: gofon/macro/class_gofonMacroParameters.inc:374
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1701
+msgid "Information"
+msgstr ""
+
 #: gofon/macro/class_gofonMacroParameters.inc:374
 msgid ""
 "Number of parameters for this macro has changed. Please update all users "
@@ -852,9 +822,9 @@ msgstr ""
 #: gofon/phoneaccount/class_phoneAccount.inc:431
 #: gofon/phoneaccount/class_phoneAccount.inc:439
 #: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:1647
-#: gofon/fonreports/class_fonreport.inc:166
-#: gofon/fonreports/class_fonreport.inc:169
+#: gofon/phoneaccount/class_phoneAccount.inc:1668
+#: gofon/fonreports/class_fonreport.inc:176
+#: gofon/fonreports/class_fonreport.inc:179
 msgid "Configuration error"
 msgstr ""
 
@@ -884,132 +854,54 @@ msgstr ""
 msgid "Visibility flag"
 msgstr ""
 
-#: gofon/macro/class_divListMacros.inc:50
-#: gofon/conference/class_divListConferences.inc:50
-msgid "Select all"
+#: gofon/macro/generic.tpl:18
+msgid "Macro name to be displayed"
 msgstr ""
 
-#: gofon/macro/class_divListMacros.inc:56
-msgid "Department"
+#: gofon/macro/generic.tpl:60
+msgid "Visible for user"
 msgstr ""
 
-#: gofon/macro/class_divListMacros.inc:57
-msgid "Visible"
+#: gofon/macro/generic.tpl:70
+msgid "Macro text"
 msgstr ""
 
-#: gofon/macro/class_divListMacros.inc:58
-#: gofon/macro/class_divListMacros.inc:84
-#: gofon/conference/class_divListConferences.inc:59
-#: gofon/conference/class_divListConferences.inc:88
-msgid "Actions"
+#: gofon/macro/macro-list.xml:11
+msgid "List of macros"
 msgstr ""
 
-#: gofon/macro/class_divListMacros.inc:81
-#: gofon/conference/class_divListConferences.inc:85
-msgid "Submit department"
+#: gofon/macro/macro-list.xml:15 gofon/macro/macro-list.xml:74
+msgid "Macro"
 msgstr ""
 
-#: gofon/macro/class_divListMacros.inc:81
-#: gofon/conference/class_divListConferences.inc:85
-msgid "Submit"
+#: gofon/macro/macro-list.xml:57 gofon/conference/conf-list.xml:57
+msgid "Actions"
 msgstr ""
 
-#: gofon/macro/class_divListMacros.inc:89
-#: gofon/conference/class_divListConferences.inc:93
+#: gofon/macro/macro-list.xml:68 gofon/conference/conf-list.xml:68
 msgid "Create"
 msgstr ""
 
-#: gofon/macro/class_divListMacros.inc:91
-#: gofon/macro/class_divListMacros.inc:120
-msgid "Macro"
+#: gofon/macro/macro-list.xml:86 gofon/macro/macro-list.xml:125
+#: gofon/conference/conf-list.xml:86 gofon/conference/conf-list.xml:125
+msgid "Edit"
 msgstr ""
 
-#: gofon/macro/class_divListMacros.inc:97
-#: gofon/conference/class_divListConferences.inc:101
+#: gofon/macro/macro-list.xml:93 gofon/macro/macro-list.xml:138
+#: gofon/conference/conf-list.xml:93 gofon/conference/conf-list.xml:138
 msgid "Remove"
 msgstr ""
 
-#: gofon/macro/class_divListMacros.inc:121
-msgid "visible"
-msgstr ""
-
-#: gofon/macro/class_divListMacros.inc:122
-msgid "invisible"
-msgstr ""
-
-#: gofon/macro/class_divListMacros.inc:146
-#: gofon/conference/class_divListConferences.inc:150
-msgid "edit"
-msgstr ""
-
-#: gofon/macro/class_divListMacros.inc:147
-msgid "Edit macro"
-msgstr ""
-
-#: gofon/macro/class_divListMacros.inc:153
-#: gofon/conference/class_divListConferences.inc:158
-msgid "delete"
-msgstr ""
-
-#: gofon/macro/class_divListMacros.inc:154
-msgid "Delete macro"
-msgstr ""
-
-#: gofon/macro/class_divListMacros.inc:202
-#: gofon/macro/class_divListMacros.inc:203
-#, php-format
-msgid "Number of listed %s"
-msgstr ""
-
-#: gofon/macro/class_divListMacros.inc:202
-msgid "macros"
-msgstr ""
-
-#: gofon/macro/class_divListMacros.inc:203
-#: gofon/conference/class_divListConferences.inc:226
-msgid "departments"
-msgstr ""
-
-#: gofon/macro/generic.tpl:18
-msgid "Macro name to be displayed"
-msgstr ""
-
-#: gofon/macro/generic.tpl:60
-msgid "Visible for user"
-msgstr ""
-
-#: gofon/macro/generic.tpl:70
-msgid "Macro text"
-msgstr ""
-
-#: gofon/macro/class_gofonMacroManagement.inc:24
-msgid "Phone macros"
+#: gofon/macro/macro-filter.tpl:3 gofon/conference/conf-filter.tpl:3
+#: gofon/fonreports/contents.tpl:2
+msgid "Filter"
 msgstr ""
 
 #: gofon/macro/class_gofonMacroManagement.inc:25
-#: gofon/phoneaccount/class_phoneAccount.inc:7
-#: gofon/fonreports/class_fonreport.inc:7
-msgid "This does something"
-msgstr ""
-
-#: gofon/macro/class_gofonMacroManagement.inc:273
-#: gofon/conference/class_phoneConferenceManagment.inc:187
-msgid "Permission"
+msgid "Macros"
 msgstr ""
 
-#: gofon/macro/class_gofonMacroManagement.inc:320
-#: gofon/macro/class_gofonMacroManagement.inc:373
-#: gofon/macro/class_gofonMacroManagement.inc:397
-#: gofon/conference/class_phoneConferenceManagment.inc:228
-#: gofon/conference/class_phoneConferenceManagment.inc:288
-msgid "Permission error"
-msgstr ""
-
-#: gofon/macro/class_gofonMacroManagement.inc:366
-msgid "macro"
-msgstr ""
-
-#: gofon/macro/main.inc:51 gofon/macro/main.inc:55
+#: gofon/macro/class_gofonMacroManagement.inc:26
 msgid "Phone macro management"
 msgstr ""
 
@@ -1029,6 +921,14 @@ msgstr ""
 msgid "You are not allowed to view the macro parameter settings"
 msgstr ""
 
+#: gofon/macro/macro-list.tpl:13 gofon/conference/conf-list.tpl:13
+msgid "Update"
+msgstr ""
+
+#: gofon/macro/macro-list.tpl:13 gofon/conference/conf-list.tpl:13
+msgid "Submit"
+msgstr ""
+
 #: gofon/phoneaccount/generic.tpl:42 gofon/phoneaccount/paste_generic.tpl:27
 msgid "Telephone hardware"
 msgstr ""
@@ -1114,7 +1014,7 @@ msgstr ""
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1562
 #: gofon/phoneaccount/class_phoneAccount.inc:612
 #: gofon/phoneaccount/class_phoneAccount.inc:678
-#: gofon/phoneaccount/class_phoneAccount.inc:1562
+#: gofon/phoneaccount/class_phoneAccount.inc:1583
 #, php-format
 msgid "GOsa identified problems with your MySQL table definition!"
 msgstr ""
@@ -1124,7 +1024,7 @@ msgstr ""
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1630
 #: gofon/phoneaccount/class_phoneAccount.inc:651
 #: gofon/phoneaccount/class_phoneAccount.inc:973
-#: gofon/phoneaccount/class_phoneAccount.inc:1630
+#: gofon/phoneaccount/class_phoneAccount.inc:1651
 #: gofon/conference/class_phoneConferenceGeneric.inc:620
 msgid "Please activate debugging for details!"
 msgstr ""
@@ -1174,32 +1074,32 @@ msgid "Between 1-4 charactes"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
-#: gofon/phoneaccount/class_phoneAccount.inc:1444
+#: gofon/phoneaccount/class_phoneAccount.inc:1465
 #, php-format
 msgid "macro parameter %s"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1513
 msgid "An error occured while updating the database entries!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1701
 #, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
-#: gofon/phoneaccount/class_phoneAccount.inc:1717
-#: gofon/phoneaccount/class_phoneAccount.inc:1719
+#: gofon/phoneaccount/class_phoneAccount.inc:1738
+#: gofon/phoneaccount/class_phoneAccount.inc:1740
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
-#: gofon/phoneaccount/class_phoneAccount.inc:1765
+#: gofon/phoneaccount/class_phoneAccount.inc:1786
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -1207,73 +1107,73 @@ msgid ""
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
-#: gofon/phoneaccount/class_phoneAccount.inc:1774
+#: gofon/phoneaccount/class_phoneAccount.inc:1795
 msgid "Phone account settings"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
-#: gofon/phoneaccount/class_phoneAccount.inc:1778
+#: gofon/phoneaccount/class_phoneAccount.inc:1799
 msgid "My account"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
-#: gofon/phoneaccount/class_phoneAccount.inc:1785
+#: gofon/phoneaccount/class_phoneAccount.inc:1806
 #: gofon/conference/class_phoneConferenceGeneric.inc:864
 msgid "Telephone number"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1807
 msgid "Macro settings"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
-#: gofon/phoneaccount/class_phoneAccount.inc:1789
+#: gofon/phoneaccount/class_phoneAccount.inc:1810
 msgid "Phone context"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
-#: gofon/phoneaccount/class_phoneAccount.inc:1790
+#: gofon/phoneaccount/class_phoneAccount.inc:1811
 msgid "Voice mail context"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
-#: gofon/phoneaccount/class_phoneAccount.inc:1791
+#: gofon/phoneaccount/class_phoneAccount.inc:1812
 msgid "Telephone pin"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
-#: gofon/phoneaccount/class_phoneAccount.inc:1792
+#: gofon/phoneaccount/class_phoneAccount.inc:1813
 msgid "Voicemail pin"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
-#: gofon/phoneaccount/class_phoneAccount.inc:1874
+#: gofon/phoneaccount/class_phoneAccount.inc:1895
 msgid "There is currently no asterisk server defined!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
-#: gofon/phoneaccount/class_phoneAccount.inc:1878
+#: gofon/phoneaccount/class_phoneAccount.inc:1899
 msgid "Asterisk server is invalid!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
-#: gofon/phoneaccount/class_phoneAccount.inc:1884
+#: gofon/phoneaccount/class_phoneAccount.inc:1905
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
-#: gofon/phoneaccount/class_phoneAccount.inc:1887
+#: gofon/phoneaccount/class_phoneAccount.inc:1908
 msgid "Voicemail PIN contains invalid characters!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
-#: gofon/phoneaccount/class_phoneAccount.inc:1892
+#: gofon/phoneaccount/class_phoneAccount.inc:1913
 msgid "Phone pin contains invalid characters!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
-#: gofon/phoneaccount/class_phoneAccount.inc:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1920
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
@@ -1282,57 +1182,17 @@ msgstr ""
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 
-#: gofon/conference/headpage.tpl:6
-#: gofon/conference/class_divListConferences.inc:31
-#: gofon/conference/class_divListConferences.inc:32
-msgid "List of conference rooms"
-msgstr ""
-
-#: 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 ""
-
-#: gofon/conference/headpage.tpl:35
-msgid "Display users matching"
-msgstr ""
-
-#: gofon/conference/headpage.tpl:36
-msgid "Regular expression for        matching user names"
-msgstr ""
-
-#: gofon/conference/remove.tpl:6
-msgid ""
-"This includes 'all' accounts, systems, etc. in this subtree. Please double "
-"check if your really want to do this since there is no way for GOsa to get "
-"your data back."
-msgstr ""
-
-#: 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 ""
-
-#: gofon/conference/class_phoneConferenceManagment.inc:24
-msgid "Phone conferences"
+#: gofon/phoneaccount/class_phoneAccount.inc:7
+#: gofon/fonreports/class_fonreport.inc:7
+msgid "This does something"
 msgstr ""
 
 #: gofon/conference/class_phoneConferenceManagment.inc:25
-msgid "Management"
-msgstr ""
-
-#: gofon/conference/class_phoneConferenceManagment.inc:206
-#: gofon/conference/class_phoneConferenceManagment.inc:267
-msgid "conference"
+msgid "conferences"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceManagment.inc:228
-#: gofon/conference/class_phoneConferenceManagment.inc:288
-msgid "You have not permission to delete this entry!"
+#: gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Conference management"
 msgstr ""
 
 #: gofon/conference/generic.tpl:5
@@ -1374,7 +1234,6 @@ msgstr ""
 
 #: gofon/conference/generic.tpl:165
 #: gofon/conference/class_phoneConferenceGeneric.inc:384
-#: gofon/conference/class_divListConferences.inc:58
 msgid "PIN"
 msgstr ""
 
@@ -1408,6 +1267,15 @@ msgstr ""
 msgid "Count users"
 msgstr ""
 
+#: gofon/conference/conf-list.xml:11
+msgid "List of conference rooms"
+msgstr ""
+
+#: gofon/conference/conf-list.xml:15 gofon/conference/conf-list.xml:74
+#: gofon/conference/class_phoneConferenceGeneric.inc:836
+msgid "Conference"
+msgstr ""
+
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #, php-format
 msgid "Cannot delete entry from server '%s' because it seems to be removed!"
@@ -1437,12 +1305,6 @@ msgstr ""
 msgid "'%s' is already assigned to '%s'!"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:836
-#: gofon/conference/class_divListConferences.inc:95
-#: gofon/conference/class_divListConferences.inc:208
-msgid "Conference"
-msgstr ""
-
 #: gofon/conference/class_phoneConferenceGeneric.inc:837
 msgid "Phone conference management"
 msgstr ""
@@ -1476,94 +1338,59 @@ msgid "Format"
 msgstr ""
 
 #: gofon/conference/class_phoneConferenceGeneric.inc:865
-#: gofon/conference/class_divListConferences.inc:57
 msgid "Owner"
 msgstr ""
 
-#: gofon/conference/main.inc:48 gofon/conference/main.inc:50
-msgid "Conference management"
-msgstr ""
-
-#: gofon/conference/class_divListConferences.inc:65
-msgid "Regular expression for matching conference names"
-msgstr ""
-
-#: gofon/conference/class_divListConferences.inc:150
-msgid "Edit this entry"
-msgstr ""
-
-#: gofon/conference/class_divListConferences.inc:158
-msgid "Delete this entry"
-msgstr ""
-
-#: gofon/conference/class_divListConferences.inc:185
-msgid "Unknown"
-msgstr ""
-
-#: gofon/conference/class_divListConferences.inc:225
-#: gofon/conference/class_divListConferences.inc:226
-#, php-format
-msgid "Number of listed '%s'"
-msgstr ""
-
-#: gofon/conference/class_divListConferences.inc:225
-msgid "conferences"
-msgstr ""
-
 #: gofon/fonreports/class_fonreport.inc:6
 msgid "Phone Reports"
 msgstr ""
 
-#: gofon/fonreports/class_fonreport.inc:210
+#: gofon/fonreports/class_fonreport.inc:229
 msgid "Insufficient permissions"
 msgstr ""
 
-#: gofon/fonreports/class_fonreport.inc:229
+#: gofon/fonreports/class_fonreport.inc:248
 msgid "Y-M-D"
 msgstr ""
 
-#: gofon/fonreports/class_fonreport.inc:396
-#: gofon/fonreports/class_fonreport.inc:397
-#: gofon/fonreports/class_fonreport.inc:404 gofon/fonreports/main.inc:22
+#: gofon/fonreports/class_fonreport.inc:415
+#: gofon/fonreports/class_fonreport.inc:416
+#: gofon/fonreports/class_fonreport.inc:423 gofon/fonreports/main.inc:22
 msgid "Phone reports"
 msgstr ""
 
-#: gofon/fonreports/class_fonreport.inc:397
+#: gofon/fonreports/class_fonreport.inc:416
 msgid "All entries are readonly"
 msgstr ""
 
-#: gofon/fonreports/class_fonreport.inc:409 gofon/fonreports/contents.tpl:30
+#: gofon/fonreports/class_fonreport.inc:428 gofon/fonreports/contents.tpl:34
 msgid "Date"
 msgstr ""
 
-#: gofon/fonreports/class_fonreport.inc:410 gofon/fonreports/contents.tpl:31
+#: gofon/fonreports/class_fonreport.inc:429 gofon/fonreports/contents.tpl:35
 msgid "Source"
 msgstr ""
 
-#: gofon/fonreports/class_fonreport.inc:411 gofon/fonreports/contents.tpl:32
+#: gofon/fonreports/class_fonreport.inc:430 gofon/fonreports/contents.tpl:36
 msgid "Destination"
 msgstr ""
 
-#: gofon/fonreports/class_fonreport.inc:412 gofon/fonreports/contents.tpl:33
+#: gofon/fonreports/class_fonreport.inc:431 gofon/fonreports/contents.tpl:37
 msgid "Channel"
 msgstr ""
 
-#: gofon/fonreports/class_fonreport.inc:413
+#: gofon/fonreports/class_fonreport.inc:432
 msgid "Application called"
 msgstr ""
 
-#: gofon/fonreports/class_fonreport.inc:414
+#: gofon/fonreports/class_fonreport.inc:433
 msgid "Disposition"
 msgstr ""
 
-#: gofon/fonreports/class_fonreport.inc:415 gofon/fonreports/contents.tpl:36
+#: gofon/fonreports/class_fonreport.inc:434 gofon/fonreports/contents.tpl:40
 msgid "Duration"
 msgstr ""
 
-#: gofon/fonreports/contents.tpl:2
-msgid "Filter"
-msgstr ""
-
 #: gofon/fonreports/contents.tpl:6
 msgid "Search for"
 msgstr ""
@@ -1572,7 +1399,7 @@ msgstr ""
 msgid "Enter user name to search for"
 msgstr ""
 
-#: gofon/fonreports/contents.tpl:8 gofon/fonreports/contents.tpl:16
+#: gofon/fonreports/contents.tpl:8 gofon/fonreports/contents.tpl:20
 msgid "in"
 msgstr ""
 
@@ -1581,21 +1408,29 @@ msgid "Select subtree to base search on"
 msgstr ""
 
 #: gofon/fonreports/contents.tpl:12
+msgid "on"
+msgstr ""
+
+#: gofon/fonreports/contents.tpl:13
+msgid "Select server to search on"
+msgstr ""
+
+#: gofon/fonreports/contents.tpl:16
 msgid "during"
 msgstr ""
 
-#: gofon/fonreports/contents.tpl:21
+#: gofon/fonreports/contents.tpl:25
 msgid "Search"
 msgstr ""
 
-#: gofon/fonreports/contents.tpl:34
+#: gofon/fonreports/contents.tpl:38
 msgid "Application"
 msgstr ""
 
-#: gofon/fonreports/contents.tpl:35
+#: gofon/fonreports/contents.tpl:39
 msgid "Status"
 msgstr ""
 
-#: gofon/fonreports/contents.tpl:51
+#: gofon/fonreports/contents.tpl:55
 msgid "Search returned no results..."
 msgstr ""
diff --git a/gosa-plugins/gofon/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/nl/LC_MESSAGES/messages.po
index 66d93856d..0ad0f3e20 100644
--- a/gosa-plugins/gofon/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 16:06+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -58,7 +58,7 @@ msgstr "Opties"
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1413
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1788
 #: gofon/phoneaccount/class_phoneAccount.inc:1413
-#: gofon/phoneaccount/class_phoneAccount.inc:1788
+#: gofon/phoneaccount/class_phoneAccount.inc:1809
 #: gofon/conference/generic.tpl:68
 #: gofon/conference/class_phoneConferenceGeneric.inc:853
 #, fuzzy
@@ -260,7 +260,6 @@ msgstr "Maximale wachtrij lengte"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:323
 #: gofon/conference/class_phoneConferenceGeneric.inc:392
-#: gofon/conference/class_divListConferences.inc:56
 #, fuzzy
 msgid "Number"
 msgstr "Naam - nummer"
@@ -279,10 +278,10 @@ msgstr "Plakken"
 #: gofon/phoneaccount/class_phoneAccount.inc:431
 #: gofon/phoneaccount/class_phoneAccount.inc:1109
 #: gofon/conference/class_phoneConferenceGeneric.inc:430
-#: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:176
-#: gofon/fonreports/class_fonreport.inc:180
-#: gofon/fonreports/class_fonreport.inc:198
+#: gofon/fonreports/class_fonreport.inc:196
+#: gofon/fonreports/class_fonreport.inc:200
+#: gofon/fonreports/class_fonreport.inc:217
 #, fuzzy
 msgid "GOfon"
 msgstr "geen macro"
@@ -327,16 +326,16 @@ msgstr "Telefoonnummer"
 #: gofon/phoneaccount/class_phoneAccount.inc:1211
 #: gofon/phoneaccount/class_phoneAccount.inc:1217
 #: gofon/phoneaccount/class_phoneAccount.inc:1431
-#: gofon/phoneaccount/class_phoneAccount.inc:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1571
-#: gofon/phoneaccount/class_phoneAccount.inc:1581
-#: gofon/phoneaccount/class_phoneAccount.inc:1628
+#: gofon/phoneaccount/class_phoneAccount.inc:1513
+#: gofon/phoneaccount/class_phoneAccount.inc:1592
+#: gofon/phoneaccount/class_phoneAccount.inc:1602
+#: gofon/phoneaccount/class_phoneAccount.inc:1649
 #: gofon/conference/class_phoneConferenceGeneric.inc:260
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #: gofon/conference/class_phoneConferenceGeneric.inc:618
-#: gofon/fonreports/class_fonreport.inc:176
-#: gofon/fonreports/class_fonreport.inc:180
-#: gofon/fonreports/class_fonreport.inc:198
+#: gofon/fonreports/class_fonreport.inc:196
+#: gofon/fonreports/class_fonreport.inc:200
+#: gofon/fonreports/class_fonreport.inc:217
 msgid "Error"
 msgstr "Fout"
 
@@ -352,14 +351,15 @@ msgstr "Fout"
 #: gofon/macro/class_gofonMacro.inc:526
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
-#: gofon/phoneaccount/class_phoneAccount.inc:1518
-#: gofon/phoneaccount/class_phoneAccount.inc:1689
+#: gofon/phoneaccount/class_phoneAccount.inc:1539
+#: gofon/phoneaccount/class_phoneAccount.inc:1710
 #: gofon/conference/class_phoneConferenceGeneric.inc:789
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP fout:"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:901
+#: gofon/phoneaccount/class_phoneAccount.inc:1457
 #: gofon/conference/generic.tpl:120 gofon/conference/paste_generic.tpl:15
 msgid "Phone number"
 msgstr "Telefoonnummer"
@@ -377,7 +377,7 @@ msgstr "Telefoonnummer"
 #: gofon/phoneaccount/class_phoneAccount.inc:1072
 #: gofon/phoneaccount/class_phoneAccount.inc:1076
 #: gofon/phoneaccount/class_phoneAccount.inc:1079
-#: gofon/phoneaccount/class_phoneAccount.inc:1773
+#: gofon/phoneaccount/class_phoneAccount.inc:1794
 msgid "Phone"
 msgstr "Telefoon"
 
@@ -628,10 +628,10 @@ msgstr "Telefoonnaam"
 
 #: admin/systems/gofon/phone.tpl:17
 #: admin/systems/gofon/class_phoneGeneric.inc:517
-#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/class_divListMacros.inc:79
-#: gofon/macro/generic.tpl:27 gofon/conference/generic.tpl:49
+#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/generic.tpl:27
+#: gofon/macro/macro-list.tpl:13 gofon/conference/generic.tpl:49
 #: gofon/conference/class_phoneConferenceGeneric.inc:847
-#: gofon/conference/class_divListConferences.inc:83
+#: gofon/conference/conf-list.tpl:13
 msgid "Base"
 msgstr "Basis"
 
@@ -647,7 +647,8 @@ msgstr "Selecteer een basis"
 #: admin/systems/gofon/phone.tpl:34
 #: admin/systems/gofon/class_phoneGeneric.inc:518
 #: gofon/macro/class_gofonMacro.inc:574 gofon/macro/generic.tpl:49
-#: gofon/conference/generic.tpl:98
+#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:98
+#: gofon/conference/conf-list.xml:49
 #: gofon/conference/class_phoneConferenceGeneric.inc:848
 msgid "Description"
 msgstr "Omschrijving"
@@ -658,12 +659,10 @@ msgid "phone"
 msgstr "Telefoon"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:235
-#: gofon/macro/class_divListMacros.inc:121
 msgid "yes"
 msgstr "ja"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:235
-#: gofon/macro/class_divListMacros.inc:122
 msgid "no"
 msgstr "nee"
 
@@ -693,11 +692,11 @@ msgstr "Adres thuis"
 #: admin/systems/gofon/class_phoneGeneric.inc:362
 #: admin/systems/gofon/class_phoneGeneric.inc:516
 #: gofon/macro/class_gofonMacro.inc:406 gofon/macro/class_gofonMacro.inc:412
-#: gofon/macro/class_divListMacros.inc:56 gofon/macro/parameter.tpl:6
+#: gofon/macro/macro-list.xml:41 gofon/macro/parameter.tpl:6
+#: gofon/conference/conf-list.xml:41
 #: gofon/conference/class_phoneConferenceGeneric.inc:388
 #: gofon/conference/class_phoneConferenceGeneric.inc:410
 #: gofon/conference/class_phoneConferenceGeneric.inc:846
-#: gofon/conference/class_divListConferences.inc:56
 msgid "Name"
 msgstr "Naam"
 
@@ -713,7 +712,7 @@ msgstr "Telefoonnummer"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:513
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
-#: gofon/phoneaccount/class_phoneAccount.inc:1787
+#: gofon/phoneaccount/class_phoneAccount.inc:1808
 #, fuzzy
 msgid "Phone hardware"
 msgstr "Telefoon hardware"
@@ -775,44 +774,6 @@ msgstr ""
 msgid "Hardware type"
 msgstr ""
 
-#: gofon/macro/headpage.tpl:6 gofon/macro/class_divListMacros.inc:31
-#: gofon/macro/class_divListMacros.inc:32
-msgid "List of macros"
-msgstr "Lijst met macro's"
-
-#: gofon/macro/headpage.tpl:20 gofon/macro/class_gofonMacroParameters.inc:374
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1680
-#: gofon/conference/headpage.tpl:20
-msgid "Information"
-msgstr "Informatie"
-
-#: 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."
-
-#: gofon/macro/headpage.tpl:29 gofon/conference/headpage.tpl:29
-msgid "Filters"
-msgstr "Filters"
-
-#: gofon/macro/headpage.tpl:38
-msgid "Display macros matching"
-msgstr "Toon overeenkomende macro's"
-
-#: gofon/macro/headpage.tpl:38
-msgid "Display macros  matching"
-msgstr "Toon overeenkomende macro's"
-
-#: gofon/macro/headpage.tpl:41 gofon/macro/class_divListMacros.inc:64
-msgid "Regular expression for matching macro names"
-msgstr "Reguliere expressie voor overeenkomende macronamen"
-
 #: gofon/macro/remove.tpl:2 gofon/phoneaccount/.svn/tmp/tempfile.tmp:328
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:611
@@ -823,23 +784,22 @@ msgstr "Reguliere expressie voor overeenkomende macronamen"
 #: gofon/phoneaccount/class_phoneAccount.inc:342
 #: gofon/phoneaccount/class_phoneAccount.inc:611
 #: gofon/phoneaccount/class_phoneAccount.inc:677
-#: gofon/phoneaccount/class_phoneAccount.inc:1561
-#: gofon/phoneaccount/class_phoneAccount.inc:1938
+#: gofon/phoneaccount/class_phoneAccount.inc:1582
+#: gofon/phoneaccount/class_phoneAccount.inc:1959
 #: gofon/conference/remove.tpl:2
 #: gofon/conference/class_phoneConferenceGeneric.inc:463
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: gofon/macro/remove.tpl:6
+#: gofon/macro/remove.tpl:6 gofon/conference/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."
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
 msgstr ""
-"Dit kan gebruikt worden door meerdere groepen. Verzeker uzelf ervan dat dit "
-"is wat u wil, aangezien er geen mogelijkheid voor GOsa is om uw date terug "
-"te halen."
+"Controleer a.u.b. of u dit daadwerkelijk wil doen, aangezien er geen "
+"mogelijkheid voor GOsa is om uw data terug te krijgen."
 
-#: gofon/macro/remove.tpl:9
+#: gofon/macro/remove.tpl:10 gofon/conference/remove.tpl:10
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 "Indien u zeker bent drukt u dan 'Verwijderen' om door te gaan of 'Annuleren' "
@@ -878,6 +838,12 @@ msgstr ""
 msgid "Parameter %s is invalid!"
 msgstr "De opgegeven naam is ongeldig."
 
+#: gofon/macro/class_gofonMacroParameters.inc:374
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1701
+msgid "Information"
+msgstr "Informatie"
+
 #: gofon/macro/class_gofonMacroParameters.inc:374
 msgid ""
 "Number of parameters for this macro has changed. Please update all users "
@@ -916,9 +882,9 @@ msgstr "Macro tekst"
 #: gofon/phoneaccount/class_phoneAccount.inc:431
 #: gofon/phoneaccount/class_phoneAccount.inc:439
 #: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:1647
-#: gofon/fonreports/class_fonreport.inc:166
-#: gofon/fonreports/class_fonreport.inc:169
+#: gofon/phoneaccount/class_phoneAccount.inc:1668
+#: gofon/fonreports/class_fonreport.inc:176
+#: gofon/fonreports/class_fonreport.inc:179
 #, fuzzy
 msgid "Configuration error"
 msgstr "Configuratie bestand"
@@ -952,97 +918,6 @@ msgstr "Macro tekst"
 msgid "Visibility flag"
 msgstr ""
 
-#: gofon/macro/class_divListMacros.inc:50
-#: gofon/conference/class_divListConferences.inc:50
-#, fuzzy
-msgid "Select all"
-msgstr "Selecteer"
-
-#: gofon/macro/class_divListMacros.inc:56
-msgid "Department"
-msgstr "Afdeling"
-
-#: gofon/macro/class_divListMacros.inc:57
-msgid "Visible"
-msgstr "Zichtbaar"
-
-#: gofon/macro/class_divListMacros.inc:58
-#: gofon/macro/class_divListMacros.inc:84
-#: gofon/conference/class_divListConferences.inc:59
-#: gofon/conference/class_divListConferences.inc:88
-msgid "Actions"
-msgstr "Acties"
-
-#: gofon/macro/class_divListMacros.inc:81
-#: gofon/conference/class_divListConferences.inc:85
-msgid "Submit department"
-msgstr "Verwerk afdeling"
-
-#: gofon/macro/class_divListMacros.inc:81
-#: gofon/conference/class_divListConferences.inc:85
-msgid "Submit"
-msgstr "Verwerk"
-
-#: gofon/macro/class_divListMacros.inc:89
-#: gofon/conference/class_divListConferences.inc:93
-msgid "Create"
-msgstr "Aanmaken"
-
-#: gofon/macro/class_divListMacros.inc:91
-#: gofon/macro/class_divListMacros.inc:120
-msgid "Macro"
-msgstr "Macro"
-
-#: gofon/macro/class_divListMacros.inc:97
-#: gofon/conference/class_divListConferences.inc:101
-msgid "Remove"
-msgstr "Verwijderen"
-
-#: gofon/macro/class_divListMacros.inc:121
-msgid "visible"
-msgstr "zichtbaar"
-
-#: gofon/macro/class_divListMacros.inc:122
-msgid "invisible"
-msgstr "onzichtbaar"
-
-#: gofon/macro/class_divListMacros.inc:146
-#: gofon/conference/class_divListConferences.inc:150
-msgid "edit"
-msgstr "Bewerk"
-
-#: gofon/macro/class_divListMacros.inc:147
-#, fuzzy
-msgid "Edit macro"
-msgstr "Bewerk share"
-
-#: gofon/macro/class_divListMacros.inc:153
-#: gofon/conference/class_divListConferences.inc:158
-msgid "delete"
-msgstr "Verwijder"
-
-#: gofon/macro/class_divListMacros.inc:154
-#, fuzzy
-msgid "Delete macro"
-msgstr "Verwijder gebruiker"
-
-#: gofon/macro/class_divListMacros.inc:202
-#: gofon/macro/class_divListMacros.inc:203
-#, fuzzy, php-format
-msgid "Number of listed %s"
-msgstr "Naam van de afdeling"
-
-#: gofon/macro/class_divListMacros.inc:202
-#, fuzzy
-msgid "macros"
-msgstr "Macro"
-
-#: gofon/macro/class_divListMacros.inc:203
-#: gofon/conference/class_divListConferences.inc:226
-#, fuzzy
-msgid "departments"
-msgstr "Afdeling"
-
 #: gofon/macro/generic.tpl:18
 msgid "Macro name to be displayed"
 msgstr "Weer te geven macronaam"
@@ -1055,37 +930,43 @@ msgstr "Zichtbaar voor gebruikers"
 msgid "Macro text"
 msgstr "Macro tekst"
 
-#: gofon/macro/class_gofonMacroManagement.inc:24
-msgid "Phone macros"
-msgstr "Tel. macro's"
+#: gofon/macro/macro-list.xml:11
+msgid "List of macros"
+msgstr "Lijst met macro's"
 
-#: gofon/macro/class_gofonMacroManagement.inc:25
-#: gofon/phoneaccount/class_phoneAccount.inc:7
-#: gofon/fonreports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Dit doet iets"
+#: gofon/macro/macro-list.xml:15 gofon/macro/macro-list.xml:74
+msgid "Macro"
+msgstr "Macro"
 
-#: gofon/macro/class_gofonMacroManagement.inc:273
-#: gofon/conference/class_phoneConferenceManagment.inc:187
-#, fuzzy
-msgid "Permission"
-msgstr "Rechten"
+#: gofon/macro/macro-list.xml:57 gofon/conference/conf-list.xml:57
+msgid "Actions"
+msgstr "Acties"
 
-#: gofon/macro/class_gofonMacroManagement.inc:320
-#: gofon/macro/class_gofonMacroManagement.inc:373
-#: gofon/macro/class_gofonMacroManagement.inc:397
-#: gofon/conference/class_phoneConferenceManagment.inc:228
-#: gofon/conference/class_phoneConferenceManagment.inc:288
-#, fuzzy
-msgid "Permission error"
-msgstr "Rechten"
+#: gofon/macro/macro-list.xml:68 gofon/conference/conf-list.xml:68
+msgid "Create"
+msgstr "Aanmaken"
+
+#: gofon/macro/macro-list.xml:86 gofon/macro/macro-list.xml:125
+#: gofon/conference/conf-list.xml:86 gofon/conference/conf-list.xml:125
+msgid "Edit"
+msgstr "Bewerken"
+
+#: gofon/macro/macro-list.xml:93 gofon/macro/macro-list.xml:138
+#: gofon/conference/conf-list.xml:93 gofon/conference/conf-list.xml:138
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: gofon/macro/macro-filter.tpl:3 gofon/conference/conf-filter.tpl:3
+#: gofon/fonreports/contents.tpl:2
+msgid "Filter"
+msgstr "Filter"
 
-#: gofon/macro/class_gofonMacroManagement.inc:366
+#: gofon/macro/class_gofonMacroManagement.inc:25
 #, fuzzy
-msgid "macro"
+msgid "Macros"
 msgstr "Macro"
 
-#: gofon/macro/main.inc:51 gofon/macro/main.inc:55
+#: gofon/macro/class_gofonMacroManagement.inc:26
 msgid "Phone macro management"
 msgstr "Telefoon macrobeheer"
 
@@ -1106,6 +987,14 @@ msgstr "Standaard waarde"
 msgid "You are not allowed to view the macro parameter settings"
 msgstr "U heeft geen toestemming om deze gebruiker te verwijderen!"
 
+#: gofon/macro/macro-list.tpl:13 gofon/conference/conf-list.tpl:13
+msgid "Update"
+msgstr ""
+
+#: gofon/macro/macro-list.tpl:13 gofon/conference/conf-list.tpl:13
+msgid "Submit"
+msgstr "Verwerk"
+
 #: gofon/phoneaccount/generic.tpl:42 gofon/phoneaccount/paste_generic.tpl:27
 msgid "Telephone hardware"
 msgstr "Telefoon hardware"
@@ -1195,7 +1084,7 @@ msgstr ""
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1562
 #: gofon/phoneaccount/class_phoneAccount.inc:612
 #: gofon/phoneaccount/class_phoneAccount.inc:678
-#: gofon/phoneaccount/class_phoneAccount.inc:1562
+#: gofon/phoneaccount/class_phoneAccount.inc:1583
 #, php-format
 msgid "GOsa identified problems with your MySQL table definition!"
 msgstr ""
@@ -1205,7 +1094,7 @@ msgstr ""
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1630
 #: gofon/phoneaccount/class_phoneAccount.inc:651
 #: gofon/phoneaccount/class_phoneAccount.inc:973
-#: gofon/phoneaccount/class_phoneAccount.inc:1630
+#: gofon/phoneaccount/class_phoneAccount.inc:1651
 #: gofon/conference/class_phoneConferenceGeneric.inc:620
 msgid "Please activate debugging for details!"
 msgstr ""
@@ -1260,32 +1149,32 @@ msgid "Between 1-4 charactes"
 msgstr "Voicemail PIN-code moet tussen 1 en 4 karakters zijn"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
-#: gofon/phoneaccount/class_phoneAccount.inc:1444
+#: gofon/phoneaccount/class_phoneAccount.inc:1465
 #, fuzzy, php-format
 msgid "macro parameter %s"
 msgstr "Macro tekst"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1513
 msgid "An error occured while updating the database entries!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1701
 #, fuzzy, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr "Gebruiker '%s' is van telefoonwachtrij '%s' verwijderd"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
-#: gofon/phoneaccount/class_phoneAccount.inc:1717
-#: gofon/phoneaccount/class_phoneAccount.inc:1719
+#: gofon/phoneaccount/class_phoneAccount.inc:1738
+#: gofon/phoneaccount/class_phoneAccount.inc:1740
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr "Het opgegeven telefoonnummer '%s' is al toegekend aan '%s'."
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
-#: gofon/phoneaccount/class_phoneAccount.inc:1765
+#: gofon/phoneaccount/class_phoneAccount.inc:1786
 #, fuzzy, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -1295,83 +1184,83 @@ msgstr ""
 "profiel wordt op 'geen' ingesteld."
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
-#: gofon/phoneaccount/class_phoneAccount.inc:1774
+#: gofon/phoneaccount/class_phoneAccount.inc:1795
 #, fuzzy
 msgid "Phone account settings"
 msgstr "Telefoon instellingen"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
-#: gofon/phoneaccount/class_phoneAccount.inc:1778
+#: gofon/phoneaccount/class_phoneAccount.inc:1799
 msgid "My account"
 msgstr "Mijn account"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
-#: gofon/phoneaccount/class_phoneAccount.inc:1785
+#: gofon/phoneaccount/class_phoneAccount.inc:1806
 #: gofon/conference/class_phoneConferenceGeneric.inc:864
 #, fuzzy
 msgid "Telephone number"
 msgstr "Telefoonnummer"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1807
 #, fuzzy
 msgid "Macro settings"
 msgstr "E-mail instellingen"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
-#: gofon/phoneaccount/class_phoneAccount.inc:1789
+#: gofon/phoneaccount/class_phoneAccount.inc:1810
 #, fuzzy
 msgid "Phone context"
 msgstr "Telefoonnaam"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
-#: gofon/phoneaccount/class_phoneAccount.inc:1790
+#: gofon/phoneaccount/class_phoneAccount.inc:1811
 #, fuzzy
 msgid "Voice mail context"
 msgstr "Voicemail PIN-code"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
-#: gofon/phoneaccount/class_phoneAccount.inc:1791
+#: gofon/phoneaccount/class_phoneAccount.inc:1812
 #, fuzzy
 msgid "Telephone pin"
 msgstr "Telefoon"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
-#: gofon/phoneaccount/class_phoneAccount.inc:1792
+#: gofon/phoneaccount/class_phoneAccount.inc:1813
 #, fuzzy
 msgid "Voicemail pin"
 msgstr "Voicemail PIN-code"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
-#: gofon/phoneaccount/class_phoneAccount.inc:1874
+#: gofon/phoneaccount/class_phoneAccount.inc:1895
 msgid "There is currently no asterisk server defined!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
-#: gofon/phoneaccount/class_phoneAccount.inc:1878
+#: gofon/phoneaccount/class_phoneAccount.inc:1899
 msgid "Asterisk server is invalid!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
-#: gofon/phoneaccount/class_phoneAccount.inc:1884
+#: gofon/phoneaccount/class_phoneAccount.inc:1905
 #, fuzzy
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr "Voicemail PIN-code moet tussen 1 en 4 karakters zijn"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
-#: gofon/phoneaccount/class_phoneAccount.inc:1887
+#: gofon/phoneaccount/class_phoneAccount.inc:1908
 #, fuzzy
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "Voicemail PIN-code moet tussen 1 en 4 karakters zijn"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
-#: gofon/phoneaccount/class_phoneAccount.inc:1892
+#: gofon/phoneaccount/class_phoneAccount.inc:1913
 #, fuzzy
 msgid "Phone pin contains invalid characters!"
 msgstr "Het atribuut '%s' is leeg of bevat ongeldige karakters!"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
-#: gofon/phoneaccount/class_phoneAccount.inc:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1920
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
@@ -1384,69 +1273,19 @@ msgstr ""
 "Gebruik de 'Bewerk' knop hieronder om de informatie in deze dialoog te "
 "veranderen"
 
-#: gofon/conference/headpage.tpl:6
-#: gofon/conference/class_divListConferences.inc:31
-#: gofon/conference/class_divListConferences.inc:32
-msgid "List of conference rooms"
-msgstr "Lijst met conferentie kamers"
-
-#: 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."
-
-#: gofon/conference/headpage.tpl:35
-msgid "Display users matching"
-msgstr "Toon overeenkomende gebruikers"
-
-#: gofon/conference/headpage.tpl:36
-msgid "Regular expression for        matching user names"
-msgstr "Reguliere expressie voor       overeenkomende gebruikersnamen"
-
-#: gofon/conference/remove.tpl:6
-msgid ""
-"This includes 'all' accounts, systems, etc. in this subtree. 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' accounts, systemen etc. in deze subtree. Verzeker uzelf er "
-"van dat dit is wat u wilt, aangezien er geen mogelijkheid voor GOsa is om "
-"deze gegevens terug te halen."
-
-#: 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."
-
-#: gofon/conference/class_phoneConferenceManagment.inc:24
-msgid "Phone conferences"
-msgstr "Tel. conferenties"
+#: gofon/phoneaccount/class_phoneAccount.inc:7
+#: gofon/fonreports/class_fonreport.inc:7
+msgid "This does something"
+msgstr "Dit doet iets"
 
 #: gofon/conference/class_phoneConferenceManagment.inc:25
-msgid "Management"
-msgstr "Beheer"
-
-#: gofon/conference/class_phoneConferenceManagment.inc:206
-#: gofon/conference/class_phoneConferenceManagment.inc:267
 #, fuzzy
-msgid "conference"
+msgid "conferences"
 msgstr "Conferentie"
 
-#: gofon/conference/class_phoneConferenceManagment.inc:228
-#: gofon/conference/class_phoneConferenceManagment.inc:288
-#, fuzzy
-msgid "You have not permission to delete this entry!"
-msgstr "U heeft geen toestemming om deze afdeling te verwijderen."
+#: gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Conference management"
+msgstr "Conferentie beheer"
 
 #: gofon/conference/generic.tpl:5
 msgid "Properties"
@@ -1488,7 +1327,6 @@ msgstr "Voorgedefinieerde PIN-code"
 
 #: gofon/conference/generic.tpl:165
 #: gofon/conference/class_phoneConferenceGeneric.inc:384
-#: gofon/conference/class_divListConferences.inc:58
 msgid "PIN"
 msgstr "PIN-code"
 
@@ -1522,6 +1360,15 @@ msgstr "Kondig binnenkomende en verlatende gebruikers aan"
 msgid "Count users"
 msgstr "Tel het aantal gebruikers"
 
+#: gofon/conference/conf-list.xml:11
+msgid "List of conference rooms"
+msgstr "Lijst met conferentie kamers"
+
+#: gofon/conference/conf-list.xml:15 gofon/conference/conf-list.xml:74
+#: gofon/conference/class_phoneConferenceGeneric.inc:836
+msgid "Conference"
+msgstr "Conferentie"
+
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #, php-format
 msgid "Cannot delete entry from server '%s' because it seems to be removed!"
@@ -1552,12 +1399,6 @@ msgstr ""
 msgid "'%s' is already assigned to '%s'!"
 msgstr "Het opgegeven telefoonnummer '%s' is al toegekend aan '%s'."
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:836
-#: gofon/conference/class_divListConferences.inc:95
-#: gofon/conference/class_divListConferences.inc:208
-msgid "Conference"
-msgstr "Conferentie"
-
 #: gofon/conference/class_phoneConferenceGeneric.inc:837
 #, fuzzy
 msgid "Phone conference management"
@@ -1599,99 +1440,63 @@ msgid "Format"
 msgstr "formaat"
 
 #: gofon/conference/class_phoneConferenceGeneric.inc:865
-#: gofon/conference/class_divListConferences.inc:57
 msgid "Owner"
 msgstr "Eigenaar"
 
-#: gofon/conference/main.inc:48 gofon/conference/main.inc:50
-msgid "Conference management"
-msgstr "Conferentie beheer"
-
-#: gofon/conference/class_divListConferences.inc:65
-msgid "Regular expression for matching conference names"
-msgstr "Reguliere expressie voor overeenkomende conferentie namen"
-
-#: gofon/conference/class_divListConferences.inc:150
-msgid "Edit this entry"
-msgstr "Bewerk deze invoer"
-
-#: gofon/conference/class_divListConferences.inc:158
-msgid "Delete this entry"
-msgstr "Verwijder deze invoer"
-
-#: gofon/conference/class_divListConferences.inc:185
-msgid "Unknown"
-msgstr "Onbekend"
-
-#: gofon/conference/class_divListConferences.inc:225
-#: gofon/conference/class_divListConferences.inc:226
-#, fuzzy, php-format
-msgid "Number of listed '%s'"
-msgstr "Naam van de afdeling"
-
-#: gofon/conference/class_divListConferences.inc:225
-#, fuzzy
-msgid "conferences"
-msgstr "Conferentie"
-
 #: gofon/fonreports/class_fonreport.inc:6
 msgid "Phone Reports"
 msgstr "Telefoon rapporten"
 
-#: gofon/fonreports/class_fonreport.inc:210
+#: gofon/fonreports/class_fonreport.inc:229
 #, fuzzy
 msgid "Insufficient permissions"
 msgstr "Rechten"
 
-#: gofon/fonreports/class_fonreport.inc:229
+#: gofon/fonreports/class_fonreport.inc:248
 msgid "Y-M-D"
 msgstr "J-M-D"
 
-#: gofon/fonreports/class_fonreport.inc:396
-#: gofon/fonreports/class_fonreport.inc:397
-#: gofon/fonreports/class_fonreport.inc:404 gofon/fonreports/main.inc:22
+#: gofon/fonreports/class_fonreport.inc:415
+#: gofon/fonreports/class_fonreport.inc:416
+#: gofon/fonreports/class_fonreport.inc:423 gofon/fonreports/main.inc:22
 msgid "Phone reports"
 msgstr "Tel. rapporten"
 
-#: gofon/fonreports/class_fonreport.inc:397
+#: gofon/fonreports/class_fonreport.inc:416
 #, fuzzy
 msgid "All entries are readonly"
 msgstr "Alle velden zijn aanpasbaar"
 
-#: gofon/fonreports/class_fonreport.inc:409 gofon/fonreports/contents.tpl:30
+#: gofon/fonreports/class_fonreport.inc:428 gofon/fonreports/contents.tpl:34
 msgid "Date"
 msgstr "Datum"
 
-#: gofon/fonreports/class_fonreport.inc:410 gofon/fonreports/contents.tpl:31
+#: gofon/fonreports/class_fonreport.inc:429 gofon/fonreports/contents.tpl:35
 msgid "Source"
 msgstr "Bron"
 
-#: gofon/fonreports/class_fonreport.inc:411 gofon/fonreports/contents.tpl:32
+#: gofon/fonreports/class_fonreport.inc:430 gofon/fonreports/contents.tpl:36
 msgid "Destination"
 msgstr "Doel"
 
-#: gofon/fonreports/class_fonreport.inc:412 gofon/fonreports/contents.tpl:33
+#: gofon/fonreports/class_fonreport.inc:431 gofon/fonreports/contents.tpl:37
 msgid "Channel"
 msgstr "Kanaal"
 
-#: gofon/fonreports/class_fonreport.inc:413
+#: gofon/fonreports/class_fonreport.inc:432
 #, fuzzy
 msgid "Application called"
 msgstr "Programmanaam"
 
-#: gofon/fonreports/class_fonreport.inc:414
+#: gofon/fonreports/class_fonreport.inc:433
 #, fuzzy
 msgid "Disposition"
 msgstr "Max. verbrekingsduur"
 
-#: gofon/fonreports/class_fonreport.inc:415 gofon/fonreports/contents.tpl:36
+#: gofon/fonreports/class_fonreport.inc:434 gofon/fonreports/contents.tpl:40
 msgid "Duration"
 msgstr "Tijdsduur"
 
-#: gofon/fonreports/contents.tpl:2
-msgid "Filter"
-msgstr "Filter"
-
 #: gofon/fonreports/contents.tpl:6
 msgid "Search for"
 msgstr "Zoek naar"
@@ -1700,7 +1505,7 @@ msgstr "Zoek naar"
 msgid "Enter user name to search for"
 msgstr "Voer de te zoeken gebruikersnaam in"
 
-#: gofon/fonreports/contents.tpl:8 gofon/fonreports/contents.tpl:16
+#: gofon/fonreports/contents.tpl:8 gofon/fonreports/contents.tpl:20
 msgid "in"
 msgstr "in"
 
@@ -1709,25 +1514,187 @@ msgid "Select subtree to base search on"
 msgstr "Selecteer de subtree waarbinnen de zoekopdracht plaatsvindt"
 
 #: gofon/fonreports/contents.tpl:12
+#, fuzzy
+msgid "on"
+msgstr "Omlaag"
+
+#: gofon/fonreports/contents.tpl:13
+#, fuzzy
+msgid "Select server to search on"
+msgstr "Selecteer de subtree waarbinnen de zoekopdracht plaatsvindt"
+
+#: gofon/fonreports/contents.tpl:16
 msgid "during"
 msgstr "gedurende"
 
-#: gofon/fonreports/contents.tpl:21
+#: gofon/fonreports/contents.tpl:25
 msgid "Search"
 msgstr "Zoeken"
 
-#: gofon/fonreports/contents.tpl:34
+#: gofon/fonreports/contents.tpl:38
 msgid "Application"
 msgstr "Programma"
 
-#: gofon/fonreports/contents.tpl:35
+#: gofon/fonreports/contents.tpl:39
 msgid "Status"
 msgstr "Status"
 
-#: gofon/fonreports/contents.tpl:51
+#: gofon/fonreports/contents.tpl:55
 msgid "Search returned no results..."
 msgstr "De zoekopdracht gaf geen resultaten terug..."
 
+#~ 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."
+
+#~ msgid "Filters"
+#~ msgstr "Filters"
+
+#~ msgid "Display macros matching"
+#~ msgstr "Toon overeenkomende macro's"
+
+#~ msgid "Display macros  matching"
+#~ msgstr "Toon overeenkomende macro's"
+
+#~ msgid "Regular expression for matching macro names"
+#~ msgstr "Reguliere expressie voor overeenkomende macronamen"
+
+#~ 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 ""
+#~ "Dit kan gebruikt worden door meerdere groepen. Verzeker uzelf ervan dat "
+#~ "dit is wat u wil, aangezien er geen mogelijkheid voor GOsa is om uw date "
+#~ "terug te halen."
+
+#, fuzzy
+#~ msgid "Select all"
+#~ msgstr "Selecteer"
+
+#~ msgid "Department"
+#~ msgstr "Afdeling"
+
+#~ msgid "Visible"
+#~ msgstr "Zichtbaar"
+
+#~ msgid "Submit department"
+#~ msgstr "Verwerk afdeling"
+
+#~ msgid "visible"
+#~ msgstr "zichtbaar"
+
+#~ msgid "invisible"
+#~ msgstr "onzichtbaar"
+
+#~ msgid "edit"
+#~ msgstr "Bewerk"
+
+#, fuzzy
+#~ msgid "Edit macro"
+#~ msgstr "Bewerk share"
+
+#~ msgid "delete"
+#~ msgstr "Verwijder"
+
+#, fuzzy
+#~ msgid "Delete macro"
+#~ msgstr "Verwijder gebruiker"
+
+#, fuzzy
+#~ msgid "Number of listed %s"
+#~ msgstr "Naam van de afdeling"
+
+#, fuzzy
+#~ msgid "macros"
+#~ msgstr "Macro"
+
+#, fuzzy
+#~ msgid "departments"
+#~ msgstr "Afdeling"
+
+#~ msgid "Phone macros"
+#~ msgstr "Tel. macro's"
+
+#, fuzzy
+#~ msgid "Permission"
+#~ msgstr "Rechten"
+
+#, fuzzy
+#~ msgid "Permission error"
+#~ msgstr "Rechten"
+
+#, fuzzy
+#~ msgid "macro"
+#~ msgstr "Macro"
+
+#~ 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."
+
+#~ msgid "Display users matching"
+#~ msgstr "Toon overeenkomende gebruikers"
+
+#~ msgid "Regular expression for        matching user names"
+#~ msgstr "Reguliere expressie voor       overeenkomende gebruikersnamen"
+
+#~ msgid ""
+#~ "This includes 'all' accounts, systems, etc. in this subtree. 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' accounts, systemen etc. in deze subtree. Verzeker uzelf "
+#~ "er van dat dit is wat u wilt, aangezien er geen mogelijkheid voor GOsa is "
+#~ "om deze gegevens terug te halen."
+
+#~ 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."
+
+#~ msgid "Phone conferences"
+#~ msgstr "Tel. conferenties"
+
+#~ msgid "Management"
+#~ msgstr "Beheer"
+
+#, fuzzy
+#~ msgid "conference"
+#~ msgstr "Conferentie"
+
+#, fuzzy
+#~ msgid "You have not permission to delete this entry!"
+#~ msgstr "U heeft geen toestemming om deze afdeling te verwijderen."
+
+#~ msgid "Regular expression for matching conference names"
+#~ msgstr "Reguliere expressie voor overeenkomende conferentie namen"
+
+#~ msgid "Edit this entry"
+#~ msgstr "Bewerk deze invoer"
+
+#~ msgid "Delete this entry"
+#~ msgstr "Verwijder deze invoer"
+
+#~ msgid "Unknown"
+#~ msgstr "Onbekend"
+
+#, fuzzy
+#~ msgid "Number of listed '%s'"
+#~ msgstr "Naam van de afdeling"
+
 #~ msgid "Addons"
 #~ msgstr "Plugins"
 
@@ -1855,9 +1822,6 @@ msgstr "De zoekopdracht gaf geen resultaten terug..."
 #~ msgid "Add"
 #~ msgstr "Toevoegen"
 
-#~ msgid "Edit"
-#~ msgstr "Bewerken"
-
 #, fuzzy
 #~ msgid "You're about to delete the following macro(s) %s"
 #~ msgstr "U staat op het punt gebruiker %s te verwijderen."
diff --git a/gosa-plugins/gofon/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/pl/LC_MESSAGES/messages.po
index 50a785f30..6e4b6cbeb 100644
--- a/gosa-plugins/gofon/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 16:06+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2009-09-05 15:32+0100\n"
 "Last-Translator: Piort Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -53,7 +53,7 @@ msgstr "Opcje"
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1413
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1788
 #: gofon/phoneaccount/class_phoneAccount.inc:1413
-#: gofon/phoneaccount/class_phoneAccount.inc:1788
+#: gofon/phoneaccount/class_phoneAccount.inc:1809
 #: gofon/conference/generic.tpl:68
 #: gofon/conference/class_phoneConferenceGeneric.inc:853
 #, fuzzy
@@ -255,7 +255,6 @@ msgstr "Maksymalna długość kolejki"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:323
 #: gofon/conference/class_phoneConferenceGeneric.inc:392
-#: gofon/conference/class_divListConferences.inc:56
 #, fuzzy
 msgid "Number"
 msgstr "Nazwa - Numer"
@@ -273,10 +272,10 @@ msgstr "asterisk"
 #: gofon/phoneaccount/class_phoneAccount.inc:431
 #: gofon/phoneaccount/class_phoneAccount.inc:1109
 #: gofon/conference/class_phoneConferenceGeneric.inc:430
-#: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:176
-#: gofon/fonreports/class_fonreport.inc:180
-#: gofon/fonreports/class_fonreport.inc:198
+#: gofon/fonreports/class_fonreport.inc:196
+#: gofon/fonreports/class_fonreport.inc:200
+#: gofon/fonreports/class_fonreport.inc:217
 msgid "GOfon"
 msgstr "GOfon"
 
@@ -318,16 +317,16 @@ msgstr "numer telefonu"
 #: gofon/phoneaccount/class_phoneAccount.inc:1211
 #: gofon/phoneaccount/class_phoneAccount.inc:1217
 #: gofon/phoneaccount/class_phoneAccount.inc:1431
-#: gofon/phoneaccount/class_phoneAccount.inc:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1571
-#: gofon/phoneaccount/class_phoneAccount.inc:1581
-#: gofon/phoneaccount/class_phoneAccount.inc:1628
+#: gofon/phoneaccount/class_phoneAccount.inc:1513
+#: gofon/phoneaccount/class_phoneAccount.inc:1592
+#: gofon/phoneaccount/class_phoneAccount.inc:1602
+#: gofon/phoneaccount/class_phoneAccount.inc:1649
 #: gofon/conference/class_phoneConferenceGeneric.inc:260
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #: gofon/conference/class_phoneConferenceGeneric.inc:618
-#: gofon/fonreports/class_fonreport.inc:176
-#: gofon/fonreports/class_fonreport.inc:180
-#: gofon/fonreports/class_fonreport.inc:198
+#: gofon/fonreports/class_fonreport.inc:196
+#: gofon/fonreports/class_fonreport.inc:200
+#: gofon/fonreports/class_fonreport.inc:217
 msgid "Error"
 msgstr "Błąd"
 
@@ -343,13 +342,14 @@ msgstr "Błąd"
 #: gofon/macro/class_gofonMacro.inc:526
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
-#: gofon/phoneaccount/class_phoneAccount.inc:1518
-#: gofon/phoneaccount/class_phoneAccount.inc:1689
+#: gofon/phoneaccount/class_phoneAccount.inc:1539
+#: gofon/phoneaccount/class_phoneAccount.inc:1710
 #: gofon/conference/class_phoneConferenceGeneric.inc:789
 msgid "LDAP error"
 msgstr "błąd LDAP"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:901
+#: gofon/phoneaccount/class_phoneAccount.inc:1457
 #: gofon/conference/generic.tpl:120 gofon/conference/paste_generic.tpl:15
 msgid "Phone number"
 msgstr "Numer telefonu"
@@ -367,7 +367,7 @@ msgstr "Numer telefonu"
 #: gofon/phoneaccount/class_phoneAccount.inc:1072
 #: gofon/phoneaccount/class_phoneAccount.inc:1076
 #: gofon/phoneaccount/class_phoneAccount.inc:1079
-#: gofon/phoneaccount/class_phoneAccount.inc:1773
+#: gofon/phoneaccount/class_phoneAccount.inc:1794
 msgid "Phone"
 msgstr "Telefon"
 
@@ -597,10 +597,10 @@ msgstr "Nazwa telefonu"
 
 #: admin/systems/gofon/phone.tpl:17
 #: admin/systems/gofon/class_phoneGeneric.inc:517
-#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/class_divListMacros.inc:79
-#: gofon/macro/generic.tpl:27 gofon/conference/generic.tpl:49
+#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/generic.tpl:27
+#: gofon/macro/macro-list.tpl:13 gofon/conference/generic.tpl:49
 #: gofon/conference/class_phoneConferenceGeneric.inc:847
-#: gofon/conference/class_divListConferences.inc:83
+#: gofon/conference/conf-list.tpl:13
 msgid "Base"
 msgstr "Kontener"
 
@@ -616,7 +616,8 @@ msgstr "Wybierz bazę"
 #: admin/systems/gofon/phone.tpl:34
 #: admin/systems/gofon/class_phoneGeneric.inc:518
 #: gofon/macro/class_gofonMacro.inc:574 gofon/macro/generic.tpl:49
-#: gofon/conference/generic.tpl:98
+#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:98
+#: gofon/conference/conf-list.xml:49
 #: gofon/conference/class_phoneConferenceGeneric.inc:848
 msgid "Description"
 msgstr "Opis"
@@ -626,12 +627,10 @@ msgid "phone"
 msgstr "telefon"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:235
-#: gofon/macro/class_divListMacros.inc:121
 msgid "yes"
 msgstr "tak"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:235
-#: gofon/macro/class_divListMacros.inc:122
 msgid "no"
 msgstr "nie"
 
@@ -660,11 +659,11 @@ msgstr "Adres IP"
 #: admin/systems/gofon/class_phoneGeneric.inc:362
 #: admin/systems/gofon/class_phoneGeneric.inc:516
 #: gofon/macro/class_gofonMacro.inc:406 gofon/macro/class_gofonMacro.inc:412
-#: gofon/macro/class_divListMacros.inc:56 gofon/macro/parameter.tpl:6
+#: gofon/macro/macro-list.xml:41 gofon/macro/parameter.tpl:6
+#: gofon/conference/conf-list.xml:41
 #: gofon/conference/class_phoneConferenceGeneric.inc:388
 #: gofon/conference/class_phoneConferenceGeneric.inc:410
 #: gofon/conference/class_phoneConferenceGeneric.inc:846
-#: gofon/conference/class_divListConferences.inc:56
 msgid "Name"
 msgstr "Imię"
 
@@ -680,7 +679,7 @@ msgstr "Numer telefonu"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:513
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
-#: gofon/phoneaccount/class_phoneAccount.inc:1787
+#: gofon/phoneaccount/class_phoneAccount.inc:1808
 msgid "Phone hardware"
 msgstr "Sprzęt telefoniczny"
 
@@ -742,44 +741,6 @@ msgstr "CAPI MSN"
 msgid "Hardware type"
 msgstr "Typ sprzętu"
 
-#: gofon/macro/headpage.tpl:6 gofon/macro/class_divListMacros.inc:31
-#: gofon/macro/class_divListMacros.inc:32
-msgid "List of macros"
-msgstr "Lista makr"
-
-#: gofon/macro/headpage.tpl:20 gofon/macro/class_gofonMacroParameters.inc:374
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1680
-#: gofon/conference/headpage.tpl:20
-msgid "Information"
-msgstr "Informacja"
-
-#: 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 ""
-"To menu umożliwia tworzenie, usuwanie oraz edycję wybranych makr. Posiadając "
-"dużą ilość makr, może okazać się wygodniejsze korzystanie z selektorów "
-"zakresu na górze listy makr."
-
-#: gofon/macro/headpage.tpl:29 gofon/conference/headpage.tpl:29
-msgid "Filters"
-msgstr "Filtry"
-
-#: gofon/macro/headpage.tpl:38
-msgid "Display macros matching"
-msgstr "Wyświetl makra pasujące"
-
-#: gofon/macro/headpage.tpl:38
-msgid "Display macros  matching"
-msgstr "Wyświetl makra pasujące"
-
-#: gofon/macro/headpage.tpl:41 gofon/macro/class_divListMacros.inc:64
-msgid "Regular expression for matching macro names"
-msgstr "Wyrażenie regularne dla dopasowania nazw makr"
-
 #: gofon/macro/remove.tpl:2 gofon/phoneaccount/.svn/tmp/tempfile.tmp:328
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:611
@@ -790,22 +751,20 @@ msgstr "Wyrażenie regularne dla dopasowania nazw makr"
 #: gofon/phoneaccount/class_phoneAccount.inc:342
 #: gofon/phoneaccount/class_phoneAccount.inc:611
 #: gofon/phoneaccount/class_phoneAccount.inc:677
-#: gofon/phoneaccount/class_phoneAccount.inc:1561
-#: gofon/phoneaccount/class_phoneAccount.inc:1938
+#: gofon/phoneaccount/class_phoneAccount.inc:1582
+#: gofon/phoneaccount/class_phoneAccount.inc:1959
 #: gofon/conference/remove.tpl:2
 #: gofon/conference/class_phoneConferenceGeneric.inc:463
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: gofon/macro/remove.tpl:6
+#: gofon/macro/remove.tpl:6 gofon/conference/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 ""
-"To może być używane przez kilka grup. Proszę upewnić się czy kontynuować, "
-"gdyż nie ma operacji powrotu."
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr "Proszę upewnić się czy kontynuować, gdyż nie ma możliwości powrotu."
 
-#: gofon/macro/remove.tpl:9
+#: gofon/macro/remove.tpl:10 gofon/conference/remove.tpl:10
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 "Jeśli jesteś pewien - naciśnij 'Usuń' aby kontynuować lub 'Anuluj' aby "
@@ -843,6 +802,12 @@ msgstr ""
 msgid "Parameter %s is invalid!"
 msgstr "Podana nazwa jest nieprawidłowa"
 
+#: gofon/macro/class_gofonMacroParameters.inc:374
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1701
+msgid "Information"
+msgstr "Informacja"
+
 #: gofon/macro/class_gofonMacroParameters.inc:374
 msgid ""
 "Number of parameters for this macro has changed. Please update all users "
@@ -880,9 +845,9 @@ msgstr "Makro jest puste!"
 #: gofon/phoneaccount/class_phoneAccount.inc:431
 #: gofon/phoneaccount/class_phoneAccount.inc:439
 #: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:1647
-#: gofon/fonreports/class_fonreport.inc:166
-#: gofon/fonreports/class_fonreport.inc:169
+#: gofon/phoneaccount/class_phoneAccount.inc:1668
+#: gofon/fonreports/class_fonreport.inc:176
+#: gofon/fonreports/class_fonreport.inc:179
 #, fuzzy
 msgid "Configuration error"
 msgstr "Plik konfiguracyjny"
@@ -914,94 +879,6 @@ msgstr "Zawartość makro"
 msgid "Visibility flag"
 msgstr "Flaga widoczności"
 
-#: gofon/macro/class_divListMacros.inc:50
-#: gofon/conference/class_divListConferences.inc:50
-#, fuzzy
-msgid "Select all"
-msgstr "Wybierz"
-
-#: gofon/macro/class_divListMacros.inc:56
-msgid "Department"
-msgstr "Departament"
-
-#: gofon/macro/class_divListMacros.inc:57
-msgid "Visible"
-msgstr "Widoczne"
-
-#: gofon/macro/class_divListMacros.inc:58
-#: gofon/macro/class_divListMacros.inc:84
-#: gofon/conference/class_divListConferences.inc:59
-#: gofon/conference/class_divListConferences.inc:88
-msgid "Actions"
-msgstr "Akcje"
-
-#: gofon/macro/class_divListMacros.inc:81
-#: gofon/conference/class_divListConferences.inc:85
-msgid "Submit department"
-msgstr "Zatwierdź departament"
-
-#: gofon/macro/class_divListMacros.inc:81
-#: gofon/conference/class_divListConferences.inc:85
-msgid "Submit"
-msgstr "Wyślij"
-
-#: gofon/macro/class_divListMacros.inc:89
-#: gofon/conference/class_divListConferences.inc:93
-msgid "Create"
-msgstr "Utwórz"
-
-#: gofon/macro/class_divListMacros.inc:91
-#: gofon/macro/class_divListMacros.inc:120
-msgid "Macro"
-msgstr "Makro"
-
-#: gofon/macro/class_divListMacros.inc:97
-#: gofon/conference/class_divListConferences.inc:101
-msgid "Remove"
-msgstr "Usuń"
-
-#: gofon/macro/class_divListMacros.inc:121
-msgid "visible"
-msgstr "widoczne"
-
-#: gofon/macro/class_divListMacros.inc:122
-msgid "invisible"
-msgstr "niewidoczne"
-
-#: gofon/macro/class_divListMacros.inc:146
-#: gofon/conference/class_divListConferences.inc:150
-msgid "edit"
-msgstr "edytuj"
-
-#: gofon/macro/class_divListMacros.inc:147
-msgid "Edit macro"
-msgstr "Edytuj makro"
-
-#: gofon/macro/class_divListMacros.inc:153
-#: gofon/conference/class_divListConferences.inc:158
-msgid "delete"
-msgstr "Usuń"
-
-#: gofon/macro/class_divListMacros.inc:154
-msgid "Delete macro"
-msgstr "Usuń makro"
-
-#: gofon/macro/class_divListMacros.inc:202
-#: gofon/macro/class_divListMacros.inc:203
-#, fuzzy, php-format
-msgid "Number of listed %s"
-msgstr "Nazwa departamentu"
-
-#: gofon/macro/class_divListMacros.inc:202
-msgid "macros"
-msgstr "makra"
-
-#: gofon/macro/class_divListMacros.inc:203
-#: gofon/conference/class_divListConferences.inc:226
-#, fuzzy
-msgid "departments"
-msgstr "Departament"
-
 #: gofon/macro/generic.tpl:18
 msgid "Macro name to be displayed"
 msgstr "Nazwa makra do wyświetlenia"
@@ -1014,36 +891,43 @@ msgstr "Widoczne dla użytkownika"
 msgid "Macro text"
 msgstr "Tekst makro"
 
-#: gofon/macro/class_gofonMacroManagement.inc:24
-msgid "Phone macros"
-msgstr "Makra telefoniczne"
+#: gofon/macro/macro-list.xml:11
+msgid "List of macros"
+msgstr "Lista makr"
 
-#: gofon/macro/class_gofonMacroManagement.inc:25
-#: gofon/phoneaccount/class_phoneAccount.inc:7
-#: gofon/fonreports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "To robi coś"
+#: gofon/macro/macro-list.xml:15 gofon/macro/macro-list.xml:74
+msgid "Macro"
+msgstr "Makro"
 
-#: gofon/macro/class_gofonMacroManagement.inc:273
-#: gofon/conference/class_phoneConferenceManagment.inc:187
-#, fuzzy
-msgid "Permission"
-msgstr "Uprawnienia"
+#: gofon/macro/macro-list.xml:57 gofon/conference/conf-list.xml:57
+msgid "Actions"
+msgstr "Akcje"
 
-#: gofon/macro/class_gofonMacroManagement.inc:320
-#: gofon/macro/class_gofonMacroManagement.inc:373
-#: gofon/macro/class_gofonMacroManagement.inc:397
-#: gofon/conference/class_phoneConferenceManagment.inc:228
-#: gofon/conference/class_phoneConferenceManagment.inc:288
-#, fuzzy
-msgid "Permission error"
-msgstr "Uprawnienia"
+#: gofon/macro/macro-list.xml:68 gofon/conference/conf-list.xml:68
+msgid "Create"
+msgstr "Utwórz"
 
-#: gofon/macro/class_gofonMacroManagement.inc:366
-msgid "macro"
-msgstr "makro"
+#: gofon/macro/macro-list.xml:86 gofon/macro/macro-list.xml:125
+#: gofon/conference/conf-list.xml:86 gofon/conference/conf-list.xml:125
+msgid "Edit"
+msgstr "Edytuj"
+
+#: gofon/macro/macro-list.xml:93 gofon/macro/macro-list.xml:138
+#: gofon/conference/conf-list.xml:93 gofon/conference/conf-list.xml:138
+msgid "Remove"
+msgstr "Usuń"
+
+#: gofon/macro/macro-filter.tpl:3 gofon/conference/conf-filter.tpl:3
+#: gofon/fonreports/contents.tpl:2
+msgid "Filter"
+msgstr "Filtr"
+
+#: gofon/macro/class_gofonMacroManagement.inc:25
+#, fuzzy
+msgid "Macros"
+msgstr "Makro"
 
-#: gofon/macro/main.inc:51 gofon/macro/main.inc:55
+#: gofon/macro/class_gofonMacroManagement.inc:26
 msgid "Phone macro management"
 msgstr "Zarządzanie makrami telefonów"
 
@@ -1064,6 +948,14 @@ msgstr "Domyślna wartość"
 msgid "You are not allowed to view the macro parameter settings"
 msgstr "Brak uprawnień do usunięcia tego użytkownika!"
 
+#: gofon/macro/macro-list.tpl:13 gofon/conference/conf-list.tpl:13
+msgid "Update"
+msgstr "Aktualizuj"
+
+#: gofon/macro/macro-list.tpl:13 gofon/conference/conf-list.tpl:13
+msgid "Submit"
+msgstr "Wyślij"
+
 #: gofon/phoneaccount/generic.tpl:42 gofon/phoneaccount/paste_generic.tpl:27
 msgid "Telephone hardware"
 msgstr "Sprzęt telefoniczny"
@@ -1152,7 +1044,7 @@ msgstr ""
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1562
 #: gofon/phoneaccount/class_phoneAccount.inc:612
 #: gofon/phoneaccount/class_phoneAccount.inc:678
-#: gofon/phoneaccount/class_phoneAccount.inc:1562
+#: gofon/phoneaccount/class_phoneAccount.inc:1583
 #, php-format
 msgid "GOsa identified problems with your MySQL table definition!"
 msgstr ""
@@ -1162,7 +1054,7 @@ msgstr ""
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1630
 #: gofon/phoneaccount/class_phoneAccount.inc:651
 #: gofon/phoneaccount/class_phoneAccount.inc:973
-#: gofon/phoneaccount/class_phoneAccount.inc:1630
+#: gofon/phoneaccount/class_phoneAccount.inc:1651
 #: gofon/conference/class_phoneConferenceGeneric.inc:620
 msgid "Please activate debugging for details!"
 msgstr ""
@@ -1217,32 +1109,32 @@ msgid "Between 1-4 charactes"
 msgstr "PIN Voicemail musi zawierać od 1 do 4 znaków."
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
-#: gofon/phoneaccount/class_phoneAccount.inc:1444
+#: gofon/phoneaccount/class_phoneAccount.inc:1465
 #, fuzzy, php-format
 msgid "macro parameter %s"
 msgstr "Zawartość makro"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1513
 msgid "An error occured while updating the database entries!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1701
 #, fuzzy, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr "Usunięto użytkownika '%s' z kolejki telefonicznej '%s'."
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
-#: gofon/phoneaccount/class_phoneAccount.inc:1717
-#: gofon/phoneaccount/class_phoneAccount.inc:1719
+#: gofon/phoneaccount/class_phoneAccount.inc:1738
+#: gofon/phoneaccount/class_phoneAccount.inc:1740
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr "Podany numer telefonu '%s' jest już przypisany do '%s'."
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
-#: gofon/phoneaccount/class_phoneAccount.inc:1765
+#: gofon/phoneaccount/class_phoneAccount.inc:1786
 #, fuzzy, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -1252,78 +1144,78 @@ msgstr ""
 "'brak'."
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
-#: gofon/phoneaccount/class_phoneAccount.inc:1774
+#: gofon/phoneaccount/class_phoneAccount.inc:1795
 msgid "Phone account settings"
 msgstr "Ustawienia konta telefonicznego"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
-#: gofon/phoneaccount/class_phoneAccount.inc:1778
+#: gofon/phoneaccount/class_phoneAccount.inc:1799
 msgid "My account"
 msgstr "Moje konto "
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
-#: gofon/phoneaccount/class_phoneAccount.inc:1785
+#: gofon/phoneaccount/class_phoneAccount.inc:1806
 #: gofon/conference/class_phoneConferenceGeneric.inc:864
 msgid "Telephone number"
 msgstr "Numer telefonu"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1807
 msgid "Macro settings"
 msgstr "Ustawienia makra"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
-#: gofon/phoneaccount/class_phoneAccount.inc:1789
+#: gofon/phoneaccount/class_phoneAccount.inc:1810
 #, fuzzy
 msgid "Phone context"
 msgstr "Nazwa telefonu"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
-#: gofon/phoneaccount/class_phoneAccount.inc:1790
+#: gofon/phoneaccount/class_phoneAccount.inc:1811
 #, fuzzy
 msgid "Voice mail context"
 msgstr "PIN poczty głosowej"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
-#: gofon/phoneaccount/class_phoneAccount.inc:1791
+#: gofon/phoneaccount/class_phoneAccount.inc:1812
 msgid "Telephone pin"
 msgstr "PIN Telefonu"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
-#: gofon/phoneaccount/class_phoneAccount.inc:1792
+#: gofon/phoneaccount/class_phoneAccount.inc:1813
 msgid "Voicemail pin"
 msgstr "PIN poczty głosowej"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
-#: gofon/phoneaccount/class_phoneAccount.inc:1874
+#: gofon/phoneaccount/class_phoneAccount.inc:1895
 msgid "There is currently no asterisk server defined!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
-#: gofon/phoneaccount/class_phoneAccount.inc:1878
+#: gofon/phoneaccount/class_phoneAccount.inc:1899
 msgid "Asterisk server is invalid!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
-#: gofon/phoneaccount/class_phoneAccount.inc:1884
+#: gofon/phoneaccount/class_phoneAccount.inc:1905
 #, fuzzy
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr "PIN Voicemail musi zawierać od 1 do 4 znaków."
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
-#: gofon/phoneaccount/class_phoneAccount.inc:1887
+#: gofon/phoneaccount/class_phoneAccount.inc:1908
 #, fuzzy
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "PIN Voicemail musi zawierać od 1 do 4 znaków."
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
-#: gofon/phoneaccount/class_phoneAccount.inc:1892
+#: gofon/phoneaccount/class_phoneAccount.inc:1913
 #, fuzzy
 msgid "Phone pin contains invalid characters!"
 msgstr "Atrybut hasło jest pusty lub zawiera nieprawidłowe znaki."
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
-#: gofon/phoneaccount/class_phoneAccount.inc:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1920
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
@@ -1333,66 +1225,18 @@ msgstr ""
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr "Kliknij przycisk 'Edytuj' poniżej, aby zmienić informacje w tym oknie"
 
-#: gofon/conference/headpage.tpl:6
-#: gofon/conference/class_divListConferences.inc:31
-#: gofon/conference/class_divListConferences.inc:32
-msgid "List of conference rooms"
-msgstr "Lista sal konferencyjnych"
-
-#: 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 ""
-"To menu umożliwia tworzenie, usuwanie oraz edycję wybranych konferencji "
-"telefonicznych. Posiadając dużą ilość konferencji, może okazać się "
-"wygodniejsze korzystanie z selektorów zakresu na górze listy konferencji."
-
-#: gofon/conference/headpage.tpl:35
-msgid "Display users matching"
-msgstr "Wyświetl użytkowników pasujących"
-
-#: gofon/conference/headpage.tpl:36
-msgid "Regular expression for        matching user names"
-msgstr "Wyrażenie regularne do dopasowania nazw użytkowników"
-
-#: gofon/conference/remove.tpl:6
-msgid ""
-"This includes 'all' accounts, systems, etc. in this subtree. Please double "
-"check if your really want to do this since there is no way for GOsa to get "
-"your data back."
-msgstr ""
-"Operacja odnosi sie do 'wszystkich' kont, systemów, etc w tym poddrzewie. "
-"Proszę upewnić się czy kontynuować, gdyż nie ma operacji powrotu."
-
-#: 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 ""
-"Przed wykonaniem tej operacji zaleca się wykonanie kopii bezpieczeństwa "
-"drzewa LDAP. Naciśnij 'Usuń' aby kontynuować, lub 'Anuluj' aby przerwać."
-
-#: gofon/conference/class_phoneConferenceManagment.inc:24
-msgid "Phone conferences"
-msgstr "Konferencje telefoniczne"
+#: gofon/phoneaccount/class_phoneAccount.inc:7
+#: gofon/fonreports/class_fonreport.inc:7
+msgid "This does something"
+msgstr "To robi coś"
 
 #: gofon/conference/class_phoneConferenceManagment.inc:25
-msgid "Management"
-msgstr "Zarządzanie"
-
-#: gofon/conference/class_phoneConferenceManagment.inc:206
-#: gofon/conference/class_phoneConferenceManagment.inc:267
-msgid "conference"
-msgstr "konferencja"
+msgid "conferences"
+msgstr "konferencje"
 
-#: gofon/conference/class_phoneConferenceManagment.inc:228
-#: gofon/conference/class_phoneConferenceManagment.inc:288
-#, fuzzy
-msgid "You have not permission to delete this entry!"
-msgstr "Brak uprawnień do usunięcia tego departamentu."
+#: gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Conference management"
+msgstr "Zarządzanie konferencją"
 
 #: gofon/conference/generic.tpl:5
 msgid "Properties"
@@ -1434,7 +1278,6 @@ msgstr "Prekonfiturowany PIN"
 
 #: gofon/conference/generic.tpl:165
 #: gofon/conference/class_phoneConferenceGeneric.inc:384
-#: gofon/conference/class_divListConferences.inc:58
 msgid "PIN"
 msgstr "PIN"
 
@@ -1468,6 +1311,15 @@ msgstr "Zapowiadaj użytkowników dołączających lub opuszczających konferenc
 msgid "Count users"
 msgstr "Zlicz użytkowników"
 
+#: gofon/conference/conf-list.xml:11
+msgid "List of conference rooms"
+msgstr "Lista sal konferencyjnych"
+
+#: gofon/conference/conf-list.xml:15 gofon/conference/conf-list.xml:74
+#: gofon/conference/class_phoneConferenceGeneric.inc:836
+msgid "Conference"
+msgstr "Konferencja"
+
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #, php-format
 msgid "Cannot delete entry from server '%s' because it seems to be removed!"
@@ -1497,12 +1349,6 @@ msgstr ""
 msgid "'%s' is already assigned to '%s'!"
 msgstr "Podany numer telefonu '%s' jest już przypisany do '%s'."
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:836
-#: gofon/conference/class_divListConferences.inc:95
-#: gofon/conference/class_divListConferences.inc:208
-msgid "Conference"
-msgstr "Konferencja"
-
 #: gofon/conference/class_phoneConferenceGeneric.inc:837
 msgid "Phone conference management"
 msgstr "Zarządzanie konferencją telefoniczną"
@@ -1537,96 +1383,61 @@ msgid "Format"
 msgstr "format"
 
 #: gofon/conference/class_phoneConferenceGeneric.inc:865
-#: gofon/conference/class_divListConferences.inc:57
 msgid "Owner"
 msgstr "Właściciel"
 
-#: gofon/conference/main.inc:48 gofon/conference/main.inc:50
-msgid "Conference management"
-msgstr "Zarządzanie konferencją"
-
-#: gofon/conference/class_divListConferences.inc:65
-msgid "Regular expression for matching conference names"
-msgstr "Wyrażenie regularne dla dopasowania nazw konferencji"
-
-#: gofon/conference/class_divListConferences.inc:150
-msgid "Edit this entry"
-msgstr "Edytuj ten obiekt"
-
-#: gofon/conference/class_divListConferences.inc:158
-msgid "Delete this entry"
-msgstr "Usuń ten obiekt"
-
-#: gofon/conference/class_divListConferences.inc:185
-msgid "Unknown"
-msgstr "Nieznane"
-
-#: gofon/conference/class_divListConferences.inc:225
-#: gofon/conference/class_divListConferences.inc:226
-#, fuzzy, php-format
-msgid "Number of listed '%s'"
-msgstr "Nazwa departamentu"
-
-#: gofon/conference/class_divListConferences.inc:225
-msgid "conferences"
-msgstr "konferencje"
-
 #: gofon/fonreports/class_fonreport.inc:6
 msgid "Phone Reports"
 msgstr "Raporty telefoniczne"
 
-#: gofon/fonreports/class_fonreport.inc:210
+#: gofon/fonreports/class_fonreport.inc:229
 msgid "Insufficient permissions"
 msgstr "Niewystarczające uprawnienia"
 
-#: gofon/fonreports/class_fonreport.inc:229
+#: gofon/fonreports/class_fonreport.inc:248
 msgid "Y-M-D"
 msgstr "R-M-D"
 
-#: gofon/fonreports/class_fonreport.inc:396
-#: gofon/fonreports/class_fonreport.inc:397
-#: gofon/fonreports/class_fonreport.inc:404 gofon/fonreports/main.inc:22
+#: gofon/fonreports/class_fonreport.inc:415
+#: gofon/fonreports/class_fonreport.inc:416
+#: gofon/fonreports/class_fonreport.inc:423 gofon/fonreports/main.inc:22
 msgid "Phone reports"
 msgstr "Raporty telefoniczne"
 
-#: gofon/fonreports/class_fonreport.inc:397
+#: gofon/fonreports/class_fonreport.inc:416
 msgid "All entries are readonly"
 msgstr "Wszystkie pola są tylko do odczytu"
 
-#: gofon/fonreports/class_fonreport.inc:409 gofon/fonreports/contents.tpl:30
+#: gofon/fonreports/class_fonreport.inc:428 gofon/fonreports/contents.tpl:34
 msgid "Date"
 msgstr "Data"
 
-#: gofon/fonreports/class_fonreport.inc:410 gofon/fonreports/contents.tpl:31
+#: gofon/fonreports/class_fonreport.inc:429 gofon/fonreports/contents.tpl:35
 msgid "Source"
 msgstr "Źródło"
 
-#: gofon/fonreports/class_fonreport.inc:411 gofon/fonreports/contents.tpl:32
+#: gofon/fonreports/class_fonreport.inc:430 gofon/fonreports/contents.tpl:36
 msgid "Destination"
 msgstr "Cel"
 
-#: gofon/fonreports/class_fonreport.inc:412 gofon/fonreports/contents.tpl:33
+#: gofon/fonreports/class_fonreport.inc:431 gofon/fonreports/contents.tpl:37
 msgid "Channel"
 msgstr "Kanał"
 
-#: gofon/fonreports/class_fonreport.inc:413
+#: gofon/fonreports/class_fonreport.inc:432
 #, fuzzy
 msgid "Application called"
 msgstr "Nazwa aplikacji"
 
-#: gofon/fonreports/class_fonreport.inc:414
+#: gofon/fonreports/class_fonreport.inc:433
 #, fuzzy
 msgid "Disposition"
 msgstr "Rozłączenie"
 
-#: gofon/fonreports/class_fonreport.inc:415 gofon/fonreports/contents.tpl:36
+#: gofon/fonreports/class_fonreport.inc:434 gofon/fonreports/contents.tpl:40
 msgid "Duration"
 msgstr "Czas trwania"
 
-#: gofon/fonreports/contents.tpl:2
-msgid "Filter"
-msgstr "Filtr"
-
 #: gofon/fonreports/contents.tpl:6
 msgid "Search for"
 msgstr "Szukaj dla"
@@ -1635,7 +1446,7 @@ msgstr "Szukaj dla"
 msgid "Enter user name to search for"
 msgstr "Wprowadź poszukiwaną nazwę użytkownika"
 
-#: gofon/fonreports/contents.tpl:8 gofon/fonreports/contents.tpl:16
+#: gofon/fonreports/contents.tpl:8 gofon/fonreports/contents.tpl:20
 msgid "in"
 msgstr "w"
 
@@ -1644,25 +1455,179 @@ msgid "Select subtree to base search on"
 msgstr "Wybierz poddrzewo od którego zacząć szukanie"
 
 #: gofon/fonreports/contents.tpl:12
+#, fuzzy
+msgid "on"
+msgstr "W dół"
+
+#: gofon/fonreports/contents.tpl:13
+#, fuzzy
+msgid "Select server to search on"
+msgstr "Wybierz poddrzewo od którego zacząć szukanie"
+
+#: gofon/fonreports/contents.tpl:16
 msgid "during"
 msgstr "podczas"
 
-#: gofon/fonreports/contents.tpl:21
+#: gofon/fonreports/contents.tpl:25
 msgid "Search"
 msgstr "Szukaj"
 
-#: gofon/fonreports/contents.tpl:34
+#: gofon/fonreports/contents.tpl:38
 msgid "Application"
 msgstr "Aplikacja"
 
-#: gofon/fonreports/contents.tpl:35
+#: gofon/fonreports/contents.tpl:39
 msgid "Status"
 msgstr "Status"
 
-#: gofon/fonreports/contents.tpl:51
+#: gofon/fonreports/contents.tpl:55
 msgid "Search returned no results..."
 msgstr "Wyszukiwanie nie zwróciło żadnych wyników..."
 
+#~ 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 ""
+#~ "To menu umożliwia tworzenie, usuwanie oraz edycję wybranych makr. "
+#~ "Posiadając dużą ilość makr, może okazać się wygodniejsze korzystanie z "
+#~ "selektorów zakresu na górze listy makr."
+
+#~ msgid "Filters"
+#~ msgstr "Filtry"
+
+#~ msgid "Display macros matching"
+#~ msgstr "Wyświetl makra pasujące"
+
+#~ msgid "Display macros  matching"
+#~ msgstr "Wyświetl makra pasujące"
+
+#~ msgid "Regular expression for matching macro names"
+#~ msgstr "Wyrażenie regularne dla dopasowania nazw makr"
+
+#~ 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 ""
+#~ "To może być używane przez kilka grup. Proszę upewnić się czy kontynuować, "
+#~ "gdyż nie ma operacji powrotu."
+
+#, fuzzy
+#~ msgid "Select all"
+#~ msgstr "Wybierz"
+
+#~ msgid "Department"
+#~ msgstr "Departament"
+
+#~ msgid "Visible"
+#~ msgstr "Widoczne"
+
+#~ msgid "Submit department"
+#~ msgstr "Zatwierdź departament"
+
+#~ msgid "visible"
+#~ msgstr "widoczne"
+
+#~ msgid "invisible"
+#~ msgstr "niewidoczne"
+
+#~ msgid "edit"
+#~ msgstr "edytuj"
+
+#~ msgid "Edit macro"
+#~ msgstr "Edytuj makro"
+
+#~ msgid "delete"
+#~ msgstr "Usuń"
+
+#~ msgid "Delete macro"
+#~ msgstr "Usuń makro"
+
+#, fuzzy
+#~ msgid "Number of listed %s"
+#~ msgstr "Nazwa departamentu"
+
+#~ msgid "macros"
+#~ msgstr "makra"
+
+#, fuzzy
+#~ msgid "departments"
+#~ msgstr "Departament"
+
+#~ msgid "Phone macros"
+#~ msgstr "Makra telefoniczne"
+
+#, fuzzy
+#~ msgid "Permission"
+#~ msgstr "Uprawnienia"
+
+#, fuzzy
+#~ msgid "Permission error"
+#~ msgstr "Uprawnienia"
+
+#~ msgid "macro"
+#~ msgstr "makro"
+
+#~ 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 ""
+#~ "To menu umożliwia tworzenie, usuwanie oraz edycję wybranych konferencji "
+#~ "telefonicznych. Posiadając dużą ilość konferencji, może okazać się "
+#~ "wygodniejsze korzystanie z selektorów zakresu na górze listy konferencji."
+
+#~ msgid "Display users matching"
+#~ msgstr "Wyświetl użytkowników pasujących"
+
+#~ msgid "Regular expression for        matching user names"
+#~ msgstr "Wyrażenie regularne do dopasowania nazw użytkowników"
+
+#~ msgid ""
+#~ "This includes 'all' accounts, systems, etc. in this subtree. Please "
+#~ "double check if your really want to do this since there is no way for "
+#~ "GOsa to get your data back."
+#~ msgstr ""
+#~ "Operacja odnosi sie do 'wszystkich' kont, systemów, etc w tym poddrzewie. "
+#~ "Proszę upewnić się czy kontynuować, gdyż nie ma operacji powrotu."
+
+#~ 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 ""
+#~ "Przed wykonaniem tej operacji zaleca się wykonanie kopii bezpieczeństwa "
+#~ "drzewa LDAP. Naciśnij 'Usuń' aby kontynuować, lub 'Anuluj' aby przerwać."
+
+#~ msgid "Phone conferences"
+#~ msgstr "Konferencje telefoniczne"
+
+#~ msgid "Management"
+#~ msgstr "Zarządzanie"
+
+#~ msgid "conference"
+#~ msgstr "konferencja"
+
+#, fuzzy
+#~ msgid "You have not permission to delete this entry!"
+#~ msgstr "Brak uprawnień do usunięcia tego departamentu."
+
+#~ msgid "Regular expression for matching conference names"
+#~ msgstr "Wyrażenie regularne dla dopasowania nazw konferencji"
+
+#~ msgid "Edit this entry"
+#~ msgstr "Edytuj ten obiekt"
+
+#~ msgid "Delete this entry"
+#~ msgstr "Usuń ten obiekt"
+
+#~ msgid "Unknown"
+#~ msgstr "Nieznane"
+
+#, fuzzy
+#~ msgid "Number of listed '%s'"
+#~ msgstr "Nazwa departamentu"
+
 #~ msgid "Addons"
 #~ msgstr "Dodatki"
 
@@ -1790,9 +1755,6 @@ msgstr "Wyszukiwanie nie zwróciło żadnych wyników..."
 #~ msgid "Add"
 #~ msgstr "Dodaj"
 
-#~ msgid "Edit"
-#~ msgstr "Edytuj"
-
 #, fuzzy
 #~ msgid "You're about to delete the following macro(s) %s"
 #~ msgstr "Zamierzasz usunąć użytkownika %s."
diff --git a/gosa-plugins/gofon/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/ru/LC_MESSAGES/messages.po
index 5d79b22d9..180368c3b 100644
--- a/gosa-plugins/gofon/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 16:06+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -56,7 +56,7 @@ msgstr "Параметры"
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1413
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1788
 #: gofon/phoneaccount/class_phoneAccount.inc:1413
-#: gofon/phoneaccount/class_phoneAccount.inc:1788
+#: gofon/phoneaccount/class_phoneAccount.inc:1809
 #: gofon/conference/generic.tpl:68
 #: gofon/conference/class_phoneConferenceGeneric.inc:853
 #, fuzzy
@@ -269,7 +269,6 @@ msgstr "Настройки Samba"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:323
 #: gofon/conference/class_phoneConferenceGeneric.inc:392
-#: gofon/conference/class_divListConferences.inc:56
 #, fuzzy
 msgid "Number"
 msgstr "Номер телефона"
@@ -288,10 +287,10 @@ msgstr "Дата"
 #: gofon/phoneaccount/class_phoneAccount.inc:431
 #: gofon/phoneaccount/class_phoneAccount.inc:1109
 #: gofon/conference/class_phoneConferenceGeneric.inc:430
-#: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:176
-#: gofon/fonreports/class_fonreport.inc:180
-#: gofon/fonreports/class_fonreport.inc:198
+#: gofon/fonreports/class_fonreport.inc:196
+#: gofon/fonreports/class_fonreport.inc:200
+#: gofon/fonreports/class_fonreport.inc:217
 #, fuzzy
 msgid "GOfon"
 msgstr "Телефонные отчеты"
@@ -337,16 +336,16 @@ msgstr "Телефонные номера"
 #: gofon/phoneaccount/class_phoneAccount.inc:1211
 #: gofon/phoneaccount/class_phoneAccount.inc:1217
 #: gofon/phoneaccount/class_phoneAccount.inc:1431
-#: gofon/phoneaccount/class_phoneAccount.inc:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1571
-#: gofon/phoneaccount/class_phoneAccount.inc:1581
-#: gofon/phoneaccount/class_phoneAccount.inc:1628
+#: gofon/phoneaccount/class_phoneAccount.inc:1513
+#: gofon/phoneaccount/class_phoneAccount.inc:1592
+#: gofon/phoneaccount/class_phoneAccount.inc:1602
+#: gofon/phoneaccount/class_phoneAccount.inc:1649
 #: gofon/conference/class_phoneConferenceGeneric.inc:260
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #: gofon/conference/class_phoneConferenceGeneric.inc:618
-#: gofon/fonreports/class_fonreport.inc:176
-#: gofon/fonreports/class_fonreport.inc:180
-#: gofon/fonreports/class_fonreport.inc:198
+#: gofon/fonreports/class_fonreport.inc:196
+#: gofon/fonreports/class_fonreport.inc:200
+#: gofon/fonreports/class_fonreport.inc:217
 msgid "Error"
 msgstr ""
 
@@ -362,14 +361,15 @@ msgstr ""
 #: gofon/macro/class_gofonMacro.inc:526
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
-#: gofon/phoneaccount/class_phoneAccount.inc:1518
-#: gofon/phoneaccount/class_phoneAccount.inc:1689
+#: gofon/phoneaccount/class_phoneAccount.inc:1539
+#: gofon/phoneaccount/class_phoneAccount.inc:1710
 #: gofon/conference/class_phoneConferenceGeneric.inc:789
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:901
+#: gofon/phoneaccount/class_phoneAccount.inc:1457
 #: gofon/conference/generic.tpl:120 gofon/conference/paste_generic.tpl:15
 #, fuzzy
 msgid "Phone number"
@@ -388,7 +388,7 @@ msgstr "Телефонные номера"
 #: gofon/phoneaccount/class_phoneAccount.inc:1072
 #: gofon/phoneaccount/class_phoneAccount.inc:1076
 #: gofon/phoneaccount/class_phoneAccount.inc:1079
-#: gofon/phoneaccount/class_phoneAccount.inc:1773
+#: gofon/phoneaccount/class_phoneAccount.inc:1794
 msgid "Phone"
 msgstr "Телефон"
 
@@ -647,10 +647,10 @@ msgstr "Название"
 
 #: admin/systems/gofon/phone.tpl:17
 #: admin/systems/gofon/class_phoneGeneric.inc:517
-#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/class_divListMacros.inc:79
-#: gofon/macro/generic.tpl:27 gofon/conference/generic.tpl:49
+#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/generic.tpl:27
+#: gofon/macro/macro-list.tpl:13 gofon/conference/generic.tpl:49
 #: gofon/conference/class_phoneConferenceGeneric.inc:847
-#: gofon/conference/class_divListConferences.inc:83
+#: gofon/conference/conf-list.tpl:13
 msgid "Base"
 msgstr "Ветка"
 
@@ -667,7 +667,8 @@ msgstr "Выберите, чтобы просмотреть серверы"
 #: admin/systems/gofon/phone.tpl:34
 #: admin/systems/gofon/class_phoneGeneric.inc:518
 #: gofon/macro/class_gofonMacro.inc:574 gofon/macro/generic.tpl:49
-#: gofon/conference/generic.tpl:98
+#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:98
+#: gofon/conference/conf-list.xml:49
 #: gofon/conference/class_phoneConferenceGeneric.inc:848
 msgid "Description"
 msgstr "Описание"
@@ -678,13 +679,11 @@ msgid "phone"
 msgstr "Телефон"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:235
-#: gofon/macro/class_divListMacros.inc:121
 #, fuzzy
 msgid "yes"
 msgstr "Системы"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:235
-#: gofon/macro/class_divListMacros.inc:122
 #, fuzzy
 msgid "no"
 msgstr "нет"
@@ -716,11 +715,11 @@ msgstr "Почтовый индекс"
 #: admin/systems/gofon/class_phoneGeneric.inc:362
 #: admin/systems/gofon/class_phoneGeneric.inc:516
 #: gofon/macro/class_gofonMacro.inc:406 gofon/macro/class_gofonMacro.inc:412
-#: gofon/macro/class_divListMacros.inc:56 gofon/macro/parameter.tpl:6
+#: gofon/macro/macro-list.xml:41 gofon/macro/parameter.tpl:6
+#: gofon/conference/conf-list.xml:41
 #: gofon/conference/class_phoneConferenceGeneric.inc:388
 #: gofon/conference/class_phoneConferenceGeneric.inc:410
 #: gofon/conference/class_phoneConferenceGeneric.inc:846
-#: gofon/conference/class_divListConferences.inc:56
 msgid "Name"
 msgstr "Фамилия"
 
@@ -736,7 +735,7 @@ msgstr "Телефонные номера"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:513
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
-#: gofon/phoneaccount/class_phoneAccount.inc:1787
+#: gofon/phoneaccount/class_phoneAccount.inc:1808
 #, fuzzy
 msgid "Phone hardware"
 msgstr "Телефонное оборудование"
@@ -798,49 +797,6 @@ msgstr ""
 msgid "Hardware type"
 msgstr ""
 
-#: gofon/macro/headpage.tpl:6 gofon/macro/class_divListMacros.inc:31
-#: gofon/macro/class_divListMacros.inc:32
-#, fuzzy
-msgid "List of macros"
-msgstr "Список групп"
-
-#: gofon/macro/headpage.tpl:20 gofon/macro/class_gofonMacroParameters.inc:374
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1680
-#: gofon/conference/headpage.tpl:20
-msgid "Information"
-msgstr "Информация"
-
-#: 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 ""
-"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
-"группы пользователей. Если у вас их достаточно большое количество, вы можете "
-"использовать групповое выделение."
-
-#: gofon/macro/headpage.tpl:29 gofon/conference/headpage.tpl:29
-msgid "Filters"
-msgstr "Фильтры"
-
-#: gofon/macro/headpage.tpl:38
-#, fuzzy
-msgid "Display macros matching"
-msgstr "Шаблон для групп"
-
-#: gofon/macro/headpage.tpl:38
-#, fuzzy
-msgid "Display macros  matching"
-msgstr "Шаблон для групп"
-
-#: gofon/macro/headpage.tpl:41 gofon/macro/class_divListMacros.inc:64
-#, fuzzy
-msgid "Regular expression for matching macro names"
-msgstr "Регулярное выражение, соответствующее именам групп"
-
 #: gofon/macro/remove.tpl:2 gofon/phoneaccount/.svn/tmp/tempfile.tmp:328
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:611
@@ -851,23 +807,22 @@ msgstr "Регулярное выражение, соответствующее
 #: gofon/phoneaccount/class_phoneAccount.inc:342
 #: gofon/phoneaccount/class_phoneAccount.inc:611
 #: gofon/phoneaccount/class_phoneAccount.inc:677
-#: gofon/phoneaccount/class_phoneAccount.inc:1561
-#: gofon/phoneaccount/class_phoneAccount.inc:1938
+#: gofon/phoneaccount/class_phoneAccount.inc:1582
+#: gofon/phoneaccount/class_phoneAccount.inc:1959
 #: gofon/conference/remove.tpl:2
 #: gofon/conference/class_phoneConferenceGeneric.inc:463
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: gofon/macro/remove.tpl:6
+#: gofon/macro/remove.tpl:6 gofon/conference/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."
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
 msgstr ""
-"Это приложение может использоваться несколькими группами. Подумайте еще раз, "
-"действительно ли вы хотите удалить его, так как GOsa не сможет отменить "
-"результаты этой операции."
+"Подумайте еще раз, действительно ли вам нужно удаление, так как GOsa не "
+"сможет восстановить эти данные."
 
-#: gofon/macro/remove.tpl:9
+#: gofon/macro/remove.tpl:10 gofon/conference/remove.tpl:10
 #, fuzzy
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
@@ -908,6 +863,12 @@ msgstr "Неправильное указание таймаута '%s'"
 msgid "Parameter %s is invalid!"
 msgstr "Указанное имя уже используется."
 
+#: gofon/macro/class_gofonMacroParameters.inc:374
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1701
+msgid "Information"
+msgstr "Информация"
+
 #: gofon/macro/class_gofonMacroParameters.inc:374
 msgid ""
 "Number of parameters for this macro has changed. Please update all users "
@@ -946,9 +907,9 @@ msgstr "Название"
 #: gofon/phoneaccount/class_phoneAccount.inc:431
 #: gofon/phoneaccount/class_phoneAccount.inc:439
 #: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:1647
-#: gofon/fonreports/class_fonreport.inc:166
-#: gofon/fonreports/class_fonreport.inc:169
+#: gofon/phoneaccount/class_phoneAccount.inc:1668
+#: gofon/fonreports/class_fonreport.inc:176
+#: gofon/fonreports/class_fonreport.inc:179
 #, fuzzy
 msgid "Configuration error"
 msgstr "Настроить"
@@ -983,104 +944,6 @@ msgstr "Название"
 msgid "Visibility flag"
 msgstr ""
 
-#: gofon/macro/class_divListMacros.inc:50
-#: gofon/conference/class_divListConferences.inc:50
-#, fuzzy
-msgid "Select all"
-msgstr "Удалить"
-
-#: gofon/macro/class_divListMacros.inc:56
-msgid "Department"
-msgstr "Подразделение"
-
-#: gofon/macro/class_divListMacros.inc:57
-#, fuzzy
-msgid "Visible"
-msgstr "Переменная"
-
-#: gofon/macro/class_divListMacros.inc:58
-#: gofon/macro/class_divListMacros.inc:84
-#: gofon/conference/class_divListConferences.inc:59
-#: gofon/conference/class_divListConferences.inc:88
-msgid "Actions"
-msgstr "Действия"
-
-#: gofon/macro/class_divListMacros.inc:81
-#: gofon/conference/class_divListConferences.inc:85
-#, fuzzy
-msgid "Submit department"
-msgstr "Показать подразделения"
-
-#: gofon/macro/class_divListMacros.inc:81
-#: gofon/conference/class_divListConferences.inc:85
-msgid "Submit"
-msgstr ""
-
-#: gofon/macro/class_divListMacros.inc:89
-#: gofon/conference/class_divListConferences.inc:93
-msgid "Create"
-msgstr "Создать"
-
-#: gofon/macro/class_divListMacros.inc:91
-#: gofon/macro/class_divListMacros.inc:120
-#, fuzzy
-msgid "Macro"
-msgstr "Название"
-
-#: gofon/macro/class_divListMacros.inc:97
-#: gofon/conference/class_divListConferences.inc:101
-msgid "Remove"
-msgstr "Удалить"
-
-#: gofon/macro/class_divListMacros.inc:121
-#, fuzzy
-msgid "visible"
-msgstr "Видимый всем"
-
-#: gofon/macro/class_divListMacros.inc:122
-#, fuzzy
-msgid "invisible"
-msgstr "Видимый всем"
-
-#: gofon/macro/class_divListMacros.inc:146
-#: gofon/conference/class_divListConferences.inc:150
-#, fuzzy
-msgid "edit"
-msgstr "Изменить"
-
-#: gofon/macro/class_divListMacros.inc:147
-#, fuzzy
-msgid "Edit macro"
-msgstr "Пользователи домена"
-
-#: gofon/macro/class_divListMacros.inc:153
-#: gofon/conference/class_divListConferences.inc:158
-#, fuzzy
-msgid "delete"
-msgstr "Удалить"
-
-#: gofon/macro/class_divListMacros.inc:154
-#, fuzzy
-msgid "Delete macro"
-msgstr "Удалить"
-
-#: gofon/macro/class_divListMacros.inc:202
-#: gofon/macro/class_divListMacros.inc:203
-#, fuzzy, php-format
-msgid "Number of listed %s"
-msgstr "Подразделение"
-
-#: gofon/macro/class_divListMacros.inc:202
-#, fuzzy
-msgid "macros"
-msgstr "Название"
-
-#: gofon/macro/class_divListMacros.inc:203
-#: gofon/conference/class_divListConferences.inc:226
-#, fuzzy
-msgid "departments"
-msgstr "Подразделение"
-
 #: gofon/macro/generic.tpl:18
 msgid "Macro name to be displayed"
 msgstr ""
@@ -1095,38 +958,45 @@ msgstr "Список пользователей"
 msgid "Macro text"
 msgstr "Название"
 
-#: gofon/macro/class_gofonMacroManagement.inc:24
+#: gofon/macro/macro-list.xml:11
 #, fuzzy
-msgid "Phone macros"
-msgstr "Телефонные отчеты"
-
-#: gofon/macro/class_gofonMacroManagement.inc:25
-#: gofon/phoneaccount/class_phoneAccount.inc:7
-#: gofon/fonreports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Что-то будет"
+msgid "List of macros"
+msgstr "Список групп"
 
-#: gofon/macro/class_gofonMacroManagement.inc:273
-#: gofon/conference/class_phoneConferenceManagment.inc:187
+#: gofon/macro/macro-list.xml:15 gofon/macro/macro-list.xml:74
 #, fuzzy
-msgid "Permission"
-msgstr "Права для членов группы"
+msgid "Macro"
+msgstr "Название"
 
-#: gofon/macro/class_gofonMacroManagement.inc:320
-#: gofon/macro/class_gofonMacroManagement.inc:373
-#: gofon/macro/class_gofonMacroManagement.inc:397
-#: gofon/conference/class_phoneConferenceManagment.inc:228
-#: gofon/conference/class_phoneConferenceManagment.inc:288
-#, fuzzy
-msgid "Permission error"
-msgstr "Права для членов группы"
+#: gofon/macro/macro-list.xml:57 gofon/conference/conf-list.xml:57
+msgid "Actions"
+msgstr "Действия"
 
-#: gofon/macro/class_gofonMacroManagement.inc:366
+#: gofon/macro/macro-list.xml:68 gofon/conference/conf-list.xml:68
+msgid "Create"
+msgstr "Создать"
+
+#: gofon/macro/macro-list.xml:86 gofon/macro/macro-list.xml:125
+#: gofon/conference/conf-list.xml:86 gofon/conference/conf-list.xml:125
+msgid "Edit"
+msgstr "Изменить"
+
+#: gofon/macro/macro-list.xml:93 gofon/macro/macro-list.xml:138
+#: gofon/conference/conf-list.xml:93 gofon/conference/conf-list.xml:138
+msgid "Remove"
+msgstr "Удалить"
+
+#: gofon/macro/macro-filter.tpl:3 gofon/conference/conf-filter.tpl:3
+#: gofon/fonreports/contents.tpl:2
+msgid "Filter"
+msgstr "Фильтр"
+
+#: gofon/macro/class_gofonMacroManagement.inc:25
 #, fuzzy
-msgid "macro"
+msgid "Macros"
 msgstr "Название"
 
-#: gofon/macro/main.inc:51 gofon/macro/main.inc:55
+#: gofon/macro/class_gofonMacroManagement.inc:26
 #, fuzzy
 msgid "Phone macro management"
 msgstr "Управление системами"
@@ -1150,6 +1020,14 @@ msgstr "По умолчанию"
 msgid "You are not allowed to view the macro parameter settings"
 msgstr "У вас недостаточно прав для удаления этого пользователя!"
 
+#: gofon/macro/macro-list.tpl:13 gofon/conference/conf-list.tpl:13
+msgid "Update"
+msgstr ""
+
+#: gofon/macro/macro-list.tpl:13 gofon/conference/conf-list.tpl:13
+msgid "Submit"
+msgstr ""
+
 #: gofon/phoneaccount/generic.tpl:42 gofon/phoneaccount/paste_generic.tpl:27
 msgid "Telephone hardware"
 msgstr "Телефонное оборудование"
@@ -1242,7 +1120,7 @@ msgstr ""
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1562
 #: gofon/phoneaccount/class_phoneAccount.inc:612
 #: gofon/phoneaccount/class_phoneAccount.inc:678
-#: gofon/phoneaccount/class_phoneAccount.inc:1562
+#: gofon/phoneaccount/class_phoneAccount.inc:1583
 #, php-format
 msgid "GOsa identified problems with your MySQL table definition!"
 msgstr ""
@@ -1252,7 +1130,7 @@ msgstr ""
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1630
 #: gofon/phoneaccount/class_phoneAccount.inc:651
 #: gofon/phoneaccount/class_phoneAccount.inc:973
-#: gofon/phoneaccount/class_phoneAccount.inc:1630
+#: gofon/phoneaccount/class_phoneAccount.inc:1651
 #: gofon/conference/class_phoneConferenceGeneric.inc:620
 msgid "Please activate debugging for details!"
 msgstr ""
@@ -1304,32 +1182,32 @@ msgid "Between 1-4 charactes"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
-#: gofon/phoneaccount/class_phoneAccount.inc:1444
+#: gofon/phoneaccount/class_phoneAccount.inc:1465
 #, fuzzy, php-format
 msgid "macro parameter %s"
 msgstr "Название"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1513
 msgid "An error occured while updating the database entries!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1701
 #, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
-#: gofon/phoneaccount/class_phoneAccount.inc:1717
-#: gofon/phoneaccount/class_phoneAccount.inc:1719
+#: gofon/phoneaccount/class_phoneAccount.inc:1738
+#: gofon/phoneaccount/class_phoneAccount.inc:1740
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
-#: gofon/phoneaccount/class_phoneAccount.inc:1765
+#: gofon/phoneaccount/class_phoneAccount.inc:1786
 #, fuzzy, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -1337,80 +1215,80 @@ msgid ""
 msgstr "У выбранного приложения нет параметров."
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
-#: gofon/phoneaccount/class_phoneAccount.inc:1774
+#: gofon/phoneaccount/class_phoneAccount.inc:1795
 #, fuzzy
 msgid "Phone account settings"
 msgstr "Настройки телефона"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
-#: gofon/phoneaccount/class_phoneAccount.inc:1778
+#: gofon/phoneaccount/class_phoneAccount.inc:1799
 msgid "My account"
 msgstr "Моя учетная запись"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
-#: gofon/phoneaccount/class_phoneAccount.inc:1785
+#: gofon/phoneaccount/class_phoneAccount.inc:1806
 #: gofon/conference/class_phoneConferenceGeneric.inc:864
 #, fuzzy
 msgid "Telephone number"
 msgstr "Телефонные номера"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1807
 #, fuzzy
 msgid "Macro settings"
 msgstr "Почтовые настройки пользователя"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
-#: gofon/phoneaccount/class_phoneAccount.inc:1789
+#: gofon/phoneaccount/class_phoneAccount.inc:1810
 #, fuzzy
 msgid "Phone context"
 msgstr "Название"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
-#: gofon/phoneaccount/class_phoneAccount.inc:1790
+#: gofon/phoneaccount/class_phoneAccount.inc:1811
 msgid "Voice mail context"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
-#: gofon/phoneaccount/class_phoneAccount.inc:1791
+#: gofon/phoneaccount/class_phoneAccount.inc:1812
 #, fuzzy
 msgid "Telephone pin"
 msgstr "Телефон"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
-#: gofon/phoneaccount/class_phoneAccount.inc:1792
+#: gofon/phoneaccount/class_phoneAccount.inc:1813
 msgid "Voicemail pin"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
-#: gofon/phoneaccount/class_phoneAccount.inc:1874
+#: gofon/phoneaccount/class_phoneAccount.inc:1895
 msgid "There is currently no asterisk server defined!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
-#: gofon/phoneaccount/class_phoneAccount.inc:1878
+#: gofon/phoneaccount/class_phoneAccount.inc:1899
 msgid "Asterisk server is invalid!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
-#: gofon/phoneaccount/class_phoneAccount.inc:1884
+#: gofon/phoneaccount/class_phoneAccount.inc:1905
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
-#: gofon/phoneaccount/class_phoneAccount.inc:1887
+#: gofon/phoneaccount/class_phoneAccount.inc:1908
 #, fuzzy
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "Неправильное указание таймаута '%s'"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
-#: gofon/phoneaccount/class_phoneAccount.inc:1892
+#: gofon/phoneaccount/class_phoneAccount.inc:1913
 #, fuzzy
 msgid "Phone pin contains invalid characters!"
 msgstr "Неправильное указание таймаута '%s'"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
-#: gofon/phoneaccount/class_phoneAccount.inc:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1920
 #, fuzzy, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr "Неправильное указание таймаута '%s'"
@@ -1419,76 +1297,20 @@ msgstr "Неправильное указание таймаута '%s'"
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr "Нажмите 'Изменить' чтобы отредактировать данные в этой форме."
 
-#: gofon/conference/headpage.tpl:6
-#: gofon/conference/class_divListConferences.inc:31
-#: gofon/conference/class_divListConferences.inc:32
-#, fuzzy
-msgid "List of conference rooms"
-msgstr "Список групп"
-
-#: 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 ""
-"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
-"подразделения. Если у вас достаточно большое количество подразделений, вы "
-"можете использовать групповое выделение."
-
-#: gofon/conference/headpage.tpl:35
-msgid "Display users matching"
-msgstr "Фильтр"
-
-#: gofon/conference/headpage.tpl:36
-#, fuzzy
-msgid "Regular expression for        matching user names"
-msgstr "Регулярное выражение, соответствующее именам пользователей"
-
-#: gofon/conference/remove.tpl:6
-#, fuzzy
-msgid ""
-"This includes 'all' accounts, systems, etc. in this subtree. 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 не сможет отменить результаты этой операции."
-
-#: 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>."
-
-#: gofon/conference/class_phoneConferenceManagment.inc:24
-#, fuzzy
-msgid "Phone conferences"
-msgstr "Номер телефона"
+#: gofon/phoneaccount/class_phoneAccount.inc:7
+#: gofon/fonreports/class_fonreport.inc:7
+msgid "This does something"
+msgstr "Что-то будет"
 
 #: gofon/conference/class_phoneConferenceManagment.inc:25
 #, fuzzy
-msgid "Management"
-msgstr "Название"
-
-#: gofon/conference/class_phoneConferenceManagment.inc:206
-#: gofon/conference/class_phoneConferenceManagment.inc:267
-#, fuzzy
-msgid "conference"
+msgid "conferences"
 msgstr "Ссылки"
 
-#: gofon/conference/class_phoneConferenceManagment.inc:228
-#: gofon/conference/class_phoneConferenceManagment.inc:288
+#: gofon/conference/class_phoneConferenceManagment.inc:26
 #, fuzzy
-msgid "You have not permission to delete this entry!"
-msgstr "У вас недостаточно прав для удаления этого подразделения."
+msgid "Conference management"
+msgstr "Управление подразделениями"
 
 #: gofon/conference/generic.tpl:5
 msgid "Properties"
@@ -1534,7 +1356,6 @@ msgstr "присутствует"
 
 #: gofon/conference/generic.tpl:165
 #: gofon/conference/class_phoneConferenceGeneric.inc:384
-#: gofon/conference/class_divListConferences.inc:58
 msgid "PIN"
 msgstr ""
 
@@ -1571,6 +1392,17 @@ msgstr ""
 msgid "Count users"
 msgstr "Страна"
 
+#: gofon/conference/conf-list.xml:11
+#, fuzzy
+msgid "List of conference rooms"
+msgstr "Список групп"
+
+#: gofon/conference/conf-list.xml:15 gofon/conference/conf-list.xml:74
+#: gofon/conference/class_phoneConferenceGeneric.inc:836
+#, fuzzy
+msgid "Conference"
+msgstr "Ссылки"
+
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #, php-format
 msgid "Cannot delete entry from server '%s' because it seems to be removed!"
@@ -1600,13 +1432,6 @@ msgstr ""
 msgid "'%s' is already assigned to '%s'!"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:836
-#: gofon/conference/class_divListConferences.inc:95
-#: gofon/conference/class_divListConferences.inc:208
-#, fuzzy
-msgid "Conference"
-msgstr "Ссылки"
-
 #: gofon/conference/class_phoneConferenceGeneric.inc:837
 #, fuzzy
 msgid "Phone conference management"
@@ -1647,104 +1472,63 @@ msgid "Format"
 msgstr "Порт"
 
 #: gofon/conference/class_phoneConferenceGeneric.inc:865
-#: gofon/conference/class_divListConferences.inc:57
 msgid "Owner"
 msgstr ""
 
-#: gofon/conference/main.inc:48 gofon/conference/main.inc:50
-#, fuzzy
-msgid "Conference management"
-msgstr "Управление подразделениями"
-
-#: gofon/conference/class_divListConferences.inc:65
-#, fuzzy
-msgid "Regular expression for matching conference names"
-msgstr "Регулярное выражение, соответствующее именам пользователей"
-
-#: gofon/conference/class_divListConferences.inc:150
-#, fuzzy
-msgid "Edit this entry"
-msgstr "Редактиовать объект"
-
-#: gofon/conference/class_divListConferences.inc:158
-#, fuzzy
-msgid "Delete this entry"
-msgstr "Удалить"
-
-#: gofon/conference/class_divListConferences.inc:185
-#, fuzzy
-msgid "Unknown"
-msgstr "состояние неизвестно"
-
-#: gofon/conference/class_divListConferences.inc:225
-#: gofon/conference/class_divListConferences.inc:226
-#, fuzzy, php-format
-msgid "Number of listed '%s'"
-msgstr "Подразделение"
-
-#: gofon/conference/class_divListConferences.inc:225
-#, fuzzy
-msgid "conferences"
-msgstr "Ссылки"
-
 #: gofon/fonreports/class_fonreport.inc:6
 msgid "Phone Reports"
 msgstr "Телефонные отчеты"
 
-#: gofon/fonreports/class_fonreport.inc:210
+#: gofon/fonreports/class_fonreport.inc:229
 #, fuzzy
 msgid "Insufficient permissions"
 msgstr "Права для членов группы"
 
-#: gofon/fonreports/class_fonreport.inc:229
+#: gofon/fonreports/class_fonreport.inc:248
 msgid "Y-M-D"
 msgstr "Г-М-Д"
 
-#: gofon/fonreports/class_fonreport.inc:396
-#: gofon/fonreports/class_fonreport.inc:397
-#: gofon/fonreports/class_fonreport.inc:404 gofon/fonreports/main.inc:22
+#: gofon/fonreports/class_fonreport.inc:415
+#: gofon/fonreports/class_fonreport.inc:416
+#: gofon/fonreports/class_fonreport.inc:423 gofon/fonreports/main.inc:22
 msgid "Phone reports"
 msgstr "Телефонные отчеты"
 
-#: gofon/fonreports/class_fonreport.inc:397
+#: gofon/fonreports/class_fonreport.inc:416
 #, fuzzy
 msgid "All entries are readonly"
 msgstr "Все поля доступны для записи"
 
-#: gofon/fonreports/class_fonreport.inc:409 gofon/fonreports/contents.tpl:30
+#: gofon/fonreports/class_fonreport.inc:428 gofon/fonreports/contents.tpl:34
 msgid "Date"
 msgstr "Дата"
 
-#: gofon/fonreports/class_fonreport.inc:410 gofon/fonreports/contents.tpl:31
+#: gofon/fonreports/class_fonreport.inc:429 gofon/fonreports/contents.tpl:35
 msgid "Source"
 msgstr "Источник"
 
-#: gofon/fonreports/class_fonreport.inc:411 gofon/fonreports/contents.tpl:32
+#: gofon/fonreports/class_fonreport.inc:430 gofon/fonreports/contents.tpl:36
 msgid "Destination"
 msgstr "Назначение"
 
-#: gofon/fonreports/class_fonreport.inc:412 gofon/fonreports/contents.tpl:33
+#: gofon/fonreports/class_fonreport.inc:431 gofon/fonreports/contents.tpl:37
 msgid "Channel"
 msgstr "Канал"
 
-#: gofon/fonreports/class_fonreport.inc:413
+#: gofon/fonreports/class_fonreport.inc:432
 #, fuzzy
 msgid "Application called"
 msgstr "Приложение"
 
-#: gofon/fonreports/class_fonreport.inc:414
+#: gofon/fonreports/class_fonreport.inc:433
 #, fuzzy
 msgid "Disposition"
 msgstr "Отключение"
 
-#: gofon/fonreports/class_fonreport.inc:415 gofon/fonreports/contents.tpl:36
+#: gofon/fonreports/class_fonreport.inc:434 gofon/fonreports/contents.tpl:40
 msgid "Duration"
 msgstr "Продолжительность"
 
-#: gofon/fonreports/contents.tpl:2
-msgid "Filter"
-msgstr "Фильтр"
-
 #: gofon/fonreports/contents.tpl:6
 msgid "Search for"
 msgstr "Поиск"
@@ -1753,7 +1537,7 @@ msgstr "Поиск"
 msgid "Enter user name to search for"
 msgstr "Введите искомое имя пользователя"
 
-#: gofon/fonreports/contents.tpl:8 gofon/fonreports/contents.tpl:16
+#: gofon/fonreports/contents.tpl:8 gofon/fonreports/contents.tpl:20
 msgid "in"
 msgstr "в"
 
@@ -1762,25 +1546,208 @@ msgid "Select subtree to base search on"
 msgstr "Выберите ветку для поиска"
 
 #: gofon/fonreports/contents.tpl:12
+#, fuzzy
+msgid "on"
+msgstr "Домен"
+
+#: gofon/fonreports/contents.tpl:13
+#, fuzzy
+msgid "Select server to search on"
+msgstr "Выберите ветку для поиска"
+
+#: gofon/fonreports/contents.tpl:16
 msgid "during"
 msgstr "в течение"
 
-#: gofon/fonreports/contents.tpl:21
+#: gofon/fonreports/contents.tpl:25
 msgid "Search"
 msgstr "Поиск"
 
-#: gofon/fonreports/contents.tpl:34
+#: gofon/fonreports/contents.tpl:38
 msgid "Application"
 msgstr "Приложение"
 
-#: gofon/fonreports/contents.tpl:35
+#: gofon/fonreports/contents.tpl:39
 msgid "Status"
 msgstr "Состояние"
 
-#: gofon/fonreports/contents.tpl:51
+#: gofon/fonreports/contents.tpl:55
 msgid "Search returned no results..."
 msgstr "Не найдено..."
 
+#, 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 ""
+#~ "С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+#~ "группы пользователей. Если у вас их достаточно большое количество, вы "
+#~ "можете использовать групповое выделение."
+
+#~ msgid "Filters"
+#~ msgstr "Фильтры"
+
+#, fuzzy
+#~ msgid "Display macros matching"
+#~ msgstr "Шаблон для групп"
+
+#, fuzzy
+#~ msgid "Display macros  matching"
+#~ msgstr "Шаблон для групп"
+
+#, fuzzy
+#~ msgid "Regular expression for matching macro names"
+#~ msgstr "Регулярное выражение, соответствующее именам групп"
+
+#~ 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 ""
+#~ "Это приложение может использоваться несколькими группами. Подумайте еще "
+#~ "раз, действительно ли вы хотите удалить его, так как GOsa не сможет "
+#~ "отменить результаты этой операции."
+
+#, fuzzy
+#~ msgid "Select all"
+#~ msgstr "Удалить"
+
+#~ msgid "Department"
+#~ msgstr "Подразделение"
+
+#, fuzzy
+#~ msgid "Visible"
+#~ msgstr "Переменная"
+
+#, fuzzy
+#~ msgid "Submit department"
+#~ msgstr "Показать подразделения"
+
+#, fuzzy
+#~ msgid "visible"
+#~ msgstr "Видимый всем"
+
+#, fuzzy
+#~ msgid "invisible"
+#~ msgstr "Видимый всем"
+
+#, fuzzy
+#~ msgid "edit"
+#~ msgstr "Изменить"
+
+#, fuzzy
+#~ msgid "Edit macro"
+#~ msgstr "Пользователи домена"
+
+#, fuzzy
+#~ msgid "delete"
+#~ msgstr "Удалить"
+
+#, fuzzy
+#~ msgid "Delete macro"
+#~ msgstr "Удалить"
+
+#, fuzzy
+#~ msgid "Number of listed %s"
+#~ msgstr "Подразделение"
+
+#, fuzzy
+#~ msgid "macros"
+#~ msgstr "Название"
+
+#, fuzzy
+#~ msgid "departments"
+#~ msgstr "Подразделение"
+
+#, fuzzy
+#~ msgid "Phone macros"
+#~ msgstr "Телефонные отчеты"
+
+#, fuzzy
+#~ msgid "Permission"
+#~ msgstr "Права для членов группы"
+
+#, fuzzy
+#~ msgid "Permission error"
+#~ msgstr "Права для членов группы"
+
+#, fuzzy
+#~ msgid "macro"
+#~ msgstr "Название"
+
+#, 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 ""
+#~ "С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+#~ "подразделения. Если у вас достаточно большое количество подразделений, вы "
+#~ "можете использовать групповое выделение."
+
+#~ msgid "Display users matching"
+#~ msgstr "Фильтр"
+
+#, fuzzy
+#~ msgid "Regular expression for        matching user names"
+#~ msgstr "Регулярное выражение, соответствующее именам пользователей"
+
+#, fuzzy
+#~ msgid ""
+#~ "This includes 'all' accounts, systems, etc. in this subtree. 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 не сможет отменить результаты этой операции."
+
+#, 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>."
+
+#, fuzzy
+#~ msgid "Phone conferences"
+#~ msgstr "Номер телефона"
+
+#, fuzzy
+#~ msgid "Management"
+#~ msgstr "Название"
+
+#, fuzzy
+#~ msgid "conference"
+#~ msgstr "Ссылки"
+
+#, fuzzy
+#~ msgid "You have not permission to delete this entry!"
+#~ msgstr "У вас недостаточно прав для удаления этого подразделения."
+
+#, fuzzy
+#~ msgid "Regular expression for matching conference names"
+#~ msgstr "Регулярное выражение, соответствующее именам пользователей"
+
+#, fuzzy
+#~ msgid "Edit this entry"
+#~ msgstr "Редактиовать объект"
+
+#, fuzzy
+#~ msgid "Delete this entry"
+#~ msgstr "Удалить"
+
+#, fuzzy
+#~ msgid "Unknown"
+#~ msgstr "состояние неизвестно"
+
+#, fuzzy
+#~ msgid "Number of listed '%s'"
+#~ msgstr "Подразделение"
+
 #~ msgid "Addons"
 #~ msgstr "Дополнительно"
 
@@ -1908,9 +1875,6 @@ msgstr "Не найдено..."
 #~ msgid "Add"
 #~ msgstr "Добавить"
 
-#~ msgid "Edit"
-#~ msgstr "Изменить"
-
 #, fuzzy
 #~ msgid "You're about to delete the following macro(s) %s"
 #~ msgstr "Вы собираетесь удалить пользователя %s."
diff --git a/gosa-plugins/gofon/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/zh/LC_MESSAGES/messages.po
index 4f7b0e6cf..5dde7ac7f 100644
--- a/gosa-plugins/gofon/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 16:06+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -55,7 +55,7 @@ msgstr "选项"
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1413
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1788
 #: gofon/phoneaccount/class_phoneAccount.inc:1413
-#: gofon/phoneaccount/class_phoneAccount.inc:1788
+#: gofon/phoneaccount/class_phoneAccount.inc:1809
 #: gofon/conference/generic.tpl:68
 #: gofon/conference/class_phoneConferenceGeneric.inc:853
 msgid "Home server"
@@ -257,7 +257,6 @@ msgstr "最大队列长度"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:323
 #: gofon/conference/class_phoneConferenceGeneric.inc:392
-#: gofon/conference/class_divListConferences.inc:56
 #, fuzzy
 msgid "Number"
 msgstr "名称 - 数字"
@@ -276,10 +275,10 @@ msgstr "粘贴"
 #: gofon/phoneaccount/class_phoneAccount.inc:431
 #: gofon/phoneaccount/class_phoneAccount.inc:1109
 #: gofon/conference/class_phoneConferenceGeneric.inc:430
-#: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:176
-#: gofon/fonreports/class_fonreport.inc:180
-#: gofon/fonreports/class_fonreport.inc:198
+#: gofon/fonreports/class_fonreport.inc:196
+#: gofon/fonreports/class_fonreport.inc:200
+#: gofon/fonreports/class_fonreport.inc:217
 #, fuzzy
 msgid "GOfon"
 msgstr "没有宏"
@@ -323,16 +322,16 @@ msgstr "电话号码"
 #: gofon/phoneaccount/class_phoneAccount.inc:1211
 #: gofon/phoneaccount/class_phoneAccount.inc:1217
 #: gofon/phoneaccount/class_phoneAccount.inc:1431
-#: gofon/phoneaccount/class_phoneAccount.inc:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1571
-#: gofon/phoneaccount/class_phoneAccount.inc:1581
-#: gofon/phoneaccount/class_phoneAccount.inc:1628
+#: gofon/phoneaccount/class_phoneAccount.inc:1513
+#: gofon/phoneaccount/class_phoneAccount.inc:1592
+#: gofon/phoneaccount/class_phoneAccount.inc:1602
+#: gofon/phoneaccount/class_phoneAccount.inc:1649
 #: gofon/conference/class_phoneConferenceGeneric.inc:260
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #: gofon/conference/class_phoneConferenceGeneric.inc:618
-#: gofon/fonreports/class_fonreport.inc:176
-#: gofon/fonreports/class_fonreport.inc:180
-#: gofon/fonreports/class_fonreport.inc:198
+#: gofon/fonreports/class_fonreport.inc:196
+#: gofon/fonreports/class_fonreport.inc:200
+#: gofon/fonreports/class_fonreport.inc:217
 msgid "Error"
 msgstr "错误"
 
@@ -348,14 +347,15 @@ msgstr "错误"
 #: gofon/macro/class_gofonMacro.inc:526
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
-#: gofon/phoneaccount/class_phoneAccount.inc:1518
-#: gofon/phoneaccount/class_phoneAccount.inc:1689
+#: gofon/phoneaccount/class_phoneAccount.inc:1539
+#: gofon/phoneaccount/class_phoneAccount.inc:1710
 #: gofon/conference/class_phoneConferenceGeneric.inc:789
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:901
+#: gofon/phoneaccount/class_phoneAccount.inc:1457
 #: gofon/conference/generic.tpl:120 gofon/conference/paste_generic.tpl:15
 msgid "Phone number"
 msgstr "电话号码"
@@ -373,7 +373,7 @@ msgstr "电话号码"
 #: gofon/phoneaccount/class_phoneAccount.inc:1072
 #: gofon/phoneaccount/class_phoneAccount.inc:1076
 #: gofon/phoneaccount/class_phoneAccount.inc:1079
-#: gofon/phoneaccount/class_phoneAccount.inc:1773
+#: gofon/phoneaccount/class_phoneAccount.inc:1794
 msgid "Phone"
 msgstr "电话"
 
@@ -622,10 +622,10 @@ msgstr "电话名称"
 
 #: admin/systems/gofon/phone.tpl:17
 #: admin/systems/gofon/class_phoneGeneric.inc:517
-#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/class_divListMacros.inc:79
-#: gofon/macro/generic.tpl:27 gofon/conference/generic.tpl:49
+#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/generic.tpl:27
+#: gofon/macro/macro-list.tpl:13 gofon/conference/generic.tpl:49
 #: gofon/conference/class_phoneConferenceGeneric.inc:847
-#: gofon/conference/class_divListConferences.inc:83
+#: gofon/conference/conf-list.tpl:13
 msgid "Base"
 msgstr "位置"
 
@@ -641,7 +641,8 @@ msgstr "选择一个位置"
 #: admin/systems/gofon/phone.tpl:34
 #: admin/systems/gofon/class_phoneGeneric.inc:518
 #: gofon/macro/class_gofonMacro.inc:574 gofon/macro/generic.tpl:49
-#: gofon/conference/generic.tpl:98
+#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:98
+#: gofon/conference/conf-list.xml:49
 #: gofon/conference/class_phoneConferenceGeneric.inc:848
 msgid "Description"
 msgstr "描述"
@@ -652,12 +653,10 @@ msgid "phone"
 msgstr "电话"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:235
-#: gofon/macro/class_divListMacros.inc:121
 msgid "yes"
 msgstr "是"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:235
-#: gofon/macro/class_divListMacros.inc:122
 msgid "no"
 msgstr "否"
 
@@ -687,11 +686,11 @@ msgstr "地址"
 #: admin/systems/gofon/class_phoneGeneric.inc:362
 #: admin/systems/gofon/class_phoneGeneric.inc:516
 #: gofon/macro/class_gofonMacro.inc:406 gofon/macro/class_gofonMacro.inc:412
-#: gofon/macro/class_divListMacros.inc:56 gofon/macro/parameter.tpl:6
+#: gofon/macro/macro-list.xml:41 gofon/macro/parameter.tpl:6
+#: gofon/conference/conf-list.xml:41
 #: gofon/conference/class_phoneConferenceGeneric.inc:388
 #: gofon/conference/class_phoneConferenceGeneric.inc:410
 #: gofon/conference/class_phoneConferenceGeneric.inc:846
-#: gofon/conference/class_divListConferences.inc:56
 msgid "Name"
 msgstr "名称"
 
@@ -707,7 +706,7 @@ msgstr "电话号码"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:513
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
-#: gofon/phoneaccount/class_phoneAccount.inc:1787
+#: gofon/phoneaccount/class_phoneAccount.inc:1808
 #, fuzzy
 msgid "Phone hardware"
 msgstr "电话硬件"
@@ -768,43 +767,6 @@ msgstr ""
 msgid "Hardware type"
 msgstr ""
 
-#: gofon/macro/headpage.tpl:6 gofon/macro/class_divListMacros.inc:31
-#: gofon/macro/class_divListMacros.inc:32
-msgid "List of macros"
-msgstr "宏列表"
-
-#: gofon/macro/headpage.tpl:20 gofon/macro/class_gofonMacroParameters.inc:374
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1680
-#: gofon/conference/headpage.tpl:20
-msgid "Information"
-msgstr "提示信息"
-
-#: 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 ""
-"这个菜单允许您添加，编辑和删除所选的宏。对于一个长列表，您可以通过选择框上面"
-"的范围选择来调整。"
-
-#: gofon/macro/headpage.tpl:29 gofon/conference/headpage.tpl:29
-msgid "Filters"
-msgstr "过滤器"
-
-#: gofon/macro/headpage.tpl:38
-msgid "Display macros matching"
-msgstr "显示匹配的宏"
-
-#: gofon/macro/headpage.tpl:38
-msgid "Display macros  matching"
-msgstr "显示匹配的宏"
-
-#: gofon/macro/headpage.tpl:41 gofon/macro/class_divListMacros.inc:64
-msgid "Regular expression for matching macro names"
-msgstr "匹配宏名的正则表达式"
-
 #: gofon/macro/remove.tpl:2 gofon/phoneaccount/.svn/tmp/tempfile.tmp:328
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:611
@@ -815,22 +777,20 @@ msgstr "匹配宏名的正则表达式"
 #: gofon/phoneaccount/class_phoneAccount.inc:342
 #: gofon/phoneaccount/class_phoneAccount.inc:611
 #: gofon/phoneaccount/class_phoneAccount.inc:677
-#: gofon/phoneaccount/class_phoneAccount.inc:1561
-#: gofon/phoneaccount/class_phoneAccount.inc:1938
+#: gofon/phoneaccount/class_phoneAccount.inc:1582
+#: gofon/phoneaccount/class_phoneAccount.inc:1959
 #: gofon/conference/remove.tpl:2
 #: gofon/conference/class_phoneConferenceGeneric.inc:463
 msgid "Warning"
 msgstr "警告"
 
-#: gofon/macro/remove.tpl:6
+#: gofon/macro/remove.tpl:6 gofon/conference/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 ""
-"这可能被好几个组使用。请再次检查您是否要这么做，因为 GOsa 没有办法将您的数据"
-"找回。"
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr "请再次检查您是否要这么做，因为 GOsa 没有办法将您的数据找回。"
 
-#: gofon/macro/remove.tpl:9
+#: gofon/macro/remove.tpl:10 gofon/conference/remove.tpl:10
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "所以，如果您确定，请按“删除”继续，否则按“取消”退出。"
 
@@ -865,6 +825,12 @@ msgstr "参数 %s 包含无效字符。'!,#' 用做分隔符"
 msgid "Parameter %s is invalid!"
 msgstr "指定的 branch 名称无效。"
 
+#: gofon/macro/class_gofonMacroParameters.inc:374
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1701
+msgid "Information"
+msgstr "提示信息"
+
 #: gofon/macro/class_gofonMacroParameters.inc:374
 msgid ""
 "Number of parameters for this macro has changed. Please update all users "
@@ -903,9 +869,9 @@ msgstr "宏文本"
 #: gofon/phoneaccount/class_phoneAccount.inc:431
 #: gofon/phoneaccount/class_phoneAccount.inc:439
 #: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:1647
-#: gofon/fonreports/class_fonreport.inc:166
-#: gofon/fonreports/class_fonreport.inc:169
+#: gofon/phoneaccount/class_phoneAccount.inc:1668
+#: gofon/fonreports/class_fonreport.inc:176
+#: gofon/fonreports/class_fonreport.inc:179
 #, fuzzy
 msgid "Configuration error"
 msgstr "配置文件"
@@ -939,95 +905,6 @@ msgstr "启动参数"
 msgid "Visibility flag"
 msgstr ""
 
-#: gofon/macro/class_divListMacros.inc:50
-#: gofon/conference/class_divListConferences.inc:50
-#, fuzzy
-msgid "Select all"
-msgstr "选择"
-
-#: gofon/macro/class_divListMacros.inc:56
-msgid "Department"
-msgstr "部门"
-
-#: gofon/macro/class_divListMacros.inc:57
-msgid "Visible"
-msgstr "可见"
-
-#: gofon/macro/class_divListMacros.inc:58
-#: gofon/macro/class_divListMacros.inc:84
-#: gofon/conference/class_divListConferences.inc:59
-#: gofon/conference/class_divListConferences.inc:88
-msgid "Actions"
-msgstr "动作"
-
-#: gofon/macro/class_divListMacros.inc:81
-#: gofon/conference/class_divListConferences.inc:85
-msgid "Submit department"
-msgstr "提交部门"
-
-#: gofon/macro/class_divListMacros.inc:81
-#: gofon/conference/class_divListConferences.inc:85
-msgid "Submit"
-msgstr "提交"
-
-#: gofon/macro/class_divListMacros.inc:89
-#: gofon/conference/class_divListConferences.inc:93
-msgid "Create"
-msgstr "创建"
-
-#: gofon/macro/class_divListMacros.inc:91
-#: gofon/macro/class_divListMacros.inc:120
-msgid "Macro"
-msgstr "宏"
-
-#: gofon/macro/class_divListMacros.inc:97
-#: gofon/conference/class_divListConferences.inc:101
-msgid "Remove"
-msgstr "删除"
-
-#: gofon/macro/class_divListMacros.inc:121
-msgid "visible"
-msgstr "可见"
-
-#: gofon/macro/class_divListMacros.inc:122
-msgid "invisible"
-msgstr "不可见"
-
-#: gofon/macro/class_divListMacros.inc:146
-#: gofon/conference/class_divListConferences.inc:150
-msgid "edit"
-msgstr "编辑"
-
-#: gofon/macro/class_divListMacros.inc:147
-msgid "Edit macro"
-msgstr "编辑宏"
-
-#: gofon/macro/class_divListMacros.inc:153
-#: gofon/conference/class_divListConferences.inc:158
-msgid "delete"
-msgstr "删除"
-
-#: gofon/macro/class_divListMacros.inc:154
-msgid "Delete macro"
-msgstr "删除宏"
-
-#: gofon/macro/class_divListMacros.inc:202
-#: gofon/macro/class_divListMacros.inc:203
-#, fuzzy, php-format
-msgid "Number of listed %s"
-msgstr "部门名称"
-
-#: gofon/macro/class_divListMacros.inc:202
-#, fuzzy
-msgid "macros"
-msgstr "宏"
-
-#: gofon/macro/class_divListMacros.inc:203
-#: gofon/conference/class_divListConferences.inc:226
-#, fuzzy
-msgid "departments"
-msgstr "部门"
-
 #: gofon/macro/generic.tpl:18
 msgid "Macro name to be displayed"
 msgstr "要显示的宏名称"
@@ -1040,38 +917,43 @@ msgstr "用户可见"
 msgid "Macro text"
 msgstr "宏文本"
 
-#: gofon/macro/class_gofonMacroManagement.inc:24
-msgid "Phone macros"
-msgstr "电话宏"
+#: gofon/macro/macro-list.xml:11
+msgid "List of macros"
+msgstr "宏列表"
 
-#: gofon/macro/class_gofonMacroManagement.inc:25
-#: gofon/phoneaccount/class_phoneAccount.inc:7
-#: gofon/fonreports/class_fonreport.inc:7
-#, fuzzy
-msgid "This does something"
-msgstr "******"
+#: gofon/macro/macro-list.xml:15 gofon/macro/macro-list.xml:74
+msgid "Macro"
+msgstr "宏"
 
-#: gofon/macro/class_gofonMacroManagement.inc:273
-#: gofon/conference/class_phoneConferenceManagment.inc:187
-#, fuzzy
-msgid "Permission"
-msgstr "允许"
+#: gofon/macro/macro-list.xml:57 gofon/conference/conf-list.xml:57
+msgid "Actions"
+msgstr "动作"
 
-#: gofon/macro/class_gofonMacroManagement.inc:320
-#: gofon/macro/class_gofonMacroManagement.inc:373
-#: gofon/macro/class_gofonMacroManagement.inc:397
-#: gofon/conference/class_phoneConferenceManagment.inc:228
-#: gofon/conference/class_phoneConferenceManagment.inc:288
-#, fuzzy
-msgid "Permission error"
-msgstr "允许"
+#: gofon/macro/macro-list.xml:68 gofon/conference/conf-list.xml:68
+msgid "Create"
+msgstr "创建"
+
+#: gofon/macro/macro-list.xml:86 gofon/macro/macro-list.xml:125
+#: gofon/conference/conf-list.xml:86 gofon/conference/conf-list.xml:125
+msgid "Edit"
+msgstr "编辑"
+
+#: gofon/macro/macro-list.xml:93 gofon/macro/macro-list.xml:138
+#: gofon/conference/conf-list.xml:93 gofon/conference/conf-list.xml:138
+msgid "Remove"
+msgstr "删除"
 
-#: gofon/macro/class_gofonMacroManagement.inc:366
+#: gofon/macro/macro-filter.tpl:3 gofon/conference/conf-filter.tpl:3
+#: gofon/fonreports/contents.tpl:2
+msgid "Filter"
+msgstr "过滤器"
+
+#: gofon/macro/class_gofonMacroManagement.inc:25
 #, fuzzy
-msgid "macro"
+msgid "Macros"
 msgstr "宏"
 
-#: gofon/macro/main.inc:51 gofon/macro/main.inc:55
+#: gofon/macro/class_gofonMacroManagement.inc:26
 msgid "Phone macro management"
 msgstr "电话宏管理"
 
@@ -1092,6 +974,14 @@ msgstr "缺省值"
 msgid "You are not allowed to view the macro parameter settings"
 msgstr "您无权删除这个宏！"
 
+#: gofon/macro/macro-list.tpl:13 gofon/conference/conf-list.tpl:13
+msgid "Update"
+msgstr ""
+
+#: gofon/macro/macro-list.tpl:13 gofon/conference/conf-list.tpl:13
+msgid "Submit"
+msgstr "提交"
+
 #: gofon/phoneaccount/generic.tpl:42 gofon/phoneaccount/paste_generic.tpl:27
 msgid "Telephone hardware"
 msgstr "电话硬件"
@@ -1183,7 +1073,7 @@ msgstr ""
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1562
 #: gofon/phoneaccount/class_phoneAccount.inc:612
 #: gofon/phoneaccount/class_phoneAccount.inc:678
-#: gofon/phoneaccount/class_phoneAccount.inc:1562
+#: gofon/phoneaccount/class_phoneAccount.inc:1583
 #, php-format
 msgid "GOsa identified problems with your MySQL table definition!"
 msgstr ""
@@ -1193,7 +1083,7 @@ msgstr ""
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1630
 #: gofon/phoneaccount/class_phoneAccount.inc:651
 #: gofon/phoneaccount/class_phoneAccount.inc:973
-#: gofon/phoneaccount/class_phoneAccount.inc:1630
+#: gofon/phoneaccount/class_phoneAccount.inc:1651
 #: gofon/conference/class_phoneConferenceGeneric.inc:620
 msgid "Please activate debugging for details!"
 msgstr ""
@@ -1245,32 +1135,32 @@ msgid "Between 1-4 charactes"
 msgstr "语音邮件 PIN 必须包含 1-4 个字符。"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
-#: gofon/phoneaccount/class_phoneAccount.inc:1444
+#: gofon/phoneaccount/class_phoneAccount.inc:1465
 #, fuzzy, php-format
 msgid "macro parameter %s"
 msgstr "启动参数"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1513
 msgid "An error occured while updating the database entries!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1701
 #, fuzzy, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr "删除用户 '%s'，从电话队列 '%s'。"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
-#: gofon/phoneaccount/class_phoneAccount.inc:1717
-#: gofon/phoneaccount/class_phoneAccount.inc:1719
+#: gofon/phoneaccount/class_phoneAccount.inc:1738
+#: gofon/phoneaccount/class_phoneAccount.inc:1740
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr "指定的电话号码 '%s' 已经分配给了 '%s'。"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
-#: gofon/phoneaccount/class_phoneAccount.inc:1765
+#: gofon/phoneaccount/class_phoneAccount.inc:1786
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -1278,83 +1168,83 @@ msgid ""
 msgstr "之前选择的 asterisk 主服务器 (%s) 不存在了。删除终止。"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
-#: gofon/phoneaccount/class_phoneAccount.inc:1774
+#: gofon/phoneaccount/class_phoneAccount.inc:1795
 #, fuzzy
 msgid "Phone account settings"
 msgstr "电话设置"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
-#: gofon/phoneaccount/class_phoneAccount.inc:1778
+#: gofon/phoneaccount/class_phoneAccount.inc:1799
 msgid "My account"
 msgstr "我的账号"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
-#: gofon/phoneaccount/class_phoneAccount.inc:1785
+#: gofon/phoneaccount/class_phoneAccount.inc:1806
 #: gofon/conference/class_phoneConferenceGeneric.inc:864
 #, fuzzy
 msgid "Telephone number"
 msgstr "电话号码"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1807
 #, fuzzy
 msgid "Macro settings"
 msgstr "邮件选项"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
-#: gofon/phoneaccount/class_phoneAccount.inc:1789
+#: gofon/phoneaccount/class_phoneAccount.inc:1810
 #, fuzzy
 msgid "Phone context"
 msgstr "电话名称"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
-#: gofon/phoneaccount/class_phoneAccount.inc:1790
+#: gofon/phoneaccount/class_phoneAccount.inc:1811
 #, fuzzy
 msgid "Voice mail context"
 msgstr "语音邮件 PIN"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
-#: gofon/phoneaccount/class_phoneAccount.inc:1791
+#: gofon/phoneaccount/class_phoneAccount.inc:1812
 #, fuzzy
 msgid "Telephone pin"
 msgstr "电话"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
-#: gofon/phoneaccount/class_phoneAccount.inc:1792
+#: gofon/phoneaccount/class_phoneAccount.inc:1813
 #, fuzzy
 msgid "Voicemail pin"
 msgstr "语音邮件 PIN"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
-#: gofon/phoneaccount/class_phoneAccount.inc:1874
+#: gofon/phoneaccount/class_phoneAccount.inc:1895
 msgid "There is currently no asterisk server defined!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
-#: gofon/phoneaccount/class_phoneAccount.inc:1878
+#: gofon/phoneaccount/class_phoneAccount.inc:1899
 msgid "Asterisk server is invalid!"
 msgstr ""
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
-#: gofon/phoneaccount/class_phoneAccount.inc:1884
+#: gofon/phoneaccount/class_phoneAccount.inc:1905
 #, fuzzy
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr "语音邮件 PIN 必须包含 1-4 个字符。"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
-#: gofon/phoneaccount/class_phoneAccount.inc:1887
+#: gofon/phoneaccount/class_phoneAccount.inc:1908
 #, fuzzy
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "语音邮件 PIN 必须包含 1-4 个字符。"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
-#: gofon/phoneaccount/class_phoneAccount.inc:1892
+#: gofon/phoneaccount/class_phoneAccount.inc:1913
 #, fuzzy
 msgid "Phone pin contains invalid characters!"
 msgstr "属性 '%s' 为空或者包含无效字符。"
 
 #: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
-#: gofon/phoneaccount/class_phoneAccount.inc:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1920
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr "参数 %s 包含无效字符。'!,#' 用做分隔符"
@@ -1363,66 +1253,20 @@ msgstr "参数 %s 包含无效字符。'!,#' 用做分隔符"
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr "点击下面的“编辑”按钮修改该对话框内的信息"
 
-#: gofon/conference/headpage.tpl:6
-#: gofon/conference/class_divListConferences.inc:31
-#: gofon/conference/class_divListConferences.inc:32
-msgid "List of conference rooms"
-msgstr "会议室列表"
-
-#: 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 ""
-"这个菜单允许您创建，删除和修改所选的电话会议。对于一个长列表，您可以通过列表"
-"上面的范围选择来调整。"
-
-#: gofon/conference/headpage.tpl:35
-msgid "Display users matching"
-msgstr "显示匹配的用户"
-
-#: gofon/conference/headpage.tpl:36
-msgid "Regular expression for        matching user names"
-msgstr "用于匹配用户名的正则表达式"
-
-#: gofon/conference/remove.tpl:6
-msgid ""
-"This includes 'all' accounts, systems, etc. in this subtree. Please double "
-"check if your really want to do this since there is no way for GOsa to get "
-"your data back."
-msgstr ""
-"在这个子树中包含了所有账号，系统等等。请再次检查您是否要这么做，因为 GOsa 没"
-"有办法将您的数据找回。"
-
-#: 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 ""
-"最好在执行这个操作之前，保存当前 LDAP 树中的内容到一个文件。所以，如果您已经"
-"这么做了，按“删除”继续或者按“取消”退出。"
-
-#: gofon/conference/class_phoneConferenceManagment.inc:24
-msgid "Phone conferences"
-msgstr "电话会议"
+#: gofon/phoneaccount/class_phoneAccount.inc:7
+#: gofon/fonreports/class_fonreport.inc:7
+#, fuzzy
+msgid "This does something"
+msgstr "******"
 
 #: gofon/conference/class_phoneConferenceManagment.inc:25
-msgid "Management"
-msgstr "管理"
-
-#: gofon/conference/class_phoneConferenceManagment.inc:206
-#: gofon/conference/class_phoneConferenceManagment.inc:267
 #, fuzzy
-msgid "conference"
+msgid "conferences"
 msgstr "会议"
 
-#: gofon/conference/class_phoneConferenceManagment.inc:228
-#: gofon/conference/class_phoneConferenceManagment.inc:288
-#, fuzzy
-msgid "You have not permission to delete this entry!"
-msgstr "您无权删除这个部门。"
+#: gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Conference management"
+msgstr "会议管理"
 
 #: gofon/conference/generic.tpl:5
 msgid "Properties"
@@ -1464,7 +1308,6 @@ msgstr "预置 PIN"
 
 #: gofon/conference/generic.tpl:165
 #: gofon/conference/class_phoneConferenceGeneric.inc:384
-#: gofon/conference/class_divListConferences.inc:58
 msgid "PIN"
 msgstr "PIN"
 
@@ -1499,6 +1342,15 @@ msgstr "通知用户加入或者离开会议"
 msgid "Count users"
 msgstr "计算机"
 
+#: gofon/conference/conf-list.xml:11
+msgid "List of conference rooms"
+msgstr "会议室列表"
+
+#: gofon/conference/conf-list.xml:15 gofon/conference/conf-list.xml:74
+#: gofon/conference/class_phoneConferenceGeneric.inc:836
+msgid "Conference"
+msgstr "会议"
+
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #, php-format
 msgid "Cannot delete entry from server '%s' because it seems to be removed!"
@@ -1529,12 +1381,6 @@ msgstr ""
 msgid "'%s' is already assigned to '%s'!"
 msgstr "指定的电话号码 '%s' 已经分配给了 '%s'。"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:836
-#: gofon/conference/class_divListConferences.inc:95
-#: gofon/conference/class_divListConferences.inc:208
-msgid "Conference"
-msgstr "会议"
-
 #: gofon/conference/class_phoneConferenceGeneric.inc:837
 #, fuzzy
 msgid "Phone conference management"
@@ -1576,99 +1422,63 @@ msgid "Format"
 msgstr "格式"
 
 #: gofon/conference/class_phoneConferenceGeneric.inc:865
-#: gofon/conference/class_divListConferences.inc:57
 msgid "Owner"
 msgstr "所有者"
 
-#: gofon/conference/main.inc:48 gofon/conference/main.inc:50
-msgid "Conference management"
-msgstr "会议管理"
-
-#: gofon/conference/class_divListConferences.inc:65
-msgid "Regular expression for matching conference names"
-msgstr "匹配会议名称的正则表达式"
-
-#: gofon/conference/class_divListConferences.inc:150
-msgid "Edit this entry"
-msgstr "编辑这条记录"
-
-#: gofon/conference/class_divListConferences.inc:158
-msgid "Delete this entry"
-msgstr "删除这个条目"
-
-#: gofon/conference/class_divListConferences.inc:185
-msgid "Unknown"
-msgstr "未知"
-
-#: gofon/conference/class_divListConferences.inc:225
-#: gofon/conference/class_divListConferences.inc:226
-#, fuzzy, php-format
-msgid "Number of listed '%s'"
-msgstr "部门名称"
-
-#: gofon/conference/class_divListConferences.inc:225
-#, fuzzy
-msgid "conferences"
-msgstr "会议"
-
 #: gofon/fonreports/class_fonreport.inc:6
 msgid "Phone Reports"
 msgstr "电话记录"
 
-#: gofon/fonreports/class_fonreport.inc:210
+#: gofon/fonreports/class_fonreport.inc:229
 #, fuzzy
 msgid "Insufficient permissions"
 msgstr "缺省权限"
 
-#: gofon/fonreports/class_fonreport.inc:229
+#: gofon/fonreports/class_fonreport.inc:248
 msgid "Y-M-D"
 msgstr "Y-M-D"
 
-#: gofon/fonreports/class_fonreport.inc:396
-#: gofon/fonreports/class_fonreport.inc:397
-#: gofon/fonreports/class_fonreport.inc:404 gofon/fonreports/main.inc:22
+#: gofon/fonreports/class_fonreport.inc:415
+#: gofon/fonreports/class_fonreport.inc:416
+#: gofon/fonreports/class_fonreport.inc:423 gofon/fonreports/main.inc:22
 msgid "Phone reports"
 msgstr "电话记录"
 
-#: gofon/fonreports/class_fonreport.inc:397
+#: gofon/fonreports/class_fonreport.inc:416
 #, fuzzy
 msgid "All entries are readonly"
 msgstr "所有字段均可写"
 
-#: gofon/fonreports/class_fonreport.inc:409 gofon/fonreports/contents.tpl:30
+#: gofon/fonreports/class_fonreport.inc:428 gofon/fonreports/contents.tpl:34
 msgid "Date"
 msgstr "日期"
 
-#: gofon/fonreports/class_fonreport.inc:410 gofon/fonreports/contents.tpl:31
+#: gofon/fonreports/class_fonreport.inc:429 gofon/fonreports/contents.tpl:35
 msgid "Source"
 msgstr "源"
 
-#: gofon/fonreports/class_fonreport.inc:411 gofon/fonreports/contents.tpl:32
+#: gofon/fonreports/class_fonreport.inc:430 gofon/fonreports/contents.tpl:36
 msgid "Destination"
 msgstr "目标"
 
-#: gofon/fonreports/class_fonreport.inc:412 gofon/fonreports/contents.tpl:33
+#: gofon/fonreports/class_fonreport.inc:431 gofon/fonreports/contents.tpl:37
 msgid "Channel"
 msgstr "频道"
 
-#: gofon/fonreports/class_fonreport.inc:413
+#: gofon/fonreports/class_fonreport.inc:432
 #, fuzzy
 msgid "Application called"
 msgstr "应用程序名称"
 
-#: gofon/fonreports/class_fonreport.inc:414
+#: gofon/fonreports/class_fonreport.inc:433
 #, fuzzy
 msgid "Disposition"
 msgstr "断开"
 
-#: gofon/fonreports/class_fonreport.inc:415 gofon/fonreports/contents.tpl:36
+#: gofon/fonreports/class_fonreport.inc:434 gofon/fonreports/contents.tpl:40
 msgid "Duration"
 msgstr "持续时间"
 
-#: gofon/fonreports/contents.tpl:2
-msgid "Filter"
-msgstr "过滤器"
-
 #: gofon/fonreports/contents.tpl:6
 msgid "Search for"
 msgstr "查询"
@@ -1677,7 +1487,7 @@ msgstr "查询"
 msgid "Enter user name to search for"
 msgstr "输入要查询的用户名"
 
-#: gofon/fonreports/contents.tpl:8 gofon/fonreports/contents.tpl:16
+#: gofon/fonreports/contents.tpl:8 gofon/fonreports/contents.tpl:20
 msgid "in"
 msgstr "于"
 
@@ -1686,25 +1496,180 @@ msgid "Select subtree to base search on"
 msgstr "选择查询基于的子树"
 
 #: gofon/fonreports/contents.tpl:12
+#, fuzzy
+msgid "on"
+msgstr "关闭"
+
+#: gofon/fonreports/contents.tpl:13
+#, fuzzy
+msgid "Select server to search on"
+msgstr "选择查询基于的子树"
+
+#: gofon/fonreports/contents.tpl:16
 msgid "during"
 msgstr "在"
 
-#: gofon/fonreports/contents.tpl:21
+#: gofon/fonreports/contents.tpl:25
 msgid "Search"
 msgstr "查找"
 
-#: gofon/fonreports/contents.tpl:34
+#: gofon/fonreports/contents.tpl:38
 msgid "Application"
 msgstr "应用程序"
 
-#: gofon/fonreports/contents.tpl:35
+#: gofon/fonreports/contents.tpl:39
 msgid "Status"
 msgstr "状态"
 
-#: gofon/fonreports/contents.tpl:51
+#: gofon/fonreports/contents.tpl:55
 msgid "Search returned no results..."
 msgstr "查无结果..."
 
+#~ 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 ""
+#~ "这个菜单允许您添加，编辑和删除所选的宏。对于一个长列表，您可以通过选择框上"
+#~ "面的范围选择来调整。"
+
+#~ msgid "Filters"
+#~ msgstr "过滤器"
+
+#~ msgid "Display macros matching"
+#~ msgstr "显示匹配的宏"
+
+#~ msgid "Display macros  matching"
+#~ msgstr "显示匹配的宏"
+
+#~ msgid "Regular expression for matching macro names"
+#~ msgstr "匹配宏名的正则表达式"
+
+#~ 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 ""
+#~ "这可能被好几个组使用。请再次检查您是否要这么做，因为 GOsa 没有办法将您的数"
+#~ "据找回。"
+
+#, fuzzy
+#~ msgid "Select all"
+#~ msgstr "选择"
+
+#~ msgid "Department"
+#~ msgstr "部门"
+
+#~ msgid "Visible"
+#~ msgstr "可见"
+
+#~ msgid "Submit department"
+#~ msgstr "提交部门"
+
+#~ msgid "visible"
+#~ msgstr "可见"
+
+#~ msgid "invisible"
+#~ msgstr "不可见"
+
+#~ msgid "edit"
+#~ msgstr "编辑"
+
+#~ msgid "Edit macro"
+#~ msgstr "编辑宏"
+
+#~ msgid "delete"
+#~ msgstr "删除"
+
+#~ msgid "Delete macro"
+#~ msgstr "删除宏"
+
+#, fuzzy
+#~ msgid "Number of listed %s"
+#~ msgstr "部门名称"
+
+#, fuzzy
+#~ msgid "macros"
+#~ msgstr "宏"
+
+#, fuzzy
+#~ msgid "departments"
+#~ msgstr "部门"
+
+#~ msgid "Phone macros"
+#~ msgstr "电话宏"
+
+#, fuzzy
+#~ msgid "Permission"
+#~ msgstr "允许"
+
+#, fuzzy
+#~ msgid "Permission error"
+#~ msgstr "允许"
+
+#, fuzzy
+#~ msgid "macro"
+#~ msgstr "宏"
+
+#~ 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 ""
+#~ "这个菜单允许您创建，删除和修改所选的电话会议。对于一个长列表，您可以通过列"
+#~ "表上面的范围选择来调整。"
+
+#~ msgid "Display users matching"
+#~ msgstr "显示匹配的用户"
+
+#~ msgid "Regular expression for        matching user names"
+#~ msgstr "用于匹配用户名的正则表达式"
+
+#~ msgid ""
+#~ "This includes 'all' accounts, systems, etc. in this subtree. Please "
+#~ "double check if your really want to do this since there is no way for "
+#~ "GOsa to get your data back."
+#~ msgstr ""
+#~ "在这个子树中包含了所有账号，系统等等。请再次检查您是否要这么做，因为 GOsa "
+#~ "没有办法将您的数据找回。"
+
+#~ 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 树中的内容到一个文件。所以，如果您已"
+#~ "经这么做了，按“删除”继续或者按“取消”退出。"
+
+#~ msgid "Phone conferences"
+#~ msgstr "电话会议"
+
+#~ msgid "Management"
+#~ msgstr "管理"
+
+#, fuzzy
+#~ msgid "conference"
+#~ msgstr "会议"
+
+#, fuzzy
+#~ msgid "You have not permission to delete this entry!"
+#~ msgstr "您无权删除这个部门。"
+
+#~ msgid "Regular expression for matching conference names"
+#~ msgstr "匹配会议名称的正则表达式"
+
+#~ msgid "Edit this entry"
+#~ msgstr "编辑这条记录"
+
+#~ msgid "Delete this entry"
+#~ msgstr "删除这个条目"
+
+#~ msgid "Unknown"
+#~ msgstr "未知"
+
+#, fuzzy
+#~ msgid "Number of listed '%s'"
+#~ msgstr "部门名称"
+
 #~ msgid "Addons"
 #~ msgstr "插件"
 
@@ -1828,9 +1793,6 @@ msgstr "查无结果..."
 #~ msgid "Add"
 #~ msgstr "添加"
 
-#~ msgid "Edit"
-#~ msgstr "编辑"
-
 #, fuzzy
 #~ msgid "You're about to delete the following macro(s) %s"
 #~ msgstr "您将删除用户 %s。"
diff --git a/gosa-plugins/goto/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/goto/locale/de/LC_MESSAGES/messages.po
index 7f0c3aab2..5a73d6e64 100644
--- a/gosa-plugins/goto/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/goto/locale/de/LC_MESSAGES/messages.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:52+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2009-07-22 13:16+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: de <kde-i18n-de@kde.org>\n"
@@ -49,15 +49,15 @@ msgstr ""
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
 #: admin/mimetypes/class_mimetypeGeneric.inc:715
 #: admin/systems/goto/class_printGeneric.inc:988
-#: admin/systems/goto/class_workstationGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:699
 msgid "Generic"
 msgstr "Allgemein"
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
 #: admin/systems/goto/workstation.tpl:95
-#: admin/systems/goto/class_workstationGeneric.inc:489
-#: admin/systems/goto/class_terminalGeneric.inc:480
+#: admin/systems/goto/class_workstationGeneric.inc:490
+#: admin/systems/goto/class_terminalGeneric.inc:482
 #: admin/systems/goto/terminal.tpl:84
 msgid "NTP server"
 msgstr "Zeit-Server"
@@ -71,7 +71,7 @@ msgstr ""
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
 #: admin/systems/goto/workstation.tpl:55
-#: admin/systems/goto/class_terminalGeneric.inc:700
+#: admin/systems/goto/class_terminalGeneric.inc:702
 #: admin/systems/goto/terminal.tpl:47
 msgid "Mode"
 msgstr "Modus"
@@ -83,10 +83,8 @@ msgstr "Wählen Sie den Terminal-Modus"
 
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
-#: admin/systems/services/syslog/class_goSyslogServer.inc:27
-#: admin/systems/services/syslog/class_goSyslogServer.inc:47
 #: admin/systems/goto/workstation.tpl:65
-#: admin/systems/goto/class_workstationGeneric.inc:712
+#: admin/systems/goto/class_workstationGeneric.inc:713
 #: admin/systems/goto/terminal.tpl:57
 msgid "Syslog server"
 msgstr "Syslog-Server"
@@ -98,7 +96,7 @@ msgstr "Wählen Sie den Server, der für das Protokollieren genutzt werden soll"
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:703
+#: admin/systems/goto/class_terminalGeneric.inc:705
 #: admin/systems/goto/terminal.tpl:117
 msgid "Root server"
 msgstr "Root-Server"
@@ -109,7 +107,7 @@ msgstr "Wählen Sie das NFS-Root-Dateisystem"
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:704
+#: admin/systems/goto/class_terminalGeneric.inc:706
 #: admin/systems/goto/terminal.tpl:131
 msgid "Swap server"
 msgstr "Auslagerungs-Server"
@@ -144,20 +142,20 @@ msgid "Execute"
 msgstr "Ausführen"
 
 #: admin/ogroups/goto/class_termgroup.inc:51
-#: admin/systems/goto/class_workstationGeneric.inc:138
-#: admin/systems/goto/class_terminalGeneric.inc:122
+#: admin/systems/goto/class_workstationGeneric.inc:139
+#: admin/systems/goto/class_terminalGeneric.inc:124
 msgid "Activated"
 msgstr "Aktiv"
 
 #: admin/ogroups/goto/class_termgroup.inc:52
-#: admin/systems/goto/class_workstationGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:121
+#: admin/systems/goto/class_workstationGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:123
 #: addons/goto/class_gotomasses.inc:542
 msgid "Locked"
 msgstr "Gesperrt"
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:281
+#: admin/systems/goto/class_terminalGeneric.inc:283
 msgid "Local swap"
 msgstr "Lokaler Auslagerungsspeicher"
 
@@ -175,7 +173,7 @@ msgstr "Lokaler Auslagerungsspeicher"
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:154
+#: admin/systems/goto/class_workstationGeneric.inc:155
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -193,51 +191,51 @@ msgstr "Lokaler Auslagerungsspeicher"
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:137
-#: admin/systems/goto/class_terminalGeneric.inc:287
-#: admin/systems/goto/class_terminalGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:139
+#: admin/systems/goto/class_terminalGeneric.inc:289
+#: admin/systems/goto/class_terminalGeneric.inc:301
 msgid "inherited"
 msgstr "geerbt"
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:635
+#: admin/systems/goto/class_workstationGeneric.inc:213
+#: admin/systems/goto/class_workstationGeneric.inc:636
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
-#: admin/systems/goto/class_workstationService.inc:568
-#: admin/systems/goto/class_terminalGeneric.inc:187
-#: admin/systems/goto/class_terminalGeneric.inc:625
+#: admin/systems/goto/class_workstationService.inc:572
+#: admin/systems/goto/class_terminalGeneric.inc:189
+#: admin/systems/goto/class_terminalGeneric.inc:627
 #: addons/goto/class_gotomasses.inc:328
 #: addons/goto/class_goto_import_file.inc:124
 msgid "Service infrastructure"
 msgstr "Dienst-Infrastruktur"
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:216
-#: admin/systems/goto/class_terminalGeneric.inc:191
+#: admin/systems/goto/class_workstationGeneric.inc:217
+#: admin/systems/goto/class_terminalGeneric.inc:193
 msgid "Event error"
 msgstr "Ereignis-Fehler"
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:217
-#: admin/systems/goto/class_terminalGeneric.inc:192
+#: admin/systems/goto/class_workstationGeneric.inc:218
+#: admin/systems/goto/class_terminalGeneric.inc:194
 #, php-format
 msgid "Event '%s' is not available!"
 msgstr "Das Ereignis '%s' ist nicht verfügbar!"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:298
-#: admin/systems/goto/class_terminalGeneric.inc:265
+#: admin/systems/goto/class_workstationGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:267
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
 msgid "Switch off"
 msgstr "Ausschalten"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:298
-#: admin/systems/goto/class_terminalGeneric.inc:266
+#: admin/systems/goto/class_workstationGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:268
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
 msgid "Reboot"
@@ -256,15 +254,15 @@ msgid "Wake"
 msgstr "Aufwecken"
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:300
-#: admin/systems/goto/class_workstationGeneric.inc:308
+#: admin/systems/goto/class_workstationGeneric.inc:301
+#: admin/systems/goto/class_workstationGeneric.inc:309
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
 msgid "Reinstall"
 msgstr "Neu-Installation"
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:301
+#: admin/systems/goto/class_workstationGeneric.inc:302
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 msgid "Rescan hardware"
@@ -309,13 +307,13 @@ msgstr "Systemanalyse"
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:364
-#: admin/systems/goto/class_workstationGeneric.inc:596
-#: admin/systems/goto/class_workstationGeneric.inc:613
+#: admin/systems/goto/class_workstationGeneric.inc:365
+#: admin/systems/goto/class_workstationGeneric.inc:597
+#: admin/systems/goto/class_workstationGeneric.inc:614
 #: admin/systems/goto/class_workstationStartup.inc:889
-#: admin/systems/goto/class_workstationService.inc:456
-#: admin/systems/goto/class_terminalGeneric.inc:353
-#: admin/systems/goto/class_terminalGeneric.inc:611
+#: admin/systems/goto/class_workstationService.inc:460
+#: admin/systems/goto/class_terminalGeneric.inc:355
+#: admin/systems/goto/class_terminalGeneric.inc:613
 #: personal/environment/class_environment.inc:1058
 #: personal/environment/class_environment.inc:1315
 msgid "LDAP error"
@@ -330,13 +328,13 @@ msgid "System group"
 msgstr "System-Gruppe"
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:716
-#: admin/systems/goto/class_terminalGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:717
+#: admin/systems/goto/class_terminalGeneric.inc:711
 msgid "Action flag"
 msgstr "Ablaufstatus"
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:713
+#: admin/systems/goto/class_workstationGeneric.inc:714
 msgid "Ntp server"
 msgstr "NTP-Dienst"
 
@@ -376,34 +374,38 @@ msgstr "Zurücksetzen"
 msgid "Application settings"
 msgstr "Anwendungs-Einstellungen"
 
-#: admin/groups/apps/edit_entry.tpl:43
+#: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
 #: admin/devices/class_deviceGeneric.inc:90
 #: admin/devices/class_deviceGeneric.inc:114
 #: admin/devices/class_deviceGeneric.inc:260
 #: admin/applications/class_applicationParameters.inc:190
+#: admin/applications/application-list.xml:41
+#: admin/applications/application-list-release.xml:41
 #: admin/applications/class_applicationGeneric.inc:430
 #: admin/applications/class_applicationGeneric.inc:434
 #: admin/applications/class_applicationGeneric.inc:606
 #: admin/applications/class_applicationGeneric.inc:610
+#: admin/mimetypes/mimetype-list-release.xml:41
+#: admin/mimetypes/mimetype-list.xml:41
 #: admin/mimetypes/class_mimetypeGeneric.inc:532
 #: admin/mimetypes/class_mimetypeGeneric.inc:724
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
-#: admin/systems/services/nfs/class_servNfs.inc:239
+#: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
 #: admin/systems/goto/class_printGeneric.inc:733
 #: admin/systems/goto/class_printGeneric.inc:738
 #: admin/systems/goto/class_printGeneric.inc:757
 #: admin/systems/goto/class_printGeneric.inc:997
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:456
-#: admin/systems/goto/class_workstationGeneric.inc:461
-#: admin/systems/goto/class_workstationGeneric.inc:479
-#: admin/systems/goto/class_terminalGeneric.inc:446
-#: admin/systems/goto/class_terminalGeneric.inc:451
-#: admin/systems/goto/class_terminalGeneric.inc:470
-#: admin/systems/goto/class_terminalGeneric.inc:696
+#: admin/systems/goto/class_workstationGeneric.inc:457
+#: admin/systems/goto/class_workstationGeneric.inc:462
+#: admin/systems/goto/class_workstationGeneric.inc:480
+#: admin/systems/goto/class_terminalGeneric.inc:448
+#: admin/systems/goto/class_terminalGeneric.inc:453
+#: admin/systems/goto/class_terminalGeneric.inc:472
+#: admin/systems/goto/class_terminalGeneric.inc:698
 #: personal/environment/class_logonManagementDialog.inc:103
 msgid "Name"
 msgstr "Name"
@@ -431,8 +433,6 @@ msgid "department"
 msgstr "Abteilung"
 
 #: admin/groups/apps/class_groupApplication.inc:481
-#: admin/applications/class_applicationManagement.inc:368
-#: admin/applications/class_applicationManagement.inc:449
 #: admin/applications/class_applicationGeneric.inc:127
 msgid "application"
 msgstr "Anwendung"
@@ -442,7 +442,7 @@ msgid "Not available in release."
 msgstr "Nicht verfügbar in Release."
 
 #: admin/groups/apps/class_groupApplication.inc:1373
-#: admin/applications/class_applicationManagement.inc:24
+#: admin/applications/class_applicationManagement.inc:25
 #: admin/mimetypes/generic.tpl:117 admin/mimetypes/generic.tpl:177
 msgid "Applications"
 msgstr "Anwendungen"
@@ -452,8 +452,10 @@ msgid "Group applications"
 msgstr "Anwendungen der Gruppe"
 
 #: admin/groups/apps/class_groupApplication.inc:1381
-#: admin/applications/class_divListApplication.inc:114
-#: admin/applications/class_divListApplication.inc:150
+#: admin/applications/application-list.xml:15
+#: admin/applications/application-list.xml:74
+#: admin/applications/application-list-release.xml:15
+#: admin/applications/application-list-release.xml:74
 #: admin/applications/class_applicationGeneric.inc:603
 #: admin/mimetypes/class_mimetypeGeneric.inc:728
 msgid "Application"
@@ -461,6 +463,8 @@ msgstr "Anwendung"
 
 #: admin/groups/apps/class_groupApplication.inc:1382
 #: admin/groups/apps/app_list.tpl:5 admin/groups/apps/app_list.tpl:53
+#: admin/applications/application-filter-release.tpl:14
+#: admin/mimetypes/mimetype-filter-release.tpl:14
 #: admin/systems/goto/workstationStartup.tpl:83
 #: admin/systems/goto/workstationStartup.tpl:123
 msgid "Release"
@@ -498,10 +502,12 @@ msgstr "Nach unten bewegen"
 
 #: admin/groups/apps/app_list.tpl:86 admin/groups/apps/app_list.tpl:107
 #: admin/groups/apps/app_list.tpl:132
-#: admin/devices/class_divListDevices.inc:100
+#: admin/devices/class_divListDevices.inc:100 admin/devices/device-list.xml:86
 #: admin/applications/class_applicationParameters.inc:122
-#: admin/applications/class_divListApplication.inc:120
-#: admin/mimetypes/class_divListMimeTypes.inc:122
+#: admin/applications/application-list.xml:86
+#: admin/applications/application-list-release.xml:86
+#: admin/mimetypes/mimetype-list-release.xml:86
+#: admin/mimetypes/mimetype-list.xml:86
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
@@ -546,8 +552,6 @@ msgid "List of defined devices"
 msgstr "Liste der definierten Geräte"
 
 #: admin/devices/class_divListDevices.inc:45
-#: admin/applications/class_divListApplication.inc:45
-#: admin/mimetypes/class_divListMimeTypes.inc:45
 msgid "Select all"
 msgstr "Alle auswählen"
 
@@ -557,18 +561,15 @@ msgid "Device name"
 msgstr "Gerätename"
 
 #: admin/devices/class_divListDevices.inc:51
-#: admin/applications/class_divListApplication.inc:51
-#: admin/mimetypes/class_divListMimeTypes.inc:51
 msgid "Department"
 msgstr "Abteilung"
 
 #: admin/devices/class_divListDevices.inc:52
-#: admin/devices/class_divListDevices.inc:87
-#: admin/applications/class_divListApplication.inc:52
-#: admin/applications/class_divListApplication.inc:107
-#: admin/mimetypes/class_divListMimeTypes.inc:52
-#: admin/mimetypes/class_divListMimeTypes.inc:109
-#: addons/goto/class_gotomasses.inc:365
+#: admin/devices/class_divListDevices.inc:87 admin/devices/device-list.xml:57
+#: admin/applications/application-list.xml:57
+#: admin/applications/application-list-release.xml:57
+#: admin/mimetypes/mimetype-list-release.xml:57
+#: admin/mimetypes/mimetype-list.xml:57 addons/goto/class_gotomasses.inc:365
 msgid "Actions"
 msgstr "Aktionen"
 
@@ -577,18 +578,17 @@ msgid "Display devices matching"
 msgstr "Zeige die Geräte, auf die das Folgende passt"
 
 #: admin/devices/class_divListDevices.inc:82 admin/devices/deviceGeneric.tpl:9
-#: admin/devices/class_deviceGeneric.inc:261 admin/applications/generic.tpl:42
-#: admin/applications/class_divListApplication.inc:90
+#: admin/devices/class_deviceGeneric.inc:261 admin/devices/device-list.tpl:13
+#: admin/applications/generic.tpl:42
 #: admin/applications/class_applicationGeneric.inc:607
-#: admin/mimetypes/generic.tpl:44
-#: admin/mimetypes/class_divListMimeTypes.inc:93
+#: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
+#: admin/mimetypes/mimetype-list.tpl:13
 #: admin/mimetypes/class_mimetypeGeneric.inc:727
-#: admin/systems/services/ldap/class_goLdapServer.inc:79
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
 #: admin/systems/goto/class_printGeneric.inc:998
-#: admin/systems/goto/class_workstationGeneric.inc:710
-#: admin/systems/goto/class_terminalGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:711
+#: admin/systems/goto/class_terminalGeneric.inc:700
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/class_target_list.inc:152 addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/class_EventTargetAddList.inc:161
@@ -597,60 +597,51 @@ msgid "Base"
 msgstr "Basis"
 
 #: admin/devices/class_divListDevices.inc:84
-#: admin/applications/class_divListApplication.inc:92
-#: admin/mimetypes/class_divListMimeTypes.inc:95
 #: addons/goto/class_target_list.inc:154
 #: addons/goto/events/class_EventTargetAddList.inc:163
 #: addons/goto/events/class_EventTargetAddUsersList.inc:132
 msgid "Submit department"
 msgstr "Aktualisieren"
 
-#: admin/devices/class_divListDevices.inc:84
-#: admin/applications/class_divListApplication.inc:92
-#: admin/mimetypes/class_divListMimeTypes.inc:95
-#: addons/goto/class_target_list.inc:154
+#: admin/devices/class_divListDevices.inc:84 admin/devices/device-list.tpl:13
+#: admin/applications/application-list.tpl:13
+#: admin/mimetypes/mimetype-list.tpl:13 addons/goto/class_target_list.inc:154
 #: addons/goto/events/class_EventTargetAddList.inc:163
 #: addons/goto/events/class_EventTargetAddUsersList.inc:132
 msgid "Submit"
 msgstr "Übertragen"
 
-#: admin/devices/class_divListDevices.inc:92
-#: admin/applications/class_divListApplication.inc:111
-#: admin/mimetypes/class_divListMimeTypes.inc:114
-#: admin/systems/goto/chooser.tpl:16 addons/goto/class_gotomasses.inc:366
+#: admin/devices/class_divListDevices.inc:92 admin/devices/device-list.xml:68
+#: admin/applications/application-list.xml:68
+#: admin/applications/application-list-release.xml:68
+#: admin/mimetypes/mimetype-list-release.xml:68
+#: admin/mimetypes/mimetype-list.xml:68 admin/systems/goto/chooser.tpl:16
+#: addons/goto/class_gotomasses.inc:366
 msgid "Create"
 msgstr "Anlegen"
 
 #: admin/devices/class_divListDevices.inc:94
-#: admin/devices/class_divListDevices.inc:131
-#: admin/devices/class_deviceGeneric.inc:159
+#: admin/devices/class_divListDevices.inc:131 admin/devices/device-list.xml:15
+#: admin/devices/device-list.xml:74 admin/devices/class_deviceGeneric.inc:159
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 msgid "Device"
 msgstr "Gerät"
 
 #: admin/devices/class_divListDevices.inc:156
-#: admin/applications/class_divListApplication.inc:186
-#: admin/mimetypes/class_divListMimeTypes.inc:186
 msgid "edit"
 msgstr "Bearbeiten"
 
 #: admin/devices/class_divListDevices.inc:156
-#: admin/applications/class_divListApplication.inc:186
-#: admin/mimetypes/class_divListMimeTypes.inc:186
 msgid "Edit this entry"
 msgstr "Diesen Eintrag bearbeiten"
 
 #: admin/devices/class_divListDevices.inc:163
-#: admin/applications/class_divListApplication.inc:202
-#: admin/mimetypes/class_divListMimeTypes.inc:201
 #: admin/systems/ppd/class_printerPPDSelectionDialog.inc:140
 msgid "delete"
 msgstr "Entfernen"
 
 #: admin/devices/class_divListDevices.inc:163
-#: admin/applications/class_divListApplication.inc:202
-#: admin/mimetypes/class_divListMimeTypes.inc:201
 msgid "Delete this entry"
 msgstr "Diesen Eintrag entfernen"
 
@@ -659,45 +650,48 @@ msgid "Number of listed devices"
 msgstr "Anzahl der angezeigten Geräte"
 
 #: admin/devices/class_divListDevices.inc:206
-#: admin/applications/class_divListApplication.inc:243
-#: admin/mimetypes/class_divListMimeTypes.inc:244
 msgid "Number of listed departments"
 msgstr "Anzahl der angezeigten Abteilungen"
 
-#: admin/devices/remove.tpl:6
+#: admin/devices/remove.tpl:6 admin/applications/remove.tpl:6
+#: admin/mimetypes/remove.tpl:6
 msgid ""
-"This may be used by several users/groups. Please double check if your really "
-"want to do this since there is no way for GOsa to get your data back."
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
 msgstr ""
-"Dies wird unter Umständen von verschiedenen Benutzern/Gruppen genutzt. Bitte "
-"prüfen Sie genau, ob Sie dies wünschen, da GOsa keine Möglichkeit hat, die "
+"Bitte überprüfen Sie genau was Sie tun, weil GOsa keine Möglichkeit hat, die "
 "Daten wiederherzustellen."
 
-#: admin/devices/remove.tpl:9 admin/applications/remove.tpl:9
-#: admin/mimetypes/remove.tpl:9 addons/goto/remove.tpl:9
+#: admin/devices/remove.tpl:10 admin/applications/remove.tpl:10
+#: admin/mimetypes/remove.tpl:10 addons/goto/remove.tpl:9
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 "Wenn Sie sicher sind, drücken Sie 'Entfernen' um fortzufahren oder "
 "'Abbrechen' zum Abbruch."
 
-#: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:257
-msgid "Devices"
-msgstr "Geräte"
+#: admin/devices/device-list.xml:11
+#, fuzzy
+msgid "List of devices"
+msgstr "Liste der definierten Geräte"
 
-#: admin/devices/deviceGeneric.tpl:29 admin/devices/class_deviceGeneric.inc:93
+#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:29
+#: admin/devices/class_deviceGeneric.inc:93
 #: admin/devices/class_deviceGeneric.inc:262 admin/applications/generic.tpl:33
+#: admin/applications/application-list.xml:49
+#: admin/applications/application-list-release.xml:49
 #: admin/applications/class_applicationGeneric.inc:608
 #: admin/mimetypes/generic.tpl:34 admin/mimetypes/paste_generic.tpl:21
+#: admin/mimetypes/mimetype-list-release.xml:49
+#: admin/mimetypes/mimetype-list.xml:49
 #: admin/mimetypes/class_mimetypeGeneric.inc:726
 #: admin/systems/services/shares/class_goShareServer.inc:424
-#: admin/systems/services/nfs/class_servNfs.inc:211
+#: admin/systems/services/nfs/class_servNfs.inc:207
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
 #: admin/systems/goto/class_printGeneric.inc:999
-#: admin/systems/goto/class_workstationGeneric.inc:708
-#: admin/systems/goto/class_terminalGeneric.inc:697
+#: admin/systems/goto/class_workstationGeneric.inc:709
+#: admin/systems/goto/class_terminalGeneric.inc:699
 #: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
 #: addons/goto/class_gotomasses.inc:932
 #: personal/environment/class_logonManagementDialog.inc:111
@@ -705,6 +699,21 @@ msgstr "Geräte"
 msgid "Description"
 msgstr "Beschreibung"
 
+#: admin/devices/device-list.xml:118
+#, fuzzy
+msgid "Edit device"
+msgstr "Soundkarte"
+
+#: admin/devices/device-list.xml:131
+#, fuzzy
+msgid "Remove device"
+msgstr "Bild entfernen"
+
+#: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
+#: admin/devices/class_deviceGeneric.inc:257
+msgid "Devices"
+msgstr "Geräte"
+
 #: admin/devices/deviceGeneric.tpl:38
 msgid "Device type"
 msgstr "Gerätetyp"
@@ -739,9 +748,14 @@ msgstr "Produkt-ID"
 msgid "(idProduct)"
 msgstr "(idProduct)"
 
-#: admin/devices/main.inc:49 admin/devices/main.inc:51
-msgid "Hotplug device management"
-msgstr "Verwaltung der Hotplug-Geräte"
+#: admin/devices/device-filter.tpl:3
+#: admin/applications/application-filter.tpl:3
+#: admin/applications/application-filter-release.tpl:3
+#: admin/mimetypes/mimetype-filter-release.tpl:3
+#: admin/mimetypes/mimetype-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filter"
 
 #: admin/devices/class_deviceGeneric.inc:29
 msgid "Digital camera"
@@ -837,51 +851,21 @@ msgstr "Hersteller"
 msgid "Device ID"
 msgstr "Geräte-ID"
 
-#: admin/devices/class_deviceManagement.inc:7
+#: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:82
+#: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:84
+#: admin/mimetypes/mimetype-list.tpl:13
+msgid "Update"
+msgstr "Aktualisieren"
+
+#: admin/devices/class_deviceManagement.inc:25
 #: personal/environment/class_environment.inc:1783
 #: personal/environment/environment.tpl:293
 msgid "Hotplug devices"
 msgstr "Hotplug-Geräte"
 
-#: admin/devices/class_deviceManagement.inc:8
-msgid "Manage hotplug devices"
-msgstr "Hotplug-Geräte verwalten"
-
-#: admin/devices/class_deviceManagement.inc:246
-#: admin/applications/class_applicationManagement.inc:352
-#: admin/mimetypes/class_mimetypeManagement.inc:360
-#: addons/goto/class_gotomasses.inc:230
-msgid "Permission"
-msgstr "Berechtigung"
-
-#: admin/devices/class_deviceManagement.inc:263
-#: admin/devices/class_deviceManagement.inc:345
-msgid "device"
-msgstr "Gerät"
-
-#: admin/devices/class_deviceManagement.inc:296
-#: admin/devices/class_deviceManagement.inc:352
-#: admin/devices/class_deviceManagement.inc:381
-#: admin/applications/class_applicationManagement.inc:401
-#: admin/applications/class_applicationManagement.inc:456
-#: admin/applications/class_applicationManagement.inc:487
-#: admin/mimetypes/class_mimetypeManagement.inc:412
-#: admin/mimetypes/class_mimetypeManagement.inc:466
-#: admin/mimetypes/class_mimetypeManagement.inc:496
-#: admin/systems/goto/class_printGeneric.inc:1019
-#: admin/systems/goto/class_printGeneric.inc:1041
-#: personal/environment/class_environment.inc:583
-msgid "Permission error"
-msgstr "Berechtigungsfehler"
-
-#: admin/applications/remove.tpl:6 admin/mimetypes/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 ""
-"Dieser Eintrag wird unter Umständen von verschiedenen Gruppen genutzt. Bitte "
-"überprüfen Sie genau was Sie tun, da GOsa keine Möglichkeit hat, die Daten "
-"wiederherzustellen."
+#: admin/devices/class_deviceManagement.inc:26
+msgid "Hotplug device management"
+msgstr "Verwaltung der Hotplug-Geräte"
 
 #: admin/applications/release_select.tpl:2
 #: admin/mimetypes/release_select.tpl:2
@@ -931,7 +915,6 @@ msgid "Application parameter settings"
 msgstr "Konfiguration der Anwendungs-Parameter"
 
 #: admin/applications/generic.tpl:7 admin/applications/generic.tpl:10
-#: admin/applications/class_divListApplication.inc:51
 #: admin/applications/class_applicationGeneric.inc:561
 msgid "Application name"
 msgstr "Name der Anwendung"
@@ -966,10 +949,6 @@ msgstr "Wählen Sie eine Basis"
 msgid "Icon"
 msgstr "Symbol"
 
-#: admin/applications/generic.tpl:82 admin/mimetypes/generic.tpl:84
-msgid "Update"
-msgstr "Aktualisieren"
-
 #: admin/applications/generic.tpl:82
 msgid "Reload picture from LDAP"
 msgstr "Bild neu laden"
@@ -1032,36 +1011,27 @@ msgstr "Importieren"
 msgid "Download"
 msgstr "Herunterladen"
 
-#: admin/applications/class_applicationManagement.inc:25
-#: personal/environment/class_environment.inc:10
-msgid "This does something"
-msgstr "Dies tut etwas"
+#: admin/applications/class_applicationManagement.inc:26
+msgid "Application management"
+msgstr "Anwendungsverwaltung"
 
-#: admin/applications/class_divListApplication.inc:25
-msgid "List of Applications"
+#: admin/applications/application-list.xml:11
+#: admin/applications/application-list-release.xml:11
+#, fuzzy
+msgid "List of applications"
 msgstr "Liste der Anwendungen"
 
-#: admin/applications/class_divListApplication.inc:26
-msgid "This table displays all applications in the selected tree."
-msgstr "Diese Tabelle enthält alle Abteilungen des gewählten Teilbaums"
-
-#: admin/applications/class_divListApplication.inc:58
-#: personal/environment/hotplugDialog.tpl:43
-msgid "Display users matching"
-msgstr "Zeige die Benutzer, auf die Folgendes passt"
-
-#: admin/applications/class_divListApplication.inc:199
-#: admin/mimetypes/class_divListMimeTypes.inc:198
-msgid "Freezed"
-msgstr "Eingefroren"
-
-#: admin/applications/class_divListApplication.inc:242
-msgid "Number of listed applications"
-msgstr "Anzahl der angezeigten Anwendungen"
+#: admin/applications/application-list.xml:118
+#: admin/applications/application-list-release.xml:118
+#, fuzzy
+msgid "Edit application"
+msgstr "Anwendung hinzufügen"
 
-#: admin/applications/main.inc:48 admin/applications/main.inc:50
-msgid "Application management"
-msgstr "Anwendungsverwaltung"
+#: admin/applications/application-list.xml:131
+#: admin/applications/application-list-release.xml:131
+#, fuzzy
+msgid "Remove application"
+msgstr "Anwendung"
 
 #: admin/applications/class_applicationGeneric.inc:95
 msgid "no example"
@@ -1103,22 +1073,19 @@ msgstr "Anwendung (Allgemein)"
 msgid "Script content"
 msgstr "Skript-Inhalt"
 
-#: admin/mimetypes/class_mimetypeManagement.inc:24
+#: admin/mimetypes/class_mimetypeManagement.inc:25
 #: admin/mimetypes/class_mimetypeGeneric.inc:721
 msgid "Mime types"
 msgstr "MIME-Typen"
 
-#: admin/mimetypes/class_mimetypeManagement.inc:25
+#: admin/mimetypes/class_mimetypeManagement.inc:26
 msgid "Manage mime types"
 msgstr "MIME-Typen verwalten"
 
-#: admin/mimetypes/class_mimetypeManagement.inc:378
-#: admin/mimetypes/class_mimetypeManagement.inc:459
-#: admin/mimetypes/generic.tpl:12
-#: admin/mimetypes/class_divListMimeTypes.inc:51
-#: admin/mimetypes/class_divListMimeTypes.inc:116
-#: admin/mimetypes/class_divListMimeTypes.inc:152
-#: admin/mimetypes/paste_generic.tpl:13
+#: admin/mimetypes/generic.tpl:12 admin/mimetypes/paste_generic.tpl:13
+#: admin/mimetypes/mimetype-list-release.xml:15
+#: admin/mimetypes/mimetype-list-release.xml:74
+#: admin/mimetypes/mimetype-list.xml:15 admin/mimetypes/mimetype-list.xml:74
 msgid "Mime type"
 msgstr "MIME-Typ"
 
@@ -1188,26 +1155,27 @@ msgstr "Zeige Datei mit externem Programm"
 msgid "Ask whether to save to local disk"
 msgstr "Frage nach, ob Datei lokal auf Festplatte gespeichert werden soll"
 
-#: admin/mimetypes/class_divListMimeTypes.inc:27
-#: admin/mimetypes/class_divListMimeTypes.inc:28
-msgid "List of defined mime types"
-msgstr "Liste von definierten MIME-Typen"
-
-#: admin/mimetypes/class_divListMimeTypes.inc:58
-msgid "Display mime types matching"
-msgstr "Zeige MIME-Typen, auf die Folgendes passt"
-
-#: admin/mimetypes/class_divListMimeTypes.inc:243
-msgid "Number of listed mimetypes"
-msgstr "Anzahl der angezeigten MIME-Typen"
-
 #: admin/mimetypes/paste_generic.tpl:24
 msgid "Please specify a description for this mime type here"
 msgstr "Bitte geben Sie hier eine Beschreibung dieses MIME-Typs ein"
 
-#: admin/mimetypes/main.inc:48 admin/mimetypes/main.inc:50
-msgid "Mimetype management"
-msgstr "MIME-Typen Verwaltung"
+#: admin/mimetypes/mimetype-list-release.xml:11
+#: admin/mimetypes/mimetype-list.xml:11
+#, fuzzy
+msgid "List of mimetypes"
+msgstr "Liste von definierten MIME-Typen"
+
+#: admin/mimetypes/mimetype-list-release.xml:118
+#: admin/mimetypes/mimetype-list.xml:118
+#, fuzzy
+msgid "Edit mimetype"
+msgstr "Aktualisiere MIME-Typ Icon"
+
+#: admin/mimetypes/mimetype-list-release.xml:131
+#: admin/mimetypes/mimetype-list.xml:131
+#, fuzzy
+msgid "Remove mimetype"
+msgstr "Bild entfernen"
 
 #: admin/mimetypes/class_mimetypeGeneric.inc:535
 msgid "File pattern"
@@ -1230,7 +1198,6 @@ msgid "Print Service"
 msgstr "Druck-Dienst"
 
 #: admin/systems/services/cups/goCupsServer.tpl:1
-#: admin/systems/services/syslog/goSyslogServer.tpl:1
 msgid "enabled"
 msgstr "aktiviert"
 
@@ -1251,23 +1218,18 @@ msgstr "CUPS"
 #: admin/systems/services/ntp/class_goNtpServer.inc:115
 #: admin/systems/services/terminal/class_goTerminalServer.inc:165
 #: admin/systems/services/shares/class_goShareServer.inc:414
-#: admin/systems/services/syslog/class_goSyslogServer.inc:69
-#: admin/systems/services/syslog/class_goLogDBServer.inc:93
 msgid "Services"
 msgstr "Dienste"
 
 #: admin/systems/services/cups/class_goCupsServer.inc:77
-#: admin/systems/services/syslog/class_goLogDBServer.inc:101
 msgid "Start"
 msgstr "Start"
 
 #: admin/systems/services/cups/class_goCupsServer.inc:78
-#: admin/systems/services/syslog/class_goLogDBServer.inc:102
 msgid "Stop"
 msgstr "Beenden"
 
 #: admin/systems/services/cups/class_goCupsServer.inc:79
-#: admin/systems/services/syslog/class_goLogDBServer.inc:103
 msgid "Restart"
 msgstr "Neustart"
 
@@ -1309,6 +1271,8 @@ msgid "LDAP service"
 msgstr "LDAP-Dienst"
 
 #: admin/systems/services/ldap/goLdapServer.tpl:2
+#: admin/systems/services/ldap/class_goLdapServer.inc:79
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
 msgid "LDAP URI"
 msgstr "LDAP URI"
 
@@ -1316,6 +1280,24 @@ msgstr "LDAP URI"
 msgid "fill-in-your-servers-dns-name"
 msgstr "tragen-sie-den-dns-namen-des-servers-ein"
 
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
+#: admin/systems/services/nfs/servnfs.tpl:39
+#: admin/systems/goto/class_ArpNewDevice.inc:38
+#: admin/systems/goto/class_SelectDeviceType.inc:39
+#: addons/goto/class_target_list.inc:201
+#: addons/goto/events/class_EventTargetAddList.inc:238
+#: personal/environment/environment.tpl:135
+msgid "Server"
+msgstr "Server"
+
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
+#: admin/systems/goto/class_gotoLpdEnabled.inc:153
+#: admin/systems/goto/terminalService.tpl:58
+#: admin/systems/goto/workstationService.tpl:66
+#: admin/systems/goto/gotoLpdEnable.tpl:71
+msgid "Port"
+msgstr "Anschluss"
+
 #: admin/systems/services/ldap/class_goLdapServer.inc:128
 #: admin/systems/services/ldap/class_goLdapServer.inc:129
 msgid "Ldap"
@@ -1410,13 +1392,13 @@ msgid "Path"
 msgstr "Pfad"
 
 #: admin/systems/services/shares/class_goShareServer.inc:428
-#: admin/systems/services/nfs/class_servNfs.inc:219
+#: admin/systems/services/nfs/class_servNfs.inc:215
 #: admin/systems/services/nfs/servnfs.tpl:121
 msgid "Option"
 msgstr "Option"
 
 #: admin/systems/services/shares/class_goShareServer.inc:429
-#: admin/systems/services/nfs/class_servNfs.inc:215
+#: admin/systems/services/nfs/class_servNfs.inc:211
 #: admin/systems/services/nfs/servnfs.tpl:29
 msgid "Volume"
 msgstr "Volume"
@@ -1429,10 +1411,6 @@ msgstr "'Pfad / Volume' muß das Format 'server:port' haben!"
 msgid "'Path / Volume' must contain at least one '/'!"
 msgstr "'Pfad / Volume' muß mindestens ein '/' enthalten!"
 
-#: admin/systems/services/nfs/class_servNfs.inc:205
-msgid "Hidden shares must have a '$' at the end of the name!"
-msgstr ""
-
 #: admin/systems/services/nfs/servnfs.tpl:1
 msgid "Edit share"
 msgstr "Freigabe bearbeiten"
@@ -1441,15 +1419,6 @@ msgstr "Freigabe bearbeiten"
 msgid "NFS setup"
 msgstr "NFS-Einrichtung"
 
-#: admin/systems/services/nfs/servnfs.tpl:39
-#: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_SelectDeviceType.inc:39
-#: addons/goto/class_target_list.inc:201
-#: addons/goto/events/class_EventTargetAddList.inc:238
-#: personal/environment/environment.tpl:135
-msgid "Server"
-msgstr "Server"
-
 #: admin/systems/services/nfs/servnfs.tpl:69
 msgid "Auto-mount share on Apple systems"
 msgstr "Freigabe auf Apple-Systemen automatisch einbinden."
@@ -1458,55 +1427,6 @@ msgstr "Freigabe auf Apple-Systemen automatisch einbinden."
 msgid "Codepage"
 msgstr "Codepage"
 
-#: admin/systems/services/syslog/goSyslogServer.tpl:1
-msgid "Syslog Service"
-msgstr "Protokoll-Dienst"
-
-#: admin/systems/services/syslog/class_goSyslogServer.inc:68
-#: admin/systems/services/syslog/class_goSyslogServer.inc:69
-msgid "Logging service"
-msgstr "Protokoll-Dienst"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:31
-#: admin/systems/services/syslog/class_goLogDBServer.inc:59
-msgid "Syslog service database"
-msgstr "Protokoll-Dienst Datenbank"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:69
-#: admin/systems/goto/class_printGeneric.inc:976
-#: addons/goto/events/class_EventTargetAddUsersList.inc:171
-msgid "User"
-msgstr "Benutzer"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:72
-#: admin/systems/services/syslog/class_goLogDBServer.inc:105
-#: admin/systems/services/syslog/goLogDBServer.tpl:20
-msgid "Password"
-msgstr "Passwort"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:75
-#: admin/systems/services/syslog/class_goLogDBServer.inc:106
-#: admin/systems/services/syslog/goLogDBServer.tpl:4
-msgid "Database"
-msgstr "Datenbank"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:92
-#: admin/systems/services/syslog/class_goLogDBServer.inc:93
-msgid "Logging database"
-msgstr "Protokoll-Datenbank"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:104
-msgid "Admin"
-msgstr "Administrator"
-
-#: admin/systems/services/syslog/goLogDBServer.tpl:1
-msgid "Logging database information"
-msgstr "Informationen der Protokoll-Datenbank"
-
-#: admin/systems/services/syslog/goLogDBServer.tpl:12
-msgid "Logging DB user"
-msgstr "Protokoll-DB Benutzer"
-
 #: admin/systems/goto/workstation.tpl:1 admin/systems/goto/terminal.tpl:1
 msgid "Properties"
 msgstr "Eigenschaften"
@@ -1516,13 +1436,13 @@ msgid "Workstation template"
 msgstr "Vorlage für Arbeitsstation"
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:707
+#: admin/systems/goto/class_workstationGeneric.inc:708
 msgid "Workstation name"
 msgstr "Name der Arbeitsstation"
 
 #: admin/systems/goto/workstation.tpl:27
 #: admin/systems/goto/class_printGeneric.inc:1000
-#: admin/systems/goto/class_workstationGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:710
 msgid "Location"
 msgstr "Ort"
 
@@ -1618,13 +1538,6 @@ msgstr "Uneben"
 msgid "bit/s"
 msgstr "bits/s"
 
-#: admin/systems/goto/class_gotoLpdEnabled.inc:153
-#: admin/systems/goto/terminalService.tpl:58
-#: admin/systems/goto/workstationService.tpl:66
-#: admin/systems/goto/gotoLpdEnable.tpl:71
-msgid "Port"
-msgstr "Anschluss"
-
 #: admin/systems/goto/ArpNewDevice.tpl:1
 msgid "Integrating unknown devices"
 msgstr "Integriere unbekannt Geräte"
@@ -1763,12 +1676,12 @@ msgstr "Dieser Drucker gehört zu %s. Sie können ihn nicht umbenennen."
 #: admin/systems/goto/class_printGeneric.inc:593
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:230
+#: admin/systems/goto/class_terminalGeneric.inc:232
 msgid "terminal"
 msgstr "Terminal"
 
 #: admin/systems/goto/class_printGeneric.inc:595
-#: admin/systems/goto/class_workstationGeneric.inc:226
+#: admin/systems/goto/class_workstationGeneric.inc:227
 #: admin/systems/goto/class_workstationStartup.inc:285
 msgid "workstation"
 msgstr "Arbeitsstation"
@@ -1789,6 +1702,11 @@ msgstr "Drucker URL"
 msgid "Group"
 msgstr "Gruppe"
 
+#: admin/systems/goto/class_printGeneric.inc:976
+#: addons/goto/events/class_EventTargetAddUsersList.inc:171
+msgid "User"
+msgstr "Benutzer"
+
 #: admin/systems/goto/class_printGeneric.inc:989
 msgid "Print generic"
 msgstr "Drucken (Alllgemein)"
@@ -1813,6 +1731,12 @@ msgstr "Drucker-PPD"
 msgid "Permissions"
 msgstr "Berechtigungen"
 
+#: admin/systems/goto/class_printGeneric.inc:1019
+#: admin/systems/goto/class_printGeneric.inc:1041
+#: personal/environment/class_environment.inc:583
+msgid "Permission error"
+msgstr "Berechtigungsfehler"
+
 #: admin/systems/goto/class_printGeneric.inc:1019
 #: admin/systems/goto/class_printGeneric.inc:1041
 msgid "printer user"
@@ -1938,7 +1862,7 @@ msgid "System informations"
 msgstr "System-Informationen"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:704
+#: admin/systems/goto/class_workstationGeneric.inc:705
 #: admin/systems/goto/class_SelectDeviceType.inc:39
 #: addons/goto/class_target_list.inc:203
 #: addons/goto/events/class_EventTargetAddList.inc:249
@@ -1947,8 +1871,8 @@ msgstr "Arbeitsstation"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:39
-#: admin/systems/goto/class_terminalGeneric.inc:687
-#: admin/systems/goto/class_terminalGeneric.inc:693
+#: admin/systems/goto/class_terminalGeneric.inc:689
+#: admin/systems/goto/class_terminalGeneric.inc:695
 msgid "Terminal"
 msgstr "Terminal"
 
@@ -2047,12 +1971,12 @@ msgid "unknown"
 msgstr "unbekannt"
 
 #: admin/systems/goto/class_terminalService.inc:703
-#: admin/systems/goto/class_workstationService.inc:498
+#: admin/systems/goto/class_workstationService.inc:502
 msgid "Service"
 msgstr "Dienst"
 
 #: admin/systems/goto/class_terminalService.inc:713
-#: admin/systems/goto/class_workstationService.inc:507
+#: admin/systems/goto/class_workstationService.inc:511
 msgid "Monitor"
 msgstr "Monitor"
 
@@ -2066,27 +1990,27 @@ msgid "Remote desktop"
 msgstr "Entfernte Arbeitsfläche"
 
 #: admin/systems/goto/class_terminalService.inc:716
-#: admin/systems/goto/class_workstationService.inc:508
+#: admin/systems/goto/class_workstationService.inc:512
 msgid "Gfx driver"
 msgstr "Grafiktreiber"
 
 #: admin/systems/goto/class_terminalService.inc:717
-#: admin/systems/goto/class_workstationService.inc:509
+#: admin/systems/goto/class_workstationService.inc:513
 msgid "Gfx resolution"
 msgstr "Auflösung"
 
 #: admin/systems/goto/class_terminalService.inc:718
-#: admin/systems/goto/class_workstationService.inc:510
+#: admin/systems/goto/class_workstationService.inc:514
 msgid "Gfx color depth"
 msgstr "Farbtiefe"
 
 #: admin/systems/goto/class_terminalService.inc:719
 #: admin/systems/goto/terminalService.tpl:150
 #: admin/systems/goto/workstationService.tpl:170
-#: admin/systems/goto/class_workstationService.inc:402
 #: admin/systems/goto/class_workstationService.inc:404
-#: admin/systems/goto/class_workstationService.inc:409
-#: admin/systems/goto/class_workstationService.inc:511
+#: admin/systems/goto/class_workstationService.inc:406
+#: admin/systems/goto/class_workstationService.inc:412
+#: admin/systems/goto/class_workstationService.inc:515
 msgid "HSync"
 msgstr "HSync"
 
@@ -2095,8 +2019,8 @@ msgstr "HSync"
 #: admin/systems/goto/workstationService.tpl:181
 #: admin/systems/goto/class_workstationService.inc:385
 #: admin/systems/goto/class_workstationService.inc:387
-#: admin/systems/goto/class_workstationService.inc:392
-#: admin/systems/goto/class_workstationService.inc:512
+#: admin/systems/goto/class_workstationService.inc:393
+#: admin/systems/goto/class_workstationService.inc:516
 msgid "VSync"
 msgstr "VSync"
 
@@ -2105,7 +2029,7 @@ msgid "Auto-Sync"
 msgstr "Auto-Sync"
 
 #: admin/systems/goto/class_terminalService.inc:722
-#: admin/systems/goto/class_workstationService.inc:514
+#: admin/systems/goto/class_workstationService.inc:518
 msgid "Scanner enabled"
 msgstr "Scanner aktiviert"
 
@@ -2115,34 +2039,34 @@ msgid "Printer enabled"
 msgstr "Drucker aktiviert"
 
 #: admin/systems/goto/class_terminalService.inc:724
-#: admin/systems/goto/class_workstationService.inc:515
+#: admin/systems/goto/class_workstationService.inc:519
 msgid "Keyboard model"
 msgstr "Tastatur-Modell"
 
 #: admin/systems/goto/class_terminalService.inc:725
-#: admin/systems/goto/class_workstationService.inc:516
+#: admin/systems/goto/class_workstationService.inc:520
 msgid "Keyboard layout"
 msgstr "Tastatur-Layout"
 
 #: admin/systems/goto/class_terminalService.inc:726
-#: admin/systems/goto/class_workstationService.inc:517
+#: admin/systems/goto/class_workstationService.inc:521
 msgid "Keyboard variant"
 msgstr "Tastatur-Variante"
 
 #: admin/systems/goto/class_terminalService.inc:727
-#: admin/systems/goto/class_workstationService.inc:518
+#: admin/systems/goto/class_workstationService.inc:522
 msgid "Mouse type"
 msgstr "Maus-Typ"
 
 #: admin/systems/goto/class_terminalService.inc:728
-#: admin/systems/goto/class_workstationService.inc:519
+#: admin/systems/goto/class_workstationService.inc:523
 msgid "Mouse port"
 msgstr "Maus-Anschluß"
 
 #: admin/systems/goto/class_terminalService.inc:730
 #: admin/systems/goto/terminalService.tpl:76
 #: admin/systems/goto/workstationService.tpl:86
-#: admin/systems/goto/class_workstationService.inc:520
+#: admin/systems/goto/class_workstationService.inc:524
 msgid "Telephone hardware"
 msgstr "Telefon-Hardware"
 
@@ -2239,54 +2163,54 @@ msgstr "Audio-Dienst"
 msgid "GUI"
 msgstr "GUI"
 
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_workstationGeneric.inc:309
+#: admin/systems/goto/class_workstationGeneric.inc:300
+#: admin/systems/goto/class_workstationGeneric.inc:310
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
 msgid "Software update"
 msgstr "Softwareupdate"
 
-#: admin/systems/goto/class_workstationGeneric.inc:303
-#: admin/systems/goto/class_workstationGeneric.inc:311
+#: admin/systems/goto/class_workstationGeneric.inc:304
+#: admin/systems/goto/class_workstationGeneric.inc:312
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr "Erzwinge lokalen Systemstart"
 
-#: admin/systems/goto/class_workstationGeneric.inc:307
-#: admin/systems/goto/class_terminalGeneric.inc:271
+#: admin/systems/goto/class_workstationGeneric.inc:308
+#: admin/systems/goto/class_terminalGeneric.inc:273
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr "Aufwecken"
 
-#: admin/systems/goto/class_workstationGeneric.inc:500
+#: admin/systems/goto/class_workstationGeneric.inc:501
 msgid "A valid LDAP server assignement is missing!"
 msgstr "Es fehlt eine gültige LDAP-Server-Zusweisung!"
 
-#: admin/systems/goto/class_workstationGeneric.inc:510
+#: admin/systems/goto/class_workstationGeneric.inc:511
 msgid "Software deployment"
 msgstr "Softwareverteilung"
 
-#: admin/systems/goto/class_workstationGeneric.inc:511
+#: admin/systems/goto/class_workstationGeneric.inc:512
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 "Dieses System installiert momentan. Wenn Sie es speichern möchten, drücken "
 "Sie 'OK'."
 
-#: admin/systems/goto/class_workstationGeneric.inc:699
+#: admin/systems/goto/class_workstationGeneric.inc:700
 msgid "Workstation generic"
 msgstr "Arbeitsstation (Allgemein)"
 
-#: admin/systems/goto/class_workstationGeneric.inc:711
+#: admin/systems/goto/class_workstationGeneric.inc:712
 msgid "Goto mode"
 msgstr "GOto-Modus"
 
-#: admin/systems/goto/class_workstationGeneric.inc:714
-#: admin/systems/goto/class_terminalGeneric.inc:707
+#: admin/systems/goto/class_workstationGeneric.inc:715
+#: admin/systems/goto/class_terminalGeneric.inc:709
 msgid "Root password"
 msgstr "Root-Passwort"
 
-#: admin/systems/goto/class_workstationGeneric.inc:715
+#: admin/systems/goto/class_workstationGeneric.inc:716
 msgid "Create FAI CD"
 msgstr "FAI CD erstellen"
 
@@ -2548,11 +2472,11 @@ msgstr ""
 msgid "Create ISO-Image"
 msgstr "Erstelle ISO-Abbild"
 
-#: admin/systems/goto/class_workstationService.inc:499
+#: admin/systems/goto/class_workstationService.inc:503
 msgid "Workstation service"
 msgstr "Arbeitsstations-Dienst"
 
-#: admin/systems/goto/class_workstationService.inc:513
+#: admin/systems/goto/class_workstationService.inc:517
 msgid "Use DDC"
 msgstr "Verwende DDC"
 
@@ -2669,15 +2593,15 @@ msgstr "Zugewiesene FAI-Klassen"
 msgid "set"
 msgstr "setzen"
 
-#: admin/systems/goto/class_terminalGeneric.inc:688
+#: admin/systems/goto/class_terminalGeneric.inc:690
 msgid "Terminal generic"
 msgstr "Terminal (Allgemein)"
 
-#: admin/systems/goto/class_terminalGeneric.inc:701
+#: admin/systems/goto/class_terminalGeneric.inc:703
 msgid "Syslog server enabled"
 msgstr "Protokoll-Server aktiviert"
 
-#: admin/systems/goto/class_terminalGeneric.inc:706
+#: admin/systems/goto/class_terminalGeneric.inc:708
 msgid "Ntp server settings"
 msgstr "NTP-Dienst-Einstellungen"
 
@@ -3172,6 +3096,10 @@ msgstr "Verteilungs-Status"
 msgid "System deployment status"
 msgstr "Systemverteilungs-Status"
 
+#: addons/goto/class_gotomasses.inc:230
+msgid "Permission"
+msgstr "Berechtigung"
+
 #: addons/goto/class_gotomasses.inc:270
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
@@ -3660,6 +3588,10 @@ msgstr "Import abgeschlossen: %s Vorgänge importiert, %s fehlgeschlagen"
 msgid "Environment"
 msgstr "Umgebung"
 
+#: personal/environment/class_environment.inc:10
+msgid "This does something"
+msgstr "Dies tut etwas"
+
 #: personal/environment/class_environment.inc:139
 #, php-format
 msgid "Device '%s' is not available anymore. It will be removed!"
@@ -3961,6 +3893,78 @@ msgstr "Auswahl des hinzuzufügenden Hotplug-Gerätes"
 msgid "Choose the department the search will be based    on"
 msgstr "Wählen Sie die Abteilung, auf die die Suchfunktion angewandt wird"
 
+#: personal/environment/hotplugDialog.tpl:43
+msgid "Display users matching"
+msgstr "Zeige die Benutzer, auf die Folgendes passt"
+
 #: personal/environment/hotplugDialog.tpl:48
 msgid "Regular expression for        matching hotplugs"
 msgstr "Regulärer Ausdruck zum Erkennen von Hotplug-Geräten"
+
+#~ msgid ""
+#~ "This may be used by several users/groups. Please double check if your "
+#~ "really want to do this since there is no way for GOsa to get your data "
+#~ "back."
+#~ msgstr ""
+#~ "Dies wird unter Umständen von verschiedenen Benutzern/Gruppen genutzt. "
+#~ "Bitte prüfen Sie genau, ob Sie dies wünschen, da GOsa keine Möglichkeit "
+#~ "hat, die Daten wiederherzustellen."
+
+#~ msgid "Manage hotplug devices"
+#~ msgstr "Hotplug-Geräte verwalten"
+
+#~ msgid "device"
+#~ msgstr "Gerät"
+
+#~ 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 ""
+#~ "Dieser Eintrag wird unter Umständen von verschiedenen Gruppen genutzt. "
+#~ "Bitte überprüfen Sie genau was Sie tun, da GOsa keine Möglichkeit hat, "
+#~ "die Daten wiederherzustellen."
+
+#~ msgid "This table displays all applications in the selected tree."
+#~ msgstr "Diese Tabelle enthält alle Abteilungen des gewählten Teilbaums"
+
+#~ msgid "Freezed"
+#~ msgstr "Eingefroren"
+
+#~ msgid "Number of listed applications"
+#~ msgstr "Anzahl der angezeigten Anwendungen"
+
+#~ msgid "Display mime types matching"
+#~ msgstr "Zeige MIME-Typen, auf die Folgendes passt"
+
+#~ msgid "Number of listed mimetypes"
+#~ msgstr "Anzahl der angezeigten MIME-Typen"
+
+#~ msgid "Mimetype management"
+#~ msgstr "MIME-Typen Verwaltung"
+
+#~ msgid "Syslog Service"
+#~ msgstr "Protokoll-Dienst"
+
+#~ msgid "Logging service"
+#~ msgstr "Protokoll-Dienst"
+
+#~ msgid "Syslog service database"
+#~ msgstr "Protokoll-Dienst Datenbank"
+
+#~ msgid "Password"
+#~ msgstr "Passwort"
+
+#~ msgid "Database"
+#~ msgstr "Datenbank"
+
+#~ msgid "Logging database"
+#~ msgstr "Protokoll-Datenbank"
+
+#~ msgid "Admin"
+#~ msgstr "Administrator"
+
+#~ msgid "Logging database information"
+#~ msgstr "Informationen der Protokoll-Datenbank"
+
+#~ msgid "Logging DB user"
+#~ msgstr "Protokoll-DB Benutzer"
diff --git a/gosa-plugins/goto/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/goto/locale/es/LC_MESSAGES/messages.po
index b0eb7ab1e..c1521427b 100644
--- a/gosa-plugins/goto/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/goto/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:52+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
@@ -40,15 +40,15 @@ msgstr ""
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
 #: admin/mimetypes/class_mimetypeGeneric.inc:715
 #: admin/systems/goto/class_printGeneric.inc:988
-#: admin/systems/goto/class_workstationGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:699
 msgid "Generic"
 msgstr "Genérico"
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
 #: admin/systems/goto/workstation.tpl:95
-#: admin/systems/goto/class_workstationGeneric.inc:489
-#: admin/systems/goto/class_terminalGeneric.inc:480
+#: admin/systems/goto/class_workstationGeneric.inc:490
+#: admin/systems/goto/class_terminalGeneric.inc:482
 #: admin/systems/goto/terminal.tpl:84
 #, fuzzy
 msgid "NTP server"
@@ -62,7 +62,7 @@ msgstr ""
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
 #: admin/systems/goto/workstation.tpl:55
-#: admin/systems/goto/class_terminalGeneric.inc:700
+#: admin/systems/goto/class_terminalGeneric.inc:702
 #: admin/systems/goto/terminal.tpl:47
 msgid "Mode"
 msgstr "Modo"
@@ -75,10 +75,8 @@ msgstr "Seleccione los sistemas a añadir"
 
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
-#: admin/systems/services/syslog/class_goSyslogServer.inc:27
-#: admin/systems/services/syslog/class_goSyslogServer.inc:47
 #: admin/systems/goto/workstation.tpl:65
-#: admin/systems/goto/class_workstationGeneric.inc:712
+#: admin/systems/goto/class_workstationGeneric.inc:713
 #: admin/systems/goto/terminal.tpl:57
 msgid "Syslog server"
 msgstr "Servidor de registro de sistema"
@@ -91,7 +89,7 @@ msgstr "Elija el subárbol donde colocar al usuario"
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:703
+#: admin/systems/goto/class_terminalGeneric.inc:705
 #: admin/systems/goto/terminal.tpl:117
 msgid "Root server"
 msgstr "Servidor Raíz"
@@ -103,7 +101,7 @@ msgstr "Seleccione los sistemas a añadir"
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:704
+#: admin/systems/goto/class_terminalGeneric.inc:706
 #: admin/systems/goto/terminal.tpl:131
 msgid "Swap server"
 msgstr "Servidor de Intercambio"
@@ -138,20 +136,20 @@ msgid "Execute"
 msgstr "Ejecute"
 
 #: admin/ogroups/goto/class_termgroup.inc:51
-#: admin/systems/goto/class_workstationGeneric.inc:138
-#: admin/systems/goto/class_terminalGeneric.inc:122
+#: admin/systems/goto/class_workstationGeneric.inc:139
+#: admin/systems/goto/class_terminalGeneric.inc:124
 msgid "Activated"
 msgstr "Activado"
 
 #: admin/ogroups/goto/class_termgroup.inc:52
-#: admin/systems/goto/class_workstationGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:121
+#: admin/systems/goto/class_workstationGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:123
 #: addons/goto/class_gotomasses.inc:542
 msgid "Locked"
 msgstr "Bloqueado"
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:281
+#: admin/systems/goto/class_terminalGeneric.inc:283
 #, fuzzy
 msgid "Local swap"
 msgstr "Nombre del Rol"
@@ -170,7 +168,7 @@ msgstr "Nombre del Rol"
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:154
+#: admin/systems/goto/class_workstationGeneric.inc:155
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -188,22 +186,22 @@ msgstr "Nombre del Rol"
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:137
-#: admin/systems/goto/class_terminalGeneric.inc:287
-#: admin/systems/goto/class_terminalGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:139
+#: admin/systems/goto/class_terminalGeneric.inc:289
+#: admin/systems/goto/class_terminalGeneric.inc:301
 msgid "inherited"
 msgstr "heredado"
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:635
+#: admin/systems/goto/class_workstationGeneric.inc:213
+#: admin/systems/goto/class_workstationGeneric.inc:636
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
-#: admin/systems/goto/class_workstationService.inc:568
-#: admin/systems/goto/class_terminalGeneric.inc:187
-#: admin/systems/goto/class_terminalGeneric.inc:625
+#: admin/systems/goto/class_workstationService.inc:572
+#: admin/systems/goto/class_terminalGeneric.inc:189
+#: admin/systems/goto/class_terminalGeneric.inc:627
 #: addons/goto/class_gotomasses.inc:328
 #: addons/goto/class_goto_import_file.inc:124
 #, fuzzy
@@ -211,30 +209,30 @@ msgid "Service infrastructure"
 msgstr "Buscar en subárboles"
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:216
-#: admin/systems/goto/class_terminalGeneric.inc:191
+#: admin/systems/goto/class_workstationGeneric.inc:217
+#: admin/systems/goto/class_terminalGeneric.inc:193
 #, fuzzy
 msgid "Event error"
 msgstr "Error de configuración"
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:217
-#: admin/systems/goto/class_terminalGeneric.inc:192
+#: admin/systems/goto/class_workstationGeneric.inc:218
+#: admin/systems/goto/class_terminalGeneric.inc:194
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "'%s' no está permitido:"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:298
-#: admin/systems/goto/class_terminalGeneric.inc:265
+#: admin/systems/goto/class_workstationGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:267
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
 msgid "Switch off"
 msgstr "Apagar"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:298
-#: admin/systems/goto/class_terminalGeneric.inc:266
+#: admin/systems/goto/class_workstationGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:268
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
 msgid "Reboot"
@@ -254,15 +252,15 @@ msgid "Wake"
 msgstr "Despertar"
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:300
-#: admin/systems/goto/class_workstationGeneric.inc:308
+#: admin/systems/goto/class_workstationGeneric.inc:301
+#: admin/systems/goto/class_workstationGeneric.inc:309
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
 msgid "Reinstall"
 msgstr "Reinstalar"
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:301
+#: admin/systems/goto/class_workstationGeneric.inc:302
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 msgid "Rescan hardware"
@@ -307,13 +305,13 @@ msgstr "Análisis del sistema"
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:364
-#: admin/systems/goto/class_workstationGeneric.inc:596
-#: admin/systems/goto/class_workstationGeneric.inc:613
+#: admin/systems/goto/class_workstationGeneric.inc:365
+#: admin/systems/goto/class_workstationGeneric.inc:597
+#: admin/systems/goto/class_workstationGeneric.inc:614
 #: admin/systems/goto/class_workstationStartup.inc:889
-#: admin/systems/goto/class_workstationService.inc:456
-#: admin/systems/goto/class_terminalGeneric.inc:353
-#: admin/systems/goto/class_terminalGeneric.inc:611
+#: admin/systems/goto/class_workstationService.inc:460
+#: admin/systems/goto/class_terminalGeneric.inc:355
+#: admin/systems/goto/class_terminalGeneric.inc:613
 #: personal/environment/class_environment.inc:1058
 #: personal/environment/class_environment.inc:1315
 #, fuzzy
@@ -331,13 +329,13 @@ msgid "System group"
 msgstr "Sistema de seguridad"
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:716
-#: admin/systems/goto/class_terminalGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:717
+#: admin/systems/goto/class_terminalGeneric.inc:711
 msgid "Action flag"
 msgstr "Marca de acción"
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:713
+#: admin/systems/goto/class_workstationGeneric.inc:714
 msgid "Ntp server"
 msgstr "Servidor NTP"
 
@@ -383,34 +381,38 @@ msgstr "Versión"
 msgid "Application settings"
 msgstr "Parametros de la aplicación"
 
-#: admin/groups/apps/edit_entry.tpl:43
+#: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
 #: admin/devices/class_deviceGeneric.inc:90
 #: admin/devices/class_deviceGeneric.inc:114
 #: admin/devices/class_deviceGeneric.inc:260
 #: admin/applications/class_applicationParameters.inc:190
+#: admin/applications/application-list.xml:41
+#: admin/applications/application-list-release.xml:41
 #: admin/applications/class_applicationGeneric.inc:430
 #: admin/applications/class_applicationGeneric.inc:434
 #: admin/applications/class_applicationGeneric.inc:606
 #: admin/applications/class_applicationGeneric.inc:610
+#: admin/mimetypes/mimetype-list-release.xml:41
+#: admin/mimetypes/mimetype-list.xml:41
 #: admin/mimetypes/class_mimetypeGeneric.inc:532
 #: admin/mimetypes/class_mimetypeGeneric.inc:724
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
-#: admin/systems/services/nfs/class_servNfs.inc:239
+#: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
 #: admin/systems/goto/class_printGeneric.inc:733
 #: admin/systems/goto/class_printGeneric.inc:738
 #: admin/systems/goto/class_printGeneric.inc:757
 #: admin/systems/goto/class_printGeneric.inc:997
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:456
-#: admin/systems/goto/class_workstationGeneric.inc:461
-#: admin/systems/goto/class_workstationGeneric.inc:479
-#: admin/systems/goto/class_terminalGeneric.inc:446
-#: admin/systems/goto/class_terminalGeneric.inc:451
-#: admin/systems/goto/class_terminalGeneric.inc:470
-#: admin/systems/goto/class_terminalGeneric.inc:696
+#: admin/systems/goto/class_workstationGeneric.inc:457
+#: admin/systems/goto/class_workstationGeneric.inc:462
+#: admin/systems/goto/class_workstationGeneric.inc:480
+#: admin/systems/goto/class_terminalGeneric.inc:448
+#: admin/systems/goto/class_terminalGeneric.inc:453
+#: admin/systems/goto/class_terminalGeneric.inc:472
+#: admin/systems/goto/class_terminalGeneric.inc:698
 #: personal/environment/class_logonManagementDialog.inc:103
 msgid "Name"
 msgstr "Nombre"
@@ -440,8 +442,6 @@ msgid "department"
 msgstr "departamento"
 
 #: admin/groups/apps/class_groupApplication.inc:481
-#: admin/applications/class_applicationManagement.inc:368
-#: admin/applications/class_applicationManagement.inc:449
 #: admin/applications/class_applicationGeneric.inc:127
 msgid "application"
 msgstr "aplicación"
@@ -452,7 +452,7 @@ msgid "Not available in release."
 msgstr "No esta disponible en la configuración actual"
 
 #: admin/groups/apps/class_groupApplication.inc:1373
-#: admin/applications/class_applicationManagement.inc:24
+#: admin/applications/class_applicationManagement.inc:25
 #: admin/mimetypes/generic.tpl:117 admin/mimetypes/generic.tpl:177
 msgid "Applications"
 msgstr "Aplicaciones"
@@ -462,8 +462,10 @@ msgid "Group applications"
 msgstr "Grupo de aplicaciones"
 
 #: admin/groups/apps/class_groupApplication.inc:1381
-#: admin/applications/class_divListApplication.inc:114
-#: admin/applications/class_divListApplication.inc:150
+#: admin/applications/application-list.xml:15
+#: admin/applications/application-list.xml:74
+#: admin/applications/application-list-release.xml:15
+#: admin/applications/application-list-release.xml:74
 #: admin/applications/class_applicationGeneric.inc:603
 #: admin/mimetypes/class_mimetypeGeneric.inc:728
 msgid "Application"
@@ -471,6 +473,8 @@ msgstr "Aplicación"
 
 #: admin/groups/apps/class_groupApplication.inc:1382
 #: admin/groups/apps/app_list.tpl:5 admin/groups/apps/app_list.tpl:53
+#: admin/applications/application-filter-release.tpl:14
+#: admin/mimetypes/mimetype-filter-release.tpl:14
 #: admin/systems/goto/workstationStartup.tpl:83
 #: admin/systems/goto/workstationStartup.tpl:123
 msgid "Release"
@@ -512,10 +516,12 @@ msgstr "Mover abajo"
 
 #: admin/groups/apps/app_list.tpl:86 admin/groups/apps/app_list.tpl:107
 #: admin/groups/apps/app_list.tpl:132
-#: admin/devices/class_divListDevices.inc:100
+#: admin/devices/class_divListDevices.inc:100 admin/devices/device-list.xml:86
 #: admin/applications/class_applicationParameters.inc:122
-#: admin/applications/class_divListApplication.inc:120
-#: admin/mimetypes/class_divListMimeTypes.inc:122
+#: admin/applications/application-list.xml:86
+#: admin/applications/application-list-release.xml:86
+#: admin/mimetypes/mimetype-list-release.xml:86
+#: admin/mimetypes/mimetype-list.xml:86
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
@@ -566,8 +572,6 @@ msgid "List of defined devices"
 msgstr "Lista de Departamentos"
 
 #: admin/devices/class_divListDevices.inc:45
-#: admin/applications/class_divListApplication.inc:45
-#: admin/mimetypes/class_divListMimeTypes.inc:45
 msgid "Select all"
 msgstr "Seleccione todos"
 
@@ -578,18 +582,15 @@ msgid "Device name"
 msgstr "Nombre de pila"
 
 #: admin/devices/class_divListDevices.inc:51
-#: admin/applications/class_divListApplication.inc:51
-#: admin/mimetypes/class_divListMimeTypes.inc:51
 msgid "Department"
 msgstr "Departamento"
 
 #: admin/devices/class_divListDevices.inc:52
-#: admin/devices/class_divListDevices.inc:87
-#: admin/applications/class_divListApplication.inc:52
-#: admin/applications/class_divListApplication.inc:107
-#: admin/mimetypes/class_divListMimeTypes.inc:52
-#: admin/mimetypes/class_divListMimeTypes.inc:109
-#: addons/goto/class_gotomasses.inc:365
+#: admin/devices/class_divListDevices.inc:87 admin/devices/device-list.xml:57
+#: admin/applications/application-list.xml:57
+#: admin/applications/application-list-release.xml:57
+#: admin/mimetypes/mimetype-list-release.xml:57
+#: admin/mimetypes/mimetype-list.xml:57 addons/goto/class_gotomasses.inc:365
 msgid "Actions"
 msgstr "Acciones"
 
@@ -599,18 +600,17 @@ msgid "Display devices matching"
 msgstr "Mostrar las acl que coincidan con"
 
 #: admin/devices/class_divListDevices.inc:82 admin/devices/deviceGeneric.tpl:9
-#: admin/devices/class_deviceGeneric.inc:261 admin/applications/generic.tpl:42
-#: admin/applications/class_divListApplication.inc:90
+#: admin/devices/class_deviceGeneric.inc:261 admin/devices/device-list.tpl:13
+#: admin/applications/generic.tpl:42
 #: admin/applications/class_applicationGeneric.inc:607
-#: admin/mimetypes/generic.tpl:44
-#: admin/mimetypes/class_divListMimeTypes.inc:93
+#: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
+#: admin/mimetypes/mimetype-list.tpl:13
 #: admin/mimetypes/class_mimetypeGeneric.inc:727
-#: admin/systems/services/ldap/class_goLdapServer.inc:79
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
 #: admin/systems/goto/class_printGeneric.inc:998
-#: admin/systems/goto/class_workstationGeneric.inc:710
-#: admin/systems/goto/class_terminalGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:711
+#: admin/systems/goto/class_terminalGeneric.inc:700
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/class_target_list.inc:152 addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/class_EventTargetAddList.inc:161
@@ -619,33 +619,32 @@ msgid "Base"
 msgstr "Base"
 
 #: admin/devices/class_divListDevices.inc:84
-#: admin/applications/class_divListApplication.inc:92
-#: admin/mimetypes/class_divListMimeTypes.inc:95
 #: addons/goto/class_target_list.inc:154
 #: addons/goto/events/class_EventTargetAddList.inc:163
 #: addons/goto/events/class_EventTargetAddUsersList.inc:132
 msgid "Submit department"
 msgstr "Enviar departamento"
 
-#: admin/devices/class_divListDevices.inc:84
-#: admin/applications/class_divListApplication.inc:92
-#: admin/mimetypes/class_divListMimeTypes.inc:95
-#: addons/goto/class_target_list.inc:154
+#: admin/devices/class_divListDevices.inc:84 admin/devices/device-list.tpl:13
+#: admin/applications/application-list.tpl:13
+#: admin/mimetypes/mimetype-list.tpl:13 addons/goto/class_target_list.inc:154
 #: addons/goto/events/class_EventTargetAddList.inc:163
 #: addons/goto/events/class_EventTargetAddUsersList.inc:132
 msgid "Submit"
 msgstr "Enviar"
 
-#: admin/devices/class_divListDevices.inc:92
-#: admin/applications/class_divListApplication.inc:111
-#: admin/mimetypes/class_divListMimeTypes.inc:114
-#: admin/systems/goto/chooser.tpl:16 addons/goto/class_gotomasses.inc:366
+#: admin/devices/class_divListDevices.inc:92 admin/devices/device-list.xml:68
+#: admin/applications/application-list.xml:68
+#: admin/applications/application-list-release.xml:68
+#: admin/mimetypes/mimetype-list-release.xml:68
+#: admin/mimetypes/mimetype-list.xml:68 admin/systems/goto/chooser.tpl:16
+#: addons/goto/class_gotomasses.inc:366
 msgid "Create"
 msgstr "Crear"
 
 #: admin/devices/class_divListDevices.inc:94
-#: admin/devices/class_divListDevices.inc:131
-#: admin/devices/class_deviceGeneric.inc:159
+#: admin/devices/class_divListDevices.inc:131 admin/devices/device-list.xml:15
+#: admin/devices/device-list.xml:74 admin/devices/class_deviceGeneric.inc:159
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 #, fuzzy
@@ -653,27 +652,19 @@ msgid "Device"
 msgstr "Dispositivos"
 
 #: admin/devices/class_divListDevices.inc:156
-#: admin/applications/class_divListApplication.inc:186
-#: admin/mimetypes/class_divListMimeTypes.inc:186
 msgid "edit"
 msgstr "editar"
 
 #: admin/devices/class_divListDevices.inc:156
-#: admin/applications/class_divListApplication.inc:186
-#: admin/mimetypes/class_divListMimeTypes.inc:186
 msgid "Edit this entry"
 msgstr "Editar esta entrada"
 
 #: admin/devices/class_divListDevices.inc:163
-#: admin/applications/class_divListApplication.inc:202
-#: admin/mimetypes/class_divListMimeTypes.inc:201
 #: admin/systems/ppd/class_printerPPDSelectionDialog.inc:140
 msgid "delete"
 msgstr "eliminar"
 
 #: admin/devices/class_divListDevices.inc:163
-#: admin/applications/class_divListApplication.inc:202
-#: admin/mimetypes/class_divListMimeTypes.inc:201
 msgid "Delete this entry"
 msgstr "Eliminar esta entrada"
 
@@ -683,47 +674,49 @@ msgid "Number of listed devices"
 msgstr "Nuevo otros dispositivos"
 
 #: admin/devices/class_divListDevices.inc:206
-#: admin/applications/class_divListApplication.inc:243
-#: admin/mimetypes/class_divListMimeTypes.inc:244
 #, fuzzy
 msgid "Number of listed departments"
 msgstr "Eliminar departamentos seleccionados"
 
-#: admin/devices/remove.tpl:6
-#, fuzzy
+#: admin/devices/remove.tpl:6 admin/applications/remove.tpl:6
+#: admin/mimetypes/remove.tpl:6
 msgid ""
-"This may be used by several users/groups. Please double check if your really "
-"want to do this since there is no way for GOsa to get your data back."
+"Please double check if you 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. Si está seguro de lo que quiere "
-"hacer pulse dos veces, ya que no hay manera de que GOsa recupere "
-"posteriormente la información."
+"Si está seguro de lo que quiere hacer pulse dos veces, ya que no hay forma "
+"de que GOsa pueda recuperar posteriormente esa información"
 
-#: admin/devices/remove.tpl:9 admin/applications/remove.tpl:9
-#: admin/mimetypes/remove.tpl:9 addons/goto/remove.tpl:9
+#: admin/devices/remove.tpl:10 admin/applications/remove.tpl:10
+#: admin/mimetypes/remove.tpl:10 addons/goto/remove.tpl:9
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o "
 "<i>Cancelar</i> para Abortar."
 
-#: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:257
-msgid "Devices"
-msgstr "Dispositivos"
+#: admin/devices/device-list.xml:11
+#, fuzzy
+msgid "List of devices"
+msgstr "Lista de Departamentos"
 
-#: admin/devices/deviceGeneric.tpl:29 admin/devices/class_deviceGeneric.inc:93
+#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:29
+#: admin/devices/class_deviceGeneric.inc:93
 #: admin/devices/class_deviceGeneric.inc:262 admin/applications/generic.tpl:33
+#: admin/applications/application-list.xml:49
+#: admin/applications/application-list-release.xml:49
 #: admin/applications/class_applicationGeneric.inc:608
 #: admin/mimetypes/generic.tpl:34 admin/mimetypes/paste_generic.tpl:21
+#: admin/mimetypes/mimetype-list-release.xml:49
+#: admin/mimetypes/mimetype-list.xml:49
 #: admin/mimetypes/class_mimetypeGeneric.inc:726
 #: admin/systems/services/shares/class_goShareServer.inc:424
-#: admin/systems/services/nfs/class_servNfs.inc:211
+#: admin/systems/services/nfs/class_servNfs.inc:207
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
 #: admin/systems/goto/class_printGeneric.inc:999
-#: admin/systems/goto/class_workstationGeneric.inc:708
-#: admin/systems/goto/class_terminalGeneric.inc:697
+#: admin/systems/goto/class_workstationGeneric.inc:709
+#: admin/systems/goto/class_terminalGeneric.inc:699
 #: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
 #: addons/goto/class_gotomasses.inc:932
 #: personal/environment/class_logonManagementDialog.inc:111
@@ -731,6 +724,21 @@ msgstr "Dispositivos"
 msgid "Description"
 msgstr "Descripción"
 
+#: admin/devices/device-list.xml:118
+#, fuzzy
+msgid "Edit device"
+msgstr "Dispositivos"
+
+#: admin/devices/device-list.xml:131
+#, fuzzy
+msgid "Remove device"
+msgstr "Eliminar foto"
+
+#: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
+#: admin/devices/class_deviceGeneric.inc:257
+msgid "Devices"
+msgstr "Dispositivos"
+
 #: admin/devices/deviceGeneric.tpl:38
 #, fuzzy
 msgid "Device type"
@@ -767,10 +775,14 @@ msgstr ""
 msgid "(idProduct)"
 msgstr ""
 
-#: admin/devices/main.inc:49 admin/devices/main.inc:51
+#: admin/devices/device-filter.tpl:3
+#: admin/applications/application-filter.tpl:3
+#: admin/applications/application-filter-release.tpl:3
+#: admin/mimetypes/mimetype-filter-release.tpl:3
+#: admin/mimetypes/mimetype-filter.tpl:3
 #, fuzzy
-msgid "Hotplug device management"
-msgstr "Administración Sieve"
+msgid "Filter"
+msgstr "Filtros"
 
 #: admin/devices/class_deviceGeneric.inc:29
 msgid "Digital camera"
@@ -872,55 +884,22 @@ msgstr "Servidor"
 msgid "Device ID"
 msgstr "Nombre del servicio"
 
-#: admin/devices/class_deviceManagement.inc:7
+#: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:82
+#: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:84
+#: admin/mimetypes/mimetype-list.tpl:13
+msgid "Update"
+msgstr ""
+
+#: admin/devices/class_deviceManagement.inc:25
 #: personal/environment/class_environment.inc:1783
 #: personal/environment/environment.tpl:293
 msgid "Hotplug devices"
 msgstr "Dispositivos de conexión en caliente (HotPlug)"
 
-#: admin/devices/class_deviceManagement.inc:8
-#, fuzzy
-msgid "Manage hotplug devices"
-msgstr "dispositivos"
-
-#: admin/devices/class_deviceManagement.inc:246
-#: admin/applications/class_applicationManagement.inc:352
-#: admin/mimetypes/class_mimetypeManagement.inc:360
-#: addons/goto/class_gotomasses.inc:230
-#, fuzzy
-msgid "Permission"
-msgstr "Permisos"
-
-#: admin/devices/class_deviceManagement.inc:263
-#: admin/devices/class_deviceManagement.inc:345
+#: admin/devices/class_deviceManagement.inc:26
 #, fuzzy
-msgid "device"
-msgstr "Servicio"
-
-#: admin/devices/class_deviceManagement.inc:296
-#: admin/devices/class_deviceManagement.inc:352
-#: admin/devices/class_deviceManagement.inc:381
-#: admin/applications/class_applicationManagement.inc:401
-#: admin/applications/class_applicationManagement.inc:456
-#: admin/applications/class_applicationManagement.inc:487
-#: admin/mimetypes/class_mimetypeManagement.inc:412
-#: admin/mimetypes/class_mimetypeManagement.inc:466
-#: admin/mimetypes/class_mimetypeManagement.inc:496
-#: admin/systems/goto/class_printGeneric.inc:1019
-#: admin/systems/goto/class_printGeneric.inc:1041
-#: personal/environment/class_environment.inc:583
-#, fuzzy
-msgid "Permission error"
-msgstr "Permisos"
-
-#: admin/applications/remove.tpl:6 admin/mimetypes/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. Si está seguro de lo que quiere "
-"hacer pulse dos veces, ya que no hay manera de que GOsa recupere "
-"posteriormente la información."
+msgid "Hotplug device management"
+msgstr "Administración Sieve"
 
 #: admin/applications/release_select.tpl:2
 #: admin/mimetypes/release_select.tpl:2
@@ -973,7 +952,6 @@ msgid "Application parameter settings"
 msgstr "Configuración de los parámetros de aplicación"
 
 #: admin/applications/generic.tpl:7 admin/applications/generic.tpl:10
-#: admin/applications/class_divListApplication.inc:51
 #: admin/applications/class_applicationGeneric.inc:561
 msgid "Application name"
 msgstr "Nombre de la aplicación"
@@ -1011,10 +989,6 @@ msgstr "Seleccione una base"
 msgid "Icon"
 msgstr "Icono"
 
-#: admin/applications/generic.tpl:82 admin/mimetypes/generic.tpl:84
-msgid "Update"
-msgstr ""
-
 #: admin/applications/generic.tpl:82
 msgid "Reload picture from LDAP"
 msgstr ""
@@ -1079,38 +1053,27 @@ msgstr ""
 msgid "Download"
 msgstr "Abajo"
 
-#: admin/applications/class_applicationManagement.inc:25
-#: personal/environment/class_environment.inc:10
-#, fuzzy
-msgid "This does something"
-msgstr "Mostrar objetos que coincidan"
+#: admin/applications/class_applicationManagement.inc:26
+msgid "Application management"
+msgstr "Administración de aplicación"
 
-#: admin/applications/class_divListApplication.inc:25
-msgid "List of Applications"
+#: admin/applications/application-list.xml:11
+#: admin/applications/application-list-release.xml:11
+#, fuzzy
+msgid "List of applications"
 msgstr "Lista de aplicaciones"
 
-#: admin/applications/class_divListApplication.inc:26
-msgid "This table displays all applications in the selected tree."
-msgstr "Esta tabla muestra todas las aplicaciones en el árbol seleccionado."
-
-#: admin/applications/class_divListApplication.inc:58
-#: personal/environment/hotplugDialog.tpl:43
-msgid "Display users matching"
-msgstr "Mostrar usuarios que coincidan con"
-
-#: admin/applications/class_divListApplication.inc:199
-#: admin/mimetypes/class_divListMimeTypes.inc:198
-msgid "Freezed"
-msgstr ""
-
-#: admin/applications/class_divListApplication.inc:242
+#: admin/applications/application-list.xml:118
+#: admin/applications/application-list-release.xml:118
 #, fuzzy
-msgid "Number of listed applications"
-msgstr "Eliminar aplicaciones seleccionadas"
+msgid "Edit application"
+msgstr "Aplicación"
 
-#: admin/applications/main.inc:48 admin/applications/main.inc:50
-msgid "Application management"
-msgstr "Administración de aplicación"
+#: admin/applications/application-list.xml:131
+#: admin/applications/application-list-release.xml:131
+#, fuzzy
+msgid "Remove application"
+msgstr "aplicación"
 
 #: admin/applications/class_applicationGeneric.inc:95
 msgid "no example"
@@ -1154,24 +1117,21 @@ msgstr "Aplicación genérica"
 msgid "Script content"
 msgstr "Contenido del script"
 
-#: admin/mimetypes/class_mimetypeManagement.inc:24
+#: admin/mimetypes/class_mimetypeManagement.inc:25
 #: admin/mimetypes/class_mimetypeGeneric.inc:721
 #, fuzzy
 msgid "Mime types"
 msgstr "Funciones laborales"
 
-#: admin/mimetypes/class_mimetypeManagement.inc:25
+#: admin/mimetypes/class_mimetypeManagement.inc:26
 #, fuzzy
 msgid "Manage mime types"
 msgstr "Gestionar Departamentos"
 
-#: admin/mimetypes/class_mimetypeManagement.inc:378
-#: admin/mimetypes/class_mimetypeManagement.inc:459
-#: admin/mimetypes/generic.tpl:12
-#: admin/mimetypes/class_divListMimeTypes.inc:51
-#: admin/mimetypes/class_divListMimeTypes.inc:116
-#: admin/mimetypes/class_divListMimeTypes.inc:152
-#: admin/mimetypes/paste_generic.tpl:13
+#: admin/mimetypes/generic.tpl:12 admin/mimetypes/paste_generic.tpl:13
+#: admin/mimetypes/mimetype-list-release.xml:15
+#: admin/mimetypes/mimetype-list-release.xml:74
+#: admin/mimetypes/mimetype-list.xml:15 admin/mimetypes/mimetype-list.xml:74
 #, fuzzy
 msgid "Mime type"
 msgstr "Funciones laborales"
@@ -1248,30 +1208,27 @@ msgstr ""
 msgid "Ask whether to save to local disk"
 msgstr ""
 
-#: admin/mimetypes/class_divListMimeTypes.inc:27
-#: admin/mimetypes/class_divListMimeTypes.inc:28
-#, fuzzy
-msgid "List of defined mime types"
-msgstr "Lista de Departamentos"
+#: admin/mimetypes/paste_generic.tpl:24
+msgid "Please specify a description for this mime type here"
+msgstr ""
 
-#: admin/mimetypes/class_divListMimeTypes.inc:58
+#: admin/mimetypes/mimetype-list-release.xml:11
+#: admin/mimetypes/mimetype-list.xml:11
 #, fuzzy
-msgid "Display mime types matching"
-msgstr "Mostrar sistemas que coincidan con"
+msgid "List of mimetypes"
+msgstr "Lista de Departamentos"
 
-#: admin/mimetypes/class_divListMimeTypes.inc:243
+#: admin/mimetypes/mimetype-list-release.xml:118
+#: admin/mimetypes/mimetype-list.xml:118
 #, fuzzy
-msgid "Number of listed mimetypes"
-msgstr "Número de usuarios mostrados"
-
-#: admin/mimetypes/paste_generic.tpl:24
-msgid "Please specify a description for this mime type here"
-msgstr ""
+msgid "Edit mimetype"
+msgstr "Editar esta entrada"
 
-#: admin/mimetypes/main.inc:48 admin/mimetypes/main.inc:50
+#: admin/mimetypes/mimetype-list-release.xml:131
+#: admin/mimetypes/mimetype-list.xml:131
 #, fuzzy
-msgid "Mimetype management"
-msgstr "Activar gestión tipos mime"
+msgid "Remove mimetype"
+msgstr "Eliminar foto"
 
 #: admin/mimetypes/class_mimetypeGeneric.inc:535
 #, fuzzy
@@ -1297,7 +1254,6 @@ msgid "Print Service"
 msgstr "Impresora"
 
 #: admin/systems/services/cups/goCupsServer.tpl:1
-#: admin/systems/services/syslog/goSyslogServer.tpl:1
 #, fuzzy
 msgid "enabled"
 msgstr "Activado"
@@ -1319,23 +1275,18 @@ msgstr "Cups"
 #: admin/systems/services/ntp/class_goNtpServer.inc:115
 #: admin/systems/services/terminal/class_goTerminalServer.inc:165
 #: admin/systems/services/shares/class_goShareServer.inc:414
-#: admin/systems/services/syslog/class_goSyslogServer.inc:69
-#: admin/systems/services/syslog/class_goLogDBServer.inc:93
 msgid "Services"
 msgstr "Servicios"
 
 #: admin/systems/services/cups/class_goCupsServer.inc:77
-#: admin/systems/services/syslog/class_goLogDBServer.inc:101
 msgid "Start"
 msgstr "Inicio"
 
 #: admin/systems/services/cups/class_goCupsServer.inc:78
-#: admin/systems/services/syslog/class_goLogDBServer.inc:102
 msgid "Stop"
 msgstr "Parada"
 
 #: admin/systems/services/cups/class_goCupsServer.inc:79
-#: admin/systems/services/syslog/class_goLogDBServer.inc:103
 msgid "Restart"
 msgstr "Reiniciar"
 
@@ -1381,6 +1332,8 @@ msgid "LDAP service"
 msgstr "Servicio LDAP"
 
 #: admin/systems/services/ldap/goLdapServer.tpl:2
+#: admin/systems/services/ldap/class_goLdapServer.inc:79
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
 #, fuzzy
 msgid "LDAP URI"
 msgstr "LDAP"
@@ -1389,6 +1342,25 @@ msgstr "LDAP"
 msgid "fill-in-your-servers-dns-name"
 msgstr ""
 
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
+#: admin/systems/services/nfs/servnfs.tpl:39
+#: admin/systems/goto/class_ArpNewDevice.inc:38
+#: admin/systems/goto/class_SelectDeviceType.inc:39
+#: addons/goto/class_target_list.inc:201
+#: addons/goto/events/class_EventTargetAddList.inc:238
+#: personal/environment/environment.tpl:135
+msgid "Server"
+msgstr "Servidor"
+
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
+#: admin/systems/goto/class_gotoLpdEnabled.inc:153
+#: admin/systems/goto/terminalService.tpl:58
+#: admin/systems/goto/workstationService.tpl:66
+#: admin/systems/goto/gotoLpdEnable.tpl:71
+#, fuzzy
+msgid "Port"
+msgstr "Cancelar"
+
 #: admin/systems/services/ldap/class_goLdapServer.inc:128
 #: admin/systems/services/ldap/class_goLdapServer.inc:129
 msgid "Ldap"
@@ -1484,13 +1456,13 @@ msgid "Path"
 msgstr "Ruta"
 
 #: admin/systems/services/shares/class_goShareServer.inc:428
-#: admin/systems/services/nfs/class_servNfs.inc:219
+#: admin/systems/services/nfs/class_servNfs.inc:215
 #: admin/systems/services/nfs/servnfs.tpl:121
 msgid "Option"
 msgstr "Opción"
 
 #: admin/systems/services/shares/class_goShareServer.inc:429
-#: admin/systems/services/nfs/class_servNfs.inc:215
+#: admin/systems/services/nfs/class_servNfs.inc:211
 #: admin/systems/services/nfs/servnfs.tpl:29
 msgid "Volume"
 msgstr "Volumen"
@@ -1503,10 +1475,6 @@ msgstr ""
 msgid "'Path / Volume' must contain at least one '/'!"
 msgstr ""
 
-#: admin/systems/services/nfs/class_servNfs.inc:205
-msgid "Hidden shares must have a '$' at the end of the name!"
-msgstr ""
-
 #: admin/systems/services/nfs/servnfs.tpl:1
 #, fuzzy
 msgid "Edit share"
@@ -1517,15 +1485,6 @@ msgstr "Editar usuario"
 msgid "NFS setup"
 msgstr "Configuración"
 
-#: admin/systems/services/nfs/servnfs.tpl:39
-#: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_SelectDeviceType.inc:39
-#: addons/goto/class_target_list.inc:201
-#: addons/goto/events/class_EventTargetAddList.inc:238
-#: personal/environment/environment.tpl:135
-msgid "Server"
-msgstr "Servidor"
-
 #: admin/systems/services/nfs/servnfs.tpl:69
 msgid "Auto-mount share on Apple systems"
 msgstr ""
@@ -1535,60 +1494,6 @@ msgstr ""
 msgid "Codepage"
 msgstr "Página Web"
 
-#: admin/systems/services/syslog/goSyslogServer.tpl:1
-#, fuzzy
-msgid "Syslog Service"
-msgstr "Servicios"
-
-#: admin/systems/services/syslog/class_goSyslogServer.inc:68
-#: admin/systems/services/syslog/class_goSyslogServer.inc:69
-msgid "Logging service"
-msgstr "Servicio de Registro de sistema"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:31
-#: admin/systems/services/syslog/class_goLogDBServer.inc:59
-#, fuzzy
-msgid "Syslog service database"
-msgstr "Servidor de registro de sistema activado"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:69
-#: admin/systems/goto/class_printGeneric.inc:976
-#: addons/goto/events/class_EventTargetAddUsersList.inc:171
-msgid "User"
-msgstr "Usuario"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:72
-#: admin/systems/services/syslog/class_goLogDBServer.inc:105
-#: admin/systems/services/syslog/goLogDBServer.tpl:20
-msgid "Password"
-msgstr "Contraseña"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:75
-#: admin/systems/services/syslog/class_goLogDBServer.inc:106
-#: admin/systems/services/syslog/goLogDBServer.tpl:4
-#, fuzzy
-msgid "Database"
-msgstr "Crear"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:92
-#: admin/systems/services/syslog/class_goLogDBServer.inc:93
-msgid "Logging database"
-msgstr "Base de datos de Registro"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:104
-msgid "Admin"
-msgstr "Administrador"
-
-#: admin/systems/services/syslog/goLogDBServer.tpl:1
-#, fuzzy
-msgid "Logging database information"
-msgstr "Modificar información"
-
-#: admin/systems/services/syslog/goLogDBServer.tpl:12
-#, fuzzy
-msgid "Logging DB user"
-msgstr "Entrada fallida: %s"
-
 #: admin/systems/goto/workstation.tpl:1 admin/systems/goto/terminal.tpl:1
 msgid "Properties"
 msgstr "Propiedades"
@@ -1599,13 +1504,13 @@ msgid "Workstation template"
 msgstr "Plantillas de ausencia"
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:707
+#: admin/systems/goto/class_workstationGeneric.inc:708
 msgid "Workstation name"
 msgstr "Nombre de la estación de trabajo"
 
 #: admin/systems/goto/workstation.tpl:27
 #: admin/systems/goto/class_printGeneric.inc:1000
-#: admin/systems/goto/class_workstationGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:710
 msgid "Location"
 msgstr "Localización"
 
@@ -1712,14 +1617,6 @@ msgstr "Añadir"
 msgid "bit/s"
 msgstr "bit"
 
-#: admin/systems/goto/class_gotoLpdEnabled.inc:153
-#: admin/systems/goto/terminalService.tpl:58
-#: admin/systems/goto/workstationService.tpl:66
-#: admin/systems/goto/gotoLpdEnable.tpl:71
-#, fuzzy
-msgid "Port"
-msgstr "Cancelar"
-
 #: admin/systems/goto/ArpNewDevice.tpl:1
 msgid "Integrating unknown devices"
 msgstr ""
@@ -1866,13 +1763,13 @@ msgstr ""
 #: admin/systems/goto/class_printGeneric.inc:593
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:230
+#: admin/systems/goto/class_terminalGeneric.inc:232
 #, fuzzy
 msgid "terminal"
 msgstr "Terminal"
 
 #: admin/systems/goto/class_printGeneric.inc:595
-#: admin/systems/goto/class_workstationGeneric.inc:226
+#: admin/systems/goto/class_workstationGeneric.inc:227
 #: admin/systems/goto/class_workstationStartup.inc:285
 #, fuzzy
 msgid "workstation"
@@ -1896,6 +1793,11 @@ msgstr "Impresora"
 msgid "Group"
 msgstr "Grupo"
 
+#: admin/systems/goto/class_printGeneric.inc:976
+#: addons/goto/events/class_EventTargetAddUsersList.inc:171
+msgid "User"
+msgstr "Usuario"
+
 #: admin/systems/goto/class_printGeneric.inc:989
 msgid "Print generic"
 msgstr "Impresora genérica"
@@ -1920,6 +1822,13 @@ msgstr "Impresora PPD"
 msgid "Permissions"
 msgstr "Permisos"
 
+#: admin/systems/goto/class_printGeneric.inc:1019
+#: admin/systems/goto/class_printGeneric.inc:1041
+#: personal/environment/class_environment.inc:583
+#, fuzzy
+msgid "Permission error"
+msgstr "Permisos"
+
 #: admin/systems/goto/class_printGeneric.inc:1019
 #: admin/systems/goto/class_printGeneric.inc:1041
 #, fuzzy
@@ -2049,7 +1958,7 @@ msgid "System informations"
 msgstr "No se puede acceder a la información PPD"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:704
+#: admin/systems/goto/class_workstationGeneric.inc:705
 #: admin/systems/goto/class_SelectDeviceType.inc:39
 #: addons/goto/class_target_list.inc:203
 #: addons/goto/events/class_EventTargetAddList.inc:249
@@ -2058,8 +1967,8 @@ msgstr "Estación de trabajo"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:39
-#: admin/systems/goto/class_terminalGeneric.inc:687
-#: admin/systems/goto/class_terminalGeneric.inc:693
+#: admin/systems/goto/class_terminalGeneric.inc:689
+#: admin/systems/goto/class_terminalGeneric.inc:695
 msgid "Terminal"
 msgstr "Terminal"
 
@@ -2159,12 +2068,12 @@ msgid "unknown"
 msgstr "desconocido"
 
 #: admin/systems/goto/class_terminalService.inc:703
-#: admin/systems/goto/class_workstationService.inc:498
+#: admin/systems/goto/class_workstationService.inc:502
 msgid "Service"
 msgstr "Servicio"
 
 #: admin/systems/goto/class_terminalService.inc:713
-#: admin/systems/goto/class_workstationService.inc:507
+#: admin/systems/goto/class_workstationService.inc:511
 msgid "Monitor"
 msgstr "Monitor"
 
@@ -2178,27 +2087,27 @@ msgid "Remote desktop"
 msgstr "Escritorio remoto"
 
 #: admin/systems/goto/class_terminalService.inc:716
-#: admin/systems/goto/class_workstationService.inc:508
+#: admin/systems/goto/class_workstationService.inc:512
 msgid "Gfx driver"
 msgstr "Dispositivo Gfx"
 
 #: admin/systems/goto/class_terminalService.inc:717
-#: admin/systems/goto/class_workstationService.inc:509
+#: admin/systems/goto/class_workstationService.inc:513
 msgid "Gfx resolution"
 msgstr "Resolución Gfx"
 
 #: admin/systems/goto/class_terminalService.inc:718
-#: admin/systems/goto/class_workstationService.inc:510
+#: admin/systems/goto/class_workstationService.inc:514
 msgid "Gfx color depth"
 msgstr "Profundidad del Color Gfx"
 
 #: admin/systems/goto/class_terminalService.inc:719
 #: admin/systems/goto/terminalService.tpl:150
 #: admin/systems/goto/workstationService.tpl:170
-#: admin/systems/goto/class_workstationService.inc:402
 #: admin/systems/goto/class_workstationService.inc:404
-#: admin/systems/goto/class_workstationService.inc:409
-#: admin/systems/goto/class_workstationService.inc:511
+#: admin/systems/goto/class_workstationService.inc:406
+#: admin/systems/goto/class_workstationService.inc:412
+#: admin/systems/goto/class_workstationService.inc:515
 msgid "HSync"
 msgstr ""
 
@@ -2207,8 +2116,8 @@ msgstr ""
 #: admin/systems/goto/workstationService.tpl:181
 #: admin/systems/goto/class_workstationService.inc:385
 #: admin/systems/goto/class_workstationService.inc:387
-#: admin/systems/goto/class_workstationService.inc:392
-#: admin/systems/goto/class_workstationService.inc:512
+#: admin/systems/goto/class_workstationService.inc:393
+#: admin/systems/goto/class_workstationService.inc:516
 msgid "VSync"
 msgstr ""
 
@@ -2217,7 +2126,7 @@ msgid "Auto-Sync"
 msgstr "Auto-Sync"
 
 #: admin/systems/goto/class_terminalService.inc:722
-#: admin/systems/goto/class_workstationService.inc:514
+#: admin/systems/goto/class_workstationService.inc:518
 msgid "Scanner enabled"
 msgstr "Escáner activado"
 
@@ -2228,34 +2137,34 @@ msgid "Printer enabled"
 msgstr "Servicio de impresión activo"
 
 #: admin/systems/goto/class_terminalService.inc:724
-#: admin/systems/goto/class_workstationService.inc:515
+#: admin/systems/goto/class_workstationService.inc:519
 msgid "Keyboard model"
 msgstr "Modelo de teclado"
 
 #: admin/systems/goto/class_terminalService.inc:725
-#: admin/systems/goto/class_workstationService.inc:516
+#: admin/systems/goto/class_workstationService.inc:520
 msgid "Keyboard layout"
 msgstr "Localización del teclado"
 
 #: admin/systems/goto/class_terminalService.inc:726
-#: admin/systems/goto/class_workstationService.inc:517
+#: admin/systems/goto/class_workstationService.inc:521
 msgid "Keyboard variant"
 msgstr "Variante de teclado"
 
 #: admin/systems/goto/class_terminalService.inc:727
-#: admin/systems/goto/class_workstationService.inc:518
+#: admin/systems/goto/class_workstationService.inc:522
 msgid "Mouse type"
 msgstr "Tipo de ratón"
 
 #: admin/systems/goto/class_terminalService.inc:728
-#: admin/systems/goto/class_workstationService.inc:519
+#: admin/systems/goto/class_workstationService.inc:523
 msgid "Mouse port"
 msgstr "Puerto del ratón"
 
 #: admin/systems/goto/class_terminalService.inc:730
 #: admin/systems/goto/terminalService.tpl:76
 #: admin/systems/goto/workstationService.tpl:86
-#: admin/systems/goto/class_workstationService.inc:520
+#: admin/systems/goto/class_workstationService.inc:524
 msgid "Telephone hardware"
 msgstr "Teléfono hardware"
 
@@ -2365,54 +2274,54 @@ msgstr "Servicios"
 msgid "GUI"
 msgstr "UID"
 
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_workstationGeneric.inc:309
+#: admin/systems/goto/class_workstationGeneric.inc:300
+#: admin/systems/goto/class_workstationGeneric.inc:310
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
 #, fuzzy
 msgid "Software update"
 msgstr "Actualización instantánea"
 
-#: admin/systems/goto/class_workstationGeneric.inc:303
-#: admin/systems/goto/class_workstationGeneric.inc:311
+#: admin/systems/goto/class_workstationGeneric.inc:304
+#: admin/systems/goto/class_workstationGeneric.inc:312
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr "Forzar inicio local"
 
-#: admin/systems/goto/class_workstationGeneric.inc:307
-#: admin/systems/goto/class_terminalGeneric.inc:271
+#: admin/systems/goto/class_workstationGeneric.inc:308
+#: admin/systems/goto/class_terminalGeneric.inc:273
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr "Despertar"
 
-#: admin/systems/goto/class_workstationGeneric.inc:500
+#: admin/systems/goto/class_workstationGeneric.inc:501
 msgid "A valid LDAP server assignement is missing!"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:510
+#: admin/systems/goto/class_workstationGeneric.inc:511
 #, fuzzy
 msgid "Software deployment"
 msgstr "Inicio del Sistema"
 
-#: admin/systems/goto/class_workstationGeneric.inc:511
+#: admin/systems/goto/class_workstationGeneric.inc:512
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:699
+#: admin/systems/goto/class_workstationGeneric.inc:700
 msgid "Workstation generic"
 msgstr "Estación de trabajo genérica"
 
-#: admin/systems/goto/class_workstationGeneric.inc:711
+#: admin/systems/goto/class_workstationGeneric.inc:712
 msgid "Goto mode"
 msgstr "Pasar al modo"
 
-#: admin/systems/goto/class_workstationGeneric.inc:714
-#: admin/systems/goto/class_terminalGeneric.inc:707
+#: admin/systems/goto/class_workstationGeneric.inc:715
+#: admin/systems/goto/class_terminalGeneric.inc:709
 msgid "Root password"
 msgstr "Contraseña de root"
 
-#: admin/systems/goto/class_workstationGeneric.inc:715
+#: admin/systems/goto/class_workstationGeneric.inc:716
 #, fuzzy
 msgid "Create FAI CD"
 msgstr "Crear"
@@ -2691,11 +2600,11 @@ msgstr ""
 msgid "Create ISO-Image"
 msgstr "Crear"
 
-#: admin/systems/goto/class_workstationService.inc:499
+#: admin/systems/goto/class_workstationService.inc:503
 msgid "Workstation service"
 msgstr "Servicio de la estación de trabajo"
 
-#: admin/systems/goto/class_workstationService.inc:513
+#: admin/systems/goto/class_workstationService.inc:517
 msgid "Use DDC"
 msgstr "Usar DDC"
 
@@ -2808,15 +2717,15 @@ msgstr ""
 msgid "set"
 msgstr "Activar"
 
-#: admin/systems/goto/class_terminalGeneric.inc:688
+#: admin/systems/goto/class_terminalGeneric.inc:690
 msgid "Terminal generic"
 msgstr "Terminal genérico"
 
-#: admin/systems/goto/class_terminalGeneric.inc:701
+#: admin/systems/goto/class_terminalGeneric.inc:703
 msgid "Syslog server enabled"
 msgstr "Servidor de registro de sistema activado"
 
-#: admin/systems/goto/class_terminalGeneric.inc:706
+#: admin/systems/goto/class_terminalGeneric.inc:708
 msgid "Ntp server settings"
 msgstr "Parámetros del servidor NTP"
 
@@ -3337,6 +3246,11 @@ msgstr "Inicio del Sistema"
 msgid "System deployment status"
 msgstr "Inicio del Sistema"
 
+#: addons/goto/class_gotomasses.inc:230
+#, fuzzy
+msgid "Permission"
+msgstr "Permisos"
+
 #: addons/goto/class_gotomasses.inc:270
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
@@ -3871,6 +3785,11 @@ msgstr ""
 msgid "Environment"
 msgstr "Entorno"
 
+#: personal/environment/class_environment.inc:10
+#, fuzzy
+msgid "This does something"
+msgstr "Mostrar objetos que coincidan"
+
 #: personal/environment/class_environment.inc:139
 #, fuzzy, php-format
 msgid "Device '%s' is not available anymore. It will be removed!"
@@ -4202,11 +4121,92 @@ msgstr "Seleccione los objetos a añadir"
 msgid "Choose the department the search will be based    on"
 msgstr "Escoja el departamento base de la búsqueda"
 
+#: personal/environment/hotplugDialog.tpl:43
+msgid "Display users matching"
+msgstr "Mostrar usuarios que coincidan con"
+
 #: personal/environment/hotplugDialog.tpl:48
 #, fuzzy
 msgid "Regular expression for        matching hotplugs"
 msgstr "Expresión regular para buscar nombres de grupos"
 
+#, fuzzy
+#~ msgid ""
+#~ "This may be used by several users/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. Si está seguro de lo que quiere "
+#~ "hacer pulse dos veces, ya que no hay manera de que GOsa recupere "
+#~ "posteriormente la información."
+
+#, fuzzy
+#~ msgid "Manage hotplug devices"
+#~ msgstr "dispositivos"
+
+#, fuzzy
+#~ msgid "device"
+#~ msgstr "Servicio"
+
+#~ 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. Si está seguro de lo que quiere "
+#~ "hacer pulse dos veces, ya que no hay manera de que GOsa recupere "
+#~ "posteriormente la información."
+
+#~ msgid "This table displays all applications in the selected tree."
+#~ msgstr "Esta tabla muestra todas las aplicaciones en el árbol seleccionado."
+
+#, fuzzy
+#~ msgid "Number of listed applications"
+#~ msgstr "Eliminar aplicaciones seleccionadas"
+
+#, fuzzy
+#~ msgid "Display mime types matching"
+#~ msgstr "Mostrar sistemas que coincidan con"
+
+#, fuzzy
+#~ msgid "Number of listed mimetypes"
+#~ msgstr "Número de usuarios mostrados"
+
+#, fuzzy
+#~ msgid "Mimetype management"
+#~ msgstr "Activar gestión tipos mime"
+
+#, fuzzy
+#~ msgid "Syslog Service"
+#~ msgstr "Servicios"
+
+#~ msgid "Logging service"
+#~ msgstr "Servicio de Registro de sistema"
+
+#, fuzzy
+#~ msgid "Syslog service database"
+#~ msgstr "Servidor de registro de sistema activado"
+
+#~ msgid "Password"
+#~ msgstr "Contraseña"
+
+#, fuzzy
+#~ msgid "Database"
+#~ msgstr "Crear"
+
+#~ msgid "Logging database"
+#~ msgstr "Base de datos de Registro"
+
+#~ msgid "Admin"
+#~ msgstr "Administrador"
+
+#, fuzzy
+#~ msgid "Logging database information"
+#~ msgstr "Modificar información"
+
+#, fuzzy
+#~ msgid "Logging DB user"
+#~ msgstr "Entrada fallida: %s"
+
 #, fuzzy
 #~ msgid "Vendor ID"
 #~ msgstr "Identificador (ID) de usuario"
diff --git a/gosa-plugins/goto/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/goto/locale/fr/LC_MESSAGES/messages.po
index b73a15535..a746eccb1 100644
--- a/gosa-plugins/goto/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/goto/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:52+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2009-10-06 17:04+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -40,15 +40,15 @@ msgstr ""
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
 #: admin/mimetypes/class_mimetypeGeneric.inc:715
 #: admin/systems/goto/class_printGeneric.inc:988
-#: admin/systems/goto/class_workstationGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:699
 msgid "Generic"
 msgstr "Informations"
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
 #: admin/systems/goto/workstation.tpl:95
-#: admin/systems/goto/class_workstationGeneric.inc:489
-#: admin/systems/goto/class_terminalGeneric.inc:480
+#: admin/systems/goto/class_workstationGeneric.inc:490
+#: admin/systems/goto/class_terminalGeneric.inc:482
 #: admin/systems/goto/terminal.tpl:84
 msgid "NTP server"
 msgstr "Serveur NTP"
@@ -61,7 +61,7 @@ msgstr "Sélectionnez le serveur pour la synchronisation du temps"
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
 #: admin/systems/goto/workstation.tpl:55
-#: admin/systems/goto/class_terminalGeneric.inc:700
+#: admin/systems/goto/class_terminalGeneric.inc:702
 #: admin/systems/goto/terminal.tpl:47
 msgid "Mode"
 msgstr "Mode"
@@ -73,10 +73,8 @@ msgstr "Sélectionnez le mode du terminal"
 
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
-#: admin/systems/services/syslog/class_goSyslogServer.inc:27
-#: admin/systems/services/syslog/class_goSyslogServer.inc:47
 #: admin/systems/goto/workstation.tpl:65
-#: admin/systems/goto/class_workstationGeneric.inc:712
+#: admin/systems/goto/class_workstationGeneric.inc:713
 #: admin/systems/goto/terminal.tpl:57
 msgid "Syslog server"
 msgstr "Serveur de journaux systèmes"
@@ -88,7 +86,7 @@ msgstr "Sélectionnez le serveur de journaux à utiliser"
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:703
+#: admin/systems/goto/class_terminalGeneric.inc:705
 #: admin/systems/goto/terminal.tpl:117
 msgid "Root server"
 msgstr "Serveur Primaire"
@@ -99,7 +97,7 @@ msgstr "Sélectionnez le système de fichier racine NFS à utiliser"
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:704
+#: admin/systems/goto/class_terminalGeneric.inc:706
 #: admin/systems/goto/terminal.tpl:131
 msgid "Swap server"
 msgstr "Serveur de Swap"
@@ -132,20 +130,20 @@ msgid "Execute"
 msgstr "Exécuter"
 
 #: admin/ogroups/goto/class_termgroup.inc:51
-#: admin/systems/goto/class_workstationGeneric.inc:138
-#: admin/systems/goto/class_terminalGeneric.inc:122
+#: admin/systems/goto/class_workstationGeneric.inc:139
+#: admin/systems/goto/class_terminalGeneric.inc:124
 msgid "Activated"
 msgstr "Activé"
 
 #: admin/ogroups/goto/class_termgroup.inc:52
-#: admin/systems/goto/class_workstationGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:121
+#: admin/systems/goto/class_workstationGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:123
 #: addons/goto/class_gotomasses.inc:542
 msgid "Locked"
 msgstr "Verrouillé"
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:281
+#: admin/systems/goto/class_terminalGeneric.inc:283
 msgid "Local swap"
 msgstr "swap locale"
 
@@ -163,7 +161,7 @@ msgstr "swap locale"
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:154
+#: admin/systems/goto/class_workstationGeneric.inc:155
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -181,51 +179,51 @@ msgstr "swap locale"
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:137
-#: admin/systems/goto/class_terminalGeneric.inc:287
-#: admin/systems/goto/class_terminalGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:139
+#: admin/systems/goto/class_terminalGeneric.inc:289
+#: admin/systems/goto/class_terminalGeneric.inc:301
 msgid "inherited"
 msgstr "hérité"
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:635
+#: admin/systems/goto/class_workstationGeneric.inc:213
+#: admin/systems/goto/class_workstationGeneric.inc:636
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
-#: admin/systems/goto/class_workstationService.inc:568
-#: admin/systems/goto/class_terminalGeneric.inc:187
-#: admin/systems/goto/class_terminalGeneric.inc:625
+#: admin/systems/goto/class_workstationService.inc:572
+#: admin/systems/goto/class_terminalGeneric.inc:189
+#: admin/systems/goto/class_terminalGeneric.inc:627
 #: addons/goto/class_gotomasses.inc:328
 #: addons/goto/class_goto_import_file.inc:124
 msgid "Service infrastructure"
 msgstr "Infrastructure des services"
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:216
-#: admin/systems/goto/class_terminalGeneric.inc:191
+#: admin/systems/goto/class_workstationGeneric.inc:217
+#: admin/systems/goto/class_terminalGeneric.inc:193
 msgid "Event error"
 msgstr "Erreur Evénement "
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:217
-#: admin/systems/goto/class_terminalGeneric.inc:192
+#: admin/systems/goto/class_workstationGeneric.inc:218
+#: admin/systems/goto/class_terminalGeneric.inc:194
 #, php-format
 msgid "Event '%s' is not available!"
 msgstr "L'événement '%s' n'est pas disponible !"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:298
-#: admin/systems/goto/class_terminalGeneric.inc:265
+#: admin/systems/goto/class_workstationGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:267
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
 msgid "Switch off"
 msgstr "Eteindre"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:298
-#: admin/systems/goto/class_terminalGeneric.inc:266
+#: admin/systems/goto/class_workstationGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:268
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
 msgid "Reboot"
@@ -244,15 +242,15 @@ msgid "Wake"
 msgstr "Réveiller"
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:300
-#: admin/systems/goto/class_workstationGeneric.inc:308
+#: admin/systems/goto/class_workstationGeneric.inc:301
+#: admin/systems/goto/class_workstationGeneric.inc:309
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
 msgid "Reinstall"
 msgstr "Reinstaller"
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:301
+#: admin/systems/goto/class_workstationGeneric.inc:302
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 msgid "Rescan hardware"
@@ -297,13 +295,13 @@ msgstr "Analyse du système"
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:364
-#: admin/systems/goto/class_workstationGeneric.inc:596
-#: admin/systems/goto/class_workstationGeneric.inc:613
+#: admin/systems/goto/class_workstationGeneric.inc:365
+#: admin/systems/goto/class_workstationGeneric.inc:597
+#: admin/systems/goto/class_workstationGeneric.inc:614
 #: admin/systems/goto/class_workstationStartup.inc:889
-#: admin/systems/goto/class_workstationService.inc:456
-#: admin/systems/goto/class_terminalGeneric.inc:353
-#: admin/systems/goto/class_terminalGeneric.inc:611
+#: admin/systems/goto/class_workstationService.inc:460
+#: admin/systems/goto/class_terminalGeneric.inc:355
+#: admin/systems/goto/class_terminalGeneric.inc:613
 #: personal/environment/class_environment.inc:1058
 #: personal/environment/class_environment.inc:1315
 msgid "LDAP error"
@@ -318,13 +316,13 @@ msgid "System group"
 msgstr "Groupe système"
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:716
-#: admin/systems/goto/class_terminalGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:717
+#: admin/systems/goto/class_terminalGeneric.inc:711
 msgid "Action flag"
 msgstr "Indicateur d'action"
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:713
+#: admin/systems/goto/class_workstationGeneric.inc:714
 msgid "Ntp server"
 msgstr "Serveur NTP"
 
@@ -364,34 +362,38 @@ msgstr "Réinitialiser"
 msgid "Application settings"
 msgstr "Préférences de l'application"
 
-#: admin/groups/apps/edit_entry.tpl:43
+#: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
 #: admin/devices/class_deviceGeneric.inc:90
 #: admin/devices/class_deviceGeneric.inc:114
 #: admin/devices/class_deviceGeneric.inc:260
 #: admin/applications/class_applicationParameters.inc:190
+#: admin/applications/application-list.xml:41
+#: admin/applications/application-list-release.xml:41
 #: admin/applications/class_applicationGeneric.inc:430
 #: admin/applications/class_applicationGeneric.inc:434
 #: admin/applications/class_applicationGeneric.inc:606
 #: admin/applications/class_applicationGeneric.inc:610
+#: admin/mimetypes/mimetype-list-release.xml:41
+#: admin/mimetypes/mimetype-list.xml:41
 #: admin/mimetypes/class_mimetypeGeneric.inc:532
 #: admin/mimetypes/class_mimetypeGeneric.inc:724
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
-#: admin/systems/services/nfs/class_servNfs.inc:239
+#: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
 #: admin/systems/goto/class_printGeneric.inc:733
 #: admin/systems/goto/class_printGeneric.inc:738
 #: admin/systems/goto/class_printGeneric.inc:757
 #: admin/systems/goto/class_printGeneric.inc:997
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:456
-#: admin/systems/goto/class_workstationGeneric.inc:461
-#: admin/systems/goto/class_workstationGeneric.inc:479
-#: admin/systems/goto/class_terminalGeneric.inc:446
-#: admin/systems/goto/class_terminalGeneric.inc:451
-#: admin/systems/goto/class_terminalGeneric.inc:470
-#: admin/systems/goto/class_terminalGeneric.inc:696
+#: admin/systems/goto/class_workstationGeneric.inc:457
+#: admin/systems/goto/class_workstationGeneric.inc:462
+#: admin/systems/goto/class_workstationGeneric.inc:480
+#: admin/systems/goto/class_terminalGeneric.inc:448
+#: admin/systems/goto/class_terminalGeneric.inc:453
+#: admin/systems/goto/class_terminalGeneric.inc:472
+#: admin/systems/goto/class_terminalGeneric.inc:698
 #: personal/environment/class_logonManagementDialog.inc:103
 msgid "Name"
 msgstr "Nom"
@@ -419,8 +421,6 @@ msgid "department"
 msgstr "département"
 
 #: admin/groups/apps/class_groupApplication.inc:481
-#: admin/applications/class_applicationManagement.inc:368
-#: admin/applications/class_applicationManagement.inc:449
 #: admin/applications/class_applicationGeneric.inc:127
 msgid "application"
 msgstr "application"
@@ -430,7 +430,7 @@ msgid "Not available in release."
 msgstr "Non disponible dans cette version."
 
 #: admin/groups/apps/class_groupApplication.inc:1373
-#: admin/applications/class_applicationManagement.inc:24
+#: admin/applications/class_applicationManagement.inc:25
 #: admin/mimetypes/generic.tpl:117 admin/mimetypes/generic.tpl:177
 msgid "Applications"
 msgstr "Applications"
@@ -440,8 +440,10 @@ msgid "Group applications"
 msgstr "Groupe d'applications"
 
 #: admin/groups/apps/class_groupApplication.inc:1381
-#: admin/applications/class_divListApplication.inc:114
-#: admin/applications/class_divListApplication.inc:150
+#: admin/applications/application-list.xml:15
+#: admin/applications/application-list.xml:74
+#: admin/applications/application-list-release.xml:15
+#: admin/applications/application-list-release.xml:74
 #: admin/applications/class_applicationGeneric.inc:603
 #: admin/mimetypes/class_mimetypeGeneric.inc:728
 msgid "Application"
@@ -449,6 +451,8 @@ msgstr "Applications"
 
 #: admin/groups/apps/class_groupApplication.inc:1382
 #: admin/groups/apps/app_list.tpl:5 admin/groups/apps/app_list.tpl:53
+#: admin/applications/application-filter-release.tpl:14
+#: admin/mimetypes/mimetype-filter-release.tpl:14
 #: admin/systems/goto/workstationStartup.tpl:83
 #: admin/systems/goto/workstationStartup.tpl:123
 msgid "Release"
@@ -486,10 +490,12 @@ msgstr "En bas"
 
 #: admin/groups/apps/app_list.tpl:86 admin/groups/apps/app_list.tpl:107
 #: admin/groups/apps/app_list.tpl:132
-#: admin/devices/class_divListDevices.inc:100
+#: admin/devices/class_divListDevices.inc:100 admin/devices/device-list.xml:86
 #: admin/applications/class_applicationParameters.inc:122
-#: admin/applications/class_divListApplication.inc:120
-#: admin/mimetypes/class_divListMimeTypes.inc:122
+#: admin/applications/application-list.xml:86
+#: admin/applications/application-list-release.xml:86
+#: admin/mimetypes/mimetype-list-release.xml:86
+#: admin/mimetypes/mimetype-list.xml:86
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
@@ -534,8 +540,6 @@ msgid "List of defined devices"
 msgstr "Liste des périphériques définis"
 
 #: admin/devices/class_divListDevices.inc:45
-#: admin/applications/class_divListApplication.inc:45
-#: admin/mimetypes/class_divListMimeTypes.inc:45
 msgid "Select all"
 msgstr "Sélectionner tout"
 
@@ -545,18 +549,15 @@ msgid "Device name"
 msgstr "Nom du périphérique"
 
 #: admin/devices/class_divListDevices.inc:51
-#: admin/applications/class_divListApplication.inc:51
-#: admin/mimetypes/class_divListMimeTypes.inc:51
 msgid "Department"
 msgstr "Département"
 
 #: admin/devices/class_divListDevices.inc:52
-#: admin/devices/class_divListDevices.inc:87
-#: admin/applications/class_divListApplication.inc:52
-#: admin/applications/class_divListApplication.inc:107
-#: admin/mimetypes/class_divListMimeTypes.inc:52
-#: admin/mimetypes/class_divListMimeTypes.inc:109
-#: addons/goto/class_gotomasses.inc:365
+#: admin/devices/class_divListDevices.inc:87 admin/devices/device-list.xml:57
+#: admin/applications/application-list.xml:57
+#: admin/applications/application-list-release.xml:57
+#: admin/mimetypes/mimetype-list-release.xml:57
+#: admin/mimetypes/mimetype-list.xml:57 addons/goto/class_gotomasses.inc:365
 msgid "Actions"
 msgstr "Actions"
 
@@ -565,18 +566,17 @@ msgid "Display devices matching"
 msgstr "Afficher les périphériques correspondants"
 
 #: admin/devices/class_divListDevices.inc:82 admin/devices/deviceGeneric.tpl:9
-#: admin/devices/class_deviceGeneric.inc:261 admin/applications/generic.tpl:42
-#: admin/applications/class_divListApplication.inc:90
+#: admin/devices/class_deviceGeneric.inc:261 admin/devices/device-list.tpl:13
+#: admin/applications/generic.tpl:42
 #: admin/applications/class_applicationGeneric.inc:607
-#: admin/mimetypes/generic.tpl:44
-#: admin/mimetypes/class_divListMimeTypes.inc:93
+#: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
+#: admin/mimetypes/mimetype-list.tpl:13
 #: admin/mimetypes/class_mimetypeGeneric.inc:727
-#: admin/systems/services/ldap/class_goLdapServer.inc:79
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
 #: admin/systems/goto/class_printGeneric.inc:998
-#: admin/systems/goto/class_workstationGeneric.inc:710
-#: admin/systems/goto/class_terminalGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:711
+#: admin/systems/goto/class_terminalGeneric.inc:700
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/class_target_list.inc:152 addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/class_EventTargetAddList.inc:161
@@ -585,60 +585,51 @@ msgid "Base"
 msgstr "Base"
 
 #: admin/devices/class_divListDevices.inc:84
-#: admin/applications/class_divListApplication.inc:92
-#: admin/mimetypes/class_divListMimeTypes.inc:95
 #: addons/goto/class_target_list.inc:154
 #: addons/goto/events/class_EventTargetAddList.inc:163
 #: addons/goto/events/class_EventTargetAddUsersList.inc:132
 msgid "Submit department"
 msgstr "Soumettre le département"
 
-#: admin/devices/class_divListDevices.inc:84
-#: admin/applications/class_divListApplication.inc:92
-#: admin/mimetypes/class_divListMimeTypes.inc:95
-#: addons/goto/class_target_list.inc:154
+#: admin/devices/class_divListDevices.inc:84 admin/devices/device-list.tpl:13
+#: admin/applications/application-list.tpl:13
+#: admin/mimetypes/mimetype-list.tpl:13 addons/goto/class_target_list.inc:154
 #: addons/goto/events/class_EventTargetAddList.inc:163
 #: addons/goto/events/class_EventTargetAddUsersList.inc:132
 msgid "Submit"
 msgstr "Soumettre"
 
-#: admin/devices/class_divListDevices.inc:92
-#: admin/applications/class_divListApplication.inc:111
-#: admin/mimetypes/class_divListMimeTypes.inc:114
-#: admin/systems/goto/chooser.tpl:16 addons/goto/class_gotomasses.inc:366
+#: admin/devices/class_divListDevices.inc:92 admin/devices/device-list.xml:68
+#: admin/applications/application-list.xml:68
+#: admin/applications/application-list-release.xml:68
+#: admin/mimetypes/mimetype-list-release.xml:68
+#: admin/mimetypes/mimetype-list.xml:68 admin/systems/goto/chooser.tpl:16
+#: addons/goto/class_gotomasses.inc:366
 msgid "Create"
 msgstr "Créer"
 
 #: admin/devices/class_divListDevices.inc:94
-#: admin/devices/class_divListDevices.inc:131
-#: admin/devices/class_deviceGeneric.inc:159
+#: admin/devices/class_divListDevices.inc:131 admin/devices/device-list.xml:15
+#: admin/devices/device-list.xml:74 admin/devices/class_deviceGeneric.inc:159
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 msgid "Device"
 msgstr "Périphérique"
 
 #: admin/devices/class_divListDevices.inc:156
-#: admin/applications/class_divListApplication.inc:186
-#: admin/mimetypes/class_divListMimeTypes.inc:186
 msgid "edit"
 msgstr "éditer"
 
 #: admin/devices/class_divListDevices.inc:156
-#: admin/applications/class_divListApplication.inc:186
-#: admin/mimetypes/class_divListMimeTypes.inc:186
 msgid "Edit this entry"
 msgstr "Editer cette entrée"
 
 #: admin/devices/class_divListDevices.inc:163
-#: admin/applications/class_divListApplication.inc:202
-#: admin/mimetypes/class_divListMimeTypes.inc:201
 #: admin/systems/ppd/class_printerPPDSelectionDialog.inc:140
 msgid "delete"
 msgstr "supprimer"
 
 #: admin/devices/class_divListDevices.inc:163
-#: admin/applications/class_divListApplication.inc:202
-#: admin/mimetypes/class_divListMimeTypes.inc:201
 msgid "Delete this entry"
 msgstr "Supprimer cette entrée"
 
@@ -647,45 +638,49 @@ msgid "Number of listed devices"
 msgstr "Nombre de périphériques listés"
 
 #: admin/devices/class_divListDevices.inc:206
-#: admin/applications/class_divListApplication.inc:243
-#: admin/mimetypes/class_divListMimeTypes.inc:244
 msgid "Number of listed departments"
 msgstr "Nombre de département listés"
 
-#: admin/devices/remove.tpl:6
+#: admin/devices/remove.tpl:6 admin/applications/remove.tpl:6
+#: admin/mimetypes/remove.tpl:6
 msgid ""
-"This may be used by several users/groups. Please double check if your really "
-"want to do this since there is no way for GOsa to get your data back."
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
 msgstr ""
-"Cela peut être utilisé par plusieurs utilisateurs/groupes. 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."
+"Veuillez vérifier que vous voulez effectuer cette action. Toutes les données "
+"seront perdues étant donné qu'il est impossible pour GOsa de récupérer vos "
+"données."
 
-#: admin/devices/remove.tpl:9 admin/applications/remove.tpl:9
-#: admin/mimetypes/remove.tpl:9 addons/goto/remove.tpl:9
+#: admin/devices/remove.tpl:10 admin/applications/remove.tpl:10
+#: admin/mimetypes/remove.tpl:10 addons/goto/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."
 
-#: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:257
-msgid "Devices"
-msgstr "Périphériques"
+#: admin/devices/device-list.xml:11
+#, fuzzy
+msgid "List of devices"
+msgstr "Liste des périphériques définis"
 
-#: admin/devices/deviceGeneric.tpl:29 admin/devices/class_deviceGeneric.inc:93
+#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:29
+#: admin/devices/class_deviceGeneric.inc:93
 #: admin/devices/class_deviceGeneric.inc:262 admin/applications/generic.tpl:33
+#: admin/applications/application-list.xml:49
+#: admin/applications/application-list-release.xml:49
 #: admin/applications/class_applicationGeneric.inc:608
 #: admin/mimetypes/generic.tpl:34 admin/mimetypes/paste_generic.tpl:21
+#: admin/mimetypes/mimetype-list-release.xml:49
+#: admin/mimetypes/mimetype-list.xml:49
 #: admin/mimetypes/class_mimetypeGeneric.inc:726
 #: admin/systems/services/shares/class_goShareServer.inc:424
-#: admin/systems/services/nfs/class_servNfs.inc:211
+#: admin/systems/services/nfs/class_servNfs.inc:207
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
 #: admin/systems/goto/class_printGeneric.inc:999
-#: admin/systems/goto/class_workstationGeneric.inc:708
-#: admin/systems/goto/class_terminalGeneric.inc:697
+#: admin/systems/goto/class_workstationGeneric.inc:709
+#: admin/systems/goto/class_terminalGeneric.inc:699
 #: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
 #: addons/goto/class_gotomasses.inc:932
 #: personal/environment/class_logonManagementDialog.inc:111
@@ -693,6 +688,21 @@ msgstr "Périphériques"
 msgid "Description"
 msgstr "Description"
 
+#: admin/devices/device-list.xml:118
+#, fuzzy
+msgid "Edit device"
+msgstr "Carte son"
+
+#: admin/devices/device-list.xml:131
+#, fuzzy
+msgid "Remove device"
+msgstr "Suppression de l'image personnelle"
+
+#: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
+#: admin/devices/class_deviceGeneric.inc:257
+msgid "Devices"
+msgstr "Périphériques"
+
 #: admin/devices/deviceGeneric.tpl:38
 msgid "Device type"
 msgstr "Type de périphérique"
@@ -727,9 +737,14 @@ msgstr "ID du produit"
 msgid "(idProduct)"
 msgstr "(Idproduit)"
 
-#: admin/devices/main.inc:49 admin/devices/main.inc:51
-msgid "Hotplug device management"
-msgstr "Gestion des périphériques Hotplug"
+#: admin/devices/device-filter.tpl:3
+#: admin/applications/application-filter.tpl:3
+#: admin/applications/application-filter-release.tpl:3
+#: admin/mimetypes/mimetype-filter-release.tpl:3
+#: admin/mimetypes/mimetype-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filtres"
 
 #: admin/devices/class_deviceGeneric.inc:29
 msgid "Digital camera"
@@ -825,51 +840,21 @@ msgstr "Vendeur"
 msgid "Device ID"
 msgstr "ID du périphérique"
 
-#: admin/devices/class_deviceManagement.inc:7
+#: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:82
+#: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:84
+#: admin/mimetypes/mimetype-list.tpl:13
+msgid "Update"
+msgstr "Mise à Jour"
+
+#: admin/devices/class_deviceManagement.inc:25
 #: personal/environment/class_environment.inc:1783
 #: personal/environment/environment.tpl:293
 msgid "Hotplug devices"
 msgstr "Périphériques Hotplug"
 
-#: admin/devices/class_deviceManagement.inc:8
-msgid "Manage hotplug devices"
-msgstr "Gérer les périphériques hotplug"
-
-#: admin/devices/class_deviceManagement.inc:246
-#: admin/applications/class_applicationManagement.inc:352
-#: admin/mimetypes/class_mimetypeManagement.inc:360
-#: addons/goto/class_gotomasses.inc:230
-msgid "Permission"
-msgstr "Permissions"
-
-#: admin/devices/class_deviceManagement.inc:263
-#: admin/devices/class_deviceManagement.inc:345
-msgid "device"
-msgstr "périphérique"
-
-#: admin/devices/class_deviceManagement.inc:296
-#: admin/devices/class_deviceManagement.inc:352
-#: admin/devices/class_deviceManagement.inc:381
-#: admin/applications/class_applicationManagement.inc:401
-#: admin/applications/class_applicationManagement.inc:456
-#: admin/applications/class_applicationManagement.inc:487
-#: admin/mimetypes/class_mimetypeManagement.inc:412
-#: admin/mimetypes/class_mimetypeManagement.inc:466
-#: admin/mimetypes/class_mimetypeManagement.inc:496
-#: admin/systems/goto/class_printGeneric.inc:1019
-#: admin/systems/goto/class_printGeneric.inc:1041
-#: personal/environment/class_environment.inc:583
-msgid "Permission error"
-msgstr "Erreur de permissions"
-
-#: admin/applications/remove.tpl:6 admin/mimetypes/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 ""
-"Cela peut être utilisé par plusieurs groupes. 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."
+#: admin/devices/class_deviceManagement.inc:26
+msgid "Hotplug device management"
+msgstr "Gestion des périphériques Hotplug"
 
 #: admin/applications/release_select.tpl:2
 #: admin/mimetypes/release_select.tpl:2
@@ -919,7 +904,6 @@ msgid "Application parameter settings"
 msgstr "Préférences de l'application"
 
 #: admin/applications/generic.tpl:7 admin/applications/generic.tpl:10
-#: admin/applications/class_divListApplication.inc:51
 #: admin/applications/class_applicationGeneric.inc:561
 msgid "Application name"
 msgstr "Nom de l'application"
@@ -956,10 +940,6 @@ msgstr "Sélectionnez une base"
 msgid "Icon"
 msgstr "Icône"
 
-#: admin/applications/generic.tpl:82 admin/mimetypes/generic.tpl:84
-msgid "Update"
-msgstr "Mise à Jour"
-
 #: admin/applications/generic.tpl:82
 msgid "Reload picture from LDAP"
 msgstr "Recharger l'image à partir de l'annuaire LDAP"
@@ -1022,36 +1002,27 @@ msgstr "Importer"
 msgid "Download"
 msgstr "Téléchargement"
 
-#: admin/applications/class_applicationManagement.inc:25
-#: personal/environment/class_environment.inc:10
-msgid "This does something"
-msgstr "Ceci fait quelque chose"
+#: admin/applications/class_applicationManagement.inc:26
+msgid "Application management"
+msgstr "Gestion des applications"
 
-#: admin/applications/class_divListApplication.inc:25
-msgid "List of Applications"
+#: admin/applications/application-list.xml:11
+#: admin/applications/application-list-release.xml:11
+#, fuzzy
+msgid "List of applications"
 msgstr "Liste des applications"
 
-#: admin/applications/class_divListApplication.inc:26
-msgid "This table displays all applications in the selected tree."
-msgstr "Ce tableau montre toutes les applications dans l'arbre sélectionné."
-
-#: admin/applications/class_divListApplication.inc:58
-#: personal/environment/hotplugDialog.tpl:43
-msgid "Display users matching"
-msgstr "Afficher les utilisateurs correspondants"
-
-#: admin/applications/class_divListApplication.inc:199
-#: admin/mimetypes/class_divListMimeTypes.inc:198
-msgid "Freezed"
-msgstr "Gelée"
-
-#: admin/applications/class_divListApplication.inc:242
-msgid "Number of listed applications"
-msgstr "Nombre d'applications listées"
+#: admin/applications/application-list.xml:118
+#: admin/applications/application-list-release.xml:118
+#, fuzzy
+msgid "Edit application"
+msgstr "Ajouter une Application"
 
-#: admin/applications/main.inc:48 admin/applications/main.inc:50
-msgid "Application management"
-msgstr "Gestion des applications"
+#: admin/applications/application-list.xml:131
+#: admin/applications/application-list-release.xml:131
+#, fuzzy
+msgid "Remove application"
+msgstr "application"
 
 #: admin/applications/class_applicationGeneric.inc:95
 msgid "no example"
@@ -1093,22 +1064,19 @@ msgstr "Information des applications"
 msgid "Script content"
 msgstr "Contenu du script"
 
-#: admin/mimetypes/class_mimetypeManagement.inc:24
+#: admin/mimetypes/class_mimetypeManagement.inc:25
 #: admin/mimetypes/class_mimetypeGeneric.inc:721
 msgid "Mime types"
 msgstr "Types mime"
 
-#: admin/mimetypes/class_mimetypeManagement.inc:25
+#: admin/mimetypes/class_mimetypeManagement.inc:26
 msgid "Manage mime types"
 msgstr "Gérer les types mime"
 
-#: admin/mimetypes/class_mimetypeManagement.inc:378
-#: admin/mimetypes/class_mimetypeManagement.inc:459
-#: admin/mimetypes/generic.tpl:12
-#: admin/mimetypes/class_divListMimeTypes.inc:51
-#: admin/mimetypes/class_divListMimeTypes.inc:116
-#: admin/mimetypes/class_divListMimeTypes.inc:152
-#: admin/mimetypes/paste_generic.tpl:13
+#: admin/mimetypes/generic.tpl:12 admin/mimetypes/paste_generic.tpl:13
+#: admin/mimetypes/mimetype-list-release.xml:15
+#: admin/mimetypes/mimetype-list-release.xml:74
+#: admin/mimetypes/mimetype-list.xml:15 admin/mimetypes/mimetype-list.xml:74
 msgid "Mime type"
 msgstr "Type mime"
 
@@ -1178,26 +1146,27 @@ msgstr "Montrer le fichier dans un programme externe"
 msgid "Ask whether to save to local disk"
 msgstr "Demander si il faut le sauver sur un disque local"
 
-#: admin/mimetypes/class_divListMimeTypes.inc:27
-#: admin/mimetypes/class_divListMimeTypes.inc:28
-msgid "List of defined mime types"
-msgstr "Liste des type mime définis"
-
-#: admin/mimetypes/class_divListMimeTypes.inc:58
-msgid "Display mime types matching"
-msgstr "Afficher les types mime correspondants"
-
-#: admin/mimetypes/class_divListMimeTypes.inc:243
-msgid "Number of listed mimetypes"
-msgstr "Nombre de type mime listés"
-
 #: admin/mimetypes/paste_generic.tpl:24
 msgid "Please specify a description for this mime type here"
 msgstr "Veuillez indiquer une description pour ce type mime"
 
-#: admin/mimetypes/main.inc:48 admin/mimetypes/main.inc:50
-msgid "Mimetype management"
-msgstr "Gestion des type mime"
+#: admin/mimetypes/mimetype-list-release.xml:11
+#: admin/mimetypes/mimetype-list.xml:11
+#, fuzzy
+msgid "List of mimetypes"
+msgstr "Liste des type mime définis"
+
+#: admin/mimetypes/mimetype-list-release.xml:118
+#: admin/mimetypes/mimetype-list.xml:118
+#, fuzzy
+msgid "Edit mimetype"
+msgstr "Mettre à jour l'icône mime"
+
+#: admin/mimetypes/mimetype-list-release.xml:131
+#: admin/mimetypes/mimetype-list.xml:131
+#, fuzzy
+msgid "Remove mimetype"
+msgstr "Suppression de l'image personnelle"
 
 #: admin/mimetypes/class_mimetypeGeneric.inc:535
 msgid "File pattern"
@@ -1220,7 +1189,6 @@ msgid "Print Service"
 msgstr "Services d'impression"
 
 #: admin/systems/services/cups/goCupsServer.tpl:1
-#: admin/systems/services/syslog/goSyslogServer.tpl:1
 msgid "enabled"
 msgstr "activé"
 
@@ -1241,23 +1209,18 @@ msgstr ""
 #: admin/systems/services/ntp/class_goNtpServer.inc:115
 #: admin/systems/services/terminal/class_goTerminalServer.inc:165
 #: admin/systems/services/shares/class_goShareServer.inc:414
-#: admin/systems/services/syslog/class_goSyslogServer.inc:69
-#: admin/systems/services/syslog/class_goLogDBServer.inc:93
 msgid "Services"
 msgstr "Services"
 
 #: admin/systems/services/cups/class_goCupsServer.inc:77
-#: admin/systems/services/syslog/class_goLogDBServer.inc:101
 msgid "Start"
 msgstr "Démarrage"
 
 #: admin/systems/services/cups/class_goCupsServer.inc:78
-#: admin/systems/services/syslog/class_goLogDBServer.inc:102
 msgid "Stop"
 msgstr "Arrêter"
 
 #: admin/systems/services/cups/class_goCupsServer.inc:79
-#: admin/systems/services/syslog/class_goLogDBServer.inc:103
 msgid "Restart"
 msgstr "Réessayer"
 
@@ -1299,6 +1262,8 @@ msgid "LDAP service"
 msgstr "Service LDAP"
 
 #: admin/systems/services/ldap/goLdapServer.tpl:2
+#: admin/systems/services/ldap/class_goLdapServer.inc:79
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
 msgid "LDAP URI"
 msgstr ""
 
@@ -1306,6 +1271,24 @@ msgstr ""
 msgid "fill-in-your-servers-dns-name"
 msgstr "Veuillez indiquer vos serveurs dns"
 
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
+#: admin/systems/services/nfs/servnfs.tpl:39
+#: admin/systems/goto/class_ArpNewDevice.inc:38
+#: admin/systems/goto/class_SelectDeviceType.inc:39
+#: addons/goto/class_target_list.inc:201
+#: addons/goto/events/class_EventTargetAddList.inc:238
+#: personal/environment/environment.tpl:135
+msgid "Server"
+msgstr "Serveur"
+
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
+#: admin/systems/goto/class_gotoLpdEnabled.inc:153
+#: admin/systems/goto/terminalService.tpl:58
+#: admin/systems/goto/workstationService.tpl:66
+#: admin/systems/goto/gotoLpdEnable.tpl:71
+msgid "Port"
+msgstr "Port"
+
 #: admin/systems/services/ldap/class_goLdapServer.inc:128
 #: admin/systems/services/ldap/class_goLdapServer.inc:129
 msgid "Ldap"
@@ -1400,13 +1383,13 @@ msgid "Path"
 msgstr "Chemin"
 
 #: admin/systems/services/shares/class_goShareServer.inc:428
-#: admin/systems/services/nfs/class_servNfs.inc:219
+#: admin/systems/services/nfs/class_servNfs.inc:215
 #: admin/systems/services/nfs/servnfs.tpl:121
 msgid "Option"
 msgstr "Option"
 
 #: admin/systems/services/shares/class_goShareServer.inc:429
-#: admin/systems/services/nfs/class_servNfs.inc:215
+#: admin/systems/services/nfs/class_servNfs.inc:211
 #: admin/systems/services/nfs/servnfs.tpl:29
 msgid "Volume"
 msgstr "Volume"
@@ -1419,10 +1402,6 @@ msgstr "'Chemin / Volume' doit être dans le format 'serveur:port' !"
 msgid "'Path / Volume' must contain at least one '/'!"
 msgstr "'Chemin / Volume' doit au moins contenir un '/' !"
 
-#: admin/systems/services/nfs/class_servNfs.inc:205
-msgid "Hidden shares must have a '$' at the end of the name!"
-msgstr "Les partages cachés doivent avoir un '$' à la fin du nom !"
-
 #: admin/systems/services/nfs/servnfs.tpl:1
 msgid "Edit share"
 msgstr "Editer un partage"
@@ -1431,15 +1410,6 @@ msgstr "Editer un partage"
 msgid "NFS setup"
 msgstr "Préférences NFS"
 
-#: admin/systems/services/nfs/servnfs.tpl:39
-#: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_SelectDeviceType.inc:39
-#: addons/goto/class_target_list.inc:201
-#: addons/goto/events/class_EventTargetAddList.inc:238
-#: personal/environment/environment.tpl:135
-msgid "Server"
-msgstr "Serveur"
-
 #: admin/systems/services/nfs/servnfs.tpl:69
 msgid "Auto-mount share on Apple systems"
 msgstr "Monter les partages automatiquement sur les machines Apple."
@@ -1448,55 +1418,6 @@ msgstr "Monter les partages automatiquement sur les machines Apple."
 msgid "Codepage"
 msgstr "Codage des caractères"
 
-#: admin/systems/services/syslog/goSyslogServer.tpl:1
-msgid "Syslog Service"
-msgstr "Service de journaux systèmes"
-
-#: admin/systems/services/syslog/class_goSyslogServer.inc:68
-#: admin/systems/services/syslog/class_goSyslogServer.inc:69
-msgid "Logging service"
-msgstr "Service des journaux systèmes"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:31
-#: admin/systems/services/syslog/class_goLogDBServer.inc:59
-msgid "Syslog service database"
-msgstr "Service de journaux systèmes"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:69
-#: admin/systems/goto/class_printGeneric.inc:976
-#: addons/goto/events/class_EventTargetAddUsersList.inc:171
-msgid "User"
-msgstr "Utilisateur"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:72
-#: admin/systems/services/syslog/class_goLogDBServer.inc:105
-#: admin/systems/services/syslog/goLogDBServer.tpl:20
-msgid "Password"
-msgstr "Mot de passe"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:75
-#: admin/systems/services/syslog/class_goLogDBServer.inc:106
-#: admin/systems/services/syslog/goLogDBServer.tpl:4
-msgid "Database"
-msgstr "Base de données"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:92
-#: admin/systems/services/syslog/class_goLogDBServer.inc:93
-msgid "Logging database"
-msgstr "Base de données des journaux systèmes"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:104
-msgid "Admin"
-msgstr "Administrateur"
-
-#: admin/systems/services/syslog/goLogDBServer.tpl:1
-msgid "Logging database information"
-msgstr "Base de données des journaux systèmes"
-
-#: admin/systems/services/syslog/goLogDBServer.tpl:12
-msgid "Logging DB user"
-msgstr "Utilisateur de la base de données des journaux systèmes"
-
 #: admin/systems/goto/workstation.tpl:1 admin/systems/goto/terminal.tpl:1
 msgid "Properties"
 msgstr "Propriétés"
@@ -1506,13 +1427,13 @@ msgid "Workstation template"
 msgstr "Modèle de station de travail"
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:707
+#: admin/systems/goto/class_workstationGeneric.inc:708
 msgid "Workstation name"
 msgstr "Nom de la station de travail"
 
 #: admin/systems/goto/workstation.tpl:27
 #: admin/systems/goto/class_printGeneric.inc:1000
-#: admin/systems/goto/class_workstationGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:710
 msgid "Location"
 msgstr "Lieu"
 
@@ -1608,13 +1529,6 @@ msgstr "Impair"
 msgid "bit/s"
 msgstr ""
 
-#: admin/systems/goto/class_gotoLpdEnabled.inc:153
-#: admin/systems/goto/terminalService.tpl:58
-#: admin/systems/goto/workstationService.tpl:66
-#: admin/systems/goto/gotoLpdEnable.tpl:71
-msgid "Port"
-msgstr "Port"
-
 #: admin/systems/goto/ArpNewDevice.tpl:1
 msgid "Integrating unknown devices"
 msgstr "Intégration des périphériques inconnus"
@@ -1675,7 +1589,8 @@ msgstr "Erreur interne"
 
 #: admin/systems/goto/class_printGeneric.inc:108
 #, php-format
-msgid "Cannot determine a valid department for this object. Setting base to '%s'!"
+msgid ""
+"Cannot determine a valid department for this object. Setting base to '%s'!"
 msgstr ""
 "Impossible d'obtenir un département valide pour cet objet. Je met la base à "
 "'%s' ! "
@@ -1699,7 +1614,8 @@ msgstr ""
 
 #: admin/systems/goto/class_printGeneric.inc:294
 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é."
+msgstr ""
+"Ceci est un modèle de station de travail, l'onglet imprimante est désactivé."
 
 #: admin/systems/goto/class_printGeneric.inc:299
 msgid "This is a terminal template, printer tab is disabled."
@@ -1750,12 +1666,12 @@ msgstr "Cette imprimante appartient à %s. Vous ne pouvez pas changer son nom."
 #: admin/systems/goto/class_printGeneric.inc:593
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:230
+#: admin/systems/goto/class_terminalGeneric.inc:232
 msgid "terminal"
 msgstr "terminal"
 
 #: admin/systems/goto/class_printGeneric.inc:595
-#: admin/systems/goto/class_workstationGeneric.inc:226
+#: admin/systems/goto/class_workstationGeneric.inc:227
 #: admin/systems/goto/class_workstationStartup.inc:285
 msgid "workstation"
 msgstr "stations de travail"
@@ -1776,6 +1692,11 @@ msgstr "URL de l'imprimante"
 msgid "Group"
 msgstr "Groupes"
 
+#: admin/systems/goto/class_printGeneric.inc:976
+#: addons/goto/events/class_EventTargetAddUsersList.inc:171
+msgid "User"
+msgstr "Utilisateur"
+
 #: admin/systems/goto/class_printGeneric.inc:989
 msgid "Print generic"
 msgstr "Imprimante générique"
@@ -1800,6 +1721,12 @@ msgstr "PPD de  l'Imprimante"
 msgid "Permissions"
 msgstr "Permissions"
 
+#: admin/systems/goto/class_printGeneric.inc:1019
+#: admin/systems/goto/class_printGeneric.inc:1041
+#: personal/environment/class_environment.inc:583
+msgid "Permission error"
+msgstr "Erreur de permissions"
+
 #: admin/systems/goto/class_printGeneric.inc:1019
 #: admin/systems/goto/class_printGeneric.inc:1041
 msgid "printer user"
@@ -1923,7 +1850,7 @@ msgid "System informations"
 msgstr "Information système"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:704
+#: admin/systems/goto/class_workstationGeneric.inc:705
 #: admin/systems/goto/class_SelectDeviceType.inc:39
 #: addons/goto/class_target_list.inc:203
 #: addons/goto/events/class_EventTargetAddList.inc:249
@@ -1932,8 +1859,8 @@ msgstr "Stations de travail"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:39
-#: admin/systems/goto/class_terminalGeneric.inc:687
-#: admin/systems/goto/class_terminalGeneric.inc:693
+#: admin/systems/goto/class_terminalGeneric.inc:689
+#: admin/systems/goto/class_terminalGeneric.inc:695
 msgid "Terminal"
 msgstr "Terminal"
 
@@ -2032,12 +1959,12 @@ msgid "unknown"
 msgstr "inconnu"
 
 #: admin/systems/goto/class_terminalService.inc:703
-#: admin/systems/goto/class_workstationService.inc:498
+#: admin/systems/goto/class_workstationService.inc:502
 msgid "Service"
 msgstr "Service"
 
 #: admin/systems/goto/class_terminalService.inc:713
-#: admin/systems/goto/class_workstationService.inc:507
+#: admin/systems/goto/class_workstationService.inc:511
 msgid "Monitor"
 msgstr "Ecran"
 
@@ -2051,27 +1978,27 @@ msgid "Remote desktop"
 msgstr "Bureau distant"
 
 #: admin/systems/goto/class_terminalService.inc:716
-#: admin/systems/goto/class_workstationService.inc:508
+#: admin/systems/goto/class_workstationService.inc:512
 msgid "Gfx driver"
 msgstr "Pilote graphique"
 
 #: admin/systems/goto/class_terminalService.inc:717
-#: admin/systems/goto/class_workstationService.inc:509
+#: admin/systems/goto/class_workstationService.inc:513
 msgid "Gfx resolution"
 msgstr "Résolution"
 
 #: admin/systems/goto/class_terminalService.inc:718
-#: admin/systems/goto/class_workstationService.inc:510
+#: admin/systems/goto/class_workstationService.inc:514
 msgid "Gfx color depth"
 msgstr "Profondeur des couleurs"
 
 #: admin/systems/goto/class_terminalService.inc:719
 #: admin/systems/goto/terminalService.tpl:150
 #: admin/systems/goto/workstationService.tpl:170
-#: admin/systems/goto/class_workstationService.inc:402
 #: admin/systems/goto/class_workstationService.inc:404
-#: admin/systems/goto/class_workstationService.inc:409
-#: admin/systems/goto/class_workstationService.inc:511
+#: admin/systems/goto/class_workstationService.inc:406
+#: admin/systems/goto/class_workstationService.inc:412
+#: admin/systems/goto/class_workstationService.inc:515
 msgid "HSync"
 msgstr "Fréquence de synchronisation Horizontale"
 
@@ -2080,8 +2007,8 @@ msgstr "Fréquence de synchronisation Horizontale"
 #: admin/systems/goto/workstationService.tpl:181
 #: admin/systems/goto/class_workstationService.inc:385
 #: admin/systems/goto/class_workstationService.inc:387
-#: admin/systems/goto/class_workstationService.inc:392
-#: admin/systems/goto/class_workstationService.inc:512
+#: admin/systems/goto/class_workstationService.inc:393
+#: admin/systems/goto/class_workstationService.inc:516
 msgid "VSync"
 msgstr "Fréquence de synchronisation verticale"
 
@@ -2090,7 +2017,7 @@ msgid "Auto-Sync"
 msgstr "Synchronisation automatique"
 
 #: admin/systems/goto/class_terminalService.inc:722
-#: admin/systems/goto/class_workstationService.inc:514
+#: admin/systems/goto/class_workstationService.inc:518
 msgid "Scanner enabled"
 msgstr "Scanner activé"
 
@@ -2100,34 +2027,34 @@ msgid "Printer enabled"
 msgstr "Imprimante activée"
 
 #: admin/systems/goto/class_terminalService.inc:724
-#: admin/systems/goto/class_workstationService.inc:515
+#: admin/systems/goto/class_workstationService.inc:519
 msgid "Keyboard model"
 msgstr "Modèle de clavier"
 
 #: admin/systems/goto/class_terminalService.inc:725
-#: admin/systems/goto/class_workstationService.inc:516
+#: admin/systems/goto/class_workstationService.inc:520
 msgid "Keyboard layout"
 msgstr "Disposition du clavier"
 
 #: admin/systems/goto/class_terminalService.inc:726
-#: admin/systems/goto/class_workstationService.inc:517
+#: admin/systems/goto/class_workstationService.inc:521
 msgid "Keyboard variant"
 msgstr "Variante du clavier"
 
 #: admin/systems/goto/class_terminalService.inc:727
-#: admin/systems/goto/class_workstationService.inc:518
+#: admin/systems/goto/class_workstationService.inc:522
 msgid "Mouse type"
 msgstr "Type de souris"
 
 #: admin/systems/goto/class_terminalService.inc:728
-#: admin/systems/goto/class_workstationService.inc:519
+#: admin/systems/goto/class_workstationService.inc:523
 msgid "Mouse port"
 msgstr "Port souris"
 
 #: admin/systems/goto/class_terminalService.inc:730
 #: admin/systems/goto/terminalService.tpl:76
 #: admin/systems/goto/workstationService.tpl:86
-#: admin/systems/goto/class_workstationService.inc:520
+#: admin/systems/goto/class_workstationService.inc:524
 msgid "Telephone hardware"
 msgstr "Matériel téléphonique"
 
@@ -2224,54 +2151,54 @@ msgstr "Service Son"
 msgid "GUI"
 msgstr "Interface graphique"
 
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_workstationGeneric.inc:309
+#: admin/systems/goto/class_workstationGeneric.inc:300
+#: admin/systems/goto/class_workstationGeneric.inc:310
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
 msgid "Software update"
 msgstr "Mise à jour logicielle"
 
-#: admin/systems/goto/class_workstationGeneric.inc:303
-#: admin/systems/goto/class_workstationGeneric.inc:311
+#: admin/systems/goto/class_workstationGeneric.inc:304
+#: admin/systems/goto/class_workstationGeneric.inc:312
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr "Forcer un démarrage local"
 
-#: admin/systems/goto/class_workstationGeneric.inc:307
-#: admin/systems/goto/class_terminalGeneric.inc:271
+#: admin/systems/goto/class_workstationGeneric.inc:308
+#: admin/systems/goto/class_terminalGeneric.inc:273
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr "Réveiller"
 
-#: admin/systems/goto/class_workstationGeneric.inc:500
+#: admin/systems/goto/class_workstationGeneric.inc:501
 msgid "A valid LDAP server assignement is missing!"
 msgstr "Un serveur LDAP valide est manquant !"
 
-#: admin/systems/goto/class_workstationGeneric.inc:510
+#: admin/systems/goto/class_workstationGeneric.inc:511
 msgid "Software deployment"
 msgstr "Déploiement logiciel"
 
-#: admin/systems/goto/class_workstationGeneric.inc:511
+#: admin/systems/goto/class_workstationGeneric.inc:512
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 "Cet hôte est en cours d'installation, si vous voulez le sauver, cliquez sur "
 "'OK'."
 
-#: admin/systems/goto/class_workstationGeneric.inc:699
+#: admin/systems/goto/class_workstationGeneric.inc:700
 msgid "Workstation generic"
 msgstr "Information de la station de travail"
 
-#: admin/systems/goto/class_workstationGeneric.inc:711
+#: admin/systems/goto/class_workstationGeneric.inc:712
 msgid "Goto mode"
 msgstr "Mode Goto"
 
-#: admin/systems/goto/class_workstationGeneric.inc:714
-#: admin/systems/goto/class_terminalGeneric.inc:707
+#: admin/systems/goto/class_workstationGeneric.inc:715
+#: admin/systems/goto/class_terminalGeneric.inc:709
 msgid "Root password"
 msgstr "Mot de passe root"
 
-#: admin/systems/goto/class_workstationGeneric.inc:715
+#: admin/systems/goto/class_workstationGeneric.inc:716
 msgid "Create FAI CD"
 msgstr "Créer un CD FAI"
 
@@ -2464,11 +2391,13 @@ msgstr ""
 #: admin/systems/goto/class_workstationStartup.inc:234
 #, php-format
 msgid "FAI mirror '%s' is not available - setting to mirror 'auto'!"
-msgstr "Le miroir FAI '%s' n'est pas disponible - miroir mis sur 'automatique' !"
+msgstr ""
+"Le miroir FAI '%s' n'est pas disponible - miroir mis sur 'automatique' !"
 
 #: admin/systems/goto/class_workstationStartup.inc:247
 #, php-format
-msgid "FAI release '%s' is not available on mirror '%s' - setting to release '%s'!"
+msgid ""
+"FAI release '%s' is not available on mirror '%s' - setting to release '%s'!"
 msgstr ""
 "La version FAI '%s' n'est pas disponible sur le miroir '%s' - la version "
 "sera '%s' !"
@@ -2531,11 +2460,11 @@ msgstr ""
 msgid "Create ISO-Image"
 msgstr "Créer un image ISO"
 
-#: admin/systems/goto/class_workstationService.inc:499
+#: admin/systems/goto/class_workstationService.inc:503
 msgid "Workstation service"
 msgstr "Service station de travail"
 
-#: admin/systems/goto/class_workstationService.inc:513
+#: admin/systems/goto/class_workstationService.inc:517
 msgid "Use DDC"
 msgstr "Utiliser DCC"
 
@@ -2615,7 +2544,8 @@ msgstr "Continuer"
 msgid ""
 "FAI Object assignment disabled. You can't use this feature until FAI is "
 "activated."
-msgstr "Vous ne pouvez pas utiliser cette option tant que FAI n'est pas activé."
+msgstr ""
+"Vous ne pouvez pas utiliser cette option tant que FAI n'est pas activé."
 
 #: admin/systems/goto/workstationStartup.tpl:66
 msgid "GOsa support daemon not configured"
@@ -2647,15 +2577,15 @@ msgstr "Liste des classes FAI utilisées"
 msgid "set"
 msgstr "activé"
 
-#: admin/systems/goto/class_terminalGeneric.inc:688
+#: admin/systems/goto/class_terminalGeneric.inc:690
 msgid "Terminal generic"
 msgstr "Information du terminal"
 
-#: admin/systems/goto/class_terminalGeneric.inc:701
+#: admin/systems/goto/class_terminalGeneric.inc:703
 msgid "Syslog server enabled"
 msgstr "Serveur de journaux systèmes activé"
 
-#: admin/systems/goto/class_terminalGeneric.inc:706
+#: admin/systems/goto/class_terminalGeneric.inc:708
 msgid "Ntp server settings"
 msgstr "Préférences du serveur de temps"
 
@@ -2883,7 +2813,8 @@ msgstr "Impossible de lire le PPD '%s' !"
 #: admin/systems/ppd/class_printerPPDDialog.inc:121
 #, php-format
 msgid "Cannot open PPD path '%s' for reading and writing!"
-msgstr "Impossible de lire et d'écrire dans le chemin spécifié pour le PPD '%s' !"
+msgstr ""
+"Impossible de lire et d'écrire dans le chemin spécifié pour le PPD '%s' !"
 
 #: admin/systems/ppd/class_printerPPDDialog.inc:140
 #: admin/systems/ppd/class_printerPPDDialog.inc:339
@@ -2904,7 +2835,8 @@ msgstr "Ecrasement du PPD existant"
 msgid ""
 "There is already a ppd file for this kind of printer. Do you want to "
 "overwrite it?"
-msgstr "Il y a déjà un fichier ppd pour ce type d'imprimante. Voulez vous l'écraser ?"
+msgstr ""
+"Il y a déjà un fichier ppd pour ce type d'imprimante. Voulez vous l'écraser ?"
 
 #: admin/systems/ppd/class_printerPPDDialog.inc:463
 msgid "Section"
@@ -3144,14 +3076,20 @@ msgstr "Etat du déploiement"
 msgid "System deployment status"
 msgstr "Etat du déploiement des systèmes"
 
+#: addons/goto/class_gotomasses.inc:230
+msgid "Permission"
+msgstr "Permissions"
+
 #: addons/goto/class_gotomasses.inc:270
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
-msgstr "Les jobs suivants ne peuvent pas être effacés, il doivent être annulés: %s"
+msgstr ""
+"Les jobs suivants ne peuvent pas être effacés, il doivent être annulés: %s"
 
 #: addons/goto/class_gotomasses.inc:360
 msgid "This menu allows you to remove and change the properties of GOsa tasks."
-msgstr "Ce menu vous permet d'effacer et d'éditer les propriétés des tâches GOsa."
+msgstr ""
+"Ce menu vous permet d'effacer et d'éditer les propriétés des tâches GOsa."
 
 #: addons/goto/class_gotomasses.inc:361
 msgid "List of queued jobs"
@@ -3306,7 +3244,8 @@ msgstr "Déploiement de système"
 
 #: addons/goto/class_gotomasses.inc:926
 msgid "Provide a mechanism to automatically activate systems"
-msgstr "Procure un mécanisme pour activer un ensemble de systèmes automatiquement"
+msgstr ""
+"Procure un mécanisme pour activer un ensemble de systèmes automatiquement"
 
 #: addons/goto/log_view.tpl:7
 msgid "Available logs"
@@ -3597,7 +3536,8 @@ msgid "Progress"
 msgstr "Progression"
 
 #: addons/goto/class_goto_import_file.inc:90
-msgid "Selected entries will be skipped because of errors. Do you want to proceed?"
+msgid ""
+"Selected entries will be skipped because of errors. Do you want to proceed?"
 msgstr ""
 "Les entrées sélectionnées seront ignorées à cause des erreurs qu'elle "
 "contiennent. Voulez vous continuer ?"
@@ -3605,7 +3545,8 @@ msgstr ""
 #: addons/goto/class_goto_import_file.inc:131
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
-msgstr "L'importation est finie : %s évènements ont été envoyés, %s ont échoués"
+msgstr ""
+"L'importation est finie : %s évènements ont été envoyés, %s ont échoués"
 
 #: personal/environment/class_environment.inc:9
 #: personal/environment/class_environment.inc:433
@@ -3626,6 +3567,10 @@ msgstr "L'importation est finie : %s évènements ont été envoyés, %s ont éc
 msgid "Environment"
 msgstr "Environnement"
 
+#: personal/environment/class_environment.inc:10
+msgid "This does something"
+msgstr "Ceci fait quelque chose"
+
 #: personal/environment/class_environment.inc:139
 #, php-format
 msgid "Device '%s' is not available anymore. It will be removed!"
@@ -3663,7 +3608,8 @@ msgstr ""
 
 #: personal/environment/class_environment.inc:364
 #, php-format
-msgid "Profile server '%s' is not available anymore. Kiosk profile will be disabled."
+msgid ""
+"Profile server '%s' is not available anymore. Kiosk profile will be disabled."
 msgstr ""
 "Le serveur de profil sélectionné '%s' n'est plus disponible. Le profil Kiosk "
 "sera désactivé."
@@ -3708,7 +3654,9 @@ msgstr "Supprimer ce partage"
 
 #: personal/environment/class_environment.inc:988
 msgid "Cannot set default printer flag for groups!"
-msgstr "Impossible de mettre le paramètre par défaut des imprimantes pour les groupes !"
+msgstr ""
+"Impossible de mettre le paramètre par défaut des imprimantes pour les "
+"groupes !"
 
 #: personal/environment/class_environment.inc:1141
 #: personal/environment/class_environment.inc:1711
@@ -3927,7 +3875,82 @@ msgstr "Sélectionner le périphérique hotplug à ajouter"
 msgid "Choose the department the search will be based    on"
 msgstr "Sélectionner le département où sera effectuée la recherche"
 
+#: personal/environment/hotplugDialog.tpl:43
+msgid "Display users matching"
+msgstr "Afficher les utilisateurs correspondants"
+
 #: personal/environment/hotplugDialog.tpl:48
 msgid "Regular expression for        matching hotplugs"
-msgstr "Expression régulière concordant avec les noms des périphériques hotplug"
+msgstr ""
+"Expression régulière concordant avec les noms des périphériques hotplug"
+
+#~ msgid ""
+#~ "This may be used by several users/groups. Please double check if your "
+#~ "really want to do this since there is no way for GOsa to get your data "
+#~ "back."
+#~ msgstr ""
+#~ "Cela peut être utilisé par plusieurs utilisateurs/groupes. 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."
+
+#~ msgid "Manage hotplug devices"
+#~ msgstr "Gérer les périphériques hotplug"
+
+#~ msgid "device"
+#~ msgstr "périphérique"
+
+#~ 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 ""
+#~ "Cela peut être utilisé par plusieurs groupes. 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."
+
+#~ msgid "This table displays all applications in the selected tree."
+#~ msgstr "Ce tableau montre toutes les applications dans l'arbre sélectionné."
+
+#~ msgid "Freezed"
+#~ msgstr "Gelée"
+
+#~ msgid "Number of listed applications"
+#~ msgstr "Nombre d'applications listées"
+
+#~ msgid "Display mime types matching"
+#~ msgstr "Afficher les types mime correspondants"
+
+#~ msgid "Number of listed mimetypes"
+#~ msgstr "Nombre de type mime listés"
+
+#~ msgid "Mimetype management"
+#~ msgstr "Gestion des type mime"
+
+#~ msgid "Hidden shares must have a '$' at the end of the name!"
+#~ msgstr "Les partages cachés doivent avoir un '$' à la fin du nom !"
+
+#~ msgid "Syslog Service"
+#~ msgstr "Service de journaux systèmes"
+
+#~ msgid "Logging service"
+#~ msgstr "Service des journaux systèmes"
+
+#~ msgid "Syslog service database"
+#~ msgstr "Service de journaux systèmes"
+
+#~ msgid "Password"
+#~ msgstr "Mot de passe"
+
+#~ msgid "Database"
+#~ msgstr "Base de données"
+
+#~ msgid "Logging database"
+#~ msgstr "Base de données des journaux systèmes"
+
+#~ msgid "Admin"
+#~ msgstr "Administrateur"
+
+#~ msgid "Logging database information"
+#~ msgstr "Base de données des journaux systèmes"
 
+#~ msgid "Logging DB user"
+#~ msgstr "Utilisateur de la base de données des journaux systèmes"
diff --git a/gosa-plugins/goto/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/goto/locale/it/LC_MESSAGES/messages.po
index e526c0c74..954b55c40 100644
--- a/gosa-plugins/goto/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/goto/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:52+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -38,15 +38,15 @@ msgstr ""
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
 #: admin/mimetypes/class_mimetypeGeneric.inc:715
 #: admin/systems/goto/class_printGeneric.inc:988
-#: admin/systems/goto/class_workstationGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:699
 msgid "Generic"
 msgstr "Generale"
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
 #: admin/systems/goto/workstation.tpl:95
-#: admin/systems/goto/class_workstationGeneric.inc:489
-#: admin/systems/goto/class_terminalGeneric.inc:480
+#: admin/systems/goto/class_workstationGeneric.inc:490
+#: admin/systems/goto/class_terminalGeneric.inc:482
 #: admin/systems/goto/terminal.tpl:84
 #, fuzzy
 msgid "NTP server"
@@ -60,7 +60,7 @@ msgstr ""
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
 #: admin/systems/goto/workstation.tpl:55
-#: admin/systems/goto/class_terminalGeneric.inc:700
+#: admin/systems/goto/class_terminalGeneric.inc:702
 #: admin/systems/goto/terminal.tpl:47
 #, fuzzy
 msgid "Mode"
@@ -74,10 +74,8 @@ msgstr "Seleziona un sistema da aggiungere"
 
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
-#: admin/systems/services/syslog/class_goSyslogServer.inc:27
-#: admin/systems/services/syslog/class_goSyslogServer.inc:47
 #: admin/systems/goto/workstation.tpl:65
-#: admin/systems/goto/class_workstationGeneric.inc:712
+#: admin/systems/goto/class_workstationGeneric.inc:713
 #: admin/systems/goto/terminal.tpl:57
 #, fuzzy
 msgid "Syslog server"
@@ -91,7 +89,7 @@ msgstr "Scegli il subtree per l'utente"
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:703
+#: admin/systems/goto/class_terminalGeneric.inc:705
 #: admin/systems/goto/terminal.tpl:117
 #, fuzzy
 msgid "Root server"
@@ -104,7 +102,7 @@ msgstr "Seleziona un sistema da aggiungere"
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:704
+#: admin/systems/goto/class_terminalGeneric.inc:706
 #: admin/systems/goto/terminal.tpl:131
 #, fuzzy
 msgid "Swap server"
@@ -141,21 +139,21 @@ msgid "Execute"
 msgstr "Esegui"
 
 #: admin/ogroups/goto/class_termgroup.inc:51
-#: admin/systems/goto/class_workstationGeneric.inc:138
-#: admin/systems/goto/class_terminalGeneric.inc:122
+#: admin/systems/goto/class_workstationGeneric.inc:139
+#: admin/systems/goto/class_terminalGeneric.inc:124
 #, fuzzy
 msgid "Activated"
 msgstr "Privato"
 
 #: admin/ogroups/goto/class_termgroup.inc:52
-#: admin/systems/goto/class_workstationGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:121
+#: admin/systems/goto/class_workstationGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:123
 #: addons/goto/class_gotomasses.inc:542
 msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:281
+#: admin/systems/goto/class_terminalGeneric.inc:283
 #, fuzzy
 msgid "Local swap"
 msgstr "Nome locazione"
@@ -174,7 +172,7 @@ msgstr "Nome locazione"
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:154
+#: admin/systems/goto/class_workstationGeneric.inc:155
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -192,22 +190,22 @@ msgstr "Nome locazione"
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:137
-#: admin/systems/goto/class_terminalGeneric.inc:287
-#: admin/systems/goto/class_terminalGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:139
+#: admin/systems/goto/class_terminalGeneric.inc:289
+#: admin/systems/goto/class_terminalGeneric.inc:301
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:635
+#: admin/systems/goto/class_workstationGeneric.inc:213
+#: admin/systems/goto/class_workstationGeneric.inc:636
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
-#: admin/systems/goto/class_workstationService.inc:568
-#: admin/systems/goto/class_terminalGeneric.inc:187
-#: admin/systems/goto/class_terminalGeneric.inc:625
+#: admin/systems/goto/class_workstationService.inc:572
+#: admin/systems/goto/class_terminalGeneric.inc:189
+#: admin/systems/goto/class_terminalGeneric.inc:627
 #: addons/goto/class_gotomasses.inc:328
 #: addons/goto/class_goto_import_file.inc:124
 #, fuzzy
@@ -215,30 +213,30 @@ msgid "Service infrastructure"
 msgstr "Seleziona per mostrare le applicazioni"
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:216
-#: admin/systems/goto/class_terminalGeneric.inc:191
+#: admin/systems/goto/class_workstationGeneric.inc:217
+#: admin/systems/goto/class_terminalGeneric.inc:193
 #, fuzzy
 msgid "Event error"
 msgstr "Stato"
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:217
-#: admin/systems/goto/class_terminalGeneric.inc:192
+#: admin/systems/goto/class_workstationGeneric.inc:218
+#: admin/systems/goto/class_terminalGeneric.inc:194
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "Cambia la password"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:298
-#: admin/systems/goto/class_terminalGeneric.inc:265
+#: admin/systems/goto/class_workstationGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:267
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
 msgid "Switch off"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:298
-#: admin/systems/goto/class_terminalGeneric.inc:266
+#: admin/systems/goto/class_workstationGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:268
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
 #, fuzzy
@@ -260,15 +258,15 @@ msgid "Wake"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:300
-#: admin/systems/goto/class_workstationGeneric.inc:308
+#: admin/systems/goto/class_workstationGeneric.inc:301
+#: admin/systems/goto/class_workstationGeneric.inc:309
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
 msgid "Reinstall"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:301
+#: admin/systems/goto/class_workstationGeneric.inc:302
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 #, fuzzy
@@ -315,13 +313,13 @@ msgstr "Log di sitema"
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:364
-#: admin/systems/goto/class_workstationGeneric.inc:596
-#: admin/systems/goto/class_workstationGeneric.inc:613
+#: admin/systems/goto/class_workstationGeneric.inc:365
+#: admin/systems/goto/class_workstationGeneric.inc:597
+#: admin/systems/goto/class_workstationGeneric.inc:614
 #: admin/systems/goto/class_workstationStartup.inc:889
-#: admin/systems/goto/class_workstationService.inc:456
-#: admin/systems/goto/class_terminalGeneric.inc:353
-#: admin/systems/goto/class_terminalGeneric.inc:611
+#: admin/systems/goto/class_workstationService.inc:460
+#: admin/systems/goto/class_terminalGeneric.inc:355
+#: admin/systems/goto/class_terminalGeneric.inc:613
 #: personal/environment/class_environment.inc:1058
 #: personal/environment/class_environment.inc:1315
 #, fuzzy
@@ -339,14 +337,14 @@ msgid "System group"
 msgstr "Accesso ai sistemi"
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:716
-#: admin/systems/goto/class_terminalGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:717
+#: admin/systems/goto/class_terminalGeneric.inc:711
 #, fuzzy
 msgid "Action flag"
 msgstr "Azione"
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:713
+#: admin/systems/goto/class_workstationGeneric.inc:714
 #, fuzzy
 msgid "Ntp server"
 msgstr "Servizi"
@@ -394,34 +392,38 @@ msgstr "reset"
 msgid "Application settings"
 msgstr "Opzioni applicazione"
 
-#: admin/groups/apps/edit_entry.tpl:43
+#: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
 #: admin/devices/class_deviceGeneric.inc:90
 #: admin/devices/class_deviceGeneric.inc:114
 #: admin/devices/class_deviceGeneric.inc:260
 #: admin/applications/class_applicationParameters.inc:190
+#: admin/applications/application-list.xml:41
+#: admin/applications/application-list-release.xml:41
 #: admin/applications/class_applicationGeneric.inc:430
 #: admin/applications/class_applicationGeneric.inc:434
 #: admin/applications/class_applicationGeneric.inc:606
 #: admin/applications/class_applicationGeneric.inc:610
+#: admin/mimetypes/mimetype-list-release.xml:41
+#: admin/mimetypes/mimetype-list.xml:41
 #: admin/mimetypes/class_mimetypeGeneric.inc:532
 #: admin/mimetypes/class_mimetypeGeneric.inc:724
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
-#: admin/systems/services/nfs/class_servNfs.inc:239
+#: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
 #: admin/systems/goto/class_printGeneric.inc:733
 #: admin/systems/goto/class_printGeneric.inc:738
 #: admin/systems/goto/class_printGeneric.inc:757
 #: admin/systems/goto/class_printGeneric.inc:997
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:456
-#: admin/systems/goto/class_workstationGeneric.inc:461
-#: admin/systems/goto/class_workstationGeneric.inc:479
-#: admin/systems/goto/class_terminalGeneric.inc:446
-#: admin/systems/goto/class_terminalGeneric.inc:451
-#: admin/systems/goto/class_terminalGeneric.inc:470
-#: admin/systems/goto/class_terminalGeneric.inc:696
+#: admin/systems/goto/class_workstationGeneric.inc:457
+#: admin/systems/goto/class_workstationGeneric.inc:462
+#: admin/systems/goto/class_workstationGeneric.inc:480
+#: admin/systems/goto/class_terminalGeneric.inc:448
+#: admin/systems/goto/class_terminalGeneric.inc:453
+#: admin/systems/goto/class_terminalGeneric.inc:472
+#: admin/systems/goto/class_terminalGeneric.inc:698
 #: personal/environment/class_logonManagementDialog.inc:103
 msgid "Name"
 msgstr "Cognome"
@@ -452,8 +454,6 @@ msgid "department"
 msgstr "dipartimenti"
 
 #: admin/groups/apps/class_groupApplication.inc:481
-#: admin/applications/class_applicationManagement.inc:368
-#: admin/applications/class_applicationManagement.inc:449
 #: admin/applications/class_applicationGeneric.inc:127
 #, fuzzy
 msgid "application"
@@ -465,7 +465,7 @@ msgid "Not available in release."
 msgstr "Applicazioni disponibili"
 
 #: admin/groups/apps/class_groupApplication.inc:1373
-#: admin/applications/class_applicationManagement.inc:24
+#: admin/applications/class_applicationManagement.inc:25
 #: admin/mimetypes/generic.tpl:117 admin/mimetypes/generic.tpl:177
 msgid "Applications"
 msgstr "Applicazioni"
@@ -476,8 +476,10 @@ msgid "Group applications"
 msgstr "Mostra applicazioni"
 
 #: admin/groups/apps/class_groupApplication.inc:1381
-#: admin/applications/class_divListApplication.inc:114
-#: admin/applications/class_divListApplication.inc:150
+#: admin/applications/application-list.xml:15
+#: admin/applications/application-list.xml:74
+#: admin/applications/application-list-release.xml:15
+#: admin/applications/application-list-release.xml:74
 #: admin/applications/class_applicationGeneric.inc:603
 #: admin/mimetypes/class_mimetypeGeneric.inc:728
 msgid "Application"
@@ -485,6 +487,8 @@ msgstr "Applicazione"
 
 #: admin/groups/apps/class_groupApplication.inc:1382
 #: admin/groups/apps/app_list.tpl:5 admin/groups/apps/app_list.tpl:53
+#: admin/applications/application-filter-release.tpl:14
+#: admin/mimetypes/mimetype-filter-release.tpl:14
 #: admin/systems/goto/workstationStartup.tpl:83
 #: admin/systems/goto/workstationStartup.tpl:123
 #, fuzzy
@@ -529,10 +533,12 @@ msgstr "Dominio"
 
 #: admin/groups/apps/app_list.tpl:86 admin/groups/apps/app_list.tpl:107
 #: admin/groups/apps/app_list.tpl:132
-#: admin/devices/class_divListDevices.inc:100
+#: admin/devices/class_divListDevices.inc:100 admin/devices/device-list.xml:86
 #: admin/applications/class_applicationParameters.inc:122
-#: admin/applications/class_divListApplication.inc:120
-#: admin/mimetypes/class_divListMimeTypes.inc:122
+#: admin/applications/application-list.xml:86
+#: admin/applications/application-list-release.xml:86
+#: admin/mimetypes/mimetype-list-release.xml:86
+#: admin/mimetypes/mimetype-list.xml:86
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
@@ -581,8 +587,6 @@ msgid "List of defined devices"
 msgstr "Lista degli utenti"
 
 #: admin/devices/class_divListDevices.inc:45
-#: admin/applications/class_divListApplication.inc:45
-#: admin/mimetypes/class_divListMimeTypes.inc:45
 #, fuzzy
 msgid "Select all"
 msgstr "Rimuovi"
@@ -594,18 +598,15 @@ msgid "Device name"
 msgstr "Nome"
 
 #: admin/devices/class_divListDevices.inc:51
-#: admin/applications/class_divListApplication.inc:51
-#: admin/mimetypes/class_divListMimeTypes.inc:51
 msgid "Department"
 msgstr "Dipartimento"
 
 #: admin/devices/class_divListDevices.inc:52
-#: admin/devices/class_divListDevices.inc:87
-#: admin/applications/class_divListApplication.inc:52
-#: admin/applications/class_divListApplication.inc:107
-#: admin/mimetypes/class_divListMimeTypes.inc:52
-#: admin/mimetypes/class_divListMimeTypes.inc:109
-#: addons/goto/class_gotomasses.inc:365
+#: admin/devices/class_divListDevices.inc:87 admin/devices/device-list.xml:57
+#: admin/applications/application-list.xml:57
+#: admin/applications/application-list-release.xml:57
+#: admin/mimetypes/mimetype-list-release.xml:57
+#: admin/mimetypes/mimetype-list.xml:57 addons/goto/class_gotomasses.inc:365
 msgid "Actions"
 msgstr "Azioni"
 
@@ -615,18 +616,17 @@ msgid "Display devices matching"
 msgstr "Mostra gli indirizzi che corrispondono"
 
 #: admin/devices/class_divListDevices.inc:82 admin/devices/deviceGeneric.tpl:9
-#: admin/devices/class_deviceGeneric.inc:261 admin/applications/generic.tpl:42
-#: admin/applications/class_divListApplication.inc:90
+#: admin/devices/class_deviceGeneric.inc:261 admin/devices/device-list.tpl:13
+#: admin/applications/generic.tpl:42
 #: admin/applications/class_applicationGeneric.inc:607
-#: admin/mimetypes/generic.tpl:44
-#: admin/mimetypes/class_divListMimeTypes.inc:93
+#: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
+#: admin/mimetypes/mimetype-list.tpl:13
 #: admin/mimetypes/class_mimetypeGeneric.inc:727
-#: admin/systems/services/ldap/class_goLdapServer.inc:79
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
 #: admin/systems/goto/class_printGeneric.inc:998
-#: admin/systems/goto/class_workstationGeneric.inc:710
-#: admin/systems/goto/class_terminalGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:711
+#: admin/systems/goto/class_terminalGeneric.inc:700
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/class_target_list.inc:152 addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/class_EventTargetAddList.inc:161
@@ -635,33 +635,32 @@ msgid "Base"
 msgstr "Base"
 
 #: admin/devices/class_divListDevices.inc:84
-#: admin/applications/class_divListApplication.inc:92
-#: admin/mimetypes/class_divListMimeTypes.inc:95
 #: addons/goto/class_target_list.inc:154
 #: addons/goto/events/class_EventTargetAddList.inc:163
 #: addons/goto/events/class_EventTargetAddUsersList.inc:132
 msgid "Submit department"
 msgstr "Imposta dipartimento"
 
-#: admin/devices/class_divListDevices.inc:84
-#: admin/applications/class_divListApplication.inc:92
-#: admin/mimetypes/class_divListMimeTypes.inc:95
-#: addons/goto/class_target_list.inc:154
+#: admin/devices/class_divListDevices.inc:84 admin/devices/device-list.tpl:13
+#: admin/applications/application-list.tpl:13
+#: admin/mimetypes/mimetype-list.tpl:13 addons/goto/class_target_list.inc:154
 #: addons/goto/events/class_EventTargetAddList.inc:163
 #: addons/goto/events/class_EventTargetAddUsersList.inc:132
 msgid "Submit"
 msgstr ""
 
-#: admin/devices/class_divListDevices.inc:92
-#: admin/applications/class_divListApplication.inc:111
-#: admin/mimetypes/class_divListMimeTypes.inc:114
-#: admin/systems/goto/chooser.tpl:16 addons/goto/class_gotomasses.inc:366
+#: admin/devices/class_divListDevices.inc:92 admin/devices/device-list.xml:68
+#: admin/applications/application-list.xml:68
+#: admin/applications/application-list-release.xml:68
+#: admin/mimetypes/mimetype-list-release.xml:68
+#: admin/mimetypes/mimetype-list.xml:68 admin/systems/goto/chooser.tpl:16
+#: addons/goto/class_gotomasses.inc:366
 msgid "Create"
 msgstr "Creare"
 
 #: admin/devices/class_divListDevices.inc:94
-#: admin/devices/class_divListDevices.inc:131
-#: admin/devices/class_deviceGeneric.inc:159
+#: admin/devices/class_divListDevices.inc:131 admin/devices/device-list.xml:15
+#: admin/devices/device-list.xml:74 admin/devices/class_deviceGeneric.inc:159
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 #, fuzzy
@@ -669,27 +668,19 @@ msgid "Device"
 msgstr "Dispositivi"
 
 #: admin/devices/class_divListDevices.inc:156
-#: admin/applications/class_divListApplication.inc:186
-#: admin/mimetypes/class_divListMimeTypes.inc:186
 msgid "edit"
 msgstr "modifica"
 
 #: admin/devices/class_divListDevices.inc:156
-#: admin/applications/class_divListApplication.inc:186
-#: admin/mimetypes/class_divListMimeTypes.inc:186
 msgid "Edit this entry"
 msgstr "Modifica questo record"
 
 #: admin/devices/class_divListDevices.inc:163
-#: admin/applications/class_divListApplication.inc:202
-#: admin/mimetypes/class_divListMimeTypes.inc:201
 #: admin/systems/ppd/class_printerPPDSelectionDialog.inc:140
 msgid "delete"
 msgstr "elimina"
 
 #: admin/devices/class_divListDevices.inc:163
-#: admin/applications/class_divListApplication.inc:202
-#: admin/mimetypes/class_divListMimeTypes.inc:201
 msgid "Delete this entry"
 msgstr "Elimina questo record"
 
@@ -699,44 +690,48 @@ msgid "Number of listed devices"
 msgstr "Mostra dispositiva di rete"
 
 #: admin/devices/class_divListDevices.inc:206
-#: admin/applications/class_divListApplication.inc:243
-#: admin/mimetypes/class_divListMimeTypes.inc:244
 #, fuzzy
 msgid "Number of listed departments"
 msgstr "Imposta dipartimento"
 
-#: admin/devices/remove.tpl:6
+#: admin/devices/remove.tpl:6 admin/applications/remove.tpl:6
+#: admin/mimetypes/remove.tpl:6
 msgid ""
-"This may be used by several users/groups. Please double check if your really "
-"want to do this since there is no way for GOsa to get your data back."
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
 msgstr ""
 
-#: admin/devices/remove.tpl:9 admin/applications/remove.tpl:9
-#: admin/mimetypes/remove.tpl:9 addons/goto/remove.tpl:9
+#: admin/devices/remove.tpl:10 admin/applications/remove.tpl:10
+#: admin/mimetypes/remove.tpl:10 addons/goto/remove.tpl:9
 #, fuzzy
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 "Quindi - Se sei sicuro - premi <i>Rimuovi</i> per continuare o <i>Annulla</"
 "i> per abortire."
 
-#: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:257
-msgid "Devices"
-msgstr "Dispositivi"
+#: admin/devices/device-list.xml:11
+#, fuzzy
+msgid "List of devices"
+msgstr "Lista degli utenti"
 
-#: admin/devices/deviceGeneric.tpl:29 admin/devices/class_deviceGeneric.inc:93
+#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:29
+#: admin/devices/class_deviceGeneric.inc:93
 #: admin/devices/class_deviceGeneric.inc:262 admin/applications/generic.tpl:33
+#: admin/applications/application-list.xml:49
+#: admin/applications/application-list-release.xml:49
 #: admin/applications/class_applicationGeneric.inc:608
 #: admin/mimetypes/generic.tpl:34 admin/mimetypes/paste_generic.tpl:21
+#: admin/mimetypes/mimetype-list-release.xml:49
+#: admin/mimetypes/mimetype-list.xml:49
 #: admin/mimetypes/class_mimetypeGeneric.inc:726
 #: admin/systems/services/shares/class_goShareServer.inc:424
-#: admin/systems/services/nfs/class_servNfs.inc:211
+#: admin/systems/services/nfs/class_servNfs.inc:207
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
 #: admin/systems/goto/class_printGeneric.inc:999
-#: admin/systems/goto/class_workstationGeneric.inc:708
-#: admin/systems/goto/class_terminalGeneric.inc:697
+#: admin/systems/goto/class_workstationGeneric.inc:709
+#: admin/systems/goto/class_terminalGeneric.inc:699
 #: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
 #: addons/goto/class_gotomasses.inc:932
 #: personal/environment/class_logonManagementDialog.inc:111
@@ -744,6 +739,21 @@ msgstr "Dispositivi"
 msgid "Description"
 msgstr "Descrizione"
 
+#: admin/devices/device-list.xml:118
+#, fuzzy
+msgid "Edit device"
+msgstr "Dispositivi"
+
+#: admin/devices/device-list.xml:131
+#, fuzzy
+msgid "Remove device"
+msgstr "Elimina foto"
+
+#: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
+#: admin/devices/class_deviceGeneric.inc:257
+msgid "Devices"
+msgstr "Dispositivi"
+
 #: admin/devices/deviceGeneric.tpl:38
 #, fuzzy
 msgid "Device type"
@@ -782,10 +792,14 @@ msgstr ""
 msgid "(idProduct)"
 msgstr ""
 
-#: admin/devices/main.inc:49 admin/devices/main.inc:51
+#: admin/devices/device-filter.tpl:3
+#: admin/applications/application-filter.tpl:3
+#: admin/applications/application-filter-release.tpl:3
+#: admin/mimetypes/mimetype-filter-release.tpl:3
+#: admin/mimetypes/mimetype-filter.tpl:3
 #, fuzzy
-msgid "Hotplug device management"
-msgstr "Riferimenti"
+msgid "Filter"
+msgstr "Filtri"
 
 #: admin/devices/class_deviceGeneric.inc:29
 msgid "Digital camera"
@@ -888,53 +902,23 @@ msgstr "Server"
 msgid "Device ID"
 msgstr "Dispositivi"
 
-#: admin/devices/class_deviceManagement.inc:7
+#: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:82
+#: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:84
+#: admin/mimetypes/mimetype-list.tpl:13
+msgid "Update"
+msgstr "Aggiorna"
+
+#: admin/devices/class_deviceManagement.inc:25
 #: personal/environment/class_environment.inc:1783
 #: personal/environment/environment.tpl:293
 #, fuzzy
 msgid "Hotplug devices"
 msgstr "Dispositivi del client"
 
-#: admin/devices/class_deviceManagement.inc:8
-#, fuzzy
-msgid "Manage hotplug devices"
-msgstr "Dispositivi del client"
-
-#: admin/devices/class_deviceManagement.inc:246
-#: admin/applications/class_applicationManagement.inc:352
-#: admin/mimetypes/class_mimetypeManagement.inc:360
-#: addons/goto/class_gotomasses.inc:230
-#, fuzzy
-msgid "Permission"
-msgstr "Permessi"
-
-#: admin/devices/class_deviceManagement.inc:263
-#: admin/devices/class_deviceManagement.inc:345
+#: admin/devices/class_deviceManagement.inc:26
 #, fuzzy
-msgid "device"
-msgstr "Dispositivi"
-
-#: admin/devices/class_deviceManagement.inc:296
-#: admin/devices/class_deviceManagement.inc:352
-#: admin/devices/class_deviceManagement.inc:381
-#: admin/applications/class_applicationManagement.inc:401
-#: admin/applications/class_applicationManagement.inc:456
-#: admin/applications/class_applicationManagement.inc:487
-#: admin/mimetypes/class_mimetypeManagement.inc:412
-#: admin/mimetypes/class_mimetypeManagement.inc:466
-#: admin/mimetypes/class_mimetypeManagement.inc:496
-#: admin/systems/goto/class_printGeneric.inc:1019
-#: admin/systems/goto/class_printGeneric.inc:1041
-#: personal/environment/class_environment.inc:583
-#, fuzzy
-msgid "Permission error"
-msgstr "Permessi"
-
-#: admin/applications/remove.tpl:6 admin/mimetypes/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 ""
+msgid "Hotplug device management"
+msgstr "Riferimenti"
 
 #: admin/applications/release_select.tpl:2
 #: admin/mimetypes/release_select.tpl:2
@@ -994,7 +978,6 @@ msgid "Application parameter settings"
 msgstr "Nome applicazione"
 
 #: admin/applications/generic.tpl:7 admin/applications/generic.tpl:10
-#: admin/applications/class_divListApplication.inc:51
 #: admin/applications/class_applicationGeneric.inc:561
 msgid "Application name"
 msgstr "Nome applicazione"
@@ -1031,10 +1014,6 @@ msgstr "Rimuovi"
 msgid "Icon"
 msgstr "Icna"
 
-#: admin/applications/generic.tpl:82 admin/mimetypes/generic.tpl:84
-msgid "Update"
-msgstr "Aggiorna"
-
 #: admin/applications/generic.tpl:82
 msgid "Reload picture from LDAP"
 msgstr ""
@@ -1100,39 +1079,28 @@ msgstr "Importa"
 msgid "Download"
 msgstr "Dominio"
 
-#: admin/applications/class_applicationManagement.inc:25
-#: personal/environment/class_environment.inc:10
-msgid "This does something"
-msgstr "Questo fa qualcosa"
+#: admin/applications/class_applicationManagement.inc:26
+#, fuzzy
+msgid "Application management"
+msgstr "Riferimenti"
 
-#: admin/applications/class_divListApplication.inc:25
+#: admin/applications/application-list.xml:11
+#: admin/applications/application-list-release.xml:11
 #, fuzzy
-msgid "List of Applications"
+msgid "List of applications"
 msgstr "Lista delle applicazioni"
 
-#: admin/applications/class_divListApplication.inc:26
-msgid "This table displays all applications in the selected tree."
-msgstr ""
-
-#: admin/applications/class_divListApplication.inc:58
-#: personal/environment/hotplugDialog.tpl:43
-msgid "Display users matching"
-msgstr "Mostra utenti che corrispondono a"
-
-#: admin/applications/class_divListApplication.inc:199
-#: admin/mimetypes/class_divListMimeTypes.inc:198
-msgid "Freezed"
-msgstr ""
-
-#: admin/applications/class_divListApplication.inc:242
+#: admin/applications/application-list.xml:118
+#: admin/applications/application-list-release.xml:118
 #, fuzzy
-msgid "Number of listed applications"
-msgstr "Applicazioni in uso"
+msgid "Edit application"
+msgstr "applicazioni"
 
-#: admin/applications/main.inc:48 admin/applications/main.inc:50
+#: admin/applications/application-list.xml:131
+#: admin/applications/application-list-release.xml:131
 #, fuzzy
-msgid "Application management"
-msgstr "Riferimenti"
+msgid "Remove application"
+msgstr "applicazioni"
 
 #: admin/applications/class_applicationGeneric.inc:95
 #, fuzzy
@@ -1178,24 +1146,21 @@ msgstr "Nome applicazione"
 msgid "Script content"
 msgstr "Mostra terminali"
 
-#: admin/mimetypes/class_mimetypeManagement.inc:24
+#: admin/mimetypes/class_mimetypeManagement.inc:25
 #: admin/mimetypes/class_mimetypeGeneric.inc:721
 #, fuzzy
 msgid "Mime types"
 msgstr "Tipo"
 
-#: admin/mimetypes/class_mimetypeManagement.inc:25
+#: admin/mimetypes/class_mimetypeManagement.inc:26
 #, fuzzy
 msgid "Manage mime types"
 msgstr "Sistemi"
 
-#: admin/mimetypes/class_mimetypeManagement.inc:378
-#: admin/mimetypes/class_mimetypeManagement.inc:459
-#: admin/mimetypes/generic.tpl:12
-#: admin/mimetypes/class_divListMimeTypes.inc:51
-#: admin/mimetypes/class_divListMimeTypes.inc:116
-#: admin/mimetypes/class_divListMimeTypes.inc:152
-#: admin/mimetypes/paste_generic.tpl:13
+#: admin/mimetypes/generic.tpl:12 admin/mimetypes/paste_generic.tpl:13
+#: admin/mimetypes/mimetype-list-release.xml:15
+#: admin/mimetypes/mimetype-list-release.xml:74
+#: admin/mimetypes/mimetype-list.xml:15 admin/mimetypes/mimetype-list.xml:74
 #, fuzzy
 msgid "Mime type"
 msgstr "Tipo"
@@ -1274,31 +1239,28 @@ msgstr ""
 msgid "Ask whether to save to local disk"
 msgstr ""
 
-#: admin/mimetypes/class_divListMimeTypes.inc:27
-#: admin/mimetypes/class_divListMimeTypes.inc:28
-#, fuzzy
-msgid "List of defined mime types"
-msgstr "Liste di blocco predefinite"
-
-#: admin/mimetypes/class_divListMimeTypes.inc:58
+#: admin/mimetypes/paste_generic.tpl:24
 #, fuzzy
-msgid "Display mime types matching"
-msgstr "Mostra utenti che corrispondono a"
+msgid "Please specify a description for this mime type here"
+msgstr "Specificare una dimenzione valida per le mail da rigettare."
 
-#: admin/mimetypes/class_divListMimeTypes.inc:243
+#: admin/mimetypes/mimetype-list-release.xml:11
+#: admin/mimetypes/mimetype-list.xml:11
 #, fuzzy
-msgid "Number of listed mimetypes"
+msgid "List of mimetypes"
 msgstr "Liste di blocco predefinite"
 
-#: admin/mimetypes/paste_generic.tpl:24
+#: admin/mimetypes/mimetype-list-release.xml:118
+#: admin/mimetypes/mimetype-list.xml:118
 #, fuzzy
-msgid "Please specify a description for this mime type here"
-msgstr "Specificare una dimenzione valida per le mail da rigettare."
+msgid "Edit mimetype"
+msgstr "Modifica questo record"
 
-#: admin/mimetypes/main.inc:48 admin/mimetypes/main.inc:50
+#: admin/mimetypes/mimetype-list-release.xml:131
+#: admin/mimetypes/mimetype-list.xml:131
 #, fuzzy
-msgid "Mimetype management"
-msgstr "Riferimenti"
+msgid "Remove mimetype"
+msgstr "Elimina foto"
 
 #: admin/mimetypes/class_mimetypeGeneric.inc:535
 #, fuzzy
@@ -1326,7 +1288,6 @@ msgid "Print Service"
 msgstr "Stampante"
 
 #: admin/systems/services/cups/goCupsServer.tpl:1
-#: admin/systems/services/syslog/goSyslogServer.tpl:1
 #, fuzzy
 msgid "enabled"
 msgstr "disabilitato"
@@ -1350,25 +1311,20 @@ msgstr "gruppi"
 #: admin/systems/services/ntp/class_goNtpServer.inc:115
 #: admin/systems/services/terminal/class_goTerminalServer.inc:165
 #: admin/systems/services/shares/class_goShareServer.inc:414
-#: admin/systems/services/syslog/class_goSyslogServer.inc:69
-#: admin/systems/services/syslog/class_goLogDBServer.inc:93
 msgid "Services"
 msgstr "Servizi"
 
 #: admin/systems/services/cups/class_goCupsServer.inc:77
-#: admin/systems/services/syslog/class_goLogDBServer.inc:101
 #, fuzzy
 msgid "Start"
 msgstr "Avvio"
 
 #: admin/systems/services/cups/class_goCupsServer.inc:78
-#: admin/systems/services/syslog/class_goLogDBServer.inc:102
 #, fuzzy
 msgid "Stop"
 msgstr "Rapporto"
 
 #: admin/systems/services/cups/class_goCupsServer.inc:79
-#: admin/systems/services/syslog/class_goLogDBServer.inc:103
 #, fuzzy
 msgid "Restart"
 msgstr "Riprova"
@@ -1416,6 +1372,8 @@ msgid "LDAP service"
 msgstr "Dispositivi"
 
 #: admin/systems/services/ldap/goLdapServer.tpl:2
+#: admin/systems/services/ldap/class_goLdapServer.inc:79
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
 msgid "LDAP URI"
 msgstr ""
 
@@ -1423,6 +1381,25 @@ msgstr ""
 msgid "fill-in-your-servers-dns-name"
 msgstr ""
 
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
+#: admin/systems/services/nfs/servnfs.tpl:39
+#: admin/systems/goto/class_ArpNewDevice.inc:38
+#: admin/systems/goto/class_SelectDeviceType.inc:39
+#: addons/goto/class_target_list.inc:201
+#: addons/goto/events/class_EventTargetAddList.inc:238
+#: personal/environment/environment.tpl:135
+msgid "Server"
+msgstr "Server"
+
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
+#: admin/systems/goto/class_gotoLpdEnabled.inc:153
+#: admin/systems/goto/terminalService.tpl:58
+#: admin/systems/goto/workstationService.tpl:66
+#: admin/systems/goto/gotoLpdEnable.tpl:71
+#, fuzzy
+msgid "Port"
+msgstr "Importa"
+
 #: admin/systems/services/ldap/class_goLdapServer.inc:128
 #: admin/systems/services/ldap/class_goLdapServer.inc:129
 msgid "Ldap"
@@ -1528,14 +1505,14 @@ msgid "Path"
 msgstr "Data"
 
 #: admin/systems/services/shares/class_goShareServer.inc:428
-#: admin/systems/services/nfs/class_servNfs.inc:219
+#: admin/systems/services/nfs/class_servNfs.inc:215
 #: admin/systems/services/nfs/servnfs.tpl:121
 #, fuzzy
 msgid "Option"
 msgstr "Opzioni"
 
 #: admin/systems/services/shares/class_goShareServer.inc:429
-#: admin/systems/services/nfs/class_servNfs.inc:215
+#: admin/systems/services/nfs/class_servNfs.inc:211
 #: admin/systems/services/nfs/servnfs.tpl:29
 #, fuzzy
 msgid "Volume"
@@ -1549,10 +1526,6 @@ msgstr ""
 msgid "'Path / Volume' must contain at least one '/'!"
 msgstr ""
 
-#: admin/systems/services/nfs/class_servNfs.inc:205
-msgid "Hidden shares must have a '$' at the end of the name!"
-msgstr ""
-
 #: admin/systems/services/nfs/servnfs.tpl:1
 #, fuzzy
 msgid "Edit share"
@@ -1563,15 +1536,6 @@ msgstr "Modifica contatto"
 msgid "NFS setup"
 msgstr "Imposta"
 
-#: admin/systems/services/nfs/servnfs.tpl:39
-#: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_SelectDeviceType.inc:39
-#: addons/goto/class_target_list.inc:201
-#: addons/goto/events/class_EventTargetAddList.inc:238
-#: personal/environment/environment.tpl:135
-msgid "Server"
-msgstr "Server"
-
 #: admin/systems/services/nfs/servnfs.tpl:69
 msgid "Auto-mount share on Apple systems"
 msgstr ""
@@ -1581,63 +1545,6 @@ msgstr ""
 msgid "Codepage"
 msgstr "Home Page"
 
-#: admin/systems/services/syslog/goSyslogServer.tpl:1
-#, fuzzy
-msgid "Syslog Service"
-msgstr "Servizi"
-
-#: admin/systems/services/syslog/class_goSyslogServer.inc:68
-#: admin/systems/services/syslog/class_goSyslogServer.inc:69
-#, fuzzy
-msgid "Logging service"
-msgstr "Utenti di Dominio"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:31
-#: admin/systems/services/syslog/class_goLogDBServer.inc:59
-#, fuzzy
-msgid "Syslog service database"
-msgstr "Mostra server"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:69
-#: admin/systems/goto/class_printGeneric.inc:976
-#: addons/goto/events/class_EventTargetAddUsersList.inc:171
-msgid "User"
-msgstr ""
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:72
-#: admin/systems/services/syslog/class_goLogDBServer.inc:105
-#: admin/systems/services/syslog/goLogDBServer.tpl:20
-msgid "Password"
-msgstr "Password"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:75
-#: admin/systems/services/syslog/class_goLogDBServer.inc:106
-#: admin/systems/services/syslog/goLogDBServer.tpl:4
-#, fuzzy
-msgid "Database"
-msgstr "Data"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:92
-#: admin/systems/services/syslog/class_goLogDBServer.inc:93
-#, fuzzy
-msgid "Logging database"
-msgstr "Utenti di Dominio"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:104
-#, fuzzy
-msgid "Admin"
-msgstr "DN dell'amministratore"
-
-#: admin/systems/services/syslog/goLogDBServer.tpl:1
-#, fuzzy
-msgid "Logging database information"
-msgstr "Informazioni organizzazione"
-
-#: admin/systems/services/syslog/goLogDBServer.tpl:12
-#, fuzzy
-msgid "Logging DB user"
-msgstr "Utenti di Dominio"
-
 #: admin/systems/goto/workstation.tpl:1 admin/systems/goto/terminal.tpl:1
 msgid "Properties"
 msgstr ""
@@ -1648,14 +1555,14 @@ msgid "Workstation template"
 msgstr "Messaggio di di risposta automatica"
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:707
+#: admin/systems/goto/class_workstationGeneric.inc:708
 #, fuzzy
 msgid "Workstation name"
 msgstr "Mostra workstation"
 
 #: admin/systems/goto/workstation.tpl:27
 #: admin/systems/goto/class_printGeneric.inc:1000
-#: admin/systems/goto/class_workstationGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:710
 msgid "Location"
 msgstr "Località"
 
@@ -1764,14 +1671,6 @@ msgstr "Aggiungi"
 msgid "bit/s"
 msgstr "scrivere"
 
-#: admin/systems/goto/class_gotoLpdEnabled.inc:153
-#: admin/systems/goto/terminalService.tpl:58
-#: admin/systems/goto/workstationService.tpl:66
-#: admin/systems/goto/gotoLpdEnable.tpl:71
-#, fuzzy
-msgid "Port"
-msgstr "Importa"
-
 #: admin/systems/goto/ArpNewDevice.tpl:1
 msgid "Integrating unknown devices"
 msgstr ""
@@ -1909,13 +1808,13 @@ msgstr ""
 #: admin/systems/goto/class_printGeneric.inc:593
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:230
+#: admin/systems/goto/class_terminalGeneric.inc:232
 #, fuzzy
 msgid "terminal"
 msgstr "Terminali"
 
 #: admin/systems/goto/class_printGeneric.inc:595
-#: admin/systems/goto/class_workstationGeneric.inc:226
+#: admin/systems/goto/class_workstationGeneric.inc:227
 #: admin/systems/goto/class_workstationStartup.inc:285
 #, fuzzy
 msgid "workstation"
@@ -1938,6 +1837,11 @@ msgstr "URL della stampante"
 msgid "Group"
 msgstr "Gruppo"
 
+#: admin/systems/goto/class_printGeneric.inc:976
+#: addons/goto/events/class_EventTargetAddUsersList.inc:171
+msgid "User"
+msgstr ""
+
 #: admin/systems/goto/class_printGeneric.inc:989
 #, fuzzy
 msgid "Print generic"
@@ -1964,6 +1868,13 @@ msgstr "Stampante"
 msgid "Permissions"
 msgstr "Permessi"
 
+#: admin/systems/goto/class_printGeneric.inc:1019
+#: admin/systems/goto/class_printGeneric.inc:1041
+#: personal/environment/class_environment.inc:583
+#, fuzzy
+msgid "Permission error"
+msgstr "Permessi"
+
 #: admin/systems/goto/class_printGeneric.inc:1019
 #: admin/systems/goto/class_printGeneric.inc:1041
 #, fuzzy
@@ -2098,7 +2009,7 @@ msgid "System informations"
 msgstr "Informazioni personali"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:704
+#: admin/systems/goto/class_workstationGeneric.inc:705
 #: admin/systems/goto/class_SelectDeviceType.inc:39
 #: addons/goto/class_target_list.inc:203
 #: addons/goto/events/class_EventTargetAddList.inc:249
@@ -2107,8 +2018,8 @@ msgstr ""
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:39
-#: admin/systems/goto/class_terminalGeneric.inc:687
-#: admin/systems/goto/class_terminalGeneric.inc:693
+#: admin/systems/goto/class_terminalGeneric.inc:689
+#: admin/systems/goto/class_terminalGeneric.inc:695
 #, fuzzy
 msgid "Terminal"
 msgstr "Terminali"
@@ -2211,13 +2122,13 @@ msgid "unknown"
 msgstr ""
 
 #: admin/systems/goto/class_terminalService.inc:703
-#: admin/systems/goto/class_workstationService.inc:498
+#: admin/systems/goto/class_workstationService.inc:502
 #, fuzzy
 msgid "Service"
 msgstr "Servizi"
 
 #: admin/systems/goto/class_terminalService.inc:713
-#: admin/systems/goto/class_workstationService.inc:507
+#: admin/systems/goto/class_workstationService.inc:511
 #, fuzzy
 msgid "Monitor"
 msgstr "Dimensione quota"
@@ -2234,28 +2145,28 @@ msgid "Remote desktop"
 msgstr "Descrizoione unità"
 
 #: admin/systems/goto/class_terminalService.inc:716
-#: admin/systems/goto/class_workstationService.inc:508
+#: admin/systems/goto/class_workstationService.inc:512
 #, fuzzy
 msgid "Gfx driver"
 msgstr "Server"
 
 #: admin/systems/goto/class_terminalService.inc:717
-#: admin/systems/goto/class_workstationService.inc:509
+#: admin/systems/goto/class_workstationService.inc:513
 msgid "Gfx resolution"
 msgstr ""
 
 #: admin/systems/goto/class_terminalService.inc:718
-#: admin/systems/goto/class_workstationService.inc:510
+#: admin/systems/goto/class_workstationService.inc:514
 msgid "Gfx color depth"
 msgstr ""
 
 #: admin/systems/goto/class_terminalService.inc:719
 #: admin/systems/goto/terminalService.tpl:150
 #: admin/systems/goto/workstationService.tpl:170
-#: admin/systems/goto/class_workstationService.inc:402
 #: admin/systems/goto/class_workstationService.inc:404
-#: admin/systems/goto/class_workstationService.inc:409
-#: admin/systems/goto/class_workstationService.inc:511
+#: admin/systems/goto/class_workstationService.inc:406
+#: admin/systems/goto/class_workstationService.inc:412
+#: admin/systems/goto/class_workstationService.inc:515
 msgid "HSync"
 msgstr ""
 
@@ -2264,8 +2175,8 @@ msgstr ""
 #: admin/systems/goto/workstationService.tpl:181
 #: admin/systems/goto/class_workstationService.inc:385
 #: admin/systems/goto/class_workstationService.inc:387
-#: admin/systems/goto/class_workstationService.inc:392
-#: admin/systems/goto/class_workstationService.inc:512
+#: admin/systems/goto/class_workstationService.inc:393
+#: admin/systems/goto/class_workstationService.inc:516
 msgid "VSync"
 msgstr ""
 
@@ -2274,7 +2185,7 @@ msgid "Auto-Sync"
 msgstr ""
 
 #: admin/systems/goto/class_terminalService.inc:722
-#: admin/systems/goto/class_workstationService.inc:514
+#: admin/systems/goto/class_workstationService.inc:518
 #, fuzzy
 msgid "Scanner enabled"
 msgstr "disabilitato"
@@ -2286,28 +2197,28 @@ msgid "Printer enabled"
 msgstr "Nome della stampante"
 
 #: admin/systems/goto/class_terminalService.inc:724
-#: admin/systems/goto/class_workstationService.inc:515
+#: admin/systems/goto/class_workstationService.inc:519
 msgid "Keyboard model"
 msgstr ""
 
 #: admin/systems/goto/class_terminalService.inc:725
-#: admin/systems/goto/class_workstationService.inc:516
+#: admin/systems/goto/class_workstationService.inc:520
 msgid "Keyboard layout"
 msgstr ""
 
 #: admin/systems/goto/class_terminalService.inc:726
-#: admin/systems/goto/class_workstationService.inc:517
+#: admin/systems/goto/class_workstationService.inc:521
 msgid "Keyboard variant"
 msgstr ""
 
 #: admin/systems/goto/class_terminalService.inc:727
-#: admin/systems/goto/class_workstationService.inc:518
+#: admin/systems/goto/class_workstationService.inc:522
 #, fuzzy
 msgid "Mouse type"
 msgstr "Tipo"
 
 #: admin/systems/goto/class_terminalService.inc:728
-#: admin/systems/goto/class_workstationService.inc:519
+#: admin/systems/goto/class_workstationService.inc:523
 #, fuzzy
 msgid "Mouse port"
 msgstr "Monitoraggio"
@@ -2315,7 +2226,7 @@ msgstr "Monitoraggio"
 #: admin/systems/goto/class_terminalService.inc:730
 #: admin/systems/goto/terminalService.tpl:76
 #: admin/systems/goto/workstationService.tpl:86
-#: admin/systems/goto/class_workstationService.inc:520
+#: admin/systems/goto/class_workstationService.inc:524
 msgid "Telephone hardware"
 msgstr "Dispositivo telefonico"
 
@@ -2425,57 +2336,57 @@ msgstr "Servizi"
 msgid "GUI"
 msgstr "UID"
 
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_workstationGeneric.inc:309
+#: admin/systems/goto/class_workstationGeneric.inc:300
+#: admin/systems/goto/class_workstationGeneric.inc:310
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
 #, fuzzy
 msgid "Software update"
 msgstr "Crea estensioni telefoniche"
 
-#: admin/systems/goto/class_workstationGeneric.inc:303
-#: admin/systems/goto/class_workstationGeneric.inc:311
+#: admin/systems/goto/class_workstationGeneric.inc:304
+#: admin/systems/goto/class_workstationGeneric.inc:312
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:307
-#: admin/systems/goto/class_terminalGeneric.inc:271
+#: admin/systems/goto/class_workstationGeneric.inc:308
+#: admin/systems/goto/class_terminalGeneric.inc:273
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:500
+#: admin/systems/goto/class_workstationGeneric.inc:501
 msgid "A valid LDAP server assignement is missing!"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:510
+#: admin/systems/goto/class_workstationGeneric.inc:511
 #, fuzzy
 msgid "Software deployment"
 msgstr "Sistemi"
 
-#: admin/systems/goto/class_workstationGeneric.inc:511
+#: admin/systems/goto/class_workstationGeneric.inc:512
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:699
+#: admin/systems/goto/class_workstationGeneric.inc:700
 #, fuzzy
 msgid "Workstation generic"
 msgstr "Mostra workstation"
 
-#: admin/systems/goto/class_workstationGeneric.inc:711
+#: admin/systems/goto/class_workstationGeneric.inc:712
 #, fuzzy
 msgid "Goto mode"
 msgstr "nella cartella"
 
-#: admin/systems/goto/class_workstationGeneric.inc:714
-#: admin/systems/goto/class_terminalGeneric.inc:707
+#: admin/systems/goto/class_workstationGeneric.inc:715
+#: admin/systems/goto/class_terminalGeneric.inc:709
 #, fuzzy
 msgid "Root password"
 msgstr "Cambia password"
 
-#: admin/systems/goto/class_workstationGeneric.inc:715
+#: admin/systems/goto/class_workstationGeneric.inc:716
 #, fuzzy
 msgid "Create FAI CD"
 msgstr "Creare"
@@ -2756,12 +2667,12 @@ msgstr ""
 msgid "Create ISO-Image"
 msgstr "Creare"
 
-#: admin/systems/goto/class_workstationService.inc:499
+#: admin/systems/goto/class_workstationService.inc:503
 #, fuzzy
 msgid "Workstation service"
 msgstr "server"
 
-#: admin/systems/goto/class_workstationService.inc:513
+#: admin/systems/goto/class_workstationService.inc:517
 #, fuzzy
 msgid "Use DDC"
 msgstr "Utenti"
@@ -2876,17 +2787,17 @@ msgstr "Scegli il tuo numero di telefono personale"
 msgid "set"
 msgstr "reset"
 
-#: admin/systems/goto/class_terminalGeneric.inc:688
+#: admin/systems/goto/class_terminalGeneric.inc:690
 #, fuzzy
 msgid "Terminal generic"
 msgstr "Terminal Server"
 
-#: admin/systems/goto/class_terminalGeneric.inc:701
+#: admin/systems/goto/class_terminalGeneric.inc:703
 #, fuzzy
 msgid "Syslog server enabled"
 msgstr "Mostra server"
 
-#: admin/systems/goto/class_terminalGeneric.inc:706
+#: admin/systems/goto/class_terminalGeneric.inc:708
 #, fuzzy
 msgid "Ntp server settings"
 msgstr "Opzioni di posta dell'identità"
@@ -3407,6 +3318,11 @@ msgstr "Sistemi"
 msgid "System deployment status"
 msgstr "Sistemi"
 
+#: addons/goto/class_gotomasses.inc:230
+#, fuzzy
+msgid "Permission"
+msgstr "Permessi"
+
 #: addons/goto/class_gotomasses.inc:270
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
@@ -3937,6 +3853,10 @@ msgstr ""
 msgid "Environment"
 msgstr "Ambiente"
 
+#: personal/environment/class_environment.inc:10
+msgid "This does something"
+msgstr "Questo fa qualcosa"
+
 #: personal/environment/class_environment.inc:139
 #, php-format
 msgid "Device '%s' is not available anymore. It will be removed!"
@@ -4274,11 +4194,74 @@ msgstr "Rimuovi"
 msgid "Choose the department the search will be based    on"
 msgstr "Scegli il dipartimento di base per la ricerca"
 
+#: personal/environment/hotplugDialog.tpl:43
+msgid "Display users matching"
+msgstr "Mostra utenti che corrispondono a"
+
 #: personal/environment/hotplugDialog.tpl:48
 #, fuzzy
 msgid "Regular expression for        matching hotplugs"
 msgstr "Espressioni regolare per selezionare il nome del gruppo"
 
+#, fuzzy
+#~ msgid "Manage hotplug devices"
+#~ msgstr "Dispositivi del client"
+
+#, fuzzy
+#~ msgid "device"
+#~ msgstr "Dispositivi"
+
+#, fuzzy
+#~ msgid "Number of listed applications"
+#~ msgstr "Applicazioni in uso"
+
+#, fuzzy
+#~ msgid "Display mime types matching"
+#~ msgstr "Mostra utenti che corrispondono a"
+
+#, fuzzy
+#~ msgid "Number of listed mimetypes"
+#~ msgstr "Liste di blocco predefinite"
+
+#, fuzzy
+#~ msgid "Mimetype management"
+#~ msgstr "Riferimenti"
+
+#, fuzzy
+#~ msgid "Syslog Service"
+#~ msgstr "Servizi"
+
+#, fuzzy
+#~ msgid "Logging service"
+#~ msgstr "Utenti di Dominio"
+
+#, fuzzy
+#~ msgid "Syslog service database"
+#~ msgstr "Mostra server"
+
+#~ msgid "Password"
+#~ msgstr "Password"
+
+#, fuzzy
+#~ msgid "Database"
+#~ msgstr "Data"
+
+#, fuzzy
+#~ msgid "Logging database"
+#~ msgstr "Utenti di Dominio"
+
+#, fuzzy
+#~ msgid "Admin"
+#~ msgstr "DN dell'amministratore"
+
+#, fuzzy
+#~ msgid "Logging database information"
+#~ msgstr "Informazioni organizzazione"
+
+#, fuzzy
+#~ msgid "Logging DB user"
+#~ msgstr "Utenti di Dominio"
+
 #, fuzzy
 #~ msgid "System mass deployment"
 #~ msgstr "Dipartimento"
diff --git a/gosa-plugins/goto/locale/messages.po b/gosa-plugins/goto/locale/messages.po
index 27e0ef34e..2f760e41b 100644
--- a/gosa-plugins/goto/locale/messages.po
+++ b/gosa-plugins/goto/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:52+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,15 +39,15 @@ msgstr ""
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
 #: admin/mimetypes/class_mimetypeGeneric.inc:715
 #: admin/systems/goto/class_printGeneric.inc:988
-#: admin/systems/goto/class_workstationGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:699
 msgid "Generic"
 msgstr ""
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
 #: admin/systems/goto/workstation.tpl:95
-#: admin/systems/goto/class_workstationGeneric.inc:489
-#: admin/systems/goto/class_terminalGeneric.inc:480
+#: admin/systems/goto/class_workstationGeneric.inc:490
+#: admin/systems/goto/class_terminalGeneric.inc:482
 #: admin/systems/goto/terminal.tpl:84
 msgid "NTP server"
 msgstr ""
@@ -60,7 +60,7 @@ msgstr ""
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
 #: admin/systems/goto/workstation.tpl:55
-#: admin/systems/goto/class_terminalGeneric.inc:700
+#: admin/systems/goto/class_terminalGeneric.inc:702
 #: admin/systems/goto/terminal.tpl:47
 msgid "Mode"
 msgstr ""
@@ -72,10 +72,8 @@ msgstr ""
 
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
-#: admin/systems/services/syslog/class_goSyslogServer.inc:27
-#: admin/systems/services/syslog/class_goSyslogServer.inc:47
 #: admin/systems/goto/workstation.tpl:65
-#: admin/systems/goto/class_workstationGeneric.inc:712
+#: admin/systems/goto/class_workstationGeneric.inc:713
 #: admin/systems/goto/terminal.tpl:57
 msgid "Syslog server"
 msgstr ""
@@ -87,7 +85,7 @@ msgstr ""
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:703
+#: admin/systems/goto/class_terminalGeneric.inc:705
 #: admin/systems/goto/terminal.tpl:117
 msgid "Root server"
 msgstr ""
@@ -98,7 +96,7 @@ msgstr ""
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:704
+#: admin/systems/goto/class_terminalGeneric.inc:706
 #: admin/systems/goto/terminal.tpl:131
 msgid "Swap server"
 msgstr ""
@@ -131,20 +129,20 @@ msgid "Execute"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:51
-#: admin/systems/goto/class_workstationGeneric.inc:138
-#: admin/systems/goto/class_terminalGeneric.inc:122
+#: admin/systems/goto/class_workstationGeneric.inc:139
+#: admin/systems/goto/class_terminalGeneric.inc:124
 msgid "Activated"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:52
-#: admin/systems/goto/class_workstationGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:121
+#: admin/systems/goto/class_workstationGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:123
 #: addons/goto/class_gotomasses.inc:542
 msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:281
+#: admin/systems/goto/class_terminalGeneric.inc:283
 msgid "Local swap"
 msgstr ""
 
@@ -162,7 +160,7 @@ msgstr ""
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:154
+#: admin/systems/goto/class_workstationGeneric.inc:155
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -180,51 +178,51 @@ msgstr ""
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:137
-#: admin/systems/goto/class_terminalGeneric.inc:287
-#: admin/systems/goto/class_terminalGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:139
+#: admin/systems/goto/class_terminalGeneric.inc:289
+#: admin/systems/goto/class_terminalGeneric.inc:301
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:635
+#: admin/systems/goto/class_workstationGeneric.inc:213
+#: admin/systems/goto/class_workstationGeneric.inc:636
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
-#: admin/systems/goto/class_workstationService.inc:568
-#: admin/systems/goto/class_terminalGeneric.inc:187
-#: admin/systems/goto/class_terminalGeneric.inc:625
+#: admin/systems/goto/class_workstationService.inc:572
+#: admin/systems/goto/class_terminalGeneric.inc:189
+#: admin/systems/goto/class_terminalGeneric.inc:627
 #: addons/goto/class_gotomasses.inc:328
 #: addons/goto/class_goto_import_file.inc:124
 msgid "Service infrastructure"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:216
-#: admin/systems/goto/class_terminalGeneric.inc:191
+#: admin/systems/goto/class_workstationGeneric.inc:217
+#: admin/systems/goto/class_terminalGeneric.inc:193
 msgid "Event error"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:217
-#: admin/systems/goto/class_terminalGeneric.inc:192
+#: admin/systems/goto/class_workstationGeneric.inc:218
+#: admin/systems/goto/class_terminalGeneric.inc:194
 #, php-format
 msgid "Event '%s' is not available!"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:298
-#: admin/systems/goto/class_terminalGeneric.inc:265
+#: admin/systems/goto/class_workstationGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:267
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
 msgid "Switch off"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:298
-#: admin/systems/goto/class_terminalGeneric.inc:266
+#: admin/systems/goto/class_workstationGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:268
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
 msgid "Reboot"
@@ -243,15 +241,15 @@ msgid "Wake"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:300
-#: admin/systems/goto/class_workstationGeneric.inc:308
+#: admin/systems/goto/class_workstationGeneric.inc:301
+#: admin/systems/goto/class_workstationGeneric.inc:309
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
 msgid "Reinstall"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:301
+#: admin/systems/goto/class_workstationGeneric.inc:302
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 msgid "Rescan hardware"
@@ -296,13 +294,13 @@ msgstr ""
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:364
-#: admin/systems/goto/class_workstationGeneric.inc:596
-#: admin/systems/goto/class_workstationGeneric.inc:613
+#: admin/systems/goto/class_workstationGeneric.inc:365
+#: admin/systems/goto/class_workstationGeneric.inc:597
+#: admin/systems/goto/class_workstationGeneric.inc:614
 #: admin/systems/goto/class_workstationStartup.inc:889
-#: admin/systems/goto/class_workstationService.inc:456
-#: admin/systems/goto/class_terminalGeneric.inc:353
-#: admin/systems/goto/class_terminalGeneric.inc:611
+#: admin/systems/goto/class_workstationService.inc:460
+#: admin/systems/goto/class_terminalGeneric.inc:355
+#: admin/systems/goto/class_terminalGeneric.inc:613
 #: personal/environment/class_environment.inc:1058
 #: personal/environment/class_environment.inc:1315
 msgid "LDAP error"
@@ -317,13 +315,13 @@ msgid "System group"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:716
-#: admin/systems/goto/class_terminalGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:717
+#: admin/systems/goto/class_terminalGeneric.inc:711
 msgid "Action flag"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:713
+#: admin/systems/goto/class_workstationGeneric.inc:714
 msgid "Ntp server"
 msgstr ""
 
@@ -363,34 +361,38 @@ msgstr ""
 msgid "Application settings"
 msgstr ""
 
-#: admin/groups/apps/edit_entry.tpl:43
+#: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
 #: admin/devices/class_deviceGeneric.inc:90
 #: admin/devices/class_deviceGeneric.inc:114
 #: admin/devices/class_deviceGeneric.inc:260
 #: admin/applications/class_applicationParameters.inc:190
+#: admin/applications/application-list.xml:41
+#: admin/applications/application-list-release.xml:41
 #: admin/applications/class_applicationGeneric.inc:430
 #: admin/applications/class_applicationGeneric.inc:434
 #: admin/applications/class_applicationGeneric.inc:606
 #: admin/applications/class_applicationGeneric.inc:610
+#: admin/mimetypes/mimetype-list-release.xml:41
+#: admin/mimetypes/mimetype-list.xml:41
 #: admin/mimetypes/class_mimetypeGeneric.inc:532
 #: admin/mimetypes/class_mimetypeGeneric.inc:724
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
-#: admin/systems/services/nfs/class_servNfs.inc:239
+#: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
 #: admin/systems/goto/class_printGeneric.inc:733
 #: admin/systems/goto/class_printGeneric.inc:738
 #: admin/systems/goto/class_printGeneric.inc:757
 #: admin/systems/goto/class_printGeneric.inc:997
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:456
-#: admin/systems/goto/class_workstationGeneric.inc:461
-#: admin/systems/goto/class_workstationGeneric.inc:479
-#: admin/systems/goto/class_terminalGeneric.inc:446
-#: admin/systems/goto/class_terminalGeneric.inc:451
-#: admin/systems/goto/class_terminalGeneric.inc:470
-#: admin/systems/goto/class_terminalGeneric.inc:696
+#: admin/systems/goto/class_workstationGeneric.inc:457
+#: admin/systems/goto/class_workstationGeneric.inc:462
+#: admin/systems/goto/class_workstationGeneric.inc:480
+#: admin/systems/goto/class_terminalGeneric.inc:448
+#: admin/systems/goto/class_terminalGeneric.inc:453
+#: admin/systems/goto/class_terminalGeneric.inc:472
+#: admin/systems/goto/class_terminalGeneric.inc:698
 #: personal/environment/class_logonManagementDialog.inc:103
 msgid "Name"
 msgstr ""
@@ -418,8 +420,6 @@ msgid "department"
 msgstr ""
 
 #: admin/groups/apps/class_groupApplication.inc:481
-#: admin/applications/class_applicationManagement.inc:368
-#: admin/applications/class_applicationManagement.inc:449
 #: admin/applications/class_applicationGeneric.inc:127
 msgid "application"
 msgstr ""
@@ -429,7 +429,7 @@ msgid "Not available in release."
 msgstr ""
 
 #: admin/groups/apps/class_groupApplication.inc:1373
-#: admin/applications/class_applicationManagement.inc:24
+#: admin/applications/class_applicationManagement.inc:25
 #: admin/mimetypes/generic.tpl:117 admin/mimetypes/generic.tpl:177
 msgid "Applications"
 msgstr ""
@@ -439,8 +439,10 @@ msgid "Group applications"
 msgstr ""
 
 #: admin/groups/apps/class_groupApplication.inc:1381
-#: admin/applications/class_divListApplication.inc:114
-#: admin/applications/class_divListApplication.inc:150
+#: admin/applications/application-list.xml:15
+#: admin/applications/application-list.xml:74
+#: admin/applications/application-list-release.xml:15
+#: admin/applications/application-list-release.xml:74
 #: admin/applications/class_applicationGeneric.inc:603
 #: admin/mimetypes/class_mimetypeGeneric.inc:728
 msgid "Application"
@@ -448,6 +450,8 @@ msgstr ""
 
 #: admin/groups/apps/class_groupApplication.inc:1382
 #: admin/groups/apps/app_list.tpl:5 admin/groups/apps/app_list.tpl:53
+#: admin/applications/application-filter-release.tpl:14
+#: admin/mimetypes/mimetype-filter-release.tpl:14
 #: admin/systems/goto/workstationStartup.tpl:83
 #: admin/systems/goto/workstationStartup.tpl:123
 msgid "Release"
@@ -485,10 +489,12 @@ msgstr ""
 
 #: admin/groups/apps/app_list.tpl:86 admin/groups/apps/app_list.tpl:107
 #: admin/groups/apps/app_list.tpl:132
-#: admin/devices/class_divListDevices.inc:100
+#: admin/devices/class_divListDevices.inc:100 admin/devices/device-list.xml:86
 #: admin/applications/class_applicationParameters.inc:122
-#: admin/applications/class_divListApplication.inc:120
-#: admin/mimetypes/class_divListMimeTypes.inc:122
+#: admin/applications/application-list.xml:86
+#: admin/applications/application-list-release.xml:86
+#: admin/mimetypes/mimetype-list-release.xml:86
+#: admin/mimetypes/mimetype-list.xml:86
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
@@ -533,8 +539,6 @@ msgid "List of defined devices"
 msgstr ""
 
 #: admin/devices/class_divListDevices.inc:45
-#: admin/applications/class_divListApplication.inc:45
-#: admin/mimetypes/class_divListMimeTypes.inc:45
 msgid "Select all"
 msgstr ""
 
@@ -544,18 +548,15 @@ msgid "Device name"
 msgstr ""
 
 #: admin/devices/class_divListDevices.inc:51
-#: admin/applications/class_divListApplication.inc:51
-#: admin/mimetypes/class_divListMimeTypes.inc:51
 msgid "Department"
 msgstr ""
 
 #: admin/devices/class_divListDevices.inc:52
-#: admin/devices/class_divListDevices.inc:87
-#: admin/applications/class_divListApplication.inc:52
-#: admin/applications/class_divListApplication.inc:107
-#: admin/mimetypes/class_divListMimeTypes.inc:52
-#: admin/mimetypes/class_divListMimeTypes.inc:109
-#: addons/goto/class_gotomasses.inc:365
+#: admin/devices/class_divListDevices.inc:87 admin/devices/device-list.xml:57
+#: admin/applications/application-list.xml:57
+#: admin/applications/application-list-release.xml:57
+#: admin/mimetypes/mimetype-list-release.xml:57
+#: admin/mimetypes/mimetype-list.xml:57 addons/goto/class_gotomasses.inc:365
 msgid "Actions"
 msgstr ""
 
@@ -564,18 +565,17 @@ msgid "Display devices matching"
 msgstr ""
 
 #: admin/devices/class_divListDevices.inc:82 admin/devices/deviceGeneric.tpl:9
-#: admin/devices/class_deviceGeneric.inc:261 admin/applications/generic.tpl:42
-#: admin/applications/class_divListApplication.inc:90
+#: admin/devices/class_deviceGeneric.inc:261 admin/devices/device-list.tpl:13
+#: admin/applications/generic.tpl:42
 #: admin/applications/class_applicationGeneric.inc:607
-#: admin/mimetypes/generic.tpl:44
-#: admin/mimetypes/class_divListMimeTypes.inc:93
+#: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
+#: admin/mimetypes/mimetype-list.tpl:13
 #: admin/mimetypes/class_mimetypeGeneric.inc:727
-#: admin/systems/services/ldap/class_goLdapServer.inc:79
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
 #: admin/systems/goto/class_printGeneric.inc:998
-#: admin/systems/goto/class_workstationGeneric.inc:710
-#: admin/systems/goto/class_terminalGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:711
+#: admin/systems/goto/class_terminalGeneric.inc:700
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/class_target_list.inc:152 addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/class_EventTargetAddList.inc:161
@@ -584,60 +584,51 @@ msgid "Base"
 msgstr ""
 
 #: admin/devices/class_divListDevices.inc:84
-#: admin/applications/class_divListApplication.inc:92
-#: admin/mimetypes/class_divListMimeTypes.inc:95
 #: addons/goto/class_target_list.inc:154
 #: addons/goto/events/class_EventTargetAddList.inc:163
 #: addons/goto/events/class_EventTargetAddUsersList.inc:132
 msgid "Submit department"
 msgstr ""
 
-#: admin/devices/class_divListDevices.inc:84
-#: admin/applications/class_divListApplication.inc:92
-#: admin/mimetypes/class_divListMimeTypes.inc:95
-#: addons/goto/class_target_list.inc:154
+#: admin/devices/class_divListDevices.inc:84 admin/devices/device-list.tpl:13
+#: admin/applications/application-list.tpl:13
+#: admin/mimetypes/mimetype-list.tpl:13 addons/goto/class_target_list.inc:154
 #: addons/goto/events/class_EventTargetAddList.inc:163
 #: addons/goto/events/class_EventTargetAddUsersList.inc:132
 msgid "Submit"
 msgstr ""
 
-#: admin/devices/class_divListDevices.inc:92
-#: admin/applications/class_divListApplication.inc:111
-#: admin/mimetypes/class_divListMimeTypes.inc:114
-#: admin/systems/goto/chooser.tpl:16 addons/goto/class_gotomasses.inc:366
+#: admin/devices/class_divListDevices.inc:92 admin/devices/device-list.xml:68
+#: admin/applications/application-list.xml:68
+#: admin/applications/application-list-release.xml:68
+#: admin/mimetypes/mimetype-list-release.xml:68
+#: admin/mimetypes/mimetype-list.xml:68 admin/systems/goto/chooser.tpl:16
+#: addons/goto/class_gotomasses.inc:366
 msgid "Create"
 msgstr ""
 
 #: admin/devices/class_divListDevices.inc:94
-#: admin/devices/class_divListDevices.inc:131
-#: admin/devices/class_deviceGeneric.inc:159
+#: admin/devices/class_divListDevices.inc:131 admin/devices/device-list.xml:15
+#: admin/devices/device-list.xml:74 admin/devices/class_deviceGeneric.inc:159
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 msgid "Device"
 msgstr ""
 
 #: admin/devices/class_divListDevices.inc:156
-#: admin/applications/class_divListApplication.inc:186
-#: admin/mimetypes/class_divListMimeTypes.inc:186
 msgid "edit"
 msgstr ""
 
 #: admin/devices/class_divListDevices.inc:156
-#: admin/applications/class_divListApplication.inc:186
-#: admin/mimetypes/class_divListMimeTypes.inc:186
 msgid "Edit this entry"
 msgstr ""
 
 #: admin/devices/class_divListDevices.inc:163
-#: admin/applications/class_divListApplication.inc:202
-#: admin/mimetypes/class_divListMimeTypes.inc:201
 #: admin/systems/ppd/class_printerPPDSelectionDialog.inc:140
 msgid "delete"
 msgstr ""
 
 #: admin/devices/class_divListDevices.inc:163
-#: admin/applications/class_divListApplication.inc:202
-#: admin/mimetypes/class_divListMimeTypes.inc:201
 msgid "Delete this entry"
 msgstr ""
 
@@ -646,40 +637,43 @@ msgid "Number of listed devices"
 msgstr ""
 
 #: admin/devices/class_divListDevices.inc:206
-#: admin/applications/class_divListApplication.inc:243
-#: admin/mimetypes/class_divListMimeTypes.inc:244
 msgid "Number of listed departments"
 msgstr ""
 
-#: admin/devices/remove.tpl:6
+#: admin/devices/remove.tpl:6 admin/applications/remove.tpl:6
+#: admin/mimetypes/remove.tpl:6
 msgid ""
-"This may be used by several users/groups. Please double check if your really "
-"want to do this since there is no way for GOsa to get your data back."
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
 msgstr ""
 
-#: admin/devices/remove.tpl:9 admin/applications/remove.tpl:9
-#: admin/mimetypes/remove.tpl:9 addons/goto/remove.tpl:9
+#: admin/devices/remove.tpl:10 admin/applications/remove.tpl:10
+#: admin/mimetypes/remove.tpl:10 addons/goto/remove.tpl:9
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:257
-msgid "Devices"
+#: admin/devices/device-list.xml:11
+msgid "List of devices"
 msgstr ""
 
-#: admin/devices/deviceGeneric.tpl:29 admin/devices/class_deviceGeneric.inc:93
+#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:29
+#: admin/devices/class_deviceGeneric.inc:93
 #: admin/devices/class_deviceGeneric.inc:262 admin/applications/generic.tpl:33
+#: admin/applications/application-list.xml:49
+#: admin/applications/application-list-release.xml:49
 #: admin/applications/class_applicationGeneric.inc:608
 #: admin/mimetypes/generic.tpl:34 admin/mimetypes/paste_generic.tpl:21
+#: admin/mimetypes/mimetype-list-release.xml:49
+#: admin/mimetypes/mimetype-list.xml:49
 #: admin/mimetypes/class_mimetypeGeneric.inc:726
 #: admin/systems/services/shares/class_goShareServer.inc:424
-#: admin/systems/services/nfs/class_servNfs.inc:211
+#: admin/systems/services/nfs/class_servNfs.inc:207
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
 #: admin/systems/goto/class_printGeneric.inc:999
-#: admin/systems/goto/class_workstationGeneric.inc:708
-#: admin/systems/goto/class_terminalGeneric.inc:697
+#: admin/systems/goto/class_workstationGeneric.inc:709
+#: admin/systems/goto/class_terminalGeneric.inc:699
 #: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
 #: addons/goto/class_gotomasses.inc:932
 #: personal/environment/class_logonManagementDialog.inc:111
@@ -687,6 +681,19 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: admin/devices/device-list.xml:118
+msgid "Edit device"
+msgstr ""
+
+#: admin/devices/device-list.xml:131
+msgid "Remove device"
+msgstr ""
+
+#: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
+#: admin/devices/class_deviceGeneric.inc:257
+msgid "Devices"
+msgstr ""
+
 #: admin/devices/deviceGeneric.tpl:38
 msgid "Device type"
 msgstr ""
@@ -721,8 +728,12 @@ msgstr ""
 msgid "(idProduct)"
 msgstr ""
 
-#: admin/devices/main.inc:49 admin/devices/main.inc:51
-msgid "Hotplug device management"
+#: admin/devices/device-filter.tpl:3
+#: admin/applications/application-filter.tpl:3
+#: admin/applications/application-filter-release.tpl:3
+#: admin/mimetypes/mimetype-filter-release.tpl:3
+#: admin/mimetypes/mimetype-filter.tpl:3
+msgid "Filter"
 msgstr ""
 
 #: admin/devices/class_deviceGeneric.inc:29
@@ -819,47 +830,20 @@ msgstr ""
 msgid "Device ID"
 msgstr ""
 
-#: admin/devices/class_deviceManagement.inc:7
+#: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:82
+#: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:84
+#: admin/mimetypes/mimetype-list.tpl:13
+msgid "Update"
+msgstr ""
+
+#: admin/devices/class_deviceManagement.inc:25
 #: personal/environment/class_environment.inc:1783
 #: personal/environment/environment.tpl:293
 msgid "Hotplug devices"
 msgstr ""
 
-#: admin/devices/class_deviceManagement.inc:8
-msgid "Manage hotplug devices"
-msgstr ""
-
-#: admin/devices/class_deviceManagement.inc:246
-#: admin/applications/class_applicationManagement.inc:352
-#: admin/mimetypes/class_mimetypeManagement.inc:360
-#: addons/goto/class_gotomasses.inc:230
-msgid "Permission"
-msgstr ""
-
-#: admin/devices/class_deviceManagement.inc:263
-#: admin/devices/class_deviceManagement.inc:345
-msgid "device"
-msgstr ""
-
-#: admin/devices/class_deviceManagement.inc:296
-#: admin/devices/class_deviceManagement.inc:352
-#: admin/devices/class_deviceManagement.inc:381
-#: admin/applications/class_applicationManagement.inc:401
-#: admin/applications/class_applicationManagement.inc:456
-#: admin/applications/class_applicationManagement.inc:487
-#: admin/mimetypes/class_mimetypeManagement.inc:412
-#: admin/mimetypes/class_mimetypeManagement.inc:466
-#: admin/mimetypes/class_mimetypeManagement.inc:496
-#: admin/systems/goto/class_printGeneric.inc:1019
-#: admin/systems/goto/class_printGeneric.inc:1041
-#: personal/environment/class_environment.inc:583
-msgid "Permission error"
-msgstr ""
-
-#: admin/applications/remove.tpl:6 admin/mimetypes/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."
+#: admin/devices/class_deviceManagement.inc:26
+msgid "Hotplug device management"
 msgstr ""
 
 #: admin/applications/release_select.tpl:2
@@ -910,7 +894,6 @@ msgid "Application parameter settings"
 msgstr ""
 
 #: admin/applications/generic.tpl:7 admin/applications/generic.tpl:10
-#: admin/applications/class_divListApplication.inc:51
 #: admin/applications/class_applicationGeneric.inc:561
 msgid "Application name"
 msgstr ""
@@ -945,10 +928,6 @@ msgstr ""
 msgid "Icon"
 msgstr ""
 
-#: admin/applications/generic.tpl:82 admin/mimetypes/generic.tpl:84
-msgid "Update"
-msgstr ""
-
 #: admin/applications/generic.tpl:82
 msgid "Reload picture from LDAP"
 msgstr ""
@@ -1011,35 +990,23 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:25
-#: personal/environment/class_environment.inc:10
-msgid "This does something"
-msgstr ""
-
-#: admin/applications/class_divListApplication.inc:25
-msgid "List of Applications"
-msgstr ""
-
-#: admin/applications/class_divListApplication.inc:26
-msgid "This table displays all applications in the selected tree."
-msgstr ""
-
-#: admin/applications/class_divListApplication.inc:58
-#: personal/environment/hotplugDialog.tpl:43
-msgid "Display users matching"
+#: admin/applications/class_applicationManagement.inc:26
+msgid "Application management"
 msgstr ""
 
-#: admin/applications/class_divListApplication.inc:199
-#: admin/mimetypes/class_divListMimeTypes.inc:198
-msgid "Freezed"
+#: admin/applications/application-list.xml:11
+#: admin/applications/application-list-release.xml:11
+msgid "List of applications"
 msgstr ""
 
-#: admin/applications/class_divListApplication.inc:242
-msgid "Number of listed applications"
+#: admin/applications/application-list.xml:118
+#: admin/applications/application-list-release.xml:118
+msgid "Edit application"
 msgstr ""
 
-#: admin/applications/main.inc:48 admin/applications/main.inc:50
-msgid "Application management"
+#: admin/applications/application-list.xml:131
+#: admin/applications/application-list-release.xml:131
+msgid "Remove application"
 msgstr ""
 
 #: admin/applications/class_applicationGeneric.inc:95
@@ -1080,22 +1047,19 @@ msgstr ""
 msgid "Script content"
 msgstr ""
 
-#: admin/mimetypes/class_mimetypeManagement.inc:24
+#: admin/mimetypes/class_mimetypeManagement.inc:25
 #: admin/mimetypes/class_mimetypeGeneric.inc:721
 msgid "Mime types"
 msgstr ""
 
-#: admin/mimetypes/class_mimetypeManagement.inc:25
+#: admin/mimetypes/class_mimetypeManagement.inc:26
 msgid "Manage mime types"
 msgstr ""
 
-#: admin/mimetypes/class_mimetypeManagement.inc:378
-#: admin/mimetypes/class_mimetypeManagement.inc:459
-#: admin/mimetypes/generic.tpl:12
-#: admin/mimetypes/class_divListMimeTypes.inc:51
-#: admin/mimetypes/class_divListMimeTypes.inc:116
-#: admin/mimetypes/class_divListMimeTypes.inc:152
-#: admin/mimetypes/paste_generic.tpl:13
+#: admin/mimetypes/generic.tpl:12 admin/mimetypes/paste_generic.tpl:13
+#: admin/mimetypes/mimetype-list-release.xml:15
+#: admin/mimetypes/mimetype-list-release.xml:74
+#: admin/mimetypes/mimetype-list.xml:15 admin/mimetypes/mimetype-list.xml:74
 msgid "Mime type"
 msgstr ""
 
@@ -1165,25 +1129,23 @@ msgstr ""
 msgid "Ask whether to save to local disk"
 msgstr ""
 
-#: admin/mimetypes/class_divListMimeTypes.inc:27
-#: admin/mimetypes/class_divListMimeTypes.inc:28
-msgid "List of defined mime types"
-msgstr ""
-
-#: admin/mimetypes/class_divListMimeTypes.inc:58
-msgid "Display mime types matching"
+#: admin/mimetypes/paste_generic.tpl:24
+msgid "Please specify a description for this mime type here"
 msgstr ""
 
-#: admin/mimetypes/class_divListMimeTypes.inc:243
-msgid "Number of listed mimetypes"
+#: admin/mimetypes/mimetype-list-release.xml:11
+#: admin/mimetypes/mimetype-list.xml:11
+msgid "List of mimetypes"
 msgstr ""
 
-#: admin/mimetypes/paste_generic.tpl:24
-msgid "Please specify a description for this mime type here"
+#: admin/mimetypes/mimetype-list-release.xml:118
+#: admin/mimetypes/mimetype-list.xml:118
+msgid "Edit mimetype"
 msgstr ""
 
-#: admin/mimetypes/main.inc:48 admin/mimetypes/main.inc:50
-msgid "Mimetype management"
+#: admin/mimetypes/mimetype-list-release.xml:131
+#: admin/mimetypes/mimetype-list.xml:131
+msgid "Remove mimetype"
 msgstr ""
 
 #: admin/mimetypes/class_mimetypeGeneric.inc:535
@@ -1207,7 +1169,6 @@ msgid "Print Service"
 msgstr ""
 
 #: admin/systems/services/cups/goCupsServer.tpl:1
-#: admin/systems/services/syslog/goSyslogServer.tpl:1
 msgid "enabled"
 msgstr ""
 
@@ -1228,23 +1189,18 @@ msgstr ""
 #: admin/systems/services/ntp/class_goNtpServer.inc:115
 #: admin/systems/services/terminal/class_goTerminalServer.inc:165
 #: admin/systems/services/shares/class_goShareServer.inc:414
-#: admin/systems/services/syslog/class_goSyslogServer.inc:69
-#: admin/systems/services/syslog/class_goLogDBServer.inc:93
 msgid "Services"
 msgstr ""
 
 #: admin/systems/services/cups/class_goCupsServer.inc:77
-#: admin/systems/services/syslog/class_goLogDBServer.inc:101
 msgid "Start"
 msgstr ""
 
 #: admin/systems/services/cups/class_goCupsServer.inc:78
-#: admin/systems/services/syslog/class_goLogDBServer.inc:102
 msgid "Stop"
 msgstr ""
 
 #: admin/systems/services/cups/class_goCupsServer.inc:79
-#: admin/systems/services/syslog/class_goLogDBServer.inc:103
 msgid "Restart"
 msgstr ""
 
@@ -1286,6 +1242,8 @@ msgid "LDAP service"
 msgstr ""
 
 #: admin/systems/services/ldap/goLdapServer.tpl:2
+#: admin/systems/services/ldap/class_goLdapServer.inc:79
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
 msgid "LDAP URI"
 msgstr ""
 
@@ -1293,6 +1251,24 @@ msgstr ""
 msgid "fill-in-your-servers-dns-name"
 msgstr ""
 
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
+#: admin/systems/services/nfs/servnfs.tpl:39
+#: admin/systems/goto/class_ArpNewDevice.inc:38
+#: admin/systems/goto/class_SelectDeviceType.inc:39
+#: addons/goto/class_target_list.inc:201
+#: addons/goto/events/class_EventTargetAddList.inc:238
+#: personal/environment/environment.tpl:135
+msgid "Server"
+msgstr ""
+
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
+#: admin/systems/goto/class_gotoLpdEnabled.inc:153
+#: admin/systems/goto/terminalService.tpl:58
+#: admin/systems/goto/workstationService.tpl:66
+#: admin/systems/goto/gotoLpdEnable.tpl:71
+msgid "Port"
+msgstr ""
+
 #: admin/systems/services/ldap/class_goLdapServer.inc:128
 #: admin/systems/services/ldap/class_goLdapServer.inc:129
 msgid "Ldap"
@@ -1385,13 +1361,13 @@ msgid "Path"
 msgstr ""
 
 #: admin/systems/services/shares/class_goShareServer.inc:428
-#: admin/systems/services/nfs/class_servNfs.inc:219
+#: admin/systems/services/nfs/class_servNfs.inc:215
 #: admin/systems/services/nfs/servnfs.tpl:121
 msgid "Option"
 msgstr ""
 
 #: admin/systems/services/shares/class_goShareServer.inc:429
-#: admin/systems/services/nfs/class_servNfs.inc:215
+#: admin/systems/services/nfs/class_servNfs.inc:211
 #: admin/systems/services/nfs/servnfs.tpl:29
 msgid "Volume"
 msgstr ""
@@ -1404,10 +1380,6 @@ msgstr ""
 msgid "'Path / Volume' must contain at least one '/'!"
 msgstr ""
 
-#: admin/systems/services/nfs/class_servNfs.inc:205
-msgid "Hidden shares must have a '$' at the end of the name!"
-msgstr ""
-
 #: admin/systems/services/nfs/servnfs.tpl:1
 msgid "Edit share"
 msgstr ""
@@ -1416,15 +1388,6 @@ msgstr ""
 msgid "NFS setup"
 msgstr ""
 
-#: admin/systems/services/nfs/servnfs.tpl:39
-#: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_SelectDeviceType.inc:39
-#: addons/goto/class_target_list.inc:201
-#: addons/goto/events/class_EventTargetAddList.inc:238
-#: personal/environment/environment.tpl:135
-msgid "Server"
-msgstr ""
-
 #: admin/systems/services/nfs/servnfs.tpl:69
 msgid "Auto-mount share on Apple systems"
 msgstr ""
@@ -1433,55 +1396,6 @@ msgstr ""
 msgid "Codepage"
 msgstr ""
 
-#: admin/systems/services/syslog/goSyslogServer.tpl:1
-msgid "Syslog Service"
-msgstr ""
-
-#: admin/systems/services/syslog/class_goSyslogServer.inc:68
-#: admin/systems/services/syslog/class_goSyslogServer.inc:69
-msgid "Logging service"
-msgstr ""
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:31
-#: admin/systems/services/syslog/class_goLogDBServer.inc:59
-msgid "Syslog service database"
-msgstr ""
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:69
-#: admin/systems/goto/class_printGeneric.inc:976
-#: addons/goto/events/class_EventTargetAddUsersList.inc:171
-msgid "User"
-msgstr ""
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:72
-#: admin/systems/services/syslog/class_goLogDBServer.inc:105
-#: admin/systems/services/syslog/goLogDBServer.tpl:20
-msgid "Password"
-msgstr ""
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:75
-#: admin/systems/services/syslog/class_goLogDBServer.inc:106
-#: admin/systems/services/syslog/goLogDBServer.tpl:4
-msgid "Database"
-msgstr ""
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:92
-#: admin/systems/services/syslog/class_goLogDBServer.inc:93
-msgid "Logging database"
-msgstr ""
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:104
-msgid "Admin"
-msgstr ""
-
-#: admin/systems/services/syslog/goLogDBServer.tpl:1
-msgid "Logging database information"
-msgstr ""
-
-#: admin/systems/services/syslog/goLogDBServer.tpl:12
-msgid "Logging DB user"
-msgstr ""
-
 #: admin/systems/goto/workstation.tpl:1 admin/systems/goto/terminal.tpl:1
 msgid "Properties"
 msgstr ""
@@ -1491,13 +1405,13 @@ msgid "Workstation template"
 msgstr ""
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:707
+#: admin/systems/goto/class_workstationGeneric.inc:708
 msgid "Workstation name"
 msgstr ""
 
 #: admin/systems/goto/workstation.tpl:27
 #: admin/systems/goto/class_printGeneric.inc:1000
-#: admin/systems/goto/class_workstationGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:710
 msgid "Location"
 msgstr ""
 
@@ -1593,13 +1507,6 @@ msgstr ""
 msgid "bit/s"
 msgstr ""
 
-#: admin/systems/goto/class_gotoLpdEnabled.inc:153
-#: admin/systems/goto/terminalService.tpl:58
-#: admin/systems/goto/workstationService.tpl:66
-#: admin/systems/goto/gotoLpdEnable.tpl:71
-msgid "Port"
-msgstr ""
-
 #: admin/systems/goto/ArpNewDevice.tpl:1
 msgid "Integrating unknown devices"
 msgstr ""
@@ -1726,12 +1633,12 @@ msgstr ""
 #: admin/systems/goto/class_printGeneric.inc:593
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:230
+#: admin/systems/goto/class_terminalGeneric.inc:232
 msgid "terminal"
 msgstr ""
 
 #: admin/systems/goto/class_printGeneric.inc:595
-#: admin/systems/goto/class_workstationGeneric.inc:226
+#: admin/systems/goto/class_workstationGeneric.inc:227
 #: admin/systems/goto/class_workstationStartup.inc:285
 msgid "workstation"
 msgstr ""
@@ -1752,6 +1659,11 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#: admin/systems/goto/class_printGeneric.inc:976
+#: addons/goto/events/class_EventTargetAddUsersList.inc:171
+msgid "User"
+msgstr ""
+
 #: admin/systems/goto/class_printGeneric.inc:989
 msgid "Print generic"
 msgstr ""
@@ -1776,6 +1688,12 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
+#: admin/systems/goto/class_printGeneric.inc:1019
+#: admin/systems/goto/class_printGeneric.inc:1041
+#: personal/environment/class_environment.inc:583
+msgid "Permission error"
+msgstr ""
+
 #: admin/systems/goto/class_printGeneric.inc:1019
 #: admin/systems/goto/class_printGeneric.inc:1041
 msgid "printer user"
@@ -1897,7 +1815,7 @@ msgid "System informations"
 msgstr ""
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:704
+#: admin/systems/goto/class_workstationGeneric.inc:705
 #: admin/systems/goto/class_SelectDeviceType.inc:39
 #: addons/goto/class_target_list.inc:203
 #: addons/goto/events/class_EventTargetAddList.inc:249
@@ -1906,8 +1824,8 @@ msgstr ""
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:39
-#: admin/systems/goto/class_terminalGeneric.inc:687
-#: admin/systems/goto/class_terminalGeneric.inc:693
+#: admin/systems/goto/class_terminalGeneric.inc:689
+#: admin/systems/goto/class_terminalGeneric.inc:695
 msgid "Terminal"
 msgstr ""
 
@@ -2004,12 +1922,12 @@ msgid "unknown"
 msgstr ""
 
 #: admin/systems/goto/class_terminalService.inc:703
-#: admin/systems/goto/class_workstationService.inc:498
+#: admin/systems/goto/class_workstationService.inc:502
 msgid "Service"
 msgstr ""
 
 #: admin/systems/goto/class_terminalService.inc:713
-#: admin/systems/goto/class_workstationService.inc:507
+#: admin/systems/goto/class_workstationService.inc:511
 msgid "Monitor"
 msgstr ""
 
@@ -2023,27 +1941,27 @@ msgid "Remote desktop"
 msgstr ""
 
 #: admin/systems/goto/class_terminalService.inc:716
-#: admin/systems/goto/class_workstationService.inc:508
+#: admin/systems/goto/class_workstationService.inc:512
 msgid "Gfx driver"
 msgstr ""
 
 #: admin/systems/goto/class_terminalService.inc:717
-#: admin/systems/goto/class_workstationService.inc:509
+#: admin/systems/goto/class_workstationService.inc:513
 msgid "Gfx resolution"
 msgstr ""
 
 #: admin/systems/goto/class_terminalService.inc:718
-#: admin/systems/goto/class_workstationService.inc:510
+#: admin/systems/goto/class_workstationService.inc:514
 msgid "Gfx color depth"
 msgstr ""
 
 #: admin/systems/goto/class_terminalService.inc:719
 #: admin/systems/goto/terminalService.tpl:150
 #: admin/systems/goto/workstationService.tpl:170
-#: admin/systems/goto/class_workstationService.inc:402
 #: admin/systems/goto/class_workstationService.inc:404
-#: admin/systems/goto/class_workstationService.inc:409
-#: admin/systems/goto/class_workstationService.inc:511
+#: admin/systems/goto/class_workstationService.inc:406
+#: admin/systems/goto/class_workstationService.inc:412
+#: admin/systems/goto/class_workstationService.inc:515
 msgid "HSync"
 msgstr ""
 
@@ -2052,8 +1970,8 @@ msgstr ""
 #: admin/systems/goto/workstationService.tpl:181
 #: admin/systems/goto/class_workstationService.inc:385
 #: admin/systems/goto/class_workstationService.inc:387
-#: admin/systems/goto/class_workstationService.inc:392
-#: admin/systems/goto/class_workstationService.inc:512
+#: admin/systems/goto/class_workstationService.inc:393
+#: admin/systems/goto/class_workstationService.inc:516
 msgid "VSync"
 msgstr ""
 
@@ -2062,7 +1980,7 @@ msgid "Auto-Sync"
 msgstr ""
 
 #: admin/systems/goto/class_terminalService.inc:722
-#: admin/systems/goto/class_workstationService.inc:514
+#: admin/systems/goto/class_workstationService.inc:518
 msgid "Scanner enabled"
 msgstr ""
 
@@ -2072,34 +1990,34 @@ msgid "Printer enabled"
 msgstr ""
 
 #: admin/systems/goto/class_terminalService.inc:724
-#: admin/systems/goto/class_workstationService.inc:515
+#: admin/systems/goto/class_workstationService.inc:519
 msgid "Keyboard model"
 msgstr ""
 
 #: admin/systems/goto/class_terminalService.inc:725
-#: admin/systems/goto/class_workstationService.inc:516
+#: admin/systems/goto/class_workstationService.inc:520
 msgid "Keyboard layout"
 msgstr ""
 
 #: admin/systems/goto/class_terminalService.inc:726
-#: admin/systems/goto/class_workstationService.inc:517
+#: admin/systems/goto/class_workstationService.inc:521
 msgid "Keyboard variant"
 msgstr ""
 
 #: admin/systems/goto/class_terminalService.inc:727
-#: admin/systems/goto/class_workstationService.inc:518
+#: admin/systems/goto/class_workstationService.inc:522
 msgid "Mouse type"
 msgstr ""
 
 #: admin/systems/goto/class_terminalService.inc:728
-#: admin/systems/goto/class_workstationService.inc:519
+#: admin/systems/goto/class_workstationService.inc:523
 msgid "Mouse port"
 msgstr ""
 
 #: admin/systems/goto/class_terminalService.inc:730
 #: admin/systems/goto/terminalService.tpl:76
 #: admin/systems/goto/workstationService.tpl:86
-#: admin/systems/goto/class_workstationService.inc:520
+#: admin/systems/goto/class_workstationService.inc:524
 msgid "Telephone hardware"
 msgstr ""
 
@@ -2196,52 +2114,52 @@ msgstr ""
 msgid "GUI"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_workstationGeneric.inc:309
+#: admin/systems/goto/class_workstationGeneric.inc:300
+#: admin/systems/goto/class_workstationGeneric.inc:310
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
 msgid "Software update"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:303
-#: admin/systems/goto/class_workstationGeneric.inc:311
+#: admin/systems/goto/class_workstationGeneric.inc:304
+#: admin/systems/goto/class_workstationGeneric.inc:312
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:307
-#: admin/systems/goto/class_terminalGeneric.inc:271
+#: admin/systems/goto/class_workstationGeneric.inc:308
+#: admin/systems/goto/class_terminalGeneric.inc:273
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:500
+#: admin/systems/goto/class_workstationGeneric.inc:501
 msgid "A valid LDAP server assignement is missing!"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:510
+#: admin/systems/goto/class_workstationGeneric.inc:511
 msgid "Software deployment"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:511
+#: admin/systems/goto/class_workstationGeneric.inc:512
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:699
+#: admin/systems/goto/class_workstationGeneric.inc:700
 msgid "Workstation generic"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:711
+#: admin/systems/goto/class_workstationGeneric.inc:712
 msgid "Goto mode"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:714
-#: admin/systems/goto/class_terminalGeneric.inc:707
+#: admin/systems/goto/class_workstationGeneric.inc:715
+#: admin/systems/goto/class_terminalGeneric.inc:709
 msgid "Root password"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:715
+#: admin/systems/goto/class_workstationGeneric.inc:716
 msgid "Create FAI CD"
 msgstr ""
 
@@ -2493,11 +2411,11 @@ msgstr ""
 msgid "Create ISO-Image"
 msgstr ""
 
-#: admin/systems/goto/class_workstationService.inc:499
+#: admin/systems/goto/class_workstationService.inc:503
 msgid "Workstation service"
 msgstr ""
 
-#: admin/systems/goto/class_workstationService.inc:513
+#: admin/systems/goto/class_workstationService.inc:517
 msgid "Use DDC"
 msgstr ""
 
@@ -2602,15 +2520,15 @@ msgstr ""
 msgid "set"
 msgstr ""
 
-#: admin/systems/goto/class_terminalGeneric.inc:688
+#: admin/systems/goto/class_terminalGeneric.inc:690
 msgid "Terminal generic"
 msgstr ""
 
-#: admin/systems/goto/class_terminalGeneric.inc:701
+#: admin/systems/goto/class_terminalGeneric.inc:703
 msgid "Syslog server enabled"
 msgstr ""
 
-#: admin/systems/goto/class_terminalGeneric.inc:706
+#: admin/systems/goto/class_terminalGeneric.inc:708
 msgid "Ntp server settings"
 msgstr ""
 
@@ -3084,6 +3002,10 @@ msgstr ""
 msgid "System deployment status"
 msgstr ""
 
+#: addons/goto/class_gotomasses.inc:230
+msgid "Permission"
+msgstr ""
+
 #: addons/goto/class_gotomasses.inc:270
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
@@ -3559,6 +3481,10 @@ msgstr ""
 msgid "Environment"
 msgstr ""
 
+#: personal/environment/class_environment.inc:10
+msgid "This does something"
+msgstr ""
+
 #: personal/environment/class_environment.inc:139
 #, php-format
 msgid "Device '%s' is not available anymore. It will be removed!"
@@ -3853,6 +3779,10 @@ msgstr ""
 msgid "Choose the department the search will be based    on"
 msgstr ""
 
+#: personal/environment/hotplugDialog.tpl:43
+msgid "Display users matching"
+msgstr ""
+
 #: personal/environment/hotplugDialog.tpl:48
 msgid "Regular expression for        matching hotplugs"
 msgstr ""
diff --git a/gosa-plugins/goto/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/goto/locale/nl/LC_MESSAGES/messages.po
index 38b3976d8..90e14df53 100644
--- a/gosa-plugins/goto/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/goto/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:52+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -45,15 +45,15 @@ msgstr ""
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
 #: admin/mimetypes/class_mimetypeGeneric.inc:715
 #: admin/systems/goto/class_printGeneric.inc:988
-#: admin/systems/goto/class_workstationGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:699
 msgid "Generic"
 msgstr "Algemeen"
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
 #: admin/systems/goto/workstation.tpl:95
-#: admin/systems/goto/class_workstationGeneric.inc:489
-#: admin/systems/goto/class_terminalGeneric.inc:480
+#: admin/systems/goto/class_workstationGeneric.inc:490
+#: admin/systems/goto/class_terminalGeneric.inc:482
 #: admin/systems/goto/terminal.tpl:84
 msgid "NTP server"
 msgstr "NTP tijdserver"
@@ -66,7 +66,7 @@ msgstr "Selecteer de server die gebruikt wordt voor tijdsynchronisatie"
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
 #: admin/systems/goto/workstation.tpl:55
-#: admin/systems/goto/class_terminalGeneric.inc:700
+#: admin/systems/goto/class_terminalGeneric.inc:702
 #: admin/systems/goto/terminal.tpl:47
 msgid "Mode"
 msgstr "Modus"
@@ -78,10 +78,8 @@ msgstr "Selecteer terminal modus"
 
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
-#: admin/systems/services/syslog/class_goSyslogServer.inc:27
-#: admin/systems/services/syslog/class_goSyslogServer.inc:47
 #: admin/systems/goto/workstation.tpl:65
-#: admin/systems/goto/class_workstationGeneric.inc:712
+#: admin/systems/goto/class_workstationGeneric.inc:713
 #: admin/systems/goto/terminal.tpl:57
 msgid "Syslog server"
 msgstr "Syslog server"
@@ -93,7 +91,7 @@ msgstr "Selecteer de server die gebruikt wordt voor log doeleinden"
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:703
+#: admin/systems/goto/class_terminalGeneric.inc:705
 #: admin/systems/goto/terminal.tpl:117
 msgid "Root server"
 msgstr "Root server"
@@ -104,7 +102,7 @@ msgstr "Selecteer het te gebruiken NFS root bestandssysteem"
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:704
+#: admin/systems/goto/class_terminalGeneric.inc:706
 #: admin/systems/goto/terminal.tpl:131
 msgid "Swap server"
 msgstr "Swap server"
@@ -138,20 +136,20 @@ msgid "Execute"
 msgstr "Commando"
 
 #: admin/ogroups/goto/class_termgroup.inc:51
-#: admin/systems/goto/class_workstationGeneric.inc:138
-#: admin/systems/goto/class_terminalGeneric.inc:122
+#: admin/systems/goto/class_workstationGeneric.inc:139
+#: admin/systems/goto/class_terminalGeneric.inc:124
 msgid "Activated"
 msgstr "Geactiveerd"
 
 #: admin/ogroups/goto/class_termgroup.inc:52
-#: admin/systems/goto/class_workstationGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:121
+#: admin/systems/goto/class_workstationGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:123
 #: addons/goto/class_gotomasses.inc:542
 msgid "Locked"
 msgstr "Geblokkeerd"
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:281
+#: admin/systems/goto/class_terminalGeneric.inc:283
 #, fuzzy
 msgid "Local swap"
 msgstr "Naam van de locatie"
@@ -170,7 +168,7 @@ msgstr "Naam van de locatie"
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:154
+#: admin/systems/goto/class_workstationGeneric.inc:155
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -188,22 +186,22 @@ msgstr "Naam van de locatie"
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:137
-#: admin/systems/goto/class_terminalGeneric.inc:287
-#: admin/systems/goto/class_terminalGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:139
+#: admin/systems/goto/class_terminalGeneric.inc:289
+#: admin/systems/goto/class_terminalGeneric.inc:301
 msgid "inherited"
 msgstr "overerfd"
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:635
+#: admin/systems/goto/class_workstationGeneric.inc:213
+#: admin/systems/goto/class_workstationGeneric.inc:636
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
-#: admin/systems/goto/class_workstationService.inc:568
-#: admin/systems/goto/class_terminalGeneric.inc:187
-#: admin/systems/goto/class_terminalGeneric.inc:625
+#: admin/systems/goto/class_workstationService.inc:572
+#: admin/systems/goto/class_terminalGeneric.inc:189
+#: admin/systems/goto/class_terminalGeneric.inc:627
 #: addons/goto/class_gotomasses.inc:328
 #: addons/goto/class_goto_import_file.inc:124
 #, fuzzy
@@ -211,30 +209,30 @@ msgid "Service infrastructure"
 msgstr "Zoek binnen subtree"
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:216
-#: admin/systems/goto/class_terminalGeneric.inc:191
+#: admin/systems/goto/class_workstationGeneric.inc:217
+#: admin/systems/goto/class_terminalGeneric.inc:193
 #, fuzzy
 msgid "Event error"
 msgstr "Fout"
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:217
-#: admin/systems/goto/class_terminalGeneric.inc:192
+#: admin/systems/goto/class_workstationGeneric.inc:218
+#: admin/systems/goto/class_terminalGeneric.inc:194
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:298
-#: admin/systems/goto/class_terminalGeneric.inc:265
+#: admin/systems/goto/class_workstationGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:267
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
 msgid "Switch off"
 msgstr "Uitschakelen"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:298
-#: admin/systems/goto/class_terminalGeneric.inc:266
+#: admin/systems/goto/class_workstationGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:268
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
 msgid "Reboot"
@@ -254,15 +252,15 @@ msgid "Wake"
 msgstr "Aanzetten"
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:300
-#: admin/systems/goto/class_workstationGeneric.inc:308
+#: admin/systems/goto/class_workstationGeneric.inc:301
+#: admin/systems/goto/class_workstationGeneric.inc:309
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
 msgid "Reinstall"
 msgstr "Herinstalleer"
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:301
+#: admin/systems/goto/class_workstationGeneric.inc:302
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 msgid "Rescan hardware"
@@ -307,13 +305,13 @@ msgstr "Systeem analyse"
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:364
-#: admin/systems/goto/class_workstationGeneric.inc:596
-#: admin/systems/goto/class_workstationGeneric.inc:613
+#: admin/systems/goto/class_workstationGeneric.inc:365
+#: admin/systems/goto/class_workstationGeneric.inc:597
+#: admin/systems/goto/class_workstationGeneric.inc:614
 #: admin/systems/goto/class_workstationStartup.inc:889
-#: admin/systems/goto/class_workstationService.inc:456
-#: admin/systems/goto/class_terminalGeneric.inc:353
-#: admin/systems/goto/class_terminalGeneric.inc:611
+#: admin/systems/goto/class_workstationService.inc:460
+#: admin/systems/goto/class_terminalGeneric.inc:355
+#: admin/systems/goto/class_terminalGeneric.inc:613
 #: personal/environment/class_environment.inc:1058
 #: personal/environment/class_environment.inc:1315
 #, fuzzy
@@ -330,14 +328,14 @@ msgid "System group"
 msgstr "Systeem status"
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:716
-#: admin/systems/goto/class_terminalGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:717
+#: admin/systems/goto/class_terminalGeneric.inc:711
 #, fuzzy
 msgid "Action flag"
 msgstr "Actie"
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:713
+#: admin/systems/goto/class_workstationGeneric.inc:714
 #, fuzzy
 msgid "Ntp server"
 msgstr "NTP tijdserver"
@@ -383,34 +381,38 @@ msgstr "stel in"
 msgid "Application settings"
 msgstr "Programma instellingen"
 
-#: admin/groups/apps/edit_entry.tpl:43
+#: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
 #: admin/devices/class_deviceGeneric.inc:90
 #: admin/devices/class_deviceGeneric.inc:114
 #: admin/devices/class_deviceGeneric.inc:260
 #: admin/applications/class_applicationParameters.inc:190
+#: admin/applications/application-list.xml:41
+#: admin/applications/application-list-release.xml:41
 #: admin/applications/class_applicationGeneric.inc:430
 #: admin/applications/class_applicationGeneric.inc:434
 #: admin/applications/class_applicationGeneric.inc:606
 #: admin/applications/class_applicationGeneric.inc:610
+#: admin/mimetypes/mimetype-list-release.xml:41
+#: admin/mimetypes/mimetype-list.xml:41
 #: admin/mimetypes/class_mimetypeGeneric.inc:532
 #: admin/mimetypes/class_mimetypeGeneric.inc:724
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
-#: admin/systems/services/nfs/class_servNfs.inc:239
+#: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
 #: admin/systems/goto/class_printGeneric.inc:733
 #: admin/systems/goto/class_printGeneric.inc:738
 #: admin/systems/goto/class_printGeneric.inc:757
 #: admin/systems/goto/class_printGeneric.inc:997
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:456
-#: admin/systems/goto/class_workstationGeneric.inc:461
-#: admin/systems/goto/class_workstationGeneric.inc:479
-#: admin/systems/goto/class_terminalGeneric.inc:446
-#: admin/systems/goto/class_terminalGeneric.inc:451
-#: admin/systems/goto/class_terminalGeneric.inc:470
-#: admin/systems/goto/class_terminalGeneric.inc:696
+#: admin/systems/goto/class_workstationGeneric.inc:457
+#: admin/systems/goto/class_workstationGeneric.inc:462
+#: admin/systems/goto/class_workstationGeneric.inc:480
+#: admin/systems/goto/class_terminalGeneric.inc:448
+#: admin/systems/goto/class_terminalGeneric.inc:453
+#: admin/systems/goto/class_terminalGeneric.inc:472
+#: admin/systems/goto/class_terminalGeneric.inc:698
 #: personal/environment/class_logonManagementDialog.inc:103
 msgid "Name"
 msgstr "Naam"
@@ -439,8 +441,6 @@ msgid "department"
 msgstr "afdeling"
 
 #: admin/groups/apps/class_groupApplication.inc:481
-#: admin/applications/class_applicationManagement.inc:368
-#: admin/applications/class_applicationManagement.inc:449
 #: admin/applications/class_applicationGeneric.inc:127
 msgid "application"
 msgstr "programma"
@@ -451,7 +451,7 @@ msgid "Not available in release."
 msgstr "Beschikbare programma's"
 
 #: admin/groups/apps/class_groupApplication.inc:1373
-#: admin/applications/class_applicationManagement.inc:24
+#: admin/applications/class_applicationManagement.inc:25
 #: admin/mimetypes/generic.tpl:117 admin/mimetypes/generic.tpl:177
 msgid "Applications"
 msgstr "Programma's"
@@ -462,8 +462,10 @@ msgid "Group applications"
 msgstr "Toon programma's"
 
 #: admin/groups/apps/class_groupApplication.inc:1381
-#: admin/applications/class_divListApplication.inc:114
-#: admin/applications/class_divListApplication.inc:150
+#: admin/applications/application-list.xml:15
+#: admin/applications/application-list.xml:74
+#: admin/applications/application-list-release.xml:15
+#: admin/applications/application-list-release.xml:74
 #: admin/applications/class_applicationGeneric.inc:603
 #: admin/mimetypes/class_mimetypeGeneric.inc:728
 msgid "Application"
@@ -471,6 +473,8 @@ msgstr "Programma"
 
 #: admin/groups/apps/class_groupApplication.inc:1382
 #: admin/groups/apps/app_list.tpl:5 admin/groups/apps/app_list.tpl:53
+#: admin/applications/application-filter-release.tpl:14
+#: admin/mimetypes/mimetype-filter-release.tpl:14
 #: admin/systems/goto/workstationStartup.tpl:83
 #: admin/systems/goto/workstationStartup.tpl:123
 msgid "Release"
@@ -512,10 +516,12 @@ msgstr "Omlaag verplaatsen"
 
 #: admin/groups/apps/app_list.tpl:86 admin/groups/apps/app_list.tpl:107
 #: admin/groups/apps/app_list.tpl:132
-#: admin/devices/class_divListDevices.inc:100
+#: admin/devices/class_divListDevices.inc:100 admin/devices/device-list.xml:86
 #: admin/applications/class_applicationParameters.inc:122
-#: admin/applications/class_divListApplication.inc:120
-#: admin/mimetypes/class_divListMimeTypes.inc:122
+#: admin/applications/application-list.xml:86
+#: admin/applications/application-list-release.xml:86
+#: admin/mimetypes/mimetype-list-release.xml:86
+#: admin/mimetypes/mimetype-list.xml:86
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
@@ -566,8 +572,6 @@ msgid "List of defined devices"
 msgstr "Lijst met apparaten"
 
 #: admin/devices/class_divListDevices.inc:45
-#: admin/applications/class_divListApplication.inc:45
-#: admin/mimetypes/class_divListMimeTypes.inc:45
 #, fuzzy
 msgid "Select all"
 msgstr "Selecteer"
@@ -578,18 +582,15 @@ msgid "Device name"
 msgstr "Apparaat naam"
 
 #: admin/devices/class_divListDevices.inc:51
-#: admin/applications/class_divListApplication.inc:51
-#: admin/mimetypes/class_divListMimeTypes.inc:51
 msgid "Department"
 msgstr "Afdeling"
 
 #: admin/devices/class_divListDevices.inc:52
-#: admin/devices/class_divListDevices.inc:87
-#: admin/applications/class_divListApplication.inc:52
-#: admin/applications/class_divListApplication.inc:107
-#: admin/mimetypes/class_divListMimeTypes.inc:52
-#: admin/mimetypes/class_divListMimeTypes.inc:109
-#: addons/goto/class_gotomasses.inc:365
+#: admin/devices/class_divListDevices.inc:87 admin/devices/device-list.xml:57
+#: admin/applications/application-list.xml:57
+#: admin/applications/application-list-release.xml:57
+#: admin/mimetypes/mimetype-list-release.xml:57
+#: admin/mimetypes/mimetype-list.xml:57 addons/goto/class_gotomasses.inc:365
 msgid "Actions"
 msgstr "Acties"
 
@@ -598,18 +599,17 @@ msgid "Display devices matching"
 msgstr "Toon overeenkomende apparaten"
 
 #: admin/devices/class_divListDevices.inc:82 admin/devices/deviceGeneric.tpl:9
-#: admin/devices/class_deviceGeneric.inc:261 admin/applications/generic.tpl:42
-#: admin/applications/class_divListApplication.inc:90
+#: admin/devices/class_deviceGeneric.inc:261 admin/devices/device-list.tpl:13
+#: admin/applications/generic.tpl:42
 #: admin/applications/class_applicationGeneric.inc:607
-#: admin/mimetypes/generic.tpl:44
-#: admin/mimetypes/class_divListMimeTypes.inc:93
+#: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
+#: admin/mimetypes/mimetype-list.tpl:13
 #: admin/mimetypes/class_mimetypeGeneric.inc:727
-#: admin/systems/services/ldap/class_goLdapServer.inc:79
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
 #: admin/systems/goto/class_printGeneric.inc:998
-#: admin/systems/goto/class_workstationGeneric.inc:710
-#: admin/systems/goto/class_terminalGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:711
+#: admin/systems/goto/class_terminalGeneric.inc:700
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/class_target_list.inc:152 addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/class_EventTargetAddList.inc:161
@@ -618,60 +618,51 @@ msgid "Base"
 msgstr "Basis"
 
 #: admin/devices/class_divListDevices.inc:84
-#: admin/applications/class_divListApplication.inc:92
-#: admin/mimetypes/class_divListMimeTypes.inc:95
 #: addons/goto/class_target_list.inc:154
 #: addons/goto/events/class_EventTargetAddList.inc:163
 #: addons/goto/events/class_EventTargetAddUsersList.inc:132
 msgid "Submit department"
 msgstr "Verwerk afdeling"
 
-#: admin/devices/class_divListDevices.inc:84
-#: admin/applications/class_divListApplication.inc:92
-#: admin/mimetypes/class_divListMimeTypes.inc:95
-#: addons/goto/class_target_list.inc:154
+#: admin/devices/class_divListDevices.inc:84 admin/devices/device-list.tpl:13
+#: admin/applications/application-list.tpl:13
+#: admin/mimetypes/mimetype-list.tpl:13 addons/goto/class_target_list.inc:154
 #: addons/goto/events/class_EventTargetAddList.inc:163
 #: addons/goto/events/class_EventTargetAddUsersList.inc:132
 msgid "Submit"
 msgstr "Verwerk"
 
-#: admin/devices/class_divListDevices.inc:92
-#: admin/applications/class_divListApplication.inc:111
-#: admin/mimetypes/class_divListMimeTypes.inc:114
-#: admin/systems/goto/chooser.tpl:16 addons/goto/class_gotomasses.inc:366
+#: admin/devices/class_divListDevices.inc:92 admin/devices/device-list.xml:68
+#: admin/applications/application-list.xml:68
+#: admin/applications/application-list-release.xml:68
+#: admin/mimetypes/mimetype-list-release.xml:68
+#: admin/mimetypes/mimetype-list.xml:68 admin/systems/goto/chooser.tpl:16
+#: addons/goto/class_gotomasses.inc:366
 msgid "Create"
 msgstr "Aanmaken"
 
 #: admin/devices/class_divListDevices.inc:94
-#: admin/devices/class_divListDevices.inc:131
-#: admin/devices/class_deviceGeneric.inc:159
+#: admin/devices/class_divListDevices.inc:131 admin/devices/device-list.xml:15
+#: admin/devices/device-list.xml:74 admin/devices/class_deviceGeneric.inc:159
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 msgid "Device"
 msgstr "Apparaat"
 
 #: admin/devices/class_divListDevices.inc:156
-#: admin/applications/class_divListApplication.inc:186
-#: admin/mimetypes/class_divListMimeTypes.inc:186
 msgid "edit"
 msgstr "Bewerk"
 
 #: admin/devices/class_divListDevices.inc:156
-#: admin/applications/class_divListApplication.inc:186
-#: admin/mimetypes/class_divListMimeTypes.inc:186
 msgid "Edit this entry"
 msgstr "Bewerk deze invoer"
 
 #: admin/devices/class_divListDevices.inc:163
-#: admin/applications/class_divListApplication.inc:202
-#: admin/mimetypes/class_divListMimeTypes.inc:201
 #: admin/systems/ppd/class_printerPPDSelectionDialog.inc:140
 msgid "delete"
 msgstr "Verwijder"
 
 #: admin/devices/class_divListDevices.inc:163
-#: admin/applications/class_divListApplication.inc:202
-#: admin/mimetypes/class_divListMimeTypes.inc:201
 msgid "Delete this entry"
 msgstr "Verwijder deze invoer"
 
@@ -681,47 +672,49 @@ msgid "Number of listed devices"
 msgstr "Naam van de afdeling"
 
 #: admin/devices/class_divListDevices.inc:206
-#: admin/applications/class_divListApplication.inc:243
-#: admin/mimetypes/class_divListMimeTypes.inc:244
 #, fuzzy
 msgid "Number of listed departments"
 msgstr "Naam van de afdeling"
 
-#: admin/devices/remove.tpl:6
-#, fuzzy
+#: admin/devices/remove.tpl:6 admin/applications/remove.tpl:6
+#: admin/mimetypes/remove.tpl:6
 msgid ""
-"This may be used by several users/groups. Please double check if your really "
-"want to do this since there is no way for GOsa to get your data back."
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
 msgstr ""
-"Dit kan gebruikt worden door meerdere groepen. Verzeker uzelf ervan dat dit "
-"is wat u wil, aangezien er geen mogelijkheid voor GOsa is om uw date terug "
-"te halen."
+"Controleer a.u.b. of u dit daadwerkelijk wil doen, aangezien er geen "
+"mogelijkheid voor GOsa is om uw data terug te krijgen."
 
-#: admin/devices/remove.tpl:9 admin/applications/remove.tpl:9
-#: admin/mimetypes/remove.tpl:9 addons/goto/remove.tpl:9
+#: admin/devices/remove.tpl:10 admin/applications/remove.tpl:10
+#: admin/mimetypes/remove.tpl:10 addons/goto/remove.tpl:9
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 "Indien u zeker bent drukt u dan 'Verwijderen' om door te gaan of 'Annuleren' "
 "om te annuleren."
 
-#: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:257
-msgid "Devices"
-msgstr "Apparaten"
+#: admin/devices/device-list.xml:11
+#, fuzzy
+msgid "List of devices"
+msgstr "Lijst met apparaten"
 
-#: admin/devices/deviceGeneric.tpl:29 admin/devices/class_deviceGeneric.inc:93
+#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:29
+#: admin/devices/class_deviceGeneric.inc:93
 #: admin/devices/class_deviceGeneric.inc:262 admin/applications/generic.tpl:33
+#: admin/applications/application-list.xml:49
+#: admin/applications/application-list-release.xml:49
 #: admin/applications/class_applicationGeneric.inc:608
 #: admin/mimetypes/generic.tpl:34 admin/mimetypes/paste_generic.tpl:21
+#: admin/mimetypes/mimetype-list-release.xml:49
+#: admin/mimetypes/mimetype-list.xml:49
 #: admin/mimetypes/class_mimetypeGeneric.inc:726
 #: admin/systems/services/shares/class_goShareServer.inc:424
-#: admin/systems/services/nfs/class_servNfs.inc:211
+#: admin/systems/services/nfs/class_servNfs.inc:207
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
 #: admin/systems/goto/class_printGeneric.inc:999
-#: admin/systems/goto/class_workstationGeneric.inc:708
-#: admin/systems/goto/class_terminalGeneric.inc:697
+#: admin/systems/goto/class_workstationGeneric.inc:709
+#: admin/systems/goto/class_terminalGeneric.inc:699
 #: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
 #: addons/goto/class_gotomasses.inc:932
 #: personal/environment/class_logonManagementDialog.inc:111
@@ -729,6 +722,21 @@ msgstr "Apparaten"
 msgid "Description"
 msgstr "Omschrijving"
 
+#: admin/devices/device-list.xml:118
+#, fuzzy
+msgid "Edit device"
+msgstr "Geluidskaart"
+
+#: admin/devices/device-list.xml:131
+#, fuzzy
+msgid "Remove device"
+msgstr "Plaatje verwijderen"
+
+#: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
+#: admin/devices/class_deviceGeneric.inc:257
+msgid "Devices"
+msgstr "Apparaten"
+
 #: admin/devices/deviceGeneric.tpl:38
 #, fuzzy
 msgid "Device type"
@@ -768,10 +776,14 @@ msgstr ""
 msgid "(idProduct)"
 msgstr ""
 
-#: admin/devices/main.inc:49 admin/devices/main.inc:51
+#: admin/devices/device-filter.tpl:3
+#: admin/applications/application-filter.tpl:3
+#: admin/applications/application-filter-release.tpl:3
+#: admin/mimetypes/mimetype-filter-release.tpl:3
+#: admin/mimetypes/mimetype-filter.tpl:3
 #, fuzzy
-msgid "Hotplug device management"
-msgstr "Hotplug beheer"
+msgid "Filter"
+msgstr "Filters"
 
 #: admin/devices/class_deviceGeneric.inc:29
 msgid "Digital camera"
@@ -874,55 +886,22 @@ msgstr "Afzender ID"
 msgid "Device ID"
 msgstr "Apparaat"
 
-#: admin/devices/class_deviceManagement.inc:7
+#: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:82
+#: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:84
+#: admin/mimetypes/mimetype-list.tpl:13
+msgid "Update"
+msgstr "Bijwerken"
+
+#: admin/devices/class_deviceManagement.inc:25
 #: personal/environment/class_environment.inc:1783
 #: personal/environment/environment.tpl:293
 msgid "Hotplug devices"
 msgstr "Hotplug apparaten"
 
-#: admin/devices/class_deviceManagement.inc:8
-#, fuzzy
-msgid "Manage hotplug devices"
-msgstr "Hotplug apparaten toevoegen"
-
-#: admin/devices/class_deviceManagement.inc:246
-#: admin/applications/class_applicationManagement.inc:352
-#: admin/mimetypes/class_mimetypeManagement.inc:360
-#: addons/goto/class_gotomasses.inc:230
-#, fuzzy
-msgid "Permission"
-msgstr "Rechten"
-
-#: admin/devices/class_deviceManagement.inc:263
-#: admin/devices/class_deviceManagement.inc:345
-#, fuzzy
-msgid "device"
-msgstr "Apparaat"
-
-#: admin/devices/class_deviceManagement.inc:296
-#: admin/devices/class_deviceManagement.inc:352
-#: admin/devices/class_deviceManagement.inc:381
-#: admin/applications/class_applicationManagement.inc:401
-#: admin/applications/class_applicationManagement.inc:456
-#: admin/applications/class_applicationManagement.inc:487
-#: admin/mimetypes/class_mimetypeManagement.inc:412
-#: admin/mimetypes/class_mimetypeManagement.inc:466
-#: admin/mimetypes/class_mimetypeManagement.inc:496
-#: admin/systems/goto/class_printGeneric.inc:1019
-#: admin/systems/goto/class_printGeneric.inc:1041
-#: personal/environment/class_environment.inc:583
+#: admin/devices/class_deviceManagement.inc:26
 #, fuzzy
-msgid "Permission error"
-msgstr "Rechten"
-
-#: admin/applications/remove.tpl:6 admin/mimetypes/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 ""
-"Dit kan gebruikt worden door meerdere groepen. Verzeker uzelf ervan dat dit "
-"is wat u wil, aangezien er geen mogelijkheid voor GOsa is om uw date terug "
-"te halen."
+msgid "Hotplug device management"
+msgstr "Hotplug beheer"
 
 #: admin/applications/release_select.tpl:2
 #: admin/mimetypes/release_select.tpl:2
@@ -975,7 +954,6 @@ msgid "Application parameter settings"
 msgstr "Programmanaam"
 
 #: admin/applications/generic.tpl:7 admin/applications/generic.tpl:10
-#: admin/applications/class_divListApplication.inc:51
 #: admin/applications/class_applicationGeneric.inc:561
 msgid "Application name"
 msgstr "Programmanaam"
@@ -1010,10 +988,6 @@ msgstr "Selecteer een basis"
 msgid "Icon"
 msgstr "Icoon"
 
-#: admin/applications/generic.tpl:82 admin/mimetypes/generic.tpl:84
-msgid "Update"
-msgstr "Bijwerken"
-
 #: admin/applications/generic.tpl:82
 msgid "Reload picture from LDAP"
 msgstr "Herlaad plaatje vanuit LDAP"
@@ -1077,37 +1051,27 @@ msgstr "Importeren"
 msgid "Download"
 msgstr "Downloaden"
 
-#: admin/applications/class_applicationManagement.inc:25
-#: personal/environment/class_environment.inc:10
-msgid "This does something"
-msgstr "Dit doet iets"
+#: admin/applications/class_applicationManagement.inc:26
+msgid "Application management"
+msgstr "Programma beheer"
 
-#: admin/applications/class_divListApplication.inc:25
-msgid "List of Applications"
+#: admin/applications/application-list.xml:11
+#: admin/applications/application-list-release.xml:11
+#, fuzzy
+msgid "List of applications"
 msgstr "Lijst met programma's"
 
-#: admin/applications/class_divListApplication.inc:26
-msgid "This table displays all applications in the selected tree."
-msgstr "Deze tabel toont alle programma's in de geselecteerde tree."
-
-#: admin/applications/class_divListApplication.inc:58
-#: personal/environment/hotplugDialog.tpl:43
-msgid "Display users matching"
-msgstr "Toon overeenkomende gebruikers"
-
-#: admin/applications/class_divListApplication.inc:199
-#: admin/mimetypes/class_divListMimeTypes.inc:198
-msgid "Freezed"
-msgstr ""
-
-#: admin/applications/class_divListApplication.inc:242
+#: admin/applications/application-list.xml:118
+#: admin/applications/application-list-release.xml:118
 #, fuzzy
-msgid "Number of listed applications"
-msgstr "Gebruikte programma's"
+msgid "Edit application"
+msgstr "programma"
 
-#: admin/applications/main.inc:48 admin/applications/main.inc:50
-msgid "Application management"
-msgstr "Programma beheer"
+#: admin/applications/application-list.xml:131
+#: admin/applications/application-list-release.xml:131
+#, fuzzy
+msgid "Remove application"
+msgstr "programma"
 
 #: admin/applications/class_applicationGeneric.inc:95
 msgid "no example"
@@ -1154,24 +1118,21 @@ msgstr "Programmanaam"
 msgid "Script content"
 msgstr "Variabele inhoud"
 
-#: admin/mimetypes/class_mimetypeManagement.inc:24
+#: admin/mimetypes/class_mimetypeManagement.inc:25
 #: admin/mimetypes/class_mimetypeGeneric.inc:721
 #, fuzzy
 msgid "Mime types"
 msgstr "MIME-type"
 
-#: admin/mimetypes/class_mimetypeManagement.inc:25
+#: admin/mimetypes/class_mimetypeManagement.inc:26
 #, fuzzy
 msgid "Manage mime types"
 msgstr "OS-types beheren"
 
-#: admin/mimetypes/class_mimetypeManagement.inc:378
-#: admin/mimetypes/class_mimetypeManagement.inc:459
-#: admin/mimetypes/generic.tpl:12
-#: admin/mimetypes/class_divListMimeTypes.inc:51
-#: admin/mimetypes/class_divListMimeTypes.inc:116
-#: admin/mimetypes/class_divListMimeTypes.inc:152
-#: admin/mimetypes/paste_generic.tpl:13
+#: admin/mimetypes/generic.tpl:12 admin/mimetypes/paste_generic.tpl:13
+#: admin/mimetypes/mimetype-list-release.xml:15
+#: admin/mimetypes/mimetype-list-release.xml:74
+#: admin/mimetypes/mimetype-list.xml:15 admin/mimetypes/mimetype-list.xml:74
 #, fuzzy
 msgid "Mime type"
 msgstr "MIME-type"
@@ -1251,31 +1212,28 @@ msgstr ""
 msgid "Ask whether to save to local disk"
 msgstr ""
 
-#: admin/mimetypes/class_divListMimeTypes.inc:27
-#: admin/mimetypes/class_divListMimeTypes.inc:28
-#, fuzzy
-msgid "List of defined mime types"
-msgstr "Lijst met voorgedefiniëerde blokkeerlijstn"
-
-#: admin/mimetypes/class_divListMimeTypes.inc:58
+#: admin/mimetypes/paste_generic.tpl:24
 #, fuzzy
-msgid "Display mime types matching"
-msgstr "Toon de overeenkomende cartridgetypes"
+msgid "Please specify a description for this mime type here"
+msgstr "Geef a.u.b. een geldige naam op voor deze bijlage."
 
-#: admin/mimetypes/class_divListMimeTypes.inc:243
+#: admin/mimetypes/mimetype-list-release.xml:11
+#: admin/mimetypes/mimetype-list.xml:11
 #, fuzzy
-msgid "Number of listed mimetypes"
+msgid "List of mimetypes"
 msgstr "Lijst met voorgedefiniëerde blokkeerlijstn"
 
-#: admin/mimetypes/paste_generic.tpl:24
+#: admin/mimetypes/mimetype-list-release.xml:118
+#: admin/mimetypes/mimetype-list.xml:118
 #, fuzzy
-msgid "Please specify a description for this mime type here"
-msgstr "Geef a.u.b. een geldige naam op voor deze bijlage."
+msgid "Edit mimetype"
+msgstr "Bewerk deze invoer"
 
-#: admin/mimetypes/main.inc:48 admin/mimetypes/main.inc:50
+#: admin/mimetypes/mimetype-list-release.xml:131
+#: admin/mimetypes/mimetype-list.xml:131
 #, fuzzy
-msgid "Mimetype management"
-msgstr "Systeembeheer"
+msgid "Remove mimetype"
+msgstr "Plaatje verwijderen"
 
 #: admin/mimetypes/class_mimetypeGeneric.inc:535
 #, fuzzy
@@ -1302,7 +1260,6 @@ msgid "Print Service"
 msgstr "Print Service"
 
 #: admin/systems/services/cups/goCupsServer.tpl:1
-#: admin/systems/services/syslog/goSyslogServer.tpl:1
 #, fuzzy
 msgid "enabled"
 msgstr "gedeactiveerd"
@@ -1325,24 +1282,19 @@ msgstr "omhoog"
 #: admin/systems/services/ntp/class_goNtpServer.inc:115
 #: admin/systems/services/terminal/class_goTerminalServer.inc:165
 #: admin/systems/services/shares/class_goShareServer.inc:414
-#: admin/systems/services/syslog/class_goSyslogServer.inc:69
-#: admin/systems/services/syslog/class_goLogDBServer.inc:93
 msgid "Services"
 msgstr "Services"
 
 #: admin/systems/services/cups/class_goCupsServer.inc:77
-#: admin/systems/services/syslog/class_goLogDBServer.inc:101
 #, fuzzy
 msgid "Start"
 msgstr "Opstarten"
 
 #: admin/systems/services/cups/class_goCupsServer.inc:78
-#: admin/systems/services/syslog/class_goLogDBServer.inc:102
 msgid "Stop"
 msgstr "Stop"
 
 #: admin/systems/services/cups/class_goCupsServer.inc:79
-#: admin/systems/services/syslog/class_goLogDBServer.inc:103
 #, fuzzy
 msgid "Restart"
 msgstr "Opnieuw proberen"
@@ -1388,6 +1340,8 @@ msgid "LDAP service"
 msgstr "LDAP Service"
 
 #: admin/systems/services/ldap/goLdapServer.tpl:2
+#: admin/systems/services/ldap/class_goLdapServer.inc:79
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
 msgid "LDAP URI"
 msgstr ""
 
@@ -1395,6 +1349,24 @@ msgstr ""
 msgid "fill-in-your-servers-dns-name"
 msgstr ""
 
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
+#: admin/systems/services/nfs/servnfs.tpl:39
+#: admin/systems/goto/class_ArpNewDevice.inc:38
+#: admin/systems/goto/class_SelectDeviceType.inc:39
+#: addons/goto/class_target_list.inc:201
+#: addons/goto/events/class_EventTargetAddList.inc:238
+#: personal/environment/environment.tpl:135
+msgid "Server"
+msgstr "Server"
+
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
+#: admin/systems/goto/class_gotoLpdEnabled.inc:153
+#: admin/systems/goto/terminalService.tpl:58
+#: admin/systems/goto/workstationService.tpl:66
+#: admin/systems/goto/gotoLpdEnable.tpl:71
+msgid "Port"
+msgstr "Poort"
+
 #: admin/systems/services/ldap/class_goLdapServer.inc:128
 #: admin/systems/services/ldap/class_goLdapServer.inc:129
 msgid "Ldap"
@@ -1500,13 +1472,13 @@ msgid "Path"
 msgstr "Pad"
 
 #: admin/systems/services/shares/class_goShareServer.inc:428
-#: admin/systems/services/nfs/class_servNfs.inc:219
+#: admin/systems/services/nfs/class_servNfs.inc:215
 #: admin/systems/services/nfs/servnfs.tpl:121
 msgid "Option"
 msgstr "Optie"
 
 #: admin/systems/services/shares/class_goShareServer.inc:429
-#: admin/systems/services/nfs/class_servNfs.inc:215
+#: admin/systems/services/nfs/class_servNfs.inc:211
 #: admin/systems/services/nfs/servnfs.tpl:29
 msgid "Volume"
 msgstr "Volume"
@@ -1519,10 +1491,6 @@ msgstr ""
 msgid "'Path / Volume' must contain at least one '/'!"
 msgstr ""
 
-#: admin/systems/services/nfs/class_servNfs.inc:205
-msgid "Hidden shares must have a '$' at the end of the name!"
-msgstr ""
-
 #: admin/systems/services/nfs/servnfs.tpl:1
 msgid "Edit share"
 msgstr "Bewerk share"
@@ -1531,15 +1499,6 @@ msgstr "Bewerk share"
 msgid "NFS setup"
 msgstr "NFS instellingen"
 
-#: admin/systems/services/nfs/servnfs.tpl:39
-#: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_SelectDeviceType.inc:39
-#: addons/goto/class_target_list.inc:201
-#: addons/goto/events/class_EventTargetAddList.inc:238
-#: personal/environment/environment.tpl:135
-msgid "Server"
-msgstr "Server"
-
 #: admin/systems/services/nfs/servnfs.tpl:69
 msgid "Auto-mount share on Apple systems"
 msgstr "Auto-mount share op Apple systemen"
@@ -1548,60 +1507,6 @@ msgstr "Auto-mount share op Apple systemen"
 msgid "Codepage"
 msgstr "Karakterset"
 
-#: admin/systems/services/syslog/goSyslogServer.tpl:1
-msgid "Syslog Service"
-msgstr "Syslog Service"
-
-#: admin/systems/services/syslog/class_goSyslogServer.inc:68
-#: admin/systems/services/syslog/class_goSyslogServer.inc:69
-#, fuzzy
-msgid "Logging service"
-msgstr "Log DB gebruiker"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:31
-#: admin/systems/services/syslog/class_goLogDBServer.inc:59
-#, fuzzy
-msgid "Syslog service database"
-msgstr "Syslog Service"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:69
-#: admin/systems/goto/class_printGeneric.inc:976
-#: addons/goto/events/class_EventTargetAddUsersList.inc:171
-msgid "User"
-msgstr "Gebruiker"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:72
-#: admin/systems/services/syslog/class_goLogDBServer.inc:105
-#: admin/systems/services/syslog/goLogDBServer.tpl:20
-msgid "Password"
-msgstr "Wachtwoord"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:75
-#: admin/systems/services/syslog/class_goLogDBServer.inc:106
-#: admin/systems/services/syslog/goLogDBServer.tpl:4
-#, fuzzy
-msgid "Database"
-msgstr "Plakken"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:92
-#: admin/systems/services/syslog/class_goLogDBServer.inc:93
-msgid "Logging database"
-msgstr "Log database"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:104
-#, fuzzy
-msgid "Admin"
-msgstr "Beheerders"
-
-#: admin/systems/services/syslog/goLogDBServer.tpl:1
-#, fuzzy
-msgid "Logging database information"
-msgstr "Log database"
-
-#: admin/systems/services/syslog/goLogDBServer.tpl:12
-msgid "Logging DB user"
-msgstr "Log DB gebruiker"
-
 #: admin/systems/goto/workstation.tpl:1 admin/systems/goto/terminal.tpl:1
 msgid "Properties"
 msgstr "Eigenschappen"
@@ -1611,13 +1516,13 @@ msgid "Workstation template"
 msgstr "Werkstation sjabloon"
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:707
+#: admin/systems/goto/class_workstationGeneric.inc:708
 msgid "Workstation name"
 msgstr "Werkstation naam"
 
 #: admin/systems/goto/workstation.tpl:27
 #: admin/systems/goto/class_printGeneric.inc:1000
-#: admin/systems/goto/class_workstationGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:710
 msgid "Location"
 msgstr "Plaats"
 
@@ -1720,13 +1625,6 @@ msgstr "Toevoegen"
 msgid "bit/s"
 msgstr "bit"
 
-#: admin/systems/goto/class_gotoLpdEnabled.inc:153
-#: admin/systems/goto/terminalService.tpl:58
-#: admin/systems/goto/workstationService.tpl:66
-#: admin/systems/goto/gotoLpdEnable.tpl:71
-msgid "Port"
-msgstr "Poort"
-
 #: admin/systems/goto/ArpNewDevice.tpl:1
 msgid "Integrating unknown devices"
 msgstr ""
@@ -1868,13 +1766,13 @@ msgstr ""
 #: admin/systems/goto/class_printGeneric.inc:593
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:230
+#: admin/systems/goto/class_terminalGeneric.inc:232
 #, fuzzy
 msgid "terminal"
 msgstr "Terminal"
 
 #: admin/systems/goto/class_printGeneric.inc:595
-#: admin/systems/goto/class_workstationGeneric.inc:226
+#: admin/systems/goto/class_workstationGeneric.inc:227
 #: admin/systems/goto/class_workstationStartup.inc:285
 #, fuzzy
 msgid "workstation"
@@ -1897,6 +1795,11 @@ msgstr "Printer URL"
 msgid "Group"
 msgstr "Groep"
 
+#: admin/systems/goto/class_printGeneric.inc:976
+#: addons/goto/events/class_EventTargetAddUsersList.inc:171
+msgid "User"
+msgstr "Gebruiker"
+
 #: admin/systems/goto/class_printGeneric.inc:989
 #, fuzzy
 msgid "Print generic"
@@ -1923,6 +1826,13 @@ msgstr "Printer"
 msgid "Permissions"
 msgstr "Rechten"
 
+#: admin/systems/goto/class_printGeneric.inc:1019
+#: admin/systems/goto/class_printGeneric.inc:1041
+#: personal/environment/class_environment.inc:583
+#, fuzzy
+msgid "Permission error"
+msgstr "Rechten"
+
 #: admin/systems/goto/class_printGeneric.inc:1019
 #: admin/systems/goto/class_printGeneric.inc:1041
 #, fuzzy
@@ -2057,7 +1967,7 @@ msgid "System informations"
 msgstr "Systeem informatie"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:704
+#: admin/systems/goto/class_workstationGeneric.inc:705
 #: admin/systems/goto/class_SelectDeviceType.inc:39
 #: addons/goto/class_target_list.inc:203
 #: addons/goto/events/class_EventTargetAddList.inc:249
@@ -2066,8 +1976,8 @@ msgstr "Werkstation"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:39
-#: admin/systems/goto/class_terminalGeneric.inc:687
-#: admin/systems/goto/class_terminalGeneric.inc:693
+#: admin/systems/goto/class_terminalGeneric.inc:689
+#: admin/systems/goto/class_terminalGeneric.inc:695
 msgid "Terminal"
 msgstr "Terminal"
 
@@ -2169,13 +2079,13 @@ msgid "unknown"
 msgstr "onbekend"
 
 #: admin/systems/goto/class_terminalService.inc:703
-#: admin/systems/goto/class_workstationService.inc:498
+#: admin/systems/goto/class_workstationService.inc:502
 #, fuzzy
 msgid "Service"
 msgstr "Services"
 
 #: admin/systems/goto/class_terminalService.inc:713
-#: admin/systems/goto/class_workstationService.inc:507
+#: admin/systems/goto/class_workstationService.inc:511
 #, fuzzy
 msgid "Monitor"
 msgstr "Monitor grootte"
@@ -2191,19 +2101,19 @@ msgid "Remote desktop"
 msgstr "Remote desktop"
 
 #: admin/systems/goto/class_terminalService.inc:716
-#: admin/systems/goto/class_workstationService.inc:508
+#: admin/systems/goto/class_workstationService.inc:512
 #, fuzzy
 msgid "Gfx driver"
 msgstr "Nieuw stuurprogramma"
 
 #: admin/systems/goto/class_terminalService.inc:717
-#: admin/systems/goto/class_workstationService.inc:509
+#: admin/systems/goto/class_workstationService.inc:513
 #, fuzzy
 msgid "Gfx resolution"
 msgstr "Resolutie"
 
 #: admin/systems/goto/class_terminalService.inc:718
-#: admin/systems/goto/class_workstationService.inc:510
+#: admin/systems/goto/class_workstationService.inc:514
 #, fuzzy
 msgid "Gfx color depth"
 msgstr "Kleurdiepte"
@@ -2211,10 +2121,10 @@ msgstr "Kleurdiepte"
 #: admin/systems/goto/class_terminalService.inc:719
 #: admin/systems/goto/terminalService.tpl:150
 #: admin/systems/goto/workstationService.tpl:170
-#: admin/systems/goto/class_workstationService.inc:402
 #: admin/systems/goto/class_workstationService.inc:404
-#: admin/systems/goto/class_workstationService.inc:409
-#: admin/systems/goto/class_workstationService.inc:511
+#: admin/systems/goto/class_workstationService.inc:406
+#: admin/systems/goto/class_workstationService.inc:412
+#: admin/systems/goto/class_workstationService.inc:515
 msgid "HSync"
 msgstr "HSync"
 
@@ -2223,8 +2133,8 @@ msgstr "HSync"
 #: admin/systems/goto/workstationService.tpl:181
 #: admin/systems/goto/class_workstationService.inc:385
 #: admin/systems/goto/class_workstationService.inc:387
-#: admin/systems/goto/class_workstationService.inc:392
-#: admin/systems/goto/class_workstationService.inc:512
+#: admin/systems/goto/class_workstationService.inc:393
+#: admin/systems/goto/class_workstationService.inc:516
 msgid "VSync"
 msgstr "VSync"
 
@@ -2233,7 +2143,7 @@ msgid "Auto-Sync"
 msgstr ""
 
 #: admin/systems/goto/class_terminalService.inc:722
-#: admin/systems/goto/class_workstationService.inc:514
+#: admin/systems/goto/class_workstationService.inc:518
 #, fuzzy
 msgid "Scanner enabled"
 msgstr "gedeactiveerd"
@@ -2245,31 +2155,31 @@ msgid "Printer enabled"
 msgstr "Printernaam"
 
 #: admin/systems/goto/class_terminalService.inc:724
-#: admin/systems/goto/class_workstationService.inc:515
+#: admin/systems/goto/class_workstationService.inc:519
 #, fuzzy
 msgid "Keyboard model"
 msgstr "Kies toetsenbord model"
 
 #: admin/systems/goto/class_terminalService.inc:725
-#: admin/systems/goto/class_workstationService.inc:516
+#: admin/systems/goto/class_workstationService.inc:520
 #, fuzzy
 msgid "Keyboard layout"
 msgstr "Kies toetsenbord indeling"
 
 #: admin/systems/goto/class_terminalService.inc:726
-#: admin/systems/goto/class_workstationService.inc:517
+#: admin/systems/goto/class_workstationService.inc:521
 #, fuzzy
 msgid "Keyboard variant"
 msgstr "Kies toetsenbord variant"
 
 #: admin/systems/goto/class_terminalService.inc:727
-#: admin/systems/goto/class_workstationService.inc:518
+#: admin/systems/goto/class_workstationService.inc:522
 #, fuzzy
 msgid "Mouse type"
 msgstr "MIME-type"
 
 #: admin/systems/goto/class_terminalService.inc:728
-#: admin/systems/goto/class_workstationService.inc:519
+#: admin/systems/goto/class_workstationService.inc:523
 #, fuzzy
 msgid "Mouse port"
 msgstr "Koppelpunt"
@@ -2277,7 +2187,7 @@ msgstr "Koppelpunt"
 #: admin/systems/goto/class_terminalService.inc:730
 #: admin/systems/goto/terminalService.tpl:76
 #: admin/systems/goto/workstationService.tpl:86
-#: admin/systems/goto/class_workstationService.inc:520
+#: admin/systems/goto/class_workstationService.inc:524
 msgid "Telephone hardware"
 msgstr "Telefoon hardware"
 
@@ -2374,57 +2284,57 @@ msgstr "Audio service"
 msgid "GUI"
 msgstr "GUI"
 
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_workstationGeneric.inc:309
+#: admin/systems/goto/class_workstationGeneric.inc:300
+#: admin/systems/goto/class_workstationGeneric.inc:310
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
 #, fuzzy
 msgid "Software update"
 msgstr "Onmiddelijk bijwerken"
 
-#: admin/systems/goto/class_workstationGeneric.inc:303
-#: admin/systems/goto/class_workstationGeneric.inc:311
+#: admin/systems/goto/class_workstationGeneric.inc:304
+#: admin/systems/goto/class_workstationGeneric.inc:312
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:307
-#: admin/systems/goto/class_terminalGeneric.inc:271
+#: admin/systems/goto/class_workstationGeneric.inc:308
+#: admin/systems/goto/class_terminalGeneric.inc:273
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr "Aanzetten"
 
-#: admin/systems/goto/class_workstationGeneric.inc:500
+#: admin/systems/goto/class_workstationGeneric.inc:501
 msgid "A valid LDAP server assignement is missing!"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:510
+#: admin/systems/goto/class_workstationGeneric.inc:511
 #, fuzzy
 msgid "Software deployment"
 msgstr "Systeemtype"
 
-#: admin/systems/goto/class_workstationGeneric.inc:511
+#: admin/systems/goto/class_workstationGeneric.inc:512
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:699
+#: admin/systems/goto/class_workstationGeneric.inc:700
 #, fuzzy
 msgid "Workstation generic"
 msgstr "Werkstation naam"
 
-#: admin/systems/goto/class_workstationGeneric.inc:711
+#: admin/systems/goto/class_workstationGeneric.inc:712
 #, fuzzy
 msgid "Goto mode"
 msgstr "naar map"
 
-#: admin/systems/goto/class_workstationGeneric.inc:714
-#: admin/systems/goto/class_terminalGeneric.inc:707
+#: admin/systems/goto/class_workstationGeneric.inc:715
+#: admin/systems/goto/class_terminalGeneric.inc:709
 #, fuzzy
 msgid "Root password"
 msgstr "Wachtwoord instellen"
 
-#: admin/systems/goto/class_workstationGeneric.inc:715
+#: admin/systems/goto/class_workstationGeneric.inc:716
 #, fuzzy
 msgid "Create FAI CD"
 msgstr "Aanmaken"
@@ -2698,12 +2608,12 @@ msgstr ""
 msgid "Create ISO-Image"
 msgstr "Aanmaken"
 
-#: admin/systems/goto/class_workstationService.inc:499
+#: admin/systems/goto/class_workstationService.inc:503
 #, fuzzy
 msgid "Workstation service"
 msgstr "Werkstation naam"
 
-#: admin/systems/goto/class_workstationService.inc:513
+#: admin/systems/goto/class_workstationService.inc:517
 #, fuzzy
 msgid "Use DDC"
 msgstr "Gebruikers ID"
@@ -2818,17 +2728,17 @@ msgstr "Toegekende FAI klasses"
 msgid "set"
 msgstr "stel in"
 
-#: admin/systems/goto/class_terminalGeneric.inc:688
+#: admin/systems/goto/class_terminalGeneric.inc:690
 #, fuzzy
 msgid "Terminal generic"
 msgstr "Terminal Service"
 
-#: admin/systems/goto/class_terminalGeneric.inc:701
+#: admin/systems/goto/class_terminalGeneric.inc:703
 #, fuzzy
 msgid "Syslog server enabled"
 msgstr "Syslog server"
 
-#: admin/systems/goto/class_terminalGeneric.inc:706
+#: admin/systems/goto/class_terminalGeneric.inc:708
 #, fuzzy
 msgid "Ntp server settings"
 msgstr "Gebruikersinstellingen"
@@ -3347,6 +3257,11 @@ msgstr "Systeem status"
 msgid "System deployment status"
 msgstr "Systeemtype"
 
+#: addons/goto/class_gotomasses.inc:230
+#, fuzzy
+msgid "Permission"
+msgstr "Rechten"
+
 #: addons/goto/class_gotomasses.inc:270
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
@@ -3884,6 +3799,10 @@ msgstr ""
 msgid "Environment"
 msgstr "Omgeving"
 
+#: personal/environment/class_environment.inc:10
+msgid "This does something"
+msgstr "Dit doet iets"
+
 #: personal/environment/class_environment.inc:139
 #, fuzzy, php-format
 msgid "Device '%s' is not available anymore. It will be removed!"
@@ -4194,10 +4113,91 @@ msgstr "Selecteer toe te voegen hotplug apparaat"
 msgid "Choose the department the search will be based    on"
 msgstr "Selecteer de afdeling waarbinnen gezocht zal    worden"
 
+#: personal/environment/hotplugDialog.tpl:43
+msgid "Display users matching"
+msgstr "Toon overeenkomende gebruikers"
+
 #: personal/environment/hotplugDialog.tpl:48
 msgid "Regular expression for        matching hotplugs"
 msgstr "Reguliere expressie voor      overeenkomende hotplugs"
 
+#, fuzzy
+#~ msgid ""
+#~ "This may be used by several users/groups. Please double check if your "
+#~ "really want to do this since there is no way for GOsa to get your data "
+#~ "back."
+#~ msgstr ""
+#~ "Dit kan gebruikt worden door meerdere groepen. Verzeker uzelf ervan dat "
+#~ "dit is wat u wil, aangezien er geen mogelijkheid voor GOsa is om uw date "
+#~ "terug te halen."
+
+#, fuzzy
+#~ msgid "Manage hotplug devices"
+#~ msgstr "Hotplug apparaten toevoegen"
+
+#, fuzzy
+#~ msgid "device"
+#~ msgstr "Apparaat"
+
+#~ 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 ""
+#~ "Dit kan gebruikt worden door meerdere groepen. Verzeker uzelf ervan dat "
+#~ "dit is wat u wil, aangezien er geen mogelijkheid voor GOsa is om uw date "
+#~ "terug te halen."
+
+#~ msgid "This table displays all applications in the selected tree."
+#~ msgstr "Deze tabel toont alle programma's in de geselecteerde tree."
+
+#, fuzzy
+#~ msgid "Number of listed applications"
+#~ msgstr "Gebruikte programma's"
+
+#, fuzzy
+#~ msgid "Display mime types matching"
+#~ msgstr "Toon de overeenkomende cartridgetypes"
+
+#, fuzzy
+#~ msgid "Number of listed mimetypes"
+#~ msgstr "Lijst met voorgedefiniëerde blokkeerlijstn"
+
+#, fuzzy
+#~ msgid "Mimetype management"
+#~ msgstr "Systeembeheer"
+
+#~ msgid "Syslog Service"
+#~ msgstr "Syslog Service"
+
+#, fuzzy
+#~ msgid "Logging service"
+#~ msgstr "Log DB gebruiker"
+
+#, fuzzy
+#~ msgid "Syslog service database"
+#~ msgstr "Syslog Service"
+
+#~ msgid "Password"
+#~ msgstr "Wachtwoord"
+
+#, fuzzy
+#~ msgid "Database"
+#~ msgstr "Plakken"
+
+#~ msgid "Logging database"
+#~ msgstr "Log database"
+
+#, fuzzy
+#~ msgid "Admin"
+#~ msgstr "Beheerders"
+
+#, fuzzy
+#~ msgid "Logging database information"
+#~ msgstr "Log database"
+
+#~ msgid "Logging DB user"
+#~ msgstr "Log DB gebruiker"
+
 #, fuzzy
 #~ msgid "Vendor ID"
 #~ msgstr "Afzender ID"
@@ -6934,13 +6934,6 @@ msgstr "Reguliere expressie voor      overeenkomende hotplugs"
 #~ msgid "Windows Install"
 #~ msgstr "Windows werkstation"
 
-#~ msgid ""
-#~ "Please double check if you really want to do this since there is no way "
-#~ "for GOsa to get your data back."
-#~ msgstr ""
-#~ "Controleer a.u.b. of u dit daadwerkelijk wil doen, aangezien er geen "
-#~ "mogelijkheid voor GOsa is om uw data terug te krijgen."
-
 #, fuzzy
 #~ msgid "Please enter the new object group name"
 #~ msgstr "Geef a.u.b. een nieuwe naam op"
diff --git a/gosa-plugins/goto/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/goto/locale/pl/LC_MESSAGES/messages.po
index a0c140622..83d67bee7 100644
--- a/gosa-plugins/goto/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/goto/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:52+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -40,15 +40,15 @@ msgstr ""
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
 #: admin/mimetypes/class_mimetypeGeneric.inc:715
 #: admin/systems/goto/class_printGeneric.inc:988
-#: admin/systems/goto/class_workstationGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:699
 msgid "Generic"
 msgstr "Ogólne"
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
 #: admin/systems/goto/workstation.tpl:95
-#: admin/systems/goto/class_workstationGeneric.inc:489
-#: admin/systems/goto/class_terminalGeneric.inc:480
+#: admin/systems/goto/class_workstationGeneric.inc:490
+#: admin/systems/goto/class_terminalGeneric.inc:482
 #: admin/systems/goto/terminal.tpl:84
 msgid "NTP server"
 msgstr "Serwer NTP"
@@ -61,7 +61,7 @@ msgstr "Proszę wybrać serwer do synchronizacji czasu"
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
 #: admin/systems/goto/workstation.tpl:55
-#: admin/systems/goto/class_terminalGeneric.inc:700
+#: admin/systems/goto/class_terminalGeneric.inc:702
 #: admin/systems/goto/terminal.tpl:47
 msgid "Mode"
 msgstr "Tryb"
@@ -73,10 +73,8 @@ msgstr "Proszę wybrać tryb terminala"
 
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
-#: admin/systems/services/syslog/class_goSyslogServer.inc:27
-#: admin/systems/services/syslog/class_goSyslogServer.inc:47
 #: admin/systems/goto/workstation.tpl:65
-#: admin/systems/goto/class_workstationGeneric.inc:712
+#: admin/systems/goto/class_workstationGeneric.inc:713
 #: admin/systems/goto/terminal.tpl:57
 msgid "Syslog server"
 msgstr "Serwer Syslog"
@@ -88,7 +86,7 @@ msgstr "Proszę wybrać serwer do logowania"
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:703
+#: admin/systems/goto/class_terminalGeneric.inc:705
 #: admin/systems/goto/terminal.tpl:117
 msgid "Root server"
 msgstr "Serwer NFS"
@@ -99,7 +97,7 @@ msgstr "Proszę wybrać główny system plików NFS"
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:704
+#: admin/systems/goto/class_terminalGeneric.inc:706
 #: admin/systems/goto/terminal.tpl:131
 msgid "Swap server"
 msgstr "Serwer Swap"
@@ -133,20 +131,20 @@ msgid "Execute"
 msgstr "Uruchom"
 
 #: admin/ogroups/goto/class_termgroup.inc:51
-#: admin/systems/goto/class_workstationGeneric.inc:138
-#: admin/systems/goto/class_terminalGeneric.inc:122
+#: admin/systems/goto/class_workstationGeneric.inc:139
+#: admin/systems/goto/class_terminalGeneric.inc:124
 msgid "Activated"
 msgstr "Aktywne"
 
 #: admin/ogroups/goto/class_termgroup.inc:52
-#: admin/systems/goto/class_workstationGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:121
+#: admin/systems/goto/class_workstationGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:123
 #: addons/goto/class_gotomasses.inc:542
 msgid "Locked"
 msgstr "Zablokowane"
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:281
+#: admin/systems/goto/class_terminalGeneric.inc:283
 #, fuzzy
 msgid "Local swap"
 msgstr "Nazwa lokalizacji"
@@ -165,7 +163,7 @@ msgstr "Nazwa lokalizacji"
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:154
+#: admin/systems/goto/class_workstationGeneric.inc:155
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -183,22 +181,22 @@ msgstr "Nazwa lokalizacji"
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:137
-#: admin/systems/goto/class_terminalGeneric.inc:287
-#: admin/systems/goto/class_terminalGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:139
+#: admin/systems/goto/class_terminalGeneric.inc:289
+#: admin/systems/goto/class_terminalGeneric.inc:301
 msgid "inherited"
 msgstr "odziedziczony"
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:635
+#: admin/systems/goto/class_workstationGeneric.inc:213
+#: admin/systems/goto/class_workstationGeneric.inc:636
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
-#: admin/systems/goto/class_workstationService.inc:568
-#: admin/systems/goto/class_terminalGeneric.inc:187
-#: admin/systems/goto/class_terminalGeneric.inc:625
+#: admin/systems/goto/class_workstationService.inc:572
+#: admin/systems/goto/class_terminalGeneric.inc:189
+#: admin/systems/goto/class_terminalGeneric.inc:627
 #: addons/goto/class_gotomasses.inc:328
 #: addons/goto/class_goto_import_file.inc:124
 #, fuzzy
@@ -206,30 +204,30 @@ msgid "Service infrastructure"
 msgstr "Szukaj wewnątrz tego poddrzewa"
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:216
-#: admin/systems/goto/class_terminalGeneric.inc:191
+#: admin/systems/goto/class_workstationGeneric.inc:217
+#: admin/systems/goto/class_terminalGeneric.inc:193
 #, fuzzy
 msgid "Event error"
 msgstr "Błąd"
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:217
-#: admin/systems/goto/class_terminalGeneric.inc:192
+#: admin/systems/goto/class_workstationGeneric.inc:218
+#: admin/systems/goto/class_terminalGeneric.inc:194
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "Brak uprawnień do zmiay hasła"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:298
-#: admin/systems/goto/class_terminalGeneric.inc:265
+#: admin/systems/goto/class_workstationGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:267
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
 msgid "Switch off"
 msgstr "Wyłącz"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:298
-#: admin/systems/goto/class_terminalGeneric.inc:266
+#: admin/systems/goto/class_workstationGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:268
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
 msgid "Reboot"
@@ -249,15 +247,15 @@ msgid "Wake"
 msgstr "Zbudź"
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:300
-#: admin/systems/goto/class_workstationGeneric.inc:308
+#: admin/systems/goto/class_workstationGeneric.inc:301
+#: admin/systems/goto/class_workstationGeneric.inc:309
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
 msgid "Reinstall"
 msgstr "Przeinstaluj"
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:301
+#: admin/systems/goto/class_workstationGeneric.inc:302
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 msgid "Rescan hardware"
@@ -302,13 +300,13 @@ msgstr "Analiza systemu"
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:364
-#: admin/systems/goto/class_workstationGeneric.inc:596
-#: admin/systems/goto/class_workstationGeneric.inc:613
+#: admin/systems/goto/class_workstationGeneric.inc:365
+#: admin/systems/goto/class_workstationGeneric.inc:597
+#: admin/systems/goto/class_workstationGeneric.inc:614
 #: admin/systems/goto/class_workstationStartup.inc:889
-#: admin/systems/goto/class_workstationService.inc:456
-#: admin/systems/goto/class_terminalGeneric.inc:353
-#: admin/systems/goto/class_terminalGeneric.inc:611
+#: admin/systems/goto/class_workstationService.inc:460
+#: admin/systems/goto/class_terminalGeneric.inc:355
+#: admin/systems/goto/class_terminalGeneric.inc:613
 #: personal/environment/class_environment.inc:1058
 #: personal/environment/class_environment.inc:1315
 #, fuzzy
@@ -324,13 +322,13 @@ msgid "System group"
 msgstr "Grupa systemowa"
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:716
-#: admin/systems/goto/class_terminalGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:717
+#: admin/systems/goto/class_terminalGeneric.inc:711
 msgid "Action flag"
 msgstr "Flaga akcji"
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:713
+#: admin/systems/goto/class_workstationGeneric.inc:714
 msgid "Ntp server"
 msgstr "Serwer NTP"
 
@@ -375,34 +373,38 @@ msgstr "ustaw"
 msgid "Application settings"
 msgstr "Ustawienia Aplikacji"
 
-#: admin/groups/apps/edit_entry.tpl:43
+#: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
 #: admin/devices/class_deviceGeneric.inc:90
 #: admin/devices/class_deviceGeneric.inc:114
 #: admin/devices/class_deviceGeneric.inc:260
 #: admin/applications/class_applicationParameters.inc:190
+#: admin/applications/application-list.xml:41
+#: admin/applications/application-list-release.xml:41
 #: admin/applications/class_applicationGeneric.inc:430
 #: admin/applications/class_applicationGeneric.inc:434
 #: admin/applications/class_applicationGeneric.inc:606
 #: admin/applications/class_applicationGeneric.inc:610
+#: admin/mimetypes/mimetype-list-release.xml:41
+#: admin/mimetypes/mimetype-list.xml:41
 #: admin/mimetypes/class_mimetypeGeneric.inc:532
 #: admin/mimetypes/class_mimetypeGeneric.inc:724
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
-#: admin/systems/services/nfs/class_servNfs.inc:239
+#: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
 #: admin/systems/goto/class_printGeneric.inc:733
 #: admin/systems/goto/class_printGeneric.inc:738
 #: admin/systems/goto/class_printGeneric.inc:757
 #: admin/systems/goto/class_printGeneric.inc:997
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:456
-#: admin/systems/goto/class_workstationGeneric.inc:461
-#: admin/systems/goto/class_workstationGeneric.inc:479
-#: admin/systems/goto/class_terminalGeneric.inc:446
-#: admin/systems/goto/class_terminalGeneric.inc:451
-#: admin/systems/goto/class_terminalGeneric.inc:470
-#: admin/systems/goto/class_terminalGeneric.inc:696
+#: admin/systems/goto/class_workstationGeneric.inc:457
+#: admin/systems/goto/class_workstationGeneric.inc:462
+#: admin/systems/goto/class_workstationGeneric.inc:480
+#: admin/systems/goto/class_terminalGeneric.inc:448
+#: admin/systems/goto/class_terminalGeneric.inc:453
+#: admin/systems/goto/class_terminalGeneric.inc:472
+#: admin/systems/goto/class_terminalGeneric.inc:698
 #: personal/environment/class_logonManagementDialog.inc:103
 msgid "Name"
 msgstr "Imię"
@@ -431,8 +433,6 @@ msgid "department"
 msgstr "departament"
 
 #: admin/groups/apps/class_groupApplication.inc:481
-#: admin/applications/class_applicationManagement.inc:368
-#: admin/applications/class_applicationManagement.inc:449
 #: admin/applications/class_applicationGeneric.inc:127
 msgid "application"
 msgstr "aplikacja"
@@ -443,7 +443,7 @@ msgid "Not available in release."
 msgstr "Dostępni członkowie"
 
 #: admin/groups/apps/class_groupApplication.inc:1373
-#: admin/applications/class_applicationManagement.inc:24
+#: admin/applications/class_applicationManagement.inc:25
 #: admin/mimetypes/generic.tpl:117 admin/mimetypes/generic.tpl:177
 msgid "Applications"
 msgstr "Aplikacje"
@@ -453,8 +453,10 @@ msgid "Group applications"
 msgstr "Grupa aplikacje"
 
 #: admin/groups/apps/class_groupApplication.inc:1381
-#: admin/applications/class_divListApplication.inc:114
-#: admin/applications/class_divListApplication.inc:150
+#: admin/applications/application-list.xml:15
+#: admin/applications/application-list.xml:74
+#: admin/applications/application-list-release.xml:15
+#: admin/applications/application-list-release.xml:74
 #: admin/applications/class_applicationGeneric.inc:603
 #: admin/mimetypes/class_mimetypeGeneric.inc:728
 msgid "Application"
@@ -462,6 +464,8 @@ msgstr "Aplikacja"
 
 #: admin/groups/apps/class_groupApplication.inc:1382
 #: admin/groups/apps/app_list.tpl:5 admin/groups/apps/app_list.tpl:53
+#: admin/applications/application-filter-release.tpl:14
+#: admin/mimetypes/mimetype-filter-release.tpl:14
 #: admin/systems/goto/workstationStartup.tpl:83
 #: admin/systems/goto/workstationStartup.tpl:123
 msgid "Release"
@@ -503,10 +507,12 @@ msgstr "Przesuń w dół"
 
 #: admin/groups/apps/app_list.tpl:86 admin/groups/apps/app_list.tpl:107
 #: admin/groups/apps/app_list.tpl:132
-#: admin/devices/class_divListDevices.inc:100
+#: admin/devices/class_divListDevices.inc:100 admin/devices/device-list.xml:86
 #: admin/applications/class_applicationParameters.inc:122
-#: admin/applications/class_divListApplication.inc:120
-#: admin/mimetypes/class_divListMimeTypes.inc:122
+#: admin/applications/application-list.xml:86
+#: admin/applications/application-list-release.xml:86
+#: admin/mimetypes/mimetype-list-release.xml:86
+#: admin/mimetypes/mimetype-list.xml:86
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
@@ -557,8 +563,6 @@ msgid "List of defined devices"
 msgstr "Lista urządzeń"
 
 #: admin/devices/class_divListDevices.inc:45
-#: admin/applications/class_divListApplication.inc:45
-#: admin/mimetypes/class_divListMimeTypes.inc:45
 #, fuzzy
 msgid "Select all"
 msgstr "Wybierz"
@@ -569,18 +573,15 @@ msgid "Device name"
 msgstr "Nazwa urządzenia"
 
 #: admin/devices/class_divListDevices.inc:51
-#: admin/applications/class_divListApplication.inc:51
-#: admin/mimetypes/class_divListMimeTypes.inc:51
 msgid "Department"
 msgstr "Departament"
 
 #: admin/devices/class_divListDevices.inc:52
-#: admin/devices/class_divListDevices.inc:87
-#: admin/applications/class_divListApplication.inc:52
-#: admin/applications/class_divListApplication.inc:107
-#: admin/mimetypes/class_divListMimeTypes.inc:52
-#: admin/mimetypes/class_divListMimeTypes.inc:109
-#: addons/goto/class_gotomasses.inc:365
+#: admin/devices/class_divListDevices.inc:87 admin/devices/device-list.xml:57
+#: admin/applications/application-list.xml:57
+#: admin/applications/application-list-release.xml:57
+#: admin/mimetypes/mimetype-list-release.xml:57
+#: admin/mimetypes/mimetype-list.xml:57 addons/goto/class_gotomasses.inc:365
 msgid "Actions"
 msgstr "Akcje"
 
@@ -589,18 +590,17 @@ msgid "Display devices matching"
 msgstr "Wyświetl pasujące urządzenia"
 
 #: admin/devices/class_divListDevices.inc:82 admin/devices/deviceGeneric.tpl:9
-#: admin/devices/class_deviceGeneric.inc:261 admin/applications/generic.tpl:42
-#: admin/applications/class_divListApplication.inc:90
+#: admin/devices/class_deviceGeneric.inc:261 admin/devices/device-list.tpl:13
+#: admin/applications/generic.tpl:42
 #: admin/applications/class_applicationGeneric.inc:607
-#: admin/mimetypes/generic.tpl:44
-#: admin/mimetypes/class_divListMimeTypes.inc:93
+#: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
+#: admin/mimetypes/mimetype-list.tpl:13
 #: admin/mimetypes/class_mimetypeGeneric.inc:727
-#: admin/systems/services/ldap/class_goLdapServer.inc:79
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
 #: admin/systems/goto/class_printGeneric.inc:998
-#: admin/systems/goto/class_workstationGeneric.inc:710
-#: admin/systems/goto/class_terminalGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:711
+#: admin/systems/goto/class_terminalGeneric.inc:700
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/class_target_list.inc:152 addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/class_EventTargetAddList.inc:161
@@ -609,60 +609,51 @@ msgid "Base"
 msgstr "Kontener"
 
 #: admin/devices/class_divListDevices.inc:84
-#: admin/applications/class_divListApplication.inc:92
-#: admin/mimetypes/class_divListMimeTypes.inc:95
 #: addons/goto/class_target_list.inc:154
 #: addons/goto/events/class_EventTargetAddList.inc:163
 #: addons/goto/events/class_EventTargetAddUsersList.inc:132
 msgid "Submit department"
 msgstr "Zatwierdź departament"
 
-#: admin/devices/class_divListDevices.inc:84
-#: admin/applications/class_divListApplication.inc:92
-#: admin/mimetypes/class_divListMimeTypes.inc:95
-#: addons/goto/class_target_list.inc:154
+#: admin/devices/class_divListDevices.inc:84 admin/devices/device-list.tpl:13
+#: admin/applications/application-list.tpl:13
+#: admin/mimetypes/mimetype-list.tpl:13 addons/goto/class_target_list.inc:154
 #: addons/goto/events/class_EventTargetAddList.inc:163
 #: addons/goto/events/class_EventTargetAddUsersList.inc:132
 msgid "Submit"
 msgstr "Wyślij"
 
-#: admin/devices/class_divListDevices.inc:92
-#: admin/applications/class_divListApplication.inc:111
-#: admin/mimetypes/class_divListMimeTypes.inc:114
-#: admin/systems/goto/chooser.tpl:16 addons/goto/class_gotomasses.inc:366
+#: admin/devices/class_divListDevices.inc:92 admin/devices/device-list.xml:68
+#: admin/applications/application-list.xml:68
+#: admin/applications/application-list-release.xml:68
+#: admin/mimetypes/mimetype-list-release.xml:68
+#: admin/mimetypes/mimetype-list.xml:68 admin/systems/goto/chooser.tpl:16
+#: addons/goto/class_gotomasses.inc:366
 msgid "Create"
 msgstr "Utwórz"
 
 #: admin/devices/class_divListDevices.inc:94
-#: admin/devices/class_divListDevices.inc:131
-#: admin/devices/class_deviceGeneric.inc:159
+#: admin/devices/class_divListDevices.inc:131 admin/devices/device-list.xml:15
+#: admin/devices/device-list.xml:74 admin/devices/class_deviceGeneric.inc:159
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 msgid "Device"
 msgstr "Urządzenie"
 
 #: admin/devices/class_divListDevices.inc:156
-#: admin/applications/class_divListApplication.inc:186
-#: admin/mimetypes/class_divListMimeTypes.inc:186
 msgid "edit"
 msgstr "edytuj"
 
 #: admin/devices/class_divListDevices.inc:156
-#: admin/applications/class_divListApplication.inc:186
-#: admin/mimetypes/class_divListMimeTypes.inc:186
 msgid "Edit this entry"
 msgstr "Edytuj ten obiekt"
 
 #: admin/devices/class_divListDevices.inc:163
-#: admin/applications/class_divListApplication.inc:202
-#: admin/mimetypes/class_divListMimeTypes.inc:201
 #: admin/systems/ppd/class_printerPPDSelectionDialog.inc:140
 msgid "delete"
 msgstr "Usuń"
 
 #: admin/devices/class_divListDevices.inc:163
-#: admin/applications/class_divListApplication.inc:202
-#: admin/mimetypes/class_divListMimeTypes.inc:201
 msgid "Delete this entry"
 msgstr "Usuń ten obiekt"
 
@@ -672,46 +663,47 @@ msgid "Number of listed devices"
 msgstr "Nazwa departamentu"
 
 #: admin/devices/class_divListDevices.inc:206
-#: admin/applications/class_divListApplication.inc:243
-#: admin/mimetypes/class_divListMimeTypes.inc:244
 #, fuzzy
 msgid "Number of listed departments"
 msgstr "Nazwa departamentu"
 
-#: admin/devices/remove.tpl:6
-#, fuzzy
+#: admin/devices/remove.tpl:6 admin/applications/remove.tpl:6
+#: admin/mimetypes/remove.tpl:6
 msgid ""
-"This may be used by several users/groups. Please double check if your really "
-"want to do this since there is no way for GOsa to get your data back."
-msgstr ""
-"To może być używane przez kilka grup. Proszę upewnić się czy kontynuować, "
-"gdyż nie ma operacji powrotu."
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr "Proszę upewnić się czy kontynuować, gdyż nie ma możliwości powrotu."
 
-#: admin/devices/remove.tpl:9 admin/applications/remove.tpl:9
-#: admin/mimetypes/remove.tpl:9 addons/goto/remove.tpl:9
+#: admin/devices/remove.tpl:10 admin/applications/remove.tpl:10
+#: admin/mimetypes/remove.tpl:10 addons/goto/remove.tpl:9
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 "Jeśli jesteś pewien - naciśnij 'Usuń' aby kontynuować lub 'Anuluj' aby "
 "anulować."
 
-#: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:257
-msgid "Devices"
-msgstr "Urządzenia"
+#: admin/devices/device-list.xml:11
+#, fuzzy
+msgid "List of devices"
+msgstr "Lista urządzeń"
 
-#: admin/devices/deviceGeneric.tpl:29 admin/devices/class_deviceGeneric.inc:93
+#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:29
+#: admin/devices/class_deviceGeneric.inc:93
 #: admin/devices/class_deviceGeneric.inc:262 admin/applications/generic.tpl:33
+#: admin/applications/application-list.xml:49
+#: admin/applications/application-list-release.xml:49
 #: admin/applications/class_applicationGeneric.inc:608
 #: admin/mimetypes/generic.tpl:34 admin/mimetypes/paste_generic.tpl:21
+#: admin/mimetypes/mimetype-list-release.xml:49
+#: admin/mimetypes/mimetype-list.xml:49
 #: admin/mimetypes/class_mimetypeGeneric.inc:726
 #: admin/systems/services/shares/class_goShareServer.inc:424
-#: admin/systems/services/nfs/class_servNfs.inc:211
+#: admin/systems/services/nfs/class_servNfs.inc:207
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
 #: admin/systems/goto/class_printGeneric.inc:999
-#: admin/systems/goto/class_workstationGeneric.inc:708
-#: admin/systems/goto/class_terminalGeneric.inc:697
+#: admin/systems/goto/class_workstationGeneric.inc:709
+#: admin/systems/goto/class_terminalGeneric.inc:699
 #: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
 #: addons/goto/class_gotomasses.inc:932
 #: personal/environment/class_logonManagementDialog.inc:111
@@ -719,6 +711,21 @@ msgstr "Urządzenia"
 msgid "Description"
 msgstr "Opis"
 
+#: admin/devices/device-list.xml:118
+#, fuzzy
+msgid "Edit device"
+msgstr "Karta dźwiękowa"
+
+#: admin/devices/device-list.xml:131
+#, fuzzy
+msgid "Remove device"
+msgstr "Usuń obrazek"
+
+#: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
+#: admin/devices/class_deviceGeneric.inc:257
+msgid "Devices"
+msgstr "Urządzenia"
+
 #: admin/devices/deviceGeneric.tpl:38
 #, fuzzy
 msgid "Device type"
@@ -760,10 +767,14 @@ msgstr "ID Produktu"
 msgid "(idProduct)"
 msgstr "ID Produktu"
 
-#: admin/devices/main.inc:49 admin/devices/main.inc:51
+#: admin/devices/device-filter.tpl:3
+#: admin/applications/application-filter.tpl:3
+#: admin/applications/application-filter-release.tpl:3
+#: admin/mimetypes/mimetype-filter-release.tpl:3
+#: admin/mimetypes/mimetype-filter.tpl:3
 #, fuzzy
-msgid "Hotplug device management"
-msgstr "Zarządzanie Hotplug"
+msgid "Filter"
+msgstr "Filtry"
 
 #: admin/devices/class_deviceGeneric.inc:29
 msgid "Digital camera"
@@ -866,54 +877,22 @@ msgstr "ID Dostawcy"
 msgid "Device ID"
 msgstr "Urządzenie"
 
-#: admin/devices/class_deviceManagement.inc:7
+#: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:82
+#: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:84
+#: admin/mimetypes/mimetype-list.tpl:13
+msgid "Update"
+msgstr "Aktualizuj"
+
+#: admin/devices/class_deviceManagement.inc:25
 #: personal/environment/class_environment.inc:1783
 #: personal/environment/environment.tpl:293
 msgid "Hotplug devices"
 msgstr "Urządzenia Hotplug"
 
-#: admin/devices/class_deviceManagement.inc:8
+#: admin/devices/class_deviceManagement.inc:26
 #, fuzzy
-msgid "Manage hotplug devices"
-msgstr "Dodaj urządzenia hotplug"
-
-#: admin/devices/class_deviceManagement.inc:246
-#: admin/applications/class_applicationManagement.inc:352
-#: admin/mimetypes/class_mimetypeManagement.inc:360
-#: addons/goto/class_gotomasses.inc:230
-#, fuzzy
-msgid "Permission"
-msgstr "Uprawnienia"
-
-#: admin/devices/class_deviceManagement.inc:263
-#: admin/devices/class_deviceManagement.inc:345
-#, fuzzy
-msgid "device"
-msgstr "Urządzenie"
-
-#: admin/devices/class_deviceManagement.inc:296
-#: admin/devices/class_deviceManagement.inc:352
-#: admin/devices/class_deviceManagement.inc:381
-#: admin/applications/class_applicationManagement.inc:401
-#: admin/applications/class_applicationManagement.inc:456
-#: admin/applications/class_applicationManagement.inc:487
-#: admin/mimetypes/class_mimetypeManagement.inc:412
-#: admin/mimetypes/class_mimetypeManagement.inc:466
-#: admin/mimetypes/class_mimetypeManagement.inc:496
-#: admin/systems/goto/class_printGeneric.inc:1019
-#: admin/systems/goto/class_printGeneric.inc:1041
-#: personal/environment/class_environment.inc:583
-#, fuzzy
-msgid "Permission error"
-msgstr "Uprawnienia"
-
-#: admin/applications/remove.tpl:6 admin/mimetypes/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 ""
-"To może być używane przez kilka grup. Proszę upewnić się czy kontynuować, "
-"gdyż nie ma operacji powrotu."
+msgid "Hotplug device management"
+msgstr "Zarządzanie Hotplug"
 
 #: admin/applications/release_select.tpl:2
 #: admin/mimetypes/release_select.tpl:2
@@ -966,7 +945,6 @@ msgid "Application parameter settings"
 msgstr "Parametr aplikacji"
 
 #: admin/applications/generic.tpl:7 admin/applications/generic.tpl:10
-#: admin/applications/class_divListApplication.inc:51
 #: admin/applications/class_applicationGeneric.inc:561
 msgid "Application name"
 msgstr "Nazwa aplikacji"
@@ -1001,10 +979,6 @@ msgstr "Wybierz bazę"
 msgid "Icon"
 msgstr "Ikona"
 
-#: admin/applications/generic.tpl:82 admin/mimetypes/generic.tpl:84
-msgid "Update"
-msgstr "Aktualizuj"
-
 #: admin/applications/generic.tpl:82
 msgid "Reload picture from LDAP"
 msgstr "Przeładuj obrazek z LDAP"
@@ -1068,37 +1042,27 @@ msgstr "Import"
 msgid "Download"
 msgstr "Ściągnij"
 
-#: admin/applications/class_applicationManagement.inc:25
-#: personal/environment/class_environment.inc:10
-msgid "This does something"
-msgstr "To robi coś"
+#: admin/applications/class_applicationManagement.inc:26
+msgid "Application management"
+msgstr "Zarządzanie aplikacją"
 
-#: admin/applications/class_divListApplication.inc:25
-msgid "List of Applications"
+#: admin/applications/application-list.xml:11
+#: admin/applications/application-list-release.xml:11
+#, fuzzy
+msgid "List of applications"
 msgstr "Lista aplikacji"
 
-#: admin/applications/class_divListApplication.inc:26
-msgid "This table displays all applications in the selected tree."
-msgstr "Ta tabela wyświetla wszystkie aplikacje w wybranym drzewie."
-
-#: admin/applications/class_divListApplication.inc:58
-#: personal/environment/hotplugDialog.tpl:43
-msgid "Display users matching"
-msgstr "Wyświetl użytkowników pasujących"
-
-#: admin/applications/class_divListApplication.inc:199
-#: admin/mimetypes/class_divListMimeTypes.inc:198
-msgid "Freezed"
-msgstr ""
-
-#: admin/applications/class_divListApplication.inc:242
+#: admin/applications/application-list.xml:118
+#: admin/applications/application-list-release.xml:118
 #, fuzzy
-msgid "Number of listed applications"
-msgstr "Osadzone aplikacje"
+msgid "Edit application"
+msgstr "Dodaj aplikację"
 
-#: admin/applications/main.inc:48 admin/applications/main.inc:50
-msgid "Application management"
-msgstr "Zarządzanie aplikacją"
+#: admin/applications/application-list.xml:131
+#: admin/applications/application-list-release.xml:131
+#, fuzzy
+msgid "Remove application"
+msgstr "aplikacja"
 
 #: admin/applications/class_applicationGeneric.inc:95
 msgid "no example"
@@ -1143,22 +1107,19 @@ msgstr "Nazwa aplikacji"
 msgid "Script content"
 msgstr "Zawartość skryptu"
 
-#: admin/mimetypes/class_mimetypeManagement.inc:24
+#: admin/mimetypes/class_mimetypeManagement.inc:25
 #: admin/mimetypes/class_mimetypeGeneric.inc:721
 msgid "Mime types"
 msgstr "Typy mime"
 
-#: admin/mimetypes/class_mimetypeManagement.inc:25
+#: admin/mimetypes/class_mimetypeManagement.inc:26
 msgid "Manage mime types"
 msgstr "Zarządzaj typami mime"
 
-#: admin/mimetypes/class_mimetypeManagement.inc:378
-#: admin/mimetypes/class_mimetypeManagement.inc:459
-#: admin/mimetypes/generic.tpl:12
-#: admin/mimetypes/class_divListMimeTypes.inc:51
-#: admin/mimetypes/class_divListMimeTypes.inc:116
-#: admin/mimetypes/class_divListMimeTypes.inc:152
-#: admin/mimetypes/paste_generic.tpl:13
+#: admin/mimetypes/generic.tpl:12 admin/mimetypes/paste_generic.tpl:13
+#: admin/mimetypes/mimetype-list-release.xml:15
+#: admin/mimetypes/mimetype-list-release.xml:74
+#: admin/mimetypes/mimetype-list.xml:15 admin/mimetypes/mimetype-list.xml:74
 msgid "Mime type"
 msgstr "Typ mime"
 
@@ -1229,27 +1190,27 @@ msgstr "Pokaż plik w zewnętrznej przeglądarce"
 msgid "Ask whether to save to local disk"
 msgstr "Pytaj czy zapisać na dysk"
 
-#: admin/mimetypes/class_divListMimeTypes.inc:27
-#: admin/mimetypes/class_divListMimeTypes.inc:28
-msgid "List of defined mime types"
-msgstr "Lista zdefiniowanych typów mime"
-
-#: admin/mimetypes/class_divListMimeTypes.inc:58
-msgid "Display mime types matching"
-msgstr "Wyświetl pasujące typy mime"
+#: admin/mimetypes/paste_generic.tpl:24
+msgid "Please specify a description for this mime type here"
+msgstr "Proszę podać opis dla tego typu mime"
 
-#: admin/mimetypes/class_divListMimeTypes.inc:243
+#: admin/mimetypes/mimetype-list-release.xml:11
+#: admin/mimetypes/mimetype-list.xml:11
 #, fuzzy
-msgid "Number of listed mimetypes"
+msgid "List of mimetypes"
 msgstr "Lista zdefiniowanych typów mime"
 
-#: admin/mimetypes/paste_generic.tpl:24
-msgid "Please specify a description for this mime type here"
-msgstr "Proszę podać opis dla tego typu mime"
+#: admin/mimetypes/mimetype-list-release.xml:118
+#: admin/mimetypes/mimetype-list.xml:118
+#, fuzzy
+msgid "Edit mimetype"
+msgstr "Aktualizuj ikonę typu mime"
 
-#: admin/mimetypes/main.inc:48 admin/mimetypes/main.inc:50
-msgid "Mimetype management"
-msgstr "Zarządzanie typami mime"
+#: admin/mimetypes/mimetype-list-release.xml:131
+#: admin/mimetypes/mimetype-list.xml:131
+#, fuzzy
+msgid "Remove mimetype"
+msgstr "Usuń obrazek"
 
 #: admin/mimetypes/class_mimetypeGeneric.inc:535
 #, fuzzy
@@ -1273,7 +1234,6 @@ msgid "Print Service"
 msgstr "Usługa drukowania"
 
 #: admin/systems/services/cups/goCupsServer.tpl:1
-#: admin/systems/services/syslog/goSyslogServer.tpl:1
 msgid "enabled"
 msgstr "włączone"
 
@@ -1294,23 +1254,18 @@ msgstr "Cups"
 #: admin/systems/services/ntp/class_goNtpServer.inc:115
 #: admin/systems/services/terminal/class_goTerminalServer.inc:165
 #: admin/systems/services/shares/class_goShareServer.inc:414
-#: admin/systems/services/syslog/class_goSyslogServer.inc:69
-#: admin/systems/services/syslog/class_goLogDBServer.inc:93
 msgid "Services"
 msgstr "Usługi"
 
 #: admin/systems/services/cups/class_goCupsServer.inc:77
-#: admin/systems/services/syslog/class_goLogDBServer.inc:101
 msgid "Start"
 msgstr "Start"
 
 #: admin/systems/services/cups/class_goCupsServer.inc:78
-#: admin/systems/services/syslog/class_goLogDBServer.inc:102
 msgid "Stop"
 msgstr "Zatrzymaj"
 
 #: admin/systems/services/cups/class_goCupsServer.inc:79
-#: admin/systems/services/syslog/class_goLogDBServer.inc:103
 msgid "Restart"
 msgstr "Restart"
 
@@ -1354,6 +1309,8 @@ msgid "LDAP service"
 msgstr "Usługa LDAP"
 
 #: admin/systems/services/ldap/goLdapServer.tpl:2
+#: admin/systems/services/ldap/class_goLdapServer.inc:79
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
 msgid "LDAP URI"
 msgstr ""
 
@@ -1361,6 +1318,24 @@ msgstr ""
 msgid "fill-in-your-servers-dns-name"
 msgstr ""
 
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
+#: admin/systems/services/nfs/servnfs.tpl:39
+#: admin/systems/goto/class_ArpNewDevice.inc:38
+#: admin/systems/goto/class_SelectDeviceType.inc:39
+#: addons/goto/class_target_list.inc:201
+#: addons/goto/events/class_EventTargetAddList.inc:238
+#: personal/environment/environment.tpl:135
+msgid "Server"
+msgstr "Serwer"
+
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
+#: admin/systems/goto/class_gotoLpdEnabled.inc:153
+#: admin/systems/goto/terminalService.tpl:58
+#: admin/systems/goto/workstationService.tpl:66
+#: admin/systems/goto/gotoLpdEnable.tpl:71
+msgid "Port"
+msgstr "Port"
+
 #: admin/systems/services/ldap/class_goLdapServer.inc:128
 #: admin/systems/services/ldap/class_goLdapServer.inc:129
 msgid "Ldap"
@@ -1460,13 +1435,13 @@ msgid "Path"
 msgstr "Ścieżka"
 
 #: admin/systems/services/shares/class_goShareServer.inc:428
-#: admin/systems/services/nfs/class_servNfs.inc:219
+#: admin/systems/services/nfs/class_servNfs.inc:215
 #: admin/systems/services/nfs/servnfs.tpl:121
 msgid "Option"
 msgstr "Opcja"
 
 #: admin/systems/services/shares/class_goShareServer.inc:429
-#: admin/systems/services/nfs/class_servNfs.inc:215
+#: admin/systems/services/nfs/class_servNfs.inc:211
 #: admin/systems/services/nfs/servnfs.tpl:29
 msgid "Volume"
 msgstr "Głośność"
@@ -1479,10 +1454,6 @@ msgstr ""
 msgid "'Path / Volume' must contain at least one '/'!"
 msgstr ""
 
-#: admin/systems/services/nfs/class_servNfs.inc:205
-msgid "Hidden shares must have a '$' at the end of the name!"
-msgstr ""
-
 #: admin/systems/services/nfs/servnfs.tpl:1
 msgid "Edit share"
 msgstr "Edytuj udział"
@@ -1491,15 +1462,6 @@ msgstr "Edytuj udział"
 msgid "NFS setup"
 msgstr "Ustawienia NFS"
 
-#: admin/systems/services/nfs/servnfs.tpl:39
-#: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_SelectDeviceType.inc:39
-#: addons/goto/class_target_list.inc:201
-#: addons/goto/events/class_EventTargetAddList.inc:238
-#: personal/environment/environment.tpl:135
-msgid "Server"
-msgstr "Serwer"
-
 #: admin/systems/services/nfs/servnfs.tpl:69
 msgid "Auto-mount share on Apple systems"
 msgstr "Auto-montuj udział na systemach Apple"
@@ -1508,57 +1470,6 @@ msgstr "Auto-montuj udział na systemach Apple"
 msgid "Codepage"
 msgstr "Strona kodowa"
 
-#: admin/systems/services/syslog/goSyslogServer.tpl:1
-msgid "Syslog Service"
-msgstr "Usługa Syslog"
-
-#: admin/systems/services/syslog/class_goSyslogServer.inc:68
-#: admin/systems/services/syslog/class_goSyslogServer.inc:69
-msgid "Logging service"
-msgstr "Usługa Logowania"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:31
-#: admin/systems/services/syslog/class_goLogDBServer.inc:59
-#, fuzzy
-msgid "Syslog service database"
-msgstr "Usługa Syslog"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:69
-#: admin/systems/goto/class_printGeneric.inc:976
-#: addons/goto/events/class_EventTargetAddUsersList.inc:171
-msgid "User"
-msgstr "Użytkownik"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:72
-#: admin/systems/services/syslog/class_goLogDBServer.inc:105
-#: admin/systems/services/syslog/goLogDBServer.tpl:20
-msgid "Password"
-msgstr "Hasło"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:75
-#: admin/systems/services/syslog/class_goLogDBServer.inc:106
-#: admin/systems/services/syslog/goLogDBServer.tpl:4
-#, fuzzy
-msgid "Database"
-msgstr "Wklej"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:92
-#: admin/systems/services/syslog/class_goLogDBServer.inc:93
-msgid "Logging database"
-msgstr "Baza logowania"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:104
-msgid "Admin"
-msgstr "Admin"
-
-#: admin/systems/services/syslog/goLogDBServer.tpl:1
-msgid "Logging database information"
-msgstr "Informacje bazy logowania"
-
-#: admin/systems/services/syslog/goLogDBServer.tpl:12
-msgid "Logging DB user"
-msgstr "Użytkownik bazy logowania"
-
 #: admin/systems/goto/workstation.tpl:1 admin/systems/goto/terminal.tpl:1
 msgid "Properties"
 msgstr "Właściwości"
@@ -1568,13 +1479,13 @@ msgid "Workstation template"
 msgstr "Szablon stacji roboczej"
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:707
+#: admin/systems/goto/class_workstationGeneric.inc:708
 msgid "Workstation name"
 msgstr "Nazwa stacji roboczej"
 
 #: admin/systems/goto/workstation.tpl:27
 #: admin/systems/goto/class_printGeneric.inc:1000
-#: admin/systems/goto/class_workstationGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:710
 msgid "Location"
 msgstr "Lokalizacja"
 
@@ -1677,13 +1588,6 @@ msgstr "Dodaj"
 msgid "bit/s"
 msgstr "bit"
 
-#: admin/systems/goto/class_gotoLpdEnabled.inc:153
-#: admin/systems/goto/terminalService.tpl:58
-#: admin/systems/goto/workstationService.tpl:66
-#: admin/systems/goto/gotoLpdEnable.tpl:71
-msgid "Port"
-msgstr "Port"
-
 #: admin/systems/goto/ArpNewDevice.tpl:1
 msgid "Integrating unknown devices"
 msgstr ""
@@ -1825,13 +1729,13 @@ msgstr ""
 #: admin/systems/goto/class_printGeneric.inc:593
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:230
+#: admin/systems/goto/class_terminalGeneric.inc:232
 #, fuzzy
 msgid "terminal"
 msgstr "Terminal"
 
 #: admin/systems/goto/class_printGeneric.inc:595
-#: admin/systems/goto/class_workstationGeneric.inc:226
+#: admin/systems/goto/class_workstationGeneric.inc:227
 #: admin/systems/goto/class_workstationStartup.inc:285
 #, fuzzy
 msgid "workstation"
@@ -1854,6 +1758,11 @@ msgstr "URL drukarki"
 msgid "Group"
 msgstr "Grupa"
 
+#: admin/systems/goto/class_printGeneric.inc:976
+#: addons/goto/events/class_EventTargetAddUsersList.inc:171
+msgid "User"
+msgstr "Użytkownik"
+
 #: admin/systems/goto/class_printGeneric.inc:989
 #, fuzzy
 msgid "Print generic"
@@ -1879,6 +1788,13 @@ msgstr "PPD drukarki"
 msgid "Permissions"
 msgstr "Uprawnienia"
 
+#: admin/systems/goto/class_printGeneric.inc:1019
+#: admin/systems/goto/class_printGeneric.inc:1041
+#: personal/environment/class_environment.inc:583
+#, fuzzy
+msgid "Permission error"
+msgstr "Uprawnienia"
+
 #: admin/systems/goto/class_printGeneric.inc:1019
 #: admin/systems/goto/class_printGeneric.inc:1041
 #, fuzzy
@@ -2009,7 +1925,7 @@ msgid "System informations"
 msgstr "Informacja o systemie"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:704
+#: admin/systems/goto/class_workstationGeneric.inc:705
 #: admin/systems/goto/class_SelectDeviceType.inc:39
 #: addons/goto/class_target_list.inc:203
 #: addons/goto/events/class_EventTargetAddList.inc:249
@@ -2018,8 +1934,8 @@ msgstr "Stacja robocza"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:39
-#: admin/systems/goto/class_terminalGeneric.inc:687
-#: admin/systems/goto/class_terminalGeneric.inc:693
+#: admin/systems/goto/class_terminalGeneric.inc:689
+#: admin/systems/goto/class_terminalGeneric.inc:695
 msgid "Terminal"
 msgstr "Terminal"
 
@@ -2121,12 +2037,12 @@ msgid "unknown"
 msgstr "nieznane"
 
 #: admin/systems/goto/class_terminalService.inc:703
-#: admin/systems/goto/class_workstationService.inc:498
+#: admin/systems/goto/class_workstationService.inc:502
 msgid "Service"
 msgstr "Usługa"
 
 #: admin/systems/goto/class_terminalService.inc:713
-#: admin/systems/goto/class_workstationService.inc:507
+#: admin/systems/goto/class_workstationService.inc:511
 msgid "Monitor"
 msgstr "Monitor"
 
@@ -2140,27 +2056,27 @@ msgid "Remote desktop"
 msgstr "Zdalny pulpit"
 
 #: admin/systems/goto/class_terminalService.inc:716
-#: admin/systems/goto/class_workstationService.inc:508
+#: admin/systems/goto/class_workstationService.inc:512
 msgid "Gfx driver"
 msgstr "Sterownik Gfx"
 
 #: admin/systems/goto/class_terminalService.inc:717
-#: admin/systems/goto/class_workstationService.inc:509
+#: admin/systems/goto/class_workstationService.inc:513
 msgid "Gfx resolution"
 msgstr "Rozdzielczość Gfx"
 
 #: admin/systems/goto/class_terminalService.inc:718
-#: admin/systems/goto/class_workstationService.inc:510
+#: admin/systems/goto/class_workstationService.inc:514
 msgid "Gfx color depth"
 msgstr "Głębia kolorów Gfx"
 
 #: admin/systems/goto/class_terminalService.inc:719
 #: admin/systems/goto/terminalService.tpl:150
 #: admin/systems/goto/workstationService.tpl:170
-#: admin/systems/goto/class_workstationService.inc:402
 #: admin/systems/goto/class_workstationService.inc:404
-#: admin/systems/goto/class_workstationService.inc:409
-#: admin/systems/goto/class_workstationService.inc:511
+#: admin/systems/goto/class_workstationService.inc:406
+#: admin/systems/goto/class_workstationService.inc:412
+#: admin/systems/goto/class_workstationService.inc:515
 msgid "HSync"
 msgstr "HSync"
 
@@ -2169,8 +2085,8 @@ msgstr "HSync"
 #: admin/systems/goto/workstationService.tpl:181
 #: admin/systems/goto/class_workstationService.inc:385
 #: admin/systems/goto/class_workstationService.inc:387
-#: admin/systems/goto/class_workstationService.inc:392
-#: admin/systems/goto/class_workstationService.inc:512
+#: admin/systems/goto/class_workstationService.inc:393
+#: admin/systems/goto/class_workstationService.inc:516
 msgid "VSync"
 msgstr "VSync"
 
@@ -2179,7 +2095,7 @@ msgid "Auto-Sync"
 msgstr ""
 
 #: admin/systems/goto/class_terminalService.inc:722
-#: admin/systems/goto/class_workstationService.inc:514
+#: admin/systems/goto/class_workstationService.inc:518
 msgid "Scanner enabled"
 msgstr "Skaner włączony"
 
@@ -2190,34 +2106,34 @@ msgid "Printer enabled"
 msgstr "nazwa drukarki"
 
 #: admin/systems/goto/class_terminalService.inc:724
-#: admin/systems/goto/class_workstationService.inc:515
+#: admin/systems/goto/class_workstationService.inc:519
 msgid "Keyboard model"
 msgstr "Model klawiatury"
 
 #: admin/systems/goto/class_terminalService.inc:725
-#: admin/systems/goto/class_workstationService.inc:516
+#: admin/systems/goto/class_workstationService.inc:520
 msgid "Keyboard layout"
 msgstr "Układ klawiatury"
 
 #: admin/systems/goto/class_terminalService.inc:726
-#: admin/systems/goto/class_workstationService.inc:517
+#: admin/systems/goto/class_workstationService.inc:521
 msgid "Keyboard variant"
 msgstr "Wariant klawiatury"
 
 #: admin/systems/goto/class_terminalService.inc:727
-#: admin/systems/goto/class_workstationService.inc:518
+#: admin/systems/goto/class_workstationService.inc:522
 msgid "Mouse type"
 msgstr "Typ myszy"
 
 #: admin/systems/goto/class_terminalService.inc:728
-#: admin/systems/goto/class_workstationService.inc:519
+#: admin/systems/goto/class_workstationService.inc:523
 msgid "Mouse port"
 msgstr "Port myszy"
 
 #: admin/systems/goto/class_terminalService.inc:730
 #: admin/systems/goto/terminalService.tpl:76
 #: admin/systems/goto/workstationService.tpl:86
-#: admin/systems/goto/class_workstationService.inc:520
+#: admin/systems/goto/class_workstationService.inc:524
 msgid "Telephone hardware"
 msgstr "Sprzęt telefoniczny"
 
@@ -2314,57 +2230,57 @@ msgstr "Usługa dźwięku"
 msgid "GUI"
 msgstr "GUI"
 
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_workstationGeneric.inc:309
+#: admin/systems/goto/class_workstationGeneric.inc:300
+#: admin/systems/goto/class_workstationGeneric.inc:310
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
 #, fuzzy
 msgid "Software update"
 msgstr "Natychmiastowe uaktualnienie"
 
-#: admin/systems/goto/class_workstationGeneric.inc:303
-#: admin/systems/goto/class_workstationGeneric.inc:311
+#: admin/systems/goto/class_workstationGeneric.inc:304
+#: admin/systems/goto/class_workstationGeneric.inc:312
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:307
-#: admin/systems/goto/class_terminalGeneric.inc:271
+#: admin/systems/goto/class_workstationGeneric.inc:308
+#: admin/systems/goto/class_terminalGeneric.inc:273
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr "Zbudź"
 
-#: admin/systems/goto/class_workstationGeneric.inc:500
+#: admin/systems/goto/class_workstationGeneric.inc:501
 msgid "A valid LDAP server assignement is missing!"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:510
+#: admin/systems/goto/class_workstationGeneric.inc:511
 #, fuzzy
 msgid "Software deployment"
 msgstr "Typ systemu"
 
-#: admin/systems/goto/class_workstationGeneric.inc:511
+#: admin/systems/goto/class_workstationGeneric.inc:512
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:699
+#: admin/systems/goto/class_workstationGeneric.inc:700
 #, fuzzy
 msgid "Workstation generic"
 msgstr "Nazwa stacji roboczej"
 
-#: admin/systems/goto/class_workstationGeneric.inc:711
+#: admin/systems/goto/class_workstationGeneric.inc:712
 #, fuzzy
 msgid "Goto mode"
 msgstr "do folferu"
 
-#: admin/systems/goto/class_workstationGeneric.inc:714
-#: admin/systems/goto/class_terminalGeneric.inc:707
+#: admin/systems/goto/class_workstationGeneric.inc:715
+#: admin/systems/goto/class_terminalGeneric.inc:709
 #, fuzzy
 msgid "Root password"
 msgstr "Ustaw hasło"
 
-#: admin/systems/goto/class_workstationGeneric.inc:715
+#: admin/systems/goto/class_workstationGeneric.inc:716
 #, fuzzy
 msgid "Create FAI CD"
 msgstr "Utwórz"
@@ -2636,11 +2552,11 @@ msgstr ""
 msgid "Create ISO-Image"
 msgstr "Utwórz"
 
-#: admin/systems/goto/class_workstationService.inc:499
+#: admin/systems/goto/class_workstationService.inc:503
 msgid "Workstation service"
 msgstr "Usługa stacji roboczej"
 
-#: admin/systems/goto/class_workstationService.inc:513
+#: admin/systems/goto/class_workstationService.inc:517
 #, fuzzy
 msgid "Use DDC"
 msgstr "Identyfikator użytkownika"
@@ -2755,16 +2671,16 @@ msgstr "Przydzielone klasy FAI"
 msgid "set"
 msgstr "ustaw"
 
-#: admin/systems/goto/class_terminalGeneric.inc:688
+#: admin/systems/goto/class_terminalGeneric.inc:690
 #, fuzzy
 msgid "Terminal generic"
 msgstr "Usługa Terminali"
 
-#: admin/systems/goto/class_terminalGeneric.inc:701
+#: admin/systems/goto/class_terminalGeneric.inc:703
 msgid "Syslog server enabled"
 msgstr "Serwer Syslog włączony"
 
-#: admin/systems/goto/class_terminalGeneric.inc:706
+#: admin/systems/goto/class_terminalGeneric.inc:708
 msgid "Ntp server settings"
 msgstr "Ustawienia serwera ntp"
 
@@ -3278,6 +3194,11 @@ msgstr "Status systemu"
 msgid "System deployment status"
 msgstr "Typ systemu"
 
+#: addons/goto/class_gotomasses.inc:230
+#, fuzzy
+msgid "Permission"
+msgstr "Uprawnienia"
+
 #: addons/goto/class_gotomasses.inc:270
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
@@ -3813,6 +3734,10 @@ msgstr ""
 msgid "Environment"
 msgstr "Środowisko"
 
+#: personal/environment/class_environment.inc:10
+msgid "This does something"
+msgstr "To robi coś"
+
 #: personal/environment/class_environment.inc:139
 #, fuzzy, php-format
 msgid "Device '%s' is not available anymore. It will be removed!"
@@ -4118,10 +4043,84 @@ msgstr "Wybierz urządzenie hotplug do dodania"
 msgid "Choose the department the search will be based    on"
 msgstr "Wybierz departament na którym będzie wyszukiwanie"
 
+#: personal/environment/hotplugDialog.tpl:43
+msgid "Display users matching"
+msgstr "Wyświetl użytkowników pasujących"
+
 #: personal/environment/hotplugDialog.tpl:48
 msgid "Regular expression for        matching hotplugs"
 msgstr "Wyrażenie regularne dla dopasowania hotplug"
 
+#, fuzzy
+#~ msgid ""
+#~ "This may be used by several users/groups. Please double check if your "
+#~ "really want to do this since there is no way for GOsa to get your data "
+#~ "back."
+#~ msgstr ""
+#~ "To może być używane przez kilka grup. Proszę upewnić się czy kontynuować, "
+#~ "gdyż nie ma operacji powrotu."
+
+#, fuzzy
+#~ msgid "Manage hotplug devices"
+#~ msgstr "Dodaj urządzenia hotplug"
+
+#, fuzzy
+#~ msgid "device"
+#~ msgstr "Urządzenie"
+
+#~ 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 ""
+#~ "To może być używane przez kilka grup. Proszę upewnić się czy kontynuować, "
+#~ "gdyż nie ma operacji powrotu."
+
+#~ msgid "This table displays all applications in the selected tree."
+#~ msgstr "Ta tabela wyświetla wszystkie aplikacje w wybranym drzewie."
+
+#, fuzzy
+#~ msgid "Number of listed applications"
+#~ msgstr "Osadzone aplikacje"
+
+#~ msgid "Display mime types matching"
+#~ msgstr "Wyświetl pasujące typy mime"
+
+#, fuzzy
+#~ msgid "Number of listed mimetypes"
+#~ msgstr "Lista zdefiniowanych typów mime"
+
+#~ msgid "Mimetype management"
+#~ msgstr "Zarządzanie typami mime"
+
+#~ msgid "Syslog Service"
+#~ msgstr "Usługa Syslog"
+
+#~ msgid "Logging service"
+#~ msgstr "Usługa Logowania"
+
+#, fuzzy
+#~ msgid "Syslog service database"
+#~ msgstr "Usługa Syslog"
+
+#~ msgid "Password"
+#~ msgstr "Hasło"
+
+#, fuzzy
+#~ msgid "Database"
+#~ msgstr "Wklej"
+
+#~ msgid "Logging database"
+#~ msgstr "Baza logowania"
+
+#~ msgid "Admin"
+#~ msgstr "Admin"
+
+#~ msgid "Logging database information"
+#~ msgstr "Informacje bazy logowania"
+
+#~ msgid "Logging DB user"
+#~ msgstr "Użytkownik bazy logowania"
+
 #, fuzzy
 #~ msgid "Vendor ID"
 #~ msgstr "ID Dostawcy"
@@ -6900,11 +6899,6 @@ msgstr "Wyrażenie regularne dla dopasowania hotplug"
 #~ msgid "Windows Install"
 #~ msgstr "Stacja robocza Windows"
 
-#~ msgid ""
-#~ "Please double check if you really want to do this since there is no way "
-#~ "for GOsa to get your data back."
-#~ msgstr "Proszę upewnić się czy kontynuować, gdyż nie ma możliwości powrotu."
-
 #, fuzzy
 #~ msgid "Please enter the new object group name"
 #~ msgstr "Proszę podać nową nazwę."
diff --git a/gosa-plugins/goto/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/goto/locale/ru/LC_MESSAGES/messages.po
index 042d90f3c..19c273b09 100644
--- a/gosa-plugins/goto/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/goto/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:52+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -37,15 +37,15 @@ msgstr ""
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
 #: admin/mimetypes/class_mimetypeGeneric.inc:715
 #: admin/systems/goto/class_printGeneric.inc:988
-#: admin/systems/goto/class_workstationGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:699
 msgid "Generic"
 msgstr "Общее"
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
 #: admin/systems/goto/workstation.tpl:95
-#: admin/systems/goto/class_workstationGeneric.inc:489
-#: admin/systems/goto/class_terminalGeneric.inc:480
+#: admin/systems/goto/class_workstationGeneric.inc:490
+#: admin/systems/goto/class_terminalGeneric.inc:482
 #: admin/systems/goto/terminal.tpl:84
 msgid "NTP server"
 msgstr "Сервер NTP"
@@ -58,7 +58,7 @@ msgstr "Выберите сервер для синхронизации врем
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
 #: admin/systems/goto/workstation.tpl:55
-#: admin/systems/goto/class_terminalGeneric.inc:700
+#: admin/systems/goto/class_terminalGeneric.inc:702
 #: admin/systems/goto/terminal.tpl:47
 msgid "Mode"
 msgstr "Режим"
@@ -70,10 +70,8 @@ msgstr "Выберите режим терминала"
 
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
-#: admin/systems/services/syslog/class_goSyslogServer.inc:27
-#: admin/systems/services/syslog/class_goSyslogServer.inc:47
 #: admin/systems/goto/workstation.tpl:65
-#: admin/systems/goto/class_workstationGeneric.inc:712
+#: admin/systems/goto/class_workstationGeneric.inc:713
 #: admin/systems/goto/terminal.tpl:57
 msgid "Syslog server"
 msgstr "Сервер системных журналов"
@@ -85,7 +83,7 @@ msgstr "Выберите сервер для ведения системных 
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:703
+#: admin/systems/goto/class_terminalGeneric.inc:705
 #: admin/systems/goto/terminal.tpl:117
 msgid "Root server"
 msgstr "Основной сервер"
@@ -96,7 +94,7 @@ msgstr "Выберите корневую файловую систему NFS"
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:704
+#: admin/systems/goto/class_terminalGeneric.inc:706
 #: admin/systems/goto/terminal.tpl:131
 msgid "Swap server"
 msgstr "Сервер подкачки"
@@ -130,21 +128,21 @@ msgid "Execute"
 msgstr "Выполнить"
 
 #: admin/ogroups/goto/class_termgroup.inc:51
-#: admin/systems/goto/class_workstationGeneric.inc:138
-#: admin/systems/goto/class_terminalGeneric.inc:122
+#: admin/systems/goto/class_workstationGeneric.inc:139
+#: admin/systems/goto/class_terminalGeneric.inc:124
 #, fuzzy
 msgid "Activated"
 msgstr "Личный"
 
 #: admin/ogroups/goto/class_termgroup.inc:52
-#: admin/systems/goto/class_workstationGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:121
+#: admin/systems/goto/class_workstationGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:123
 #: addons/goto/class_gotomasses.inc:542
 msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:281
+#: admin/systems/goto/class_terminalGeneric.inc:283
 #, fuzzy
 msgid "Local swap"
 msgstr "Местоположение"
@@ -163,7 +161,7 @@ msgstr "Местоположение"
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:154
+#: admin/systems/goto/class_workstationGeneric.inc:155
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -181,22 +179,22 @@ msgstr "Местоположение"
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:137
-#: admin/systems/goto/class_terminalGeneric.inc:287
-#: admin/systems/goto/class_terminalGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:139
+#: admin/systems/goto/class_terminalGeneric.inc:289
+#: admin/systems/goto/class_terminalGeneric.inc:301
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:635
+#: admin/systems/goto/class_workstationGeneric.inc:213
+#: admin/systems/goto/class_workstationGeneric.inc:636
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
-#: admin/systems/goto/class_workstationService.inc:568
-#: admin/systems/goto/class_terminalGeneric.inc:187
-#: admin/systems/goto/class_terminalGeneric.inc:625
+#: admin/systems/goto/class_workstationService.inc:572
+#: admin/systems/goto/class_terminalGeneric.inc:189
+#: admin/systems/goto/class_terminalGeneric.inc:627
 #: addons/goto/class_gotomasses.inc:328
 #: addons/goto/class_goto_import_file.inc:124
 #, fuzzy
@@ -204,30 +202,30 @@ msgid "Service infrastructure"
 msgstr "Искать в поддеревьях"
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:216
-#: admin/systems/goto/class_terminalGeneric.inc:191
+#: admin/systems/goto/class_workstationGeneric.inc:217
+#: admin/systems/goto/class_terminalGeneric.inc:193
 #, fuzzy
 msgid "Event error"
 msgstr "Состояние системы"
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:217
-#: admin/systems/goto/class_terminalGeneric.inc:192
+#: admin/systems/goto/class_workstationGeneric.inc:218
+#: admin/systems/goto/class_terminalGeneric.inc:194
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "Сменить пароль"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:298
-#: admin/systems/goto/class_terminalGeneric.inc:265
+#: admin/systems/goto/class_workstationGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:267
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
 msgid "Switch off"
 msgstr "Выключить"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:298
-#: admin/systems/goto/class_terminalGeneric.inc:266
+#: admin/systems/goto/class_workstationGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:268
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
 msgid "Reboot"
@@ -249,15 +247,15 @@ msgid "Wake"
 msgstr "Вернуть в обычный режим"
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:300
-#: admin/systems/goto/class_workstationGeneric.inc:308
+#: admin/systems/goto/class_workstationGeneric.inc:301
+#: admin/systems/goto/class_workstationGeneric.inc:309
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
 msgid "Reinstall"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:301
+#: admin/systems/goto/class_workstationGeneric.inc:302
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 #, fuzzy
@@ -305,13 +303,13 @@ msgstr "Системные журналы"
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:364
-#: admin/systems/goto/class_workstationGeneric.inc:596
-#: admin/systems/goto/class_workstationGeneric.inc:613
+#: admin/systems/goto/class_workstationGeneric.inc:365
+#: admin/systems/goto/class_workstationGeneric.inc:597
+#: admin/systems/goto/class_workstationGeneric.inc:614
 #: admin/systems/goto/class_workstationStartup.inc:889
-#: admin/systems/goto/class_workstationService.inc:456
-#: admin/systems/goto/class_terminalGeneric.inc:353
-#: admin/systems/goto/class_terminalGeneric.inc:611
+#: admin/systems/goto/class_workstationService.inc:460
+#: admin/systems/goto/class_terminalGeneric.inc:355
+#: admin/systems/goto/class_terminalGeneric.inc:613
 #: personal/environment/class_environment.inc:1058
 #: personal/environment/class_environment.inc:1315
 #, fuzzy
@@ -329,14 +327,14 @@ msgid "System group"
 msgstr "Состояние системы"
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:716
-#: admin/systems/goto/class_terminalGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:717
+#: admin/systems/goto/class_terminalGeneric.inc:711
 #, fuzzy
 msgid "Action flag"
 msgstr "Действие"
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:713
+#: admin/systems/goto/class_workstationGeneric.inc:714
 #, fuzzy
 msgid "Ntp server"
 msgstr "Сервер NTP"
@@ -384,34 +382,38 @@ msgstr "сброс"
 msgid "Application settings"
 msgstr "Параметры приложения"
 
-#: admin/groups/apps/edit_entry.tpl:43
+#: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
 #: admin/devices/class_deviceGeneric.inc:90
 #: admin/devices/class_deviceGeneric.inc:114
 #: admin/devices/class_deviceGeneric.inc:260
 #: admin/applications/class_applicationParameters.inc:190
+#: admin/applications/application-list.xml:41
+#: admin/applications/application-list-release.xml:41
 #: admin/applications/class_applicationGeneric.inc:430
 #: admin/applications/class_applicationGeneric.inc:434
 #: admin/applications/class_applicationGeneric.inc:606
 #: admin/applications/class_applicationGeneric.inc:610
+#: admin/mimetypes/mimetype-list-release.xml:41
+#: admin/mimetypes/mimetype-list.xml:41
 #: admin/mimetypes/class_mimetypeGeneric.inc:532
 #: admin/mimetypes/class_mimetypeGeneric.inc:724
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
-#: admin/systems/services/nfs/class_servNfs.inc:239
+#: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
 #: admin/systems/goto/class_printGeneric.inc:733
 #: admin/systems/goto/class_printGeneric.inc:738
 #: admin/systems/goto/class_printGeneric.inc:757
 #: admin/systems/goto/class_printGeneric.inc:997
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:456
-#: admin/systems/goto/class_workstationGeneric.inc:461
-#: admin/systems/goto/class_workstationGeneric.inc:479
-#: admin/systems/goto/class_terminalGeneric.inc:446
-#: admin/systems/goto/class_terminalGeneric.inc:451
-#: admin/systems/goto/class_terminalGeneric.inc:470
-#: admin/systems/goto/class_terminalGeneric.inc:696
+#: admin/systems/goto/class_workstationGeneric.inc:457
+#: admin/systems/goto/class_workstationGeneric.inc:462
+#: admin/systems/goto/class_workstationGeneric.inc:480
+#: admin/systems/goto/class_terminalGeneric.inc:448
+#: admin/systems/goto/class_terminalGeneric.inc:453
+#: admin/systems/goto/class_terminalGeneric.inc:472
+#: admin/systems/goto/class_terminalGeneric.inc:698
 #: personal/environment/class_logonManagementDialog.inc:103
 msgid "Name"
 msgstr "Фамилия"
@@ -442,8 +444,6 @@ msgid "department"
 msgstr "подразделения"
 
 #: admin/groups/apps/class_groupApplication.inc:481
-#: admin/applications/class_applicationManagement.inc:368
-#: admin/applications/class_applicationManagement.inc:449
 #: admin/applications/class_applicationGeneric.inc:127
 #, fuzzy
 msgid "application"
@@ -455,7 +455,7 @@ msgid "Not available in release."
 msgstr "Доступные приложения"
 
 #: admin/groups/apps/class_groupApplication.inc:1373
-#: admin/applications/class_applicationManagement.inc:24
+#: admin/applications/class_applicationManagement.inc:25
 #: admin/mimetypes/generic.tpl:117 admin/mimetypes/generic.tpl:177
 msgid "Applications"
 msgstr "Приложения"
@@ -466,8 +466,10 @@ msgid "Group applications"
 msgstr "Показать приложения"
 
 #: admin/groups/apps/class_groupApplication.inc:1381
-#: admin/applications/class_divListApplication.inc:114
-#: admin/applications/class_divListApplication.inc:150
+#: admin/applications/application-list.xml:15
+#: admin/applications/application-list.xml:74
+#: admin/applications/application-list-release.xml:15
+#: admin/applications/application-list-release.xml:74
 #: admin/applications/class_applicationGeneric.inc:603
 #: admin/mimetypes/class_mimetypeGeneric.inc:728
 msgid "Application"
@@ -475,6 +477,8 @@ msgstr "Приложение"
 
 #: admin/groups/apps/class_groupApplication.inc:1382
 #: admin/groups/apps/app_list.tpl:5 admin/groups/apps/app_list.tpl:53
+#: admin/applications/application-filter-release.tpl:14
+#: admin/mimetypes/mimetype-filter-release.tpl:14
 #: admin/systems/goto/workstationStartup.tpl:83
 #: admin/systems/goto/workstationStartup.tpl:123
 #, fuzzy
@@ -519,10 +523,12 @@ msgstr "Домен"
 
 #: admin/groups/apps/app_list.tpl:86 admin/groups/apps/app_list.tpl:107
 #: admin/groups/apps/app_list.tpl:132
-#: admin/devices/class_divListDevices.inc:100
+#: admin/devices/class_divListDevices.inc:100 admin/devices/device-list.xml:86
 #: admin/applications/class_applicationParameters.inc:122
-#: admin/applications/class_divListApplication.inc:120
-#: admin/mimetypes/class_divListMimeTypes.inc:122
+#: admin/applications/application-list.xml:86
+#: admin/applications/application-list-release.xml:86
+#: admin/mimetypes/mimetype-list-release.xml:86
+#: admin/mimetypes/mimetype-list.xml:86
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
@@ -573,8 +579,6 @@ msgid "List of defined devices"
 msgstr "Список пользователей"
 
 #: admin/devices/class_divListDevices.inc:45
-#: admin/applications/class_divListApplication.inc:45
-#: admin/mimetypes/class_divListMimeTypes.inc:45
 #, fuzzy
 msgid "Select all"
 msgstr "Удалить"
@@ -586,18 +590,15 @@ msgid "Device name"
 msgstr "Имя сервера"
 
 #: admin/devices/class_divListDevices.inc:51
-#: admin/applications/class_divListApplication.inc:51
-#: admin/mimetypes/class_divListMimeTypes.inc:51
 msgid "Department"
 msgstr "Подразделение"
 
 #: admin/devices/class_divListDevices.inc:52
-#: admin/devices/class_divListDevices.inc:87
-#: admin/applications/class_divListApplication.inc:52
-#: admin/applications/class_divListApplication.inc:107
-#: admin/mimetypes/class_divListMimeTypes.inc:52
-#: admin/mimetypes/class_divListMimeTypes.inc:109
-#: addons/goto/class_gotomasses.inc:365
+#: admin/devices/class_divListDevices.inc:87 admin/devices/device-list.xml:57
+#: admin/applications/application-list.xml:57
+#: admin/applications/application-list-release.xml:57
+#: admin/mimetypes/mimetype-list-release.xml:57
+#: admin/mimetypes/mimetype-list.xml:57 addons/goto/class_gotomasses.inc:365
 msgid "Actions"
 msgstr "Действия"
 
@@ -607,18 +608,17 @@ msgid "Display devices matching"
 msgstr "Показать подходяшие адреса"
 
 #: admin/devices/class_divListDevices.inc:82 admin/devices/deviceGeneric.tpl:9
-#: admin/devices/class_deviceGeneric.inc:261 admin/applications/generic.tpl:42
-#: admin/applications/class_divListApplication.inc:90
+#: admin/devices/class_deviceGeneric.inc:261 admin/devices/device-list.tpl:13
+#: admin/applications/generic.tpl:42
 #: admin/applications/class_applicationGeneric.inc:607
-#: admin/mimetypes/generic.tpl:44
-#: admin/mimetypes/class_divListMimeTypes.inc:93
+#: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
+#: admin/mimetypes/mimetype-list.tpl:13
 #: admin/mimetypes/class_mimetypeGeneric.inc:727
-#: admin/systems/services/ldap/class_goLdapServer.inc:79
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
 #: admin/systems/goto/class_printGeneric.inc:998
-#: admin/systems/goto/class_workstationGeneric.inc:710
-#: admin/systems/goto/class_terminalGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:711
+#: admin/systems/goto/class_terminalGeneric.inc:700
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/class_target_list.inc:152 addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/class_EventTargetAddList.inc:161
@@ -627,8 +627,6 @@ msgid "Base"
 msgstr "Ветка"
 
 #: admin/devices/class_divListDevices.inc:84
-#: admin/applications/class_divListApplication.inc:92
-#: admin/mimetypes/class_divListMimeTypes.inc:95
 #: addons/goto/class_target_list.inc:154
 #: addons/goto/events/class_EventTargetAddList.inc:163
 #: addons/goto/events/class_EventTargetAddUsersList.inc:132
@@ -636,25 +634,26 @@ msgstr "Ветка"
 msgid "Submit department"
 msgstr "Показать подразделения"
 
-#: admin/devices/class_divListDevices.inc:84
-#: admin/applications/class_divListApplication.inc:92
-#: admin/mimetypes/class_divListMimeTypes.inc:95
-#: addons/goto/class_target_list.inc:154
+#: admin/devices/class_divListDevices.inc:84 admin/devices/device-list.tpl:13
+#: admin/applications/application-list.tpl:13
+#: admin/mimetypes/mimetype-list.tpl:13 addons/goto/class_target_list.inc:154
 #: addons/goto/events/class_EventTargetAddList.inc:163
 #: addons/goto/events/class_EventTargetAddUsersList.inc:132
 msgid "Submit"
 msgstr ""
 
-#: admin/devices/class_divListDevices.inc:92
-#: admin/applications/class_divListApplication.inc:111
-#: admin/mimetypes/class_divListMimeTypes.inc:114
-#: admin/systems/goto/chooser.tpl:16 addons/goto/class_gotomasses.inc:366
+#: admin/devices/class_divListDevices.inc:92 admin/devices/device-list.xml:68
+#: admin/applications/application-list.xml:68
+#: admin/applications/application-list-release.xml:68
+#: admin/mimetypes/mimetype-list-release.xml:68
+#: admin/mimetypes/mimetype-list.xml:68 admin/systems/goto/chooser.tpl:16
+#: addons/goto/class_gotomasses.inc:366
 msgid "Create"
 msgstr "Создать"
 
 #: admin/devices/class_divListDevices.inc:94
-#: admin/devices/class_divListDevices.inc:131
-#: admin/devices/class_deviceGeneric.inc:159
+#: admin/devices/class_divListDevices.inc:131 admin/devices/device-list.xml:15
+#: admin/devices/device-list.xml:74 admin/devices/class_deviceGeneric.inc:159
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 #, fuzzy
@@ -662,30 +661,22 @@ msgid "Device"
 msgstr "Устройства"
 
 #: admin/devices/class_divListDevices.inc:156
-#: admin/applications/class_divListApplication.inc:186
-#: admin/mimetypes/class_divListMimeTypes.inc:186
 #, fuzzy
 msgid "edit"
 msgstr "Изменить"
 
 #: admin/devices/class_divListDevices.inc:156
-#: admin/applications/class_divListApplication.inc:186
-#: admin/mimetypes/class_divListMimeTypes.inc:186
 #, fuzzy
 msgid "Edit this entry"
 msgstr "Редактиовать объект"
 
 #: admin/devices/class_divListDevices.inc:163
-#: admin/applications/class_divListApplication.inc:202
-#: admin/mimetypes/class_divListMimeTypes.inc:201
 #: admin/systems/ppd/class_printerPPDSelectionDialog.inc:140
 #, fuzzy
 msgid "delete"
 msgstr "Удалить"
 
 #: admin/devices/class_divListDevices.inc:163
-#: admin/applications/class_divListApplication.inc:202
-#: admin/mimetypes/class_divListMimeTypes.inc:201
 #, fuzzy
 msgid "Delete this entry"
 msgstr "Удалить"
@@ -696,48 +687,50 @@ msgid "Number of listed devices"
 msgstr "Подразделение"
 
 #: admin/devices/class_divListDevices.inc:206
-#: admin/applications/class_divListApplication.inc:243
-#: admin/mimetypes/class_divListMimeTypes.inc:244
 #, fuzzy
 msgid "Number of listed departments"
 msgstr "Подразделение"
 
-#: admin/devices/remove.tpl:6
-#, fuzzy
+#: admin/devices/remove.tpl:6 admin/applications/remove.tpl:6
+#: admin/mimetypes/remove.tpl:6
 msgid ""
-"This may be used by several users/groups. Please double check if your really "
-"want to do this since there is no way for GOsa to get your data back."
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
 msgstr ""
-"Это приложение может использоваться несколькими группами. Подумайте еще раз, "
-"действительно ли вы хотите удалить его, так как GOsa не сможет отменить "
-"результаты этой операции."
+"Подумайте еще раз, действительно ли вам нужно удаление, так как GOsa не "
+"сможет восстановить эти данные."
 
-#: admin/devices/remove.tpl:9 admin/applications/remove.tpl:9
-#: admin/mimetypes/remove.tpl:9 addons/goto/remove.tpl:9
+#: admin/devices/remove.tpl:10 admin/applications/remove.tpl:10
+#: admin/mimetypes/remove.tpl:10 addons/goto/remove.tpl:9
 #, fuzzy
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 "Если вы уверены в своих действиях, нажмите на кнопку <i>Удалить</i>, иначе "
 "нажмите <i>Отмена</i>."
 
-#: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:257
-msgid "Devices"
-msgstr "Устройства"
+#: admin/devices/device-list.xml:11
+#, fuzzy
+msgid "List of devices"
+msgstr "Список пользователей"
 
-#: admin/devices/deviceGeneric.tpl:29 admin/devices/class_deviceGeneric.inc:93
+#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:29
+#: admin/devices/class_deviceGeneric.inc:93
 #: admin/devices/class_deviceGeneric.inc:262 admin/applications/generic.tpl:33
+#: admin/applications/application-list.xml:49
+#: admin/applications/application-list-release.xml:49
 #: admin/applications/class_applicationGeneric.inc:608
 #: admin/mimetypes/generic.tpl:34 admin/mimetypes/paste_generic.tpl:21
+#: admin/mimetypes/mimetype-list-release.xml:49
+#: admin/mimetypes/mimetype-list.xml:49
 #: admin/mimetypes/class_mimetypeGeneric.inc:726
 #: admin/systems/services/shares/class_goShareServer.inc:424
-#: admin/systems/services/nfs/class_servNfs.inc:211
+#: admin/systems/services/nfs/class_servNfs.inc:207
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
 #: admin/systems/goto/class_printGeneric.inc:999
-#: admin/systems/goto/class_workstationGeneric.inc:708
-#: admin/systems/goto/class_terminalGeneric.inc:697
+#: admin/systems/goto/class_workstationGeneric.inc:709
+#: admin/systems/goto/class_terminalGeneric.inc:699
 #: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
 #: addons/goto/class_gotomasses.inc:932
 #: personal/environment/class_logonManagementDialog.inc:111
@@ -745,6 +738,21 @@ msgstr "Устройства"
 msgid "Description"
 msgstr "Описание"
 
+#: admin/devices/device-list.xml:118
+#, fuzzy
+msgid "Edit device"
+msgstr "Звуковая карта"
+
+#: admin/devices/device-list.xml:131
+#, fuzzy
+msgid "Remove device"
+msgstr "Удалить изображение"
+
+#: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
+#: admin/devices/class_deviceGeneric.inc:257
+msgid "Devices"
+msgstr "Устройства"
+
 #: admin/devices/deviceGeneric.tpl:38
 #, fuzzy
 msgid "Device type"
@@ -785,10 +793,14 @@ msgstr ""
 msgid "(idProduct)"
 msgstr ""
 
-#: admin/devices/main.inc:49 admin/devices/main.inc:51
+#: admin/devices/device-filter.tpl:3
+#: admin/applications/application-filter.tpl:3
+#: admin/applications/application-filter-release.tpl:3
+#: admin/mimetypes/mimetype-filter-release.tpl:3
+#: admin/mimetypes/mimetype-filter.tpl:3
 #, fuzzy
-msgid "Hotplug device management"
-msgstr "Управление подразделениями"
+msgid "Filter"
+msgstr "Фильтры"
 
 #: admin/devices/class_deviceGeneric.inc:29
 msgid "Digital camera"
@@ -891,56 +903,23 @@ msgstr "Идентификатор отправителя"
 msgid "Device ID"
 msgstr "Устройства"
 
-#: admin/devices/class_deviceManagement.inc:7
+#: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:82
+#: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:84
+#: admin/mimetypes/mimetype-list.tpl:13
+msgid "Update"
+msgstr "Обновить"
+
+#: admin/devices/class_deviceManagement.inc:25
 #: personal/environment/class_environment.inc:1783
 #: personal/environment/environment.tpl:293
 #, fuzzy
 msgid "Hotplug devices"
 msgstr "Дисковод"
 
-#: admin/devices/class_deviceManagement.inc:8
-#, fuzzy
-msgid "Manage hotplug devices"
-msgstr "Дисковод"
-
-#: admin/devices/class_deviceManagement.inc:246
-#: admin/applications/class_applicationManagement.inc:352
-#: admin/mimetypes/class_mimetypeManagement.inc:360
-#: addons/goto/class_gotomasses.inc:230
-#, fuzzy
-msgid "Permission"
-msgstr "Права для членов группы"
-
-#: admin/devices/class_deviceManagement.inc:263
-#: admin/devices/class_deviceManagement.inc:345
+#: admin/devices/class_deviceManagement.inc:26
 #, fuzzy
-msgid "device"
-msgstr "Устройства"
-
-#: admin/devices/class_deviceManagement.inc:296
-#: admin/devices/class_deviceManagement.inc:352
-#: admin/devices/class_deviceManagement.inc:381
-#: admin/applications/class_applicationManagement.inc:401
-#: admin/applications/class_applicationManagement.inc:456
-#: admin/applications/class_applicationManagement.inc:487
-#: admin/mimetypes/class_mimetypeManagement.inc:412
-#: admin/mimetypes/class_mimetypeManagement.inc:466
-#: admin/mimetypes/class_mimetypeManagement.inc:496
-#: admin/systems/goto/class_printGeneric.inc:1019
-#: admin/systems/goto/class_printGeneric.inc:1041
-#: personal/environment/class_environment.inc:583
-#, fuzzy
-msgid "Permission error"
-msgstr "Права для членов группы"
-
-#: admin/applications/remove.tpl:6 admin/mimetypes/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 ""
-"Это приложение может использоваться несколькими группами. Подумайте еще раз, "
-"действительно ли вы хотите удалить его, так как GOsa не сможет отменить "
-"результаты этой операции."
+msgid "Hotplug device management"
+msgstr "Управление подразделениями"
 
 #: admin/applications/release_select.tpl:2
 #: admin/mimetypes/release_select.tpl:2
@@ -996,7 +975,6 @@ msgid "Application parameter settings"
 msgstr "Приложение"
 
 #: admin/applications/generic.tpl:7 admin/applications/generic.tpl:10
-#: admin/applications/class_divListApplication.inc:51
 #: admin/applications/class_applicationGeneric.inc:561
 msgid "Application name"
 msgstr "Приложение"
@@ -1034,10 +1012,6 @@ msgstr "Выберите, чтобы просмотреть серверы"
 msgid "Icon"
 msgstr "Пиктограмма"
 
-#: admin/applications/generic.tpl:82 admin/mimetypes/generic.tpl:84
-msgid "Update"
-msgstr "Обновить"
-
 #: admin/applications/generic.tpl:82
 msgid "Reload picture from LDAP"
 msgstr "Обновить изображение с LDAP"
@@ -1104,39 +1078,27 @@ msgstr "Импортировать"
 msgid "Download"
 msgstr "Домен"
 
-#: admin/applications/class_applicationManagement.inc:25
-#: personal/environment/class_environment.inc:10
-msgid "This does something"
-msgstr "Что-то будет"
+#: admin/applications/class_applicationManagement.inc:26
+msgid "Application management"
+msgstr "Управление приложениями"
 
-#: admin/applications/class_divListApplication.inc:25
+#: admin/applications/application-list.xml:11
+#: admin/applications/application-list-release.xml:11
 #, fuzzy
-msgid "List of Applications"
+msgid "List of applications"
 msgstr "Список приложений"
 
-#: admin/applications/class_divListApplication.inc:26
+#: admin/applications/application-list.xml:118
+#: admin/applications/application-list-release.xml:118
 #, fuzzy
-msgid "This table displays all applications in the selected tree."
-msgstr "Приложение с таким именем уже существует."
-
-#: admin/applications/class_divListApplication.inc:58
-#: personal/environment/hotplugDialog.tpl:43
-msgid "Display users matching"
-msgstr "Фильтр"
-
-#: admin/applications/class_divListApplication.inc:199
-#: admin/mimetypes/class_divListMimeTypes.inc:198
-msgid "Freezed"
-msgstr ""
+msgid "Edit application"
+msgstr "приложения"
 
-#: admin/applications/class_divListApplication.inc:242
+#: admin/applications/application-list.xml:131
+#: admin/applications/application-list-release.xml:131
 #, fuzzy
-msgid "Number of listed applications"
-msgstr "Используемые приложения"
-
-#: admin/applications/main.inc:48 admin/applications/main.inc:50
-msgid "Application management"
-msgstr "Управление приложениями"
+msgid "Remove application"
+msgstr "приложения"
 
 #: admin/applications/class_applicationGeneric.inc:95
 #, fuzzy
@@ -1182,24 +1144,21 @@ msgstr "Приложение"
 msgid "Script content"
 msgstr "Путь к сценариям"
 
-#: admin/mimetypes/class_mimetypeManagement.inc:24
+#: admin/mimetypes/class_mimetypeManagement.inc:25
 #: admin/mimetypes/class_mimetypeGeneric.inc:721
 #, fuzzy
 msgid "Mime types"
 msgstr "Тип"
 
-#: admin/mimetypes/class_mimetypeManagement.inc:25
+#: admin/mimetypes/class_mimetypeManagement.inc:26
 #, fuzzy
 msgid "Manage mime types"
 msgstr "Системы"
 
-#: admin/mimetypes/class_mimetypeManagement.inc:378
-#: admin/mimetypes/class_mimetypeManagement.inc:459
-#: admin/mimetypes/generic.tpl:12
-#: admin/mimetypes/class_divListMimeTypes.inc:51
-#: admin/mimetypes/class_divListMimeTypes.inc:116
-#: admin/mimetypes/class_divListMimeTypes.inc:152
-#: admin/mimetypes/paste_generic.tpl:13
+#: admin/mimetypes/generic.tpl:12 admin/mimetypes/paste_generic.tpl:13
+#: admin/mimetypes/mimetype-list-release.xml:15
+#: admin/mimetypes/mimetype-list-release.xml:74
+#: admin/mimetypes/mimetype-list.xml:15 admin/mimetypes/mimetype-list.xml:74
 #, fuzzy
 msgid "Mime type"
 msgstr "Тип"
@@ -1279,31 +1238,28 @@ msgstr ""
 msgid "Ask whether to save to local disk"
 msgstr ""
 
-#: admin/mimetypes/class_divListMimeTypes.inc:27
-#: admin/mimetypes/class_divListMimeTypes.inc:28
-#, fuzzy
-msgid "List of defined mime types"
-msgstr "Готовые \"черные списки\""
-
-#: admin/mimetypes/class_divListMimeTypes.inc:58
+#: admin/mimetypes/paste_generic.tpl:24
 #, fuzzy
-msgid "Display mime types matching"
-msgstr "Показать совпадения номеров"
+msgid "Please specify a description for this mime type here"
+msgstr "Укажите корректный номер телефона."
 
-#: admin/mimetypes/class_divListMimeTypes.inc:243
+#: admin/mimetypes/mimetype-list-release.xml:11
+#: admin/mimetypes/mimetype-list.xml:11
 #, fuzzy
-msgid "Number of listed mimetypes"
+msgid "List of mimetypes"
 msgstr "Готовые \"черные списки\""
 
-#: admin/mimetypes/paste_generic.tpl:24
+#: admin/mimetypes/mimetype-list-release.xml:118
+#: admin/mimetypes/mimetype-list.xml:118
 #, fuzzy
-msgid "Please specify a description for this mime type here"
-msgstr "Укажите корректный номер телефона."
+msgid "Edit mimetype"
+msgstr "Редактиовать объект"
 
-#: admin/mimetypes/main.inc:48 admin/mimetypes/main.inc:50
+#: admin/mimetypes/mimetype-list-release.xml:131
+#: admin/mimetypes/mimetype-list.xml:131
 #, fuzzy
-msgid "Mimetype management"
-msgstr "Управление системами"
+msgid "Remove mimetype"
+msgstr "Удалить изображение"
 
 #: admin/mimetypes/class_mimetypeGeneric.inc:535
 #, fuzzy
@@ -1331,7 +1287,6 @@ msgid "Print Service"
 msgstr "Служба печати"
 
 #: admin/systems/services/cups/goCupsServer.tpl:1
-#: admin/systems/services/syslog/goSyslogServer.tpl:1
 #, fuzzy
 msgid "enabled"
 msgstr "отключен"
@@ -1354,25 +1309,20 @@ msgstr "группы"
 #: admin/systems/services/ntp/class_goNtpServer.inc:115
 #: admin/systems/services/terminal/class_goTerminalServer.inc:165
 #: admin/systems/services/shares/class_goShareServer.inc:414
-#: admin/systems/services/syslog/class_goSyslogServer.inc:69
-#: admin/systems/services/syslog/class_goLogDBServer.inc:93
 msgid "Services"
 msgstr "Сервисы"
 
 #: admin/systems/services/cups/class_goCupsServer.inc:77
-#: admin/systems/services/syslog/class_goLogDBServer.inc:101
 #, fuzzy
 msgid "Start"
 msgstr "Запуск"
 
 #: admin/systems/services/cups/class_goCupsServer.inc:78
-#: admin/systems/services/syslog/class_goLogDBServer.inc:102
 #, fuzzy
 msgid "Stop"
 msgstr "Отношение"
 
 #: admin/systems/services/cups/class_goCupsServer.inc:79
-#: admin/systems/services/syslog/class_goLogDBServer.inc:103
 #, fuzzy
 msgid "Restart"
 msgstr "Повторить"
@@ -1419,6 +1369,8 @@ msgid "LDAP service"
 msgstr "LDAP-сервер"
 
 #: admin/systems/services/ldap/goLdapServer.tpl:2
+#: admin/systems/services/ldap/class_goLdapServer.inc:79
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
 msgid "LDAP URI"
 msgstr ""
 
@@ -1426,6 +1378,24 @@ msgstr ""
 msgid "fill-in-your-servers-dns-name"
 msgstr ""
 
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
+#: admin/systems/services/nfs/servnfs.tpl:39
+#: admin/systems/goto/class_ArpNewDevice.inc:38
+#: admin/systems/goto/class_SelectDeviceType.inc:39
+#: addons/goto/class_target_list.inc:201
+#: addons/goto/events/class_EventTargetAddList.inc:238
+#: personal/environment/environment.tpl:135
+msgid "Server"
+msgstr "Сервер"
+
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
+#: admin/systems/goto/class_gotoLpdEnabled.inc:153
+#: admin/systems/goto/terminalService.tpl:58
+#: admin/systems/goto/workstationService.tpl:66
+#: admin/systems/goto/gotoLpdEnable.tpl:71
+msgid "Port"
+msgstr "Порт"
+
 #: admin/systems/services/ldap/class_goLdapServer.inc:128
 #: admin/systems/services/ldap/class_goLdapServer.inc:129
 msgid "Ldap"
@@ -1532,14 +1502,14 @@ msgid "Path"
 msgstr "Дата"
 
 #: admin/systems/services/shares/class_goShareServer.inc:428
-#: admin/systems/services/nfs/class_servNfs.inc:219
+#: admin/systems/services/nfs/class_servNfs.inc:215
 #: admin/systems/services/nfs/servnfs.tpl:121
 #, fuzzy
 msgid "Option"
 msgstr "Параметры"
 
 #: admin/systems/services/shares/class_goShareServer.inc:429
-#: admin/systems/services/nfs/class_servNfs.inc:215
+#: admin/systems/services/nfs/class_servNfs.inc:211
 #: admin/systems/services/nfs/servnfs.tpl:29
 #, fuzzy
 msgid "Volume"
@@ -1553,10 +1523,6 @@ msgstr ""
 msgid "'Path / Volume' must contain at least one '/'!"
 msgstr ""
 
-#: admin/systems/services/nfs/class_servNfs.inc:205
-msgid "Hidden shares must have a '$' at the end of the name!"
-msgstr ""
-
 #: admin/systems/services/nfs/servnfs.tpl:1
 #, fuzzy
 msgid "Edit share"
@@ -1567,15 +1533,6 @@ msgstr "Пользователи домена"
 msgid "NFS setup"
 msgstr "Установить"
 
-#: admin/systems/services/nfs/servnfs.tpl:39
-#: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_SelectDeviceType.inc:39
-#: addons/goto/class_target_list.inc:201
-#: addons/goto/events/class_EventTargetAddList.inc:238
-#: personal/environment/environment.tpl:135
-msgid "Server"
-msgstr "Сервер"
-
 #: admin/systems/services/nfs/servnfs.tpl:69
 msgid "Auto-mount share on Apple systems"
 msgstr ""
@@ -1585,63 +1542,6 @@ msgstr ""
 msgid "Codepage"
 msgstr "Домашняя страница"
 
-#: admin/systems/services/syslog/goSyslogServer.tpl:1
-#, fuzzy
-msgid "Syslog Service"
-msgstr "Сервер системных журналов"
-
-#: admin/systems/services/syslog/class_goSyslogServer.inc:68
-#: admin/systems/services/syslog/class_goSyslogServer.inc:69
-#, fuzzy
-msgid "Logging service"
-msgstr "Служба печати"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:31
-#: admin/systems/services/syslog/class_goLogDBServer.inc:59
-#, fuzzy
-msgid "Syslog service database"
-msgstr "Сервер системных журналов"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:69
-#: admin/systems/goto/class_printGeneric.inc:976
-#: addons/goto/events/class_EventTargetAddUsersList.inc:171
-msgid "User"
-msgstr "Пользователь"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:72
-#: admin/systems/services/syslog/class_goLogDBServer.inc:105
-#: admin/systems/services/syslog/goLogDBServer.tpl:20
-msgid "Password"
-msgstr "Пароль"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:75
-#: admin/systems/services/syslog/class_goLogDBServer.inc:106
-#: admin/systems/services/syslog/goLogDBServer.tpl:4
-#, fuzzy
-msgid "Database"
-msgstr "Дата"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:92
-#: admin/systems/services/syslog/class_goLogDBServer.inc:93
-#, fuzzy
-msgid "Logging database"
-msgstr "база пользователя"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:104
-#, fuzzy
-msgid "Admin"
-msgstr "DN администратора"
-
-#: admin/systems/services/syslog/goLogDBServer.tpl:1
-#, fuzzy
-msgid "Logging database information"
-msgstr "база пользователя"
-
-#: admin/systems/services/syslog/goLogDBServer.tpl:12
-#, fuzzy
-msgid "Logging DB user"
-msgstr "Служба печати"
-
 #: admin/systems/goto/workstation.tpl:1 admin/systems/goto/terminal.tpl:1
 msgid "Properties"
 msgstr "Свойства"
@@ -1651,13 +1551,13 @@ msgid "Workstation template"
 msgstr "Шаблон рабочей станции"
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:707
+#: admin/systems/goto/class_workstationGeneric.inc:708
 msgid "Workstation name"
 msgstr "Имя рабочий станции"
 
 #: admin/systems/goto/workstation.tpl:27
 #: admin/systems/goto/class_printGeneric.inc:1000
-#: admin/systems/goto/class_workstationGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:710
 msgid "Location"
 msgstr "Местоположение"
 
@@ -1766,13 +1666,6 @@ msgstr "Добавить"
 msgid "bit/s"
 msgstr "запись"
 
-#: admin/systems/goto/class_gotoLpdEnabled.inc:153
-#: admin/systems/goto/terminalService.tpl:58
-#: admin/systems/goto/workstationService.tpl:66
-#: admin/systems/goto/gotoLpdEnable.tpl:71
-msgid "Port"
-msgstr "Порт"
-
 #: admin/systems/goto/ArpNewDevice.tpl:1
 msgid "Integrating unknown devices"
 msgstr ""
@@ -1912,13 +1805,13 @@ msgstr ""
 #: admin/systems/goto/class_printGeneric.inc:593
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:230
+#: admin/systems/goto/class_terminalGeneric.inc:232
 #, fuzzy
 msgid "terminal"
 msgstr "Терминалы"
 
 #: admin/systems/goto/class_printGeneric.inc:595
-#: admin/systems/goto/class_workstationGeneric.inc:226
+#: admin/systems/goto/class_workstationGeneric.inc:227
 #: admin/systems/goto/class_workstationStartup.inc:285
 #, fuzzy
 msgid "workstation"
@@ -1941,6 +1834,11 @@ msgstr "URL принтера"
 msgid "Group"
 msgstr "Группа"
 
+#: admin/systems/goto/class_printGeneric.inc:976
+#: addons/goto/events/class_EventTargetAddUsersList.inc:171
+msgid "User"
+msgstr "Пользователь"
+
 #: admin/systems/goto/class_printGeneric.inc:989
 #, fuzzy
 msgid "Print generic"
@@ -1968,6 +1866,13 @@ msgstr "Принтер"
 msgid "Permissions"
 msgstr "Права для членов группы"
 
+#: admin/systems/goto/class_printGeneric.inc:1019
+#: admin/systems/goto/class_printGeneric.inc:1041
+#: personal/environment/class_environment.inc:583
+#, fuzzy
+msgid "Permission error"
+msgstr "Права для членов группы"
+
 #: admin/systems/goto/class_printGeneric.inc:1019
 #: admin/systems/goto/class_printGeneric.inc:1041
 #, fuzzy
@@ -2100,7 +2005,7 @@ msgid "System informations"
 msgstr "Системная информация"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:704
+#: admin/systems/goto/class_workstationGeneric.inc:705
 #: admin/systems/goto/class_SelectDeviceType.inc:39
 #: addons/goto/class_target_list.inc:203
 #: addons/goto/events/class_EventTargetAddList.inc:249
@@ -2109,8 +2014,8 @@ msgstr "Рабочая станция"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:39
-#: admin/systems/goto/class_terminalGeneric.inc:687
-#: admin/systems/goto/class_terminalGeneric.inc:693
+#: admin/systems/goto/class_terminalGeneric.inc:689
+#: admin/systems/goto/class_terminalGeneric.inc:695
 #, fuzzy
 msgid "Terminal"
 msgstr "Терминалы"
@@ -2217,13 +2122,13 @@ msgid "unknown"
 msgstr "состояние неизвестно"
 
 #: admin/systems/goto/class_terminalService.inc:703
-#: admin/systems/goto/class_workstationService.inc:498
+#: admin/systems/goto/class_workstationService.inc:502
 #, fuzzy
 msgid "Service"
 msgstr "Сервисы"
 
 #: admin/systems/goto/class_terminalService.inc:713
-#: admin/systems/goto/class_workstationService.inc:507
+#: admin/systems/goto/class_workstationService.inc:511
 #, fuzzy
 msgid "Monitor"
 msgstr "Мониторинг"
@@ -2239,19 +2144,19 @@ msgid "Remote desktop"
 msgstr "Удаленная рабочая станция"
 
 #: admin/systems/goto/class_terminalService.inc:716
-#: admin/systems/goto/class_workstationService.inc:508
+#: admin/systems/goto/class_workstationService.inc:512
 #, fuzzy
 msgid "Gfx driver"
 msgstr "Сервер"
 
 #: admin/systems/goto/class_terminalService.inc:717
-#: admin/systems/goto/class_workstationService.inc:509
+#: admin/systems/goto/class_workstationService.inc:513
 #, fuzzy
 msgid "Gfx resolution"
 msgstr "Разрешение"
 
 #: admin/systems/goto/class_terminalService.inc:718
-#: admin/systems/goto/class_workstationService.inc:510
+#: admin/systems/goto/class_workstationService.inc:514
 #, fuzzy
 msgid "Gfx color depth"
 msgstr "Глубина цвета"
@@ -2259,10 +2164,10 @@ msgstr "Глубина цвета"
 #: admin/systems/goto/class_terminalService.inc:719
 #: admin/systems/goto/terminalService.tpl:150
 #: admin/systems/goto/workstationService.tpl:170
-#: admin/systems/goto/class_workstationService.inc:402
 #: admin/systems/goto/class_workstationService.inc:404
-#: admin/systems/goto/class_workstationService.inc:409
-#: admin/systems/goto/class_workstationService.inc:511
+#: admin/systems/goto/class_workstationService.inc:406
+#: admin/systems/goto/class_workstationService.inc:412
+#: admin/systems/goto/class_workstationService.inc:515
 msgid "HSync"
 msgstr "Строчная синхронизация"
 
@@ -2271,8 +2176,8 @@ msgstr "Строчная синхронизация"
 #: admin/systems/goto/workstationService.tpl:181
 #: admin/systems/goto/class_workstationService.inc:385
 #: admin/systems/goto/class_workstationService.inc:387
-#: admin/systems/goto/class_workstationService.inc:392
-#: admin/systems/goto/class_workstationService.inc:512
+#: admin/systems/goto/class_workstationService.inc:393
+#: admin/systems/goto/class_workstationService.inc:516
 msgid "VSync"
 msgstr "Кадровая синхронизация"
 
@@ -2281,7 +2186,7 @@ msgid "Auto-Sync"
 msgstr ""
 
 #: admin/systems/goto/class_terminalService.inc:722
-#: admin/systems/goto/class_workstationService.inc:514
+#: admin/systems/goto/class_workstationService.inc:518
 #, fuzzy
 msgid "Scanner enabled"
 msgstr "отключен"
@@ -2293,31 +2198,31 @@ msgid "Printer enabled"
 msgstr "Имя принтера"
 
 #: admin/systems/goto/class_terminalService.inc:724
-#: admin/systems/goto/class_workstationService.inc:515
+#: admin/systems/goto/class_workstationService.inc:519
 #, fuzzy
 msgid "Keyboard model"
 msgstr "Выберите модель клавиатуры"
 
 #: admin/systems/goto/class_terminalService.inc:725
-#: admin/systems/goto/class_workstationService.inc:516
+#: admin/systems/goto/class_workstationService.inc:520
 #, fuzzy
 msgid "Keyboard layout"
 msgstr "Выберите раскладку"
 
 #: admin/systems/goto/class_terminalService.inc:726
-#: admin/systems/goto/class_workstationService.inc:517
+#: admin/systems/goto/class_workstationService.inc:521
 #, fuzzy
 msgid "Keyboard variant"
 msgstr "Выберите вариант раскладки"
 
 #: admin/systems/goto/class_terminalService.inc:727
-#: admin/systems/goto/class_workstationService.inc:518
+#: admin/systems/goto/class_workstationService.inc:522
 #, fuzzy
 msgid "Mouse type"
 msgstr "Тип"
 
 #: admin/systems/goto/class_terminalService.inc:728
-#: admin/systems/goto/class_workstationService.inc:519
+#: admin/systems/goto/class_workstationService.inc:523
 #, fuzzy
 msgid "Mouse port"
 msgstr "Мониторинг"
@@ -2325,7 +2230,7 @@ msgstr "Мониторинг"
 #: admin/systems/goto/class_terminalService.inc:730
 #: admin/systems/goto/terminalService.tpl:76
 #: admin/systems/goto/workstationService.tpl:86
-#: admin/systems/goto/class_workstationService.inc:520
+#: admin/systems/goto/class_workstationService.inc:524
 msgid "Telephone hardware"
 msgstr "Телефонное оборудование"
 
@@ -2423,57 +2328,57 @@ msgstr "Звук"
 msgid "GUI"
 msgstr "Графический интерфейс"
 
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_workstationGeneric.inc:309
+#: admin/systems/goto/class_workstationGeneric.inc:300
+#: admin/systems/goto/class_workstationGeneric.inc:310
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
 #, fuzzy
 msgid "Software update"
 msgstr "Создать телефонный аккаунт"
 
-#: admin/systems/goto/class_workstationGeneric.inc:303
-#: admin/systems/goto/class_workstationGeneric.inc:311
+#: admin/systems/goto/class_workstationGeneric.inc:304
+#: admin/systems/goto/class_workstationGeneric.inc:312
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:307
-#: admin/systems/goto/class_terminalGeneric.inc:271
+#: admin/systems/goto/class_workstationGeneric.inc:308
+#: admin/systems/goto/class_terminalGeneric.inc:273
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr "Вернуть в обычный режим"
 
-#: admin/systems/goto/class_workstationGeneric.inc:500
+#: admin/systems/goto/class_workstationGeneric.inc:501
 msgid "A valid LDAP server assignement is missing!"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:510
+#: admin/systems/goto/class_workstationGeneric.inc:511
 #, fuzzy
 msgid "Software deployment"
 msgstr "Системы"
 
-#: admin/systems/goto/class_workstationGeneric.inc:511
+#: admin/systems/goto/class_workstationGeneric.inc:512
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:699
+#: admin/systems/goto/class_workstationGeneric.inc:700
 #, fuzzy
 msgid "Workstation generic"
 msgstr "Имя рабочий станции"
 
-#: admin/systems/goto/class_workstationGeneric.inc:711
+#: admin/systems/goto/class_workstationGeneric.inc:712
 #, fuzzy
 msgid "Goto mode"
 msgstr "в папку"
 
-#: admin/systems/goto/class_workstationGeneric.inc:714
-#: admin/systems/goto/class_terminalGeneric.inc:707
+#: admin/systems/goto/class_workstationGeneric.inc:715
+#: admin/systems/goto/class_terminalGeneric.inc:709
 #, fuzzy
 msgid "Root password"
 msgstr "Изменить пароль"
 
-#: admin/systems/goto/class_workstationGeneric.inc:715
+#: admin/systems/goto/class_workstationGeneric.inc:716
 #, fuzzy
 msgid "Create FAI CD"
 msgstr "Создать"
@@ -2743,12 +2648,12 @@ msgstr ""
 msgid "Create ISO-Image"
 msgstr "Создать шаблон"
 
-#: admin/systems/goto/class_workstationService.inc:499
+#: admin/systems/goto/class_workstationService.inc:503
 #, fuzzy
 msgid "Workstation service"
 msgstr "Рабочие станции"
 
-#: admin/systems/goto/class_workstationService.inc:513
+#: admin/systems/goto/class_workstationService.inc:517
 #, fuzzy
 msgid "Use DDC"
 msgstr "Идентификатор пользователя"
@@ -2863,17 +2768,17 @@ msgstr "Выберите тип мыши"
 msgid "set"
 msgstr "сброс"
 
-#: admin/systems/goto/class_terminalGeneric.inc:688
+#: admin/systems/goto/class_terminalGeneric.inc:690
 #, fuzzy
 msgid "Terminal generic"
 msgstr "Терминальный сервер"
 
-#: admin/systems/goto/class_terminalGeneric.inc:701
+#: admin/systems/goto/class_terminalGeneric.inc:703
 #, fuzzy
 msgid "Syslog server enabled"
 msgstr "Сервер системных журналов"
 
-#: admin/systems/goto/class_terminalGeneric.inc:706
+#: admin/systems/goto/class_terminalGeneric.inc:708
 #, fuzzy
 msgid "Ntp server settings"
 msgstr "Почтовые настройки пользователя"
@@ -3405,6 +3310,11 @@ msgstr "Состояние системы"
 msgid "System deployment status"
 msgstr "Системы"
 
+#: addons/goto/class_gotomasses.inc:230
+#, fuzzy
+msgid "Permission"
+msgstr "Права для членов группы"
+
 #: addons/goto/class_gotomasses.inc:270
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
@@ -3940,6 +3850,10 @@ msgstr ""
 msgid "Environment"
 msgstr "Окружение"
 
+#: personal/environment/class_environment.inc:10
+msgid "This does something"
+msgstr "Что-то будет"
+
 #: personal/environment/class_environment.inc:139
 #, php-format
 msgid "Device '%s' is not available anymore. It will be removed!"
@@ -4279,11 +4193,96 @@ msgstr "Удалить"
 msgid "Choose the department the search will be based    on"
 msgstr "Выбрать раздел, для которого будет осуществлен поиск"
 
+#: personal/environment/hotplugDialog.tpl:43
+msgid "Display users matching"
+msgstr "Фильтр"
+
 #: personal/environment/hotplugDialog.tpl:48
 #, fuzzy
 msgid "Regular expression for        matching hotplugs"
 msgstr "Регулярное выражение, соответствующее именам пользователей"
 
+#, fuzzy
+#~ msgid ""
+#~ "This may be used by several users/groups. Please double check if your "
+#~ "really want to do this since there is no way for GOsa to get your data "
+#~ "back."
+#~ msgstr ""
+#~ "Это приложение может использоваться несколькими группами. Подумайте еще "
+#~ "раз, действительно ли вы хотите удалить его, так как GOsa не сможет "
+#~ "отменить результаты этой операции."
+
+#, fuzzy
+#~ msgid "Manage hotplug devices"
+#~ msgstr "Дисковод"
+
+#, fuzzy
+#~ msgid "device"
+#~ msgstr "Устройства"
+
+#~ 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 ""
+#~ "Это приложение может использоваться несколькими группами. Подумайте еще "
+#~ "раз, действительно ли вы хотите удалить его, так как GOsa не сможет "
+#~ "отменить результаты этой операции."
+
+#, fuzzy
+#~ msgid "This table displays all applications in the selected tree."
+#~ msgstr "Приложение с таким именем уже существует."
+
+#, fuzzy
+#~ msgid "Number of listed applications"
+#~ msgstr "Используемые приложения"
+
+#, fuzzy
+#~ msgid "Display mime types matching"
+#~ msgstr "Показать совпадения номеров"
+
+#, fuzzy
+#~ msgid "Number of listed mimetypes"
+#~ msgstr "Готовые \"черные списки\""
+
+#, fuzzy
+#~ msgid "Mimetype management"
+#~ msgstr "Управление системами"
+
+#, fuzzy
+#~ msgid "Syslog Service"
+#~ msgstr "Сервер системных журналов"
+
+#, fuzzy
+#~ msgid "Logging service"
+#~ msgstr "Служба печати"
+
+#, fuzzy
+#~ msgid "Syslog service database"
+#~ msgstr "Сервер системных журналов"
+
+#~ msgid "Password"
+#~ msgstr "Пароль"
+
+#, fuzzy
+#~ msgid "Database"
+#~ msgstr "Дата"
+
+#, fuzzy
+#~ msgid "Logging database"
+#~ msgstr "база пользователя"
+
+#, fuzzy
+#~ msgid "Admin"
+#~ msgstr "DN администратора"
+
+#, fuzzy
+#~ msgid "Logging database information"
+#~ msgstr "база пользователя"
+
+#, fuzzy
+#~ msgid "Logging DB user"
+#~ msgstr "Служба печати"
+
 #, fuzzy
 #~ msgid "Vendor ID"
 #~ msgstr "Идентификатор отправителя"
@@ -6818,13 +6817,6 @@ msgstr "Регулярное выражение, соответствующее
 #~ msgid "Windows Install"
 #~ msgstr "Рабочая станция Windows"
 
-#~ msgid ""
-#~ "Please double check if you really want to do this since there is no way "
-#~ "for GOsa to get your data back."
-#~ msgstr ""
-#~ "Подумайте еще раз, действительно ли вам нужно удаление, так как GOsa не "
-#~ "сможет восстановить эти данные."
-
 #, fuzzy
 #~ msgid "Please enter the new object group name"
 #~ msgstr "Введите адрес сервера"
diff --git a/gosa-plugins/goto/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/goto/locale/zh/LC_MESSAGES/messages.po
index b6223ea74..2bd9f2fbd 100644
--- a/gosa-plugins/goto/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/goto/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:52+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -41,15 +41,15 @@ msgstr ""
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
 #: admin/mimetypes/class_mimetypeGeneric.inc:715
 #: admin/systems/goto/class_printGeneric.inc:988
-#: admin/systems/goto/class_workstationGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:699
 msgid "Generic"
 msgstr "通用配置"
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
 #: admin/systems/goto/workstation.tpl:95
-#: admin/systems/goto/class_workstationGeneric.inc:489
-#: admin/systems/goto/class_terminalGeneric.inc:480
+#: admin/systems/goto/class_workstationGeneric.inc:490
+#: admin/systems/goto/class_terminalGeneric.inc:482
 #: admin/systems/goto/terminal.tpl:84
 msgid "NTP server"
 msgstr "NTP 服务器"
@@ -62,7 +62,7 @@ msgstr "选择要用于同步时间的服务器"
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
 #: admin/systems/goto/workstation.tpl:55
-#: admin/systems/goto/class_terminalGeneric.inc:700
+#: admin/systems/goto/class_terminalGeneric.inc:702
 #: admin/systems/goto/terminal.tpl:47
 msgid "Mode"
 msgstr "模式"
@@ -74,10 +74,8 @@ msgstr "选择终端类型"
 
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
-#: admin/systems/services/syslog/class_goSyslogServer.inc:27
-#: admin/systems/services/syslog/class_goSyslogServer.inc:47
 #: admin/systems/goto/workstation.tpl:65
-#: admin/systems/goto/class_workstationGeneric.inc:712
+#: admin/systems/goto/class_workstationGeneric.inc:713
 #: admin/systems/goto/terminal.tpl:57
 msgid "Syslog server"
 msgstr "日志服务器"
@@ -89,7 +87,7 @@ msgstr "限制记录日志的服务器"
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:703
+#: admin/systems/goto/class_terminalGeneric.inc:705
 #: admin/systems/goto/terminal.tpl:117
 msgid "Root server"
 msgstr "根服务器"
@@ -100,7 +98,7 @@ msgstr "选择要用的 NFS 根文件系统。"
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:704
+#: admin/systems/goto/class_terminalGeneric.inc:706
 #: admin/systems/goto/terminal.tpl:131
 msgid "Swap server"
 msgstr "交换服务器"
@@ -134,20 +132,20 @@ msgid "Execute"
 msgstr "执行"
 
 #: admin/ogroups/goto/class_termgroup.inc:51
-#: admin/systems/goto/class_workstationGeneric.inc:138
-#: admin/systems/goto/class_terminalGeneric.inc:122
+#: admin/systems/goto/class_workstationGeneric.inc:139
+#: admin/systems/goto/class_terminalGeneric.inc:124
 msgid "Activated"
 msgstr "活动"
 
 #: admin/ogroups/goto/class_termgroup.inc:52
-#: admin/systems/goto/class_workstationGeneric.inc:139
-#: admin/systems/goto/class_terminalGeneric.inc:121
+#: admin/systems/goto/class_workstationGeneric.inc:140
+#: admin/systems/goto/class_terminalGeneric.inc:123
 #: addons/goto/class_gotomasses.inc:542
 msgid "Locked"
 msgstr "锁定"
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:281
+#: admin/systems/goto/class_terminalGeneric.inc:283
 #, fuzzy
 msgid "Local swap"
 msgstr "位置名称"
@@ -166,7 +164,7 @@ msgstr "位置名称"
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:154
+#: admin/systems/goto/class_workstationGeneric.inc:155
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -184,22 +182,22 @@ msgstr "位置名称"
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:137
-#: admin/systems/goto/class_terminalGeneric.inc:287
-#: admin/systems/goto/class_terminalGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:139
+#: admin/systems/goto/class_terminalGeneric.inc:289
+#: admin/systems/goto/class_terminalGeneric.inc:301
 msgid "inherited"
 msgstr "继承"
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:635
+#: admin/systems/goto/class_workstationGeneric.inc:213
+#: admin/systems/goto/class_workstationGeneric.inc:636
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
-#: admin/systems/goto/class_workstationService.inc:568
-#: admin/systems/goto/class_terminalGeneric.inc:187
-#: admin/systems/goto/class_terminalGeneric.inc:625
+#: admin/systems/goto/class_workstationService.inc:572
+#: admin/systems/goto/class_terminalGeneric.inc:189
+#: admin/systems/goto/class_terminalGeneric.inc:627
 #: addons/goto/class_gotomasses.inc:328
 #: addons/goto/class_goto_import_file.inc:124
 #, fuzzy
@@ -207,30 +205,30 @@ msgid "Service infrastructure"
 msgstr "在子树中查找"
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:216
-#: admin/systems/goto/class_terminalGeneric.inc:191
+#: admin/systems/goto/class_workstationGeneric.inc:217
+#: admin/systems/goto/class_terminalGeneric.inc:193
 #, fuzzy
 msgid "Event error"
 msgstr "错误"
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:217
-#: admin/systems/goto/class_terminalGeneric.inc:192
+#: admin/systems/goto/class_workstationGeneric.inc:218
+#: admin/systems/goto/class_terminalGeneric.inc:194
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "不允许修改口令"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:298
-#: admin/systems/goto/class_terminalGeneric.inc:265
+#: admin/systems/goto/class_workstationGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:267
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
 msgid "Switch off"
 msgstr "关闭"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:298
-#: admin/systems/goto/class_terminalGeneric.inc:266
+#: admin/systems/goto/class_workstationGeneric.inc:299
+#: admin/systems/goto/class_terminalGeneric.inc:268
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
 msgid "Reboot"
@@ -250,15 +248,15 @@ msgid "Wake"
 msgstr "唤醒"
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:300
-#: admin/systems/goto/class_workstationGeneric.inc:308
+#: admin/systems/goto/class_workstationGeneric.inc:301
+#: admin/systems/goto/class_workstationGeneric.inc:309
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
 msgid "Reinstall"
 msgstr "重新安装"
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:301
+#: admin/systems/goto/class_workstationGeneric.inc:302
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 msgid "Rescan hardware"
@@ -303,13 +301,13 @@ msgstr "系统分析"
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:364
-#: admin/systems/goto/class_workstationGeneric.inc:596
-#: admin/systems/goto/class_workstationGeneric.inc:613
+#: admin/systems/goto/class_workstationGeneric.inc:365
+#: admin/systems/goto/class_workstationGeneric.inc:597
+#: admin/systems/goto/class_workstationGeneric.inc:614
 #: admin/systems/goto/class_workstationStartup.inc:889
-#: admin/systems/goto/class_workstationService.inc:456
-#: admin/systems/goto/class_terminalGeneric.inc:353
-#: admin/systems/goto/class_terminalGeneric.inc:611
+#: admin/systems/goto/class_workstationService.inc:460
+#: admin/systems/goto/class_terminalGeneric.inc:355
+#: admin/systems/goto/class_terminalGeneric.inc:613
 #: personal/environment/class_environment.inc:1058
 #: personal/environment/class_environment.inc:1315
 #, fuzzy
@@ -326,14 +324,14 @@ msgid "System group"
 msgstr "信赖的系统"
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:716
-#: admin/systems/goto/class_terminalGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:717
+#: admin/systems/goto/class_terminalGeneric.inc:711
 #, fuzzy
 msgid "Action flag"
 msgstr "行动"
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:713
+#: admin/systems/goto/class_workstationGeneric.inc:714
 #, fuzzy
 msgid "Ntp server"
 msgstr "NTP 服务器"
@@ -379,34 +377,38 @@ msgstr "设置"
 msgid "Application settings"
 msgstr "应用程序设置"
 
-#: admin/groups/apps/edit_entry.tpl:43
+#: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
 #: admin/devices/class_deviceGeneric.inc:90
 #: admin/devices/class_deviceGeneric.inc:114
 #: admin/devices/class_deviceGeneric.inc:260
 #: admin/applications/class_applicationParameters.inc:190
+#: admin/applications/application-list.xml:41
+#: admin/applications/application-list-release.xml:41
 #: admin/applications/class_applicationGeneric.inc:430
 #: admin/applications/class_applicationGeneric.inc:434
 #: admin/applications/class_applicationGeneric.inc:606
 #: admin/applications/class_applicationGeneric.inc:610
+#: admin/mimetypes/mimetype-list-release.xml:41
+#: admin/mimetypes/mimetype-list.xml:41
 #: admin/mimetypes/class_mimetypeGeneric.inc:532
 #: admin/mimetypes/class_mimetypeGeneric.inc:724
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
-#: admin/systems/services/nfs/class_servNfs.inc:239
+#: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
 #: admin/systems/goto/class_printGeneric.inc:733
 #: admin/systems/goto/class_printGeneric.inc:738
 #: admin/systems/goto/class_printGeneric.inc:757
 #: admin/systems/goto/class_printGeneric.inc:997
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:456
-#: admin/systems/goto/class_workstationGeneric.inc:461
-#: admin/systems/goto/class_workstationGeneric.inc:479
-#: admin/systems/goto/class_terminalGeneric.inc:446
-#: admin/systems/goto/class_terminalGeneric.inc:451
-#: admin/systems/goto/class_terminalGeneric.inc:470
-#: admin/systems/goto/class_terminalGeneric.inc:696
+#: admin/systems/goto/class_workstationGeneric.inc:457
+#: admin/systems/goto/class_workstationGeneric.inc:462
+#: admin/systems/goto/class_workstationGeneric.inc:480
+#: admin/systems/goto/class_terminalGeneric.inc:448
+#: admin/systems/goto/class_terminalGeneric.inc:453
+#: admin/systems/goto/class_terminalGeneric.inc:472
+#: admin/systems/goto/class_terminalGeneric.inc:698
 #: personal/environment/class_logonManagementDialog.inc:103
 msgid "Name"
 msgstr "名称"
@@ -435,8 +437,6 @@ msgid "department"
 msgstr "部门"
 
 #: admin/groups/apps/class_groupApplication.inc:481
-#: admin/applications/class_applicationManagement.inc:368
-#: admin/applications/class_applicationManagement.inc:449
 #: admin/applications/class_applicationGeneric.inc:127
 msgid "application"
 msgstr "应用程序"
@@ -447,7 +447,7 @@ msgid "Not available in release."
 msgstr "当前安装不可用"
 
 #: admin/groups/apps/class_groupApplication.inc:1373
-#: admin/applications/class_applicationManagement.inc:24
+#: admin/applications/class_applicationManagement.inc:25
 #: admin/mimetypes/generic.tpl:117 admin/mimetypes/generic.tpl:177
 msgid "Applications"
 msgstr "应用程序"
@@ -458,8 +458,10 @@ msgid "Group applications"
 msgstr "应用程序"
 
 #: admin/groups/apps/class_groupApplication.inc:1381
-#: admin/applications/class_divListApplication.inc:114
-#: admin/applications/class_divListApplication.inc:150
+#: admin/applications/application-list.xml:15
+#: admin/applications/application-list.xml:74
+#: admin/applications/application-list-release.xml:15
+#: admin/applications/application-list-release.xml:74
 #: admin/applications/class_applicationGeneric.inc:603
 #: admin/mimetypes/class_mimetypeGeneric.inc:728
 msgid "Application"
@@ -467,6 +469,8 @@ msgstr "应用程序"
 
 #: admin/groups/apps/class_groupApplication.inc:1382
 #: admin/groups/apps/app_list.tpl:5 admin/groups/apps/app_list.tpl:53
+#: admin/applications/application-filter-release.tpl:14
+#: admin/mimetypes/mimetype-filter-release.tpl:14
 #: admin/systems/goto/workstationStartup.tpl:83
 #: admin/systems/goto/workstationStartup.tpl:123
 msgid "Release"
@@ -508,10 +512,12 @@ msgstr "向下移动"
 
 #: admin/groups/apps/app_list.tpl:86 admin/groups/apps/app_list.tpl:107
 #: admin/groups/apps/app_list.tpl:132
-#: admin/devices/class_divListDevices.inc:100
+#: admin/devices/class_divListDevices.inc:100 admin/devices/device-list.xml:86
 #: admin/applications/class_applicationParameters.inc:122
-#: admin/applications/class_divListApplication.inc:120
-#: admin/mimetypes/class_divListMimeTypes.inc:122
+#: admin/applications/application-list.xml:86
+#: admin/applications/application-list-release.xml:86
+#: admin/mimetypes/mimetype-list-release.xml:86
+#: admin/mimetypes/mimetype-list.xml:86
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
@@ -562,8 +568,6 @@ msgid "List of defined devices"
 msgstr "设备列表"
 
 #: admin/devices/class_divListDevices.inc:45
-#: admin/applications/class_divListApplication.inc:45
-#: admin/mimetypes/class_divListMimeTypes.inc:45
 #, fuzzy
 msgid "Select all"
 msgstr "选择"
@@ -574,18 +578,15 @@ msgid "Device name"
 msgstr "设备名称"
 
 #: admin/devices/class_divListDevices.inc:51
-#: admin/applications/class_divListApplication.inc:51
-#: admin/mimetypes/class_divListMimeTypes.inc:51
 msgid "Department"
 msgstr "部门"
 
 #: admin/devices/class_divListDevices.inc:52
-#: admin/devices/class_divListDevices.inc:87
-#: admin/applications/class_divListApplication.inc:52
-#: admin/applications/class_divListApplication.inc:107
-#: admin/mimetypes/class_divListMimeTypes.inc:52
-#: admin/mimetypes/class_divListMimeTypes.inc:109
-#: addons/goto/class_gotomasses.inc:365
+#: admin/devices/class_divListDevices.inc:87 admin/devices/device-list.xml:57
+#: admin/applications/application-list.xml:57
+#: admin/applications/application-list-release.xml:57
+#: admin/mimetypes/mimetype-list-release.xml:57
+#: admin/mimetypes/mimetype-list.xml:57 addons/goto/class_gotomasses.inc:365
 msgid "Actions"
 msgstr "动作"
 
@@ -594,18 +595,17 @@ msgid "Display devices matching"
 msgstr "显示匹配的设备"
 
 #: admin/devices/class_divListDevices.inc:82 admin/devices/deviceGeneric.tpl:9
-#: admin/devices/class_deviceGeneric.inc:261 admin/applications/generic.tpl:42
-#: admin/applications/class_divListApplication.inc:90
+#: admin/devices/class_deviceGeneric.inc:261 admin/devices/device-list.tpl:13
+#: admin/applications/generic.tpl:42
 #: admin/applications/class_applicationGeneric.inc:607
-#: admin/mimetypes/generic.tpl:44
-#: admin/mimetypes/class_divListMimeTypes.inc:93
+#: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
+#: admin/mimetypes/mimetype-list.tpl:13
 #: admin/mimetypes/class_mimetypeGeneric.inc:727
-#: admin/systems/services/ldap/class_goLdapServer.inc:79
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
 #: admin/systems/goto/class_printGeneric.inc:998
-#: admin/systems/goto/class_workstationGeneric.inc:710
-#: admin/systems/goto/class_terminalGeneric.inc:698
+#: admin/systems/goto/class_workstationGeneric.inc:711
+#: admin/systems/goto/class_terminalGeneric.inc:700
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/class_target_list.inc:152 addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/class_EventTargetAddList.inc:161
@@ -614,60 +614,51 @@ msgid "Base"
 msgstr "位置"
 
 #: admin/devices/class_divListDevices.inc:84
-#: admin/applications/class_divListApplication.inc:92
-#: admin/mimetypes/class_divListMimeTypes.inc:95
 #: addons/goto/class_target_list.inc:154
 #: addons/goto/events/class_EventTargetAddList.inc:163
 #: addons/goto/events/class_EventTargetAddUsersList.inc:132
 msgid "Submit department"
 msgstr "提交部门"
 
-#: admin/devices/class_divListDevices.inc:84
-#: admin/applications/class_divListApplication.inc:92
-#: admin/mimetypes/class_divListMimeTypes.inc:95
-#: addons/goto/class_target_list.inc:154
+#: admin/devices/class_divListDevices.inc:84 admin/devices/device-list.tpl:13
+#: admin/applications/application-list.tpl:13
+#: admin/mimetypes/mimetype-list.tpl:13 addons/goto/class_target_list.inc:154
 #: addons/goto/events/class_EventTargetAddList.inc:163
 #: addons/goto/events/class_EventTargetAddUsersList.inc:132
 msgid "Submit"
 msgstr "提交"
 
-#: admin/devices/class_divListDevices.inc:92
-#: admin/applications/class_divListApplication.inc:111
-#: admin/mimetypes/class_divListMimeTypes.inc:114
-#: admin/systems/goto/chooser.tpl:16 addons/goto/class_gotomasses.inc:366
+#: admin/devices/class_divListDevices.inc:92 admin/devices/device-list.xml:68
+#: admin/applications/application-list.xml:68
+#: admin/applications/application-list-release.xml:68
+#: admin/mimetypes/mimetype-list-release.xml:68
+#: admin/mimetypes/mimetype-list.xml:68 admin/systems/goto/chooser.tpl:16
+#: addons/goto/class_gotomasses.inc:366
 msgid "Create"
 msgstr "创建"
 
 #: admin/devices/class_divListDevices.inc:94
-#: admin/devices/class_divListDevices.inc:131
-#: admin/devices/class_deviceGeneric.inc:159
+#: admin/devices/class_divListDevices.inc:131 admin/devices/device-list.xml:15
+#: admin/devices/device-list.xml:74 admin/devices/class_deviceGeneric.inc:159
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 msgid "Device"
 msgstr "设备"
 
 #: admin/devices/class_divListDevices.inc:156
-#: admin/applications/class_divListApplication.inc:186
-#: admin/mimetypes/class_divListMimeTypes.inc:186
 msgid "edit"
 msgstr "编辑"
 
 #: admin/devices/class_divListDevices.inc:156
-#: admin/applications/class_divListApplication.inc:186
-#: admin/mimetypes/class_divListMimeTypes.inc:186
 msgid "Edit this entry"
 msgstr "编辑这条记录"
 
 #: admin/devices/class_divListDevices.inc:163
-#: admin/applications/class_divListApplication.inc:202
-#: admin/mimetypes/class_divListMimeTypes.inc:201
 #: admin/systems/ppd/class_printerPPDSelectionDialog.inc:140
 msgid "delete"
 msgstr "删除"
 
 #: admin/devices/class_divListDevices.inc:163
-#: admin/applications/class_divListApplication.inc:202
-#: admin/mimetypes/class_divListMimeTypes.inc:201
 msgid "Delete this entry"
 msgstr "删除这个条目"
 
@@ -677,44 +668,45 @@ msgid "Number of listed devices"
 msgstr "部门名称"
 
 #: admin/devices/class_divListDevices.inc:206
-#: admin/applications/class_divListApplication.inc:243
-#: admin/mimetypes/class_divListMimeTypes.inc:244
 #, fuzzy
 msgid "Number of listed departments"
 msgstr "部门名称"
 
-#: admin/devices/remove.tpl:6
-#, fuzzy
+#: admin/devices/remove.tpl:6 admin/applications/remove.tpl:6
+#: admin/mimetypes/remove.tpl:6
 msgid ""
-"This may be used by several users/groups. Please double check if your really "
-"want to do this since there is no way for GOsa to get your data back."
-msgstr ""
-"这可能被好几个组使用。请再次检查您是否要这么做，因为 GOsa 没有办法将您的数据"
-"找回。"
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr "请再次检查您是否要这么做，因为 GOsa 没有办法将您的数据找回。"
 
-#: admin/devices/remove.tpl:9 admin/applications/remove.tpl:9
-#: admin/mimetypes/remove.tpl:9 addons/goto/remove.tpl:9
+#: admin/devices/remove.tpl:10 admin/applications/remove.tpl:10
+#: admin/mimetypes/remove.tpl:10 addons/goto/remove.tpl:9
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "所以，如果您确定，请按“删除”继续，否则按“取消”退出。"
 
-#: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:257
-msgid "Devices"
-msgstr "设备"
+#: admin/devices/device-list.xml:11
+#, fuzzy
+msgid "List of devices"
+msgstr "设备列表"
 
-#: admin/devices/deviceGeneric.tpl:29 admin/devices/class_deviceGeneric.inc:93
+#: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:29
+#: admin/devices/class_deviceGeneric.inc:93
 #: admin/devices/class_deviceGeneric.inc:262 admin/applications/generic.tpl:33
+#: admin/applications/application-list.xml:49
+#: admin/applications/application-list-release.xml:49
 #: admin/applications/class_applicationGeneric.inc:608
 #: admin/mimetypes/generic.tpl:34 admin/mimetypes/paste_generic.tpl:21
+#: admin/mimetypes/mimetype-list-release.xml:49
+#: admin/mimetypes/mimetype-list.xml:49
 #: admin/mimetypes/class_mimetypeGeneric.inc:726
 #: admin/systems/services/shares/class_goShareServer.inc:424
-#: admin/systems/services/nfs/class_servNfs.inc:211
+#: admin/systems/services/nfs/class_servNfs.inc:207
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
 #: admin/systems/goto/class_printGeneric.inc:999
-#: admin/systems/goto/class_workstationGeneric.inc:708
-#: admin/systems/goto/class_terminalGeneric.inc:697
+#: admin/systems/goto/class_workstationGeneric.inc:709
+#: admin/systems/goto/class_terminalGeneric.inc:699
 #: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
 #: addons/goto/class_gotomasses.inc:932
 #: personal/environment/class_logonManagementDialog.inc:111
@@ -722,6 +714,21 @@ msgstr "设备"
 msgid "Description"
 msgstr "描述"
 
+#: admin/devices/device-list.xml:118
+#, fuzzy
+msgid "Edit device"
+msgstr "声卡"
+
+#: admin/devices/device-list.xml:131
+#, fuzzy
+msgid "Remove device"
+msgstr "删除图片"
+
+#: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
+#: admin/devices/class_deviceGeneric.inc:257
+msgid "Devices"
+msgstr "设备"
+
 #: admin/devices/deviceGeneric.tpl:38
 #, fuzzy
 msgid "Device type"
@@ -758,10 +765,14 @@ msgstr "产品-ID"
 msgid "(idProduct)"
 msgstr "(idProduct)"
 
-#: admin/devices/main.inc:49 admin/devices/main.inc:51
+#: admin/devices/device-filter.tpl:3
+#: admin/applications/application-filter.tpl:3
+#: admin/applications/application-filter-release.tpl:3
+#: admin/mimetypes/mimetype-filter-release.tpl:3
+#: admin/mimetypes/mimetype-filter.tpl:3
 #, fuzzy
-msgid "Hotplug device management"
-msgstr "热插拔管理"
+msgid "Filter"
+msgstr "过滤器"
 
 #: admin/devices/class_deviceGeneric.inc:29
 msgid "Digital camera"
@@ -864,54 +875,22 @@ msgstr "供应商-ID"
 msgid "Device ID"
 msgstr "设备"
 
-#: admin/devices/class_deviceManagement.inc:7
+#: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:82
+#: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:84
+#: admin/mimetypes/mimetype-list.tpl:13
+msgid "Update"
+msgstr "更新"
+
+#: admin/devices/class_deviceManagement.inc:25
 #: personal/environment/class_environment.inc:1783
 #: personal/environment/environment.tpl:293
 msgid "Hotplug devices"
 msgstr "热插拔设备"
 
-#: admin/devices/class_deviceManagement.inc:8
-#, fuzzy
-msgid "Manage hotplug devices"
-msgstr "添加热插拔设备"
-
-#: admin/devices/class_deviceManagement.inc:246
-#: admin/applications/class_applicationManagement.inc:352
-#: admin/mimetypes/class_mimetypeManagement.inc:360
-#: addons/goto/class_gotomasses.inc:230
-#, fuzzy
-msgid "Permission"
-msgstr "允许"
-
-#: admin/devices/class_deviceManagement.inc:263
-#: admin/devices/class_deviceManagement.inc:345
-#, fuzzy
-msgid "device"
-msgstr "设备"
-
-#: admin/devices/class_deviceManagement.inc:296
-#: admin/devices/class_deviceManagement.inc:352
-#: admin/devices/class_deviceManagement.inc:381
-#: admin/applications/class_applicationManagement.inc:401
-#: admin/applications/class_applicationManagement.inc:456
-#: admin/applications/class_applicationManagement.inc:487
-#: admin/mimetypes/class_mimetypeManagement.inc:412
-#: admin/mimetypes/class_mimetypeManagement.inc:466
-#: admin/mimetypes/class_mimetypeManagement.inc:496
-#: admin/systems/goto/class_printGeneric.inc:1019
-#: admin/systems/goto/class_printGeneric.inc:1041
-#: personal/environment/class_environment.inc:583
+#: admin/devices/class_deviceManagement.inc:26
 #, fuzzy
-msgid "Permission error"
-msgstr "允许"
-
-#: admin/applications/remove.tpl:6 admin/mimetypes/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 ""
-"这可能被好几个组使用。请再次检查您是否要这么做，因为 GOsa 没有办法将您的数据"
-"找回。"
+msgid "Hotplug device management"
+msgstr "热插拔管理"
 
 #: admin/applications/release_select.tpl:2
 #: admin/mimetypes/release_select.tpl:2
@@ -964,7 +943,6 @@ msgid "Application parameter settings"
 msgstr "应用程序设置"
 
 #: admin/applications/generic.tpl:7 admin/applications/generic.tpl:10
-#: admin/applications/class_divListApplication.inc:51
 #: admin/applications/class_applicationGeneric.inc:561
 msgid "Application name"
 msgstr "应用程序名称"
@@ -999,10 +977,6 @@ msgstr "选择一个位置"
 msgid "Icon"
 msgstr "图标"
 
-#: admin/applications/generic.tpl:82 admin/mimetypes/generic.tpl:84
-msgid "Update"
-msgstr "更新"
-
 #: admin/applications/generic.tpl:82
 msgid "Reload picture from LDAP"
 msgstr "从 LDAP 重新加载图片"
@@ -1066,38 +1040,27 @@ msgstr "导入"
 msgid "Download"
 msgstr "下载"
 
-#: admin/applications/class_applicationManagement.inc:25
-#: personal/environment/class_environment.inc:10
-#, fuzzy
-msgid "This does something"
-msgstr "******"
+#: admin/applications/class_applicationManagement.inc:26
+msgid "Application management"
+msgstr "应用程序管理"
 
-#: admin/applications/class_divListApplication.inc:25
-msgid "List of Applications"
+#: admin/applications/application-list.xml:11
+#: admin/applications/application-list-release.xml:11
+#, fuzzy
+msgid "List of applications"
 msgstr "应用程序列表"
 
-#: admin/applications/class_divListApplication.inc:26
-msgid "This table displays all applications in the selected tree."
-msgstr "这个表显示在所选树下的所有应用程序。"
-
-#: admin/applications/class_divListApplication.inc:58
-#: personal/environment/hotplugDialog.tpl:43
-msgid "Display users matching"
-msgstr "显示匹配的用户"
-
-#: admin/applications/class_divListApplication.inc:199
-#: admin/mimetypes/class_divListMimeTypes.inc:198
-msgid "Freezed"
-msgstr ""
-
-#: admin/applications/class_divListApplication.inc:242
+#: admin/applications/application-list.xml:118
+#: admin/applications/application-list-release.xml:118
 #, fuzzy
-msgid "Number of listed applications"
-msgstr "使用的应用程序"
+msgid "Edit application"
+msgstr "应用程序"
 
-#: admin/applications/main.inc:48 admin/applications/main.inc:50
-msgid "Application management"
-msgstr "应用程序管理"
+#: admin/applications/application-list.xml:131
+#: admin/applications/application-list-release.xml:131
+#, fuzzy
+msgid "Remove application"
+msgstr "应用程序"
 
 #: admin/applications/class_applicationGeneric.inc:95
 msgid "no example"
@@ -1142,24 +1105,21 @@ msgstr "应用程序名称"
 msgid "Script content"
 msgstr "变量内容"
 
-#: admin/mimetypes/class_mimetypeManagement.inc:24
+#: admin/mimetypes/class_mimetypeManagement.inc:25
 #: admin/mimetypes/class_mimetypeGeneric.inc:721
 #, fuzzy
 msgid "Mime types"
 msgstr "Mime-type"
 
-#: admin/mimetypes/class_mimetypeManagement.inc:25
+#: admin/mimetypes/class_mimetypeManagement.inc:26
 #, fuzzy
 msgid "Manage mime types"
 msgstr "管理操作系统类型"
 
-#: admin/mimetypes/class_mimetypeManagement.inc:378
-#: admin/mimetypes/class_mimetypeManagement.inc:459
-#: admin/mimetypes/generic.tpl:12
-#: admin/mimetypes/class_divListMimeTypes.inc:51
-#: admin/mimetypes/class_divListMimeTypes.inc:116
-#: admin/mimetypes/class_divListMimeTypes.inc:152
-#: admin/mimetypes/paste_generic.tpl:13
+#: admin/mimetypes/generic.tpl:12 admin/mimetypes/paste_generic.tpl:13
+#: admin/mimetypes/mimetype-list-release.xml:15
+#: admin/mimetypes/mimetype-list-release.xml:74
+#: admin/mimetypes/mimetype-list.xml:15 admin/mimetypes/mimetype-list.xml:74
 #, fuzzy
 msgid "Mime type"
 msgstr "Mime-type"
@@ -1239,31 +1199,28 @@ msgstr ""
 msgid "Ask whether to save to local disk"
 msgstr ""
 
-#: admin/mimetypes/class_divListMimeTypes.inc:27
-#: admin/mimetypes/class_divListMimeTypes.inc:28
-#, fuzzy
-msgid "List of defined mime types"
-msgstr "预定义黑名单列表"
-
-#: admin/mimetypes/class_divListMimeTypes.inc:58
+#: admin/mimetypes/paste_generic.tpl:24
 #, fuzzy
-msgid "Display mime types matching"
-msgstr "显示匹配的硒鼓类型"
+msgid "Please specify a description for this mime type here"
+msgstr "请为这个附件指定一个有效名称。"
 
-#: admin/mimetypes/class_divListMimeTypes.inc:243
+#: admin/mimetypes/mimetype-list-release.xml:11
+#: admin/mimetypes/mimetype-list.xml:11
 #, fuzzy
-msgid "Number of listed mimetypes"
+msgid "List of mimetypes"
 msgstr "预定义黑名单列表"
 
-#: admin/mimetypes/paste_generic.tpl:24
+#: admin/mimetypes/mimetype-list-release.xml:118
+#: admin/mimetypes/mimetype-list.xml:118
 #, fuzzy
-msgid "Please specify a description for this mime type here"
-msgstr "请为这个附件指定一个有效名称。"
+msgid "Edit mimetype"
+msgstr "编辑这条记录"
 
-#: admin/mimetypes/main.inc:48 admin/mimetypes/main.inc:50
+#: admin/mimetypes/mimetype-list-release.xml:131
+#: admin/mimetypes/mimetype-list.xml:131
 #, fuzzy
-msgid "Mimetype management"
-msgstr "系统管理"
+msgid "Remove mimetype"
+msgstr "删除图片"
 
 #: admin/mimetypes/class_mimetypeGeneric.inc:535
 #, fuzzy
@@ -1290,7 +1247,6 @@ msgid "Print Service"
 msgstr "打印服务"
 
 #: admin/systems/services/cups/goCupsServer.tpl:1
-#: admin/systems/services/syslog/goSyslogServer.tpl:1
 #, fuzzy
 msgid "enabled"
 msgstr "禁用"
@@ -1313,24 +1269,19 @@ msgstr "上"
 #: admin/systems/services/ntp/class_goNtpServer.inc:115
 #: admin/systems/services/terminal/class_goTerminalServer.inc:165
 #: admin/systems/services/shares/class_goShareServer.inc:414
-#: admin/systems/services/syslog/class_goSyslogServer.inc:69
-#: admin/systems/services/syslog/class_goLogDBServer.inc:93
 msgid "Services"
 msgstr "服务"
 
 #: admin/systems/services/cups/class_goCupsServer.inc:77
-#: admin/systems/services/syslog/class_goLogDBServer.inc:101
 #, fuzzy
 msgid "Start"
 msgstr "启动"
 
 #: admin/systems/services/cups/class_goCupsServer.inc:78
-#: admin/systems/services/syslog/class_goLogDBServer.inc:102
 msgid "Stop"
 msgstr "停止"
 
 #: admin/systems/services/cups/class_goCupsServer.inc:79
-#: admin/systems/services/syslog/class_goLogDBServer.inc:103
 #, fuzzy
 msgid "Restart"
 msgstr "重试"
@@ -1376,6 +1327,8 @@ msgid "LDAP service"
 msgstr "LDAP 服务"
 
 #: admin/systems/services/ldap/goLdapServer.tpl:2
+#: admin/systems/services/ldap/class_goLdapServer.inc:79
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
 msgid "LDAP URI"
 msgstr ""
 
@@ -1383,6 +1336,24 @@ msgstr ""
 msgid "fill-in-your-servers-dns-name"
 msgstr ""
 
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
+#: admin/systems/services/nfs/servnfs.tpl:39
+#: admin/systems/goto/class_ArpNewDevice.inc:38
+#: admin/systems/goto/class_SelectDeviceType.inc:39
+#: addons/goto/class_target_list.inc:201
+#: addons/goto/events/class_EventTargetAddList.inc:238
+#: personal/environment/environment.tpl:135
+msgid "Server"
+msgstr "服务器"
+
+#: admin/systems/services/ldap/class_goLdapServer.inc:82
+#: admin/systems/goto/class_gotoLpdEnabled.inc:153
+#: admin/systems/goto/terminalService.tpl:58
+#: admin/systems/goto/workstationService.tpl:66
+#: admin/systems/goto/gotoLpdEnable.tpl:71
+msgid "Port"
+msgstr "端口"
+
 #: admin/systems/services/ldap/class_goLdapServer.inc:128
 #: admin/systems/services/ldap/class_goLdapServer.inc:129
 msgid "Ldap"
@@ -1486,13 +1457,13 @@ msgid "Path"
 msgstr "路径"
 
 #: admin/systems/services/shares/class_goShareServer.inc:428
-#: admin/systems/services/nfs/class_servNfs.inc:219
+#: admin/systems/services/nfs/class_servNfs.inc:215
 #: admin/systems/services/nfs/servnfs.tpl:121
 msgid "Option"
 msgstr "选项"
 
 #: admin/systems/services/shares/class_goShareServer.inc:429
-#: admin/systems/services/nfs/class_servNfs.inc:215
+#: admin/systems/services/nfs/class_servNfs.inc:211
 #: admin/systems/services/nfs/servnfs.tpl:29
 msgid "Volume"
 msgstr "卷"
@@ -1505,10 +1476,6 @@ msgstr ""
 msgid "'Path / Volume' must contain at least one '/'!"
 msgstr ""
 
-#: admin/systems/services/nfs/class_servNfs.inc:205
-msgid "Hidden shares must have a '$' at the end of the name!"
-msgstr ""
-
 #: admin/systems/services/nfs/servnfs.tpl:1
 msgid "Edit share"
 msgstr "编辑共享"
@@ -1517,15 +1484,6 @@ msgstr "编辑共享"
 msgid "NFS setup"
 msgstr "NFS 设置"
 
-#: admin/systems/services/nfs/servnfs.tpl:39
-#: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_SelectDeviceType.inc:39
-#: addons/goto/class_target_list.inc:201
-#: addons/goto/events/class_EventTargetAddList.inc:238
-#: personal/environment/environment.tpl:135
-msgid "Server"
-msgstr "服务器"
-
 #: admin/systems/services/nfs/servnfs.tpl:69
 msgid "Auto-mount share on Apple systems"
 msgstr "自动挂载共享到苹果系统"
@@ -1534,60 +1492,6 @@ msgstr "自动挂载共享到苹果系统"
 msgid "Codepage"
 msgstr "代码页"
 
-#: admin/systems/services/syslog/goSyslogServer.tpl:1
-msgid "Syslog Service"
-msgstr "Syslog 服务"
-
-#: admin/systems/services/syslog/class_goSyslogServer.inc:68
-#: admin/systems/services/syslog/class_goSyslogServer.inc:69
-#, fuzzy
-msgid "Logging service"
-msgstr "Logging DB 用户"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:31
-#: admin/systems/services/syslog/class_goLogDBServer.inc:59
-#, fuzzy
-msgid "Syslog service database"
-msgstr "日志服务器"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:69
-#: admin/systems/goto/class_printGeneric.inc:976
-#: addons/goto/events/class_EventTargetAddUsersList.inc:171
-msgid "User"
-msgstr "用户"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:72
-#: admin/systems/services/syslog/class_goLogDBServer.inc:105
-#: admin/systems/services/syslog/goLogDBServer.tpl:20
-msgid "Password"
-msgstr "口令"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:75
-#: admin/systems/services/syslog/class_goLogDBServer.inc:106
-#: admin/systems/services/syslog/goLogDBServer.tpl:4
-#, fuzzy
-msgid "Database"
-msgstr "粘贴"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:92
-#: admin/systems/services/syslog/class_goLogDBServer.inc:93
-msgid "Logging database"
-msgstr "日志数据库"
-
-#: admin/systems/services/syslog/class_goLogDBServer.inc:104
-#, fuzzy
-msgid "Admin"
-msgstr "管理员"
-
-#: admin/systems/services/syslog/goLogDBServer.tpl:1
-#, fuzzy
-msgid "Logging database information"
-msgstr "日志数据库"
-
-#: admin/systems/services/syslog/goLogDBServer.tpl:12
-msgid "Logging DB user"
-msgstr "Logging DB 用户"
-
 #: admin/systems/goto/workstation.tpl:1 admin/systems/goto/terminal.tpl:1
 msgid "Properties"
 msgstr "属性"
@@ -1597,13 +1501,13 @@ msgid "Workstation template"
 msgstr "工作站模板"
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:707
+#: admin/systems/goto/class_workstationGeneric.inc:708
 msgid "Workstation name"
 msgstr "工作站名称"
 
 #: admin/systems/goto/workstation.tpl:27
 #: admin/systems/goto/class_printGeneric.inc:1000
-#: admin/systems/goto/class_workstationGeneric.inc:709
+#: admin/systems/goto/class_workstationGeneric.inc:710
 msgid "Location"
 msgstr "位置"
 
@@ -1706,13 +1610,6 @@ msgstr "添加"
 msgid "bit/s"
 msgstr "比特"
 
-#: admin/systems/goto/class_gotoLpdEnabled.inc:153
-#: admin/systems/goto/terminalService.tpl:58
-#: admin/systems/goto/workstationService.tpl:66
-#: admin/systems/goto/gotoLpdEnable.tpl:71
-msgid "Port"
-msgstr "端口"
-
 #: admin/systems/goto/ArpNewDevice.tpl:1
 msgid "Integrating unknown devices"
 msgstr ""
@@ -1849,13 +1746,13 @@ msgstr "该打印机属于终端 %s。您不能重命名该打印机。"
 #: admin/systems/goto/class_printGeneric.inc:593
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:230
+#: admin/systems/goto/class_terminalGeneric.inc:232
 #, fuzzy
 msgid "terminal"
 msgstr "终端"
 
 #: admin/systems/goto/class_printGeneric.inc:595
-#: admin/systems/goto/class_workstationGeneric.inc:226
+#: admin/systems/goto/class_workstationGeneric.inc:227
 #: admin/systems/goto/class_workstationStartup.inc:285
 #, fuzzy
 msgid "workstation"
@@ -1878,6 +1775,11 @@ msgstr "打印机 URL"
 msgid "Group"
 msgstr "组"
 
+#: admin/systems/goto/class_printGeneric.inc:976
+#: addons/goto/events/class_EventTargetAddUsersList.inc:171
+msgid "User"
+msgstr "用户"
+
 #: admin/systems/goto/class_printGeneric.inc:989
 #, fuzzy
 msgid "Print generic"
@@ -1904,6 +1806,13 @@ msgstr "打印机"
 msgid "Permissions"
 msgstr "允许"
 
+#: admin/systems/goto/class_printGeneric.inc:1019
+#: admin/systems/goto/class_printGeneric.inc:1041
+#: personal/environment/class_environment.inc:583
+#, fuzzy
+msgid "Permission error"
+msgstr "允许"
+
 #: admin/systems/goto/class_printGeneric.inc:1019
 #: admin/systems/goto/class_printGeneric.inc:1041
 #, fuzzy
@@ -2034,7 +1943,7 @@ msgid "System informations"
 msgstr "系统信息"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:704
+#: admin/systems/goto/class_workstationGeneric.inc:705
 #: admin/systems/goto/class_SelectDeviceType.inc:39
 #: addons/goto/class_target_list.inc:203
 #: addons/goto/events/class_EventTargetAddList.inc:249
@@ -2043,8 +1952,8 @@ msgstr "工作站"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:39
-#: admin/systems/goto/class_terminalGeneric.inc:687
-#: admin/systems/goto/class_terminalGeneric.inc:693
+#: admin/systems/goto/class_terminalGeneric.inc:689
+#: admin/systems/goto/class_terminalGeneric.inc:695
 msgid "Terminal"
 msgstr "终端"
 
@@ -2146,13 +2055,13 @@ msgid "unknown"
 msgstr "未知"
 
 #: admin/systems/goto/class_terminalService.inc:703
-#: admin/systems/goto/class_workstationService.inc:498
+#: admin/systems/goto/class_workstationService.inc:502
 #, fuzzy
 msgid "Service"
 msgstr "服务"
 
 #: admin/systems/goto/class_terminalService.inc:713
-#: admin/systems/goto/class_workstationService.inc:507
+#: admin/systems/goto/class_workstationService.inc:511
 #, fuzzy
 msgid "Monitor"
 msgstr "显示器大小"
@@ -2168,19 +2077,19 @@ msgid "Remote desktop"
 msgstr "远程桌面"
 
 #: admin/systems/goto/class_terminalService.inc:716
-#: admin/systems/goto/class_workstationService.inc:508
+#: admin/systems/goto/class_workstationService.inc:512
 #, fuzzy
 msgid "Gfx driver"
 msgstr "新驱动"
 
 #: admin/systems/goto/class_terminalService.inc:717
-#: admin/systems/goto/class_workstationService.inc:509
+#: admin/systems/goto/class_workstationService.inc:513
 #, fuzzy
 msgid "Gfx resolution"
 msgstr "分辨率"
 
 #: admin/systems/goto/class_terminalService.inc:718
-#: admin/systems/goto/class_workstationService.inc:510
+#: admin/systems/goto/class_workstationService.inc:514
 #, fuzzy
 msgid "Gfx color depth"
 msgstr "颜色深度"
@@ -2188,10 +2097,10 @@ msgstr "颜色深度"
 #: admin/systems/goto/class_terminalService.inc:719
 #: admin/systems/goto/terminalService.tpl:150
 #: admin/systems/goto/workstationService.tpl:170
-#: admin/systems/goto/class_workstationService.inc:402
 #: admin/systems/goto/class_workstationService.inc:404
-#: admin/systems/goto/class_workstationService.inc:409
-#: admin/systems/goto/class_workstationService.inc:511
+#: admin/systems/goto/class_workstationService.inc:406
+#: admin/systems/goto/class_workstationService.inc:412
+#: admin/systems/goto/class_workstationService.inc:515
 msgid "HSync"
 msgstr "HSync"
 
@@ -2200,8 +2109,8 @@ msgstr "HSync"
 #: admin/systems/goto/workstationService.tpl:181
 #: admin/systems/goto/class_workstationService.inc:385
 #: admin/systems/goto/class_workstationService.inc:387
-#: admin/systems/goto/class_workstationService.inc:392
-#: admin/systems/goto/class_workstationService.inc:512
+#: admin/systems/goto/class_workstationService.inc:393
+#: admin/systems/goto/class_workstationService.inc:516
 msgid "VSync"
 msgstr "VSync"
 
@@ -2210,7 +2119,7 @@ msgid "Auto-Sync"
 msgstr ""
 
 #: admin/systems/goto/class_terminalService.inc:722
-#: admin/systems/goto/class_workstationService.inc:514
+#: admin/systems/goto/class_workstationService.inc:518
 #, fuzzy
 msgid "Scanner enabled"
 msgstr "保存打印机失败"
@@ -2222,31 +2131,31 @@ msgid "Printer enabled"
 msgstr "打印机名称"
 
 #: admin/systems/goto/class_terminalService.inc:724
-#: admin/systems/goto/class_workstationService.inc:515
+#: admin/systems/goto/class_workstationService.inc:519
 #, fuzzy
 msgid "Keyboard model"
 msgstr "选择键盘类型"
 
 #: admin/systems/goto/class_terminalService.inc:725
-#: admin/systems/goto/class_workstationService.inc:516
+#: admin/systems/goto/class_workstationService.inc:520
 #, fuzzy
 msgid "Keyboard layout"
 msgstr "选择键盘布局"
 
 #: admin/systems/goto/class_terminalService.inc:726
-#: admin/systems/goto/class_workstationService.inc:517
+#: admin/systems/goto/class_workstationService.inc:521
 #, fuzzy
 msgid "Keyboard variant"
 msgstr "选择键盘变种"
 
 #: admin/systems/goto/class_terminalService.inc:727
-#: admin/systems/goto/class_workstationService.inc:518
+#: admin/systems/goto/class_workstationService.inc:522
 #, fuzzy
 msgid "Mouse type"
 msgstr "电话类型"
 
 #: admin/systems/goto/class_terminalService.inc:728
-#: admin/systems/goto/class_workstationService.inc:519
+#: admin/systems/goto/class_workstationService.inc:523
 #, fuzzy
 msgid "Mouse port"
 msgstr "挂载点"
@@ -2254,7 +2163,7 @@ msgstr "挂载点"
 #: admin/systems/goto/class_terminalService.inc:730
 #: admin/systems/goto/terminalService.tpl:76
 #: admin/systems/goto/workstationService.tpl:86
-#: admin/systems/goto/class_workstationService.inc:520
+#: admin/systems/goto/class_workstationService.inc:524
 msgid "Telephone hardware"
 msgstr "电话硬件"
 
@@ -2351,57 +2260,57 @@ msgstr "声音服务"
 msgid "GUI"
 msgstr "GUI"
 
-#: admin/systems/goto/class_workstationGeneric.inc:299
-#: admin/systems/goto/class_workstationGeneric.inc:309
+#: admin/systems/goto/class_workstationGeneric.inc:300
+#: admin/systems/goto/class_workstationGeneric.inc:310
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
 #, fuzzy
 msgid "Software update"
 msgstr "立即更新"
 
-#: admin/systems/goto/class_workstationGeneric.inc:303
-#: admin/systems/goto/class_workstationGeneric.inc:311
+#: admin/systems/goto/class_workstationGeneric.inc:304
+#: admin/systems/goto/class_workstationGeneric.inc:312
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr "强制本地启动"
 
-#: admin/systems/goto/class_workstationGeneric.inc:307
-#: admin/systems/goto/class_terminalGeneric.inc:271
+#: admin/systems/goto/class_workstationGeneric.inc:308
+#: admin/systems/goto/class_terminalGeneric.inc:273
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr "唤醒"
 
-#: admin/systems/goto/class_workstationGeneric.inc:500
+#: admin/systems/goto/class_workstationGeneric.inc:501
 msgid "A valid LDAP server assignement is missing!"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:510
+#: admin/systems/goto/class_workstationGeneric.inc:511
 #, fuzzy
 msgid "Software deployment"
 msgstr "系统类型"
 
-#: admin/systems/goto/class_workstationGeneric.inc:511
+#: admin/systems/goto/class_workstationGeneric.inc:512
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:699
+#: admin/systems/goto/class_workstationGeneric.inc:700
 #, fuzzy
 msgid "Workstation generic"
 msgstr "工作站名称"
 
-#: admin/systems/goto/class_workstationGeneric.inc:711
+#: admin/systems/goto/class_workstationGeneric.inc:712
 #, fuzzy
 msgid "Goto mode"
 msgstr "到目录"
 
-#: admin/systems/goto/class_workstationGeneric.inc:714
-#: admin/systems/goto/class_terminalGeneric.inc:707
+#: admin/systems/goto/class_workstationGeneric.inc:715
+#: admin/systems/goto/class_terminalGeneric.inc:709
 #, fuzzy
 msgid "Root password"
 msgstr "设置口令"
 
-#: admin/systems/goto/class_workstationGeneric.inc:715
+#: admin/systems/goto/class_workstationGeneric.inc:716
 #, fuzzy
 msgid "Create FAI CD"
 msgstr "创建"
@@ -2669,12 +2578,12 @@ msgstr ""
 msgid "Create ISO-Image"
 msgstr "创建 ISO 镜像"
 
-#: admin/systems/goto/class_workstationService.inc:499
+#: admin/systems/goto/class_workstationService.inc:503
 #, fuzzy
 msgid "Workstation service"
 msgstr "工作站名称"
 
-#: admin/systems/goto/class_workstationService.inc:513
+#: admin/systems/goto/class_workstationService.inc:517
 #, fuzzy
 msgid "Use DDC"
 msgstr "用户 ID"
@@ -2784,17 +2693,17 @@ msgstr "分配的 FAI 类"
 msgid "set"
 msgstr "设置"
 
-#: admin/systems/goto/class_terminalGeneric.inc:688
+#: admin/systems/goto/class_terminalGeneric.inc:690
 #, fuzzy
 msgid "Terminal generic"
 msgstr "终端服务"
 
-#: admin/systems/goto/class_terminalGeneric.inc:701
+#: admin/systems/goto/class_terminalGeneric.inc:703
 #, fuzzy
 msgid "Syslog server enabled"
 msgstr "日志服务器"
 
-#: admin/systems/goto/class_terminalGeneric.inc:706
+#: admin/systems/goto/class_terminalGeneric.inc:708
 #, fuzzy
 msgid "Ntp server settings"
 msgstr "用户设置"
@@ -3303,6 +3212,11 @@ msgstr "系统状态"
 msgid "System deployment status"
 msgstr "系统类型"
 
+#: addons/goto/class_gotomasses.inc:230
+#, fuzzy
+msgid "Permission"
+msgstr "允许"
+
 #: addons/goto/class_gotomasses.inc:270
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
@@ -3837,6 +3751,11 @@ msgstr ""
 msgid "Environment"
 msgstr "环境设置"
 
+#: personal/environment/class_environment.inc:10
+#, fuzzy
+msgid "This does something"
+msgstr "******"
+
 #: personal/environment/class_environment.inc:139
 #, fuzzy, php-format
 msgid "Device '%s' is not available anymore. It will be removed!"
@@ -4143,10 +4062,89 @@ msgstr "选择添加一个热插拔设备"
 msgid "Choose the department the search will be based    on"
 msgstr "选择一个部门来做查询"
 
+#: personal/environment/hotplugDialog.tpl:43
+msgid "Display users matching"
+msgstr "显示匹配的用户"
+
 #: personal/environment/hotplugDialog.tpl:48
 msgid "Regular expression for        matching hotplugs"
 msgstr "用于匹配热插拔的正则表达式"
 
+#, fuzzy
+#~ msgid ""
+#~ "This may be used by several users/groups. Please double check if your "
+#~ "really want to do this since there is no way for GOsa to get your data "
+#~ "back."
+#~ msgstr ""
+#~ "这可能被好几个组使用。请再次检查您是否要这么做，因为 GOsa 没有办法将您的数"
+#~ "据找回。"
+
+#, fuzzy
+#~ msgid "Manage hotplug devices"
+#~ msgstr "添加热插拔设备"
+
+#, fuzzy
+#~ msgid "device"
+#~ msgstr "设备"
+
+#~ 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 ""
+#~ "这可能被好几个组使用。请再次检查您是否要这么做，因为 GOsa 没有办法将您的数"
+#~ "据找回。"
+
+#~ msgid "This table displays all applications in the selected tree."
+#~ msgstr "这个表显示在所选树下的所有应用程序。"
+
+#, fuzzy
+#~ msgid "Number of listed applications"
+#~ msgstr "使用的应用程序"
+
+#, fuzzy
+#~ msgid "Display mime types matching"
+#~ msgstr "显示匹配的硒鼓类型"
+
+#, fuzzy
+#~ msgid "Number of listed mimetypes"
+#~ msgstr "预定义黑名单列表"
+
+#, fuzzy
+#~ msgid "Mimetype management"
+#~ msgstr "系统管理"
+
+#~ msgid "Syslog Service"
+#~ msgstr "Syslog 服务"
+
+#, fuzzy
+#~ msgid "Logging service"
+#~ msgstr "Logging DB 用户"
+
+#, fuzzy
+#~ msgid "Syslog service database"
+#~ msgstr "日志服务器"
+
+#~ msgid "Password"
+#~ msgstr "口令"
+
+#, fuzzy
+#~ msgid "Database"
+#~ msgstr "粘贴"
+
+#~ msgid "Logging database"
+#~ msgstr "日志数据库"
+
+#, fuzzy
+#~ msgid "Admin"
+#~ msgstr "管理员"
+
+#, fuzzy
+#~ msgid "Logging database information"
+#~ msgstr "日志数据库"
+
+#~ msgid "Logging DB user"
+#~ msgstr "Logging DB 用户"
+
 #, fuzzy
 #~ msgid "Vendor ID"
 #~ msgstr "供应商-ID"
@@ -6683,11 +6681,6 @@ msgstr "用于匹配热插拔的正则表达式"
 #~ msgid "Windows Install"
 #~ msgstr "Windows 工作站"
 
-#~ msgid ""
-#~ "Please double check if you really want to do this since there is no way "
-#~ "for GOsa to get your data back."
-#~ msgstr "请再次检查您是否要这么做，因为 GOsa 没有办法将您的数据找回。"
-
 #~ msgid "Please enter the new object group name"
 #~ msgstr "请输入新对象组名称"
 
diff --git a/gosa-plugins/heimdal/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/heimdal/locale/de/LC_MESSAGES/messages.po
index 7daedfe40..25e45e2af 100644
--- a/gosa-plugins/heimdal/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/heimdal/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2008-06-12 09:08+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: German <de@li.org>\n"
diff --git a/gosa-plugins/heimdal/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/heimdal/locale/es/LC_MESSAGES/messages.po
index 5e18f474d..9898ad134 100644
--- a/gosa-plugins/heimdal/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/heimdal/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
diff --git a/gosa-plugins/heimdal/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/heimdal/locale/fr/LC_MESSAGES/messages.po
index 241dd107c..74a5e674f 100644
--- a/gosa-plugins/heimdal/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/heimdal/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2009-06-30 11:11+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
diff --git a/gosa-plugins/heimdal/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/heimdal/locale/it/LC_MESSAGES/messages.po
index 16a3afb2a..256aa6cda 100644
--- a/gosa-plugins/heimdal/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/heimdal/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
diff --git a/gosa-plugins/heimdal/locale/messages.po b/gosa-plugins/heimdal/locale/messages.po
index 7390e3182..5ed70bb8d 100644
--- a/gosa-plugins/heimdal/locale/messages.po
+++ b/gosa-plugins/heimdal/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gosa-plugins/heimdal/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/heimdal/locale/nl/LC_MESSAGES/messages.po
index 64856f676..e40c28a5f 100644
--- a/gosa-plugins/heimdal/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/heimdal/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
diff --git a/gosa-plugins/heimdal/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/heimdal/locale/pl/LC_MESSAGES/messages.po
index 9fb0fbaea..6aa997e82 100644
--- a/gosa-plugins/heimdal/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/heimdal/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2009-09-05 15:38+0100\n"
 "Last-Translator: Piort Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
diff --git a/gosa-plugins/heimdal/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/heimdal/locale/ru/LC_MESSAGES/messages.po
index 9041b999b..90274cd28 100644
--- a/gosa-plugins/heimdal/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/heimdal/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
diff --git a/gosa-plugins/heimdal/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/heimdal/locale/zh/LC_MESSAGES/messages.po
index 6e071cbc1..a645b7027 100644
--- a/gosa-plugins/heimdal/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/heimdal/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:04+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
diff --git a/gosa-plugins/kolab/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/kolab/locale/de/LC_MESSAGES/messages.po
index c3fe56c9f..5fd692324 100644
--- a/gosa-plugins/kolab/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/kolab/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2008-12-19 08:56+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
@@ -46,7 +46,7 @@ msgid "Kolab account does not exist!"
 msgstr "Kolab-Konto existiert nicht!"
 
 #: admin/systems/services/kolab/class_servKolab.inc:207
-#: personal/connectivity/kolab/class_kolabAccount.inc:171
+#: personal/connectivity/kolab/class_kolabAccount.inc:178
 msgid "Error"
 msgstr "Fehler"
 
@@ -57,8 +57,8 @@ msgstr "Hostname"
 #: admin/systems/services/kolab/class_servKolab.inc:217
 #: admin/systems/services/kolab/class_servKolab.inc:233
 #: admin/systems/services/kolab/class_servKolab.inc:402
-#: personal/connectivity/kolab/class_kolabAccount.inc:339
-#: personal/connectivity/kolab/class_kolabAccount.inc:476
+#: personal/connectivity/kolab/class_kolabAccount.inc:346
+#: personal/connectivity/kolab/class_kolabAccount.inc:483
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
@@ -92,7 +92,7 @@ msgstr "Kolab Mail-Dienst"
 
 #: admin/systems/services/kolab/class_servKolab.inc:429
 #: personal/connectivity/kolab/class_kolabAccount.inc:5
-#: personal/connectivity/kolab/class_kolabAccount.inc:512
+#: personal/connectivity/kolab/class_kolabAccount.inc:519
 msgid "Kolab"
 msgstr "Kolab"
 
@@ -317,7 +317,7 @@ msgstr ""
 
 #: personal/connectivity/kolab/kolab.tpl:51
 #: personal/connectivity/kolab/kolab.tpl:63
-#: personal/connectivity/kolab/class_kolabAccount.inc:525
+#: personal/connectivity/kolab/class_kolabAccount.inc:532
 msgid "Delegations"
 msgstr "Stellvertreter"
 
@@ -346,7 +346,7 @@ msgid "days"
 msgstr "Tage"
 
 #: personal/connectivity/kolab/kolab.tpl:119
-#: personal/connectivity/kolab/class_kolabAccount.inc:526
+#: personal/connectivity/kolab/class_kolabAccount.inc:533
 msgid "Invitation policy"
 msgstr "Einladungs-Richtlinie"
 
@@ -354,76 +354,76 @@ msgstr "Einladungs-Richtlinie"
 msgid "This does something"
 msgstr "Dies tut etwas"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:171
+#: personal/connectivity/kolab/class_kolabAccount.inc:178
 msgid "Mail address"
 msgstr "Mail-Adresse"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:204
+#: personal/connectivity/kolab/class_kolabAccount.inc:211
 msgid "Always accept"
 msgstr "Immer annehmen"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:205
+#: personal/connectivity/kolab/class_kolabAccount.inc:212
 msgid "Always reject"
 msgstr "Immer ablehnen"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:206
+#: personal/connectivity/kolab/class_kolabAccount.inc:213
 msgid "Reject if conflicts"
 msgstr "Im Konfliktfall ablehnen"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:207
+#: personal/connectivity/kolab/class_kolabAccount.inc:214
 msgid "Manual if conflicts"
 msgstr "Im Konfliktfall manuell bearbeiten"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:208
+#: personal/connectivity/kolab/class_kolabAccount.inc:215
 msgid "Manual"
 msgstr "Manuell"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:256
+#: personal/connectivity/kolab/class_kolabAccount.inc:263
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:351
-#: personal/connectivity/kolab/class_kolabAccount.inc:354
+#: personal/connectivity/kolab/class_kolabAccount.inc:358
+#: personal/connectivity/kolab/class_kolabAccount.inc:361
 msgid "Free Busy future"
 msgstr "Frei/Belegt Ausblick"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:359
-#: personal/connectivity/kolab/class_kolabAccount.inc:362
+#: personal/connectivity/kolab/class_kolabAccount.inc:366
+#: personal/connectivity/kolab/class_kolabAccount.inc:369
 msgid "Free Busy url"
 msgstr "Frei/Belegt URL"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:376
+#: personal/connectivity/kolab/class_kolabAccount.inc:383
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr "Die Einladungs-Richtlinie für die Adresse '%s' ist ungültig."
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:384
+#: personal/connectivity/kolab/class_kolabAccount.inc:391
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 "Es gibt keinen Mail Benutzer mit der Adresse %s für Ihre Einladungs-"
 "Richtlinie!"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:513
+#: personal/connectivity/kolab/class_kolabAccount.inc:520
 msgid "Kolab account settings"
 msgstr "Kolab Konto-Einstellungen"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:513
+#: personal/connectivity/kolab/class_kolabAccount.inc:520
 msgid "Connectivity addon"
 msgstr "Konnektivitäts-Erweiterung"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:517
+#: personal/connectivity/kolab/class_kolabAccount.inc:524
 msgid "My account"
 msgstr "Mein Konto"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:522
+#: personal/connectivity/kolab/class_kolabAccount.inc:529
 msgid "Free busy future"
 msgstr "Frei/Belegt Ausblick"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:523
+#: personal/connectivity/kolab/class_kolabAccount.inc:530
 msgid "Mail size restriction"
 msgstr "Beschränkung der Nachrichtengröße"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:524
+#: personal/connectivity/kolab/class_kolabAccount.inc:531
 msgid "Free busy information"
 msgstr "Frei/Belegt-Information"
diff --git a/gosa-plugins/kolab/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/kolab/locale/es/LC_MESSAGES/messages.po
index 196abfec2..1d41de77b 100644
--- a/gosa-plugins/kolab/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/kolab/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
@@ -44,7 +44,7 @@ msgid "Kolab account does not exist!"
 msgstr "Configuración cuenta Kolab"
 
 #: admin/systems/services/kolab/class_servKolab.inc:207
-#: personal/connectivity/kolab/class_kolabAccount.inc:171
+#: personal/connectivity/kolab/class_kolabAccount.inc:178
 msgid "Error"
 msgstr "Error"
 
@@ -56,8 +56,8 @@ msgstr "Apellido"
 #: admin/systems/services/kolab/class_servKolab.inc:217
 #: admin/systems/services/kolab/class_servKolab.inc:233
 #: admin/systems/services/kolab/class_servKolab.inc:402
-#: personal/connectivity/kolab/class_kolabAccount.inc:339
-#: personal/connectivity/kolab/class_kolabAccount.inc:476
+#: personal/connectivity/kolab/class_kolabAccount.inc:346
+#: personal/connectivity/kolab/class_kolabAccount.inc:483
 #, fuzzy
 msgid "LDAP error"
 msgstr "Servicio LDAP"
@@ -96,7 +96,7 @@ msgstr "Añadir el servicio Kolab"
 
 #: admin/systems/services/kolab/class_servKolab.inc:429
 #: personal/connectivity/kolab/class_kolabAccount.inc:5
-#: personal/connectivity/kolab/class_kolabAccount.inc:512
+#: personal/connectivity/kolab/class_kolabAccount.inc:519
 msgid "Kolab"
 msgstr "Kolab"
 
@@ -326,7 +326,7 @@ msgstr ""
 
 #: personal/connectivity/kolab/kolab.tpl:51
 #: personal/connectivity/kolab/kolab.tpl:63
-#: personal/connectivity/kolab/class_kolabAccount.inc:525
+#: personal/connectivity/kolab/class_kolabAccount.inc:532
 msgid "Delegations"
 msgstr "Delegaciones"
 
@@ -359,7 +359,7 @@ msgid "days"
 msgstr "Domingo"
 
 #: personal/connectivity/kolab/kolab.tpl:119
-#: personal/connectivity/kolab/class_kolabAccount.inc:526
+#: personal/connectivity/kolab/class_kolabAccount.inc:533
 msgid "Invitation policy"
 msgstr "Política de invitación"
 
@@ -368,80 +368,80 @@ msgstr "Política de invitación"
 msgid "This does something"
 msgstr "Mostrar objetos que coincidan"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:171
+#: personal/connectivity/kolab/class_kolabAccount.inc:178
 msgid "Mail address"
 msgstr "Dirección correo electrónico"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:204
+#: personal/connectivity/kolab/class_kolabAccount.inc:211
 msgid "Always accept"
 msgstr "Aceptar siempre"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:205
+#: personal/connectivity/kolab/class_kolabAccount.inc:212
 msgid "Always reject"
 msgstr "Denegar siempre"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:206
+#: personal/connectivity/kolab/class_kolabAccount.inc:213
 msgid "Reject if conflicts"
 msgstr "Denegar si hay conflictos"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:207
+#: personal/connectivity/kolab/class_kolabAccount.inc:214
 msgid "Manual if conflicts"
 msgstr "Preguntar si hay conflictos"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:208
+#: personal/connectivity/kolab/class_kolabAccount.inc:215
 msgid "Manual"
 msgstr "Manual"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:256
+#: personal/connectivity/kolab/class_kolabAccount.inc:263
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:351
-#: personal/connectivity/kolab/class_kolabAccount.inc:354
+#: personal/connectivity/kolab/class_kolabAccount.inc:358
+#: personal/connectivity/kolab/class_kolabAccount.inc:361
 #, fuzzy
 msgid "Free Busy future"
 msgstr "Disponibilidad futura"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:359
-#: personal/connectivity/kolab/class_kolabAccount.inc:362
+#: personal/connectivity/kolab/class_kolabAccount.inc:366
+#: personal/connectivity/kolab/class_kolabAccount.inc:369
 #, fuzzy
 msgid "Free Busy url"
 msgstr "Disponibilidad futura"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:376
+#: personal/connectivity/kolab/class_kolabAccount.inc:383
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 "La entrada de política de invitación para la dirección '%s' no es valida."
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:384
+#: personal/connectivity/kolab/class_kolabAccount.inc:391
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 "¡No hay ningún usuario con cuenta de correo '%s' para su política de "
 "invitación!"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:513
+#: personal/connectivity/kolab/class_kolabAccount.inc:520
 msgid "Kolab account settings"
 msgstr "Configuración cuenta Kolab"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:513
+#: personal/connectivity/kolab/class_kolabAccount.inc:520
 msgid "Connectivity addon"
 msgstr "Conectividad adicional"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:517
+#: personal/connectivity/kolab/class_kolabAccount.inc:524
 msgid "My account"
 msgstr "Mi cuenta"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:522
+#: personal/connectivity/kolab/class_kolabAccount.inc:529
 msgid "Free busy future"
 msgstr "Disponibilidad futura"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:523
+#: personal/connectivity/kolab/class_kolabAccount.inc:530
 msgid "Mail size restriction"
 msgstr "Restricciones al tamaño de mensaje"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:524
+#: personal/connectivity/kolab/class_kolabAccount.inc:531
 msgid "Free busy information"
 msgstr "Información de disponibilidad"
 
diff --git a/gosa-plugins/kolab/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/kolab/locale/fr/LC_MESSAGES/messages.po
index cc28f5f7f..63c651ab1 100644
--- a/gosa-plugins/kolab/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/kolab/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2009-06-30 11:15+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -41,7 +41,7 @@ msgid "Kolab account does not exist!"
 msgstr "Le compte kolab ,'existe pas !"
 
 #: admin/systems/services/kolab/class_servKolab.inc:207
-#: personal/connectivity/kolab/class_kolabAccount.inc:171
+#: personal/connectivity/kolab/class_kolabAccount.inc:178
 msgid "Error"
 msgstr "Erreur"
 
@@ -52,8 +52,8 @@ msgstr "Nom de l'hôte"
 #: admin/systems/services/kolab/class_servKolab.inc:217
 #: admin/systems/services/kolab/class_servKolab.inc:233
 #: admin/systems/services/kolab/class_servKolab.inc:402
-#: personal/connectivity/kolab/class_kolabAccount.inc:339
-#: personal/connectivity/kolab/class_kolabAccount.inc:476
+#: personal/connectivity/kolab/class_kolabAccount.inc:346
+#: personal/connectivity/kolab/class_kolabAccount.inc:483
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
@@ -87,7 +87,7 @@ msgstr "Service de messagerie Kolab"
 
 #: admin/systems/services/kolab/class_servKolab.inc:429
 #: personal/connectivity/kolab/class_kolabAccount.inc:5
-#: personal/connectivity/kolab/class_kolabAccount.inc:512
+#: personal/connectivity/kolab/class_kolabAccount.inc:519
 msgid "Kolab"
 msgstr ""
 
@@ -318,7 +318,7 @@ msgstr ""
 
 #: personal/connectivity/kolab/kolab.tpl:51
 #: personal/connectivity/kolab/kolab.tpl:63
-#: personal/connectivity/kolab/class_kolabAccount.inc:525
+#: personal/connectivity/kolab/class_kolabAccount.inc:532
 msgid "Delegations"
 msgstr "Délégations"
 
@@ -347,7 +347,7 @@ msgid "days"
 msgstr "jours"
 
 #: personal/connectivity/kolab/kolab.tpl:119
-#: personal/connectivity/kolab/class_kolabAccount.inc:526
+#: personal/connectivity/kolab/class_kolabAccount.inc:533
 msgid "Invitation policy"
 msgstr "Politique d'invitation"
 
@@ -355,77 +355,77 @@ msgstr "Politique d'invitation"
 msgid "This does something"
 msgstr "Ceci fait quelque chose"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:171
+#: personal/connectivity/kolab/class_kolabAccount.inc:178
 msgid "Mail address"
 msgstr "Adresse de messagerie"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:204
+#: personal/connectivity/kolab/class_kolabAccount.inc:211
 msgid "Always accept"
 msgstr "Toujours accepter"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:205
+#: personal/connectivity/kolab/class_kolabAccount.inc:212
 msgid "Always reject"
 msgstr "Toujours rejeter"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:206
+#: personal/connectivity/kolab/class_kolabAccount.inc:213
 msgid "Reject if conflicts"
 msgstr "Rejeter si il y a conflit"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:207
+#: personal/connectivity/kolab/class_kolabAccount.inc:214
 msgid "Manual if conflicts"
 msgstr "Manuel si il y a conflit"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:208
+#: personal/connectivity/kolab/class_kolabAccount.inc:215
 msgid "Manual"
 msgstr "Manuel"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:256
+#: personal/connectivity/kolab/class_kolabAccount.inc:263
 msgid "Anonymous"
 msgstr "Anonyme"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:351
-#: personal/connectivity/kolab/class_kolabAccount.inc:354
+#: personal/connectivity/kolab/class_kolabAccount.inc:358
+#: personal/connectivity/kolab/class_kolabAccount.inc:361
 msgid "Free Busy future"
 msgstr ""
 "Nombre de jours dans le futur à calculer pour l'option de disponibilité"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:359
-#: personal/connectivity/kolab/class_kolabAccount.inc:362
+#: personal/connectivity/kolab/class_kolabAccount.inc:366
+#: personal/connectivity/kolab/class_kolabAccount.inc:369
 msgid "Free Busy url"
 msgstr "Url pour l'option de disponibilité"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:376
+#: personal/connectivity/kolab/class_kolabAccount.inc:383
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr "La politique d'invitation pour l'adresse '%s' n'est pas valide."
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:384
+#: personal/connectivity/kolab/class_kolabAccount.inc:391
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 "Il n'y a pas d'utilisateur avec l'adresse de messagerie '%s' pour votre "
 "politique d'invitation !"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:513
+#: personal/connectivity/kolab/class_kolabAccount.inc:520
 msgid "Kolab account settings"
 msgstr "Paramètres du compte Kolab"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:513
+#: personal/connectivity/kolab/class_kolabAccount.inc:520
 msgid "Connectivity addon"
 msgstr "Connectivité"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:517
+#: personal/connectivity/kolab/class_kolabAccount.inc:524
 msgid "My account"
 msgstr "Mon Compte"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:522
+#: personal/connectivity/kolab/class_kolabAccount.inc:529
 msgid "Free busy future"
 msgstr "Nombre de jours futur à calculer pour l'option de disponibilité"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:523
+#: personal/connectivity/kolab/class_kolabAccount.inc:530
 msgid "Mail size restriction"
 msgstr "Restriction de taille des messages"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:524
+#: personal/connectivity/kolab/class_kolabAccount.inc:531
 msgid "Free busy information"
 msgstr "Information de disponibilité"
diff --git a/gosa-plugins/kolab/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/kolab/locale/it/LC_MESSAGES/messages.po
index 4a204f44e..9a9596083 100644
--- a/gosa-plugins/kolab/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/kolab/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -40,7 +40,7 @@ msgid "Kolab account does not exist!"
 msgstr "Account Kolab"
 
 #: admin/systems/services/kolab/class_servKolab.inc:207
-#: personal/connectivity/kolab/class_kolabAccount.inc:171
+#: personal/connectivity/kolab/class_kolabAccount.inc:178
 msgid "Error"
 msgstr ""
 
@@ -52,8 +52,8 @@ msgstr "Scegli il tuo numero di telefono personale"
 #: admin/systems/services/kolab/class_servKolab.inc:217
 #: admin/systems/services/kolab/class_servKolab.inc:233
 #: admin/systems/services/kolab/class_servKolab.inc:402
-#: personal/connectivity/kolab/class_kolabAccount.inc:339
-#: personal/connectivity/kolab/class_kolabAccount.inc:476
+#: personal/connectivity/kolab/class_kolabAccount.inc:346
+#: personal/connectivity/kolab/class_kolabAccount.inc:483
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
@@ -91,7 +91,7 @@ msgstr "Utenti di Dominio"
 
 #: admin/systems/services/kolab/class_servKolab.inc:429
 #: personal/connectivity/kolab/class_kolabAccount.inc:5
-#: personal/connectivity/kolab/class_kolabAccount.inc:512
+#: personal/connectivity/kolab/class_kolabAccount.inc:519
 msgid "Kolab"
 msgstr ""
 
@@ -328,7 +328,7 @@ msgstr ""
 
 #: personal/connectivity/kolab/kolab.tpl:51
 #: personal/connectivity/kolab/kolab.tpl:63
-#: personal/connectivity/kolab/class_kolabAccount.inc:525
+#: personal/connectivity/kolab/class_kolabAccount.inc:532
 #, fuzzy
 msgid "Delegations"
 msgstr "Applicazioni"
@@ -360,7 +360,7 @@ msgid "days"
 msgstr "giorni"
 
 #: personal/connectivity/kolab/kolab.tpl:119
-#: personal/connectivity/kolab/class_kolabAccount.inc:526
+#: personal/connectivity/kolab/class_kolabAccount.inc:533
 msgid "Invitation policy"
 msgstr ""
 
@@ -368,80 +368,80 @@ msgstr ""
 msgid "This does something"
 msgstr "Questo fa qualcosa"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:171
+#: personal/connectivity/kolab/class_kolabAccount.inc:178
 msgid "Mail address"
 msgstr "Indirizzo principale"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:204
+#: personal/connectivity/kolab/class_kolabAccount.inc:211
 msgid "Always accept"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:205
+#: personal/connectivity/kolab/class_kolabAccount.inc:212
 msgid "Always reject"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:206
+#: personal/connectivity/kolab/class_kolabAccount.inc:213
 msgid "Reject if conflicts"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:207
+#: personal/connectivity/kolab/class_kolabAccount.inc:214
 msgid "Manual if conflicts"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:208
+#: personal/connectivity/kolab/class_kolabAccount.inc:215
 msgid "Manual"
 msgstr "Manuale"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:256
+#: personal/connectivity/kolab/class_kolabAccount.inc:263
 msgid "Anonymous"
 msgstr "Anonimo"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:351
-#: personal/connectivity/kolab/class_kolabAccount.inc:354
+#: personal/connectivity/kolab/class_kolabAccount.inc:358
+#: personal/connectivity/kolab/class_kolabAccount.inc:361
 #, fuzzy
 msgid "Free Busy future"
 msgstr "Server"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:359
-#: personal/connectivity/kolab/class_kolabAccount.inc:362
+#: personal/connectivity/kolab/class_kolabAccount.inc:366
+#: personal/connectivity/kolab/class_kolabAccount.inc:369
 #, fuzzy
 msgid "Free Busy url"
 msgstr "Server"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:376
+#: personal/connectivity/kolab/class_kolabAccount.inc:383
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:384
+#: personal/connectivity/kolab/class_kolabAccount.inc:391
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:513
+#: personal/connectivity/kolab/class_kolabAccount.inc:520
 #, fuzzy
 msgid "Kolab account settings"
 msgstr "Account Kolab"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:513
+#: personal/connectivity/kolab/class_kolabAccount.inc:520
 #, fuzzy
 msgid "Connectivity addon"
 msgstr "Connettività"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:517
+#: personal/connectivity/kolab/class_kolabAccount.inc:524
 msgid "My account"
 msgstr "Identità"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:522
+#: personal/connectivity/kolab/class_kolabAccount.inc:529
 msgid "Free busy future"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:523
+#: personal/connectivity/kolab/class_kolabAccount.inc:530
 #, fuzzy
 msgid "Mail size restriction"
 msgstr "Opzioni di posta dell'identità"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:524
+#: personal/connectivity/kolab/class_kolabAccount.inc:531
 #, fuzzy
 msgid "Free busy information"
 msgstr "Informazioni generali"
diff --git a/gosa-plugins/kolab/locale/messages.po b/gosa-plugins/kolab/locale/messages.po
index 76c8df456..c8c73ee3a 100644
--- a/gosa-plugins/kolab/locale/messages.po
+++ b/gosa-plugins/kolab/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,7 +39,7 @@ msgid "Kolab account does not exist!"
 msgstr ""
 
 #: admin/systems/services/kolab/class_servKolab.inc:207
-#: personal/connectivity/kolab/class_kolabAccount.inc:171
+#: personal/connectivity/kolab/class_kolabAccount.inc:178
 msgid "Error"
 msgstr ""
 
@@ -50,8 +50,8 @@ msgstr ""
 #: admin/systems/services/kolab/class_servKolab.inc:217
 #: admin/systems/services/kolab/class_servKolab.inc:233
 #: admin/systems/services/kolab/class_servKolab.inc:402
-#: personal/connectivity/kolab/class_kolabAccount.inc:339
-#: personal/connectivity/kolab/class_kolabAccount.inc:476
+#: personal/connectivity/kolab/class_kolabAccount.inc:346
+#: personal/connectivity/kolab/class_kolabAccount.inc:483
 msgid "LDAP error"
 msgstr ""
 
@@ -85,7 +85,7 @@ msgstr ""
 
 #: admin/systems/services/kolab/class_servKolab.inc:429
 #: personal/connectivity/kolab/class_kolabAccount.inc:5
-#: personal/connectivity/kolab/class_kolabAccount.inc:512
+#: personal/connectivity/kolab/class_kolabAccount.inc:519
 msgid "Kolab"
 msgstr ""
 
@@ -304,7 +304,7 @@ msgstr ""
 
 #: personal/connectivity/kolab/kolab.tpl:51
 #: personal/connectivity/kolab/kolab.tpl:63
-#: personal/connectivity/kolab/class_kolabAccount.inc:525
+#: personal/connectivity/kolab/class_kolabAccount.inc:532
 msgid "Delegations"
 msgstr ""
 
@@ -333,7 +333,7 @@ msgid "days"
 msgstr ""
 
 #: personal/connectivity/kolab/kolab.tpl:119
-#: personal/connectivity/kolab/class_kolabAccount.inc:526
+#: personal/connectivity/kolab/class_kolabAccount.inc:533
 msgid "Invitation policy"
 msgstr ""
 
@@ -341,74 +341,74 @@ msgstr ""
 msgid "This does something"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:171
+#: personal/connectivity/kolab/class_kolabAccount.inc:178
 msgid "Mail address"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:204
+#: personal/connectivity/kolab/class_kolabAccount.inc:211
 msgid "Always accept"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:205
+#: personal/connectivity/kolab/class_kolabAccount.inc:212
 msgid "Always reject"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:206
+#: personal/connectivity/kolab/class_kolabAccount.inc:213
 msgid "Reject if conflicts"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:207
+#: personal/connectivity/kolab/class_kolabAccount.inc:214
 msgid "Manual if conflicts"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:208
+#: personal/connectivity/kolab/class_kolabAccount.inc:215
 msgid "Manual"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:256
+#: personal/connectivity/kolab/class_kolabAccount.inc:263
 msgid "Anonymous"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:351
-#: personal/connectivity/kolab/class_kolabAccount.inc:354
+#: personal/connectivity/kolab/class_kolabAccount.inc:358
+#: personal/connectivity/kolab/class_kolabAccount.inc:361
 msgid "Free Busy future"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:359
-#: personal/connectivity/kolab/class_kolabAccount.inc:362
+#: personal/connectivity/kolab/class_kolabAccount.inc:366
+#: personal/connectivity/kolab/class_kolabAccount.inc:369
 msgid "Free Busy url"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:376
+#: personal/connectivity/kolab/class_kolabAccount.inc:383
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:384
+#: personal/connectivity/kolab/class_kolabAccount.inc:391
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:513
+#: personal/connectivity/kolab/class_kolabAccount.inc:520
 msgid "Kolab account settings"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:513
+#: personal/connectivity/kolab/class_kolabAccount.inc:520
 msgid "Connectivity addon"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:517
+#: personal/connectivity/kolab/class_kolabAccount.inc:524
 msgid "My account"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:522
+#: personal/connectivity/kolab/class_kolabAccount.inc:529
 msgid "Free busy future"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:523
+#: personal/connectivity/kolab/class_kolabAccount.inc:530
 msgid "Mail size restriction"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:524
+#: personal/connectivity/kolab/class_kolabAccount.inc:531
 msgid "Free busy information"
 msgstr ""
diff --git a/gosa-plugins/kolab/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/kolab/locale/nl/LC_MESSAGES/messages.po
index 8daca473e..179eca908 100644
--- a/gosa-plugins/kolab/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/kolab/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -47,7 +47,7 @@ msgid "Kolab account does not exist!"
 msgstr "Kolab account"
 
 #: admin/systems/services/kolab/class_servKolab.inc:207
-#: personal/connectivity/kolab/class_kolabAccount.inc:171
+#: personal/connectivity/kolab/class_kolabAccount.inc:178
 msgid "Error"
 msgstr "Fout"
 
@@ -59,8 +59,8 @@ msgstr "Achternaam"
 #: admin/systems/services/kolab/class_servKolab.inc:217
 #: admin/systems/services/kolab/class_servKolab.inc:233
 #: admin/systems/services/kolab/class_servKolab.inc:402
-#: personal/connectivity/kolab/class_kolabAccount.inc:339
-#: personal/connectivity/kolab/class_kolabAccount.inc:476
+#: personal/connectivity/kolab/class_kolabAccount.inc:346
+#: personal/connectivity/kolab/class_kolabAccount.inc:483
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP fout:"
@@ -99,7 +99,7 @@ msgstr "Voeg Kolab service toe"
 
 #: admin/systems/services/kolab/class_servKolab.inc:429
 #: personal/connectivity/kolab/class_kolabAccount.inc:5
-#: personal/connectivity/kolab/class_kolabAccount.inc:512
+#: personal/connectivity/kolab/class_kolabAccount.inc:519
 msgid "Kolab"
 msgstr "Kolab"
 
@@ -334,7 +334,7 @@ msgstr ""
 
 #: personal/connectivity/kolab/kolab.tpl:51
 #: personal/connectivity/kolab/kolab.tpl:63
-#: personal/connectivity/kolab/class_kolabAccount.inc:525
+#: personal/connectivity/kolab/class_kolabAccount.inc:532
 msgid "Delegations"
 msgstr "Delegaties"
 
@@ -363,7 +363,7 @@ msgid "days"
 msgstr "dagen"
 
 #: personal/connectivity/kolab/kolab.tpl:119
-#: personal/connectivity/kolab/class_kolabAccount.inc:526
+#: personal/connectivity/kolab/class_kolabAccount.inc:533
 msgid "Invitation policy"
 msgstr "Uitnodigingsbeleid"
 
@@ -371,80 +371,80 @@ msgstr "Uitnodigingsbeleid"
 msgid "This does something"
 msgstr "Dit doet iets"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:171
+#: personal/connectivity/kolab/class_kolabAccount.inc:178
 msgid "Mail address"
 msgstr "E-mail adres"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:204
+#: personal/connectivity/kolab/class_kolabAccount.inc:211
 msgid "Always accept"
 msgstr "Altijd accepteren"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:205
+#: personal/connectivity/kolab/class_kolabAccount.inc:212
 msgid "Always reject"
 msgstr "Altijd afwijzen"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:206
+#: personal/connectivity/kolab/class_kolabAccount.inc:213
 msgid "Reject if conflicts"
 msgstr "Afwijzen bij conflicten"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:207
+#: personal/connectivity/kolab/class_kolabAccount.inc:214
 msgid "Manual if conflicts"
 msgstr "Handmatig bij conflicten"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:208
+#: personal/connectivity/kolab/class_kolabAccount.inc:215
 msgid "Manual"
 msgstr "Handmatig"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:256
+#: personal/connectivity/kolab/class_kolabAccount.inc:263
 msgid "Anonymous"
 msgstr "Anoniem"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:351
-#: personal/connectivity/kolab/class_kolabAccount.inc:354
+#: personal/connectivity/kolab/class_kolabAccount.inc:358
+#: personal/connectivity/kolab/class_kolabAccount.inc:361
 #, fuzzy
 msgid "Free Busy future"
 msgstr "Free Busy informatie"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:359
-#: personal/connectivity/kolab/class_kolabAccount.inc:362
+#: personal/connectivity/kolab/class_kolabAccount.inc:366
+#: personal/connectivity/kolab/class_kolabAccount.inc:369
 #, fuzzy
 msgid "Free Busy url"
 msgstr "Free Busy informatie"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:376
+#: personal/connectivity/kolab/class_kolabAccount.inc:383
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr "Het uitnodigingsbeleid invoer voor adres '%s' is niet geldig"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:384
+#: personal/connectivity/kolab/class_kolabAccount.inc:391
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr "Er is geen E-mail gebruiker met adres '%s' voor uw uitwisselingsbeleid"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:513
+#: personal/connectivity/kolab/class_kolabAccount.inc:520
 #, fuzzy
 msgid "Kolab account settings"
 msgstr "Kolab account"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:513
+#: personal/connectivity/kolab/class_kolabAccount.inc:520
 #, fuzzy
 msgid "Connectivity addon"
 msgstr "Verbindingen"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:517
+#: personal/connectivity/kolab/class_kolabAccount.inc:524
 msgid "My account"
 msgstr "Mijn account"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:522
+#: personal/connectivity/kolab/class_kolabAccount.inc:529
 msgid "Free busy future"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:523
+#: personal/connectivity/kolab/class_kolabAccount.inc:530
 #, fuzzy
 msgid "Mail size restriction"
 msgstr "Mail distributielijst"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:524
+#: personal/connectivity/kolab/class_kolabAccount.inc:531
 #, fuzzy
 msgid "Free busy information"
 msgstr "Free Busy informatie"
diff --git a/gosa-plugins/kolab/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/kolab/locale/pl/LC_MESSAGES/messages.po
index 830f7e0e2..04b495940 100644
--- a/gosa-plugins/kolab/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/kolab/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -39,7 +39,7 @@ msgid "Kolab account does not exist!"
 msgstr "Ustawienia konta Kolab"
 
 #: admin/systems/services/kolab/class_servKolab.inc:207
-#: personal/connectivity/kolab/class_kolabAccount.inc:171
+#: personal/connectivity/kolab/class_kolabAccount.inc:178
 msgid "Error"
 msgstr "Błąd"
 
@@ -51,8 +51,8 @@ msgstr "Nazwisko"
 #: admin/systems/services/kolab/class_servKolab.inc:217
 #: admin/systems/services/kolab/class_servKolab.inc:233
 #: admin/systems/services/kolab/class_servKolab.inc:402
-#: personal/connectivity/kolab/class_kolabAccount.inc:339
-#: personal/connectivity/kolab/class_kolabAccount.inc:476
+#: personal/connectivity/kolab/class_kolabAccount.inc:346
+#: personal/connectivity/kolab/class_kolabAccount.inc:483
 #, fuzzy
 msgid "LDAP error"
 msgstr "błąd LDAP:"
@@ -90,7 +90,7 @@ msgstr "Usługa poczty Kolab"
 
 #: admin/systems/services/kolab/class_servKolab.inc:429
 #: personal/connectivity/kolab/class_kolabAccount.inc:5
-#: personal/connectivity/kolab/class_kolabAccount.inc:512
+#: personal/connectivity/kolab/class_kolabAccount.inc:519
 msgid "Kolab"
 msgstr "Kolab"
 
@@ -320,7 +320,7 @@ msgstr ""
 
 #: personal/connectivity/kolab/kolab.tpl:51
 #: personal/connectivity/kolab/kolab.tpl:63
-#: personal/connectivity/kolab/class_kolabAccount.inc:525
+#: personal/connectivity/kolab/class_kolabAccount.inc:532
 msgid "Delegations"
 msgstr "Delegacje"
 
@@ -349,7 +349,7 @@ msgid "days"
 msgstr "dni"
 
 #: personal/connectivity/kolab/kolab.tpl:119
-#: personal/connectivity/kolab/class_kolabAccount.inc:526
+#: personal/connectivity/kolab/class_kolabAccount.inc:533
 msgid "Invitation policy"
 msgstr "Polityka zapraszania"
 
@@ -357,78 +357,78 @@ msgstr "Polityka zapraszania"
 msgid "This does something"
 msgstr "To robi coś"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:171
+#: personal/connectivity/kolab/class_kolabAccount.inc:178
 msgid "Mail address"
 msgstr "Adres email"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:204
+#: personal/connectivity/kolab/class_kolabAccount.inc:211
 msgid "Always accept"
 msgstr "Zawsze akceptuj"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:205
+#: personal/connectivity/kolab/class_kolabAccount.inc:212
 msgid "Always reject"
 msgstr "Zawsze odrzuć"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:206
+#: personal/connectivity/kolab/class_kolabAccount.inc:213
 msgid "Reject if conflicts"
 msgstr "Odmów jeśli koliduje"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:207
+#: personal/connectivity/kolab/class_kolabAccount.inc:214
 msgid "Manual if conflicts"
 msgstr "Ustaw ręcznie jeśli koliduje"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:208
+#: personal/connectivity/kolab/class_kolabAccount.inc:215
 msgid "Manual"
 msgstr "Ręczne"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:256
+#: personal/connectivity/kolab/class_kolabAccount.inc:263
 msgid "Anonymous"
 msgstr "Anonimowy"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:351
-#: personal/connectivity/kolab/class_kolabAccount.inc:354
+#: personal/connectivity/kolab/class_kolabAccount.inc:358
+#: personal/connectivity/kolab/class_kolabAccount.inc:361
 #, fuzzy
 msgid "Free Busy future"
 msgstr "Free busy przyszłość"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:359
-#: personal/connectivity/kolab/class_kolabAccount.inc:362
+#: personal/connectivity/kolab/class_kolabAccount.inc:366
+#: personal/connectivity/kolab/class_kolabAccount.inc:369
 #, fuzzy
 msgid "Free Busy url"
 msgstr "Free busy przyszłość"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:376
+#: personal/connectivity/kolab/class_kolabAccount.inc:383
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr "Polityka zapraszania dla adresu '%s' jest nieprawidłowa."
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:384
+#: personal/connectivity/kolab/class_kolabAccount.inc:391
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr "Brak użytkownika pocztowego o adresie '%s' dla polityki zapraszania!"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:513
+#: personal/connectivity/kolab/class_kolabAccount.inc:520
 msgid "Kolab account settings"
 msgstr "Ustawienia konta Kolab"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:513
+#: personal/connectivity/kolab/class_kolabAccount.inc:520
 #, fuzzy
 msgid "Connectivity addon"
 msgstr "Konto połączeń"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:517
+#: personal/connectivity/kolab/class_kolabAccount.inc:524
 msgid "My account"
 msgstr "Moje konto "
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:522
+#: personal/connectivity/kolab/class_kolabAccount.inc:529
 msgid "Free busy future"
 msgstr "Free busy przyszłość"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:523
+#: personal/connectivity/kolab/class_kolabAccount.inc:530
 msgid "Mail size restriction"
 msgstr "Ograniczenia rozmiaru wiadomości"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:524
+#: personal/connectivity/kolab/class_kolabAccount.inc:531
 msgid "Free busy information"
 msgstr "Informacja FreeBusy"
 
diff --git a/gosa-plugins/kolab/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/kolab/locale/ru/LC_MESSAGES/messages.po
index 7271a246b..721a836f7 100644
--- a/gosa-plugins/kolab/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/kolab/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -39,7 +39,7 @@ msgid "Kolab account does not exist!"
 msgstr "Моя учетная запись"
 
 #: admin/systems/services/kolab/class_servKolab.inc:207
-#: personal/connectivity/kolab/class_kolabAccount.inc:171
+#: personal/connectivity/kolab/class_kolabAccount.inc:178
 msgid "Error"
 msgstr ""
 
@@ -51,8 +51,8 @@ msgstr "Список"
 #: admin/systems/services/kolab/class_servKolab.inc:217
 #: admin/systems/services/kolab/class_servKolab.inc:233
 #: admin/systems/services/kolab/class_servKolab.inc:402
-#: personal/connectivity/kolab/class_kolabAccount.inc:339
-#: personal/connectivity/kolab/class_kolabAccount.inc:476
+#: personal/connectivity/kolab/class_kolabAccount.inc:346
+#: personal/connectivity/kolab/class_kolabAccount.inc:483
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
@@ -89,7 +89,7 @@ msgstr "Добавить сервис DNS"
 
 #: admin/systems/services/kolab/class_servKolab.inc:429
 #: personal/connectivity/kolab/class_kolabAccount.inc:5
-#: personal/connectivity/kolab/class_kolabAccount.inc:512
+#: personal/connectivity/kolab/class_kolabAccount.inc:519
 msgid "Kolab"
 msgstr ""
 
@@ -329,7 +329,7 @@ msgstr ""
 
 #: personal/connectivity/kolab/kolab.tpl:51
 #: personal/connectivity/kolab/kolab.tpl:63
-#: personal/connectivity/kolab/class_kolabAccount.inc:525
+#: personal/connectivity/kolab/class_kolabAccount.inc:532
 #, fuzzy
 msgid "Delegations"
 msgstr "Назначение"
@@ -362,7 +362,7 @@ msgid "days"
 msgstr "день"
 
 #: personal/connectivity/kolab/kolab.tpl:119
-#: personal/connectivity/kolab/class_kolabAccount.inc:526
+#: personal/connectivity/kolab/class_kolabAccount.inc:533
 msgid "Invitation policy"
 msgstr ""
 
@@ -370,83 +370,83 @@ msgstr ""
 msgid "This does something"
 msgstr "Что-то будет"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:171
+#: personal/connectivity/kolab/class_kolabAccount.inc:178
 #, fuzzy
 msgid "Mail address"
 msgstr "MAC-адрес"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:204
+#: personal/connectivity/kolab/class_kolabAccount.inc:211
 msgid "Always accept"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:205
+#: personal/connectivity/kolab/class_kolabAccount.inc:212
 msgid "Always reject"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:206
+#: personal/connectivity/kolab/class_kolabAccount.inc:213
 #, fuzzy
 msgid "Reject if conflicts"
 msgstr "В"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:207
+#: personal/connectivity/kolab/class_kolabAccount.inc:214
 msgid "Manual if conflicts"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:208
+#: personal/connectivity/kolab/class_kolabAccount.inc:215
 #, fuzzy
 msgid "Manual"
 msgstr "Январь"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:256
+#: personal/connectivity/kolab/class_kolabAccount.inc:263
 msgid "Anonymous"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:351
-#: personal/connectivity/kolab/class_kolabAccount.inc:354
+#: personal/connectivity/kolab/class_kolabAccount.inc:358
+#: personal/connectivity/kolab/class_kolabAccount.inc:361
 #, fuzzy
 msgid "Free Busy future"
 msgstr "Общая информация о пользователе"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:359
-#: personal/connectivity/kolab/class_kolabAccount.inc:362
+#: personal/connectivity/kolab/class_kolabAccount.inc:366
+#: personal/connectivity/kolab/class_kolabAccount.inc:369
 #, fuzzy
 msgid "Free Busy url"
 msgstr "Общая информация о пользователе"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:376
+#: personal/connectivity/kolab/class_kolabAccount.inc:383
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:384
+#: personal/connectivity/kolab/class_kolabAccount.inc:391
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:513
+#: personal/connectivity/kolab/class_kolabAccount.inc:520
 #, fuzzy
 msgid "Kolab account settings"
 msgstr "Моя учетная запись"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:513
+#: personal/connectivity/kolab/class_kolabAccount.inc:520
 #, fuzzy
 msgid "Connectivity addon"
 msgstr "Подключение"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:517
+#: personal/connectivity/kolab/class_kolabAccount.inc:524
 msgid "My account"
 msgstr "Моя учетная запись"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:522
+#: personal/connectivity/kolab/class_kolabAccount.inc:529
 msgid "Free busy future"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:523
+#: personal/connectivity/kolab/class_kolabAccount.inc:530
 #, fuzzy
 msgid "Mail size restriction"
 msgstr "Почтовые настройки пользователя"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:524
+#: personal/connectivity/kolab/class_kolabAccount.inc:531
 #, fuzzy
 msgid "Free busy information"
 msgstr "Общая информация о пользователе"
diff --git a/gosa-plugins/kolab/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/kolab/locale/zh/LC_MESSAGES/messages.po
index 7b1e81060..325124443 100644
--- a/gosa-plugins/kolab/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/kolab/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -41,7 +41,7 @@ msgid "Kolab account does not exist!"
 msgstr "Kolab 账号"
 
 #: admin/systems/services/kolab/class_servKolab.inc:207
-#: personal/connectivity/kolab/class_kolabAccount.inc:171
+#: personal/connectivity/kolab/class_kolabAccount.inc:178
 msgid "Error"
 msgstr "错误"
 
@@ -53,8 +53,8 @@ msgstr "姓"
 #: admin/systems/services/kolab/class_servKolab.inc:217
 #: admin/systems/services/kolab/class_servKolab.inc:233
 #: admin/systems/services/kolab/class_servKolab.inc:402
-#: personal/connectivity/kolab/class_kolabAccount.inc:339
-#: personal/connectivity/kolab/class_kolabAccount.inc:476
+#: personal/connectivity/kolab/class_kolabAccount.inc:346
+#: personal/connectivity/kolab/class_kolabAccount.inc:483
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
@@ -93,7 +93,7 @@ msgstr "添加 Kolab 服务"
 
 #: admin/systems/services/kolab/class_servKolab.inc:429
 #: personal/connectivity/kolab/class_kolabAccount.inc:5
-#: personal/connectivity/kolab/class_kolabAccount.inc:512
+#: personal/connectivity/kolab/class_kolabAccount.inc:519
 msgid "Kolab"
 msgstr "Kolab"
 
@@ -326,7 +326,7 @@ msgstr "当前 kolab 账号已经禁用。如果您添加一个邮件账号，
 
 #: personal/connectivity/kolab/kolab.tpl:51
 #: personal/connectivity/kolab/kolab.tpl:63
-#: personal/connectivity/kolab/class_kolabAccount.inc:525
+#: personal/connectivity/kolab/class_kolabAccount.inc:532
 msgid "Delegations"
 msgstr "代理人"
 
@@ -355,7 +355,7 @@ msgid "days"
 msgstr "天"
 
 #: personal/connectivity/kolab/kolab.tpl:119
-#: personal/connectivity/kolab/class_kolabAccount.inc:526
+#: personal/connectivity/kolab/class_kolabAccount.inc:533
 msgid "Invitation policy"
 msgstr "邀请策略"
 
@@ -364,80 +364,80 @@ msgstr "邀请策略"
 msgid "This does something"
 msgstr "******"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:171
+#: personal/connectivity/kolab/class_kolabAccount.inc:178
 msgid "Mail address"
 msgstr "邮件地址"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:204
+#: personal/connectivity/kolab/class_kolabAccount.inc:211
 msgid "Always accept"
 msgstr "总是接受"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:205
+#: personal/connectivity/kolab/class_kolabAccount.inc:212
 msgid "Always reject"
 msgstr "总是拒绝"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:206
+#: personal/connectivity/kolab/class_kolabAccount.inc:213
 msgid "Reject if conflicts"
 msgstr "如果冲突拒绝"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:207
+#: personal/connectivity/kolab/class_kolabAccount.inc:214
 msgid "Manual if conflicts"
 msgstr "如果冲突手工解决"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:208
+#: personal/connectivity/kolab/class_kolabAccount.inc:215
 msgid "Manual"
 msgstr "手工解决"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:256
+#: personal/connectivity/kolab/class_kolabAccount.inc:263
 msgid "Anonymous"
 msgstr "匿名"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:351
-#: personal/connectivity/kolab/class_kolabAccount.inc:354
+#: personal/connectivity/kolab/class_kolabAccount.inc:358
+#: personal/connectivity/kolab/class_kolabAccount.inc:361
 #, fuzzy
 msgid "Free Busy future"
 msgstr "自由使用的信息"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:359
-#: personal/connectivity/kolab/class_kolabAccount.inc:362
+#: personal/connectivity/kolab/class_kolabAccount.inc:366
+#: personal/connectivity/kolab/class_kolabAccount.inc:369
 #, fuzzy
 msgid "Free Busy url"
 msgstr "自由使用的信息"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:376
+#: personal/connectivity/kolab/class_kolabAccount.inc:383
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr "地址 '%s' 的邀请策略条目无效。"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:384
+#: personal/connectivity/kolab/class_kolabAccount.inc:391
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr "没有针对您邀请策略的地址为 '%s' 的用户！"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:513
+#: personal/connectivity/kolab/class_kolabAccount.inc:520
 #, fuzzy
 msgid "Kolab account settings"
 msgstr "Kolab 账号"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:513
+#: personal/connectivity/kolab/class_kolabAccount.inc:520
 #, fuzzy
 msgid "Connectivity addon"
 msgstr "互联"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:517
+#: personal/connectivity/kolab/class_kolabAccount.inc:524
 msgid "My account"
 msgstr "我的账号"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:522
+#: personal/connectivity/kolab/class_kolabAccount.inc:529
 msgid "Free busy future"
 msgstr ""
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:523
+#: personal/connectivity/kolab/class_kolabAccount.inc:530
 #, fuzzy
 msgid "Mail size restriction"
 msgstr "邮件传递列表"
 
-#: personal/connectivity/kolab/class_kolabAccount.inc:524
+#: personal/connectivity/kolab/class_kolabAccount.inc:531
 #, fuzzy
 msgid "Free busy information"
 msgstr "自由使用的信息"
diff --git a/gosa-plugins/ldapmanager/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/ldapmanager/locale/de/LC_MESSAGES/messages.po
index eab72bf30..68458823c 100644
--- a/gosa-plugins/ldapmanager/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/ldapmanager/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2008-12-03 15:10+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
diff --git a/gosa-plugins/ldapmanager/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/ldapmanager/locale/es/LC_MESSAGES/messages.po
index 72a507132..fb31b7078 100644
--- a/gosa-plugins/ldapmanager/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/ldapmanager/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
diff --git a/gosa-plugins/ldapmanager/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/ldapmanager/locale/fr/LC_MESSAGES/messages.po
index 6906ff753..48deb027d 100644
--- a/gosa-plugins/ldapmanager/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/ldapmanager/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2008-12-21 12:02+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: french <fr@li.org>\n"
diff --git a/gosa-plugins/ldapmanager/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/ldapmanager/locale/it/LC_MESSAGES/messages.po
index 2cff8003c..eb5a63295 100644
--- a/gosa-plugins/ldapmanager/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/ldapmanager/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
diff --git a/gosa-plugins/ldapmanager/locale/messages.po b/gosa-plugins/ldapmanager/locale/messages.po
index 06ed95600..dcd989628 100644
--- a/gosa-plugins/ldapmanager/locale/messages.po
+++ b/gosa-plugins/ldapmanager/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gosa-plugins/ldapmanager/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/ldapmanager/locale/nl/LC_MESSAGES/messages.po
index 098ec7d2d..4771a4f39 100644
--- a/gosa-plugins/ldapmanager/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/ldapmanager/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
diff --git a/gosa-plugins/ldapmanager/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/ldapmanager/locale/pl/LC_MESSAGES/messages.po
index 7d37e3ab4..1cf50e476 100644
--- a/gosa-plugins/ldapmanager/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/ldapmanager/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
diff --git a/gosa-plugins/ldapmanager/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/ldapmanager/locale/ru/LC_MESSAGES/messages.po
index d21b6a550..bf081e5e7 100644
--- a/gosa-plugins/ldapmanager/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/ldapmanager/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
diff --git a/gosa-plugins/ldapmanager/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/ldapmanager/locale/zh/LC_MESSAGES/messages.po
index f7183b602..35fcd3f54 100644
--- a/gosa-plugins/ldapmanager/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/ldapmanager/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
diff --git a/gosa-plugins/log/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/log/locale/de/LC_MESSAGES/messages.po
index 30f713cf2..c6ec6bcdc 100644
--- a/gosa-plugins/log/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/log/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2008-04-03 14:22+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
@@ -21,222 +21,208 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:27
-#: admin/systems/services/log/class_gosaLogServer.inc:55
-msgid "GOsa MySQL logging service"
-msgstr "GOsa MySQL-Protokoll-Dienst"
+#: admin/systems/services/syslog/goSyslogServer.tpl:1
+#, fuzzy
+msgid "Syslog Service"
+msgstr "Systemprotokolle"
+
+#: admin/systems/services/syslog/goSyslogServer.tpl:1
+#, fuzzy
+msgid "enabled"
+msgstr "Aktiviert"
+
+#: admin/systems/services/syslog/class_goSyslogServer.inc:27
+#: admin/systems/services/syslog/class_goSyslogServer.inc:47
+#, fuzzy
+msgid "Syslog server"
+msgstr "Systemprotokolle"
+
+#: admin/systems/services/syslog/class_goSyslogServer.inc:68
+#: admin/systems/services/syslog/class_goSyslogServer.inc:69
+#, fuzzy
+msgid "Logging service"
+msgstr "GOsa Protokoll-Dienst"
+
+#: admin/systems/services/syslog/class_goSyslogServer.inc:69
+#: admin/systems/services/syslog/class_goLogDBServer.inc:93
+msgid "Services"
+msgstr "Dienste"
+
+#: admin/systems/services/syslog/class_goLogDBServer.inc:31
+#: admin/systems/services/syslog/class_goLogDBServer.inc:59
+#, fuzzy
+msgid "Syslog service database"
+msgstr "GOsa Protokoll-Datenbank"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:68
-#: admin/systems/services/log/class_gosaLogServer.inc:101
-#: addons/logview/gosa_log_contents.tpl:84
+#: admin/systems/services/syslog/class_goLogDBServer.inc:69
 msgid "User"
 msgstr "Benutzer"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:71
-#: admin/systems/services/log/class_gosaLogServer.inc:102
-#: admin/systems/services/log/gosaLogServer.tpl:20
+#: admin/systems/services/syslog/class_goLogDBServer.inc:72
+#: admin/systems/services/syslog/class_goLogDBServer.inc:105
+#: admin/systems/services/syslog/goLogDBServer.tpl:20
 msgid "Password"
 msgstr "Passwort"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:74
-#: admin/systems/services/log/class_gosaLogServer.inc:100
-#: admin/systems/services/log/gosaLogServer.tpl:4
+#: admin/systems/services/syslog/class_goLogDBServer.inc:75
+#: admin/systems/services/syslog/class_goLogDBServer.inc:106
+#: admin/systems/services/syslog/goLogDBServer.tpl:4
 msgid "Database"
 msgstr "Datenbank"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:91
-#: admin/systems/services/log/class_gosaLogServer.inc:92
-msgid "GOsa logging service"
-msgstr "GOsa Protokoll-Dienst"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:92
+#: admin/systems/services/syslog/class_goLogDBServer.inc:93
+#, fuzzy
+msgid "Logging database"
+msgstr "GOsa Protokoll-Datenbank"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:92
-msgid "Services"
-msgstr "Dienste"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:101
+#, fuzzy
+msgid "Start"
+msgstr "Start"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:103
-msgid "Allow view of entries on this server"
-msgstr "Erlaube Anzeigen von Einträgen auf diesem Server"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:102
+msgid "Stop"
+msgstr ""
 
-#: admin/systems/services/log/gosaLogServer.tpl:1
-msgid "GOsa logging database"
-msgstr "GOsa Protokoll-Datenbank"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:103
+#, fuzzy
+msgid "Restart"
+msgstr "Wiederherstellen"
 
-#: admin/systems/services/log/gosaLogServer.tpl:12
-msgid "Database user"
-msgstr "Datenbank-Benutzer"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:104
+#, fuzzy
+msgid "Admin"
+msgstr "Administrator-DN"
 
-#: addons/logview/gosa_log_contents.tpl:2 addons/logview/contents.tpl:2
-msgid "Filter"
-msgstr "Filter"
+#: admin/systems/services/syslog/goLogDBServer.tpl:1
+#, fuzzy
+msgid "Logging database information"
+msgstr "Zeige/Verstecke Informationen"
 
-#: addons/logview/gosa_log_contents.tpl:11 addons/logview/contents.tpl:11
-msgid "Show hosts"
-msgstr "Zeige Rechner"
+#: admin/systems/services/syslog/goLogDBServer.tpl:12
+#, fuzzy
+msgid "Logging DB user"
+msgstr "Protokollieren fehlgeschlagen: %s"
 
-#: addons/logview/gosa_log_contents.tpl:20
-#: addons/logview/gosa_log_contents.tpl:82
-msgid "Action"
-msgstr "Aktion"
+#~ msgid "GOsa MySQL logging service"
+#~ msgstr "GOsa MySQL-Protokoll-Dienst"
 
-#: addons/logview/gosa_log_contents.tpl:38 addons/logview/contents.tpl:38
-msgid "Time interval"
-msgstr "Zeit-Intervall"
+#~ msgid "Allow view of entries on this server"
+#~ msgstr "Erlaube Anzeigen von Einträgen auf diesem Server"
 
-#: addons/logview/gosa_log_contents.tpl:47 addons/logview/contents.tpl:47
-msgid "Search for"
-msgstr "Suche nach"
+#~ msgid "Database user"
+#~ msgstr "Datenbank-Benutzer"
 
-#: addons/logview/gosa_log_contents.tpl:48 addons/logview/contents.tpl:48
-msgid "Enter string to search for"
-msgstr "Zu suchende Zeichenkette"
+#~ msgid "Filter"
+#~ msgstr "Filter"
 
-#: addons/logview/gosa_log_contents.tpl:60 addons/logview/contents.tpl:60
-msgid "Ruleset"
-msgstr "Regelsatz"
+#~ msgid "Show hosts"
+#~ msgstr "Zeige Rechner"
 
-#: addons/logview/gosa_log_contents.tpl:62 addons/logview/contents.tpl:62
-msgid "Edit"
-msgstr "Bearbeiten"
+#~ msgid "Action"
+#~ msgstr "Aktion"
 
-#: addons/logview/gosa_log_contents.tpl:68 addons/logview/contents.tpl:68
-msgid "Search"
-msgstr "Suchen"
+#~ msgid "Time interval"
+#~ msgstr "Zeit-Intervall"
 
-#: addons/logview/gosa_log_contents.tpl:83 addons/logview/contents.tpl:84
-msgid "Date"
-msgstr "Datum"
+#~ msgid "Search for"
+#~ msgstr "Suche nach"
 
-#: addons/logview/gosa_log_contents.tpl:85
-msgid "Object type"
-msgstr "Objekttyp"
+#~ msgid "Enter string to search for"
+#~ msgstr "Zu suchende Zeichenkette"
 
-#: addons/logview/gosa_log_contents.tpl:86
-msgid "Object"
-msgstr "Objekt"
+#~ msgid "Ruleset"
+#~ msgstr "Regelsatz"
 
-#: addons/logview/gosa_log_contents.tpl:87 addons/logview/contents.tpl:85
-msgid "Message"
-msgstr "Nachricht"
+#~ msgid "Edit"
+#~ msgstr "Bearbeiten"
 
-#: addons/logview/gosa_log_contents.tpl:99 addons/logview/contents.tpl:97
-msgid "Search returned no results..."
-msgstr "Die Suche verlief ergebnislos..."
+#~ msgid "Search"
+#~ msgstr "Suchen"
 
-#: addons/logview/class_logview.inc:6 addons/logview/class_logview.inc:418
-#: addons/logview/class_gosa_logview.inc:6
-msgid "System logs"
-msgstr "Systemprotokolle"
+#~ msgid "Date"
+#~ msgstr "Datum"
 
-#: addons/logview/class_logview.inc:7 addons/logview/class_gosa_logview.inc:7
-msgid "This does something"
-msgstr "Dies tut etwas"
-
-#: addons/logview/class_logview.inc:79
-#: addons/logview/class_gosa_logview.inc:118
-msgid "Warning"
-msgstr "Warnung"
-
-#: addons/logview/class_logview.inc:83
-#: addons/logview/class_gosa_logview.inc:124
-msgid "Configuration error"
-msgstr "Konfigurationsfehler"
-
-#: addons/logview/class_logview.inc:83
-#: addons/logview/class_gosa_logview.inc:124
-#, php-format
-msgid "Missing %s PHP extension!"
-msgstr "Fehlende %s PHP-Erweiterung!"
-
-#: addons/logview/class_logview.inc:95 addons/logview/class_logview.inc:102
-#: addons/logview/class_logview.inc:115 addons/logview/class_logview.inc:137
-#: addons/logview/class_logview.inc:195 addons/logview/class_logview.inc:200
-#: addons/logview/class_logview.inc:277 addons/logview/class_logview.inc:294
-#: addons/logview/class_gosa_logview.inc:151
-#: addons/logview/class_gosa_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:237
-#: addons/logview/class_gosa_logview.inc:288
-msgid "Error"
-msgstr "Fehler"
-
-#: addons/logview/class_logview.inc:124 addons/logview/class_logview.inc:146
-#: addons/logview/class_gosa_logview.inc:169
-#: addons/logview/class_gosa_logview.inc:184
-msgid "All"
-msgstr "Alle"
-
-#: addons/logview/class_logview.inc:156
-#: addons/logview/class_gosa_logview.inc:71
-msgid "one hour"
-msgstr "eine Stunde"
-
-#: addons/logview/class_logview.inc:156
-#: addons/logview/class_gosa_logview.inc:71
-msgid "6 hours"
-msgstr "6 Stunden"
-
-#: addons/logview/class_logview.inc:157
-#: addons/logview/class_gosa_logview.inc:72
-msgid "12 hours"
-msgstr "12 Stunden"
-
-#: addons/logview/class_logview.inc:157
-#: addons/logview/class_gosa_logview.inc:72
-msgid "24 hours"
-msgstr "24 Stunden"
-
-#: addons/logview/class_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:73
-msgid "2 days"
-msgstr "2 Tage"
-
-#: addons/logview/class_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:73
-msgid "one week"
-msgstr "eine Woche"
-
-#: addons/logview/class_logview.inc:159
-#: addons/logview/class_gosa_logview.inc:74
-msgid "2 weeks"
-msgstr "2 Wochen"
-
-#: addons/logview/class_logview.inc:159
-#: addons/logview/class_gosa_logview.inc:74
-msgid "one month"
-msgstr "ein Monat"
-
-#: addons/logview/class_logview.inc:412
-msgid "Log view"
-msgstr "Protokollanzeige"
-
-#: addons/logview/class_logview.inc:413
-msgid "Log view addon"
-msgstr "Protokollanzeige-Erweiterung"
-
-#: addons/logview/main.inc:49
-msgid "System log view"
-msgstr "Systemprotokolle"
+#~ msgid "Object type"
+#~ msgstr "Objekttyp"
 
-#: addons/logview/class_gosa_logview.inc:203
-msgid "You have insufficient permissions to view syslog entries."
-msgstr ""
-"Sie haben keine ausreichenden Zugriffsrechte, um das Systemprotokoll "
-"einzusehen."
+#~ msgid "Object"
+#~ msgstr "Objekt"
 
-#: addons/logview/class_gosa_logview.inc:238
-#, php-format
-msgid "Missing logging table (%s.%s) update your GOsa logging database schema."
-msgstr ""
-"Fehlende Protokollierungstabelle (%s.%s). Aktualisieren Sie Ihr GOsa "
-"Protokolldatenbank-Schema."
+#~ msgid "Message"
+#~ msgstr "Nachricht"
+
+#~ msgid "Search returned no results..."
+#~ msgstr "Die Suche verlief ergebnislos..."
+
+#~ msgid "System logs"
+#~ msgstr "Systemprotokolle"
+
+#~ msgid "This does something"
+#~ msgstr "Dies tut etwas"
+
+#~ msgid "Warning"
+#~ msgstr "Warnung"
+
+#~ msgid "Configuration error"
+#~ msgstr "Konfigurationsfehler"
+
+#~ msgid "Missing %s PHP extension!"
+#~ msgstr "Fehlende %s PHP-Erweiterung!"
+
+#~ msgid "Error"
+#~ msgstr "Fehler"
+
+#~ msgid "All"
+#~ msgstr "Alle"
+
+#~ msgid "one hour"
+#~ msgstr "eine Stunde"
+
+#~ msgid "6 hours"
+#~ msgstr "6 Stunden"
+
+#~ msgid "12 hours"
+#~ msgstr "12 Stunden"
+
+#~ msgid "24 hours"
+#~ msgstr "24 Stunden"
+
+#~ msgid "2 days"
+#~ msgstr "2 Tage"
+
+#~ msgid "one week"
+#~ msgstr "eine Woche"
+
+#~ msgid "2 weeks"
+#~ msgstr "2 Wochen"
+
+#~ msgid "one month"
+#~ msgstr "ein Monat"
+
+#~ msgid "Log view"
+#~ msgstr "Protokollanzeige"
+
+#~ msgid "Log view addon"
+#~ msgstr "Protokollanzeige-Erweiterung"
+
+#~ msgid "You have insufficient permissions to view syslog entries."
+#~ msgstr ""
+#~ "Sie haben keine ausreichenden Zugriffsrechte, um das Systemprotokoll "
+#~ "einzusehen."
+
+#~ msgid ""
+#~ "Missing logging table (%s.%s) update your GOsa logging database schema."
+#~ msgstr ""
+#~ "Fehlende Protokollierungstabelle (%s.%s). Aktualisieren Sie Ihr GOsa "
+#~ "Protokolldatenbank-Schema."
 
-#: addons/logview/contents.tpl:20
-msgid "Log level"
-msgstr "Priorität"
+#~ msgid "Log level"
+#~ msgstr "Priorität"
 
-#: addons/logview/contents.tpl:82
-msgid "Level"
-msgstr "Level"
+#~ msgid "Level"
+#~ msgstr "Level"
 
-#: addons/logview/contents.tpl:83
-msgid "Hostname"
-msgstr "Hostname"
+#~ msgid "Hostname"
+#~ msgstr "Hostname"
diff --git a/gosa-plugins/log/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/log/locale/es/LC_MESSAGES/messages.po
index 56cd1f84d..664e46853 100644
--- a/gosa-plugins/log/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/log/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
@@ -17,240 +17,185 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:27
-#: admin/systems/services/log/class_gosaLogServer.inc:55
+#: admin/systems/services/syslog/goSyslogServer.tpl:1
 #, fuzzy
-msgid "GOsa MySQL logging service"
-msgstr "servicio de registro de GOsa"
-
-#: admin/systems/services/log/class_gosaLogServer.inc:68
-#: admin/systems/services/log/class_gosaLogServer.inc:101
-#: addons/logview/gosa_log_contents.tpl:84
-msgid "User"
-msgstr "Usuario"
+msgid "Syslog Service"
+msgstr "Sistema / Departamento"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:71
-#: admin/systems/services/log/class_gosaLogServer.inc:102
-#: admin/systems/services/log/gosaLogServer.tpl:20
-msgid "Password"
-msgstr "Contraseña"
+#: admin/systems/services/syslog/goSyslogServer.tpl:1
+#, fuzzy
+msgid "enabled"
+msgstr "Activado"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:74
-#: admin/systems/services/log/class_gosaLogServer.inc:100
-#: admin/systems/services/log/gosaLogServer.tpl:4
-msgid "Database"
-msgstr "Bases de datos"
+#: admin/systems/services/syslog/class_goSyslogServer.inc:27
+#: admin/systems/services/syslog/class_goSyslogServer.inc:47
+#, fuzzy
+msgid "Syslog server"
+msgstr "Mostrar servidores"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:91
-#: admin/systems/services/log/class_gosaLogServer.inc:92
-msgid "GOsa logging service"
+#: admin/systems/services/syslog/class_goSyslogServer.inc:68
+#: admin/systems/services/syslog/class_goSyslogServer.inc:69
+#, fuzzy
+msgid "Logging service"
 msgstr "servicio de registro de GOsa"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:92
+#: admin/systems/services/syslog/class_goSyslogServer.inc:69
+#: admin/systems/services/syslog/class_goLogDBServer.inc:93
 msgid "Services"
 msgstr "Servicios"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:103
-msgid "Allow view of entries on this server"
-msgstr "Permitir vista de entradas en este servidor"
-
-#: admin/systems/services/log/gosaLogServer.tpl:1
+#: admin/systems/services/syslog/class_goLogDBServer.inc:31
+#: admin/systems/services/syslog/class_goLogDBServer.inc:59
 #, fuzzy
-msgid "GOsa logging database"
+msgid "Syslog service database"
 msgstr "Pantalla de inicio de GOsa"
 
-#: admin/systems/services/log/gosaLogServer.tpl:12
-msgid "Database user"
-msgstr "Usuario de base de datos"
-
-#: addons/logview/gosa_log_contents.tpl:2 addons/logview/contents.tpl:2
-#, fuzzy
-msgid "Filter"
-msgstr "Filtros"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:69
+msgid "User"
+msgstr "Usuario"
 
-#: addons/logview/gosa_log_contents.tpl:11 addons/logview/contents.tpl:11
-#, fuzzy
-msgid "Show hosts"
-msgstr "Mostrar %s"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:72
+#: admin/systems/services/syslog/class_goLogDBServer.inc:105
+#: admin/systems/services/syslog/goLogDBServer.tpl:20
+msgid "Password"
+msgstr "Contraseña"
 
-#: addons/logview/gosa_log_contents.tpl:20
-#: addons/logview/gosa_log_contents.tpl:82
-msgid "Action"
-msgstr "Acción"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:75
+#: admin/systems/services/syslog/class_goLogDBServer.inc:106
+#: admin/systems/services/syslog/goLogDBServer.tpl:4
+msgid "Database"
+msgstr "Bases de datos"
 
-#: addons/logview/gosa_log_contents.tpl:38 addons/logview/contents.tpl:38
-msgid "Time interval"
-msgstr ""
+#: admin/systems/services/syslog/class_goLogDBServer.inc:92
+#: admin/systems/services/syslog/class_goLogDBServer.inc:93
+#, fuzzy
+msgid "Logging database"
+msgstr "Pantalla de inicio de GOsa"
 
-#: addons/logview/gosa_log_contents.tpl:47 addons/logview/contents.tpl:47
+#: admin/systems/services/syslog/class_goLogDBServer.inc:101
 #, fuzzy
-msgid "Search for"
-msgstr "Buscar"
+msgid "Start"
+msgstr "Inicio"
 
-#: addons/logview/gosa_log_contents.tpl:48 addons/logview/contents.tpl:48
-msgid "Enter string to search for"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:102
+msgid "Stop"
 msgstr ""
 
-#: addons/logview/gosa_log_contents.tpl:60 addons/logview/contents.tpl:60
+#: admin/systems/services/syslog/class_goLogDBServer.inc:103
 #, fuzzy
-msgid "Ruleset"
-msgstr "Eliminar ACL"
+msgid "Restart"
+msgstr "Recuperar"
 
-#: addons/logview/gosa_log_contents.tpl:62 addons/logview/contents.tpl:62
-msgid "Edit"
-msgstr "Editar"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:104
+#, fuzzy
+msgid "Admin"
+msgstr "DN del administrador"
 
-#: addons/logview/gosa_log_contents.tpl:68 addons/logview/contents.tpl:68
-msgid "Search"
-msgstr "Buscar"
+#: admin/systems/services/syslog/goLogDBServer.tpl:1
+#, fuzzy
+msgid "Logging database information"
+msgstr "Modificar información"
 
-#: addons/logview/gosa_log_contents.tpl:83 addons/logview/contents.tpl:84
+#: admin/systems/services/syslog/goLogDBServer.tpl:12
 #, fuzzy
-msgid "Date"
-msgstr "Provincia"
+msgid "Logging DB user"
+msgstr "Entrada fallida: %s"
 
-#: addons/logview/gosa_log_contents.tpl:85
 #, fuzzy
-msgid "Object type"
-msgstr "Objeto"
+#~ msgid "GOsa MySQL logging service"
+#~ msgstr "servicio de registro de GOsa"
 
-#: addons/logview/gosa_log_contents.tpl:86
-msgid "Object"
-msgstr "Objeto"
+#~ msgid "Allow view of entries on this server"
+#~ msgstr "Permitir vista de entradas en este servidor"
 
-#: addons/logview/gosa_log_contents.tpl:87 addons/logview/contents.tpl:85
-msgid "Message"
-msgstr ""
+#~ msgid "Database user"
+#~ msgstr "Usuario de base de datos"
 
-#: addons/logview/gosa_log_contents.tpl:99 addons/logview/contents.tpl:97
-msgid "Search returned no results..."
-msgstr ""
-
-#: addons/logview/class_logview.inc:6 addons/logview/class_logview.inc:418
-#: addons/logview/class_gosa_logview.inc:6
 #, fuzzy
-msgid "System logs"
-msgstr "Sistemas"
+#~ msgid "Filter"
+#~ msgstr "Filtros"
 
-#: addons/logview/class_logview.inc:7 addons/logview/class_gosa_logview.inc:7
 #, fuzzy
-msgid "This does something"
-msgstr "Mostrar objetos que coincidan"
+#~ msgid "Show hosts"
+#~ msgstr "Mostrar %s"
 
-#: addons/logview/class_logview.inc:79
-#: addons/logview/class_gosa_logview.inc:118
-msgid "Warning"
-msgstr "Aviso"
+#~ msgid "Action"
+#~ msgstr "Acción"
 
-#: addons/logview/class_logview.inc:83
-#: addons/logview/class_gosa_logview.inc:124
 #, fuzzy
-msgid "Configuration error"
-msgstr "Se puede escribir en la configuración"
+#~ msgid "Search for"
+#~ msgstr "Buscar"
 
-#: addons/logview/class_logview.inc:83
-#: addons/logview/class_gosa_logview.inc:124
-#, fuzzy, php-format
-msgid "Missing %s PHP extension!"
-msgstr "Eliminar extensión de impresión"
+#, fuzzy
+#~ msgid "Ruleset"
+#~ msgstr "Eliminar ACL"
 
-#: addons/logview/class_logview.inc:95 addons/logview/class_logview.inc:102
-#: addons/logview/class_logview.inc:115 addons/logview/class_logview.inc:137
-#: addons/logview/class_logview.inc:195 addons/logview/class_logview.inc:200
-#: addons/logview/class_logview.inc:277 addons/logview/class_logview.inc:294
-#: addons/logview/class_gosa_logview.inc:151
-#: addons/logview/class_gosa_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:237
-#: addons/logview/class_gosa_logview.inc:288
-msgid "Error"
-msgstr "Error"
+#~ msgid "Edit"
+#~ msgstr "Editar"
+
+#~ msgid "Search"
+#~ msgstr "Buscar"
 
-#: addons/logview/class_logview.inc:124 addons/logview/class_logview.inc:146
-#: addons/logview/class_gosa_logview.inc:169
-#: addons/logview/class_gosa_logview.inc:184
 #, fuzzy
-msgid "All"
-msgstr "Acl"
+#~ msgid "Date"
+#~ msgstr "Provincia"
 
-#: addons/logview/class_logview.inc:156
-#: addons/logview/class_gosa_logview.inc:71
 #, fuzzy
-msgid "one hour"
-msgstr "Número de teléfono"
+#~ msgid "Object type"
+#~ msgstr "Objeto"
 
-#: addons/logview/class_logview.inc:156
-#: addons/logview/class_gosa_logview.inc:71
-msgid "6 hours"
-msgstr ""
+#~ msgid "Object"
+#~ msgstr "Objeto"
 
-#: addons/logview/class_logview.inc:157
-#: addons/logview/class_gosa_logview.inc:72
-msgid "12 hours"
-msgstr ""
+#, fuzzy
+#~ msgid "System logs"
+#~ msgstr "Sistemas"
 
-#: addons/logview/class_logview.inc:157
-#: addons/logview/class_gosa_logview.inc:72
-msgid "24 hours"
-msgstr ""
+#, fuzzy
+#~ msgid "This does something"
+#~ msgstr "Mostrar objetos que coincidan"
 
-#: addons/logview/class_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:73
-msgid "2 days"
-msgstr ""
+#~ msgid "Warning"
+#~ msgstr "Aviso"
 
-#: addons/logview/class_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:73
 #, fuzzy
-msgid "one week"
-msgstr "Cola telefónica"
+#~ msgid "Configuration error"
+#~ msgstr "Se puede escribir en la configuración"
 
-#: addons/logview/class_logview.inc:159
-#: addons/logview/class_gosa_logview.inc:74
-msgid "2 weeks"
-msgstr ""
+#, fuzzy
+#~ msgid "Missing %s PHP extension!"
+#~ msgstr "Eliminar extensión de impresión"
 
-#: addons/logview/class_logview.inc:159
-#: addons/logview/class_gosa_logview.inc:74
-msgid "one month"
-msgstr ""
+#~ msgid "Error"
+#~ msgstr "Error"
 
-#: addons/logview/class_logview.inc:412
 #, fuzzy
-msgid "Log view"
-msgstr "Inicio"
-
-#: addons/logview/class_logview.inc:413
-msgid "Log view addon"
-msgstr ""
+#~ msgid "All"
+#~ msgstr "Acl"
 
-#: addons/logview/main.inc:49
 #, fuzzy
-msgid "System log view"
-msgstr "Sistema / Departamento"
+#~ msgid "one hour"
+#~ msgstr "Número de teléfono"
 
-#: addons/logview/class_gosa_logview.inc:203
 #, fuzzy
-msgid "You have insufficient permissions to view syslog entries."
-msgstr "No tiene permisos para ver estos objetos:"
+#~ msgid "one week"
+#~ msgstr "Cola telefónica"
 
-#: addons/logview/class_gosa_logview.inc:238
-#, php-format
-msgid "Missing logging table (%s.%s) update your GOsa logging database schema."
-msgstr ""
+#, fuzzy
+#~ msgid "Log view"
+#~ msgstr "Inicio"
 
-#: addons/logview/contents.tpl:20
 #, fuzzy
-msgid "Log level"
-msgstr "Nivel de depuración"
+#~ msgid "You have insufficient permissions to view syslog entries."
+#~ msgstr "No tiene permisos para ver estos objetos:"
 
-#: addons/logview/contents.tpl:82
-msgid "Level"
-msgstr ""
+#, fuzzy
+#~ msgid "Log level"
+#~ msgstr "Nivel de depuración"
 
-#: addons/logview/contents.tpl:83
 #, fuzzy
-msgid "Hostname"
-msgstr "Apellido"
+#~ msgid "Hostname"
+#~ msgstr "Apellido"
 
 #~ msgid "Save"
 #~ msgstr "Guardar"
diff --git a/gosa-plugins/log/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/log/locale/fr/LC_MESSAGES/messages.po
index ba31630ce..daac3f1fb 100644
--- a/gosa-plugins/log/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/log/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2008-06-08 14:13+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -14,221 +14,209 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:27
-#: admin/systems/services/log/class_gosaLogServer.inc:55
-msgid "GOsa MySQL logging service"
-msgstr "Service de journaux systèmes GOsa MySQL"
+#: admin/systems/services/syslog/goSyslogServer.tpl:1
+#, fuzzy
+msgid "Syslog Service"
+msgstr "Affichage des journaux système"
+
+#: admin/systems/services/syslog/goSyslogServer.tpl:1
+#, fuzzy
+msgid "enabled"
+msgstr "Activé"
+
+#: admin/systems/services/syslog/class_goSyslogServer.inc:27
+#: admin/systems/services/syslog/class_goSyslogServer.inc:47
+#, fuzzy
+msgid "Syslog server"
+msgstr "Affichage des journaux système"
+
+#: admin/systems/services/syslog/class_goSyslogServer.inc:68
+#: admin/systems/services/syslog/class_goSyslogServer.inc:69
+#, fuzzy
+msgid "Logging service"
+msgstr "Service de journaux systèmes GOsa"
+
+#: admin/systems/services/syslog/class_goSyslogServer.inc:69
+#: admin/systems/services/syslog/class_goLogDBServer.inc:93
+msgid "Services"
+msgstr "Services"
+
+#: admin/systems/services/syslog/class_goLogDBServer.inc:31
+#: admin/systems/services/syslog/class_goLogDBServer.inc:59
+#, fuzzy
+msgid "Syslog service database"
+msgstr "Base de données des journaux systèmes GOsa"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:68
-#: admin/systems/services/log/class_gosaLogServer.inc:101
-#: addons/logview/gosa_log_contents.tpl:84
+#: admin/systems/services/syslog/class_goLogDBServer.inc:69
 msgid "User"
 msgstr "Utilisateur"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:71
-#: admin/systems/services/log/class_gosaLogServer.inc:102
-#: admin/systems/services/log/gosaLogServer.tpl:20
+#: admin/systems/services/syslog/class_goLogDBServer.inc:72
+#: admin/systems/services/syslog/class_goLogDBServer.inc:105
+#: admin/systems/services/syslog/goLogDBServer.tpl:20
 msgid "Password"
 msgstr "Mot de passe"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:74
-#: admin/systems/services/log/class_gosaLogServer.inc:100
-#: admin/systems/services/log/gosaLogServer.tpl:4
+#: admin/systems/services/syslog/class_goLogDBServer.inc:75
+#: admin/systems/services/syslog/class_goLogDBServer.inc:106
+#: admin/systems/services/syslog/goLogDBServer.tpl:4
 msgid "Database"
 msgstr "Base de données"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:91
-#: admin/systems/services/log/class_gosaLogServer.inc:92
-msgid "GOsa logging service"
-msgstr "Service de journaux systèmes GOsa"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:92
+#: admin/systems/services/syslog/class_goLogDBServer.inc:93
+#, fuzzy
+msgid "Logging database"
+msgstr "Base de données des journaux systèmes GOsa"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:92
-msgid "Services"
-msgstr "Services"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:101
+#, fuzzy
+msgid "Start"
+msgstr "Démarrage"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:103
-msgid "Allow view of entries on this server"
-msgstr "Permet la visualisation d'entrées sur ce serveur"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:102
+msgid "Stop"
+msgstr ""
 
-#: admin/systems/services/log/gosaLogServer.tpl:1
-msgid "GOsa logging database"
-msgstr "Base de données des journaux systèmes GOsa"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:103
+#, fuzzy
+msgid "Restart"
+msgstr "Restaurer"
 
-#: admin/systems/services/log/gosaLogServer.tpl:12
-msgid "Database user"
-msgstr "Utilisateur de la base de donées"
-
-#: addons/logview/gosa_log_contents.tpl:2 addons/logview/contents.tpl:2
-msgid "Filter"
-msgstr "Filtre"
-
-#: addons/logview/gosa_log_contents.tpl:11 addons/logview/contents.tpl:11
-msgid "Show hosts"
-msgstr "Afficher les machines"
-
-#: addons/logview/gosa_log_contents.tpl:20
-#: addons/logview/gosa_log_contents.tpl:82
-msgid "Action"
-msgstr "Action"
-
-#: addons/logview/gosa_log_contents.tpl:38 addons/logview/contents.tpl:38
-msgid "Time interval"
-msgstr "Intervalle de temps"
-
-#: addons/logview/gosa_log_contents.tpl:47 addons/logview/contents.tpl:47
-msgid "Search for"
-msgstr "Recherche de"
-
-#: addons/logview/gosa_log_contents.tpl:48 addons/logview/contents.tpl:48
-msgid "Enter string to search for"
-msgstr "Entrée la chaîne de caractères à rechercher"
-
-#: addons/logview/gosa_log_contents.tpl:60 addons/logview/contents.tpl:60
-msgid "Ruleset"
-msgstr "Ensemble de règles"
-
-#: addons/logview/gosa_log_contents.tpl:62 addons/logview/contents.tpl:62
-msgid "Edit"
-msgstr "Editer"
-
-#: addons/logview/gosa_log_contents.tpl:68 addons/logview/contents.tpl:68
-msgid "Search"
-msgstr "Recherche"
-
-#: addons/logview/gosa_log_contents.tpl:83 addons/logview/contents.tpl:84
-msgid "Date"
-msgstr "Date"
-
-#: addons/logview/gosa_log_contents.tpl:85
-msgid "Object type"
-msgstr "Type de l'objet"
-
-#: addons/logview/gosa_log_contents.tpl:86
-msgid "Object"
-msgstr "Objet"
-
-#: addons/logview/gosa_log_contents.tpl:87 addons/logview/contents.tpl:85
-msgid "Message"
-msgstr "Message"
-
-#: addons/logview/gosa_log_contents.tpl:99 addons/logview/contents.tpl:97
-msgid "Search returned no results..."
-msgstr "La recherche n'a renvoyé aucun résultat..."
-
-#: addons/logview/class_logview.inc:6 addons/logview/class_logview.inc:418
-#: addons/logview/class_gosa_logview.inc:6
-msgid "System logs"
-msgstr "Journaux systèmes"
-
-#: addons/logview/class_logview.inc:7 addons/logview/class_gosa_logview.inc:7
-msgid "This does something"
-msgstr "Ceci fait quelque chose"
-
-#: addons/logview/class_logview.inc:79
-#: addons/logview/class_gosa_logview.inc:118
-msgid "Warning"
-msgstr "Avertissement"
-
-#: addons/logview/class_logview.inc:83
-#: addons/logview/class_gosa_logview.inc:124
-msgid "Configuration error"
-msgstr "Erreur de configuration"
-
-#: addons/logview/class_logview.inc:83
-#: addons/logview/class_gosa_logview.inc:124
-#, php-format
-msgid "Missing %s PHP extension!"
-msgstr "Extension PHP %s manquante !"
-
-#: addons/logview/class_logview.inc:95 addons/logview/class_logview.inc:102
-#: addons/logview/class_logview.inc:115 addons/logview/class_logview.inc:137
-#: addons/logview/class_logview.inc:195 addons/logview/class_logview.inc:200
-#: addons/logview/class_logview.inc:277 addons/logview/class_logview.inc:294
-#: addons/logview/class_gosa_logview.inc:151
-#: addons/logview/class_gosa_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:237
-#: addons/logview/class_gosa_logview.inc:288
-msgid "Error"
-msgstr "Erreur"
-
-#: addons/logview/class_logview.inc:124 addons/logview/class_logview.inc:146
-#: addons/logview/class_gosa_logview.inc:169
-#: addons/logview/class_gosa_logview.inc:184
-msgid "All"
-msgstr "Tout"
-
-#: addons/logview/class_logview.inc:156
-#: addons/logview/class_gosa_logview.inc:71
-msgid "one hour"
-msgstr "une heure"
-
-#: addons/logview/class_logview.inc:156
-#: addons/logview/class_gosa_logview.inc:71
-msgid "6 hours"
-msgstr "6 heures"
-
-#: addons/logview/class_logview.inc:157
-#: addons/logview/class_gosa_logview.inc:72
-msgid "12 hours"
-msgstr "12 heures"
-
-#: addons/logview/class_logview.inc:157
-#: addons/logview/class_gosa_logview.inc:72
-msgid "24 hours"
-msgstr "24 heures"
-
-#: addons/logview/class_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:73
-msgid "2 days"
-msgstr "2 jours"
-
-#: addons/logview/class_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:73
-msgid "one week"
-msgstr "une semaine"
-
-#: addons/logview/class_logview.inc:159
-#: addons/logview/class_gosa_logview.inc:74
-msgid "2 weeks"
-msgstr "2 semaines"
-
-#: addons/logview/class_logview.inc:159
-#: addons/logview/class_gosa_logview.inc:74
-msgid "one month"
-msgstr "un mois"
-
-#: addons/logview/class_logview.inc:412
-msgid "Log view"
-msgstr "Visualisation des journaux systèmes"
-
-#: addons/logview/class_logview.inc:413
-msgid "Log view addon"
-msgstr "Extension de visualisation des journaux systèmes"
-
-#: addons/logview/main.inc:49
-msgid "System log view"
-msgstr "Affichage des journaux système"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:104
+#, fuzzy
+msgid "Admin"
+msgstr "DN de l'administrateur"
 
-#: addons/logview/class_gosa_logview.inc:203
-msgid "You have insufficient permissions to view syslog entries."
-msgstr ""
-"Vous n'avez pas l'autorisation pour voir les entrées des journaux systèmes."
+#: admin/systems/services/syslog/goLogDBServer.tpl:1
+#, fuzzy
+msgid "Logging database information"
+msgstr "Afficher/Cacher l'information"
 
-#: addons/logview/class_gosa_logview.inc:238
-#, php-format
-msgid "Missing logging table (%s.%s) update your GOsa logging database schema."
-msgstr ""
-"La table journaux systèmes (%s.%s) est manquante, mettez à jour vos schéma "
-"de base de données pour l'application des journaux systèmes de GOsa."
+#: admin/systems/services/syslog/goLogDBServer.tpl:12
+#, fuzzy
+msgid "Logging DB user"
+msgstr "Echec du Journal système : %s"
+
+#~ msgid "GOsa MySQL logging service"
+#~ msgstr "Service de journaux systèmes GOsa MySQL"
+
+#~ msgid "Allow view of entries on this server"
+#~ msgstr "Permet la visualisation d'entrées sur ce serveur"
+
+#~ msgid "Database user"
+#~ msgstr "Utilisateur de la base de donées"
+
+#~ msgid "Filter"
+#~ msgstr "Filtre"
+
+#~ msgid "Show hosts"
+#~ msgstr "Afficher les machines"
+
+#~ msgid "Action"
+#~ msgstr "Action"
+
+#~ msgid "Time interval"
+#~ msgstr "Intervalle de temps"
+
+#~ msgid "Search for"
+#~ msgstr "Recherche de"
+
+#~ msgid "Enter string to search for"
+#~ msgstr "Entrée la chaîne de caractères à rechercher"
+
+#~ msgid "Ruleset"
+#~ msgstr "Ensemble de règles"
+
+#~ msgid "Edit"
+#~ msgstr "Editer"
+
+#~ msgid "Search"
+#~ msgstr "Recherche"
+
+#~ msgid "Date"
+#~ msgstr "Date"
+
+#~ msgid "Object type"
+#~ msgstr "Type de l'objet"
+
+#~ msgid "Object"
+#~ msgstr "Objet"
+
+#~ msgid "Message"
+#~ msgstr "Message"
+
+#~ msgid "Search returned no results..."
+#~ msgstr "La recherche n'a renvoyé aucun résultat..."
+
+#~ msgid "System logs"
+#~ msgstr "Journaux systèmes"
+
+#~ msgid "This does something"
+#~ msgstr "Ceci fait quelque chose"
+
+#~ msgid "Warning"
+#~ msgstr "Avertissement"
+
+#~ msgid "Configuration error"
+#~ msgstr "Erreur de configuration"
+
+#~ msgid "Missing %s PHP extension!"
+#~ msgstr "Extension PHP %s manquante !"
+
+#~ msgid "Error"
+#~ msgstr "Erreur"
+
+#~ msgid "All"
+#~ msgstr "Tout"
+
+#~ msgid "one hour"
+#~ msgstr "une heure"
+
+#~ msgid "6 hours"
+#~ msgstr "6 heures"
+
+#~ msgid "12 hours"
+#~ msgstr "12 heures"
+
+#~ msgid "24 hours"
+#~ msgstr "24 heures"
+
+#~ msgid "2 days"
+#~ msgstr "2 jours"
+
+#~ msgid "one week"
+#~ msgstr "une semaine"
+
+#~ msgid "2 weeks"
+#~ msgstr "2 semaines"
+
+#~ msgid "one month"
+#~ msgstr "un mois"
+
+#~ msgid "Log view"
+#~ msgstr "Visualisation des journaux systèmes"
+
+#~ msgid "Log view addon"
+#~ msgstr "Extension de visualisation des journaux systèmes"
+
+#~ msgid "You have insufficient permissions to view syslog entries."
+#~ msgstr ""
+#~ "Vous n'avez pas l'autorisation pour voir les entrées des journaux "
+#~ "systèmes."
+
+#~ msgid ""
+#~ "Missing logging table (%s.%s) update your GOsa logging database schema."
+#~ msgstr ""
+#~ "La table journaux systèmes (%s.%s) est manquante, mettez à jour vos "
+#~ "schéma de base de données pour l'application des journaux systèmes de "
+#~ "GOsa."
 
-#: addons/logview/contents.tpl:20
-msgid "Log level"
-msgstr "Niveaux des journaux systèmes"
+#~ msgid "Log level"
+#~ msgstr "Niveaux des journaux systèmes"
 
-#: addons/logview/contents.tpl:82
-msgid "Level"
-msgstr "Niveau"
+#~ msgid "Level"
+#~ msgstr "Niveau"
 
-#: addons/logview/contents.tpl:83
-msgid "Hostname"
-msgstr "Nom d'hôte"
+#~ msgid "Hostname"
+#~ msgstr "Nom d'hôte"
diff --git a/gosa-plugins/log/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/log/locale/it/LC_MESSAGES/messages.po
index 9c6a60b25..36d2c519b 100644
--- a/gosa-plugins/log/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/log/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -15,240 +15,184 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:27
-#: admin/systems/services/log/class_gosaLogServer.inc:55
+#: admin/systems/services/syslog/goSyslogServer.tpl:1
 #, fuzzy
-msgid "GOsa MySQL logging service"
-msgstr "Utenti di Dominio"
-
-#: admin/systems/services/log/class_gosaLogServer.inc:68
-#: admin/systems/services/log/class_gosaLogServer.inc:101
-#: addons/logview/gosa_log_contents.tpl:84
-msgid "User"
-msgstr ""
+msgid "Syslog Service"
+msgstr "Dipartimento"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:71
-#: admin/systems/services/log/class_gosaLogServer.inc:102
-#: admin/systems/services/log/gosaLogServer.tpl:20
-msgid "Password"
-msgstr "Password"
+#: admin/systems/services/syslog/goSyslogServer.tpl:1
+#, fuzzy
+msgid "enabled"
+msgstr "disabilitato"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:74
-#: admin/systems/services/log/class_gosaLogServer.inc:100
-#: admin/systems/services/log/gosaLogServer.tpl:4
+#: admin/systems/services/syslog/class_goSyslogServer.inc:27
+#: admin/systems/services/syslog/class_goSyslogServer.inc:47
 #, fuzzy
-msgid "Database"
-msgstr "Database"
+msgid "Syslog server"
+msgstr "Mostra server"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:91
-#: admin/systems/services/log/class_gosaLogServer.inc:92
+#: admin/systems/services/syslog/class_goSyslogServer.inc:68
+#: admin/systems/services/syslog/class_goSyslogServer.inc:69
 #, fuzzy
-msgid "GOsa logging service"
+msgid "Logging service"
 msgstr "Utenti di Dominio"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:92
+#: admin/systems/services/syslog/class_goSyslogServer.inc:69
+#: admin/systems/services/syslog/class_goLogDBServer.inc:93
 msgid "Services"
 msgstr "Servizi"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:103
+#: admin/systems/services/syslog/class_goLogDBServer.inc:31
+#: admin/systems/services/syslog/class_goLogDBServer.inc:59
 #, fuzzy
-msgid "Allow view of entries on this server"
-msgstr "Permetti la connessione al Terminal Server"
+msgid "Syslog service database"
+msgstr "Database"
+
+#: admin/systems/services/syslog/class_goLogDBServer.inc:69
+msgid "User"
+msgstr ""
+
+#: admin/systems/services/syslog/class_goLogDBServer.inc:72
+#: admin/systems/services/syslog/class_goLogDBServer.inc:105
+#: admin/systems/services/syslog/goLogDBServer.tpl:20
+msgid "Password"
+msgstr "Password"
 
-#: admin/systems/services/log/gosaLogServer.tpl:1
+#: admin/systems/services/syslog/class_goLogDBServer.inc:75
+#: admin/systems/services/syslog/class_goLogDBServer.inc:106
+#: admin/systems/services/syslog/goLogDBServer.tpl:4
 #, fuzzy
-msgid "GOsa logging database"
+msgid "Database"
 msgstr "Database"
 
-#: admin/systems/services/log/gosaLogServer.tpl:12
+#: admin/systems/services/syslog/class_goLogDBServer.inc:92
+#: admin/systems/services/syslog/class_goLogDBServer.inc:93
 #, fuzzy
-msgid "Database user"
+msgid "Logging database"
 msgstr "Database"
 
-#: addons/logview/gosa_log_contents.tpl:2 addons/logview/contents.tpl:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: addons/logview/gosa_log_contents.tpl:11 addons/logview/contents.tpl:11
+#: admin/systems/services/syslog/class_goLogDBServer.inc:101
 #, fuzzy
-msgid "Show hosts"
-msgstr "Mostra telefoni"
-
-#: addons/logview/gosa_log_contents.tpl:20
-#: addons/logview/gosa_log_contents.tpl:82
-msgid "Action"
-msgstr "Azione"
+msgid "Start"
+msgstr "Avvio"
 
-#: addons/logview/gosa_log_contents.tpl:38 addons/logview/contents.tpl:38
-msgid "Time interval"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:102
+msgid "Stop"
 msgstr ""
 
-#: addons/logview/gosa_log_contents.tpl:47 addons/logview/contents.tpl:47
-msgid "Search for"
-msgstr "Cerca"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:103
+#, fuzzy
+msgid "Restart"
+msgstr "Riprova"
 
-#: addons/logview/gosa_log_contents.tpl:48 addons/logview/contents.tpl:48
-msgid "Enter string to search for"
-msgstr ""
+#: admin/systems/services/syslog/class_goLogDBServer.inc:104
+#, fuzzy
+msgid "Admin"
+msgstr "DN dell'amministratore"
 
-#: addons/logview/gosa_log_contents.tpl:60 addons/logview/contents.tpl:60
+#: admin/systems/services/syslog/goLogDBServer.tpl:1
 #, fuzzy
-msgid "Ruleset"
-msgstr "Rimuovi"
+msgid "Logging database information"
+msgstr "Informazioni organizzazione"
 
-#: addons/logview/gosa_log_contents.tpl:62 addons/logview/contents.tpl:62
-msgid "Edit"
-msgstr "Modifica"
+#: admin/systems/services/syslog/goLogDBServer.tpl:12
+#, fuzzy
+msgid "Logging DB user"
+msgstr "Utenti di Dominio"
 
-#: addons/logview/gosa_log_contents.tpl:68 addons/logview/contents.tpl:68
-msgid "Search"
-msgstr "Cerca"
+#, fuzzy
+#~ msgid "GOsa MySQL logging service"
+#~ msgstr "Utenti di Dominio"
 
-#: addons/logview/gosa_log_contents.tpl:83 addons/logview/contents.tpl:84
-msgid "Date"
-msgstr "Data"
+#, fuzzy
+#~ msgid "Allow view of entries on this server"
+#~ msgstr "Permetti la connessione al Terminal Server"
 
-#: addons/logview/gosa_log_contents.tpl:85
 #, fuzzy
-msgid "Object type"
-msgstr "Nome dell'oggetto"
+#~ msgid "Database user"
+#~ msgstr "Database"
 
-#: addons/logview/gosa_log_contents.tpl:86
-msgid "Object"
-msgstr "Oggetto"
+#~ msgid "Filter"
+#~ msgstr "Filtro"
 
-#: addons/logview/gosa_log_contents.tpl:87 addons/logview/contents.tpl:85
 #, fuzzy
-msgid "Message"
-msgstr "Home Page"
+#~ msgid "Show hosts"
+#~ msgstr "Mostra telefoni"
 
-#: addons/logview/gosa_log_contents.tpl:99 addons/logview/contents.tpl:97
-msgid "Search returned no results..."
-msgstr ""
+#~ msgid "Action"
+#~ msgstr "Azione"
 
-#: addons/logview/class_logview.inc:6 addons/logview/class_logview.inc:418
-#: addons/logview/class_gosa_logview.inc:6
-msgid "System logs"
-msgstr "Log di sitema"
+#~ msgid "Search for"
+#~ msgstr "Cerca"
 
-#: addons/logview/class_logview.inc:7 addons/logview/class_gosa_logview.inc:7
-msgid "This does something"
-msgstr "Questo fa qualcosa"
+#, fuzzy
+#~ msgid "Ruleset"
+#~ msgstr "Rimuovi"
 
-#: addons/logview/class_logview.inc:79
-#: addons/logview/class_gosa_logview.inc:118
-msgid "Warning"
-msgstr "Attenzione"
+#~ msgid "Edit"
+#~ msgstr "Modifica"
 
-#: addons/logview/class_logview.inc:83
-#: addons/logview/class_gosa_logview.inc:124
-#, fuzzy
-msgid "Configuration error"
-msgstr "File di configurazione"
-
-#: addons/logview/class_logview.inc:83
-#: addons/logview/class_gosa_logview.inc:124
-#, fuzzy, php-format
-msgid "Missing %s PHP extension!"
-msgstr "Elimina foto"
-
-#: addons/logview/class_logview.inc:95 addons/logview/class_logview.inc:102
-#: addons/logview/class_logview.inc:115 addons/logview/class_logview.inc:137
-#: addons/logview/class_logview.inc:195 addons/logview/class_logview.inc:200
-#: addons/logview/class_logview.inc:277 addons/logview/class_logview.inc:294
-#: addons/logview/class_gosa_logview.inc:151
-#: addons/logview/class_gosa_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:237
-#: addons/logview/class_gosa_logview.inc:288
-msgid "Error"
-msgstr ""
+#~ msgid "Search"
+#~ msgstr "Cerca"
 
-#: addons/logview/class_logview.inc:124 addons/logview/class_logview.inc:146
-#: addons/logview/class_gosa_logview.inc:169
-#: addons/logview/class_gosa_logview.inc:184
-msgid "All"
-msgstr ""
+#~ msgid "Date"
+#~ msgstr "Data"
 
-#: addons/logview/class_logview.inc:156
-#: addons/logview/class_gosa_logview.inc:71
 #, fuzzy
-msgid "one hour"
-msgstr "Numero di telefono"
-
-#: addons/logview/class_logview.inc:156
-#: addons/logview/class_gosa_logview.inc:71
-msgid "6 hours"
-msgstr ""
+#~ msgid "Object type"
+#~ msgstr "Nome dell'oggetto"
 
-#: addons/logview/class_logview.inc:157
-#: addons/logview/class_gosa_logview.inc:72
-msgid "12 hours"
-msgstr ""
+#~ msgid "Object"
+#~ msgstr "Oggetto"
 
-#: addons/logview/class_logview.inc:157
-#: addons/logview/class_gosa_logview.inc:72
-msgid "24 hours"
-msgstr ""
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "Home Page"
 
-#: addons/logview/class_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:73
-msgid "2 days"
-msgstr ""
+#~ msgid "System logs"
+#~ msgstr "Log di sitema"
 
-#: addons/logview/class_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:73
-#, fuzzy
-msgid "one week"
-msgstr "Numero di telefono"
+#~ msgid "This does something"
+#~ msgstr "Questo fa qualcosa"
 
-#: addons/logview/class_logview.inc:159
-#: addons/logview/class_gosa_logview.inc:74
-msgid "2 weeks"
-msgstr ""
+#~ msgid "Warning"
+#~ msgstr "Attenzione"
 
-#: addons/logview/class_logview.inc:159
-#: addons/logview/class_gosa_logview.inc:74
-msgid "one month"
-msgstr ""
+#, fuzzy
+#~ msgid "Configuration error"
+#~ msgstr "File di configurazione"
 
-#: addons/logview/class_logview.inc:412
 #, fuzzy
-msgid "Log view"
-msgstr "Utenti di Dominio"
+#~ msgid "Missing %s PHP extension!"
+#~ msgstr "Elimina foto"
 
-#: addons/logview/class_logview.inc:413
 #, fuzzy
-msgid "Log view addon"
-msgstr "Dominio"
+#~ msgid "one hour"
+#~ msgstr "Numero di telefono"
 
-#: addons/logview/main.inc:49
 #, fuzzy
-msgid "System log view"
-msgstr "Dipartimento"
+#~ msgid "one week"
+#~ msgstr "Numero di telefono"
 
-#: addons/logview/class_gosa_logview.inc:203
 #, fuzzy
-msgid "You have insufficient permissions to view syslog entries."
-msgstr "Non hai il permesso di cambiare la tua password."
+#~ msgid "Log view"
+#~ msgstr "Utenti di Dominio"
 
-#: addons/logview/class_gosa_logview.inc:238
-#, php-format
-msgid "Missing logging table (%s.%s) update your GOsa logging database schema."
-msgstr ""
+#, fuzzy
+#~ msgid "Log view addon"
+#~ msgstr "Dominio"
 
-#: addons/logview/contents.tpl:20
 #, fuzzy
-msgid "Log level"
-msgstr "Rimuovi"
+#~ msgid "You have insufficient permissions to view syslog entries."
+#~ msgstr "Non hai il permesso di cambiare la tua password."
 
-#: addons/logview/contents.tpl:82
-msgid "Level"
-msgstr ""
+#, fuzzy
+#~ msgid "Log level"
+#~ msgstr "Rimuovi"
 
-#: addons/logview/contents.tpl:83
 #, fuzzy
-msgid "Hostname"
-msgstr "Scegli il tuo numero di telefono personale"
+#~ msgid "Hostname"
+#~ msgstr "Scegli il tuo numero di telefono personale"
 
 #~ msgid "Save"
 #~ msgstr "Salva"
diff --git a/gosa-plugins/log/locale/messages.po b/gosa-plugins/log/locale/messages.po
index 23771dac4..f133ece05 100644
--- a/gosa-plugins/log/locale/messages.po
+++ b/gosa-plugins/log/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,218 +16,75 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:27
-#: admin/systems/services/log/class_gosaLogServer.inc:55
-msgid "GOsa MySQL logging service"
+#: admin/systems/services/syslog/goSyslogServer.tpl:1
+msgid "Syslog Service"
 msgstr ""
 
-#: admin/systems/services/log/class_gosaLogServer.inc:68
-#: admin/systems/services/log/class_gosaLogServer.inc:101
-#: addons/logview/gosa_log_contents.tpl:84
-msgid "User"
+#: admin/systems/services/syslog/goSyslogServer.tpl:1
+msgid "enabled"
 msgstr ""
 
-#: admin/systems/services/log/class_gosaLogServer.inc:71
-#: admin/systems/services/log/class_gosaLogServer.inc:102
-#: admin/systems/services/log/gosaLogServer.tpl:20
-msgid "Password"
-msgstr ""
-
-#: admin/systems/services/log/class_gosaLogServer.inc:74
-#: admin/systems/services/log/class_gosaLogServer.inc:100
-#: admin/systems/services/log/gosaLogServer.tpl:4
-msgid "Database"
+#: admin/systems/services/syslog/class_goSyslogServer.inc:27
+#: admin/systems/services/syslog/class_goSyslogServer.inc:47
+msgid "Syslog server"
 msgstr ""
 
-#: admin/systems/services/log/class_gosaLogServer.inc:91
-#: admin/systems/services/log/class_gosaLogServer.inc:92
-msgid "GOsa logging service"
+#: admin/systems/services/syslog/class_goSyslogServer.inc:68
+#: admin/systems/services/syslog/class_goSyslogServer.inc:69
+msgid "Logging service"
 msgstr ""
 
-#: admin/systems/services/log/class_gosaLogServer.inc:92
+#: admin/systems/services/syslog/class_goSyslogServer.inc:69
+#: admin/systems/services/syslog/class_goLogDBServer.inc:93
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/log/class_gosaLogServer.inc:103
-msgid "Allow view of entries on this server"
-msgstr ""
-
-#: admin/systems/services/log/gosaLogServer.tpl:1
-msgid "GOsa logging database"
-msgstr ""
-
-#: admin/systems/services/log/gosaLogServer.tpl:12
-msgid "Database user"
-msgstr ""
-
-#: addons/logview/gosa_log_contents.tpl:2 addons/logview/contents.tpl:2
-msgid "Filter"
-msgstr ""
-
-#: addons/logview/gosa_log_contents.tpl:11 addons/logview/contents.tpl:11
-msgid "Show hosts"
-msgstr ""
-
-#: addons/logview/gosa_log_contents.tpl:20
-#: addons/logview/gosa_log_contents.tpl:82
-msgid "Action"
-msgstr ""
-
-#: addons/logview/gosa_log_contents.tpl:38 addons/logview/contents.tpl:38
-msgid "Time interval"
-msgstr ""
-
-#: addons/logview/gosa_log_contents.tpl:47 addons/logview/contents.tpl:47
-msgid "Search for"
-msgstr ""
-
-#: addons/logview/gosa_log_contents.tpl:48 addons/logview/contents.tpl:48
-msgid "Enter string to search for"
-msgstr ""
-
-#: addons/logview/gosa_log_contents.tpl:60 addons/logview/contents.tpl:60
-msgid "Ruleset"
-msgstr ""
-
-#: addons/logview/gosa_log_contents.tpl:62 addons/logview/contents.tpl:62
-msgid "Edit"
-msgstr ""
-
-#: addons/logview/gosa_log_contents.tpl:68 addons/logview/contents.tpl:68
-msgid "Search"
-msgstr ""
-
-#: addons/logview/gosa_log_contents.tpl:83 addons/logview/contents.tpl:84
-msgid "Date"
-msgstr ""
-
-#: addons/logview/gosa_log_contents.tpl:85
-msgid "Object type"
-msgstr ""
-
-#: addons/logview/gosa_log_contents.tpl:86
-msgid "Object"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:31
+#: admin/systems/services/syslog/class_goLogDBServer.inc:59
+msgid "Syslog service database"
 msgstr ""
 
-#: addons/logview/gosa_log_contents.tpl:87 addons/logview/contents.tpl:85
-msgid "Message"
-msgstr ""
-
-#: addons/logview/gosa_log_contents.tpl:99 addons/logview/contents.tpl:97
-msgid "Search returned no results..."
-msgstr ""
-
-#: addons/logview/class_logview.inc:6 addons/logview/class_logview.inc:418
-#: addons/logview/class_gosa_logview.inc:6
-msgid "System logs"
-msgstr ""
-
-#: addons/logview/class_logview.inc:7 addons/logview/class_gosa_logview.inc:7
-msgid "This does something"
-msgstr ""
-
-#: addons/logview/class_logview.inc:79
-#: addons/logview/class_gosa_logview.inc:118
-msgid "Warning"
-msgstr ""
-
-#: addons/logview/class_logview.inc:83
-#: addons/logview/class_gosa_logview.inc:124
-msgid "Configuration error"
-msgstr ""
-
-#: addons/logview/class_logview.inc:83
-#: addons/logview/class_gosa_logview.inc:124
-#, php-format
-msgid "Missing %s PHP extension!"
-msgstr ""
-
-#: addons/logview/class_logview.inc:95 addons/logview/class_logview.inc:102
-#: addons/logview/class_logview.inc:115 addons/logview/class_logview.inc:137
-#: addons/logview/class_logview.inc:195 addons/logview/class_logview.inc:200
-#: addons/logview/class_logview.inc:277 addons/logview/class_logview.inc:294
-#: addons/logview/class_gosa_logview.inc:151
-#: addons/logview/class_gosa_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:237
-#: addons/logview/class_gosa_logview.inc:288
-msgid "Error"
-msgstr ""
-
-#: addons/logview/class_logview.inc:124 addons/logview/class_logview.inc:146
-#: addons/logview/class_gosa_logview.inc:169
-#: addons/logview/class_gosa_logview.inc:184
-msgid "All"
-msgstr ""
-
-#: addons/logview/class_logview.inc:156
-#: addons/logview/class_gosa_logview.inc:71
-msgid "one hour"
-msgstr ""
-
-#: addons/logview/class_logview.inc:156
-#: addons/logview/class_gosa_logview.inc:71
-msgid "6 hours"
-msgstr ""
-
-#: addons/logview/class_logview.inc:157
-#: addons/logview/class_gosa_logview.inc:72
-msgid "12 hours"
-msgstr ""
-
-#: addons/logview/class_logview.inc:157
-#: addons/logview/class_gosa_logview.inc:72
-msgid "24 hours"
-msgstr ""
-
-#: addons/logview/class_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:73
-msgid "2 days"
-msgstr ""
-
-#: addons/logview/class_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:73
-msgid "one week"
-msgstr ""
-
-#: addons/logview/class_logview.inc:159
-#: addons/logview/class_gosa_logview.inc:74
-msgid "2 weeks"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:69
+msgid "User"
 msgstr ""
 
-#: addons/logview/class_logview.inc:159
-#: addons/logview/class_gosa_logview.inc:74
-msgid "one month"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:72
+#: admin/systems/services/syslog/class_goLogDBServer.inc:105
+#: admin/systems/services/syslog/goLogDBServer.tpl:20
+msgid "Password"
 msgstr ""
 
-#: addons/logview/class_logview.inc:412
-msgid "Log view"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:75
+#: admin/systems/services/syslog/class_goLogDBServer.inc:106
+#: admin/systems/services/syslog/goLogDBServer.tpl:4
+msgid "Database"
 msgstr ""
 
-#: addons/logview/class_logview.inc:413
-msgid "Log view addon"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:92
+#: admin/systems/services/syslog/class_goLogDBServer.inc:93
+msgid "Logging database"
 msgstr ""
 
-#: addons/logview/main.inc:49
-msgid "System log view"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:101
+msgid "Start"
 msgstr ""
 
-#: addons/logview/class_gosa_logview.inc:203
-msgid "You have insufficient permissions to view syslog entries."
+#: admin/systems/services/syslog/class_goLogDBServer.inc:102
+msgid "Stop"
 msgstr ""
 
-#: addons/logview/class_gosa_logview.inc:238
-#, php-format
-msgid "Missing logging table (%s.%s) update your GOsa logging database schema."
+#: admin/systems/services/syslog/class_goLogDBServer.inc:103
+msgid "Restart"
 msgstr ""
 
-#: addons/logview/contents.tpl:20
-msgid "Log level"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:104
+msgid "Admin"
 msgstr ""
 
-#: addons/logview/contents.tpl:82
-msgid "Level"
+#: admin/systems/services/syslog/goLogDBServer.tpl:1
+msgid "Logging database information"
 msgstr ""
 
-#: addons/logview/contents.tpl:83
-msgid "Hostname"
+#: admin/systems/services/syslog/goLogDBServer.tpl:12
+msgid "Logging DB user"
 msgstr ""
diff --git a/gosa-plugins/log/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/log/locale/nl/LC_MESSAGES/messages.po
index e89295f6b..b05bbcc45 100644
--- a/gosa-plugins/log/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/log/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -19,231 +19,212 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:27
-#: admin/systems/services/log/class_gosaLogServer.inc:55
+#: admin/systems/services/syslog/goSyslogServer.tpl:1
 #, fuzzy
-msgid "GOsa MySQL logging service"
+msgid "Syslog Service"
+msgstr "Systeem log weergave"
+
+#: admin/systems/services/syslog/goSyslogServer.tpl:1
+#, fuzzy
+msgid "enabled"
+msgstr "gedeactiveerd"
+
+#: admin/systems/services/syslog/class_goSyslogServer.inc:27
+#: admin/systems/services/syslog/class_goSyslogServer.inc:47
+#, fuzzy
+msgid "Syslog server"
+msgstr "Toon servers"
+
+#: admin/systems/services/syslog/class_goSyslogServer.inc:68
+#: admin/systems/services/syslog/class_goSyslogServer.inc:69
+#, fuzzy
+msgid "Logging service"
 msgstr "Log DB gebruiker"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:68
-#: admin/systems/services/log/class_gosaLogServer.inc:101
-#: addons/logview/gosa_log_contents.tpl:84
+#: admin/systems/services/syslog/class_goSyslogServer.inc:69
+#: admin/systems/services/syslog/class_goLogDBServer.inc:93
+msgid "Services"
+msgstr "Services"
+
+#: admin/systems/services/syslog/class_goLogDBServer.inc:31
+#: admin/systems/services/syslog/class_goLogDBServer.inc:59
+#, fuzzy
+msgid "Syslog service database"
+msgstr "Log database"
+
+#: admin/systems/services/syslog/class_goLogDBServer.inc:69
 msgid "User"
 msgstr "Gebruiker"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:71
-#: admin/systems/services/log/class_gosaLogServer.inc:102
-#: admin/systems/services/log/gosaLogServer.tpl:20
+#: admin/systems/services/syslog/class_goLogDBServer.inc:72
+#: admin/systems/services/syslog/class_goLogDBServer.inc:105
+#: admin/systems/services/syslog/goLogDBServer.tpl:20
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:74
-#: admin/systems/services/log/class_gosaLogServer.inc:100
-#: admin/systems/services/log/gosaLogServer.tpl:4
+#: admin/systems/services/syslog/class_goLogDBServer.inc:75
+#: admin/systems/services/syslog/class_goLogDBServer.inc:106
+#: admin/systems/services/syslog/goLogDBServer.tpl:4
 msgid "Database"
 msgstr "Database"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:91
-#: admin/systems/services/log/class_gosaLogServer.inc:92
+#: admin/systems/services/syslog/class_goLogDBServer.inc:92
+#: admin/systems/services/syslog/class_goLogDBServer.inc:93
 #, fuzzy
-msgid "GOsa logging service"
-msgstr "Log DB gebruiker"
+msgid "Logging database"
+msgstr "Log database"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:92
-msgid "Services"
-msgstr "Services"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:101
+#, fuzzy
+msgid "Start"
+msgstr "Opstarten"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:103
+#: admin/systems/services/syslog/class_goLogDBServer.inc:102
+msgid "Stop"
+msgstr ""
+
+#: admin/systems/services/syslog/class_goLogDBServer.inc:103
 #, fuzzy
-msgid "Allow view of entries on this server"
-msgstr "Sta inloggen op de Terminal Server toe"
+msgid "Restart"
+msgstr "Opnieuw proberen"
 
-#: admin/systems/services/log/gosaLogServer.tpl:1
+#: admin/systems/services/syslog/class_goLogDBServer.inc:104
 #, fuzzy
-msgid "GOsa logging database"
-msgstr "Log database"
+msgid "Admin"
+msgstr "Beheerders DN"
+
+#: admin/systems/services/syslog/goLogDBServer.tpl:1
+#, fuzzy
+msgid "Logging database information"
+msgstr "Informatie weergeven/verbergen"
 
-#: admin/systems/services/log/gosaLogServer.tpl:12
+#: admin/systems/services/syslog/goLogDBServer.tpl:12
 #, fuzzy
-msgid "Database user"
-msgstr "Databases"
+msgid "Logging DB user"
+msgstr "Log DB gebruiker"
+
+#, fuzzy
+#~ msgid "GOsa MySQL logging service"
+#~ msgstr "Log DB gebruiker"
+
+#, fuzzy
+#~ msgid "Allow view of entries on this server"
+#~ msgstr "Sta inloggen op de Terminal Server toe"
+
+#, fuzzy
+#~ msgid "Database user"
+#~ msgstr "Databases"
 
-#: addons/logview/gosa_log_contents.tpl:2 addons/logview/contents.tpl:2
-msgid "Filter"
-msgstr "Filter"
+#~ msgid "Filter"
+#~ msgstr "Filter"
 
-#: addons/logview/gosa_log_contents.tpl:11 addons/logview/contents.tpl:11
-msgid "Show hosts"
-msgstr "Toon computers"
+#~ msgid "Show hosts"
+#~ msgstr "Toon computers"
 
-#: addons/logview/gosa_log_contents.tpl:20
-#: addons/logview/gosa_log_contents.tpl:82
-msgid "Action"
-msgstr "Actie"
+#~ msgid "Action"
+#~ msgstr "Actie"
 
-#: addons/logview/gosa_log_contents.tpl:38 addons/logview/contents.tpl:38
-msgid "Time interval"
-msgstr "Tijd interval"
+#~ msgid "Time interval"
+#~ msgstr "Tijd interval"
 
-#: addons/logview/gosa_log_contents.tpl:47 addons/logview/contents.tpl:47
-msgid "Search for"
-msgstr "Zoek naar"
+#~ msgid "Search for"
+#~ msgstr "Zoek naar"
 
-#: addons/logview/gosa_log_contents.tpl:48 addons/logview/contents.tpl:48
-msgid "Enter string to search for"
-msgstr "Voer de te zoeken string in"
+#~ msgid "Enter string to search for"
+#~ msgstr "Voer de te zoeken string in"
 
-#: addons/logview/gosa_log_contents.tpl:60 addons/logview/contents.tpl:60
-msgid "Ruleset"
-msgstr "Ruleset"
+#~ msgid "Ruleset"
+#~ msgstr "Ruleset"
 
-#: addons/logview/gosa_log_contents.tpl:62 addons/logview/contents.tpl:62
-msgid "Edit"
-msgstr "Bewerken"
+#~ msgid "Edit"
+#~ msgstr "Bewerken"
 
-#: addons/logview/gosa_log_contents.tpl:68 addons/logview/contents.tpl:68
-msgid "Search"
-msgstr "Zoeken"
+#~ msgid "Search"
+#~ msgstr "Zoeken"
 
-#: addons/logview/gosa_log_contents.tpl:83 addons/logview/contents.tpl:84
-msgid "Date"
-msgstr "Datum"
+#~ msgid "Date"
+#~ msgstr "Datum"
 
-#: addons/logview/gosa_log_contents.tpl:85
 #, fuzzy
-msgid "Object type"
-msgstr "Objectnaam"
+#~ msgid "Object type"
+#~ msgstr "Objectnaam"
 
-#: addons/logview/gosa_log_contents.tpl:86
-msgid "Object"
-msgstr "Object"
+#~ msgid "Object"
+#~ msgstr "Object"
 
-#: addons/logview/gosa_log_contents.tpl:87 addons/logview/contents.tpl:85
-msgid "Message"
-msgstr "Bericht"
+#~ msgid "Message"
+#~ msgstr "Bericht"
 
-#: addons/logview/gosa_log_contents.tpl:99 addons/logview/contents.tpl:97
-msgid "Search returned no results..."
-msgstr "De zoekopdracht gaf geen resultaten terug..."
+#~ msgid "Search returned no results..."
+#~ msgstr "De zoekopdracht gaf geen resultaten terug..."
 
-#: addons/logview/class_logview.inc:6 addons/logview/class_logview.inc:418
-#: addons/logview/class_gosa_logview.inc:6
-msgid "System logs"
-msgstr "Systeem logs"
+#~ msgid "System logs"
+#~ msgstr "Systeem logs"
 
-#: addons/logview/class_logview.inc:7 addons/logview/class_gosa_logview.inc:7
-msgid "This does something"
-msgstr "Dit doet iets"
+#~ msgid "This does something"
+#~ msgstr "Dit doet iets"
 
-#: addons/logview/class_logview.inc:79
-#: addons/logview/class_gosa_logview.inc:118
-msgid "Warning"
-msgstr "Waarschuwing"
+#~ msgid "Warning"
+#~ msgstr "Waarschuwing"
 
-#: addons/logview/class_logview.inc:83
-#: addons/logview/class_gosa_logview.inc:124
-#, fuzzy
-msgid "Configuration error"
-msgstr "Configuratie bestand"
-
-#: addons/logview/class_logview.inc:83
-#: addons/logview/class_gosa_logview.inc:124
-#, fuzzy, php-format
-msgid "Missing %s PHP extension!"
-msgstr "Verwijder printer mogelijkheden"
-
-#: addons/logview/class_logview.inc:95 addons/logview/class_logview.inc:102
-#: addons/logview/class_logview.inc:115 addons/logview/class_logview.inc:137
-#: addons/logview/class_logview.inc:195 addons/logview/class_logview.inc:200
-#: addons/logview/class_logview.inc:277 addons/logview/class_logview.inc:294
-#: addons/logview/class_gosa_logview.inc:151
-#: addons/logview/class_gosa_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:237
-#: addons/logview/class_gosa_logview.inc:288
-msgid "Error"
-msgstr "Fout"
-
-#: addons/logview/class_logview.inc:124 addons/logview/class_logview.inc:146
-#: addons/logview/class_gosa_logview.inc:169
-#: addons/logview/class_gosa_logview.inc:184
-msgid "All"
-msgstr "Alle"
-
-#: addons/logview/class_logview.inc:156
-#: addons/logview/class_gosa_logview.inc:71
-msgid "one hour"
-msgstr "1 uur"
-
-#: addons/logview/class_logview.inc:156
-#: addons/logview/class_gosa_logview.inc:71
-msgid "6 hours"
-msgstr "6 uur"
-
-#: addons/logview/class_logview.inc:157
-#: addons/logview/class_gosa_logview.inc:72
-msgid "12 hours"
-msgstr "12 uur"
-
-#: addons/logview/class_logview.inc:157
-#: addons/logview/class_gosa_logview.inc:72
-msgid "24 hours"
-msgstr "24 uur"
-
-#: addons/logview/class_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:73
-msgid "2 days"
-msgstr "2 dagen"
-
-#: addons/logview/class_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:73
-msgid "one week"
-msgstr "1 week"
-
-#: addons/logview/class_logview.inc:159
-#: addons/logview/class_gosa_logview.inc:74
-msgid "2 weeks"
-msgstr "2 weken"
-
-#: addons/logview/class_logview.inc:159
-#: addons/logview/class_gosa_logview.inc:74
-msgid "one month"
-msgstr "1 maand"
-
-#: addons/logview/class_logview.inc:412
 #, fuzzy
-msgid "Log view"
-msgstr "Log DB gebruiker"
+#~ msgid "Configuration error"
+#~ msgstr "Configuratie bestand"
 
-#: addons/logview/class_logview.inc:413
 #, fuzzy
-msgid "Log view addon"
-msgstr "Omlaag verplaatsen"
+#~ msgid "Missing %s PHP extension!"
+#~ msgstr "Verwijder printer mogelijkheden"
 
-#: addons/logview/main.inc:49
-msgid "System log view"
-msgstr "Systeem log weergave"
+#~ msgid "Error"
+#~ msgstr "Fout"
+
+#~ msgid "All"
+#~ msgstr "Alle"
+
+#~ msgid "one hour"
+#~ msgstr "1 uur"
+
+#~ msgid "6 hours"
+#~ msgstr "6 uur"
+
+#~ msgid "12 hours"
+#~ msgstr "12 uur"
+
+#~ msgid "24 hours"
+#~ msgstr "24 uur"
+
+#~ msgid "2 days"
+#~ msgstr "2 dagen"
+
+#~ msgid "one week"
+#~ msgstr "1 week"
+
+#~ msgid "2 weeks"
+#~ msgstr "2 weken"
+
+#~ msgid "one month"
+#~ msgstr "1 maand"
 
-#: addons/logview/class_gosa_logview.inc:203
 #, fuzzy
-msgid "You have insufficient permissions to view syslog entries."
-msgstr "U heeft geen toestemming om deze blokkeerlijst te verwijderen."
+#~ msgid "Log view"
+#~ msgstr "Log DB gebruiker"
 
-#: addons/logview/class_gosa_logview.inc:238
-#, php-format
-msgid "Missing logging table (%s.%s) update your GOsa logging database schema."
-msgstr ""
+#, fuzzy
+#~ msgid "Log view addon"
+#~ msgstr "Omlaag verplaatsen"
+
+#, fuzzy
+#~ msgid "You have insufficient permissions to view syslog entries."
+#~ msgstr "U heeft geen toestemming om deze blokkeerlijst te verwijderen."
 
-#: addons/logview/contents.tpl:20
-msgid "Log level"
-msgstr "Log prioriteit"
+#~ msgid "Log level"
+#~ msgstr "Log prioriteit"
 
-#: addons/logview/contents.tpl:82
-msgid "Level"
-msgstr "Prioriteit"
+#~ msgid "Level"
+#~ msgstr "Prioriteit"
 
-#: addons/logview/contents.tpl:83
-msgid "Hostname"
-msgstr "Computernaam"
+#~ msgid "Hostname"
+#~ msgstr "Computernaam"
 
 #~ msgid "Save"
 #~ msgstr "Opslaan"
diff --git a/gosa-plugins/log/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/log/locale/pl/LC_MESSAGES/messages.po
index 03af896d0..9d97d297b 100644
--- a/gosa-plugins/log/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/log/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -14,231 +14,212 @@ msgstr ""
 "X-Poedit-SourceCharset: iso-8859-2\n"
 "X-Poedit-Basepath: tedst\n"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:27
-#: admin/systems/services/log/class_gosaLogServer.inc:55
+#: admin/systems/services/syslog/goSyslogServer.tpl:1
 #, fuzzy
-msgid "GOsa MySQL logging service"
+msgid "Syslog Service"
+msgstr "Podgląd logu systemowego"
+
+#: admin/systems/services/syslog/goSyslogServer.tpl:1
+#, fuzzy
+msgid "enabled"
+msgstr "Włączone"
+
+#: admin/systems/services/syslog/class_goSyslogServer.inc:27
+#: admin/systems/services/syslog/class_goSyslogServer.inc:47
+#, fuzzy
+msgid "Syslog server"
+msgstr "Pokaż serwery"
+
+#: admin/systems/services/syslog/class_goSyslogServer.inc:68
+#: admin/systems/services/syslog/class_goSyslogServer.inc:69
+#, fuzzy
+msgid "Logging service"
 msgstr "Usługa Logowania"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:68
-#: admin/systems/services/log/class_gosaLogServer.inc:101
-#: addons/logview/gosa_log_contents.tpl:84
+#: admin/systems/services/syslog/class_goSyslogServer.inc:69
+#: admin/systems/services/syslog/class_goLogDBServer.inc:93
+msgid "Services"
+msgstr "Usługi"
+
+#: admin/systems/services/syslog/class_goLogDBServer.inc:31
+#: admin/systems/services/syslog/class_goLogDBServer.inc:59
+#, fuzzy
+msgid "Syslog service database"
+msgstr "Baza logowania"
+
+#: admin/systems/services/syslog/class_goLogDBServer.inc:69
 msgid "User"
 msgstr "Użytkownik"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:71
-#: admin/systems/services/log/class_gosaLogServer.inc:102
-#: admin/systems/services/log/gosaLogServer.tpl:20
+#: admin/systems/services/syslog/class_goLogDBServer.inc:72
+#: admin/systems/services/syslog/class_goLogDBServer.inc:105
+#: admin/systems/services/syslog/goLogDBServer.tpl:20
 msgid "Password"
 msgstr "Hasło"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:74
-#: admin/systems/services/log/class_gosaLogServer.inc:100
-#: admin/systems/services/log/gosaLogServer.tpl:4
+#: admin/systems/services/syslog/class_goLogDBServer.inc:75
+#: admin/systems/services/syslog/class_goLogDBServer.inc:106
+#: admin/systems/services/syslog/goLogDBServer.tpl:4
 msgid "Database"
 msgstr "Baza"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:91
-#: admin/systems/services/log/class_gosaLogServer.inc:92
+#: admin/systems/services/syslog/class_goLogDBServer.inc:92
+#: admin/systems/services/syslog/class_goLogDBServer.inc:93
 #, fuzzy
-msgid "GOsa logging service"
-msgstr "Usługa Logowania"
+msgid "Logging database"
+msgstr "Baza logowania"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:92
-msgid "Services"
-msgstr "Usługi"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:101
+#, fuzzy
+msgid "Start"
+msgstr "Startup"
+
+#: admin/systems/services/syslog/class_goLogDBServer.inc:102
+msgid "Stop"
+msgstr ""
 
-#: admin/systems/services/log/class_gosaLogServer.inc:103
+#: admin/systems/services/syslog/class_goLogDBServer.inc:103
 #, fuzzy
-msgid "Allow view of entries on this server"
-msgstr "Zezwól na logowanie do serwera terminali"
+msgid "Restart"
+msgstr "Odtwórz"
 
-#: admin/systems/services/log/gosaLogServer.tpl:1
+#: admin/systems/services/syslog/class_goLogDBServer.inc:104
 #, fuzzy
-msgid "GOsa logging database"
-msgstr "Baza logowania"
+msgid "Admin"
+msgstr "DN Administratora"
+
+#: admin/systems/services/syslog/goLogDBServer.tpl:1
+#, fuzzy
+msgid "Logging database information"
+msgstr "Przełącz informacje"
+
+#: admin/systems/services/syslog/goLogDBServer.tpl:12
+#, fuzzy
+msgid "Logging DB user"
+msgstr "Użytkownik bazy logowania"
 
-#: admin/systems/services/log/gosaLogServer.tpl:12
 #, fuzzy
-msgid "Database user"
-msgstr "Bazy danych"
+#~ msgid "GOsa MySQL logging service"
+#~ msgstr "Usługa Logowania"
 
-#: addons/logview/gosa_log_contents.tpl:2 addons/logview/contents.tpl:2
-msgid "Filter"
-msgstr "Filtr"
+#, fuzzy
+#~ msgid "Allow view of entries on this server"
+#~ msgstr "Zezwól na logowanie do serwera terminali"
+
+#, fuzzy
+#~ msgid "Database user"
+#~ msgstr "Bazy danych"
 
-#: addons/logview/gosa_log_contents.tpl:11 addons/logview/contents.tpl:11
-msgid "Show hosts"
-msgstr "Pokaż hosty"
+#~ msgid "Filter"
+#~ msgstr "Filtr"
 
-#: addons/logview/gosa_log_contents.tpl:20
-#: addons/logview/gosa_log_contents.tpl:82
-msgid "Action"
-msgstr "Akcja"
+#~ msgid "Show hosts"
+#~ msgstr "Pokaż hosty"
 
-#: addons/logview/gosa_log_contents.tpl:38 addons/logview/contents.tpl:38
-msgid "Time interval"
-msgstr "Interwał czasowy"
+#~ msgid "Action"
+#~ msgstr "Akcja"
 
-#: addons/logview/gosa_log_contents.tpl:47 addons/logview/contents.tpl:47
-msgid "Search for"
-msgstr "Szukaj dla"
+#~ msgid "Time interval"
+#~ msgstr "Interwał czasowy"
 
-#: addons/logview/gosa_log_contents.tpl:48 addons/logview/contents.tpl:48
-msgid "Enter string to search for"
-msgstr "Proszę podać szukany ciąg znaków"
+#~ msgid "Search for"
+#~ msgstr "Szukaj dla"
 
-#: addons/logview/gosa_log_contents.tpl:60 addons/logview/contents.tpl:60
-msgid "Ruleset"
-msgstr "Reguły"
+#~ msgid "Enter string to search for"
+#~ msgstr "Proszę podać szukany ciąg znaków"
 
-#: addons/logview/gosa_log_contents.tpl:62 addons/logview/contents.tpl:62
-msgid "Edit"
-msgstr "Edytuj"
+#~ msgid "Ruleset"
+#~ msgstr "Reguły"
 
-#: addons/logview/gosa_log_contents.tpl:68 addons/logview/contents.tpl:68
-msgid "Search"
-msgstr "Szukaj"
+#~ msgid "Edit"
+#~ msgstr "Edytuj"
 
-#: addons/logview/gosa_log_contents.tpl:83 addons/logview/contents.tpl:84
-msgid "Date"
-msgstr "Data"
+#~ msgid "Search"
+#~ msgstr "Szukaj"
+
+#~ msgid "Date"
+#~ msgstr "Data"
 
-#: addons/logview/gosa_log_contents.tpl:85
 #, fuzzy
-msgid "Object type"
-msgstr "Nazwa obiektu"
+#~ msgid "Object type"
+#~ msgstr "Nazwa obiektu"
 
-#: addons/logview/gosa_log_contents.tpl:86
-msgid "Object"
-msgstr "Obiekt"
+#~ msgid "Object"
+#~ msgstr "Obiekt"
 
-#: addons/logview/gosa_log_contents.tpl:87 addons/logview/contents.tpl:85
-msgid "Message"
-msgstr "Wiadomość"
+#~ msgid "Message"
+#~ msgstr "Wiadomość"
 
-#: addons/logview/gosa_log_contents.tpl:99 addons/logview/contents.tpl:97
-msgid "Search returned no results..."
-msgstr "Wyszukiwanie nie zwróciło żadnych wyników..."
+#~ msgid "Search returned no results..."
+#~ msgstr "Wyszukiwanie nie zwróciło żadnych wyników..."
 
-#: addons/logview/class_logview.inc:6 addons/logview/class_logview.inc:418
-#: addons/logview/class_gosa_logview.inc:6
-msgid "System logs"
-msgstr "Logi systemowe"
+#~ msgid "System logs"
+#~ msgstr "Logi systemowe"
 
-#: addons/logview/class_logview.inc:7 addons/logview/class_gosa_logview.inc:7
-msgid "This does something"
-msgstr "To robi coś"
+#~ msgid "This does something"
+#~ msgstr "To robi coś"
 
-#: addons/logview/class_logview.inc:79
-#: addons/logview/class_gosa_logview.inc:118
-msgid "Warning"
-msgstr "Ostrzeżenie"
+#~ msgid "Warning"
+#~ msgstr "Ostrzeżenie"
 
-#: addons/logview/class_logview.inc:83
-#: addons/logview/class_gosa_logview.inc:124
-#, fuzzy
-msgid "Configuration error"
-msgstr "Plik konfiguracyjny"
-
-#: addons/logview/class_logview.inc:83
-#: addons/logview/class_gosa_logview.inc:124
-#, fuzzy, php-format
-msgid "Missing %s PHP extension!"
-msgstr "Rozszerzenie inwentarza"
-
-#: addons/logview/class_logview.inc:95 addons/logview/class_logview.inc:102
-#: addons/logview/class_logview.inc:115 addons/logview/class_logview.inc:137
-#: addons/logview/class_logview.inc:195 addons/logview/class_logview.inc:200
-#: addons/logview/class_logview.inc:277 addons/logview/class_logview.inc:294
-#: addons/logview/class_gosa_logview.inc:151
-#: addons/logview/class_gosa_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:237
-#: addons/logview/class_gosa_logview.inc:288
-msgid "Error"
-msgstr "Błąd"
-
-#: addons/logview/class_logview.inc:124 addons/logview/class_logview.inc:146
-#: addons/logview/class_gosa_logview.inc:169
-#: addons/logview/class_gosa_logview.inc:184
-msgid "All"
-msgstr "Wszystkie"
-
-#: addons/logview/class_logview.inc:156
-#: addons/logview/class_gosa_logview.inc:71
-msgid "one hour"
-msgstr "jedna godzina"
-
-#: addons/logview/class_logview.inc:156
-#: addons/logview/class_gosa_logview.inc:71
-msgid "6 hours"
-msgstr "6 godzin"
-
-#: addons/logview/class_logview.inc:157
-#: addons/logview/class_gosa_logview.inc:72
-msgid "12 hours"
-msgstr "12 godzin"
-
-#: addons/logview/class_logview.inc:157
-#: addons/logview/class_gosa_logview.inc:72
-msgid "24 hours"
-msgstr "24 godziny"
-
-#: addons/logview/class_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:73
-msgid "2 days"
-msgstr "2 dni"
-
-#: addons/logview/class_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:73
-msgid "one week"
-msgstr "jeden tydzień"
-
-#: addons/logview/class_logview.inc:159
-#: addons/logview/class_gosa_logview.inc:74
-msgid "2 weeks"
-msgstr "2 tygodnie"
-
-#: addons/logview/class_logview.inc:159
-#: addons/logview/class_gosa_logview.inc:74
-msgid "one month"
-msgstr "jeden miesiąc"
-
-#: addons/logview/class_logview.inc:412
 #, fuzzy
-msgid "Log view"
-msgstr "Usługa logowania"
+#~ msgid "Configuration error"
+#~ msgstr "Plik konfiguracyjny"
 
-#: addons/logview/class_logview.inc:413
 #, fuzzy
-msgid "Log view addon"
-msgstr "Przesuń w dół"
+#~ msgid "Missing %s PHP extension!"
+#~ msgstr "Rozszerzenie inwentarza"
 
-#: addons/logview/main.inc:49
-msgid "System log view"
-msgstr "Podgląd logu systemowego"
+#~ msgid "Error"
+#~ msgstr "Błąd"
+
+#~ msgid "All"
+#~ msgstr "Wszystkie"
+
+#~ msgid "one hour"
+#~ msgstr "jedna godzina"
+
+#~ msgid "6 hours"
+#~ msgstr "6 godzin"
+
+#~ msgid "12 hours"
+#~ msgstr "12 godzin"
+
+#~ msgid "24 hours"
+#~ msgstr "24 godziny"
+
+#~ msgid "2 days"
+#~ msgstr "2 dni"
+
+#~ msgid "one week"
+#~ msgstr "jeden tydzień"
+
+#~ msgid "2 weeks"
+#~ msgstr "2 tygodnie"
+
+#~ msgid "one month"
+#~ msgstr "jeden miesiąc"
 
-#: addons/logview/class_gosa_logview.inc:203
 #, fuzzy
-msgid "You have insufficient permissions to view syslog entries."
-msgstr "Brak uprawnień do usunięcia tej bloklisty."
+#~ msgid "Log view"
+#~ msgstr "Usługa logowania"
 
-#: addons/logview/class_gosa_logview.inc:238
-#, php-format
-msgid "Missing logging table (%s.%s) update your GOsa logging database schema."
-msgstr ""
+#, fuzzy
+#~ msgid "Log view addon"
+#~ msgstr "Przesuń w dół"
+
+#, fuzzy
+#~ msgid "You have insufficient permissions to view syslog entries."
+#~ msgstr "Brak uprawnień do usunięcia tej bloklisty."
 
-#: addons/logview/contents.tpl:20
-msgid "Log level"
-msgstr "Poziom logu"
+#~ msgid "Log level"
+#~ msgstr "Poziom logu"
 
-#: addons/logview/contents.tpl:82
-msgid "Level"
-msgstr "Poziom"
+#~ msgid "Level"
+#~ msgstr "Poziom"
 
-#: addons/logview/contents.tpl:83
-msgid "Hostname"
-msgstr "Nazwa hosta"
+#~ msgid "Hostname"
+#~ msgstr "Nazwa hosta"
 
 #~ msgid "Save"
 #~ msgstr "Zapisz"
diff --git a/gosa-plugins/log/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/log/locale/ru/LC_MESSAGES/messages.po
index 6c80b19ef..6c6b1a6f8 100644
--- a/gosa-plugins/log/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/log/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -14,232 +14,210 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: poEdit 1.3.1\n"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:27
-#: admin/systems/services/log/class_gosaLogServer.inc:55
+#: admin/systems/services/syslog/goSyslogServer.tpl:1
 #, fuzzy
-msgid "GOsa MySQL logging service"
+msgid "Syslog Service"
+msgstr "Просмотр системного журнала"
+
+#: admin/systems/services/syslog/goSyslogServer.tpl:1
+#, fuzzy
+msgid "enabled"
+msgstr "отключен"
+
+#: admin/systems/services/syslog/class_goSyslogServer.inc:27
+#: admin/systems/services/syslog/class_goSyslogServer.inc:47
+#, fuzzy
+msgid "Syslog server"
+msgstr "Показать серверы"
+
+#: admin/systems/services/syslog/class_goSyslogServer.inc:68
+#: admin/systems/services/syslog/class_goSyslogServer.inc:69
+#, fuzzy
+msgid "Logging service"
 msgstr "Служба печати"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:68
-#: admin/systems/services/log/class_gosaLogServer.inc:101
-#: addons/logview/gosa_log_contents.tpl:84
+#: admin/systems/services/syslog/class_goSyslogServer.inc:69
+#: admin/systems/services/syslog/class_goLogDBServer.inc:93
+msgid "Services"
+msgstr "Сервисы"
+
+#: admin/systems/services/syslog/class_goLogDBServer.inc:31
+#: admin/systems/services/syslog/class_goLogDBServer.inc:59
+#, fuzzy
+msgid "Syslog service database"
+msgstr "база пользователя"
+
+#: admin/systems/services/syslog/class_goLogDBServer.inc:69
 msgid "User"
 msgstr "Пользователь"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:71
-#: admin/systems/services/log/class_gosaLogServer.inc:102
-#: admin/systems/services/log/gosaLogServer.tpl:20
+#: admin/systems/services/syslog/class_goLogDBServer.inc:72
+#: admin/systems/services/syslog/class_goLogDBServer.inc:105
+#: admin/systems/services/syslog/goLogDBServer.tpl:20
 msgid "Password"
 msgstr "Пароль"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:74
-#: admin/systems/services/log/class_gosaLogServer.inc:100
-#: admin/systems/services/log/gosaLogServer.tpl:4
+#: admin/systems/services/syslog/class_goLogDBServer.inc:75
+#: admin/systems/services/syslog/class_goLogDBServer.inc:106
+#: admin/systems/services/syslog/goLogDBServer.tpl:4
 #, fuzzy
 msgid "Database"
 msgstr "Базы данных"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:91
-#: admin/systems/services/log/class_gosaLogServer.inc:92
+#: admin/systems/services/syslog/class_goLogDBServer.inc:92
+#: admin/systems/services/syslog/class_goLogDBServer.inc:93
 #, fuzzy
-msgid "GOsa logging service"
-msgstr "Служба печати"
+msgid "Logging database"
+msgstr "база пользователя"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:92
-msgid "Services"
-msgstr "Сервисы"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:101
+#, fuzzy
+msgid "Start"
+msgstr "Запуск"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:103
+#: admin/systems/services/syslog/class_goLogDBServer.inc:102
+msgid "Stop"
+msgstr ""
+
+#: admin/systems/services/syslog/class_goLogDBServer.inc:103
 #, fuzzy
-msgid "Allow view of entries on this server"
-msgstr "Разрешить вход на терминальный сервер"
+msgid "Restart"
+msgstr "Повторить"
 
-#: admin/systems/services/log/gosaLogServer.tpl:1
+#: admin/systems/services/syslog/class_goLogDBServer.inc:104
 #, fuzzy
-msgid "GOsa logging database"
-msgstr "база пользователя"
+msgid "Admin"
+msgstr "DN администратора"
 
-#: admin/systems/services/log/gosaLogServer.tpl:12
+#: admin/systems/services/syslog/goLogDBServer.tpl:1
 #, fuzzy
-msgid "Database user"
-msgstr "Базы данных"
+msgid "Logging database information"
+msgstr "Личная информация"
+
+#: admin/systems/services/syslog/goLogDBServer.tpl:12
+#, fuzzy
+msgid "Logging DB user"
+msgstr "Служба печати"
+
+#, fuzzy
+#~ msgid "GOsa MySQL logging service"
+#~ msgstr "Служба печати"
+
+#, fuzzy
+#~ msgid "Allow view of entries on this server"
+#~ msgstr "Разрешить вход на терминальный сервер"
 
-#: addons/logview/gosa_log_contents.tpl:2 addons/logview/contents.tpl:2
-msgid "Filter"
-msgstr "Фильтр"
+#, fuzzy
+#~ msgid "Database user"
+#~ msgstr "Базы данных"
+
+#~ msgid "Filter"
+#~ msgstr "Фильтр"
 
-#: addons/logview/gosa_log_contents.tpl:11 addons/logview/contents.tpl:11
-msgid "Show hosts"
-msgstr "Показать хосты"
+#~ msgid "Show hosts"
+#~ msgstr "Показать хосты"
 
-#: addons/logview/gosa_log_contents.tpl:20
-#: addons/logview/gosa_log_contents.tpl:82
-msgid "Action"
-msgstr "Действие"
+#~ msgid "Action"
+#~ msgstr "Действие"
 
-#: addons/logview/gosa_log_contents.tpl:38 addons/logview/contents.tpl:38
-msgid "Time interval"
-msgstr "Интервал времени"
+#~ msgid "Time interval"
+#~ msgstr "Интервал времени"
 
-#: addons/logview/gosa_log_contents.tpl:47 addons/logview/contents.tpl:47
-msgid "Search for"
-msgstr "Поиск"
+#~ msgid "Search for"
+#~ msgstr "Поиск"
 
-#: addons/logview/gosa_log_contents.tpl:48 addons/logview/contents.tpl:48
-msgid "Enter string to search for"
-msgstr "Введите строку для поиска"
+#~ msgid "Enter string to search for"
+#~ msgstr "Введите строку для поиска"
 
-#: addons/logview/gosa_log_contents.tpl:60 addons/logview/contents.tpl:60
-msgid "Ruleset"
-msgstr "Набор правил"
+#~ msgid "Ruleset"
+#~ msgstr "Набор правил"
 
-#: addons/logview/gosa_log_contents.tpl:62 addons/logview/contents.tpl:62
-msgid "Edit"
-msgstr "Изменить"
+#~ msgid "Edit"
+#~ msgstr "Изменить"
 
-#: addons/logview/gosa_log_contents.tpl:68 addons/logview/contents.tpl:68
-msgid "Search"
-msgstr "Поиск"
+#~ msgid "Search"
+#~ msgstr "Поиск"
 
-#: addons/logview/gosa_log_contents.tpl:83 addons/logview/contents.tpl:84
-msgid "Date"
-msgstr "Дата"
+#~ msgid "Date"
+#~ msgstr "Дата"
 
-#: addons/logview/gosa_log_contents.tpl:85
 #, fuzzy
-msgid "Object type"
-msgstr "Имя объекта"
+#~ msgid "Object type"
+#~ msgstr "Имя объекта"
 
-#: addons/logview/gosa_log_contents.tpl:86
-msgid "Object"
-msgstr "Объект"
+#~ msgid "Object"
+#~ msgstr "Объект"
 
-#: addons/logview/gosa_log_contents.tpl:87 addons/logview/contents.tpl:85
-msgid "Message"
-msgstr "Сообщение"
+#~ msgid "Message"
+#~ msgstr "Сообщение"
 
-#: addons/logview/gosa_log_contents.tpl:99 addons/logview/contents.tpl:97
-msgid "Search returned no results..."
-msgstr "Не найдено..."
+#~ msgid "Search returned no results..."
+#~ msgstr "Не найдено..."
 
-#: addons/logview/class_logview.inc:6 addons/logview/class_logview.inc:418
-#: addons/logview/class_gosa_logview.inc:6
-msgid "System logs"
-msgstr "Системные журналы"
+#~ msgid "System logs"
+#~ msgstr "Системные журналы"
 
-#: addons/logview/class_logview.inc:7 addons/logview/class_gosa_logview.inc:7
-msgid "This does something"
-msgstr "Что-то будет"
+#~ msgid "This does something"
+#~ msgstr "Что-то будет"
 
-#: addons/logview/class_logview.inc:79
-#: addons/logview/class_gosa_logview.inc:118
-msgid "Warning"
-msgstr "Предупреждение"
+#~ msgid "Warning"
+#~ msgstr "Предупреждение"
 
-#: addons/logview/class_logview.inc:83
-#: addons/logview/class_gosa_logview.inc:124
 #, fuzzy
-msgid "Configuration error"
-msgstr "Настроить"
-
-#: addons/logview/class_logview.inc:83
-#: addons/logview/class_gosa_logview.inc:124
-#, fuzzy, php-format
-msgid "Missing %s PHP extension!"
-msgstr "Удалить параметры"
-
-#: addons/logview/class_logview.inc:95 addons/logview/class_logview.inc:102
-#: addons/logview/class_logview.inc:115 addons/logview/class_logview.inc:137
-#: addons/logview/class_logview.inc:195 addons/logview/class_logview.inc:200
-#: addons/logview/class_logview.inc:277 addons/logview/class_logview.inc:294
-#: addons/logview/class_gosa_logview.inc:151
-#: addons/logview/class_gosa_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:237
-#: addons/logview/class_gosa_logview.inc:288
-msgid "Error"
-msgstr ""
+#~ msgid "Configuration error"
+#~ msgstr "Настроить"
 
-#: addons/logview/class_logview.inc:124 addons/logview/class_logview.inc:146
-#: addons/logview/class_gosa_logview.inc:169
-#: addons/logview/class_gosa_logview.inc:184
-msgid "All"
-msgstr "Все"
-
-#: addons/logview/class_logview.inc:156
-#: addons/logview/class_gosa_logview.inc:71
-msgid "one hour"
-msgstr "один час"
-
-#: addons/logview/class_logview.inc:156
-#: addons/logview/class_gosa_logview.inc:71
-msgid "6 hours"
-msgstr "6 часов"
-
-#: addons/logview/class_logview.inc:157
-#: addons/logview/class_gosa_logview.inc:72
-msgid "12 hours"
-msgstr "12 часов"
-
-#: addons/logview/class_logview.inc:157
-#: addons/logview/class_gosa_logview.inc:72
-msgid "24 hours"
-msgstr "24 часа"
-
-#: addons/logview/class_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:73
-msgid "2 days"
-msgstr "2 дня"
-
-#: addons/logview/class_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:73
-msgid "one week"
-msgstr "одна неделя"
-
-#: addons/logview/class_logview.inc:159
-#: addons/logview/class_gosa_logview.inc:74
-msgid "2 weeks"
-msgstr "2 недели"
-
-#: addons/logview/class_logview.inc:159
-#: addons/logview/class_gosa_logview.inc:74
-msgid "one month"
-msgstr "один месяц"
-
-#: addons/logview/class_logview.inc:412
 #, fuzzy
-msgid "Log view"
-msgstr "Служба печати"
+#~ msgid "Missing %s PHP extension!"
+#~ msgstr "Удалить параметры"
 
-#: addons/logview/class_logview.inc:413
-#, fuzzy
-msgid "Log view addon"
-msgstr "Домен"
+#~ msgid "All"
+#~ msgstr "Все"
 
-#: addons/logview/main.inc:49
-msgid "System log view"
-msgstr "Просмотр системного журнала"
+#~ msgid "one hour"
+#~ msgstr "один час"
+
+#~ msgid "6 hours"
+#~ msgstr "6 часов"
+
+#~ msgid "12 hours"
+#~ msgstr "12 часов"
+
+#~ msgid "24 hours"
+#~ msgstr "24 часа"
+
+#~ msgid "2 days"
+#~ msgstr "2 дня"
+
+#~ msgid "one week"
+#~ msgstr "одна неделя"
+
+#~ msgid "2 weeks"
+#~ msgstr "2 недели"
+
+#~ msgid "one month"
+#~ msgstr "один месяц"
 
-#: addons/logview/class_gosa_logview.inc:203
 #, fuzzy
-msgid "You have insufficient permissions to view syslog entries."
-msgstr "У вас недостаточно прав для удаления этого стоп-листа."
+#~ msgid "Log view"
+#~ msgstr "Служба печати"
 
-#: addons/logview/class_gosa_logview.inc:238
-#, php-format
-msgid "Missing logging table (%s.%s) update your GOsa logging database schema."
-msgstr ""
+#, fuzzy
+#~ msgid "Log view addon"
+#~ msgstr "Домен"
+
+#, fuzzy
+#~ msgid "You have insufficient permissions to view syslog entries."
+#~ msgstr "У вас недостаточно прав для удаления этого стоп-листа."
 
-#: addons/logview/contents.tpl:20
-msgid "Log level"
-msgstr "Уровень информативности"
+#~ msgid "Log level"
+#~ msgstr "Уровень информативности"
 
-#: addons/logview/contents.tpl:82
-msgid "Level"
-msgstr "Уровень"
+#~ msgid "Level"
+#~ msgstr "Уровень"
 
-#: addons/logview/contents.tpl:83
-msgid "Hostname"
-msgstr "Имя системы"
+#~ msgid "Hostname"
+#~ msgstr "Имя системы"
 
 #~ msgid "Save"
 #~ msgstr "Сохранить"
diff --git a/gosa-plugins/log/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/log/locale/zh/LC_MESSAGES/messages.po
index 6fe667c86..898262046 100644
--- a/gosa-plugins/log/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/log/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -16,231 +16,212 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:27
-#: admin/systems/services/log/class_gosaLogServer.inc:55
+#: admin/systems/services/syslog/goSyslogServer.tpl:1
 #, fuzzy
-msgid "GOsa MySQL logging service"
+msgid "Syslog Service"
+msgstr "系统日志显示"
+
+#: admin/systems/services/syslog/goSyslogServer.tpl:1
+#, fuzzy
+msgid "enabled"
+msgstr "禁用"
+
+#: admin/systems/services/syslog/class_goSyslogServer.inc:27
+#: admin/systems/services/syslog/class_goSyslogServer.inc:47
+#, fuzzy
+msgid "Syslog server"
+msgstr "显示服务器"
+
+#: admin/systems/services/syslog/class_goSyslogServer.inc:68
+#: admin/systems/services/syslog/class_goSyslogServer.inc:69
+#, fuzzy
+msgid "Logging service"
 msgstr "Syslog 服务"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:68
-#: admin/systems/services/log/class_gosaLogServer.inc:101
-#: addons/logview/gosa_log_contents.tpl:84
+#: admin/systems/services/syslog/class_goSyslogServer.inc:69
+#: admin/systems/services/syslog/class_goLogDBServer.inc:93
+msgid "Services"
+msgstr "服务"
+
+#: admin/systems/services/syslog/class_goLogDBServer.inc:31
+#: admin/systems/services/syslog/class_goLogDBServer.inc:59
+#, fuzzy
+msgid "Syslog service database"
+msgstr "日志数据库"
+
+#: admin/systems/services/syslog/class_goLogDBServer.inc:69
 msgid "User"
 msgstr "用户"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:71
-#: admin/systems/services/log/class_gosaLogServer.inc:102
-#: admin/systems/services/log/gosaLogServer.tpl:20
+#: admin/systems/services/syslog/class_goLogDBServer.inc:72
+#: admin/systems/services/syslog/class_goLogDBServer.inc:105
+#: admin/systems/services/syslog/goLogDBServer.tpl:20
 msgid "Password"
 msgstr "口令"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:74
-#: admin/systems/services/log/class_gosaLogServer.inc:100
-#: admin/systems/services/log/gosaLogServer.tpl:4
+#: admin/systems/services/syslog/class_goLogDBServer.inc:75
+#: admin/systems/services/syslog/class_goLogDBServer.inc:106
+#: admin/systems/services/syslog/goLogDBServer.tpl:4
 msgid "Database"
 msgstr "数据库"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:91
-#: admin/systems/services/log/class_gosaLogServer.inc:92
+#: admin/systems/services/syslog/class_goLogDBServer.inc:92
+#: admin/systems/services/syslog/class_goLogDBServer.inc:93
 #, fuzzy
-msgid "GOsa logging service"
-msgstr "Syslog 服务"
+msgid "Logging database"
+msgstr "日志数据库"
 
-#: admin/systems/services/log/class_gosaLogServer.inc:92
-msgid "Services"
-msgstr "服务"
+#: admin/systems/services/syslog/class_goLogDBServer.inc:101
+#, fuzzy
+msgid "Start"
+msgstr "启动"
+
+#: admin/systems/services/syslog/class_goLogDBServer.inc:102
+msgid "Stop"
+msgstr ""
 
-#: admin/systems/services/log/class_gosaLogServer.inc:103
+#: admin/systems/services/syslog/class_goLogDBServer.inc:103
 #, fuzzy
-msgid "Allow view of entries on this server"
-msgstr "允许登录到终端服务器"
+msgid "Restart"
+msgstr "仓库"
 
-#: admin/systems/services/log/gosaLogServer.tpl:1
+#: admin/systems/services/syslog/class_goLogDBServer.inc:104
 #, fuzzy
-msgid "GOsa logging database"
-msgstr "日志数据库"
+msgid "Admin"
+msgstr "管理员 DN"
+
+#: admin/systems/services/syslog/goLogDBServer.tpl:1
+#, fuzzy
+msgid "Logging database information"
+msgstr "切换信息"
+
+#: admin/systems/services/syslog/goLogDBServer.tpl:12
+#, fuzzy
+msgid "Logging DB user"
+msgstr "Logging DB 用户"
 
-#: admin/systems/services/log/gosaLogServer.tpl:12
-msgid "Database user"
-msgstr "数据库用户"
+#, fuzzy
+#~ msgid "GOsa MySQL logging service"
+#~ msgstr "Syslog 服务"
+
+#, fuzzy
+#~ msgid "Allow view of entries on this server"
+#~ msgstr "允许登录到终端服务器"
 
-#: addons/logview/gosa_log_contents.tpl:2 addons/logview/contents.tpl:2
-msgid "Filter"
-msgstr "过滤器"
+#~ msgid "Database user"
+#~ msgstr "数据库用户"
 
-#: addons/logview/gosa_log_contents.tpl:11 addons/logview/contents.tpl:11
-msgid "Show hosts"
-msgstr "显示主机"
+#~ msgid "Filter"
+#~ msgstr "过滤器"
 
-#: addons/logview/gosa_log_contents.tpl:20
-#: addons/logview/gosa_log_contents.tpl:82
-msgid "Action"
-msgstr "行动"
+#~ msgid "Show hosts"
+#~ msgstr "显示主机"
 
-#: addons/logview/gosa_log_contents.tpl:38 addons/logview/contents.tpl:38
-msgid "Time interval"
-msgstr "时间间隔"
+#~ msgid "Action"
+#~ msgstr "行动"
 
-#: addons/logview/gosa_log_contents.tpl:47 addons/logview/contents.tpl:47
-msgid "Search for"
-msgstr "查询"
+#~ msgid "Time interval"
+#~ msgstr "时间间隔"
 
-#: addons/logview/gosa_log_contents.tpl:48 addons/logview/contents.tpl:48
-msgid "Enter string to search for"
-msgstr "输入要查询的字符串"
+#~ msgid "Search for"
+#~ msgstr "查询"
 
-#: addons/logview/gosa_log_contents.tpl:60 addons/logview/contents.tpl:60
-msgid "Ruleset"
-msgstr "规则集"
+#~ msgid "Enter string to search for"
+#~ msgstr "输入要查询的字符串"
 
-#: addons/logview/gosa_log_contents.tpl:62 addons/logview/contents.tpl:62
-msgid "Edit"
-msgstr "编辑"
+#~ msgid "Ruleset"
+#~ msgstr "规则集"
 
-#: addons/logview/gosa_log_contents.tpl:68 addons/logview/contents.tpl:68
-msgid "Search"
-msgstr "查找"
+#~ msgid "Edit"
+#~ msgstr "编辑"
 
-#: addons/logview/gosa_log_contents.tpl:83 addons/logview/contents.tpl:84
-msgid "Date"
-msgstr "日期"
+#~ msgid "Search"
+#~ msgstr "查找"
+
+#~ msgid "Date"
+#~ msgstr "日期"
 
-#: addons/logview/gosa_log_contents.tpl:85
 #, fuzzy
-msgid "Object type"
-msgstr "对象名称"
+#~ msgid "Object type"
+#~ msgstr "对象名称"
 
-#: addons/logview/gosa_log_contents.tpl:86
-msgid "Object"
-msgstr "对象"
+#~ msgid "Object"
+#~ msgstr "对象"
 
-#: addons/logview/gosa_log_contents.tpl:87 addons/logview/contents.tpl:85
-msgid "Message"
-msgstr "信息"
+#~ msgid "Message"
+#~ msgstr "信息"
 
-#: addons/logview/gosa_log_contents.tpl:99 addons/logview/contents.tpl:97
-msgid "Search returned no results..."
-msgstr "查无结果..."
+#~ msgid "Search returned no results..."
+#~ msgstr "查无结果..."
 
-#: addons/logview/class_logview.inc:6 addons/logview/class_logview.inc:418
-#: addons/logview/class_gosa_logview.inc:6
-msgid "System logs"
-msgstr "系统日志"
+#~ msgid "System logs"
+#~ msgstr "系统日志"
 
-#: addons/logview/class_logview.inc:7 addons/logview/class_gosa_logview.inc:7
 #, fuzzy
-msgid "This does something"
-msgstr "******"
+#~ msgid "This does something"
+#~ msgstr "******"
 
-#: addons/logview/class_logview.inc:79
-#: addons/logview/class_gosa_logview.inc:118
-msgid "Warning"
-msgstr "警告"
+#~ msgid "Warning"
+#~ msgstr "警告"
 
-#: addons/logview/class_logview.inc:83
-#: addons/logview/class_gosa_logview.inc:124
-#, fuzzy
-msgid "Configuration error"
-msgstr "配置文件"
-
-#: addons/logview/class_logview.inc:83
-#: addons/logview/class_gosa_logview.inc:124
-#, fuzzy, php-format
-msgid "Missing %s PHP extension!"
-msgstr "删除打印机扩展"
-
-#: addons/logview/class_logview.inc:95 addons/logview/class_logview.inc:102
-#: addons/logview/class_logview.inc:115 addons/logview/class_logview.inc:137
-#: addons/logview/class_logview.inc:195 addons/logview/class_logview.inc:200
-#: addons/logview/class_logview.inc:277 addons/logview/class_logview.inc:294
-#: addons/logview/class_gosa_logview.inc:151
-#: addons/logview/class_gosa_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:237
-#: addons/logview/class_gosa_logview.inc:288
-msgid "Error"
-msgstr "错误"
-
-#: addons/logview/class_logview.inc:124 addons/logview/class_logview.inc:146
-#: addons/logview/class_gosa_logview.inc:169
-#: addons/logview/class_gosa_logview.inc:184
-msgid "All"
-msgstr "全部"
-
-#: addons/logview/class_logview.inc:156
-#: addons/logview/class_gosa_logview.inc:71
-msgid "one hour"
-msgstr "1 小时"
-
-#: addons/logview/class_logview.inc:156
-#: addons/logview/class_gosa_logview.inc:71
-msgid "6 hours"
-msgstr "6 小时"
-
-#: addons/logview/class_logview.inc:157
-#: addons/logview/class_gosa_logview.inc:72
-msgid "12 hours"
-msgstr "12 小时"
-
-#: addons/logview/class_logview.inc:157
-#: addons/logview/class_gosa_logview.inc:72
-msgid "24 hours"
-msgstr "24 小时"
-
-#: addons/logview/class_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:73
-msgid "2 days"
-msgstr "2 天"
-
-#: addons/logview/class_logview.inc:158
-#: addons/logview/class_gosa_logview.inc:73
-msgid "one week"
-msgstr "1 星期"
-
-#: addons/logview/class_logview.inc:159
-#: addons/logview/class_gosa_logview.inc:74
-msgid "2 weeks"
-msgstr "2 星期"
-
-#: addons/logview/class_logview.inc:159
-#: addons/logview/class_gosa_logview.inc:74
-msgid "one month"
-msgstr "1 个月"
-
-#: addons/logview/class_logview.inc:412
 #, fuzzy
-msgid "Log view"
-msgstr "日志级别"
+#~ msgid "Configuration error"
+#~ msgstr "配置文件"
 
-#: addons/logview/class_logview.inc:413
 #, fuzzy
-msgid "Log view addon"
-msgstr "向下移动"
+#~ msgid "Missing %s PHP extension!"
+#~ msgstr "删除打印机扩展"
 
-#: addons/logview/main.inc:49
-msgid "System log view"
-msgstr "系统日志显示"
+#~ msgid "Error"
+#~ msgstr "错误"
+
+#~ msgid "All"
+#~ msgstr "全部"
+
+#~ msgid "one hour"
+#~ msgstr "1 小时"
+
+#~ msgid "6 hours"
+#~ msgstr "6 小时"
+
+#~ msgid "12 hours"
+#~ msgstr "12 小时"
+
+#~ msgid "24 hours"
+#~ msgstr "24 小时"
+
+#~ msgid "2 days"
+#~ msgstr "2 天"
+
+#~ msgid "one week"
+#~ msgstr "1 星期"
+
+#~ msgid "2 weeks"
+#~ msgstr "2 星期"
+
+#~ msgid "one month"
+#~ msgstr "1 个月"
 
-#: addons/logview/class_gosa_logview.inc:203
 #, fuzzy
-msgid "You have insufficient permissions to view syslog entries."
-msgstr "您无权查看和编辑 ACL。"
+#~ msgid "Log view"
+#~ msgstr "日志级别"
 
-#: addons/logview/class_gosa_logview.inc:238
-#, php-format
-msgid "Missing logging table (%s.%s) update your GOsa logging database schema."
-msgstr ""
+#, fuzzy
+#~ msgid "Log view addon"
+#~ msgstr "向下移动"
+
+#, fuzzy
+#~ msgid "You have insufficient permissions to view syslog entries."
+#~ msgstr "您无权查看和编辑 ACL。"
 
-#: addons/logview/contents.tpl:20
-msgid "Log level"
-msgstr "日志级别"
+#~ msgid "Log level"
+#~ msgstr "日志级别"
 
-#: addons/logview/contents.tpl:82
-msgid "Level"
-msgstr "级别"
+#~ msgid "Level"
+#~ msgstr "级别"
 
-#: addons/logview/contents.tpl:83
-msgid "Hostname"
-msgstr "主机名"
+#~ msgid "Hostname"
+#~ msgstr "主机名"
 
 #~ msgid "Save"
 #~ msgstr "保存"
diff --git a/gosa-plugins/mail/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/mail/locale/de/LC_MESSAGES/messages.po
index 212dcd679..c169465f4 100644
--- a/gosa-plugins/mail/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mail/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2008-12-19 09:04+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
@@ -40,18 +40,18 @@ msgstr "Neues Mail-Konto erzeugen"
 #: admin/groups/mail/class_groupMail.inc:362
 #: admin/groups/mail/class_groupMail.inc:397
 #: admin/groups/mail/class_groupMail.inc:403
-#: admin/groups/mail/class_groupMail.inc:412
-#: admin/groups/mail/class_groupMail.inc:847
-#: admin/groups/mail/class_groupMail.inc:867
-#: admin/groups/mail/class_groupMail.inc:988
+#: admin/groups/mail/class_groupMail.inc:417
+#: admin/groups/mail/class_groupMail.inc:851
+#: admin/groups/mail/class_groupMail.inc:871
+#: admin/groups/mail/class_groupMail.inc:992
 #: personal/mail/class_mailAccount.inc:328
 #: personal/mail/class_mailAccount.inc:363
 #: personal/mail/class_mailAccount.inc:368
-#: personal/mail/class_mailAccount.inc:375
-#: personal/mail/class_mailAccount.inc:1070
-#: personal/mail/class_mailAccount.inc:1074
+#: personal/mail/class_mailAccount.inc:381
+#: personal/mail/class_mailAccount.inc:1081
 #: personal/mail/class_mailAccount.inc:1085
-#: personal/mail/class_mailAccount.inc:1439
+#: personal/mail/class_mailAccount.inc:1103
+#: personal/mail/class_mailAccount.inc:1466
 msgid "Mail address"
 msgstr "Mail-Adresse"
 
@@ -61,14 +61,14 @@ msgstr "Ihr-Name@ihre-domain.com"
 
 #: admin/ogroups/mail/class_mailogroup.inc:120
 #: admin/ogroups/mail/class_mailogroup.inc:157
-#: admin/groups/mail/class_groupMail.inc:538
-#: admin/groups/mail/class_groupMail.inc:767
+#: admin/groups/mail/class_groupMail.inc:542
+#: admin/groups/mail/class_groupMail.inc:771
 #: admin/systems/services/imap/class_goImapServer.inc:190
 #: admin/systems/services/mail/class_goMailServer.inc:582
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/spam/class_goSpamServer.inc:277
-#: personal/mail/class_mailAccount.inc:889
-#: personal/mail/class_mailAccount.inc:962
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:971
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
@@ -80,17 +80,17 @@ msgstr "LDAP-Fehler"
 #: admin/groups/mail/class_groupMail.inc:292
 #: admin/groups/mail/class_groupMail.inc:294
 #: admin/groups/mail/class_groupMail.inc:295
-#: admin/groups/mail/class_groupMail.inc:835
-#: admin/groups/mail/class_groupMail.inc:980
+#: admin/groups/mail/class_groupMail.inc:839
+#: admin/groups/mail/class_groupMail.inc:984
 #: personal/mail/class_mailAccount.inc:50
 #: personal/mail/class_mailAccount.inc:244
 #: personal/mail/class_mailAccount.inc:252
 #: personal/mail/class_mailAccount.inc:254
 #: personal/mail/class_mailAccount.inc:259
 #: personal/mail/class_mailAccount.inc:261
-#: personal/mail/class_mailAccount.inc:1054
-#: personal/mail/class_mailAccount.inc:1263
-#: personal/mail/class_mailAccount.inc:1429
+#: personal/mail/class_mailAccount.inc:1065
+#: personal/mail/class_mailAccount.inc:1290
+#: personal/mail/class_mailAccount.inc:1456
 msgid "Mail"
 msgstr "Mail"
 
@@ -102,9 +102,9 @@ msgstr "Mail-Gruppe"
 msgid "Mail distribution list"
 msgstr "Mail-Verteilerliste"
 
-#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:845
+#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:849
 #: admin/groups/mail/mail.tpl:7 admin/groups/mail/paste_mail.tpl:8
-#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1066
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1077
 #: personal/mail/copypaste.tpl:7
 msgid "Primary address"
 msgstr "Primäre Adresse"
@@ -123,22 +123,22 @@ msgstr "Bitte geben Sie eine Mail-Adresse ein"
 #: admin/groups/mail/class_groupMail.inc:140
 #: admin/groups/mail/class_groupMail.inc:145
 #: admin/groups/mail/class_groupMail.inc:148
-#: admin/groups/mail/class_groupMail.inc:550
 #: admin/groups/mail/class_groupMail.inc:554
 #: admin/groups/mail/class_groupMail.inc:558
-#: admin/groups/mail/class_groupMail.inc:780
+#: admin/groups/mail/class_groupMail.inc:562
 #: admin/groups/mail/class_groupMail.inc:784
 #: admin/groups/mail/class_groupMail.inc:788
-#: admin/groups/mail/class_groupMail.inc:797
+#: admin/groups/mail/class_groupMail.inc:792
+#: admin/groups/mail/class_groupMail.inc:801
 #: personal/mail/class_mailAccount.inc:147
 #: personal/mail/class_mailAccount.inc:154
 #: personal/mail/class_mailAccount.inc:159
 #: personal/mail/class_mailAccount.inc:162
-#: personal/mail/class_mailAccount.inc:898
-#: personal/mail/class_mailAccount.inc:902
-#: personal/mail/class_mailAccount.inc:976
-#: personal/mail/class_mailAccount.inc:980
-#: personal/mail/class_mailAccount.inc:984
+#: personal/mail/class_mailAccount.inc:907
+#: personal/mail/class_mailAccount.inc:911
+#: personal/mail/class_mailAccount.inc:985
+#: personal/mail/class_mailAccount.inc:989
+#: personal/mail/class_mailAccount.inc:993
 msgid "Mail error"
 msgstr "Mail-Fehler"
 
@@ -165,11 +165,11 @@ msgid "Cannot receive folder permissions: %s"
 msgstr "Kann Ordner-Berechtigungen nicht ermitteln: %s"
 
 #: admin/groups/mail/class_groupMail.inc:145
-#: admin/groups/mail/class_groupMail.inc:550
-#: admin/groups/mail/class_groupMail.inc:780
+#: admin/groups/mail/class_groupMail.inc:554
+#: admin/groups/mail/class_groupMail.inc:784
 #: personal/mail/class_mailAccount.inc:159
-#: personal/mail/class_mailAccount.inc:898
-#: personal/mail/class_mailAccount.inc:976
+#: personal/mail/class_mailAccount.inc:907
+#: personal/mail/class_mailAccount.inc:985
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr "Mail-Methode kann nicht verbinden: %s"
@@ -198,7 +198,7 @@ msgstr ""
 #: admin/groups/mail/class_groupMail.inc:368
 #: admin/groups/mail/class_groupMail.inc:397
 #: admin/groups/mail/class_groupMail.inc:403
-#: admin/groups/mail/class_groupMail.inc:412
+#: admin/groups/mail/class_groupMail.inc:417
 #: admin/systems/services/spam/class_goSpamServer.inc:143
 #: admin/systems/services/spam/class_goSpamServer.inc:216
 #: addons/mailqueue/class_mailqueue.inc:110
@@ -215,7 +215,7 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:334
 #: personal/mail/class_mailAccount.inc:363
 #: personal/mail/class_mailAccount.inc:368
-#: personal/mail/class_mailAccount.inc:375
+#: personal/mail/class_mailAccount.inc:381
 msgid "Error"
 msgstr "Fehler"
 
@@ -231,40 +231,48 @@ msgstr ""
 "Kann die primäre Adresse nicht in die Liste der Weiterleitungen aufnehmen!"
 
 #: admin/groups/mail/class_groupMail.inc:413
-#: personal/mail/class_mailAccount.inc:376
+#: personal/mail/class_mailAccount.inc:377
+#: personal/mail/class_mailAccount.inc:1099
+#, fuzzy, php-format
+msgid "Address is already in use by group '%s'."
+msgstr "Die Adresse wird bereits von Benutzer '%s' verwendet."
+
+#: admin/groups/mail/class_groupMail.inc:415
+#: personal/mail/class_mailAccount.inc:379
+#: personal/mail/class_mailAccount.inc:1101
 #, php-format
 msgid "Address is already in use by user '%s'."
 msgstr "Die Adresse wird bereits von Benutzer '%s' verwendet."
 
-#: admin/groups/mail/class_groupMail.inc:554
-#: personal/mail/class_mailAccount.inc:902
+#: admin/groups/mail/class_groupMail.inc:558
+#: personal/mail/class_mailAccount.inc:911
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "Kann das Postfach nicht entfernen: %s"
 
-#: admin/groups/mail/class_groupMail.inc:558
-#: admin/groups/mail/class_groupMail.inc:797
+#: admin/groups/mail/class_groupMail.inc:562
+#: admin/groups/mail/class_groupMail.inc:801
 #, php-format
 msgid "Cannot update shared folder permissions: %s"
 msgstr "Berechtigungen für Gruppen-Ordner können nicht aktualisiert werden: %s"
 
-#: admin/groups/mail/class_groupMail.inc:656
+#: admin/groups/mail/class_groupMail.inc:660
 msgid "New"
 msgstr "Neu"
 
-#: admin/groups/mail/class_groupMail.inc:784
-#: personal/mail/class_mailAccount.inc:980
+#: admin/groups/mail/class_groupMail.inc:788
+#: personal/mail/class_mailAccount.inc:989
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "Kann das Postfach nicht aktualisieren: '%s'"
 
-#: admin/groups/mail/class_groupMail.inc:788
-#: personal/mail/class_mailAccount.inc:984
+#: admin/groups/mail/class_groupMail.inc:792
+#: personal/mail/class_mailAccount.inc:993
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr "Kann Kontingent-Einstellungen nicht sichern: %s"
 
-#: admin/groups/mail/class_groupMail.inc:829
+#: admin/groups/mail/class_groupMail.inc:833
 #, php-format
 msgid ""
 "The group 'cn' has changed. It can't be changed due to the fact that mail "
@@ -273,54 +281,54 @@ msgstr ""
 "Der 'cn' der Gruppe wurde geändert. Er kann nicht geändert werden, weil die "
 "Mail-Methode '%s' davon abhängt!"
 
-#: admin/groups/mail/class_groupMail.inc:854
-#: admin/groups/mail/class_groupMail.inc:989 admin/groups/mail/mail.tpl:60
-#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1093
-#: personal/mail/class_mailAccount.inc:1269
-#: personal/mail/class_mailAccount.inc:1441
+#: admin/groups/mail/class_groupMail.inc:858
+#: admin/groups/mail/class_groupMail.inc:993 admin/groups/mail/mail.tpl:60
+#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1111
+#: personal/mail/class_mailAccount.inc:1296
+#: personal/mail/class_mailAccount.inc:1468
 msgid "Quota size"
 msgstr "Kontingent-Größe"
 
-#: admin/groups/mail/class_groupMail.inc:873
-#: personal/mail/class_mailAccount.inc:1453
+#: admin/groups/mail/class_groupMail.inc:877
+#: personal/mail/class_mailAccount.inc:1480
 msgid "Mail max size"
 msgstr "Maximale Mailgröße"
 
-#: admin/groups/mail/class_groupMail.inc:881
+#: admin/groups/mail/class_groupMail.inc:885
 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."
 
-#: admin/groups/mail/class_groupMail.inc:885
-#: admin/groups/mail/class_groupMail.inc:990
-#: personal/mail/class_mailAccount.inc:1440
+#: admin/groups/mail/class_groupMail.inc:889
+#: admin/groups/mail/class_groupMail.inc:994
+#: personal/mail/class_mailAccount.inc:1467
 msgid "Mail server"
 msgstr "Mail-Server"
 
-#: admin/groups/mail/class_groupMail.inc:981
+#: admin/groups/mail/class_groupMail.inc:985
 msgid "Group mail"
 msgstr "Gruppenmail"
 
-#: admin/groups/mail/class_groupMail.inc:991 admin/groups/mail/mail.tpl:73
+#: admin/groups/mail/class_groupMail.inc:995 admin/groups/mail/mail.tpl:73
 msgid "Folder type"
 msgstr "Ordner-Typ"
 
-#: admin/groups/mail/class_groupMail.inc:991
+#: admin/groups/mail/class_groupMail.inc:995
 msgid "Kolab"
 msgstr "Kolab"
 
-#: admin/groups/mail/class_groupMail.inc:992
+#: admin/groups/mail/class_groupMail.inc:996
 msgid "Alternate addresses"
 msgstr "Weitere Adressen"
 
-#: admin/groups/mail/class_groupMail.inc:993
+#: admin/groups/mail/class_groupMail.inc:997
 msgid "Forwarding addresses"
 msgstr "Weiterleitungs-Adressen"
 
-#: admin/groups/mail/class_groupMail.inc:994
+#: admin/groups/mail/class_groupMail.inc:998
 msgid "Only local"
 msgstr "Nur lokal"
 
-#: admin/groups/mail/class_groupMail.inc:995
+#: admin/groups/mail/class_groupMail.inc:999
 msgid "Permissions"
 msgstr "Berechtigungen"
 
@@ -451,7 +459,7 @@ msgstr "Wählen Sie eine bestimmte Abteilung"
 msgid "Choose"
 msgstr "Wählen"
 
-#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1430
+#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1457
 #: personal/mail/copypaste.tpl:1
 msgid "Mail settings"
 msgstr "Mail-Einstellungen"
@@ -1125,7 +1133,7 @@ msgstr "Kopfzeilen"
 msgid "Display header of this message"
 msgstr "Zeige Kopfzeilen dieser Nachricht"
 
-#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1461
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1488
 msgid "Use custom sieve script"
 msgstr "Eigenes Sieve-Skript verwenden"
 
@@ -1158,8 +1166,8 @@ msgstr ""
 msgid "Activate vacation message"
 msgstr "Urlaubsbenachrichtigung aktivieren"
 
-#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1122
-#: personal/mail/class_mailAccount.inc:1293
+#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1140
+#: personal/mail/class_mailAccount.inc:1320
 msgid "from"
 msgstr "von"
 
@@ -1197,7 +1205,7 @@ msgstr "MB"
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
-#: personal/mail/class_mailAccount.inc:1444
+#: personal/mail/class_mailAccount.inc:1471
 msgid "Vacation message"
 msgstr "Urlaubsbenachrichtigung"
 
@@ -1228,39 +1236,51 @@ msgstr "IMAP-Fehler"
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr "Kann das IMAP-Postfach nicht verändern: '%s'"
 
-#: personal/mail/class_mail-methods-cyrus.inc:358
-#: personal/mail/class_mail-methods-cyrus.inc:395
+#: personal/mail/class_mail-methods-cyrus.inc:298
+#, fuzzy
+msgid "Mail info"
+msgstr "Ablegen unter"
+
+#: personal/mail/class_mail-methods-cyrus.inc:299
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/class_mail-methods-cyrus.inc:383
+#: personal/mail/class_mail-methods-cyrus.inc:420
 msgid "The module imap_getacl is not implemented!"
 msgstr "Die Funktion imap_getacl ist nicht implementiert!"
 
-#: personal/mail/class_mail-methods-cyrus.inc:447
+#: personal/mail/class_mail-methods-cyrus.inc:472
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Die Datei '%s' existiert nicht!"
 
-#: personal/mail/class_mail-methods-cyrus.inc:448
+#: personal/mail/class_mail-methods-cyrus.inc:473
 msgid "The sieve script may not be written correctly."
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:449
+#: personal/mail/class_mail-methods-cyrus.inc:474
 #: personal/mail/sieve/class_My_Tree.inc:245
 #: personal/mail/sieve/templates/remove_script.tpl:2
 msgid "Warning"
 msgstr "Warnung"
 
-#: personal/mail/class_mail-methods-cyrus.inc:487
+#: personal/mail/class_mail-methods-cyrus.inc:512
 #: personal/mail/sieve/class_sieveManagement.inc:309
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "Kann Sieve-Skript nicht beziehen: %s"
 
-#: personal/mail/class_mail-methods-cyrus.inc:576
+#: personal/mail/class_mail-methods-cyrus.inc:601
 #: personal/mail/sieve/class_sieveManagement.inc:1043
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr "Kann Sieve-Skript nicht speichern: %s"
 
-#: personal/mail/class_mail-methods-cyrus.inc:583
+#: personal/mail/class_mail-methods-cyrus.inc:608
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr "Kann das Sieve-Skript nicht aktivieren: %s"
@@ -2129,104 +2149,104 @@ msgstr "Hier folgt Ihr Kommentar"
 msgid "User mail settings"
 msgstr "Benutzer Mail-Einstellungen"
 
-#: personal/mail/class_mailAccount.inc:609
+#: personal/mail/class_mailAccount.inc:615
 #: personal/mail/class_mail-methods.inc:140
 #: personal/mail/class_mail-methods.inc:485
 msgid "Configuration error"
 msgstr "Konfigurationsfehler"
 
-#: personal/mail/class_mailAccount.inc:609
+#: personal/mail/class_mailAccount.inc:615
 #, php-format
 msgid "No DESC tag in vacation template '%s'!"
 msgstr "Kein DESC-Tag in der Abwesenheits-Vorlage '%s'!"
 
-#: personal/mail/class_mailAccount.inc:638
-#: personal/mail/class_mailAccount.inc:651
-#: personal/mail/class_mailAccount.inc:682
-#: personal/mail/class_mailAccount.inc:695
+#: personal/mail/class_mailAccount.inc:644
+#: personal/mail/class_mailAccount.inc:657
+#: personal/mail/class_mailAccount.inc:691
+#: personal/mail/class_mailAccount.inc:704
 msgid "Permission error"
 msgstr "Berechtigungsfehler"
 
-#: personal/mail/class_mailAccount.inc:638
-#: personal/mail/class_mailAccount.inc:651
-#: personal/mail/class_mailAccount.inc:682
-#: personal/mail/class_mailAccount.inc:695
+#: personal/mail/class_mailAccount.inc:644
+#: personal/mail/class_mailAccount.inc:657
+#: personal/mail/class_mailAccount.inc:691
+#: personal/mail/class_mailAccount.inc:704
 msgid "You have no permission to modify these addresses!"
 msgstr "Sie haben keine Berechtigung, diese Adressen zu verändern!"
 
-#: personal/mail/class_mailAccount.inc:729
-#: personal/mail/class_mailAccount.inc:732
+#: personal/mail/class_mailAccount.inc:738
+#: personal/mail/class_mailAccount.inc:741
 msgid "unknown"
 msgstr "unbekannt"
 
-#: personal/mail/class_mailAccount.inc:998
+#: personal/mail/class_mailAccount.inc:1007
 #, fuzzy
 msgid "Mail error saving sieve settings"
 msgstr "Fehler beim Speichern des Sieve-Skriptes"
 
-#: personal/mail/class_mailAccount.inc:1102
-#: personal/mail/class_mailAccount.inc:1110
-#: personal/mail/class_mailAccount.inc:1278
+#: personal/mail/class_mailAccount.inc:1120
+#: personal/mail/class_mailAccount.inc:1128
+#: personal/mail/class_mailAccount.inc:1305
 msgid "Mail reject size"
 msgstr "Maximale Mailgröße"
 
-#: personal/mail/class_mailAccount.inc:1114
-#: personal/mail/class_mailAccount.inc:1285
+#: personal/mail/class_mailAccount.inc:1132
+#: personal/mail/class_mailAccount.inc:1312
 msgid "Spam folder"
 msgstr "Ordner für Spam"
 
-#: personal/mail/class_mailAccount.inc:1126
-#: personal/mail/class_mailAccount.inc:1297
+#: personal/mail/class_mailAccount.inc:1144
+#: personal/mail/class_mailAccount.inc:1324
 msgid "to"
 msgstr "an"
 
-#: personal/mail/class_mailAccount.inc:1137
-#: personal/mail/class_mailAccount.inc:1308
+#: personal/mail/class_mailAccount.inc:1155
+#: personal/mail/class_mailAccount.inc:1335
 msgid "Vacation interval"
 msgstr "Urlaubsbenachrichtigungs-Intervall"
 
-#: personal/mail/class_mailAccount.inc:1434
+#: personal/mail/class_mailAccount.inc:1461
 msgid "My account"
 msgstr "Mein Konto"
 
-#: personal/mail/class_mailAccount.inc:1443
+#: personal/mail/class_mailAccount.inc:1470
 msgid "Add vacation information"
 msgstr "Urlaubsinformationen hinzufügen"
 
-#: personal/mail/class_mailAccount.inc:1446
+#: personal/mail/class_mailAccount.inc:1473
 msgid "Use spam filter"
 msgstr "Verwende Spam-Filter"
 
-#: personal/mail/class_mailAccount.inc:1447
+#: personal/mail/class_mailAccount.inc:1474
 msgid "Spam level"
 msgstr "Spam-Level"
 
-#: personal/mail/class_mailAccount.inc:1448
+#: personal/mail/class_mailAccount.inc:1475
 msgid "Spam mail box"
 msgstr "Spam-Postfach"
 
-#: personal/mail/class_mailAccount.inc:1450
+#: personal/mail/class_mailAccount.inc:1477
 msgid "Sieve management"
 msgstr "Sieve Verwaltung"
 
-#: personal/mail/class_mailAccount.inc:1452
+#: personal/mail/class_mailAccount.inc:1479
 msgid "Reject due to mailsize"
 msgstr "Aufgrund der Mail-Größe abweisen"
 
-#: personal/mail/class_mailAccount.inc:1455
-#: personal/mail/class_mailAccount.inc:1460
+#: personal/mail/class_mailAccount.inc:1482
+#: personal/mail/class_mailAccount.inc:1487
 msgid "Forwarding address"
 msgstr "Weiterleitungs-Adresse"
 
-#: personal/mail/class_mailAccount.inc:1456
+#: personal/mail/class_mailAccount.inc:1483
 msgid "Local delivery"
 msgstr "Lokale Zustellung"
 
-#: personal/mail/class_mailAccount.inc:1457
+#: personal/mail/class_mailAccount.inc:1484
 msgid "No delivery to own mailbox "
 msgstr "Keine Zustellung in eigenes Postfach"
 
-#: personal/mail/class_mailAccount.inc:1458
+#: personal/mail/class_mailAccount.inc:1485
 msgid "Mail alternative addresses"
 msgstr "Weitere Adressen"
 
diff --git a/gosa-plugins/mail/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/mail/locale/es/LC_MESSAGES/messages.po
index 7c7451893..c511bc367 100644
--- a/gosa-plugins/mail/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mail/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
@@ -37,18 +37,18 @@ msgstr "Crear cuenta de correo"
 #: admin/groups/mail/class_groupMail.inc:362
 #: admin/groups/mail/class_groupMail.inc:397
 #: admin/groups/mail/class_groupMail.inc:403
-#: admin/groups/mail/class_groupMail.inc:412
-#: admin/groups/mail/class_groupMail.inc:847
-#: admin/groups/mail/class_groupMail.inc:867
-#: admin/groups/mail/class_groupMail.inc:988
+#: admin/groups/mail/class_groupMail.inc:417
+#: admin/groups/mail/class_groupMail.inc:851
+#: admin/groups/mail/class_groupMail.inc:871
+#: admin/groups/mail/class_groupMail.inc:992
 #: personal/mail/class_mailAccount.inc:328
 #: personal/mail/class_mailAccount.inc:363
 #: personal/mail/class_mailAccount.inc:368
-#: personal/mail/class_mailAccount.inc:375
-#: personal/mail/class_mailAccount.inc:1070
-#: personal/mail/class_mailAccount.inc:1074
+#: personal/mail/class_mailAccount.inc:381
+#: personal/mail/class_mailAccount.inc:1081
 #: personal/mail/class_mailAccount.inc:1085
-#: personal/mail/class_mailAccount.inc:1439
+#: personal/mail/class_mailAccount.inc:1103
+#: personal/mail/class_mailAccount.inc:1466
 msgid "Mail address"
 msgstr "Dirección correo electrónico"
 
@@ -58,14 +58,14 @@ msgstr ""
 
 #: admin/ogroups/mail/class_mailogroup.inc:120
 #: admin/ogroups/mail/class_mailogroup.inc:157
-#: admin/groups/mail/class_groupMail.inc:538
-#: admin/groups/mail/class_groupMail.inc:767
+#: admin/groups/mail/class_groupMail.inc:542
+#: admin/groups/mail/class_groupMail.inc:771
 #: admin/systems/services/imap/class_goImapServer.inc:190
 #: admin/systems/services/mail/class_goMailServer.inc:582
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/spam/class_goSpamServer.inc:277
-#: personal/mail/class_mailAccount.inc:889
-#: personal/mail/class_mailAccount.inc:962
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:971
 #, fuzzy
 msgid "LDAP error"
 msgstr "Servicio IMAP"
@@ -78,17 +78,17 @@ msgstr "Servicio IMAP"
 #: admin/groups/mail/class_groupMail.inc:292
 #: admin/groups/mail/class_groupMail.inc:294
 #: admin/groups/mail/class_groupMail.inc:295
-#: admin/groups/mail/class_groupMail.inc:835
-#: admin/groups/mail/class_groupMail.inc:980
+#: admin/groups/mail/class_groupMail.inc:839
+#: admin/groups/mail/class_groupMail.inc:984
 #: personal/mail/class_mailAccount.inc:50
 #: personal/mail/class_mailAccount.inc:244
 #: personal/mail/class_mailAccount.inc:252
 #: personal/mail/class_mailAccount.inc:254
 #: personal/mail/class_mailAccount.inc:259
 #: personal/mail/class_mailAccount.inc:261
-#: personal/mail/class_mailAccount.inc:1054
-#: personal/mail/class_mailAccount.inc:1263
-#: personal/mail/class_mailAccount.inc:1429
+#: personal/mail/class_mailAccount.inc:1065
+#: personal/mail/class_mailAccount.inc:1290
+#: personal/mail/class_mailAccount.inc:1456
 msgid "Mail"
 msgstr "Correo Electrónico"
 
@@ -102,9 +102,9 @@ msgstr "grupos de correo"
 msgid "Mail distribution list"
 msgstr "Parámetros de correo"
 
-#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:845
+#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:849
 #: admin/groups/mail/mail.tpl:7 admin/groups/mail/paste_mail.tpl:8
-#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1066
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1077
 #: personal/mail/copypaste.tpl:7
 #, fuzzy
 msgid "Primary address"
@@ -125,22 +125,22 @@ msgstr "Por favor indique una dirección de correo válida."
 #: admin/groups/mail/class_groupMail.inc:140
 #: admin/groups/mail/class_groupMail.inc:145
 #: admin/groups/mail/class_groupMail.inc:148
-#: admin/groups/mail/class_groupMail.inc:550
 #: admin/groups/mail/class_groupMail.inc:554
 #: admin/groups/mail/class_groupMail.inc:558
-#: admin/groups/mail/class_groupMail.inc:780
+#: admin/groups/mail/class_groupMail.inc:562
 #: admin/groups/mail/class_groupMail.inc:784
 #: admin/groups/mail/class_groupMail.inc:788
-#: admin/groups/mail/class_groupMail.inc:797
+#: admin/groups/mail/class_groupMail.inc:792
+#: admin/groups/mail/class_groupMail.inc:801
 #: personal/mail/class_mailAccount.inc:147
 #: personal/mail/class_mailAccount.inc:154
 #: personal/mail/class_mailAccount.inc:159
 #: personal/mail/class_mailAccount.inc:162
-#: personal/mail/class_mailAccount.inc:898
-#: personal/mail/class_mailAccount.inc:902
-#: personal/mail/class_mailAccount.inc:976
-#: personal/mail/class_mailAccount.inc:980
-#: personal/mail/class_mailAccount.inc:984
+#: personal/mail/class_mailAccount.inc:907
+#: personal/mail/class_mailAccount.inc:911
+#: personal/mail/class_mailAccount.inc:985
+#: personal/mail/class_mailAccount.inc:989
+#: personal/mail/class_mailAccount.inc:993
 #, fuzzy
 msgid "Mail error"
 msgstr "Servidor de correo"
@@ -168,11 +168,11 @@ msgid "Cannot receive folder permissions: %s"
 msgstr "No se pueden modificar los permisos para '%s'"
 
 #: admin/groups/mail/class_groupMail.inc:145
-#: admin/groups/mail/class_groupMail.inc:550
-#: admin/groups/mail/class_groupMail.inc:780
+#: admin/groups/mail/class_groupMail.inc:554
+#: admin/groups/mail/class_groupMail.inc:784
 #: personal/mail/class_mailAccount.inc:159
-#: personal/mail/class_mailAccount.inc:898
-#: personal/mail/class_mailAccount.inc:976
+#: personal/mail/class_mailAccount.inc:907
+#: personal/mail/class_mailAccount.inc:985
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -202,7 +202,7 @@ msgstr ""
 #: admin/groups/mail/class_groupMail.inc:368
 #: admin/groups/mail/class_groupMail.inc:397
 #: admin/groups/mail/class_groupMail.inc:403
-#: admin/groups/mail/class_groupMail.inc:412
+#: admin/groups/mail/class_groupMail.inc:417
 #: admin/systems/services/spam/class_goSpamServer.inc:143
 #: admin/systems/services/spam/class_goSpamServer.inc:216
 #: addons/mailqueue/class_mailqueue.inc:110
@@ -219,7 +219,7 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:334
 #: personal/mail/class_mailAccount.inc:363
 #: personal/mail/class_mailAccount.inc:368
-#: personal/mail/class_mailAccount.inc:375
+#: personal/mail/class_mailAccount.inc:381
 msgid "Error"
 msgstr "Error"
 
@@ -238,100 +238,110 @@ msgstr ""
 "reenvío."
 
 #: admin/groups/mail/class_groupMail.inc:413
-#: personal/mail/class_mailAccount.inc:376
+#: personal/mail/class_mailAccount.inc:377
+#: personal/mail/class_mailAccount.inc:1099
+#, fuzzy, php-format
+msgid "Address is already in use by group '%s'."
+msgstr ""
+"La dirección de correo que esta intentando añadir, ya esta usada por otro "
+"usuario"
+
+#: admin/groups/mail/class_groupMail.inc:415
+#: personal/mail/class_mailAccount.inc:379
+#: personal/mail/class_mailAccount.inc:1101
 #, fuzzy, php-format
 msgid "Address is already in use by user '%s'."
 msgstr ""
 "La dirección de correo que esta intentando añadir, ya esta usada por otro "
 "usuario"
 
-#: admin/groups/mail/class_groupMail.inc:554
-#: personal/mail/class_mailAccount.inc:902
+#: admin/groups/mail/class_groupMail.inc:558
+#: personal/mail/class_mailAccount.inc:911
 #, fuzzy, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "No puedo crear el fichero '%s'."
 
-#: admin/groups/mail/class_groupMail.inc:558
-#: admin/groups/mail/class_groupMail.inc:797
+#: admin/groups/mail/class_groupMail.inc:562
+#: admin/groups/mail/class_groupMail.inc:801
 #, fuzzy, php-format
 msgid "Cannot update shared folder permissions: %s"
 msgstr "No se pueden modificar los permisos para '%s'"
 
-#: admin/groups/mail/class_groupMail.inc:656
+#: admin/groups/mail/class_groupMail.inc:660
 #, fuzzy
 msgid "New"
 msgstr "Nueva ACL"
 
-#: admin/groups/mail/class_groupMail.inc:784
-#: personal/mail/class_mailAccount.inc:980
+#: admin/groups/mail/class_groupMail.inc:788
+#: personal/mail/class_mailAccount.inc:989
 #, fuzzy, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "No puedo crear el fichero '%s'."
 
-#: admin/groups/mail/class_groupMail.inc:788
-#: personal/mail/class_mailAccount.inc:984
+#: admin/groups/mail/class_groupMail.inc:792
+#: personal/mail/class_mailAccount.inc:993
 #, fuzzy, php-format
 msgid "Cannot write quota settings: %s"
 msgstr "¡No se puede escribir en el archivo de revisión!"
 
-#: admin/groups/mail/class_groupMail.inc:829
+#: admin/groups/mail/class_groupMail.inc:833
 #, php-format
 msgid ""
 "The group 'cn' has changed. It can't be changed due to the fact that mail "
 "method '%s' relies on it!"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:854
-#: admin/groups/mail/class_groupMail.inc:989 admin/groups/mail/mail.tpl:60
-#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1093
-#: personal/mail/class_mailAccount.inc:1269
-#: personal/mail/class_mailAccount.inc:1441
+#: admin/groups/mail/class_groupMail.inc:858
+#: admin/groups/mail/class_groupMail.inc:993 admin/groups/mail/mail.tpl:60
+#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1111
+#: personal/mail/class_mailAccount.inc:1296
+#: personal/mail/class_mailAccount.inc:1468
 msgid "Quota size"
 msgstr "Tamaño de cuota"
 
-#: admin/groups/mail/class_groupMail.inc:873
-#: personal/mail/class_mailAccount.inc:1453
+#: admin/groups/mail/class_groupMail.inc:877
+#: personal/mail/class_mailAccount.inc:1480
 msgid "Mail max size"
 msgstr "Tamaño máximo del mensaje"
 
-#: admin/groups/mail/class_groupMail.inc:881
+#: admin/groups/mail/class_groupMail.inc:885
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 "Necesita introducir un valor máximo de tamaño de mensajes para poder "
 "rechazar mensajes."
 
-#: admin/groups/mail/class_groupMail.inc:885
-#: admin/groups/mail/class_groupMail.inc:990
-#: personal/mail/class_mailAccount.inc:1440
+#: admin/groups/mail/class_groupMail.inc:889
+#: admin/groups/mail/class_groupMail.inc:994
+#: personal/mail/class_mailAccount.inc:1467
 msgid "Mail server"
 msgstr "Servidor de correo"
 
-#: admin/groups/mail/class_groupMail.inc:981
+#: admin/groups/mail/class_groupMail.inc:985
 msgid "Group mail"
 msgstr "Grupo de correo"
 
-#: admin/groups/mail/class_groupMail.inc:991 admin/groups/mail/mail.tpl:73
+#: admin/groups/mail/class_groupMail.inc:995 admin/groups/mail/mail.tpl:73
 #, fuzzy
 msgid "Folder type"
 msgstr "Tipo de ratón"
 
-#: admin/groups/mail/class_groupMail.inc:991
+#: admin/groups/mail/class_groupMail.inc:995
 msgid "Kolab"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:992
+#: admin/groups/mail/class_groupMail.inc:996
 msgid "Alternate addresses"
 msgstr "Direcciones alternativas"
 
-#: admin/groups/mail/class_groupMail.inc:993
+#: admin/groups/mail/class_groupMail.inc:997
 msgid "Forwarding addresses"
 msgstr "Direcciones de reenvío"
 
-#: admin/groups/mail/class_groupMail.inc:994
+#: admin/groups/mail/class_groupMail.inc:998
 msgid "Only local"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:995
+#: admin/groups/mail/class_groupMail.inc:999
 msgid "Permissions"
 msgstr "Permisos"
 
@@ -476,7 +486,7 @@ msgstr "Mostrar usuarios del departamento"
 msgid "Choose"
 msgstr "Cerrar"
 
-#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1430
+#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1457
 #: personal/mail/copypaste.tpl:1
 msgid "Mail settings"
 msgstr "Parámetros de correo"
@@ -1185,7 +1195,7 @@ msgstr "Sexo"
 msgid "Display header of this message"
 msgstr ""
 
-#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1461
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1488
 msgid "Use custom sieve script"
 msgstr "Usar 'script Sieve' propios"
 
@@ -1215,8 +1225,8 @@ msgstr ""
 msgid "Activate vacation message"
 msgstr ""
 
-#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1122
-#: personal/mail/class_mailAccount.inc:1293
+#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1140
+#: personal/mail/class_mailAccount.inc:1320
 msgid "from"
 msgstr "desde"
 
@@ -1253,7 +1263,7 @@ msgstr "Mb"
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
-#: personal/mail/class_mailAccount.inc:1444
+#: personal/mail/class_mailAccount.inc:1471
 msgid "Vacation message"
 msgstr "Mensaje de ausencia"
 
@@ -1285,39 +1295,51 @@ msgstr "Servicio IMAP"
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:358
-#: personal/mail/class_mail-methods-cyrus.inc:395
+#: personal/mail/class_mail-methods-cyrus.inc:298
+#, fuzzy
+msgid "Mail info"
+msgstr "Archivo"
+
+#: personal/mail/class_mail-methods-cyrus.inc:299
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/class_mail-methods-cyrus.inc:383
+#: personal/mail/class_mail-methods-cyrus.inc:420
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:447
+#: personal/mail/class_mail-methods-cyrus.inc:472
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "¡El archivo %s no existe!"
 
-#: personal/mail/class_mail-methods-cyrus.inc:448
+#: personal/mail/class_mail-methods-cyrus.inc:473
 msgid "The sieve script may not be written correctly."
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:449
+#: personal/mail/class_mail-methods-cyrus.inc:474
 #: personal/mail/sieve/class_My_Tree.inc:245
 #: personal/mail/sieve/templates/remove_script.tpl:2
 msgid "Warning"
 msgstr "Aviso"
 
-#: personal/mail/class_mail-methods-cyrus.inc:487
+#: personal/mail/class_mail-methods-cyrus.inc:512
 #: personal/mail/sieve/class_sieveManagement.inc:309
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:576
+#: personal/mail/class_mail-methods-cyrus.inc:601
 #: personal/mail/sieve/class_sieveManagement.inc:1043
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:583
+#: personal/mail/class_mail-methods-cyrus.inc:608
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
@@ -2233,110 +2255,110 @@ msgstr ""
 msgid "User mail settings"
 msgstr "Parametros del correo del usuario"
 
-#: personal/mail/class_mailAccount.inc:609
+#: personal/mail/class_mailAccount.inc:615
 #: personal/mail/class_mail-methods.inc:140
 #: personal/mail/class_mail-methods.inc:485
 #, fuzzy
 msgid "Configuration error"
 msgstr "Se puede escribir en la configuración"
 
-#: personal/mail/class_mailAccount.inc:609
+#: personal/mail/class_mailAccount.inc:615
 #, fuzzy, php-format
 msgid "No DESC tag in vacation template '%s'!"
 msgstr "En el archivo de ausencia no existe la etiqueta 'DESC':"
 
-#: personal/mail/class_mailAccount.inc:638
-#: personal/mail/class_mailAccount.inc:651
-#: personal/mail/class_mailAccount.inc:682
-#: personal/mail/class_mailAccount.inc:695
+#: personal/mail/class_mailAccount.inc:644
+#: personal/mail/class_mailAccount.inc:657
+#: personal/mail/class_mailAccount.inc:691
+#: personal/mail/class_mailAccount.inc:704
 #, fuzzy
 msgid "Permission error"
 msgstr "Permisos"
 
-#: personal/mail/class_mailAccount.inc:638
-#: personal/mail/class_mailAccount.inc:651
-#: personal/mail/class_mailAccount.inc:682
-#: personal/mail/class_mailAccount.inc:695
+#: personal/mail/class_mailAccount.inc:644
+#: personal/mail/class_mailAccount.inc:657
+#: personal/mail/class_mailAccount.inc:691
+#: personal/mail/class_mailAccount.inc:704
 #, fuzzy
 msgid "You have no permission to modify these addresses!"
 msgstr "No tiene permisos para eliminar este departamento."
 
-#: personal/mail/class_mailAccount.inc:729
-#: personal/mail/class_mailAccount.inc:732
+#: personal/mail/class_mailAccount.inc:738
+#: personal/mail/class_mailAccount.inc:741
 #, fuzzy
 msgid "unknown"
 msgstr "Desconocido"
 
-#: personal/mail/class_mailAccount.inc:998
+#: personal/mail/class_mailAccount.inc:1007
 msgid "Mail error saving sieve settings"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1102
-#: personal/mail/class_mailAccount.inc:1110
-#: personal/mail/class_mailAccount.inc:1278
+#: personal/mail/class_mailAccount.inc:1120
+#: personal/mail/class_mailAccount.inc:1128
+#: personal/mail/class_mailAccount.inc:1305
 #, fuzzy
 msgid "Mail reject size"
 msgstr "Tamaño máximo del mensaje"
 
-#: personal/mail/class_mailAccount.inc:1114
-#: personal/mail/class_mailAccount.inc:1285
+#: personal/mail/class_mailAccount.inc:1132
+#: personal/mail/class_mailAccount.inc:1312
 #, fuzzy
 msgid "Spam folder"
 msgstr "Nivel de spam"
 
-#: personal/mail/class_mailAccount.inc:1126
-#: personal/mail/class_mailAccount.inc:1297
+#: personal/mail/class_mailAccount.inc:1144
+#: personal/mail/class_mailAccount.inc:1324
 msgid "to"
 msgstr "a"
 
-#: personal/mail/class_mailAccount.inc:1137
-#: personal/mail/class_mailAccount.inc:1308
+#: personal/mail/class_mailAccount.inc:1155
+#: personal/mail/class_mailAccount.inc:1335
 #, fuzzy
 msgid "Vacation interval"
 msgstr "Mensaje de ausencia"
 
-#: personal/mail/class_mailAccount.inc:1434
+#: personal/mail/class_mailAccount.inc:1461
 msgid "My account"
 msgstr "Mi cuenta"
 
-#: personal/mail/class_mailAccount.inc:1443
+#: personal/mail/class_mailAccount.inc:1470
 msgid "Add vacation information"
 msgstr "Añadir información de ausencia"
 
-#: personal/mail/class_mailAccount.inc:1446
+#: personal/mail/class_mailAccount.inc:1473
 msgid "Use spam filter"
 msgstr "Usar filtro antispam"
 
-#: personal/mail/class_mailAccount.inc:1447
+#: personal/mail/class_mailAccount.inc:1474
 msgid "Spam level"
 msgstr "Nivel de spam"
 
-#: personal/mail/class_mailAccount.inc:1448
+#: personal/mail/class_mailAccount.inc:1475
 msgid "Spam mail box"
 msgstr "Tamaño de la carpeta de spam"
 
-#: personal/mail/class_mailAccount.inc:1450
+#: personal/mail/class_mailAccount.inc:1477
 msgid "Sieve management"
 msgstr "Administración Sieve"
 
-#: personal/mail/class_mailAccount.inc:1452
+#: personal/mail/class_mailAccount.inc:1479
 msgid "Reject due to mailsize"
 msgstr "rechazar correos mayores que"
 
-#: personal/mail/class_mailAccount.inc:1455
-#: personal/mail/class_mailAccount.inc:1460
+#: personal/mail/class_mailAccount.inc:1482
+#: personal/mail/class_mailAccount.inc:1487
 msgid "Forwarding address"
 msgstr "Direcciones de reenvío"
 
-#: personal/mail/class_mailAccount.inc:1456
+#: personal/mail/class_mailAccount.inc:1483
 msgid "Local delivery"
 msgstr "Entrega local"
 
-#: personal/mail/class_mailAccount.inc:1457
+#: personal/mail/class_mailAccount.inc:1484
 msgid "No delivery to own mailbox "
 msgstr "No recibir en su propia cuenta"
 
-#: personal/mail/class_mailAccount.inc:1458
+#: personal/mail/class_mailAccount.inc:1485
 msgid "Mail alternative addresses"
 msgstr "Direcciones alternativas"
 
diff --git a/gosa-plugins/mail/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/mail/locale/fr/LC_MESSAGES/messages.po
index 1489e00a5..64e54a9ca 100644
--- a/gosa-plugins/mail/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mail/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2009-10-06 17:10+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -33,18 +33,18 @@ msgstr "Créer un compte de messagerie"
 #: admin/groups/mail/class_groupMail.inc:362
 #: admin/groups/mail/class_groupMail.inc:397
 #: admin/groups/mail/class_groupMail.inc:403
-#: admin/groups/mail/class_groupMail.inc:412
-#: admin/groups/mail/class_groupMail.inc:847
-#: admin/groups/mail/class_groupMail.inc:867
-#: admin/groups/mail/class_groupMail.inc:988
+#: admin/groups/mail/class_groupMail.inc:417
+#: admin/groups/mail/class_groupMail.inc:851
+#: admin/groups/mail/class_groupMail.inc:871
+#: admin/groups/mail/class_groupMail.inc:992
 #: personal/mail/class_mailAccount.inc:328
 #: personal/mail/class_mailAccount.inc:363
 #: personal/mail/class_mailAccount.inc:368
-#: personal/mail/class_mailAccount.inc:375
-#: personal/mail/class_mailAccount.inc:1070
-#: personal/mail/class_mailAccount.inc:1074
+#: personal/mail/class_mailAccount.inc:381
+#: personal/mail/class_mailAccount.inc:1081
 #: personal/mail/class_mailAccount.inc:1085
-#: personal/mail/class_mailAccount.inc:1439
+#: personal/mail/class_mailAccount.inc:1103
+#: personal/mail/class_mailAccount.inc:1466
 msgid "Mail address"
 msgstr "Adresse de messagerie"
 
@@ -54,14 +54,14 @@ msgstr "votre-nom@votre-domaine.com"
 
 #: admin/ogroups/mail/class_mailogroup.inc:120
 #: admin/ogroups/mail/class_mailogroup.inc:157
-#: admin/groups/mail/class_groupMail.inc:538
-#: admin/groups/mail/class_groupMail.inc:767
+#: admin/groups/mail/class_groupMail.inc:542
+#: admin/groups/mail/class_groupMail.inc:771
 #: admin/systems/services/imap/class_goImapServer.inc:190
 #: admin/systems/services/mail/class_goMailServer.inc:582
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/spam/class_goSpamServer.inc:277
-#: personal/mail/class_mailAccount.inc:889
-#: personal/mail/class_mailAccount.inc:962
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:971
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
@@ -73,17 +73,17 @@ msgstr "Erreur LDAP"
 #: admin/groups/mail/class_groupMail.inc:292
 #: admin/groups/mail/class_groupMail.inc:294
 #: admin/groups/mail/class_groupMail.inc:295
-#: admin/groups/mail/class_groupMail.inc:835
-#: admin/groups/mail/class_groupMail.inc:980
+#: admin/groups/mail/class_groupMail.inc:839
+#: admin/groups/mail/class_groupMail.inc:984
 #: personal/mail/class_mailAccount.inc:50
 #: personal/mail/class_mailAccount.inc:244
 #: personal/mail/class_mailAccount.inc:252
 #: personal/mail/class_mailAccount.inc:254
 #: personal/mail/class_mailAccount.inc:259
 #: personal/mail/class_mailAccount.inc:261
-#: personal/mail/class_mailAccount.inc:1054
-#: personal/mail/class_mailAccount.inc:1263
-#: personal/mail/class_mailAccount.inc:1429
+#: personal/mail/class_mailAccount.inc:1065
+#: personal/mail/class_mailAccount.inc:1290
+#: personal/mail/class_mailAccount.inc:1456
 msgid "Mail"
 msgstr "Messagerie"
 
@@ -95,9 +95,9 @@ msgstr "Messagerie de groupe"
 msgid "Mail distribution list"
 msgstr "Liste de distribution"
 
-#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:845
+#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:849
 #: admin/groups/mail/mail.tpl:7 admin/groups/mail/paste_mail.tpl:8
-#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1066
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1077
 #: personal/mail/copypaste.tpl:7
 msgid "Primary address"
 msgstr "Adresse principale"
@@ -116,22 +116,22 @@ msgstr "Veuillez entrer une adresse de messagerie"
 #: admin/groups/mail/class_groupMail.inc:140
 #: admin/groups/mail/class_groupMail.inc:145
 #: admin/groups/mail/class_groupMail.inc:148
-#: admin/groups/mail/class_groupMail.inc:550
 #: admin/groups/mail/class_groupMail.inc:554
 #: admin/groups/mail/class_groupMail.inc:558
-#: admin/groups/mail/class_groupMail.inc:780
+#: admin/groups/mail/class_groupMail.inc:562
 #: admin/groups/mail/class_groupMail.inc:784
 #: admin/groups/mail/class_groupMail.inc:788
-#: admin/groups/mail/class_groupMail.inc:797
+#: admin/groups/mail/class_groupMail.inc:792
+#: admin/groups/mail/class_groupMail.inc:801
 #: personal/mail/class_mailAccount.inc:147
 #: personal/mail/class_mailAccount.inc:154
 #: personal/mail/class_mailAccount.inc:159
 #: personal/mail/class_mailAccount.inc:162
-#: personal/mail/class_mailAccount.inc:898
-#: personal/mail/class_mailAccount.inc:902
-#: personal/mail/class_mailAccount.inc:976
-#: personal/mail/class_mailAccount.inc:980
-#: personal/mail/class_mailAccount.inc:984
+#: personal/mail/class_mailAccount.inc:907
+#: personal/mail/class_mailAccount.inc:911
+#: personal/mail/class_mailAccount.inc:985
+#: personal/mail/class_mailAccount.inc:989
+#: personal/mail/class_mailAccount.inc:993
 msgid "Mail error"
 msgstr "Erreur du serveur de messagerie"
 
@@ -158,11 +158,11 @@ msgid "Cannot receive folder permissions: %s"
 msgstr "Impossible d'obtenir les permissions du dossier : %s"
 
 #: admin/groups/mail/class_groupMail.inc:145
-#: admin/groups/mail/class_groupMail.inc:550
-#: admin/groups/mail/class_groupMail.inc:780
+#: admin/groups/mail/class_groupMail.inc:554
+#: admin/groups/mail/class_groupMail.inc:784
 #: personal/mail/class_mailAccount.inc:159
-#: personal/mail/class_mailAccount.inc:898
-#: personal/mail/class_mailAccount.inc:976
+#: personal/mail/class_mailAccount.inc:907
+#: personal/mail/class_mailAccount.inc:985
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr "Le méthode mail ne peut pas se connecter : %s"
@@ -171,7 +171,8 @@ msgstr "Le méthode mail ne peut pas se connecter : %s"
 #: personal/mail/class_mailAccount.inc:162
 #, php-format
 msgid "Mailbox '%s' doesn't exists on mail server: %s"
-msgstr "Le compte de messagerie '%s' n'existe pas sur le serveur de messagerie : %s"
+msgstr ""
+"Le compte de messagerie '%s' n'existe pas sur le serveur de messagerie : %s"
 
 #: admin/groups/mail/class_groupMail.inc:305
 msgid ""
@@ -192,7 +193,7 @@ msgstr ""
 #: admin/groups/mail/class_groupMail.inc:368
 #: admin/groups/mail/class_groupMail.inc:397
 #: admin/groups/mail/class_groupMail.inc:403
-#: admin/groups/mail/class_groupMail.inc:412
+#: admin/groups/mail/class_groupMail.inc:417
 #: admin/systems/services/spam/class_goSpamServer.inc:143
 #: admin/systems/services/spam/class_goSpamServer.inc:216
 #: addons/mailqueue/class_mailqueue.inc:110
@@ -209,7 +210,7 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:334
 #: personal/mail/class_mailAccount.inc:363
 #: personal/mail/class_mailAccount.inc:368
-#: personal/mail/class_mailAccount.inc:375
+#: personal/mail/class_mailAccount.inc:381
 msgid "Error"
 msgstr "Erreur"
 
@@ -226,40 +227,48 @@ msgstr ""
 "transfert!"
 
 #: admin/groups/mail/class_groupMail.inc:413
-#: personal/mail/class_mailAccount.inc:376
+#: personal/mail/class_mailAccount.inc:377
+#: personal/mail/class_mailAccount.inc:1099
+#, fuzzy, php-format
+msgid "Address is already in use by group '%s'."
+msgstr "L'adresse entrée est déjà utilisée par l'utilisateur '%s'."
+
+#: admin/groups/mail/class_groupMail.inc:415
+#: personal/mail/class_mailAccount.inc:379
+#: personal/mail/class_mailAccount.inc:1101
 #, php-format
 msgid "Address is already in use by user '%s'."
 msgstr "L'adresse entrée est déjà utilisée par l'utilisateur '%s'."
 
-#: admin/groups/mail/class_groupMail.inc:554
-#: personal/mail/class_mailAccount.inc:902
+#: admin/groups/mail/class_groupMail.inc:558
+#: personal/mail/class_mailAccount.inc:911
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "Impossible de supprimer le compte de messagerie : %s"
 
-#: admin/groups/mail/class_groupMail.inc:558
-#: admin/groups/mail/class_groupMail.inc:797
+#: admin/groups/mail/class_groupMail.inc:562
+#: admin/groups/mail/class_groupMail.inc:801
 #, php-format
 msgid "Cannot update shared folder permissions: %s"
 msgstr "Impossible de mettre à jour les permissions sur le dossier partagé: %s"
 
-#: admin/groups/mail/class_groupMail.inc:656
+#: admin/groups/mail/class_groupMail.inc:660
 msgid "New"
 msgstr "Nouveau"
 
-#: admin/groups/mail/class_groupMail.inc:784
-#: personal/mail/class_mailAccount.inc:980
+#: admin/groups/mail/class_groupMail.inc:788
+#: personal/mail/class_mailAccount.inc:989
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "Impossible de mettre à jour le compte de messagerie : %s"
 
-#: admin/groups/mail/class_groupMail.inc:788
-#: personal/mail/class_mailAccount.inc:984
+#: admin/groups/mail/class_groupMail.inc:792
+#: personal/mail/class_mailAccount.inc:993
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr "Impossible d'écrire les quotas : %s"
 
-#: admin/groups/mail/class_groupMail.inc:829
+#: admin/groups/mail/class_groupMail.inc:833
 #, php-format
 msgid ""
 "The group 'cn' has changed. It can't be changed due to the fact that mail "
@@ -268,56 +277,56 @@ msgstr ""
 "Le 'cn' du group a été changé. Il ne peut pas changer car la méthode de "
 "messagerie '%s' est dépendante de ce 'cn' !"
 
-#: admin/groups/mail/class_groupMail.inc:854
-#: admin/groups/mail/class_groupMail.inc:989 admin/groups/mail/mail.tpl:60
-#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1093
-#: personal/mail/class_mailAccount.inc:1269
-#: personal/mail/class_mailAccount.inc:1441
+#: admin/groups/mail/class_groupMail.inc:858
+#: admin/groups/mail/class_groupMail.inc:993 admin/groups/mail/mail.tpl:60
+#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1111
+#: personal/mail/class_mailAccount.inc:1296
+#: personal/mail/class_mailAccount.inc:1468
 msgid "Quota size"
 msgstr "Taille du Quota"
 
-#: admin/groups/mail/class_groupMail.inc:873
-#: personal/mail/class_mailAccount.inc:1453
+#: admin/groups/mail/class_groupMail.inc:877
+#: personal/mail/class_mailAccount.inc:1480
 msgid "Mail max size"
 msgstr "Taille maximale du message"
 
-#: admin/groups/mail/class_groupMail.inc:881
+#: admin/groups/mail/class_groupMail.inc:885
 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."
 
-#: admin/groups/mail/class_groupMail.inc:885
-#: admin/groups/mail/class_groupMail.inc:990
-#: personal/mail/class_mailAccount.inc:1440
+#: admin/groups/mail/class_groupMail.inc:889
+#: admin/groups/mail/class_groupMail.inc:994
+#: personal/mail/class_mailAccount.inc:1467
 msgid "Mail server"
 msgstr "Serveur de messagerie"
 
-#: admin/groups/mail/class_groupMail.inc:981
+#: admin/groups/mail/class_groupMail.inc:985
 msgid "Group mail"
 msgstr "Messagerie de groupe"
 
-#: admin/groups/mail/class_groupMail.inc:991 admin/groups/mail/mail.tpl:73
+#: admin/groups/mail/class_groupMail.inc:995 admin/groups/mail/mail.tpl:73
 msgid "Folder type"
 msgstr "Type de dossier"
 
-#: admin/groups/mail/class_groupMail.inc:991
+#: admin/groups/mail/class_groupMail.inc:995
 msgid "Kolab"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:992
+#: admin/groups/mail/class_groupMail.inc:996
 msgid "Alternate addresses"
 msgstr "Adresses alternatives"
 
-#: admin/groups/mail/class_groupMail.inc:993
+#: admin/groups/mail/class_groupMail.inc:997
 msgid "Forwarding addresses"
 msgstr "Transférer les messages vers"
 
-#: admin/groups/mail/class_groupMail.inc:994
+#: admin/groups/mail/class_groupMail.inc:998
 msgid "Only local"
 msgstr "Seulement en local"
 
-#: admin/groups/mail/class_groupMail.inc:995
+#: admin/groups/mail/class_groupMail.inc:999
 msgid "Permissions"
 msgstr "Permissions"
 
@@ -450,7 +459,7 @@ msgstr "Sélectionner un département"
 msgid "Choose"
 msgstr "Choisir"
 
-#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1430
+#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1457
 #: personal/mail/copypaste.tpl:1
 msgid "Mail settings"
 msgstr "Paramètres de messagerie"
@@ -845,7 +854,8 @@ msgstr "Score requis"
 
 #: admin/systems/services/spam/goSpamServer.tpl:22
 msgid "Select required score to tag mail as spam"
-msgstr "Sélectionner le score requis pour marquer ce message comme étant un spam"
+msgstr ""
+"Sélectionner le score requis pour marquer ce message comme étant un spam"
 
 #: admin/systems/services/spam/goSpamServer.tpl:69
 #: admin/systems/services/spam/class_goSpamServer.inc:334
@@ -1122,7 +1132,7 @@ msgstr "entête"
 msgid "Display header of this message"
 msgstr "Afficher l'entête de ce message"
 
-#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1461
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1488
 msgid "Use custom sieve script"
 msgstr "Utiliser des scripts sieve personnalisés"
 
@@ -1145,7 +1155,8 @@ msgid "No delivery to own mailbox"
 msgstr "Aucune distribution des messages dans la boite de l'utilisateur"
 
 #: personal/mail/generic.tpl:151
-msgid "Select to automatically response with the vacation message defined below"
+msgid ""
+"Select to automatically response with the vacation message defined below"
 msgstr ""
 "Indiquez la réponse automatique en remplissant le message d'absence ci-"
 "dessous"
@@ -1154,8 +1165,8 @@ msgstr ""
 msgid "Activate vacation message"
 msgstr "Activer la notification d'absence"
 
-#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1122
-#: personal/mail/class_mailAccount.inc:1293
+#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1140
+#: personal/mail/class_mailAccount.inc:1320
 msgid "from"
 msgstr "de"
 
@@ -1194,7 +1205,7 @@ msgstr "MB"
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
-#: personal/mail/class_mailAccount.inc:1444
+#: personal/mail/class_mailAccount.inc:1471
 msgid "Vacation message"
 msgstr "Message d'absence"
 
@@ -1227,39 +1238,51 @@ msgstr ""
 "Impossible de modifier le quota de la boite de messagerie IMAP. Le serveur "
 "répond %s."
 
-#: personal/mail/class_mail-methods-cyrus.inc:358
-#: personal/mail/class_mail-methods-cyrus.inc:395
+#: personal/mail/class_mail-methods-cyrus.inc:298
+#, fuzzy
+msgid "Mail info"
+msgstr "Classer dans"
+
+#: personal/mail/class_mail-methods-cyrus.inc:299
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/class_mail-methods-cyrus.inc:383
+#: personal/mail/class_mail-methods-cyrus.inc:420
 msgid "The module imap_getacl is not implemented!"
 msgstr "Le module imap_getacl n'est pas implémenté !"
 
-#: personal/mail/class_mail-methods-cyrus.inc:447
+#: personal/mail/class_mail-methods-cyrus.inc:472
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Le fichier '%s' n'existe pas !"
 
-#: personal/mail/class_mail-methods-cyrus.inc:448
+#: personal/mail/class_mail-methods-cyrus.inc:473
 msgid "The sieve script may not be written correctly."
 msgstr "Le script sieve peut ne pas être écrit correctement."
 
-#: personal/mail/class_mail-methods-cyrus.inc:449
+#: personal/mail/class_mail-methods-cyrus.inc:474
 #: personal/mail/sieve/class_My_Tree.inc:245
 #: personal/mail/sieve/templates/remove_script.tpl:2
 msgid "Warning"
 msgstr "Avertissement"
 
-#: personal/mail/class_mail-methods-cyrus.inc:487
+#: personal/mail/class_mail-methods-cyrus.inc:512
 #: personal/mail/sieve/class_sieveManagement.inc:309
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "Impossible de récupérer le script SIEVE : %s"
 
-#: personal/mail/class_mail-methods-cyrus.inc:576
+#: personal/mail/class_mail-methods-cyrus.inc:601
 #: personal/mail/sieve/class_sieveManagement.inc:1043
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr "Impossible de stocker le script SIEVE : %s"
 
-#: personal/mail/class_mail-methods-cyrus.inc:583
+#: personal/mail/class_mail-methods-cyrus.inc:608
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr "Impossible d'activer le script SIEVE : %s"
@@ -1705,7 +1728,8 @@ msgstr ""
 "d'authentification est vide."
 
 #: personal/mail/sieve/templates/management.tpl:6
-msgid "Please verify that the attributes uid and mail are not empty and try again."
+msgid ""
+"Please verify that the attributes uid and mail are not empty and try again."
 msgstr ""
 "Veuillez vérifier que les attributs uid et mail ne sont pas vide et "
 "réessayer."
@@ -1915,11 +1939,14 @@ msgid "Please specify a valid operator."
 msgstr "Veuillez spécifier un opérateur valide."
 
 #: personal/mail/sieve/class_sieveElement_If.inc:654
-msgid "Invalid character found in address attribute. Quotes are not allowed here."
-msgstr "Caractère non valide dans l'adresse. Les guillemets sont interdits ici."
+msgid ""
+"Invalid character found in address attribute. Quotes are not allowed here."
+msgstr ""
+"Caractère non valide dans l'adresse. Les guillemets sont interdits ici."
 
 #: personal/mail/sieve/class_sieveElement_If.inc:669
-msgid "Invalid character found in value attribute. Quotes are not allowed here."
+msgid ""
+"Invalid character found in value attribute. Quotes are not allowed here."
 msgstr ""
 "Caractère non valide trouvé dans l'attribut. Les guillemets ne sont pas "
 "permis ici."
@@ -2003,7 +2030,8 @@ msgstr "L'analyse à réussi"
 
 #: personal/mail/sieve/class_sieveManagement.inc:156
 #, php-format
-msgid "The specified mail server '%s' does not exist within the GOsa configuration."
+msgid ""
+"The specified mail server '%s' does not exist within the GOsa configuration."
 msgstr ""
 "Le serveur de messagerie spécifié '%s' n'existe pas dans la configuration de "
 "GOsa."
@@ -2018,7 +2046,8 @@ msgstr "Veuillez seulement utiliser des nom de script en miniscules !"
 
 #: personal/mail/sieve/class_sieveManagement.inc:212
 msgid "Please use only alphabetical characters in script names!"
-msgstr "Seul des caractères alphabétiques sont permis dans le nom des scripts !"
+msgstr ""
+"Seul des caractères alphabétiques sont permis dans le nom des scripts !"
 
 #: personal/mail/sieve/class_sieveManagement.inc:218
 msgid "Script name already in use!"
@@ -2122,103 +2151,103 @@ msgstr "Votre commentaire ici"
 msgid "User mail settings"
 msgstr "Configuration du compte de messagerie de l'utilisateur"
 
-#: personal/mail/class_mailAccount.inc:609
+#: personal/mail/class_mailAccount.inc:615
 #: personal/mail/class_mail-methods.inc:140
 #: personal/mail/class_mail-methods.inc:485
 msgid "Configuration error"
 msgstr "Erreur de configuration"
 
-#: personal/mail/class_mailAccount.inc:609
+#: personal/mail/class_mailAccount.inc:615
 #, php-format
 msgid "No DESC tag in vacation template '%s'!"
 msgstr "Pas de drapeau DESC dans le message d'absence '%s' !"
 
-#: personal/mail/class_mailAccount.inc:638
-#: personal/mail/class_mailAccount.inc:651
-#: personal/mail/class_mailAccount.inc:682
-#: personal/mail/class_mailAccount.inc:695
+#: personal/mail/class_mailAccount.inc:644
+#: personal/mail/class_mailAccount.inc:657
+#: personal/mail/class_mailAccount.inc:691
+#: personal/mail/class_mailAccount.inc:704
 msgid "Permission error"
 msgstr "Erreur de permissions"
 
-#: personal/mail/class_mailAccount.inc:638
-#: personal/mail/class_mailAccount.inc:651
-#: personal/mail/class_mailAccount.inc:682
-#: personal/mail/class_mailAccount.inc:695
+#: personal/mail/class_mailAccount.inc:644
+#: personal/mail/class_mailAccount.inc:657
+#: personal/mail/class_mailAccount.inc:691
+#: personal/mail/class_mailAccount.inc:704
 msgid "You have no permission to modify these addresses!"
 msgstr "Vous n'avez pas les droits nécessaires pour modifier ces adresses !"
 
-#: personal/mail/class_mailAccount.inc:729
-#: personal/mail/class_mailAccount.inc:732
+#: personal/mail/class_mailAccount.inc:738
+#: personal/mail/class_mailAccount.inc:741
 msgid "unknown"
 msgstr "inconnu"
 
-#: personal/mail/class_mailAccount.inc:998
+#: personal/mail/class_mailAccount.inc:1007
 msgid "Mail error saving sieve settings"
 msgstr "Erreur de messagerie lors de la sauvegarde du script sieve"
 
-#: personal/mail/class_mailAccount.inc:1102
-#: personal/mail/class_mailAccount.inc:1110
-#: personal/mail/class_mailAccount.inc:1278
+#: personal/mail/class_mailAccount.inc:1120
+#: personal/mail/class_mailAccount.inc:1128
+#: personal/mail/class_mailAccount.inc:1305
 msgid "Mail reject size"
 msgstr "Taille maximale autorisée du message"
 
-#: personal/mail/class_mailAccount.inc:1114
-#: personal/mail/class_mailAccount.inc:1285
+#: personal/mail/class_mailAccount.inc:1132
+#: personal/mail/class_mailAccount.inc:1312
 msgid "Spam folder"
 msgstr "Dossier spam"
 
-#: personal/mail/class_mailAccount.inc:1126
-#: personal/mail/class_mailAccount.inc:1297
+#: personal/mail/class_mailAccount.inc:1144
+#: personal/mail/class_mailAccount.inc:1324
 msgid "to"
 msgstr "vers"
 
-#: personal/mail/class_mailAccount.inc:1137
-#: personal/mail/class_mailAccount.inc:1308
+#: personal/mail/class_mailAccount.inc:1155
+#: personal/mail/class_mailAccount.inc:1335
 msgid "Vacation interval"
 msgstr "Intervalle du message d'absence"
 
-#: personal/mail/class_mailAccount.inc:1434
+#: personal/mail/class_mailAccount.inc:1461
 msgid "My account"
 msgstr "Mon Compte"
 
-#: personal/mail/class_mailAccount.inc:1443
+#: personal/mail/class_mailAccount.inc:1470
 msgid "Add vacation information"
 msgstr "Ajouter un message d'absence"
 
-#: personal/mail/class_mailAccount.inc:1446
+#: personal/mail/class_mailAccount.inc:1473
 msgid "Use spam filter"
 msgstr "Utiliser le filtre antispam"
 
-#: personal/mail/class_mailAccount.inc:1447
+#: personal/mail/class_mailAccount.inc:1474
 msgid "Spam level"
 msgstr "Niveau de spam"
 
-#: personal/mail/class_mailAccount.inc:1448
+#: personal/mail/class_mailAccount.inc:1475
 msgid "Spam mail box"
 msgstr "Boite spam de votre messagerie"
 
-#: personal/mail/class_mailAccount.inc:1450
+#: personal/mail/class_mailAccount.inc:1477
 msgid "Sieve management"
 msgstr "Gestion de Sieve"
 
-#: personal/mail/class_mailAccount.inc:1452
+#: personal/mail/class_mailAccount.inc:1479
 msgid "Reject due to mailsize"
 msgstr "Rejeter a cause de la taille"
 
-#: personal/mail/class_mailAccount.inc:1455
-#: personal/mail/class_mailAccount.inc:1460
+#: personal/mail/class_mailAccount.inc:1482
+#: personal/mail/class_mailAccount.inc:1487
 msgid "Forwarding address"
 msgstr "Adresse de renvoi"
 
-#: personal/mail/class_mailAccount.inc:1456
+#: personal/mail/class_mailAccount.inc:1483
 msgid "Local delivery"
 msgstr "Distribution locale"
 
-#: personal/mail/class_mailAccount.inc:1457
+#: personal/mail/class_mailAccount.inc:1484
 msgid "No delivery to own mailbox "
 msgstr "Aucune distribution des messages dans la boite de l'utilisateur"
 
-#: personal/mail/class_mailAccount.inc:1458
+#: personal/mail/class_mailAccount.inc:1485
 msgid "Mail alternative addresses"
 msgstr "Adresses alternatives"
 
@@ -2248,4 +2277,3 @@ msgstr "Illimités"
 #: personal/mail/mail_locals.tpl:35
 msgid "Select department"
 msgstr "Sélectionner un département"
-
diff --git a/gosa-plugins/mail/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/mail/locale/it/LC_MESSAGES/messages.po
index 84d811590..10f0db911 100644
--- a/gosa-plugins/mail/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mail/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -35,18 +35,18 @@ msgstr "Crea estensioni di posta"
 #: admin/groups/mail/class_groupMail.inc:362
 #: admin/groups/mail/class_groupMail.inc:397
 #: admin/groups/mail/class_groupMail.inc:403
-#: admin/groups/mail/class_groupMail.inc:412
-#: admin/groups/mail/class_groupMail.inc:847
-#: admin/groups/mail/class_groupMail.inc:867
-#: admin/groups/mail/class_groupMail.inc:988
+#: admin/groups/mail/class_groupMail.inc:417
+#: admin/groups/mail/class_groupMail.inc:851
+#: admin/groups/mail/class_groupMail.inc:871
+#: admin/groups/mail/class_groupMail.inc:992
 #: personal/mail/class_mailAccount.inc:328
 #: personal/mail/class_mailAccount.inc:363
 #: personal/mail/class_mailAccount.inc:368
-#: personal/mail/class_mailAccount.inc:375
-#: personal/mail/class_mailAccount.inc:1070
-#: personal/mail/class_mailAccount.inc:1074
+#: personal/mail/class_mailAccount.inc:381
+#: personal/mail/class_mailAccount.inc:1081
 #: personal/mail/class_mailAccount.inc:1085
-#: personal/mail/class_mailAccount.inc:1439
+#: personal/mail/class_mailAccount.inc:1103
+#: personal/mail/class_mailAccount.inc:1466
 msgid "Mail address"
 msgstr "Indirizzo principale"
 
@@ -56,14 +56,14 @@ msgstr ""
 
 #: admin/ogroups/mail/class_mailogroup.inc:120
 #: admin/ogroups/mail/class_mailogroup.inc:157
-#: admin/groups/mail/class_groupMail.inc:538
-#: admin/groups/mail/class_groupMail.inc:767
+#: admin/groups/mail/class_groupMail.inc:542
+#: admin/groups/mail/class_groupMail.inc:771
 #: admin/systems/services/imap/class_goImapServer.inc:190
 #: admin/systems/services/mail/class_goMailServer.inc:582
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/spam/class_goSpamServer.inc:277
-#: personal/mail/class_mailAccount.inc:889
-#: personal/mail/class_mailAccount.inc:962
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:971
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
@@ -76,17 +76,17 @@ msgstr "Errore LDAP"
 #: admin/groups/mail/class_groupMail.inc:292
 #: admin/groups/mail/class_groupMail.inc:294
 #: admin/groups/mail/class_groupMail.inc:295
-#: admin/groups/mail/class_groupMail.inc:835
-#: admin/groups/mail/class_groupMail.inc:980
+#: admin/groups/mail/class_groupMail.inc:839
+#: admin/groups/mail/class_groupMail.inc:984
 #: personal/mail/class_mailAccount.inc:50
 #: personal/mail/class_mailAccount.inc:244
 #: personal/mail/class_mailAccount.inc:252
 #: personal/mail/class_mailAccount.inc:254
 #: personal/mail/class_mailAccount.inc:259
 #: personal/mail/class_mailAccount.inc:261
-#: personal/mail/class_mailAccount.inc:1054
-#: personal/mail/class_mailAccount.inc:1263
-#: personal/mail/class_mailAccount.inc:1429
+#: personal/mail/class_mailAccount.inc:1065
+#: personal/mail/class_mailAccount.inc:1290
+#: personal/mail/class_mailAccount.inc:1456
 msgid "Mail"
 msgstr "Posta"
 
@@ -100,9 +100,9 @@ msgstr "Gruppo primario"
 msgid "Mail distribution list"
 msgstr "Opzioni di posta dell'identità"
 
-#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:845
+#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:849
 #: admin/groups/mail/mail.tpl:7 admin/groups/mail/paste_mail.tpl:8
-#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1066
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1077
 #: personal/mail/copypaste.tpl:7
 msgid "Primary address"
 msgstr "Indirizzo principale"
@@ -122,22 +122,22 @@ msgstr "Prego inserire un numero di telefono valido!"
 #: admin/groups/mail/class_groupMail.inc:140
 #: admin/groups/mail/class_groupMail.inc:145
 #: admin/groups/mail/class_groupMail.inc:148
-#: admin/groups/mail/class_groupMail.inc:550
 #: admin/groups/mail/class_groupMail.inc:554
 #: admin/groups/mail/class_groupMail.inc:558
-#: admin/groups/mail/class_groupMail.inc:780
+#: admin/groups/mail/class_groupMail.inc:562
 #: admin/groups/mail/class_groupMail.inc:784
 #: admin/groups/mail/class_groupMail.inc:788
-#: admin/groups/mail/class_groupMail.inc:797
+#: admin/groups/mail/class_groupMail.inc:792
+#: admin/groups/mail/class_groupMail.inc:801
 #: personal/mail/class_mailAccount.inc:147
 #: personal/mail/class_mailAccount.inc:154
 #: personal/mail/class_mailAccount.inc:159
 #: personal/mail/class_mailAccount.inc:162
-#: personal/mail/class_mailAccount.inc:898
-#: personal/mail/class_mailAccount.inc:902
-#: personal/mail/class_mailAccount.inc:976
-#: personal/mail/class_mailAccount.inc:980
-#: personal/mail/class_mailAccount.inc:984
+#: personal/mail/class_mailAccount.inc:907
+#: personal/mail/class_mailAccount.inc:911
+#: personal/mail/class_mailAccount.inc:985
+#: personal/mail/class_mailAccount.inc:989
+#: personal/mail/class_mailAccount.inc:993
 #, fuzzy
 msgid "Mail error"
 msgstr "Server"
@@ -165,11 +165,11 @@ msgid "Cannot receive folder permissions: %s"
 msgstr "Cartelle condivise IMAP"
 
 #: admin/groups/mail/class_groupMail.inc:145
-#: admin/groups/mail/class_groupMail.inc:550
-#: admin/groups/mail/class_groupMail.inc:780
+#: admin/groups/mail/class_groupMail.inc:554
+#: admin/groups/mail/class_groupMail.inc:784
 #: personal/mail/class_mailAccount.inc:159
-#: personal/mail/class_mailAccount.inc:898
-#: personal/mail/class_mailAccount.inc:976
+#: personal/mail/class_mailAccount.inc:907
+#: personal/mail/class_mailAccount.inc:985
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -195,7 +195,7 @@ msgstr ""
 #: admin/groups/mail/class_groupMail.inc:368
 #: admin/groups/mail/class_groupMail.inc:397
 #: admin/groups/mail/class_groupMail.inc:403
-#: admin/groups/mail/class_groupMail.inc:412
+#: admin/groups/mail/class_groupMail.inc:417
 #: admin/systems/services/spam/class_goSpamServer.inc:143
 #: admin/systems/services/spam/class_goSpamServer.inc:216
 #: addons/mailqueue/class_mailqueue.inc:110
@@ -212,7 +212,7 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:334
 #: personal/mail/class_mailAccount.inc:363
 #: personal/mail/class_mailAccount.inc:368
-#: personal/mail/class_mailAccount.inc:375
+#: personal/mail/class_mailAccount.inc:381
 msgid "Error"
 msgstr ""
 
@@ -231,102 +231,110 @@ msgstr ""
 "degli inoltri"
 
 #: admin/groups/mail/class_groupMail.inc:413
-#: personal/mail/class_mailAccount.inc:376
+#: personal/mail/class_mailAccount.inc:377
+#: personal/mail/class_mailAccount.inc:1099
+#, fuzzy, php-format
+msgid "Address is already in use by group '%s'."
+msgstr "L'indirizzo che stai cercando di aggiungere  gi in uso"
+
+#: admin/groups/mail/class_groupMail.inc:415
+#: personal/mail/class_mailAccount.inc:379
+#: personal/mail/class_mailAccount.inc:1101
 #, fuzzy, php-format
 msgid "Address is already in use by user '%s'."
 msgstr "L'indirizzo che stai cercando di aggiungere  gi in uso"
 
-#: admin/groups/mail/class_groupMail.inc:554
-#: personal/mail/class_mailAccount.inc:902
+#: admin/groups/mail/class_groupMail.inc:558
+#: personal/mail/class_mailAccount.inc:911
 #, fuzzy, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "Rimuovi"
 
-#: admin/groups/mail/class_groupMail.inc:558
-#: admin/groups/mail/class_groupMail.inc:797
+#: admin/groups/mail/class_groupMail.inc:562
+#: admin/groups/mail/class_groupMail.inc:801
 #, fuzzy, php-format
 msgid "Cannot update shared folder permissions: %s"
 msgstr "Cartelle condivise IMAP"
 
-#: admin/groups/mail/class_groupMail.inc:656
+#: admin/groups/mail/class_groupMail.inc:660
 #, fuzzy
 msgid "New"
 msgstr "Modifica contatto"
 
-#: admin/groups/mail/class_groupMail.inc:784
-#: personal/mail/class_mailAccount.inc:980
+#: admin/groups/mail/class_groupMail.inc:788
+#: personal/mail/class_mailAccount.inc:989
 #, fuzzy, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "Rimuovi"
 
-#: admin/groups/mail/class_groupMail.inc:788
-#: personal/mail/class_mailAccount.inc:984
+#: admin/groups/mail/class_groupMail.inc:792
+#: personal/mail/class_mailAccount.inc:993
 #, fuzzy, php-format
 msgid "Cannot write quota settings: %s"
 msgstr "Rimuovi"
 
-#: admin/groups/mail/class_groupMail.inc:829
+#: admin/groups/mail/class_groupMail.inc:833
 #, php-format
 msgid ""
 "The group 'cn' has changed. It can't be changed due to the fact that mail "
 "method '%s' relies on it!"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:854
-#: admin/groups/mail/class_groupMail.inc:989 admin/groups/mail/mail.tpl:60
-#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1093
-#: personal/mail/class_mailAccount.inc:1269
-#: personal/mail/class_mailAccount.inc:1441
+#: admin/groups/mail/class_groupMail.inc:858
+#: admin/groups/mail/class_groupMail.inc:993 admin/groups/mail/mail.tpl:60
+#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1111
+#: personal/mail/class_mailAccount.inc:1296
+#: personal/mail/class_mailAccount.inc:1468
 msgid "Quota size"
 msgstr "Dimensione quota"
 
-#: admin/groups/mail/class_groupMail.inc:873
-#: personal/mail/class_mailAccount.inc:1453
+#: admin/groups/mail/class_groupMail.inc:877
+#: personal/mail/class_mailAccount.inc:1480
 #, fuzzy
 msgid "Mail max size"
 msgstr "Inoltra i messaggi a"
 
-#: admin/groups/mail/class_groupMail.inc:881
+#: admin/groups/mail/class_groupMail.inc:885
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr "Devi specificare la dimensione massima delle mail da rigettare."
 
-#: admin/groups/mail/class_groupMail.inc:885
-#: admin/groups/mail/class_groupMail.inc:990
-#: personal/mail/class_mailAccount.inc:1440
+#: admin/groups/mail/class_groupMail.inc:889
+#: admin/groups/mail/class_groupMail.inc:994
+#: personal/mail/class_mailAccount.inc:1467
 #, fuzzy
 msgid "Mail server"
 msgstr "Server"
 
-#: admin/groups/mail/class_groupMail.inc:981
+#: admin/groups/mail/class_groupMail.inc:985
 #, fuzzy
 msgid "Group mail"
 msgstr "Nome gruppo"
 
-#: admin/groups/mail/class_groupMail.inc:991 admin/groups/mail/mail.tpl:73
+#: admin/groups/mail/class_groupMail.inc:995 admin/groups/mail/mail.tpl:73
 #, fuzzy
 msgid "Folder type"
 msgstr "Filtro"
 
-#: admin/groups/mail/class_groupMail.inc:991
+#: admin/groups/mail/class_groupMail.inc:995
 msgid "Kolab"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:992
+#: admin/groups/mail/class_groupMail.inc:996
 #, fuzzy
 msgid "Alternate addresses"
 msgstr "Indirizzi alternativi"
 
-#: admin/groups/mail/class_groupMail.inc:993
+#: admin/groups/mail/class_groupMail.inc:997
 #, fuzzy
 msgid "Forwarding addresses"
 msgstr "Indirizzo principale"
 
-#: admin/groups/mail/class_groupMail.inc:994
+#: admin/groups/mail/class_groupMail.inc:998
 #, fuzzy
 msgid "Only local"
 msgstr "Aggiungi localmente"
 
-#: admin/groups/mail/class_groupMail.inc:995
+#: admin/groups/mail/class_groupMail.inc:999
 msgid "Permissions"
 msgstr "Permessi"
 
@@ -462,7 +470,7 @@ msgstr "Selezione un dipartimento"
 msgid "Choose"
 msgstr "Scegli"
 
-#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1430
+#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1457
 #: personal/mail/copypaste.tpl:1
 #, fuzzy
 msgid "Mail settings"
@@ -1192,7 +1200,7 @@ msgstr "leggere"
 msgid "Display header of this message"
 msgstr "Mostra utenti che corrispondono a"
 
-#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1461
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1488
 msgid "Use custom sieve script"
 msgstr "Usa uno script di sieve personalizzato"
 
@@ -1223,8 +1231,8 @@ msgstr "Seleziona per rispondere automaticamente con il messaggio seguente"
 msgid "Activate vacation message"
 msgstr "Attiva la risposta automatica"
 
-#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1122
-#: personal/mail/class_mailAccount.inc:1293
+#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1140
+#: personal/mail/class_mailAccount.inc:1320
 #, fuzzy
 msgid "from"
 msgstr "e"
@@ -1264,7 +1272,7 @@ msgstr "Mb"
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
-#: personal/mail/class_mailAccount.inc:1444
+#: personal/mail/class_mailAccount.inc:1471
 msgid "Vacation message"
 msgstr "Messaggio di di risposta automatica"
 
@@ -1296,39 +1304,51 @@ msgstr "Errore LDAP"
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:358
-#: personal/mail/class_mail-methods-cyrus.inc:395
+#: personal/mail/class_mail-methods-cyrus.inc:298
+#, fuzzy
+msgid "Mail info"
+msgstr "Cognome"
+
+#: personal/mail/class_mail-methods-cyrus.inc:299
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/class_mail-methods-cyrus.inc:383
+#: personal/mail/class_mail-methods-cyrus.inc:420
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:447
+#: personal/mail/class_mail-methods-cyrus.inc:472
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:448
+#: personal/mail/class_mail-methods-cyrus.inc:473
 msgid "The sieve script may not be written correctly."
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:449
+#: personal/mail/class_mail-methods-cyrus.inc:474
 #: personal/mail/sieve/class_My_Tree.inc:245
 #: personal/mail/sieve/templates/remove_script.tpl:2
 msgid "Warning"
 msgstr "Attenzione"
 
-#: personal/mail/class_mail-methods-cyrus.inc:487
+#: personal/mail/class_mail-methods-cyrus.inc:512
 #: personal/mail/sieve/class_sieveManagement.inc:309
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:576
+#: personal/mail/class_mail-methods-cyrus.inc:601
 #: personal/mail/sieve/class_sieveManagement.inc:1043
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:583
+#: personal/mail/class_mail-methods-cyrus.inc:608
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
@@ -2275,117 +2295,117 @@ msgstr ""
 msgid "User mail settings"
 msgstr "Opzioni di posta dell'identità"
 
-#: personal/mail/class_mailAccount.inc:609
+#: personal/mail/class_mailAccount.inc:615
 #: personal/mail/class_mail-methods.inc:140
 #: personal/mail/class_mail-methods.inc:485
 #, fuzzy
 msgid "Configuration error"
 msgstr "File di configurazione"
 
-#: personal/mail/class_mailAccount.inc:609
+#: personal/mail/class_mailAccount.inc:615
 #, fuzzy, php-format
 msgid "No DESC tag in vacation template '%s'!"
 msgstr "Manca il DESC tag nel messaggio di risposta automatica:"
 
-#: personal/mail/class_mailAccount.inc:638
-#: personal/mail/class_mailAccount.inc:651
-#: personal/mail/class_mailAccount.inc:682
-#: personal/mail/class_mailAccount.inc:695
+#: personal/mail/class_mailAccount.inc:644
+#: personal/mail/class_mailAccount.inc:657
+#: personal/mail/class_mailAccount.inc:691
+#: personal/mail/class_mailAccount.inc:704
 #, fuzzy
 msgid "Permission error"
 msgstr "Permessi"
 
-#: personal/mail/class_mailAccount.inc:638
-#: personal/mail/class_mailAccount.inc:651
-#: personal/mail/class_mailAccount.inc:682
-#: personal/mail/class_mailAccount.inc:695
+#: personal/mail/class_mailAccount.inc:644
+#: personal/mail/class_mailAccount.inc:657
+#: personal/mail/class_mailAccount.inc:691
+#: personal/mail/class_mailAccount.inc:704
 #, fuzzy
 msgid "You have no permission to modify these addresses!"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: personal/mail/class_mailAccount.inc:729
-#: personal/mail/class_mailAccount.inc:732
+#: personal/mail/class_mailAccount.inc:738
+#: personal/mail/class_mailAccount.inc:741
 msgid "unknown"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:998
+#: personal/mail/class_mailAccount.inc:1007
 #, fuzzy
 msgid "Mail error saving sieve settings"
 msgstr "Usa uno script di sieve personalizzato"
 
-#: personal/mail/class_mailAccount.inc:1102
-#: personal/mail/class_mailAccount.inc:1110
-#: personal/mail/class_mailAccount.inc:1278
+#: personal/mail/class_mailAccount.inc:1120
+#: personal/mail/class_mailAccount.inc:1128
+#: personal/mail/class_mailAccount.inc:1305
 #, fuzzy
 msgid "Mail reject size"
 msgstr "Inoltra i messaggi a"
 
-#: personal/mail/class_mailAccount.inc:1114
-#: personal/mail/class_mailAccount.inc:1285
+#: personal/mail/class_mailAccount.inc:1132
+#: personal/mail/class_mailAccount.inc:1312
 #, fuzzy
 msgid "Spam folder"
 msgstr "nella cartella"
 
-#: personal/mail/class_mailAccount.inc:1126
-#: personal/mail/class_mailAccount.inc:1297
+#: personal/mail/class_mailAccount.inc:1144
+#: personal/mail/class_mailAccount.inc:1324
 #, fuzzy
 msgid "to"
 msgstr "Rapporto"
 
-#: personal/mail/class_mailAccount.inc:1137
-#: personal/mail/class_mailAccount.inc:1308
+#: personal/mail/class_mailAccount.inc:1155
+#: personal/mail/class_mailAccount.inc:1335
 #, fuzzy
 msgid "Vacation interval"
 msgstr "Messaggio di di risposta automatica"
 
-#: personal/mail/class_mailAccount.inc:1434
+#: personal/mail/class_mailAccount.inc:1461
 msgid "My account"
 msgstr "Identità"
 
-#: personal/mail/class_mailAccount.inc:1443
+#: personal/mail/class_mailAccount.inc:1470
 #, fuzzy
 msgid "Add vacation information"
 msgstr "Informazioni organizzazione"
 
-#: personal/mail/class_mailAccount.inc:1446
+#: personal/mail/class_mailAccount.inc:1473
 msgid "Use spam filter"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1447
+#: personal/mail/class_mailAccount.inc:1474
 msgid "Spam level"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1448
+#: personal/mail/class_mailAccount.inc:1475
 msgid "Spam mail box"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1450
+#: personal/mail/class_mailAccount.inc:1477
 #, fuzzy
 msgid "Sieve management"
 msgstr "Dirigenza"
 
-#: personal/mail/class_mailAccount.inc:1452
+#: personal/mail/class_mailAccount.inc:1479
 #, fuzzy
 msgid "Reject due to mailsize"
 msgstr "Rifiuta mail più grandi di"
 
-#: personal/mail/class_mailAccount.inc:1455
-#: personal/mail/class_mailAccount.inc:1460
+#: personal/mail/class_mailAccount.inc:1482
+#: personal/mail/class_mailAccount.inc:1487
 #, fuzzy
 msgid "Forwarding address"
 msgstr "Indirizzo principale"
 
-#: personal/mail/class_mailAccount.inc:1456
+#: personal/mail/class_mailAccount.inc:1483
 #, fuzzy
 msgid "Local delivery"
 msgstr "Ultimo recapito"
 
-#: personal/mail/class_mailAccount.inc:1457
+#: personal/mail/class_mailAccount.inc:1484
 #, fuzzy
 msgid "No delivery to own mailbox "
 msgstr "Non recapitare nella propria mailbox"
 
-#: personal/mail/class_mailAccount.inc:1458
+#: personal/mail/class_mailAccount.inc:1485
 #, fuzzy
 msgid "Mail alternative addresses"
 msgstr "Indirizzi alternativi"
diff --git a/gosa-plugins/mail/locale/messages.po b/gosa-plugins/mail/locale/messages.po
index 139e5b8d9..4cb769afd 100644
--- a/gosa-plugins/mail/locale/messages.po
+++ b/gosa-plugins/mail/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -35,18 +35,18 @@ msgstr ""
 #: admin/groups/mail/class_groupMail.inc:362
 #: admin/groups/mail/class_groupMail.inc:397
 #: admin/groups/mail/class_groupMail.inc:403
-#: admin/groups/mail/class_groupMail.inc:412
-#: admin/groups/mail/class_groupMail.inc:847
-#: admin/groups/mail/class_groupMail.inc:867
-#: admin/groups/mail/class_groupMail.inc:988
+#: admin/groups/mail/class_groupMail.inc:417
+#: admin/groups/mail/class_groupMail.inc:851
+#: admin/groups/mail/class_groupMail.inc:871
+#: admin/groups/mail/class_groupMail.inc:992
 #: personal/mail/class_mailAccount.inc:328
 #: personal/mail/class_mailAccount.inc:363
 #: personal/mail/class_mailAccount.inc:368
-#: personal/mail/class_mailAccount.inc:375
-#: personal/mail/class_mailAccount.inc:1070
-#: personal/mail/class_mailAccount.inc:1074
+#: personal/mail/class_mailAccount.inc:381
+#: personal/mail/class_mailAccount.inc:1081
 #: personal/mail/class_mailAccount.inc:1085
-#: personal/mail/class_mailAccount.inc:1439
+#: personal/mail/class_mailAccount.inc:1103
+#: personal/mail/class_mailAccount.inc:1466
 msgid "Mail address"
 msgstr ""
 
@@ -56,14 +56,14 @@ msgstr ""
 
 #: admin/ogroups/mail/class_mailogroup.inc:120
 #: admin/ogroups/mail/class_mailogroup.inc:157
-#: admin/groups/mail/class_groupMail.inc:538
-#: admin/groups/mail/class_groupMail.inc:767
+#: admin/groups/mail/class_groupMail.inc:542
+#: admin/groups/mail/class_groupMail.inc:771
 #: admin/systems/services/imap/class_goImapServer.inc:190
 #: admin/systems/services/mail/class_goMailServer.inc:582
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/spam/class_goSpamServer.inc:277
-#: personal/mail/class_mailAccount.inc:889
-#: personal/mail/class_mailAccount.inc:962
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:971
 msgid "LDAP error"
 msgstr ""
 
@@ -75,17 +75,17 @@ msgstr ""
 #: admin/groups/mail/class_groupMail.inc:292
 #: admin/groups/mail/class_groupMail.inc:294
 #: admin/groups/mail/class_groupMail.inc:295
-#: admin/groups/mail/class_groupMail.inc:835
-#: admin/groups/mail/class_groupMail.inc:980
+#: admin/groups/mail/class_groupMail.inc:839
+#: admin/groups/mail/class_groupMail.inc:984
 #: personal/mail/class_mailAccount.inc:50
 #: personal/mail/class_mailAccount.inc:244
 #: personal/mail/class_mailAccount.inc:252
 #: personal/mail/class_mailAccount.inc:254
 #: personal/mail/class_mailAccount.inc:259
 #: personal/mail/class_mailAccount.inc:261
-#: personal/mail/class_mailAccount.inc:1054
-#: personal/mail/class_mailAccount.inc:1263
-#: personal/mail/class_mailAccount.inc:1429
+#: personal/mail/class_mailAccount.inc:1065
+#: personal/mail/class_mailAccount.inc:1290
+#: personal/mail/class_mailAccount.inc:1456
 msgid "Mail"
 msgstr ""
 
@@ -97,9 +97,9 @@ msgstr ""
 msgid "Mail distribution list"
 msgstr ""
 
-#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:845
+#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:849
 #: admin/groups/mail/mail.tpl:7 admin/groups/mail/paste_mail.tpl:8
-#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1066
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1077
 #: personal/mail/copypaste.tpl:7
 msgid "Primary address"
 msgstr ""
@@ -118,22 +118,22 @@ msgstr ""
 #: admin/groups/mail/class_groupMail.inc:140
 #: admin/groups/mail/class_groupMail.inc:145
 #: admin/groups/mail/class_groupMail.inc:148
-#: admin/groups/mail/class_groupMail.inc:550
 #: admin/groups/mail/class_groupMail.inc:554
 #: admin/groups/mail/class_groupMail.inc:558
-#: admin/groups/mail/class_groupMail.inc:780
+#: admin/groups/mail/class_groupMail.inc:562
 #: admin/groups/mail/class_groupMail.inc:784
 #: admin/groups/mail/class_groupMail.inc:788
-#: admin/groups/mail/class_groupMail.inc:797
+#: admin/groups/mail/class_groupMail.inc:792
+#: admin/groups/mail/class_groupMail.inc:801
 #: personal/mail/class_mailAccount.inc:147
 #: personal/mail/class_mailAccount.inc:154
 #: personal/mail/class_mailAccount.inc:159
 #: personal/mail/class_mailAccount.inc:162
-#: personal/mail/class_mailAccount.inc:898
-#: personal/mail/class_mailAccount.inc:902
-#: personal/mail/class_mailAccount.inc:976
-#: personal/mail/class_mailAccount.inc:980
-#: personal/mail/class_mailAccount.inc:984
+#: personal/mail/class_mailAccount.inc:907
+#: personal/mail/class_mailAccount.inc:911
+#: personal/mail/class_mailAccount.inc:985
+#: personal/mail/class_mailAccount.inc:989
+#: personal/mail/class_mailAccount.inc:993
 msgid "Mail error"
 msgstr ""
 
@@ -160,11 +160,11 @@ msgid "Cannot receive folder permissions: %s"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:145
-#: admin/groups/mail/class_groupMail.inc:550
-#: admin/groups/mail/class_groupMail.inc:780
+#: admin/groups/mail/class_groupMail.inc:554
+#: admin/groups/mail/class_groupMail.inc:784
 #: personal/mail/class_mailAccount.inc:159
-#: personal/mail/class_mailAccount.inc:898
-#: personal/mail/class_mailAccount.inc:976
+#: personal/mail/class_mailAccount.inc:907
+#: personal/mail/class_mailAccount.inc:985
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -190,7 +190,7 @@ msgstr ""
 #: admin/groups/mail/class_groupMail.inc:368
 #: admin/groups/mail/class_groupMail.inc:397
 #: admin/groups/mail/class_groupMail.inc:403
-#: admin/groups/mail/class_groupMail.inc:412
+#: admin/groups/mail/class_groupMail.inc:417
 #: admin/systems/services/spam/class_goSpamServer.inc:143
 #: admin/systems/services/spam/class_goSpamServer.inc:216
 #: addons/mailqueue/class_mailqueue.inc:110
@@ -207,7 +207,7 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:334
 #: personal/mail/class_mailAccount.inc:363
 #: personal/mail/class_mailAccount.inc:368
-#: personal/mail/class_mailAccount.inc:375
+#: personal/mail/class_mailAccount.inc:381
 msgid "Error"
 msgstr ""
 
@@ -222,94 +222,102 @@ msgid "Cannot add primary address to the list of forwarders!"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:413
-#: personal/mail/class_mailAccount.inc:376
+#: personal/mail/class_mailAccount.inc:377
+#: personal/mail/class_mailAccount.inc:1099
+#, php-format
+msgid "Address is already in use by group '%s'."
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:415
+#: personal/mail/class_mailAccount.inc:379
+#: personal/mail/class_mailAccount.inc:1101
 #, php-format
 msgid "Address is already in use by user '%s'."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:554
-#: personal/mail/class_mailAccount.inc:902
+#: admin/groups/mail/class_groupMail.inc:558
+#: personal/mail/class_mailAccount.inc:911
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:558
-#: admin/groups/mail/class_groupMail.inc:797
+#: admin/groups/mail/class_groupMail.inc:562
+#: admin/groups/mail/class_groupMail.inc:801
 #, php-format
 msgid "Cannot update shared folder permissions: %s"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:656
+#: admin/groups/mail/class_groupMail.inc:660
 msgid "New"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:784
-#: personal/mail/class_mailAccount.inc:980
+#: admin/groups/mail/class_groupMail.inc:788
+#: personal/mail/class_mailAccount.inc:989
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:788
-#: personal/mail/class_mailAccount.inc:984
+#: admin/groups/mail/class_groupMail.inc:792
+#: personal/mail/class_mailAccount.inc:993
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:829
+#: admin/groups/mail/class_groupMail.inc:833
 #, php-format
 msgid ""
 "The group 'cn' has changed. It can't be changed due to the fact that mail "
 "method '%s' relies on it!"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:854
-#: admin/groups/mail/class_groupMail.inc:989 admin/groups/mail/mail.tpl:60
-#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1093
-#: personal/mail/class_mailAccount.inc:1269
-#: personal/mail/class_mailAccount.inc:1441
+#: admin/groups/mail/class_groupMail.inc:858
+#: admin/groups/mail/class_groupMail.inc:993 admin/groups/mail/mail.tpl:60
+#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1111
+#: personal/mail/class_mailAccount.inc:1296
+#: personal/mail/class_mailAccount.inc:1468
 msgid "Quota size"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:873
-#: personal/mail/class_mailAccount.inc:1453
+#: admin/groups/mail/class_groupMail.inc:877
+#: personal/mail/class_mailAccount.inc:1480
 msgid "Mail max size"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:881
+#: admin/groups/mail/class_groupMail.inc:885
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:885
-#: admin/groups/mail/class_groupMail.inc:990
-#: personal/mail/class_mailAccount.inc:1440
+#: admin/groups/mail/class_groupMail.inc:889
+#: admin/groups/mail/class_groupMail.inc:994
+#: personal/mail/class_mailAccount.inc:1467
 msgid "Mail server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:981
+#: admin/groups/mail/class_groupMail.inc:985
 msgid "Group mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:991 admin/groups/mail/mail.tpl:73
+#: admin/groups/mail/class_groupMail.inc:995 admin/groups/mail/mail.tpl:73
 msgid "Folder type"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:991
+#: admin/groups/mail/class_groupMail.inc:995
 msgid "Kolab"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:992
+#: admin/groups/mail/class_groupMail.inc:996
 msgid "Alternate addresses"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:993
+#: admin/groups/mail/class_groupMail.inc:997
 msgid "Forwarding addresses"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:994
+#: admin/groups/mail/class_groupMail.inc:998
 msgid "Only local"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:995
+#: admin/groups/mail/class_groupMail.inc:999
 msgid "Permissions"
 msgstr ""
 
@@ -438,7 +446,7 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1430
+#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1457
 #: personal/mail/copypaste.tpl:1
 msgid "Mail settings"
 msgstr ""
@@ -1106,7 +1114,7 @@ msgstr ""
 msgid "Display header of this message"
 msgstr ""
 
-#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1461
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1488
 msgid "Use custom sieve script"
 msgstr ""
 
@@ -1135,8 +1143,8 @@ msgstr ""
 msgid "Activate vacation message"
 msgstr ""
 
-#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1122
-#: personal/mail/class_mailAccount.inc:1293
+#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1140
+#: personal/mail/class_mailAccount.inc:1320
 msgid "from"
 msgstr ""
 
@@ -1173,7 +1181,7 @@ msgstr ""
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
-#: personal/mail/class_mailAccount.inc:1444
+#: personal/mail/class_mailAccount.inc:1471
 msgid "Vacation message"
 msgstr ""
 
@@ -1204,39 +1212,50 @@ msgstr ""
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:358
-#: personal/mail/class_mail-methods-cyrus.inc:395
+#: personal/mail/class_mail-methods-cyrus.inc:298
+msgid "Mail info"
+msgstr ""
+
+#: personal/mail/class_mail-methods-cyrus.inc:299
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/class_mail-methods-cyrus.inc:383
+#: personal/mail/class_mail-methods-cyrus.inc:420
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:447
+#: personal/mail/class_mail-methods-cyrus.inc:472
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:448
+#: personal/mail/class_mail-methods-cyrus.inc:473
 msgid "The sieve script may not be written correctly."
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:449
+#: personal/mail/class_mail-methods-cyrus.inc:474
 #: personal/mail/sieve/class_My_Tree.inc:245
 #: personal/mail/sieve/templates/remove_script.tpl:2
 msgid "Warning"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:487
+#: personal/mail/class_mail-methods-cyrus.inc:512
 #: personal/mail/sieve/class_sieveManagement.inc:309
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:576
+#: personal/mail/class_mail-methods-cyrus.inc:601
 #: personal/mail/sieve/class_sieveManagement.inc:1043
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:583
+#: personal/mail/class_mail-methods-cyrus.inc:608
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
@@ -2078,103 +2097,103 @@ msgstr ""
 msgid "User mail settings"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:609
+#: personal/mail/class_mailAccount.inc:615
 #: personal/mail/class_mail-methods.inc:140
 #: personal/mail/class_mail-methods.inc:485
 msgid "Configuration error"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:609
+#: personal/mail/class_mailAccount.inc:615
 #, php-format
 msgid "No DESC tag in vacation template '%s'!"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:638
-#: personal/mail/class_mailAccount.inc:651
-#: personal/mail/class_mailAccount.inc:682
-#: personal/mail/class_mailAccount.inc:695
+#: personal/mail/class_mailAccount.inc:644
+#: personal/mail/class_mailAccount.inc:657
+#: personal/mail/class_mailAccount.inc:691
+#: personal/mail/class_mailAccount.inc:704
 msgid "Permission error"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:638
-#: personal/mail/class_mailAccount.inc:651
-#: personal/mail/class_mailAccount.inc:682
-#: personal/mail/class_mailAccount.inc:695
+#: personal/mail/class_mailAccount.inc:644
+#: personal/mail/class_mailAccount.inc:657
+#: personal/mail/class_mailAccount.inc:691
+#: personal/mail/class_mailAccount.inc:704
 msgid "You have no permission to modify these addresses!"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:729
-#: personal/mail/class_mailAccount.inc:732
+#: personal/mail/class_mailAccount.inc:738
+#: personal/mail/class_mailAccount.inc:741
 msgid "unknown"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:998
+#: personal/mail/class_mailAccount.inc:1007
 msgid "Mail error saving sieve settings"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1102
-#: personal/mail/class_mailAccount.inc:1110
-#: personal/mail/class_mailAccount.inc:1278
+#: personal/mail/class_mailAccount.inc:1120
+#: personal/mail/class_mailAccount.inc:1128
+#: personal/mail/class_mailAccount.inc:1305
 msgid "Mail reject size"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1114
-#: personal/mail/class_mailAccount.inc:1285
+#: personal/mail/class_mailAccount.inc:1132
+#: personal/mail/class_mailAccount.inc:1312
 msgid "Spam folder"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1126
-#: personal/mail/class_mailAccount.inc:1297
+#: personal/mail/class_mailAccount.inc:1144
+#: personal/mail/class_mailAccount.inc:1324
 msgid "to"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1137
-#: personal/mail/class_mailAccount.inc:1308
+#: personal/mail/class_mailAccount.inc:1155
+#: personal/mail/class_mailAccount.inc:1335
 msgid "Vacation interval"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1434
+#: personal/mail/class_mailAccount.inc:1461
 msgid "My account"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1443
+#: personal/mail/class_mailAccount.inc:1470
 msgid "Add vacation information"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1446
+#: personal/mail/class_mailAccount.inc:1473
 msgid "Use spam filter"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1447
+#: personal/mail/class_mailAccount.inc:1474
 msgid "Spam level"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1448
+#: personal/mail/class_mailAccount.inc:1475
 msgid "Spam mail box"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1450
+#: personal/mail/class_mailAccount.inc:1477
 msgid "Sieve management"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1452
+#: personal/mail/class_mailAccount.inc:1479
 msgid "Reject due to mailsize"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1455
-#: personal/mail/class_mailAccount.inc:1460
+#: personal/mail/class_mailAccount.inc:1482
+#: personal/mail/class_mailAccount.inc:1487
 msgid "Forwarding address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1456
+#: personal/mail/class_mailAccount.inc:1483
 msgid "Local delivery"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1457
+#: personal/mail/class_mailAccount.inc:1484
 msgid "No delivery to own mailbox "
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1458
+#: personal/mail/class_mailAccount.inc:1485
 msgid "Mail alternative addresses"
 msgstr ""
 
diff --git a/gosa-plugins/mail/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/mail/locale/nl/LC_MESSAGES/messages.po
index ca6feec68..721f3d769 100644
--- a/gosa-plugins/mail/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mail/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -39,18 +39,18 @@ msgstr "E-mail account aanmaken"
 #: admin/groups/mail/class_groupMail.inc:362
 #: admin/groups/mail/class_groupMail.inc:397
 #: admin/groups/mail/class_groupMail.inc:403
-#: admin/groups/mail/class_groupMail.inc:412
-#: admin/groups/mail/class_groupMail.inc:847
-#: admin/groups/mail/class_groupMail.inc:867
-#: admin/groups/mail/class_groupMail.inc:988
+#: admin/groups/mail/class_groupMail.inc:417
+#: admin/groups/mail/class_groupMail.inc:851
+#: admin/groups/mail/class_groupMail.inc:871
+#: admin/groups/mail/class_groupMail.inc:992
 #: personal/mail/class_mailAccount.inc:328
 #: personal/mail/class_mailAccount.inc:363
 #: personal/mail/class_mailAccount.inc:368
-#: personal/mail/class_mailAccount.inc:375
-#: personal/mail/class_mailAccount.inc:1070
-#: personal/mail/class_mailAccount.inc:1074
+#: personal/mail/class_mailAccount.inc:381
+#: personal/mail/class_mailAccount.inc:1081
 #: personal/mail/class_mailAccount.inc:1085
-#: personal/mail/class_mailAccount.inc:1439
+#: personal/mail/class_mailAccount.inc:1103
+#: personal/mail/class_mailAccount.inc:1466
 msgid "Mail address"
 msgstr "E-mail adres"
 
@@ -60,14 +60,14 @@ msgstr ""
 
 #: admin/ogroups/mail/class_mailogroup.inc:120
 #: admin/ogroups/mail/class_mailogroup.inc:157
-#: admin/groups/mail/class_groupMail.inc:538
-#: admin/groups/mail/class_groupMail.inc:767
+#: admin/groups/mail/class_groupMail.inc:542
+#: admin/groups/mail/class_groupMail.inc:771
 #: admin/systems/services/imap/class_goImapServer.inc:190
 #: admin/systems/services/mail/class_goMailServer.inc:582
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/spam/class_goSpamServer.inc:277
-#: personal/mail/class_mailAccount.inc:889
-#: personal/mail/class_mailAccount.inc:962
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:971
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP fout:"
@@ -80,17 +80,17 @@ msgstr "LDAP fout:"
 #: admin/groups/mail/class_groupMail.inc:292
 #: admin/groups/mail/class_groupMail.inc:294
 #: admin/groups/mail/class_groupMail.inc:295
-#: admin/groups/mail/class_groupMail.inc:835
-#: admin/groups/mail/class_groupMail.inc:980
+#: admin/groups/mail/class_groupMail.inc:839
+#: admin/groups/mail/class_groupMail.inc:984
 #: personal/mail/class_mailAccount.inc:50
 #: personal/mail/class_mailAccount.inc:244
 #: personal/mail/class_mailAccount.inc:252
 #: personal/mail/class_mailAccount.inc:254
 #: personal/mail/class_mailAccount.inc:259
 #: personal/mail/class_mailAccount.inc:261
-#: personal/mail/class_mailAccount.inc:1054
-#: personal/mail/class_mailAccount.inc:1263
-#: personal/mail/class_mailAccount.inc:1429
+#: personal/mail/class_mailAccount.inc:1065
+#: personal/mail/class_mailAccount.inc:1290
+#: personal/mail/class_mailAccount.inc:1456
 msgid "Mail"
 msgstr "E-mail"
 
@@ -103,9 +103,9 @@ msgstr "Primaire groep"
 msgid "Mail distribution list"
 msgstr "Mail distributielijst"
 
-#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:845
+#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:849
 #: admin/groups/mail/mail.tpl:7 admin/groups/mail/paste_mail.tpl:8
-#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1066
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1077
 #: personal/mail/copypaste.tpl:7
 msgid "Primary address"
 msgstr "Primair adres"
@@ -125,22 +125,22 @@ msgstr "Geef a.u.b. een geldige naam op"
 #: admin/groups/mail/class_groupMail.inc:140
 #: admin/groups/mail/class_groupMail.inc:145
 #: admin/groups/mail/class_groupMail.inc:148
-#: admin/groups/mail/class_groupMail.inc:550
 #: admin/groups/mail/class_groupMail.inc:554
 #: admin/groups/mail/class_groupMail.inc:558
-#: admin/groups/mail/class_groupMail.inc:780
+#: admin/groups/mail/class_groupMail.inc:562
 #: admin/groups/mail/class_groupMail.inc:784
 #: admin/groups/mail/class_groupMail.inc:788
-#: admin/groups/mail/class_groupMail.inc:797
+#: admin/groups/mail/class_groupMail.inc:792
+#: admin/groups/mail/class_groupMail.inc:801
 #: personal/mail/class_mailAccount.inc:147
 #: personal/mail/class_mailAccount.inc:154
 #: personal/mail/class_mailAccount.inc:159
 #: personal/mail/class_mailAccount.inc:162
-#: personal/mail/class_mailAccount.inc:898
-#: personal/mail/class_mailAccount.inc:902
-#: personal/mail/class_mailAccount.inc:976
-#: personal/mail/class_mailAccount.inc:980
-#: personal/mail/class_mailAccount.inc:984
+#: personal/mail/class_mailAccount.inc:907
+#: personal/mail/class_mailAccount.inc:911
+#: personal/mail/class_mailAccount.inc:985
+#: personal/mail/class_mailAccount.inc:989
+#: personal/mail/class_mailAccount.inc:993
 #, fuzzy
 msgid "Mail error"
 msgstr "Mail server"
@@ -168,11 +168,11 @@ msgid "Cannot receive folder permissions: %s"
 msgstr "IMAP gedeelde mappen"
 
 #: admin/groups/mail/class_groupMail.inc:145
-#: admin/groups/mail/class_groupMail.inc:550
-#: admin/groups/mail/class_groupMail.inc:780
+#: admin/groups/mail/class_groupMail.inc:554
+#: admin/groups/mail/class_groupMail.inc:784
 #: personal/mail/class_mailAccount.inc:159
-#: personal/mail/class_mailAccount.inc:898
-#: personal/mail/class_mailAccount.inc:976
+#: personal/mail/class_mailAccount.inc:907
+#: personal/mail/class_mailAccount.inc:985
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -199,7 +199,7 @@ msgstr ""
 #: admin/groups/mail/class_groupMail.inc:368
 #: admin/groups/mail/class_groupMail.inc:397
 #: admin/groups/mail/class_groupMail.inc:403
-#: admin/groups/mail/class_groupMail.inc:412
+#: admin/groups/mail/class_groupMail.inc:417
 #: admin/systems/services/spam/class_goSpamServer.inc:143
 #: admin/systems/services/spam/class_goSpamServer.inc:216
 #: addons/mailqueue/class_mailqueue.inc:110
@@ -216,7 +216,7 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:334
 #: personal/mail/class_mailAccount.inc:363
 #: personal/mail/class_mailAccount.inc:368
-#: personal/mail/class_mailAccount.inc:375
+#: personal/mail/class_mailAccount.inc:381
 msgid "Error"
 msgstr "Fout"
 
@@ -234,104 +234,113 @@ msgstr ""
 "U probeert een ongeldig email adres toe te voegen aan de doorstuurlijst."
 
 #: admin/groups/mail/class_groupMail.inc:413
-#: personal/mail/class_mailAccount.inc:376
+#: personal/mail/class_mailAccount.inc:377
+#: personal/mail/class_mailAccount.inc:1099
+#, fuzzy, php-format
+msgid "Address is already in use by group '%s'."
+msgstr ""
+"Het adres dat u probeert toe te voegen wordt al gebruikt door gebruiker"
+
+#: admin/groups/mail/class_groupMail.inc:415
+#: personal/mail/class_mailAccount.inc:379
+#: personal/mail/class_mailAccount.inc:1101
 #, fuzzy, php-format
 msgid "Address is already in use by user '%s'."
 msgstr ""
 "Het adres dat u probeert toe te voegen wordt al gebruikt door gebruiker"
 
-#: admin/groups/mail/class_groupMail.inc:554
-#: personal/mail/class_mailAccount.inc:902
+#: admin/groups/mail/class_groupMail.inc:558
+#: personal/mail/class_mailAccount.inc:911
 #, fuzzy, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "Kan de IMAP mailbox niet verwijderen. De server meldt: '%s'."
 
-#: admin/groups/mail/class_groupMail.inc:558
-#: admin/groups/mail/class_groupMail.inc:797
+#: admin/groups/mail/class_groupMail.inc:562
+#: admin/groups/mail/class_groupMail.inc:801
 #, fuzzy, php-format
 msgid "Cannot update shared folder permissions: %s"
 msgstr "IMAP gedeelde mappen"
 
-#: admin/groups/mail/class_groupMail.inc:656
+#: admin/groups/mail/class_groupMail.inc:660
 #, fuzzy
 msgid "New"
 msgstr "Gebruiker toevoegen"
 
-#: admin/groups/mail/class_groupMail.inc:784
-#: personal/mail/class_mailAccount.inc:980
+#: admin/groups/mail/class_groupMail.inc:788
+#: personal/mail/class_mailAccount.inc:989
 #, fuzzy, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "Kan de IMAP mailbox niet aanmaken. De IMAP server meldt: '%s'."
 
-#: admin/groups/mail/class_groupMail.inc:788
-#: personal/mail/class_mailAccount.inc:984
+#: admin/groups/mail/class_groupMail.inc:792
+#: personal/mail/class_mailAccount.inc:993
 #, fuzzy, php-format
 msgid "Cannot write quota settings: %s"
 msgstr "Kan bestand '%s' niet aanmaken."
 
-#: admin/groups/mail/class_groupMail.inc:829
+#: admin/groups/mail/class_groupMail.inc:833
 #, php-format
 msgid ""
 "The group 'cn' has changed. It can't be changed due to the fact that mail "
 "method '%s' relies on it!"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:854
-#: admin/groups/mail/class_groupMail.inc:989 admin/groups/mail/mail.tpl:60
-#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1093
-#: personal/mail/class_mailAccount.inc:1269
-#: personal/mail/class_mailAccount.inc:1441
+#: admin/groups/mail/class_groupMail.inc:858
+#: admin/groups/mail/class_groupMail.inc:993 admin/groups/mail/mail.tpl:60
+#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1111
+#: personal/mail/class_mailAccount.inc:1296
+#: personal/mail/class_mailAccount.inc:1468
 msgid "Quota size"
 msgstr "Quota grootte"
 
-#: admin/groups/mail/class_groupMail.inc:873
-#: personal/mail/class_mailAccount.inc:1453
+#: admin/groups/mail/class_groupMail.inc:877
+#: personal/mail/class_mailAccount.inc:1480
 #, fuzzy
 msgid "Mail max size"
 msgstr "E-mail grootte"
 
-#: admin/groups/mail/class_groupMail.inc:881
+#: admin/groups/mail/class_groupMail.inc:885
 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."
 
-#: admin/groups/mail/class_groupMail.inc:885
-#: admin/groups/mail/class_groupMail.inc:990
-#: personal/mail/class_mailAccount.inc:1440
+#: admin/groups/mail/class_groupMail.inc:889
+#: admin/groups/mail/class_groupMail.inc:994
+#: personal/mail/class_mailAccount.inc:1467
 msgid "Mail server"
 msgstr "Mail server"
 
-#: admin/groups/mail/class_groupMail.inc:981
+#: admin/groups/mail/class_groupMail.inc:985
 #, fuzzy
 msgid "Group mail"
 msgstr "Groepnaam"
 
-#: admin/groups/mail/class_groupMail.inc:991 admin/groups/mail/mail.tpl:73
+#: admin/groups/mail/class_groupMail.inc:995 admin/groups/mail/mail.tpl:73
 #, fuzzy
 msgid "Folder type"
 msgstr "Filter"
 
-#: admin/groups/mail/class_groupMail.inc:991
+#: admin/groups/mail/class_groupMail.inc:995
 msgid "Kolab"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:992
+#: admin/groups/mail/class_groupMail.inc:996
 #, fuzzy
 msgid "Alternate addresses"
 msgstr "Alternatieve adressen"
 
-#: admin/groups/mail/class_groupMail.inc:993
+#: admin/groups/mail/class_groupMail.inc:997
 #, fuzzy
 msgid "Forwarding addresses"
 msgstr "Primair adres"
 
-#: admin/groups/mail/class_groupMail.inc:994
+#: admin/groups/mail/class_groupMail.inc:998
 #, fuzzy
 msgid "Only local"
 msgstr "Lokaal toevoegen"
 
-#: admin/groups/mail/class_groupMail.inc:995
+#: admin/groups/mail/class_groupMail.inc:999
 msgid "Permissions"
 msgstr "Rechten"
 
@@ -467,7 +476,7 @@ msgstr "Selecteer een specifieke afdeling"
 msgid "Choose"
 msgstr "Kies"
 
-#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1430
+#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1457
 #: personal/mail/copypaste.tpl:1
 msgid "Mail settings"
 msgstr "E-mail instellingen"
@@ -1185,7 +1194,7 @@ msgstr "header"
 msgid "Display header of this message"
 msgstr "Toon de header van dit bericht"
 
-#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1461
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1488
 msgid "Use custom sieve script"
 msgstr "Gebruik een eigen sieve script"
 
@@ -1217,8 +1226,8 @@ msgstr ""
 msgid "Activate vacation message"
 msgstr "Activeer afwezigheidsbericht"
 
-#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1122
-#: personal/mail/class_mailAccount.inc:1293
+#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1140
+#: personal/mail/class_mailAccount.inc:1320
 #, fuzzy
 msgid "from"
 msgstr "willekeurig"
@@ -1257,7 +1266,7 @@ msgstr "MB"
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
-#: personal/mail/class_mailAccount.inc:1444
+#: personal/mail/class_mailAccount.inc:1471
 msgid "Vacation message"
 msgstr "Afwezigheidsbericht"
 
@@ -1290,39 +1299,51 @@ msgstr "LDAP fout:"
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr "Kan de IMAP mailbox niet verwijderen. De server meldt: '%s'."
 
-#: personal/mail/class_mail-methods-cyrus.inc:358
-#: personal/mail/class_mail-methods-cyrus.inc:395
+#: personal/mail/class_mail-methods-cyrus.inc:298
+#, fuzzy
+msgid "Mail info"
+msgstr "Bestandsnaam"
+
+#: personal/mail/class_mail-methods-cyrus.inc:299
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/class_mail-methods-cyrus.inc:383
+#: personal/mail/class_mail-methods-cyrus.inc:420
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:447
+#: personal/mail/class_mail-methods-cyrus.inc:472
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:448
+#: personal/mail/class_mail-methods-cyrus.inc:473
 msgid "The sieve script may not be written correctly."
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:449
+#: personal/mail/class_mail-methods-cyrus.inc:474
 #: personal/mail/sieve/class_My_Tree.inc:245
 #: personal/mail/sieve/templates/remove_script.tpl:2
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: personal/mail/class_mail-methods-cyrus.inc:487
+#: personal/mail/class_mail-methods-cyrus.inc:512
 #: personal/mail/sieve/class_sieveManagement.inc:309
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:576
+#: personal/mail/class_mail-methods-cyrus.inc:601
 #: personal/mail/sieve/class_sieveManagement.inc:1043
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:583
+#: personal/mail/class_mail-methods-cyrus.inc:608
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
@@ -2272,120 +2293,120 @@ msgstr ""
 msgid "User mail settings"
 msgstr "Gebruikers E-mail instellingen"
 
-#: personal/mail/class_mailAccount.inc:609
+#: personal/mail/class_mailAccount.inc:615
 #: personal/mail/class_mail-methods.inc:140
 #: personal/mail/class_mail-methods.inc:485
 #, fuzzy
 msgid "Configuration error"
 msgstr "Configuratie bestand"
 
-#: personal/mail/class_mailAccount.inc:609
+#: personal/mail/class_mailAccount.inc:615
 #, fuzzy, php-format
 msgid "No DESC tag in vacation template '%s'!"
 msgstr "Er is geen DESC variabele aanwezig in het afwezigheidsbestand:"
 
-#: personal/mail/class_mailAccount.inc:638
-#: personal/mail/class_mailAccount.inc:651
-#: personal/mail/class_mailAccount.inc:682
-#: personal/mail/class_mailAccount.inc:695
+#: personal/mail/class_mailAccount.inc:644
+#: personal/mail/class_mailAccount.inc:657
+#: personal/mail/class_mailAccount.inc:691
+#: personal/mail/class_mailAccount.inc:704
 #, fuzzy
 msgid "Permission error"
 msgstr "Rechten"
 
-#: personal/mail/class_mailAccount.inc:638
-#: personal/mail/class_mailAccount.inc:651
-#: personal/mail/class_mailAccount.inc:682
-#: personal/mail/class_mailAccount.inc:695
+#: personal/mail/class_mailAccount.inc:644
+#: personal/mail/class_mailAccount.inc:657
+#: personal/mail/class_mailAccount.inc:691
+#: personal/mail/class_mailAccount.inc:704
 #, fuzzy
 msgid "You have no permission to modify these addresses!"
 msgstr "U heeft geen toestemming om deze afdeling te verwijderen."
 
-#: personal/mail/class_mailAccount.inc:729
-#: personal/mail/class_mailAccount.inc:732
+#: personal/mail/class_mailAccount.inc:738
+#: personal/mail/class_mailAccount.inc:741
 #, fuzzy
 msgid "unknown"
 msgstr "Onbekend"
 
-#: personal/mail/class_mailAccount.inc:998
+#: personal/mail/class_mailAccount.inc:1007
 #, fuzzy
 msgid "Mail error saving sieve settings"
 msgstr "Gebruik een eigen sieve script"
 
-#: personal/mail/class_mailAccount.inc:1102
-#: personal/mail/class_mailAccount.inc:1110
-#: personal/mail/class_mailAccount.inc:1278
+#: personal/mail/class_mailAccount.inc:1120
+#: personal/mail/class_mailAccount.inc:1128
+#: personal/mail/class_mailAccount.inc:1305
 #, fuzzy
 msgid "Mail reject size"
 msgstr "E-mail grootte"
 
-#: personal/mail/class_mailAccount.inc:1114
-#: personal/mail/class_mailAccount.inc:1285
+#: personal/mail/class_mailAccount.inc:1132
+#: personal/mail/class_mailAccount.inc:1312
 #, fuzzy
 msgid "Spam folder"
 msgstr "naar map"
 
-#: personal/mail/class_mailAccount.inc:1126
-#: personal/mail/class_mailAccount.inc:1297
+#: personal/mail/class_mailAccount.inc:1144
+#: personal/mail/class_mailAccount.inc:1324
 #, fuzzy
 msgid "to"
 msgstr "Stop"
 
-#: personal/mail/class_mailAccount.inc:1137
-#: personal/mail/class_mailAccount.inc:1308
+#: personal/mail/class_mailAccount.inc:1155
+#: personal/mail/class_mailAccount.inc:1335
 #, fuzzy
 msgid "Vacation interval"
 msgstr "Afwezigheidsbericht"
 
-#: personal/mail/class_mailAccount.inc:1434
+#: personal/mail/class_mailAccount.inc:1461
 msgid "My account"
 msgstr "Mijn account"
 
-#: personal/mail/class_mailAccount.inc:1443
+#: personal/mail/class_mailAccount.inc:1470
 #, fuzzy
 msgid "Add vacation information"
 msgstr "Organisatie informatie"
 
-#: personal/mail/class_mailAccount.inc:1446
+#: personal/mail/class_mailAccount.inc:1473
 msgid "Use spam filter"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1447
+#: personal/mail/class_mailAccount.inc:1474
 #, fuzzy
 msgid "Spam level"
 msgstr "Log prioriteit"
 
-#: personal/mail/class_mailAccount.inc:1448
+#: personal/mail/class_mailAccount.inc:1475
 #, fuzzy
 msgid "Spam mail box"
 msgstr "E-mail grootte"
 
-#: personal/mail/class_mailAccount.inc:1450
+#: personal/mail/class_mailAccount.inc:1477
 #, fuzzy
 msgid "Sieve management"
 msgstr "Beheer"
 
-#: personal/mail/class_mailAccount.inc:1452
+#: personal/mail/class_mailAccount.inc:1479
 #, fuzzy
 msgid "Reject due to mailsize"
 msgstr "Wijs E-mail af indien groter dan"
 
-#: personal/mail/class_mailAccount.inc:1455
-#: personal/mail/class_mailAccount.inc:1460
+#: personal/mail/class_mailAccount.inc:1482
+#: personal/mail/class_mailAccount.inc:1487
 #, fuzzy
 msgid "Forwarding address"
 msgstr "Primair adres"
 
-#: personal/mail/class_mailAccount.inc:1456
+#: personal/mail/class_mailAccount.inc:1483
 #, fuzzy
 msgid "Local delivery"
 msgstr "Laatste levering"
 
-#: personal/mail/class_mailAccount.inc:1457
+#: personal/mail/class_mailAccount.inc:1484
 #, fuzzy
 msgid "No delivery to own mailbox "
 msgstr "Geen aflevering in eigen mailbox"
 
-#: personal/mail/class_mailAccount.inc:1458
+#: personal/mail/class_mailAccount.inc:1485
 #, fuzzy
 msgid "Mail alternative addresses"
 msgstr "Alternatieve adressen"
diff --git a/gosa-plugins/mail/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/mail/locale/pl/LC_MESSAGES/messages.po
index c3ecc2441..26142ff67 100644
--- a/gosa-plugins/mail/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mail/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -34,18 +34,18 @@ msgstr "Stwórz konto pocztowe"
 #: admin/groups/mail/class_groupMail.inc:362
 #: admin/groups/mail/class_groupMail.inc:397
 #: admin/groups/mail/class_groupMail.inc:403
-#: admin/groups/mail/class_groupMail.inc:412
-#: admin/groups/mail/class_groupMail.inc:847
-#: admin/groups/mail/class_groupMail.inc:867
-#: admin/groups/mail/class_groupMail.inc:988
+#: admin/groups/mail/class_groupMail.inc:417
+#: admin/groups/mail/class_groupMail.inc:851
+#: admin/groups/mail/class_groupMail.inc:871
+#: admin/groups/mail/class_groupMail.inc:992
 #: personal/mail/class_mailAccount.inc:328
 #: personal/mail/class_mailAccount.inc:363
 #: personal/mail/class_mailAccount.inc:368
-#: personal/mail/class_mailAccount.inc:375
-#: personal/mail/class_mailAccount.inc:1070
-#: personal/mail/class_mailAccount.inc:1074
+#: personal/mail/class_mailAccount.inc:381
+#: personal/mail/class_mailAccount.inc:1081
 #: personal/mail/class_mailAccount.inc:1085
-#: personal/mail/class_mailAccount.inc:1439
+#: personal/mail/class_mailAccount.inc:1103
+#: personal/mail/class_mailAccount.inc:1466
 msgid "Mail address"
 msgstr "Adres email"
 
@@ -55,14 +55,14 @@ msgstr ""
 
 #: admin/ogroups/mail/class_mailogroup.inc:120
 #: admin/ogroups/mail/class_mailogroup.inc:157
-#: admin/groups/mail/class_groupMail.inc:538
-#: admin/groups/mail/class_groupMail.inc:767
+#: admin/groups/mail/class_groupMail.inc:542
+#: admin/groups/mail/class_groupMail.inc:771
 #: admin/systems/services/imap/class_goImapServer.inc:190
 #: admin/systems/services/mail/class_goMailServer.inc:582
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/spam/class_goSpamServer.inc:277
-#: personal/mail/class_mailAccount.inc:889
-#: personal/mail/class_mailAccount.inc:962
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:971
 #, fuzzy
 msgid "LDAP error"
 msgstr "błąd LDAP:"
@@ -75,17 +75,17 @@ msgstr "błąd LDAP:"
 #: admin/groups/mail/class_groupMail.inc:292
 #: admin/groups/mail/class_groupMail.inc:294
 #: admin/groups/mail/class_groupMail.inc:295
-#: admin/groups/mail/class_groupMail.inc:835
-#: admin/groups/mail/class_groupMail.inc:980
+#: admin/groups/mail/class_groupMail.inc:839
+#: admin/groups/mail/class_groupMail.inc:984
 #: personal/mail/class_mailAccount.inc:50
 #: personal/mail/class_mailAccount.inc:244
 #: personal/mail/class_mailAccount.inc:252
 #: personal/mail/class_mailAccount.inc:254
 #: personal/mail/class_mailAccount.inc:259
 #: personal/mail/class_mailAccount.inc:261
-#: personal/mail/class_mailAccount.inc:1054
-#: personal/mail/class_mailAccount.inc:1263
-#: personal/mail/class_mailAccount.inc:1429
+#: personal/mail/class_mailAccount.inc:1065
+#: personal/mail/class_mailAccount.inc:1290
+#: personal/mail/class_mailAccount.inc:1456
 msgid "Mail"
 msgstr "Poczta"
 
@@ -97,9 +97,9 @@ msgstr "Grupa pocztowa"
 msgid "Mail distribution list"
 msgstr "Pocztowa lista dystrybucyjna"
 
-#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:845
+#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:849
 #: admin/groups/mail/mail.tpl:7 admin/groups/mail/paste_mail.tpl:8
-#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1066
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1077
 #: personal/mail/copypaste.tpl:7
 msgid "Primary address"
 msgstr "Adres podstawowy"
@@ -119,22 +119,22 @@ msgstr "Proszę podać prawidłową nazwę."
 #: admin/groups/mail/class_groupMail.inc:140
 #: admin/groups/mail/class_groupMail.inc:145
 #: admin/groups/mail/class_groupMail.inc:148
-#: admin/groups/mail/class_groupMail.inc:550
 #: admin/groups/mail/class_groupMail.inc:554
 #: admin/groups/mail/class_groupMail.inc:558
-#: admin/groups/mail/class_groupMail.inc:780
+#: admin/groups/mail/class_groupMail.inc:562
 #: admin/groups/mail/class_groupMail.inc:784
 #: admin/groups/mail/class_groupMail.inc:788
-#: admin/groups/mail/class_groupMail.inc:797
+#: admin/groups/mail/class_groupMail.inc:792
+#: admin/groups/mail/class_groupMail.inc:801
 #: personal/mail/class_mailAccount.inc:147
 #: personal/mail/class_mailAccount.inc:154
 #: personal/mail/class_mailAccount.inc:159
 #: personal/mail/class_mailAccount.inc:162
-#: personal/mail/class_mailAccount.inc:898
-#: personal/mail/class_mailAccount.inc:902
-#: personal/mail/class_mailAccount.inc:976
-#: personal/mail/class_mailAccount.inc:980
-#: personal/mail/class_mailAccount.inc:984
+#: personal/mail/class_mailAccount.inc:907
+#: personal/mail/class_mailAccount.inc:911
+#: personal/mail/class_mailAccount.inc:985
+#: personal/mail/class_mailAccount.inc:989
+#: personal/mail/class_mailAccount.inc:993
 #, fuzzy
 msgid "Mail error"
 msgstr "Serwer pocztowy"
@@ -162,11 +162,11 @@ msgid "Cannot receive folder permissions: %s"
 msgstr "Współdzielone foldery IMAP"
 
 #: admin/groups/mail/class_groupMail.inc:145
-#: admin/groups/mail/class_groupMail.inc:550
-#: admin/groups/mail/class_groupMail.inc:780
+#: admin/groups/mail/class_groupMail.inc:554
+#: admin/groups/mail/class_groupMail.inc:784
 #: personal/mail/class_mailAccount.inc:159
-#: personal/mail/class_mailAccount.inc:898
-#: personal/mail/class_mailAccount.inc:976
+#: personal/mail/class_mailAccount.inc:907
+#: personal/mail/class_mailAccount.inc:985
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -193,7 +193,7 @@ msgstr ""
 #: admin/groups/mail/class_groupMail.inc:368
 #: admin/groups/mail/class_groupMail.inc:397
 #: admin/groups/mail/class_groupMail.inc:403
-#: admin/groups/mail/class_groupMail.inc:412
+#: admin/groups/mail/class_groupMail.inc:417
 #: admin/systems/services/spam/class_goSpamServer.inc:143
 #: admin/systems/services/spam/class_goSpamServer.inc:216
 #: addons/mailqueue/class_mailqueue.inc:110
@@ -210,7 +210,7 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:334
 #: personal/mail/class_mailAccount.inc:363
 #: personal/mail/class_mailAccount.inc:368
-#: personal/mail/class_mailAccount.inc:375
+#: personal/mail/class_mailAccount.inc:381
 msgid "Error"
 msgstr "Błąd"
 
@@ -227,97 +227,105 @@ msgid "Cannot add primary address to the list of forwarders!"
 msgstr "Próbujesz dodać błędny adres email do listy przekazywanych."
 
 #: admin/groups/mail/class_groupMail.inc:413
-#: personal/mail/class_mailAccount.inc:376
+#: personal/mail/class_mailAccount.inc:377
+#: personal/mail/class_mailAccount.inc:1099
+#, fuzzy, php-format
+msgid "Address is already in use by group '%s'."
+msgstr "Adres który próbujesz dodać jest już używany"
+
+#: admin/groups/mail/class_groupMail.inc:415
+#: personal/mail/class_mailAccount.inc:379
+#: personal/mail/class_mailAccount.inc:1101
 #, fuzzy, php-format
 msgid "Address is already in use by user '%s'."
 msgstr "Adres który próbujesz dodać jest już używany"
 
-#: admin/groups/mail/class_groupMail.inc:554
-#: personal/mail/class_mailAccount.inc:902
+#: admin/groups/mail/class_groupMail.inc:558
+#: personal/mail/class_mailAccount.inc:911
 #, fuzzy, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "Nie można usunąć konta IMAP. Odpowiedź serwera '%s'."
 
-#: admin/groups/mail/class_groupMail.inc:558
-#: admin/groups/mail/class_groupMail.inc:797
+#: admin/groups/mail/class_groupMail.inc:562
+#: admin/groups/mail/class_groupMail.inc:801
 #, fuzzy, php-format
 msgid "Cannot update shared folder permissions: %s"
 msgstr "Współdzielone foldery IMAP"
 
-#: admin/groups/mail/class_groupMail.inc:656
+#: admin/groups/mail/class_groupMail.inc:660
 #, fuzzy
 msgid "New"
 msgstr "Dodaj użytkownika"
 
-#: admin/groups/mail/class_groupMail.inc:784
-#: personal/mail/class_mailAccount.inc:980
+#: admin/groups/mail/class_groupMail.inc:788
+#: personal/mail/class_mailAccount.inc:989
 #, fuzzy, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "Nie można utworzyć konta IMAP. Odpowiedź serwera '%s'."
 
-#: admin/groups/mail/class_groupMail.inc:788
-#: personal/mail/class_mailAccount.inc:984
+#: admin/groups/mail/class_groupMail.inc:792
+#: personal/mail/class_mailAccount.inc:993
 #, fuzzy, php-format
 msgid "Cannot write quota settings: %s"
 msgstr "Nie można stworzyć pliku '%s'."
 
-#: admin/groups/mail/class_groupMail.inc:829
+#: admin/groups/mail/class_groupMail.inc:833
 #, php-format
 msgid ""
 "The group 'cn' has changed. It can't be changed due to the fact that mail "
 "method '%s' relies on it!"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:854
-#: admin/groups/mail/class_groupMail.inc:989 admin/groups/mail/mail.tpl:60
-#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1093
-#: personal/mail/class_mailAccount.inc:1269
-#: personal/mail/class_mailAccount.inc:1441
+#: admin/groups/mail/class_groupMail.inc:858
+#: admin/groups/mail/class_groupMail.inc:993 admin/groups/mail/mail.tpl:60
+#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1111
+#: personal/mail/class_mailAccount.inc:1296
+#: personal/mail/class_mailAccount.inc:1468
 msgid "Quota size"
 msgstr "Rozmiar Quoty"
 
-#: admin/groups/mail/class_groupMail.inc:873
-#: personal/mail/class_mailAccount.inc:1453
+#: admin/groups/mail/class_groupMail.inc:877
+#: personal/mail/class_mailAccount.inc:1480
 msgid "Mail max size"
 msgstr "Max rozmiar poczty"
 
-#: admin/groups/mail/class_groupMail.inc:881
+#: admin/groups/mail/class_groupMail.inc:885
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr "Należy ustawić maksymalny rozmiar poczty aby odrzucać cokolwiek."
 
-#: admin/groups/mail/class_groupMail.inc:885
-#: admin/groups/mail/class_groupMail.inc:990
-#: personal/mail/class_mailAccount.inc:1440
+#: admin/groups/mail/class_groupMail.inc:889
+#: admin/groups/mail/class_groupMail.inc:994
+#: personal/mail/class_mailAccount.inc:1467
 msgid "Mail server"
 msgstr "Serwer pocztowy"
 
-#: admin/groups/mail/class_groupMail.inc:981
+#: admin/groups/mail/class_groupMail.inc:985
 msgid "Group mail"
 msgstr "Grupa poczta"
 
-#: admin/groups/mail/class_groupMail.inc:991 admin/groups/mail/mail.tpl:73
+#: admin/groups/mail/class_groupMail.inc:995 admin/groups/mail/mail.tpl:73
 #, fuzzy
 msgid "Folder type"
 msgstr "Filtr"
 
-#: admin/groups/mail/class_groupMail.inc:991
+#: admin/groups/mail/class_groupMail.inc:995
 msgid "Kolab"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:992
+#: admin/groups/mail/class_groupMail.inc:996
 msgid "Alternate addresses"
 msgstr "Adresy alternatywne"
 
-#: admin/groups/mail/class_groupMail.inc:993
+#: admin/groups/mail/class_groupMail.inc:997
 msgid "Forwarding addresses"
 msgstr "Adresy przekazywane"
 
-#: admin/groups/mail/class_groupMail.inc:994
+#: admin/groups/mail/class_groupMail.inc:998
 #, fuzzy
 msgid "Only local"
 msgstr "Dodaj lokalne"
 
-#: admin/groups/mail/class_groupMail.inc:995
+#: admin/groups/mail/class_groupMail.inc:999
 msgid "Permissions"
 msgstr "Uprawnienia"
 
@@ -452,7 +460,7 @@ msgstr "Wybierz departament"
 msgid "Choose"
 msgstr "Wybierz"
 
-#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1430
+#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1457
 #: personal/mail/copypaste.tpl:1
 msgid "Mail settings"
 msgstr "Ustawienia pocztowe"
@@ -1152,7 +1160,7 @@ msgstr "nagłówek"
 msgid "Display header of this message"
 msgstr "Wyświetl nagłówek tej wiadomości"
 
-#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1461
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1488
 msgid "Use custom sieve script"
 msgstr "Użyj własnego skryptu SIEVE"
 
@@ -1182,8 +1190,8 @@ msgstr "Zaznacz aby automatycznie wysyłać autoodpowiedź zdefiniowaną poniże
 msgid "Activate vacation message"
 msgstr "Włącz autoresponder"
 
-#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1122
-#: personal/mail/class_mailAccount.inc:1293
+#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1140
+#: personal/mail/class_mailAccount.inc:1320
 #, fuzzy
 msgid "from"
 msgstr "losowy"
@@ -1222,7 +1230,7 @@ msgstr "MB"
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
-#: personal/mail/class_mailAccount.inc:1444
+#: personal/mail/class_mailAccount.inc:1471
 msgid "Vacation message"
 msgstr "Treść autorespondera"
 
@@ -1255,39 +1263,51 @@ msgstr "błąd LDAP:"
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr "Nie można usunąć konta IMAP. Odpowiedź serwera '%s'."
 
-#: personal/mail/class_mail-methods-cyrus.inc:358
-#: personal/mail/class_mail-methods-cyrus.inc:395
+#: personal/mail/class_mail-methods-cyrus.inc:298
+#, fuzzy
+msgid "Mail info"
+msgstr "Właściciel pliku"
+
+#: personal/mail/class_mail-methods-cyrus.inc:299
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/class_mail-methods-cyrus.inc:383
+#: personal/mail/class_mail-methods-cyrus.inc:420
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:447
+#: personal/mail/class_mail-methods-cyrus.inc:472
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Plik '%s' nie istnieje!"
 
-#: personal/mail/class_mail-methods-cyrus.inc:448
+#: personal/mail/class_mail-methods-cyrus.inc:473
 msgid "The sieve script may not be written correctly."
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:449
+#: personal/mail/class_mail-methods-cyrus.inc:474
 #: personal/mail/sieve/class_My_Tree.inc:245
 #: personal/mail/sieve/templates/remove_script.tpl:2
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: personal/mail/class_mail-methods-cyrus.inc:487
+#: personal/mail/class_mail-methods-cyrus.inc:512
 #: personal/mail/sieve/class_sieveManagement.inc:309
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:576
+#: personal/mail/class_mail-methods-cyrus.inc:601
 #: personal/mail/sieve/class_sieveManagement.inc:1043
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:583
+#: personal/mail/class_mail-methods-cyrus.inc:608
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
@@ -2236,113 +2256,113 @@ msgstr ""
 msgid "User mail settings"
 msgstr "Ustawienia poczty użytkownika"
 
-#: personal/mail/class_mailAccount.inc:609
+#: personal/mail/class_mailAccount.inc:615
 #: personal/mail/class_mail-methods.inc:140
 #: personal/mail/class_mail-methods.inc:485
 #, fuzzy
 msgid "Configuration error"
 msgstr "Plik konfiguracyjny"
 
-#: personal/mail/class_mailAccount.inc:609
+#: personal/mail/class_mailAccount.inc:615
 #, fuzzy, php-format
 msgid "No DESC tag in vacation template '%s'!"
 msgstr "Brak znacznika DESC w pliku autorespondera"
 
-#: personal/mail/class_mailAccount.inc:638
-#: personal/mail/class_mailAccount.inc:651
-#: personal/mail/class_mailAccount.inc:682
-#: personal/mail/class_mailAccount.inc:695
+#: personal/mail/class_mailAccount.inc:644
+#: personal/mail/class_mailAccount.inc:657
+#: personal/mail/class_mailAccount.inc:691
+#: personal/mail/class_mailAccount.inc:704
 #, fuzzy
 msgid "Permission error"
 msgstr "Uprawnienia"
 
-#: personal/mail/class_mailAccount.inc:638
-#: personal/mail/class_mailAccount.inc:651
-#: personal/mail/class_mailAccount.inc:682
-#: personal/mail/class_mailAccount.inc:695
+#: personal/mail/class_mailAccount.inc:644
+#: personal/mail/class_mailAccount.inc:657
+#: personal/mail/class_mailAccount.inc:691
+#: personal/mail/class_mailAccount.inc:704
 #, fuzzy
 msgid "You have no permission to modify these addresses!"
 msgstr "Brak uprawnień do usunięcia tego departamentu."
 
-#: personal/mail/class_mailAccount.inc:729
-#: personal/mail/class_mailAccount.inc:732
+#: personal/mail/class_mailAccount.inc:738
+#: personal/mail/class_mailAccount.inc:741
 #, fuzzy
 msgid "unknown"
 msgstr "Nieznane"
 
-#: personal/mail/class_mailAccount.inc:998
+#: personal/mail/class_mailAccount.inc:1007
 #, fuzzy
 msgid "Mail error saving sieve settings"
 msgstr "Użyj własnego skryptu SIEVE"
 
-#: personal/mail/class_mailAccount.inc:1102
-#: personal/mail/class_mailAccount.inc:1110
-#: personal/mail/class_mailAccount.inc:1278
+#: personal/mail/class_mailAccount.inc:1120
+#: personal/mail/class_mailAccount.inc:1128
+#: personal/mail/class_mailAccount.inc:1305
 #, fuzzy
 msgid "Mail reject size"
 msgstr "Max rozmiar poczty"
 
-#: personal/mail/class_mailAccount.inc:1114
-#: personal/mail/class_mailAccount.inc:1285
+#: personal/mail/class_mailAccount.inc:1132
+#: personal/mail/class_mailAccount.inc:1312
 #, fuzzy
 msgid "Spam folder"
 msgstr "do folferu"
 
-#: personal/mail/class_mailAccount.inc:1126
-#: personal/mail/class_mailAccount.inc:1297
+#: personal/mail/class_mailAccount.inc:1144
+#: personal/mail/class_mailAccount.inc:1324
 msgid "to"
 msgstr "do"
 
-#: personal/mail/class_mailAccount.inc:1137
-#: personal/mail/class_mailAccount.inc:1308
+#: personal/mail/class_mailAccount.inc:1155
+#: personal/mail/class_mailAccount.inc:1335
 #, fuzzy
 msgid "Vacation interval"
 msgstr "Treść autorespondera"
 
-#: personal/mail/class_mailAccount.inc:1434
+#: personal/mail/class_mailAccount.inc:1461
 msgid "My account"
 msgstr "Moje konto "
 
-#: personal/mail/class_mailAccount.inc:1443
+#: personal/mail/class_mailAccount.inc:1470
 msgid "Add vacation information"
 msgstr "Dodaj informacje autorespondera"
 
-#: personal/mail/class_mailAccount.inc:1446
+#: personal/mail/class_mailAccount.inc:1473
 msgid "Use spam filter"
 msgstr "Użyj filtra spamu"
 
-#: personal/mail/class_mailAccount.inc:1447
+#: personal/mail/class_mailAccount.inc:1474
 msgid "Spam level"
 msgstr "Poziom spamu"
 
-#: personal/mail/class_mailAccount.inc:1448
+#: personal/mail/class_mailAccount.inc:1475
 msgid "Spam mail box"
 msgstr "Skrzynpa spamowa"
 
-#: personal/mail/class_mailAccount.inc:1450
+#: personal/mail/class_mailAccount.inc:1477
 #, fuzzy
 msgid "Sieve management"
 msgstr "Zarządzanie"
 
-#: personal/mail/class_mailAccount.inc:1452
+#: personal/mail/class_mailAccount.inc:1479
 msgid "Reject due to mailsize"
 msgstr "Odrzuć z powodu rozmiaru wiadomości"
 
-#: personal/mail/class_mailAccount.inc:1455
-#: personal/mail/class_mailAccount.inc:1460
+#: personal/mail/class_mailAccount.inc:1482
+#: personal/mail/class_mailAccount.inc:1487
 msgid "Forwarding address"
 msgstr "Adresy przekazywane"
 
-#: personal/mail/class_mailAccount.inc:1456
+#: personal/mail/class_mailAccount.inc:1483
 msgid "Local delivery"
 msgstr "Lokalne dostarczanie"
 
-#: personal/mail/class_mailAccount.inc:1457
+#: personal/mail/class_mailAccount.inc:1484
 #, fuzzy
 msgid "No delivery to own mailbox "
 msgstr "Nie dostarczaj do własnej skrzynki"
 
-#: personal/mail/class_mailAccount.inc:1458
+#: personal/mail/class_mailAccount.inc:1485
 msgid "Mail alternative addresses"
 msgstr "Adresy alternatywne"
 
diff --git a/gosa-plugins/mail/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/mail/locale/ru/LC_MESSAGES/messages.po
index 312c2070d..0b1dbf5b5 100644
--- a/gosa-plugins/mail/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mail/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -34,18 +34,18 @@ msgstr "Создать настройки запись эл. почты"
 #: admin/groups/mail/class_groupMail.inc:362
 #: admin/groups/mail/class_groupMail.inc:397
 #: admin/groups/mail/class_groupMail.inc:403
-#: admin/groups/mail/class_groupMail.inc:412
-#: admin/groups/mail/class_groupMail.inc:847
-#: admin/groups/mail/class_groupMail.inc:867
-#: admin/groups/mail/class_groupMail.inc:988
+#: admin/groups/mail/class_groupMail.inc:417
+#: admin/groups/mail/class_groupMail.inc:851
+#: admin/groups/mail/class_groupMail.inc:871
+#: admin/groups/mail/class_groupMail.inc:992
 #: personal/mail/class_mailAccount.inc:328
 #: personal/mail/class_mailAccount.inc:363
 #: personal/mail/class_mailAccount.inc:368
-#: personal/mail/class_mailAccount.inc:375
-#: personal/mail/class_mailAccount.inc:1070
-#: personal/mail/class_mailAccount.inc:1074
+#: personal/mail/class_mailAccount.inc:381
+#: personal/mail/class_mailAccount.inc:1081
 #: personal/mail/class_mailAccount.inc:1085
-#: personal/mail/class_mailAccount.inc:1439
+#: personal/mail/class_mailAccount.inc:1103
+#: personal/mail/class_mailAccount.inc:1466
 #, fuzzy
 msgid "Mail address"
 msgstr "MAC-адрес"
@@ -56,14 +56,14 @@ msgstr ""
 
 #: admin/ogroups/mail/class_mailogroup.inc:120
 #: admin/ogroups/mail/class_mailogroup.inc:157
-#: admin/groups/mail/class_groupMail.inc:538
-#: admin/groups/mail/class_groupMail.inc:767
+#: admin/groups/mail/class_groupMail.inc:542
+#: admin/groups/mail/class_groupMail.inc:771
 #: admin/systems/services/imap/class_goImapServer.inc:190
 #: admin/systems/services/mail/class_goMailServer.inc:582
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/spam/class_goSpamServer.inc:277
-#: personal/mail/class_mailAccount.inc:889
-#: personal/mail/class_mailAccount.inc:962
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:971
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
@@ -76,17 +76,17 @@ msgstr "Ошибка LDAP:"
 #: admin/groups/mail/class_groupMail.inc:292
 #: admin/groups/mail/class_groupMail.inc:294
 #: admin/groups/mail/class_groupMail.inc:295
-#: admin/groups/mail/class_groupMail.inc:835
-#: admin/groups/mail/class_groupMail.inc:980
+#: admin/groups/mail/class_groupMail.inc:839
+#: admin/groups/mail/class_groupMail.inc:984
 #: personal/mail/class_mailAccount.inc:50
 #: personal/mail/class_mailAccount.inc:244
 #: personal/mail/class_mailAccount.inc:252
 #: personal/mail/class_mailAccount.inc:254
 #: personal/mail/class_mailAccount.inc:259
 #: personal/mail/class_mailAccount.inc:261
-#: personal/mail/class_mailAccount.inc:1054
-#: personal/mail/class_mailAccount.inc:1263
-#: personal/mail/class_mailAccount.inc:1429
+#: personal/mail/class_mailAccount.inc:1065
+#: personal/mail/class_mailAccount.inc:1290
+#: personal/mail/class_mailAccount.inc:1456
 msgid "Mail"
 msgstr "Почта"
 
@@ -100,9 +100,9 @@ msgstr "Основная группа"
 msgid "Mail distribution list"
 msgstr "Почтовые настройки пользователя"
 
-#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:845
+#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:849
 #: admin/groups/mail/mail.tpl:7 admin/groups/mail/paste_mail.tpl:8
-#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1066
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1077
 #: personal/mail/copypaste.tpl:7
 msgid "Primary address"
 msgstr "Основной адрес"
@@ -123,22 +123,22 @@ msgstr "Введите корректный серийный номер"
 #: admin/groups/mail/class_groupMail.inc:140
 #: admin/groups/mail/class_groupMail.inc:145
 #: admin/groups/mail/class_groupMail.inc:148
-#: admin/groups/mail/class_groupMail.inc:550
 #: admin/groups/mail/class_groupMail.inc:554
 #: admin/groups/mail/class_groupMail.inc:558
-#: admin/groups/mail/class_groupMail.inc:780
+#: admin/groups/mail/class_groupMail.inc:562
 #: admin/groups/mail/class_groupMail.inc:784
 #: admin/groups/mail/class_groupMail.inc:788
-#: admin/groups/mail/class_groupMail.inc:797
+#: admin/groups/mail/class_groupMail.inc:792
+#: admin/groups/mail/class_groupMail.inc:801
 #: personal/mail/class_mailAccount.inc:147
 #: personal/mail/class_mailAccount.inc:154
 #: personal/mail/class_mailAccount.inc:159
 #: personal/mail/class_mailAccount.inc:162
-#: personal/mail/class_mailAccount.inc:898
-#: personal/mail/class_mailAccount.inc:902
-#: personal/mail/class_mailAccount.inc:976
-#: personal/mail/class_mailAccount.inc:980
-#: personal/mail/class_mailAccount.inc:984
+#: personal/mail/class_mailAccount.inc:907
+#: personal/mail/class_mailAccount.inc:911
+#: personal/mail/class_mailAccount.inc:985
+#: personal/mail/class_mailAccount.inc:989
+#: personal/mail/class_mailAccount.inc:993
 #, fuzzy
 msgid "Mail error"
 msgstr "Сервер"
@@ -166,11 +166,11 @@ msgid "Cannot receive folder permissions: %s"
 msgstr "Общие папки IMAP"
 
 #: admin/groups/mail/class_groupMail.inc:145
-#: admin/groups/mail/class_groupMail.inc:550
-#: admin/groups/mail/class_groupMail.inc:780
+#: admin/groups/mail/class_groupMail.inc:554
+#: admin/groups/mail/class_groupMail.inc:784
 #: personal/mail/class_mailAccount.inc:159
-#: personal/mail/class_mailAccount.inc:898
-#: personal/mail/class_mailAccount.inc:976
+#: personal/mail/class_mailAccount.inc:907
+#: personal/mail/class_mailAccount.inc:985
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -197,7 +197,7 @@ msgstr ""
 #: admin/groups/mail/class_groupMail.inc:368
 #: admin/groups/mail/class_groupMail.inc:397
 #: admin/groups/mail/class_groupMail.inc:403
-#: admin/groups/mail/class_groupMail.inc:412
+#: admin/groups/mail/class_groupMail.inc:417
 #: admin/systems/services/spam/class_goSpamServer.inc:143
 #: admin/systems/services/spam/class_goSpamServer.inc:216
 #: addons/mailqueue/class_mailqueue.inc:110
@@ -214,7 +214,7 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:334
 #: personal/mail/class_mailAccount.inc:363
 #: personal/mail/class_mailAccount.inc:368
-#: personal/mail/class_mailAccount.inc:375
+#: personal/mail/class_mailAccount.inc:381
 msgid "Error"
 msgstr ""
 
@@ -233,102 +233,110 @@ msgstr ""
 "кому должны пересылаться сообщения."
 
 #: admin/groups/mail/class_groupMail.inc:413
-#: personal/mail/class_mailAccount.inc:376
+#: personal/mail/class_mailAccount.inc:377
+#: personal/mail/class_mailAccount.inc:1099
+#, fuzzy, php-format
+msgid "Address is already in use by group '%s'."
+msgstr "Добавляемый вами адрес уже используется пользователем"
+
+#: admin/groups/mail/class_groupMail.inc:415
+#: personal/mail/class_mailAccount.inc:379
+#: personal/mail/class_mailAccount.inc:1101
 #, fuzzy, php-format
 msgid "Address is already in use by user '%s'."
 msgstr "Добавляемый вами адрес уже используется пользователем"
 
-#: admin/groups/mail/class_groupMail.inc:554
-#: personal/mail/class_mailAccount.inc:902
+#: admin/groups/mail/class_groupMail.inc:558
+#: personal/mail/class_mailAccount.inc:911
 #, fuzzy, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "Не удается удалить почтовый ящик IMAP. Ответ сервера: '%s'."
 
-#: admin/groups/mail/class_groupMail.inc:558
-#: admin/groups/mail/class_groupMail.inc:797
+#: admin/groups/mail/class_groupMail.inc:562
+#: admin/groups/mail/class_groupMail.inc:801
 #, fuzzy, php-format
 msgid "Cannot update shared folder permissions: %s"
 msgstr "Общие папки IMAP"
 
-#: admin/groups/mail/class_groupMail.inc:656
+#: admin/groups/mail/class_groupMail.inc:660
 #, fuzzy
 msgid "New"
 msgstr "Пользователи домена"
 
-#: admin/groups/mail/class_groupMail.inc:784
-#: personal/mail/class_mailAccount.inc:980
+#: admin/groups/mail/class_groupMail.inc:788
+#: personal/mail/class_mailAccount.inc:989
 #, fuzzy, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "Не удается создать почтовый ящик IMAP. Ответ сервера: \"%s\"."
 
-#: admin/groups/mail/class_groupMail.inc:788
-#: personal/mail/class_mailAccount.inc:984
+#: admin/groups/mail/class_groupMail.inc:792
+#: personal/mail/class_mailAccount.inc:993
 #, fuzzy, php-format
 msgid "Cannot write quota settings: %s"
 msgstr "Удалить"
 
-#: admin/groups/mail/class_groupMail.inc:829
+#: admin/groups/mail/class_groupMail.inc:833
 #, php-format
 msgid ""
 "The group 'cn' has changed. It can't be changed due to the fact that mail "
 "method '%s' relies on it!"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:854
-#: admin/groups/mail/class_groupMail.inc:989 admin/groups/mail/mail.tpl:60
-#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1093
-#: personal/mail/class_mailAccount.inc:1269
-#: personal/mail/class_mailAccount.inc:1441
+#: admin/groups/mail/class_groupMail.inc:858
+#: admin/groups/mail/class_groupMail.inc:993 admin/groups/mail/mail.tpl:60
+#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1111
+#: personal/mail/class_mailAccount.inc:1296
+#: personal/mail/class_mailAccount.inc:1468
 msgid "Quota size"
 msgstr "Размер квоты"
 
-#: admin/groups/mail/class_groupMail.inc:873
-#: personal/mail/class_mailAccount.inc:1453
+#: admin/groups/mail/class_groupMail.inc:877
+#: personal/mail/class_mailAccount.inc:1480
 #, fuzzy
 msgid "Mail max size"
 msgstr "Размер квоты"
 
-#: admin/groups/mail/class_groupMail.inc:881
+#: admin/groups/mail/class_groupMail.inc:885
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr "Помните, что указывать нужно максимальный допустимый размер сообщений."
 
-#: admin/groups/mail/class_groupMail.inc:885
-#: admin/groups/mail/class_groupMail.inc:990
-#: personal/mail/class_mailAccount.inc:1440
+#: admin/groups/mail/class_groupMail.inc:889
+#: admin/groups/mail/class_groupMail.inc:994
+#: personal/mail/class_mailAccount.inc:1467
 #, fuzzy
 msgid "Mail server"
 msgstr "Сервер"
 
-#: admin/groups/mail/class_groupMail.inc:981
+#: admin/groups/mail/class_groupMail.inc:985
 #, fuzzy
 msgid "Group mail"
 msgstr "Группа"
 
-#: admin/groups/mail/class_groupMail.inc:991 admin/groups/mail/mail.tpl:73
+#: admin/groups/mail/class_groupMail.inc:995 admin/groups/mail/mail.tpl:73
 #, fuzzy
 msgid "Folder type"
 msgstr "Фильтр"
 
-#: admin/groups/mail/class_groupMail.inc:991
+#: admin/groups/mail/class_groupMail.inc:995
 msgid "Kolab"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:992
+#: admin/groups/mail/class_groupMail.inc:996
 #, fuzzy
 msgid "Alternate addresses"
 msgstr "Альтернативные адреса"
 
-#: admin/groups/mail/class_groupMail.inc:993
+#: admin/groups/mail/class_groupMail.inc:997
 #, fuzzy
 msgid "Forwarding addresses"
 msgstr "Основной адрес"
 
-#: admin/groups/mail/class_groupMail.inc:994
+#: admin/groups/mail/class_groupMail.inc:998
 #, fuzzy
 msgid "Only local"
 msgstr "Добавить локально"
 
-#: admin/groups/mail/class_groupMail.inc:995
+#: admin/groups/mail/class_groupMail.inc:999
 #, fuzzy
 msgid "Permissions"
 msgstr "Права для членов группы"
@@ -466,7 +474,7 @@ msgstr "Выберите подразделение."
 msgid "Choose"
 msgstr "Выбрать"
 
-#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1430
+#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1457
 #: personal/mail/copypaste.tpl:1
 #, fuzzy
 msgid "Mail settings"
@@ -1209,7 +1217,7 @@ msgstr "Отправитель"
 msgid "Display header of this message"
 msgstr "Показать совпадения номеров"
 
-#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1461
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1488
 msgid "Use custom sieve script"
 msgstr "Использовать другой сценарий SIEVE"
 
@@ -1239,8 +1247,8 @@ msgstr "Выберите, чтобы включить автоответчик 
 msgid "Activate vacation message"
 msgstr "Включить автоответчик"
 
-#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1122
-#: personal/mail/class_mailAccount.inc:1293
+#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1140
+#: personal/mail/class_mailAccount.inc:1320
 #, fuzzy
 msgid "from"
 msgstr "и"
@@ -1281,7 +1289,7 @@ msgstr "Мб"
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
-#: personal/mail/class_mailAccount.inc:1444
+#: personal/mail/class_mailAccount.inc:1471
 msgid "Vacation message"
 msgstr "Сообщение автоответчика"
 
@@ -1313,39 +1321,51 @@ msgstr "Ошибка LDAP:"
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr "Не удается удалить почтовый ящик IMAP. Ответ сервера: '%s'."
 
-#: personal/mail/class_mail-methods-cyrus.inc:358
-#: personal/mail/class_mail-methods-cyrus.inc:395
+#: personal/mail/class_mail-methods-cyrus.inc:298
+#, fuzzy
+msgid "Mail info"
+msgstr "Имя сервера"
+
+#: personal/mail/class_mail-methods-cyrus.inc:299
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/class_mail-methods-cyrus.inc:383
+#: personal/mail/class_mail-methods-cyrus.inc:420
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:447
+#: personal/mail/class_mail-methods-cyrus.inc:472
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:448
+#: personal/mail/class_mail-methods-cyrus.inc:473
 msgid "The sieve script may not be written correctly."
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:449
+#: personal/mail/class_mail-methods-cyrus.inc:474
 #: personal/mail/sieve/class_My_Tree.inc:245
 #: personal/mail/sieve/templates/remove_script.tpl:2
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: personal/mail/class_mail-methods-cyrus.inc:487
+#: personal/mail/class_mail-methods-cyrus.inc:512
 #: personal/mail/sieve/class_sieveManagement.inc:309
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:576
+#: personal/mail/class_mail-methods-cyrus.inc:601
 #: personal/mail/sieve/class_sieveManagement.inc:1043
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:583
+#: personal/mail/class_mail-methods-cyrus.inc:608
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
@@ -2303,120 +2323,120 @@ msgstr ""
 msgid "User mail settings"
 msgstr "Почтовые настройки пользователя"
 
-#: personal/mail/class_mailAccount.inc:609
+#: personal/mail/class_mailAccount.inc:615
 #: personal/mail/class_mail-methods.inc:140
 #: personal/mail/class_mail-methods.inc:485
 #, fuzzy
 msgid "Configuration error"
 msgstr "Настроить"
 
-#: personal/mail/class_mailAccount.inc:609
+#: personal/mail/class_mailAccount.inc:615
 #, fuzzy, php-format
 msgid "No DESC tag in vacation template '%s'!"
 msgstr "В файле сообщения автоответчика отсутствует тег DESC:"
 
-#: personal/mail/class_mailAccount.inc:638
-#: personal/mail/class_mailAccount.inc:651
-#: personal/mail/class_mailAccount.inc:682
-#: personal/mail/class_mailAccount.inc:695
+#: personal/mail/class_mailAccount.inc:644
+#: personal/mail/class_mailAccount.inc:657
+#: personal/mail/class_mailAccount.inc:691
+#: personal/mail/class_mailAccount.inc:704
 #, fuzzy
 msgid "Permission error"
 msgstr "Права для членов группы"
 
-#: personal/mail/class_mailAccount.inc:638
-#: personal/mail/class_mailAccount.inc:651
-#: personal/mail/class_mailAccount.inc:682
-#: personal/mail/class_mailAccount.inc:695
+#: personal/mail/class_mailAccount.inc:644
+#: personal/mail/class_mailAccount.inc:657
+#: personal/mail/class_mailAccount.inc:691
+#: personal/mail/class_mailAccount.inc:704
 #, fuzzy
 msgid "You have no permission to modify these addresses!"
 msgstr "У вас недостаточно прав для удаления этого подразделения."
 
-#: personal/mail/class_mailAccount.inc:729
-#: personal/mail/class_mailAccount.inc:732
+#: personal/mail/class_mailAccount.inc:738
+#: personal/mail/class_mailAccount.inc:741
 #, fuzzy
 msgid "unknown"
 msgstr "состояние неизвестно"
 
-#: personal/mail/class_mailAccount.inc:998
+#: personal/mail/class_mailAccount.inc:1007
 #, fuzzy
 msgid "Mail error saving sieve settings"
 msgstr "Использовать другой сценарий SIEVE"
 
-#: personal/mail/class_mailAccount.inc:1102
-#: personal/mail/class_mailAccount.inc:1110
-#: personal/mail/class_mailAccount.inc:1278
+#: personal/mail/class_mailAccount.inc:1120
+#: personal/mail/class_mailAccount.inc:1128
+#: personal/mail/class_mailAccount.inc:1305
 #, fuzzy
 msgid "Mail reject size"
 msgstr "Размер квоты"
 
-#: personal/mail/class_mailAccount.inc:1114
-#: personal/mail/class_mailAccount.inc:1285
+#: personal/mail/class_mailAccount.inc:1132
+#: personal/mail/class_mailAccount.inc:1312
 #, fuzzy
 msgid "Spam folder"
 msgstr "в папку"
 
-#: personal/mail/class_mailAccount.inc:1126
-#: personal/mail/class_mailAccount.inc:1297
+#: personal/mail/class_mailAccount.inc:1144
+#: personal/mail/class_mailAccount.inc:1324
 #, fuzzy
 msgid "to"
 msgstr "Отношение"
 
-#: personal/mail/class_mailAccount.inc:1137
-#: personal/mail/class_mailAccount.inc:1308
+#: personal/mail/class_mailAccount.inc:1155
+#: personal/mail/class_mailAccount.inc:1335
 #, fuzzy
 msgid "Vacation interval"
 msgstr "Сообщение автоответчика"
 
-#: personal/mail/class_mailAccount.inc:1434
+#: personal/mail/class_mailAccount.inc:1461
 msgid "My account"
 msgstr "Моя учетная запись"
 
-#: personal/mail/class_mailAccount.inc:1443
+#: personal/mail/class_mailAccount.inc:1470
 #, fuzzy
 msgid "Add vacation information"
 msgstr "Информация об организации"
 
-#: personal/mail/class_mailAccount.inc:1446
+#: personal/mail/class_mailAccount.inc:1473
 msgid "Use spam filter"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1447
+#: personal/mail/class_mailAccount.inc:1474
 #, fuzzy
 msgid "Spam level"
 msgstr "Уровень информативности"
 
-#: personal/mail/class_mailAccount.inc:1448
+#: personal/mail/class_mailAccount.inc:1475
 #, fuzzy
 msgid "Spam mail box"
 msgstr "Размер квоты"
 
-#: personal/mail/class_mailAccount.inc:1450
+#: personal/mail/class_mailAccount.inc:1477
 #, fuzzy
 msgid "Sieve management"
 msgstr "Название"
 
-#: personal/mail/class_mailAccount.inc:1452
+#: personal/mail/class_mailAccount.inc:1479
 #, fuzzy
 msgid "Reject due to mailsize"
 msgstr "Отклонять сообщения размером больше"
 
-#: personal/mail/class_mailAccount.inc:1455
-#: personal/mail/class_mailAccount.inc:1460
+#: personal/mail/class_mailAccount.inc:1482
+#: personal/mail/class_mailAccount.inc:1487
 #, fuzzy
 msgid "Forwarding address"
 msgstr "Основной адрес"
 
-#: personal/mail/class_mailAccount.inc:1456
+#: personal/mail/class_mailAccount.inc:1483
 #, fuzzy
 msgid "Local delivery"
 msgstr "Последняя доставка"
 
-#: personal/mail/class_mailAccount.inc:1457
+#: personal/mail/class_mailAccount.inc:1484
 #, fuzzy
 msgid "No delivery to own mailbox "
 msgstr "Не оставлять копии в своем почтовом ящике"
 
-#: personal/mail/class_mailAccount.inc:1458
+#: personal/mail/class_mailAccount.inc:1485
 #, fuzzy
 msgid "Mail alternative addresses"
 msgstr "Альтернативные адреса"
diff --git a/gosa-plugins/mail/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/mail/locale/zh/LC_MESSAGES/messages.po
index 3600726e0..b607f0ce7 100644
--- a/gosa-plugins/mail/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mail/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -36,18 +36,18 @@ msgstr "创建邮件账号"
 #: admin/groups/mail/class_groupMail.inc:362
 #: admin/groups/mail/class_groupMail.inc:397
 #: admin/groups/mail/class_groupMail.inc:403
-#: admin/groups/mail/class_groupMail.inc:412
-#: admin/groups/mail/class_groupMail.inc:847
-#: admin/groups/mail/class_groupMail.inc:867
-#: admin/groups/mail/class_groupMail.inc:988
+#: admin/groups/mail/class_groupMail.inc:417
+#: admin/groups/mail/class_groupMail.inc:851
+#: admin/groups/mail/class_groupMail.inc:871
+#: admin/groups/mail/class_groupMail.inc:992
 #: personal/mail/class_mailAccount.inc:328
 #: personal/mail/class_mailAccount.inc:363
 #: personal/mail/class_mailAccount.inc:368
-#: personal/mail/class_mailAccount.inc:375
-#: personal/mail/class_mailAccount.inc:1070
-#: personal/mail/class_mailAccount.inc:1074
+#: personal/mail/class_mailAccount.inc:381
+#: personal/mail/class_mailAccount.inc:1081
 #: personal/mail/class_mailAccount.inc:1085
-#: personal/mail/class_mailAccount.inc:1439
+#: personal/mail/class_mailAccount.inc:1103
+#: personal/mail/class_mailAccount.inc:1466
 msgid "Mail address"
 msgstr "邮件地址"
 
@@ -57,14 +57,14 @@ msgstr ""
 
 #: admin/ogroups/mail/class_mailogroup.inc:120
 #: admin/ogroups/mail/class_mailogroup.inc:157
-#: admin/groups/mail/class_groupMail.inc:538
-#: admin/groups/mail/class_groupMail.inc:767
+#: admin/groups/mail/class_groupMail.inc:542
+#: admin/groups/mail/class_groupMail.inc:771
 #: admin/systems/services/imap/class_goImapServer.inc:190
 #: admin/systems/services/mail/class_goMailServer.inc:582
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/spam/class_goSpamServer.inc:277
-#: personal/mail/class_mailAccount.inc:889
-#: personal/mail/class_mailAccount.inc:962
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:971
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
@@ -77,17 +77,17 @@ msgstr "LDAP 错误:"
 #: admin/groups/mail/class_groupMail.inc:292
 #: admin/groups/mail/class_groupMail.inc:294
 #: admin/groups/mail/class_groupMail.inc:295
-#: admin/groups/mail/class_groupMail.inc:835
-#: admin/groups/mail/class_groupMail.inc:980
+#: admin/groups/mail/class_groupMail.inc:839
+#: admin/groups/mail/class_groupMail.inc:984
 #: personal/mail/class_mailAccount.inc:50
 #: personal/mail/class_mailAccount.inc:244
 #: personal/mail/class_mailAccount.inc:252
 #: personal/mail/class_mailAccount.inc:254
 #: personal/mail/class_mailAccount.inc:259
 #: personal/mail/class_mailAccount.inc:261
-#: personal/mail/class_mailAccount.inc:1054
-#: personal/mail/class_mailAccount.inc:1263
-#: personal/mail/class_mailAccount.inc:1429
+#: personal/mail/class_mailAccount.inc:1065
+#: personal/mail/class_mailAccount.inc:1290
+#: personal/mail/class_mailAccount.inc:1456
 msgid "Mail"
 msgstr "邮件"
 
@@ -100,9 +100,9 @@ msgstr "显示邮件组"
 msgid "Mail distribution list"
 msgstr "邮件传递列表"
 
-#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:845
+#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:849
 #: admin/groups/mail/mail.tpl:7 admin/groups/mail/paste_mail.tpl:8
-#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1066
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1077
 #: personal/mail/copypaste.tpl:7
 msgid "Primary address"
 msgstr "主要地址"
@@ -121,22 +121,22 @@ msgstr "请输入一个邮件地址"
 #: admin/groups/mail/class_groupMail.inc:140
 #: admin/groups/mail/class_groupMail.inc:145
 #: admin/groups/mail/class_groupMail.inc:148
-#: admin/groups/mail/class_groupMail.inc:550
 #: admin/groups/mail/class_groupMail.inc:554
 #: admin/groups/mail/class_groupMail.inc:558
-#: admin/groups/mail/class_groupMail.inc:780
+#: admin/groups/mail/class_groupMail.inc:562
 #: admin/groups/mail/class_groupMail.inc:784
 #: admin/groups/mail/class_groupMail.inc:788
-#: admin/groups/mail/class_groupMail.inc:797
+#: admin/groups/mail/class_groupMail.inc:792
+#: admin/groups/mail/class_groupMail.inc:801
 #: personal/mail/class_mailAccount.inc:147
 #: personal/mail/class_mailAccount.inc:154
 #: personal/mail/class_mailAccount.inc:159
 #: personal/mail/class_mailAccount.inc:162
-#: personal/mail/class_mailAccount.inc:898
-#: personal/mail/class_mailAccount.inc:902
-#: personal/mail/class_mailAccount.inc:976
-#: personal/mail/class_mailAccount.inc:980
-#: personal/mail/class_mailAccount.inc:984
+#: personal/mail/class_mailAccount.inc:907
+#: personal/mail/class_mailAccount.inc:911
+#: personal/mail/class_mailAccount.inc:985
+#: personal/mail/class_mailAccount.inc:989
+#: personal/mail/class_mailAccount.inc:993
 #, fuzzy
 msgid "Mail error"
 msgstr "邮件服务器"
@@ -164,11 +164,11 @@ msgid "Cannot receive folder permissions: %s"
 msgstr "IMAP 共享目录"
 
 #: admin/groups/mail/class_groupMail.inc:145
-#: admin/groups/mail/class_groupMail.inc:550
-#: admin/groups/mail/class_groupMail.inc:780
+#: admin/groups/mail/class_groupMail.inc:554
+#: admin/groups/mail/class_groupMail.inc:784
 #: personal/mail/class_mailAccount.inc:159
-#: personal/mail/class_mailAccount.inc:898
-#: personal/mail/class_mailAccount.inc:976
+#: personal/mail/class_mailAccount.inc:907
+#: personal/mail/class_mailAccount.inc:985
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -194,7 +194,7 @@ msgstr "在保存完毕该账号后，删除共享目录和其中所有内容"
 #: admin/groups/mail/class_groupMail.inc:368
 #: admin/groups/mail/class_groupMail.inc:397
 #: admin/groups/mail/class_groupMail.inc:403
-#: admin/groups/mail/class_groupMail.inc:412
+#: admin/groups/mail/class_groupMail.inc:417
 #: admin/systems/services/spam/class_goSpamServer.inc:143
 #: admin/systems/services/spam/class_goSpamServer.inc:216
 #: addons/mailqueue/class_mailqueue.inc:110
@@ -211,7 +211,7 @@ msgstr "在保存完毕该账号后，删除共享目录和其中所有内容"
 #: personal/mail/class_mailAccount.inc:334
 #: personal/mail/class_mailAccount.inc:363
 #: personal/mail/class_mailAccount.inc:368
-#: personal/mail/class_mailAccount.inc:375
+#: personal/mail/class_mailAccount.inc:381
 msgid "Error"
 msgstr "错误"
 
@@ -228,101 +228,109 @@ msgid "Cannot add primary address to the list of forwarders!"
 msgstr "您正在尝试向转发列表添加一条无效邮件地址。"
 
 #: admin/groups/mail/class_groupMail.inc:413
-#: personal/mail/class_mailAccount.inc:376
+#: personal/mail/class_mailAccount.inc:377
+#: personal/mail/class_mailAccount.inc:1099
+#, fuzzy, php-format
+msgid "Address is already in use by group '%s'."
+msgstr "您正在添加的地址已经被用户使用"
+
+#: admin/groups/mail/class_groupMail.inc:415
+#: personal/mail/class_mailAccount.inc:379
+#: personal/mail/class_mailAccount.inc:1101
 #, fuzzy, php-format
 msgid "Address is already in use by user '%s'."
 msgstr "您正在添加的地址已经被用户使用"
 
-#: admin/groups/mail/class_groupMail.inc:554
-#: personal/mail/class_mailAccount.inc:902
+#: admin/groups/mail/class_groupMail.inc:558
+#: personal/mail/class_mailAccount.inc:911
 #, fuzzy, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "无法删除 IMAP 邮箱。服务器返回 '%s'。"
 
-#: admin/groups/mail/class_groupMail.inc:558
-#: admin/groups/mail/class_groupMail.inc:797
+#: admin/groups/mail/class_groupMail.inc:562
+#: admin/groups/mail/class_groupMail.inc:801
 #, fuzzy, php-format
 msgid "Cannot update shared folder permissions: %s"
 msgstr "IMAP 共享目录"
 
-#: admin/groups/mail/class_groupMail.inc:656
+#: admin/groups/mail/class_groupMail.inc:660
 #, fuzzy
 msgid "New"
 msgstr "添加用户"
 
-#: admin/groups/mail/class_groupMail.inc:784
-#: personal/mail/class_mailAccount.inc:980
+#: admin/groups/mail/class_groupMail.inc:788
+#: personal/mail/class_mailAccount.inc:989
 #, fuzzy, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "无法创建 IMAP 邮箱。服务器返回 '%s'。"
 
-#: admin/groups/mail/class_groupMail.inc:788
-#: personal/mail/class_mailAccount.inc:984
+#: admin/groups/mail/class_groupMail.inc:792
+#: personal/mail/class_mailAccount.inc:993
 #, fuzzy, php-format
 msgid "Cannot write quota settings: %s"
 msgstr "无法创建文件 '%s'。"
 
-#: admin/groups/mail/class_groupMail.inc:829
+#: admin/groups/mail/class_groupMail.inc:833
 #, php-format
 msgid ""
 "The group 'cn' has changed. It can't be changed due to the fact that mail "
 "method '%s' relies on it!"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:854
-#: admin/groups/mail/class_groupMail.inc:989 admin/groups/mail/mail.tpl:60
-#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1093
-#: personal/mail/class_mailAccount.inc:1269
-#: personal/mail/class_mailAccount.inc:1441
+#: admin/groups/mail/class_groupMail.inc:858
+#: admin/groups/mail/class_groupMail.inc:993 admin/groups/mail/mail.tpl:60
+#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1111
+#: personal/mail/class_mailAccount.inc:1296
+#: personal/mail/class_mailAccount.inc:1468
 msgid "Quota size"
 msgstr "Quota 大小"
 
-#: admin/groups/mail/class_groupMail.inc:873
-#: personal/mail/class_mailAccount.inc:1453
+#: admin/groups/mail/class_groupMail.inc:877
+#: personal/mail/class_mailAccount.inc:1480
 #, fuzzy
 msgid "Mail max size"
 msgstr "邮件大小"
 
-#: admin/groups/mail/class_groupMail.inc:881
+#: admin/groups/mail/class_groupMail.inc:885
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr "为了退信，您需要设定最大的邮件大小。"
 
-#: admin/groups/mail/class_groupMail.inc:885
-#: admin/groups/mail/class_groupMail.inc:990
-#: personal/mail/class_mailAccount.inc:1440
+#: admin/groups/mail/class_groupMail.inc:889
+#: admin/groups/mail/class_groupMail.inc:994
+#: personal/mail/class_mailAccount.inc:1467
 msgid "Mail server"
 msgstr "邮件服务器"
 
-#: admin/groups/mail/class_groupMail.inc:981
+#: admin/groups/mail/class_groupMail.inc:985
 #, fuzzy
 msgid "Group mail"
 msgstr "组名"
 
-#: admin/groups/mail/class_groupMail.inc:991 admin/groups/mail/mail.tpl:73
+#: admin/groups/mail/class_groupMail.inc:995 admin/groups/mail/mail.tpl:73
 #, fuzzy
 msgid "Folder type"
 msgstr "过滤器"
 
-#: admin/groups/mail/class_groupMail.inc:991
+#: admin/groups/mail/class_groupMail.inc:995
 msgid "Kolab"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:992
+#: admin/groups/mail/class_groupMail.inc:996
 #, fuzzy
 msgid "Alternate addresses"
 msgstr "替代地址"
 
-#: admin/groups/mail/class_groupMail.inc:993
+#: admin/groups/mail/class_groupMail.inc:997
 #, fuzzy
 msgid "Forwarding addresses"
 msgstr "转发邮件到"
 
-#: admin/groups/mail/class_groupMail.inc:994
+#: admin/groups/mail/class_groupMail.inc:998
 #, fuzzy
 msgid "Only local"
 msgstr "添加本地"
 
-#: admin/groups/mail/class_groupMail.inc:995
+#: admin/groups/mail/class_groupMail.inc:999
 msgid "Permissions"
 msgstr "允许"
 
@@ -456,7 +464,7 @@ msgstr "选择一个特定的部门"
 msgid "Choose"
 msgstr "选择"
 
-#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1430
+#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1457
 #: personal/mail/copypaste.tpl:1
 msgid "Mail settings"
 msgstr "邮件选项"
@@ -1164,7 +1172,7 @@ msgstr "邮件头"
 msgid "Display header of this message"
 msgstr "显示此邮件邮件头"
 
-#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1461
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1488
 msgid "Use custom sieve script"
 msgstr "定制过滤脚本"
 
@@ -1194,8 +1202,8 @@ msgstr "选择用下面定义的假期信息作为自动回复"
 msgid "Activate vacation message"
 msgstr "启用假期信息"
 
-#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1122
-#: personal/mail/class_mailAccount.inc:1293
+#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1140
+#: personal/mail/class_mailAccount.inc:1320
 msgid "from"
 msgstr "从"
 
@@ -1233,7 +1241,7 @@ msgstr "MB"
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
-#: personal/mail/class_mailAccount.inc:1444
+#: personal/mail/class_mailAccount.inc:1471
 msgid "Vacation message"
 msgstr "假期信息"
 
@@ -1266,39 +1274,51 @@ msgstr "LDAP 错误:"
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr "无法删除 IMAP 邮箱。服务器返回 '%s'。"
 
-#: personal/mail/class_mail-methods-cyrus.inc:358
-#: personal/mail/class_mail-methods-cyrus.inc:395
+#: personal/mail/class_mail-methods-cyrus.inc:298
+#, fuzzy
+msgid "Mail info"
+msgstr "文件"
+
+#: personal/mail/class_mail-methods-cyrus.inc:299
+#, php-format
+msgid ""
+"LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
+"Please delete it manually!"
+msgstr ""
+
+#: personal/mail/class_mail-methods-cyrus.inc:383
+#: personal/mail/class_mail-methods-cyrus.inc:420
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:447
+#: personal/mail/class_mail-methods-cyrus.inc:472
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:448
+#: personal/mail/class_mail-methods-cyrus.inc:473
 msgid "The sieve script may not be written correctly."
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:449
+#: personal/mail/class_mail-methods-cyrus.inc:474
 #: personal/mail/sieve/class_My_Tree.inc:245
 #: personal/mail/sieve/templates/remove_script.tpl:2
 msgid "Warning"
 msgstr "警告"
 
-#: personal/mail/class_mail-methods-cyrus.inc:487
+#: personal/mail/class_mail-methods-cyrus.inc:512
 #: personal/mail/sieve/class_sieveManagement.inc:309
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:576
+#: personal/mail/class_mail-methods-cyrus.inc:601
 #: personal/mail/sieve/class_sieveManagement.inc:1043
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:583
+#: personal/mail/class_mail-methods-cyrus.inc:608
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
@@ -2234,119 +2254,119 @@ msgstr ""
 msgid "User mail settings"
 msgstr "用户邮件选项"
 
-#: personal/mail/class_mailAccount.inc:609
+#: personal/mail/class_mailAccount.inc:615
 #: personal/mail/class_mail-methods.inc:140
 #: personal/mail/class_mail-methods.inc:485
 #, fuzzy
 msgid "Configuration error"
 msgstr "配置文件"
 
-#: personal/mail/class_mailAccount.inc:609
+#: personal/mail/class_mailAccount.inc:615
 #, fuzzy, php-format
 msgid "No DESC tag in vacation template '%s'!"
 msgstr "假期文件没有 DESC 标签："
 
-#: personal/mail/class_mailAccount.inc:638
-#: personal/mail/class_mailAccount.inc:651
-#: personal/mail/class_mailAccount.inc:682
-#: personal/mail/class_mailAccount.inc:695
+#: personal/mail/class_mailAccount.inc:644
+#: personal/mail/class_mailAccount.inc:657
+#: personal/mail/class_mailAccount.inc:691
+#: personal/mail/class_mailAccount.inc:704
 #, fuzzy
 msgid "Permission error"
 msgstr "允许"
 
-#: personal/mail/class_mailAccount.inc:638
-#: personal/mail/class_mailAccount.inc:651
-#: personal/mail/class_mailAccount.inc:682
-#: personal/mail/class_mailAccount.inc:695
+#: personal/mail/class_mailAccount.inc:644
+#: personal/mail/class_mailAccount.inc:657
+#: personal/mail/class_mailAccount.inc:691
+#: personal/mail/class_mailAccount.inc:704
 #, fuzzy
 msgid "You have no permission to modify these addresses!"
 msgstr "您无权删除这个部门。"
 
-#: personal/mail/class_mailAccount.inc:729
-#: personal/mail/class_mailAccount.inc:732
+#: personal/mail/class_mailAccount.inc:738
+#: personal/mail/class_mailAccount.inc:741
 #, fuzzy
 msgid "unknown"
 msgstr "未知"
 
-#: personal/mail/class_mailAccount.inc:998
+#: personal/mail/class_mailAccount.inc:1007
 #, fuzzy
 msgid "Mail error saving sieve settings"
 msgstr "定制过滤脚本"
 
-#: personal/mail/class_mailAccount.inc:1102
-#: personal/mail/class_mailAccount.inc:1110
-#: personal/mail/class_mailAccount.inc:1278
+#: personal/mail/class_mailAccount.inc:1120
+#: personal/mail/class_mailAccount.inc:1128
+#: personal/mail/class_mailAccount.inc:1305
 #, fuzzy
 msgid "Mail reject size"
 msgstr "邮件大小"
 
-#: personal/mail/class_mailAccount.inc:1114
-#: personal/mail/class_mailAccount.inc:1285
+#: personal/mail/class_mailAccount.inc:1132
+#: personal/mail/class_mailAccount.inc:1312
 #, fuzzy
 msgid "Spam folder"
 msgstr "到目录"
 
-#: personal/mail/class_mailAccount.inc:1126
-#: personal/mail/class_mailAccount.inc:1297
+#: personal/mail/class_mailAccount.inc:1144
+#: personal/mail/class_mailAccount.inc:1324
 #, fuzzy
 msgid "to"
 msgstr "停止"
 
-#: personal/mail/class_mailAccount.inc:1137
-#: personal/mail/class_mailAccount.inc:1308
+#: personal/mail/class_mailAccount.inc:1155
+#: personal/mail/class_mailAccount.inc:1335
 #, fuzzy
 msgid "Vacation interval"
 msgstr "假期信息"
 
-#: personal/mail/class_mailAccount.inc:1434
+#: personal/mail/class_mailAccount.inc:1461
 msgid "My account"
 msgstr "我的账号"
 
-#: personal/mail/class_mailAccount.inc:1443
+#: personal/mail/class_mailAccount.inc:1470
 #, fuzzy
 msgid "Add vacation information"
 msgstr "组织信息"
 
-#: personal/mail/class_mailAccount.inc:1446
+#: personal/mail/class_mailAccount.inc:1473
 msgid "Use spam filter"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1447
+#: personal/mail/class_mailAccount.inc:1474
 #, fuzzy
 msgid "Spam level"
 msgstr "日志级别"
 
-#: personal/mail/class_mailAccount.inc:1448
+#: personal/mail/class_mailAccount.inc:1475
 msgid "Spam mail box"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1450
+#: personal/mail/class_mailAccount.inc:1477
 #, fuzzy
 msgid "Sieve management"
 msgstr "系统管理"
 
-#: personal/mail/class_mailAccount.inc:1452
+#: personal/mail/class_mailAccount.inc:1479
 #, fuzzy
 msgid "Reject due to mailsize"
 msgstr "拒绝邮件大小超过"
 
-#: personal/mail/class_mailAccount.inc:1455
-#: personal/mail/class_mailAccount.inc:1460
+#: personal/mail/class_mailAccount.inc:1482
+#: personal/mail/class_mailAccount.inc:1487
 #, fuzzy
 msgid "Forwarding address"
 msgstr "主要地址"
 
-#: personal/mail/class_mailAccount.inc:1456
+#: personal/mail/class_mailAccount.inc:1483
 #, fuzzy
 msgid "Local delivery"
 msgstr "最后传递"
 
-#: personal/mail/class_mailAccount.inc:1457
+#: personal/mail/class_mailAccount.inc:1484
 #, fuzzy
 msgid "No delivery to own mailbox "
 msgstr "不要发送到本人邮箱"
 
-#: personal/mail/class_mailAccount.inc:1458
+#: personal/mail/class_mailAccount.inc:1485
 #, fuzzy
 msgid "Mail alternative addresses"
 msgstr "替代地址"
diff --git a/gosa-plugins/mit-krb5/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/mit-krb5/locale/de/LC_MESSAGES/messages.po
index 035fcc7c7..7b460e5f0 100644
--- a/gosa-plugins/mit-krb5/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mit-krb5/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2008-12-03 15:12+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
@@ -35,8 +35,8 @@ msgstr "Kerberos-Dienst"
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:395
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:410
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:690
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:343
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:376
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:363
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:396
 msgid "Service infrastructure"
 msgstr "Dienst-Infrastruktur"
 
@@ -68,7 +68,7 @@ msgstr "Richtlinie"
 
 #: admin/systems/services/kerberos/class_goKrbServer.inc:385
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:494
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:222
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:242
 msgid "Kerberos"
 msgstr "Kerberos"
 
@@ -186,11 +186,11 @@ msgid ""
 "s'!"
 msgstr "Der für '%s' angegebene Wert muss kleiner als der für '%s' sein!"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:213
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:233
 msgid "updated to"
 msgstr "aktualisiert nach"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:222
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:242
 #, php-format
 msgid ""
 "The principal name of this system has changed. Do you want to update your "
@@ -199,29 +199,29 @@ msgstr ""
 "Der Prinzipal-Name dieses Systems hat sich geändert. Soll er aktualisiert "
 "werden? Die betroffenen Prinzipale:"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:239
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:240
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:259
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:260
 msgid "Create key"
 msgstr "Schlüssel anlegen"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:246
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:266
 msgid "Recreate key"
 msgstr "Schlüssel auffrischen"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:248
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:268
 msgid "Remove key"
 msgstr "Schlüssel entfernen"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:287
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:317
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:307
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:337
 msgid "installed"
 msgstr "installiert"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:457
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:477
 msgid "Kerberos key"
 msgstr "Kerberos-Schlüssel"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:458
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:478
 msgid "Kerberos host key"
 msgstr "Kerberos-Host-Schlüssel"
 
diff --git a/gosa-plugins/mit-krb5/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/mit-krb5/locale/es/LC_MESSAGES/messages.po
index 6651961f3..21182b4b1 100644
--- a/gosa-plugins/mit-krb5/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mit-krb5/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
@@ -31,8 +31,8 @@ msgstr "Servicio Kerberos"
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:395
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:410
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:690
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:343
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:376
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:363
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:396
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "error de infraestructura"
@@ -64,7 +64,7 @@ msgstr "Polaco"
 
 #: admin/systems/services/kerberos/class_goKrbServer.inc:385
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:494
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:222
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:242
 msgid "Kerberos"
 msgstr "Kerberos"
 
@@ -190,45 +190,45 @@ msgid ""
 "s'!"
 msgstr "El valor especificado para '%s' debe ser una valor numérico"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:213
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:233
 msgid "updated to"
 msgstr ""
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:222
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:242
 #, php-format
 msgid ""
 "The principal name of this system has changed. Do you want to update your "
 "principals? The affected principals are listed below: %s"
 msgstr ""
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:239
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:240
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:259
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:260
 #, fuzzy
 msgid "Create key"
 msgstr "Crear"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:246
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:266
 #, fuzzy
 msgid "Recreate key"
 msgstr "Crear"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:248
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:268
 #, fuzzy
 msgid "Remove key"
 msgstr "Eliminar"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:287
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:317
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:307
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:337
 #, fuzzy
 msgid "installed"
 msgstr "desactivado"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:457
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:477
 #, fuzzy
 msgid "Kerberos key"
 msgstr "Kerberos"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:458
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:478
 #, fuzzy
 msgid "Kerberos host key"
 msgstr "Kerberos"
diff --git a/gosa-plugins/mit-krb5/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/mit-krb5/locale/fr/LC_MESSAGES/messages.po
index 59488317f..07356ed02 100644
--- a/gosa-plugins/mit-krb5/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mit-krb5/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2009-06-30 11:18+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -28,8 +28,8 @@ msgstr "Service Kerberos"
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:395
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:410
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:690
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:343
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:376
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:363
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:396
 msgid "Service infrastructure"
 msgstr "Service d'infrastructure"
 
@@ -61,7 +61,7 @@ msgstr "Polices de sécurité"
 
 #: admin/systems/services/kerberos/class_goKrbServer.inc:385
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:494
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:222
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:242
 msgid "Kerberos"
 msgstr ""
 
@@ -181,11 +181,11 @@ msgstr ""
 "La valeur spécifiée pour '%s' doit être plus petite que la valeur spécifiée "
 "pour '%s' !"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:213
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:233
 msgid "updated to"
 msgstr "mise à jour pour"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:222
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:242
 #, php-format
 msgid ""
 "The principal name of this system has changed. Do you want to update your "
@@ -194,29 +194,29 @@ msgstr ""
 "Le nom du principal à changé pour ce système. Voulez vous mettre à jour vos "
 "principaux ? Les principaux affectés sont : %s"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:239
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:240
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:259
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:260
 msgid "Create key"
 msgstr "Créer un clefs"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:246
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:266
 msgid "Recreate key"
 msgstr "Récréer une clefs"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:248
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:268
 msgid "Remove key"
 msgstr "Enlever un clefs"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:287
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:317
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:307
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:337
 msgid "installed"
 msgstr "installé"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:457
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:477
 msgid "Kerberos key"
 msgstr "Clé Kerberos"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:458
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:478
 msgid "Kerberos host key"
 msgstr "Clé Kerberos de l'hôte"
 
diff --git a/gosa-plugins/mit-krb5/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/mit-krb5/locale/it/LC_MESSAGES/messages.po
index 8b4381c5d..d7c31b59b 100644
--- a/gosa-plugins/mit-krb5/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mit-krb5/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -30,8 +30,8 @@ msgstr "Kerberos"
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:395
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:410
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:690
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:343
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:376
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:363
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:396
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "Seleziona per mostrare le applicazioni"
@@ -65,7 +65,7 @@ msgstr "Inglese"
 
 #: admin/systems/services/kerberos/class_goKrbServer.inc:385
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:494
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:222
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:242
 msgid "Kerberos"
 msgstr "Kerberos"
 
@@ -191,45 +191,45 @@ msgid ""
 "s'!"
 msgstr ""
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:213
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:233
 msgid "updated to"
 msgstr ""
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:222
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:242
 #, php-format
 msgid ""
 "The principal name of this system has changed. Do you want to update your "
 "principals? The affected principals are listed below: %s"
 msgstr ""
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:239
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:240
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:259
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:260
 #, fuzzy
 msgid "Create key"
 msgstr "Creare"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:246
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:266
 #, fuzzy
 msgid "Recreate key"
 msgstr "Creare"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:248
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:268
 #, fuzzy
 msgid "Remove key"
 msgstr "Rimuovi"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:287
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:317
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:307
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:337
 #, fuzzy
 msgid "installed"
 msgstr "disabilitato"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:457
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:477
 #, fuzzy
 msgid "Kerberos key"
 msgstr "Kerberos"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:458
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:478
 #, fuzzy
 msgid "Kerberos host key"
 msgstr "Kerberos"
diff --git a/gosa-plugins/mit-krb5/locale/messages.po b/gosa-plugins/mit-krb5/locale/messages.po
index d03d0b84a..ee4c7e030 100644
--- a/gosa-plugins/mit-krb5/locale/messages.po
+++ b/gosa-plugins/mit-krb5/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,8 +30,8 @@ msgstr ""
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:395
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:410
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:690
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:343
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:376
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:363
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:396
 msgid "Service infrastructure"
 msgstr ""
 
@@ -61,7 +61,7 @@ msgstr ""
 
 #: admin/systems/services/kerberos/class_goKrbServer.inc:385
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:494
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:222
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:242
 msgid "Kerberos"
 msgstr ""
 
@@ -179,40 +179,40 @@ msgid ""
 "s'!"
 msgstr ""
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:213
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:233
 msgid "updated to"
 msgstr ""
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:222
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:242
 #, php-format
 msgid ""
 "The principal name of this system has changed. Do you want to update your "
 "principals? The affected principals are listed below: %s"
 msgstr ""
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:239
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:240
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:259
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:260
 msgid "Create key"
 msgstr ""
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:246
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:266
 msgid "Recreate key"
 msgstr ""
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:248
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:268
 msgid "Remove key"
 msgstr ""
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:287
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:317
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:307
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:337
 msgid "installed"
 msgstr ""
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:457
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:477
 msgid "Kerberos key"
 msgstr ""
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:458
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:478
 msgid "Kerberos host key"
 msgstr ""
 
diff --git a/gosa-plugins/mit-krb5/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/mit-krb5/locale/nl/LC_MESSAGES/messages.po
index e52eeb287..1b60f39b5 100644
--- a/gosa-plugins/mit-krb5/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mit-krb5/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -34,8 +34,8 @@ msgstr "Kerberos server"
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:395
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:410
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:690
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:343
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:376
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:363
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:396
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "Zoek binnen subtree"
@@ -69,7 +69,7 @@ msgstr "Pools"
 
 #: admin/systems/services/kerberos/class_goKrbServer.inc:385
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:494
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:222
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:242
 msgid "Kerberos"
 msgstr "Kerberos"
 
@@ -195,45 +195,45 @@ msgid ""
 "s'!"
 msgstr "De sieve poort dient nummeriek te zijn."
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:213
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:233
 msgid "updated to"
 msgstr ""
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:222
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:242
 #, php-format
 msgid ""
 "The principal name of this system has changed. Do you want to update your "
 "principals? The affected principals are listed below: %s"
 msgstr ""
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:239
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:240
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:259
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:260
 #, fuzzy
 msgid "Create key"
 msgstr "Aanmaken"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:246
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:266
 #, fuzzy
 msgid "Recreate key"
 msgstr "Aanmaken"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:248
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:268
 #, fuzzy
 msgid "Remove key"
 msgstr "Verwijderen"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:287
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:317
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:307
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:337
 #, fuzzy
 msgid "installed"
 msgstr "gedeactiveerd"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:457
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:477
 #, fuzzy
 msgid "Kerberos key"
 msgstr "Kerberos Realm"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:458
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:478
 #, fuzzy
 msgid "Kerberos host key"
 msgstr "Kerberos Realm"
diff --git a/gosa-plugins/mit-krb5/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/mit-krb5/locale/pl/LC_MESSAGES/messages.po
index e21fc3811..b49bc267e 100644
--- a/gosa-plugins/mit-krb5/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mit-krb5/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -28,8 +28,8 @@ msgstr "Usługa Kerberos"
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:395
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:410
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:690
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:343
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:376
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:363
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:396
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "Szukaj wewnątrz tego poddrzewa"
@@ -62,7 +62,7 @@ msgstr "Polski"
 
 #: admin/systems/services/kerberos/class_goKrbServer.inc:385
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:494
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:222
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:242
 msgid "Kerberos"
 msgstr "Kerberos"
 
@@ -188,45 +188,45 @@ msgid ""
 "s'!"
 msgstr "Port sieve musi być liczbą."
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:213
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:233
 msgid "updated to"
 msgstr ""
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:222
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:242
 #, php-format
 msgid ""
 "The principal name of this system has changed. Do you want to update your "
 "principals? The affected principals are listed below: %s"
 msgstr ""
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:239
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:240
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:259
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:260
 #, fuzzy
 msgid "Create key"
 msgstr "Utwórz"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:246
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:266
 #, fuzzy
 msgid "Recreate key"
 msgstr "Utwórz"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:248
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:268
 #, fuzzy
 msgid "Remove key"
 msgstr "Usuń"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:287
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:317
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:307
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:337
 #, fuzzy
 msgid "installed"
 msgstr "wyłączone"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:457
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:477
 #, fuzzy
 msgid "Kerberos key"
 msgstr "Dziedzina Kerberos"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:458
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:478
 #, fuzzy
 msgid "Kerberos host key"
 msgstr "Dziedzina Kerberos"
diff --git a/gosa-plugins/mit-krb5/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/mit-krb5/locale/ru/LC_MESSAGES/messages.po
index 84df93c4f..dd13c072b 100644
--- a/gosa-plugins/mit-krb5/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mit-krb5/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -29,8 +29,8 @@ msgstr "Kerberos"
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:395
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:410
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:690
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:343
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:376
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:363
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:396
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "Искать в поддеревьях"
@@ -64,7 +64,7 @@ msgstr "Английский"
 
 #: admin/systems/services/kerberos/class_goKrbServer.inc:385
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:494
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:222
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:242
 msgid "Kerberos"
 msgstr "Kerberos"
 
@@ -190,45 +190,45 @@ msgid ""
 "s'!"
 msgstr ""
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:213
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:233
 msgid "updated to"
 msgstr ""
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:222
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:242
 #, php-format
 msgid ""
 "The principal name of this system has changed. Do you want to update your "
 "principals? The affected principals are listed below: %s"
 msgstr ""
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:239
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:240
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:259
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:260
 #, fuzzy
 msgid "Create key"
 msgstr "Создать"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:246
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:266
 #, fuzzy
 msgid "Recreate key"
 msgstr "Создать"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:248
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:268
 #, fuzzy
 msgid "Remove key"
 msgstr "Удалить"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:287
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:317
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:307
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:337
 #, fuzzy
 msgid "installed"
 msgstr "отключен"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:457
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:477
 #, fuzzy
 msgid "Kerberos key"
 msgstr "Kerberos"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:458
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:478
 #, fuzzy
 msgid "Kerberos host key"
 msgstr "Kerberos"
diff --git a/gosa-plugins/mit-krb5/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/mit-krb5/locale/zh/LC_MESSAGES/messages.po
index dc5078541..e455af65f 100644
--- a/gosa-plugins/mit-krb5/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mit-krb5/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -31,8 +31,8 @@ msgstr "Kerberos 服务器"
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:395
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:410
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:690
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:343
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:376
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:363
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:396
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "在子树中查找"
@@ -66,7 +66,7 @@ msgstr "波兰语"
 
 #: admin/systems/services/kerberos/class_goKrbServer.inc:385
 #: admin/systems/services/kerberos/class_password-methods-MIT.inc:494
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:222
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:242
 msgid "Kerberos"
 msgstr "Kerberos"
 
@@ -192,45 +192,45 @@ msgid ""
 "s'!"
 msgstr "指定 '%s' 的值必须是数字类型。"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:213
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:233
 msgid "updated to"
 msgstr ""
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:222
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:242
 #, php-format
 msgid ""
 "The principal name of this system has changed. Do you want to update your "
 "principals? The affected principals are listed below: %s"
 msgstr ""
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:239
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:240
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:259
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:260
 #, fuzzy
 msgid "Create key"
 msgstr "创建"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:246
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:266
 #, fuzzy
 msgid "Recreate key"
 msgstr "创建"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:248
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:268
 #, fuzzy
 msgid "Remove key"
 msgstr "删除"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:287
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:317
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:307
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:337
 #, fuzzy
 msgid "installed"
 msgstr "禁用"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:457
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:477
 #, fuzzy
 msgid "Kerberos key"
 msgstr "Kerberos Realm"
 
-#: admin/systems/services/kerberos/class_krb_host_keys.inc:458
+#: admin/systems/services/kerberos/class_krb_host_keys.inc:478
 #, fuzzy
 msgid "Kerberos host key"
 msgstr "Kerberos Realm"
diff --git a/gosa-plugins/nagios/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/nagios/locale/de/LC_MESSAGES/messages.po
index c28f2852e..5bcc4b470 100644
--- a/gosa-plugins/nagios/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/nagios/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2008-04-03 16:12+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
diff --git a/gosa-plugins/nagios/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/nagios/locale/es/LC_MESSAGES/messages.po
index 638c8085f..c42fa0f26 100644
--- a/gosa-plugins/nagios/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/nagios/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
diff --git a/gosa-plugins/nagios/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/nagios/locale/fr/LC_MESSAGES/messages.po
index c4c543771..87be6a5d3 100644
--- a/gosa-plugins/nagios/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/nagios/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2009-06-30 11:25+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
diff --git a/gosa-plugins/nagios/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/nagios/locale/it/LC_MESSAGES/messages.po
index e7dedda46..9e8f05948 100644
--- a/gosa-plugins/nagios/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/nagios/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
diff --git a/gosa-plugins/nagios/locale/messages.po b/gosa-plugins/nagios/locale/messages.po
index 6035507e1..3f6e6798a 100644
--- a/gosa-plugins/nagios/locale/messages.po
+++ b/gosa-plugins/nagios/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gosa-plugins/nagios/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/nagios/locale/nl/LC_MESSAGES/messages.po
index 5958dc405..db318ed05 100644
--- a/gosa-plugins/nagios/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/nagios/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
diff --git a/gosa-plugins/nagios/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/nagios/locale/pl/LC_MESSAGES/messages.po
index 1b31c367f..91f7eb11c 100644
--- a/gosa-plugins/nagios/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/nagios/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
diff --git a/gosa-plugins/nagios/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/nagios/locale/ru/LC_MESSAGES/messages.po
index a29a920d2..6f20f7a7a 100644
--- a/gosa-plugins/nagios/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/nagios/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
diff --git a/gosa-plugins/nagios/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/nagios/locale/zh/LC_MESSAGES/messages.po
index 2c361ce3c..7c792916e 100644
--- a/gosa-plugins/nagios/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/nagios/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
diff --git a/gosa-plugins/netatalk/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/netatalk/locale/de/LC_MESSAGES/messages.po
index 7c62c5924..9ec1fcbdb 100644
--- a/gosa-plugins/netatalk/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/netatalk/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2008-04-03 14:23+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
diff --git a/gosa-plugins/netatalk/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/netatalk/locale/es/LC_MESSAGES/messages.po
index 2e0779f57..51ee6173b 100644
--- a/gosa-plugins/netatalk/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/netatalk/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
diff --git a/gosa-plugins/netatalk/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/netatalk/locale/fr/LC_MESSAGES/messages.po
index 6e1b68c87..e3bad92ad 100644
--- a/gosa-plugins/netatalk/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/netatalk/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2008-06-08 15:34+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
diff --git a/gosa-plugins/netatalk/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/netatalk/locale/it/LC_MESSAGES/messages.po
index 645285962..6235bfb4c 100644
--- a/gosa-plugins/netatalk/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/netatalk/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
diff --git a/gosa-plugins/netatalk/locale/messages.po b/gosa-plugins/netatalk/locale/messages.po
index 77380419c..6e11dd6a1 100644
--- a/gosa-plugins/netatalk/locale/messages.po
+++ b/gosa-plugins/netatalk/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gosa-plugins/netatalk/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/netatalk/locale/nl/LC_MESSAGES/messages.po
index 6e46358fa..0eebbdf57 100644
--- a/gosa-plugins/netatalk/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/netatalk/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
diff --git a/gosa-plugins/netatalk/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/netatalk/locale/pl/LC_MESSAGES/messages.po
index e233512ea..312665caa 100644
--- a/gosa-plugins/netatalk/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/netatalk/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
diff --git a/gosa-plugins/netatalk/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/netatalk/locale/ru/LC_MESSAGES/messages.po
index 0f2cd5c50..e8550f944 100644
--- a/gosa-plugins/netatalk/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/netatalk/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
diff --git a/gosa-plugins/netatalk/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/netatalk/locale/zh/LC_MESSAGES/messages.po
index af61d9a34..938f5a8db 100644
--- a/gosa-plugins/netatalk/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/netatalk/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
diff --git a/gosa-plugins/opengroupware/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/opengroupware/locale/de/LC_MESSAGES/messages.po
index f41737574..228dbc0b7 100644
--- a/gosa-plugins/opengroupware/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/opengroupware/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2008-04-04 09:30+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team:  <de@li.org>\n"
diff --git a/gosa-plugins/opengroupware/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/opengroupware/locale/es/LC_MESSAGES/messages.po
index 3ad369471..d5b381a27 100644
--- a/gosa-plugins/opengroupware/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/opengroupware/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
diff --git a/gosa-plugins/opengroupware/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/opengroupware/locale/fr/LC_MESSAGES/messages.po
index 47c6e0797..71baa2853 100644
--- a/gosa-plugins/opengroupware/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/opengroupware/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2008-06-08 15:35+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
diff --git a/gosa-plugins/opengroupware/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/opengroupware/locale/it/LC_MESSAGES/messages.po
index 85de849f2..29c81cc4d 100644
--- a/gosa-plugins/opengroupware/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/opengroupware/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
diff --git a/gosa-plugins/opengroupware/locale/messages.po b/gosa-plugins/opengroupware/locale/messages.po
index 3fe903c9d..903cfd36f 100644
--- a/gosa-plugins/opengroupware/locale/messages.po
+++ b/gosa-plugins/opengroupware/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gosa-plugins/opengroupware/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/opengroupware/locale/nl/LC_MESSAGES/messages.po
index 6c383b5e8..006ff9ad6 100644
--- a/gosa-plugins/opengroupware/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/opengroupware/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
diff --git a/gosa-plugins/opengroupware/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/opengroupware/locale/pl/LC_MESSAGES/messages.po
index bced7bc15..8ce88e54d 100644
--- a/gosa-plugins/opengroupware/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/opengroupware/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
diff --git a/gosa-plugins/opengroupware/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/opengroupware/locale/ru/LC_MESSAGES/messages.po
index d6d0d9629..2c9c7328a 100644
--- a/gosa-plugins/opengroupware/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/opengroupware/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
diff --git a/gosa-plugins/opengroupware/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/opengroupware/locale/zh/LC_MESSAGES/messages.po
index ee8b5fdb4..9d300c971 100644
--- a/gosa-plugins/opengroupware/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/opengroupware/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
diff --git a/gosa-plugins/openxchange/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/openxchange/locale/de/LC_MESSAGES/messages.po
index e5da4b987..38dcdbd80 100644
--- a/gosa-plugins/openxchange/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/openxchange/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2008-04-04 09:30+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team:  <de@li.org>\n"
diff --git a/gosa-plugins/openxchange/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/openxchange/locale/es/LC_MESSAGES/messages.po
index 68e9d8105..ae9764b3f 100644
--- a/gosa-plugins/openxchange/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/openxchange/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
diff --git a/gosa-plugins/openxchange/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/openxchange/locale/fr/LC_MESSAGES/messages.po
index 3b1d60c59..329bf9620 100644
--- a/gosa-plugins/openxchange/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/openxchange/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2008-06-08 15:36+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
diff --git a/gosa-plugins/openxchange/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/openxchange/locale/it/LC_MESSAGES/messages.po
index 2b491c16f..fa2940dc5 100644
--- a/gosa-plugins/openxchange/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/openxchange/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
diff --git a/gosa-plugins/openxchange/locale/messages.po b/gosa-plugins/openxchange/locale/messages.po
index 8ff28a5bc..e2d77cc1e 100644
--- a/gosa-plugins/openxchange/locale/messages.po
+++ b/gosa-plugins/openxchange/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gosa-plugins/openxchange/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/openxchange/locale/nl/LC_MESSAGES/messages.po
index 124c0b27b..66fd6eb38 100644
--- a/gosa-plugins/openxchange/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/openxchange/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
diff --git a/gosa-plugins/openxchange/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/openxchange/locale/pl/LC_MESSAGES/messages.po
index 983ec232a..d6171104d 100644
--- a/gosa-plugins/openxchange/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/openxchange/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
diff --git a/gosa-plugins/openxchange/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/openxchange/locale/ru/LC_MESSAGES/messages.po
index 9b18f5f16..0186173e7 100644
--- a/gosa-plugins/openxchange/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/openxchange/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
diff --git a/gosa-plugins/openxchange/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/openxchange/locale/zh/LC_MESSAGES/messages.po
index e9356431f..8b32b6ef1 100644
--- a/gosa-plugins/openxchange/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/openxchange/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
diff --git a/gosa-plugins/opsi/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/opsi/locale/de/LC_MESSAGES/messages.po
index c4eb86177..76aa9c948 100644
--- a/gosa-plugins/opsi/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/opsi/locale/de/LC_MESSAGES/messages.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2009-09-30 12:47+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: de <kde-i18n-de@kde.org>\n"
@@ -45,10 +45,11 @@ msgid "Retry"
 msgstr "Wiederholen"
 
 #: admin/opsi/generic.tpl:18 admin/opsi/generic.tpl:37
-#: admin/opsi/class_opsigeneric.inc:248 admin/opsi/class_opsigeneric.inc:253
-#: admin/opsi/class_opsigeneric.inc:256 admin/opsi/class_opsigeneric.inc:770
+#: admin/opsi/class_opsigeneric.inc:225 admin/opsi/class_opsigeneric.inc:230
+#: admin/opsi/class_opsigeneric.inc:233 admin/opsi/class_opsigeneric.inc:747
 #: admin/opsiLicenses/class_licenseGeneric.inc:232
 #: admin/opsiLicenses/class_licenseGeneric.inc:278
+#: admin/opsiLicenses/opsiLicense-list.xml:41
 #: admin/opsiLicenses/class_licensePoolGeneric.inc:527
 #: admin/opsiLicenses/licenseGeneric.tpl:19
 #: admin/opsiLicenses/licensePoolGeneric.tpl:18
@@ -56,11 +57,11 @@ msgid "Name"
 msgstr "Name"
 
 #: admin/opsi/generic.tpl:27 admin/opsi/generic.tpl:46
-#: admin/opsi/class_opsigeneric.inc:262 admin/opsi/class_opsigeneric.inc:771
+#: admin/opsi/class_opsigeneric.inc:239 admin/opsi/class_opsigeneric.inc:748
 msgid "MAC address"
 msgstr "MAC-Adresse"
 
-#: admin/opsi/generic.tpl:56 admin/opsi/class_opsigeneric.inc:774
+#: admin/opsi/generic.tpl:56 admin/opsi/class_opsigeneric.inc:751
 msgid "Netboot product"
 msgstr "Netboot-Produkt"
 
@@ -68,8 +69,9 @@ msgstr "Netboot-Produkt"
 msgid "Configure product"
 msgstr "Produkt bearbeiten"
 
-#: admin/opsi/generic.tpl:80 admin/opsi/class_opsigeneric.inc:772
+#: admin/opsi/generic.tpl:80 admin/opsi/class_opsigeneric.inc:749
 #: admin/opsiLicenses/class_licenseGeneric.inc:279
+#: admin/opsiLicenses/opsiLicense-list.xml:49
 #: admin/opsiLicenses/class_licensePoolGeneric.inc:528
 #: admin/opsiLicenses/licenseGeneric.tpl:49
 #: admin/opsiLicenses/licensePoolGeneric.tpl:30
@@ -88,7 +90,7 @@ msgstr "Installierte Produkte"
 msgid "Available products"
 msgstr "Verfügbare Produkte"
 
-#: admin/opsi/generic.tpl:120 admin/opsi/class_opsigeneric.inc:776
+#: admin/opsi/generic.tpl:120 admin/opsi/class_opsigeneric.inc:753
 msgid "Action"
 msgstr "Aktion"
 
@@ -108,7 +110,7 @@ msgstr "Aufwecken"
 msgid "Execute"
 msgstr "Ausführen"
 
-#: admin/opsi/class_opsi.inc:75 admin/opsi/class_opsigeneric.inc:766
+#: admin/opsi/class_opsi.inc:75 admin/opsi/class_opsigeneric.inc:743
 msgid "Opsi"
 msgstr "OPSI"
 
@@ -121,21 +123,21 @@ msgstr "Es ist mehr als ein OPSI server verfügbar, verwende '%s'."
 msgid "Service infrastructure"
 msgstr "Dienst-Infrastruktur"
 
-#: admin/opsi/class_opsigeneric.inc:254
+#: admin/opsi/class_opsigeneric.inc:231
 msgid "The field 'Name' must contain a domain part!"
 msgstr "Das Feld 'Name' muß einen Domänen-Anteil enthalten!"
 
-#: admin/opsi/class_opsigeneric.inc:302 admin/opsi/class_opsigeneric.inc:303
-#: admin/opsi/class_opsigeneric.inc:305 admin/opsi/class_opsigeneric.inc:306
+#: admin/opsi/class_opsigeneric.inc:279 admin/opsi/class_opsigeneric.inc:280
+#: admin/opsi/class_opsigeneric.inc:282 admin/opsi/class_opsigeneric.inc:283
 msgid "OPSI"
 msgstr "OPSI"
 
-#: admin/opsi/class_opsigeneric.inc:423 admin/opsi/class_opsigeneric.inc:436
-#: admin/opsi/class_opsigeneric.inc:460 admin/opsi/class_opsigeneric.inc:471
-#: admin/opsi/class_opsigeneric.inc:477 admin/opsi/class_opsigeneric.inc:494
-#: admin/opsi/class_opsigeneric.inc:512 admin/opsi/class_opsigeneric.inc:518
-#: admin/opsi/class_opsigeneric.inc:547 admin/opsi/class_opsigeneric.inc:587
-#: admin/opsi/class_opsigeneric.inc:734
+#: admin/opsi/class_opsigeneric.inc:400 admin/opsi/class_opsigeneric.inc:413
+#: admin/opsi/class_opsigeneric.inc:437 admin/opsi/class_opsigeneric.inc:448
+#: admin/opsi/class_opsigeneric.inc:454 admin/opsi/class_opsigeneric.inc:471
+#: admin/opsi/class_opsigeneric.inc:489 admin/opsi/class_opsigeneric.inc:495
+#: admin/opsi/class_opsigeneric.inc:524 admin/opsi/class_opsigeneric.inc:564
+#: admin/opsi/class_opsigeneric.inc:711
 #: admin/opsiLicenses/class_licenseUsage.inc:61
 #: admin/opsiLicenses/class_licenseUsageByHost.inc:65
 #: admin/opsiLicenses/class_licenseUsageByHost.inc:74
@@ -150,26 +152,26 @@ msgstr "OPSI"
 #: admin/opsiLicenses/class_licensePoolGeneric.inc:454
 #: admin/opsiLicenses/class_licensePoolGeneric.inc:475
 #: admin/opsiLicenses/class_licensePoolGeneric.inc:502
-#: admin/opsiLicenses/class_opsiLicenses.inc:299
+#: admin/opsiLicenses/class_filterOpsiLicense.inc:32
 #: admin/opsiLicenses/class_licenseByProduct.inc:64
 msgid "Error"
 msgstr "Fehler"
 
-#: admin/opsi/class_opsigeneric.inc:760
+#: admin/opsi/class_opsigeneric.inc:737
 #: admin/opsiLicenses/class_licenseGeneric.inc:270
 #: admin/opsiLicenses/licensePoolGeneric.tpl:15
 msgid "Generic"
 msgstr "Allgemein"
 
-#: admin/opsi/class_opsigeneric.inc:761
+#: admin/opsi/class_opsigeneric.inc:738
 msgid "OPSI generic"
 msgstr "Allgemein"
 
-#: admin/opsi/class_opsigeneric.inc:773
+#: admin/opsi/class_opsigeneric.inc:750
 msgid "Note"
 msgstr "Notiz"
 
-#: admin/opsi/class_opsigeneric.inc:775
+#: admin/opsi/class_opsigeneric.inc:752
 msgid "Local product"
 msgstr "Lokales Produkt"
 
@@ -201,7 +203,7 @@ msgstr "Produkteigenschaften"
 msgid "Warning"
 msgstr "Warnung"
 
-#: admin/opsiLicenses/remove.tpl:7
+#: admin/opsiLicenses/remove.tpl:6
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
@@ -231,62 +233,10 @@ msgstr ""
 msgid "License usage"
 msgstr "Lizenznutzung"
 
-#: admin/opsiLicenses/class_divListLicenses.inc:52
-#: admin/opsiLicenses/class_divListLicenses.inc:53
-msgid "List of license pools"
-msgstr "Liste der Lizenzpools"
-
-#: admin/opsiLicenses/class_divListLicenses.inc:64
-msgid "Select all"
-msgstr "Alle auswählen"
-
-#: admin/opsiLicenses/class_divListLicenses.inc:70
-msgid "License pools"
-msgstr "Lizenzpools"
-
-#: admin/opsiLicenses/class_divListLicenses.inc:71
-#: admin/opsiLicenses/class_divListLicenses.inc:96
-msgid "Actions"
-msgstr "Aktionen"
-
-#: admin/opsiLicenses/class_divListLicenses.inc:75
-msgid "Regular expression for matching license pools"
-msgstr "Regulärer Ausdruck zum Erkennen von Lizenzpools"
-
-#: admin/opsiLicenses/class_divListLicenses.inc:101
-msgid "Create"
-msgstr "Anlegen"
-
-#: admin/opsiLicenses/class_divListLicenses.inc:103
-#: admin/opsiLicenses/class_divListLicenses.inc:173
-#: admin/opsiLicenses/class_opsiLicenses.inc:141
-#: admin/opsiLicenses/licenseGeneric.tpl:10
-msgid "License"
-msgstr "Lizenz"
-
-#: admin/opsiLicenses/class_divListLicenses.inc:111
-msgid "Remove"
-msgstr "Entfernen"
-
-#: admin/opsiLicenses/class_divListLicenses.inc:147
-msgid "edit"
-msgstr "Bearbeiten"
-
-#: admin/opsiLicenses/class_divListLicenses.inc:148
-msgid "Edit this entry"
-msgstr "Diesen Eintrag bearbeiten"
-
-#: admin/opsiLicenses/class_divListLicenses.inc:151
-msgid "delete"
-msgstr "Entfernen"
-
-#: admin/opsiLicenses/class_divListLicenses.inc:152
-msgid "Delete this entry"
-msgstr "Diesen Eintrag entfernen"
-
-#: admin/opsiLicenses/class_divListLicenses.inc:189
-msgid "Number of listed license pools"
-msgstr "Anzahl der angezeigten Lizenzpools"
+#: admin/opsiLicenses/opsiLicense-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filter"
 
 #: admin/opsiLicenses/class_licenseGeneric.inc:127
 #: admin/opsiLicenses/class_licensePoolGeneric.inc:271
@@ -337,6 +287,42 @@ msgstr "Benutzt von"
 msgid "License reservation"
 msgstr "Lizenzreservierung"
 
+#: admin/opsiLicenses/opsiLicense-list.xml:11
+msgid "List of license pools"
+msgstr "Liste der Lizenzpools"
+
+#: admin/opsiLicenses/opsiLicense-list.xml:15
+#: admin/opsiLicenses/opsiLicense-list.xml:74
+#: admin/opsiLicenses/licenseGeneric.tpl:10
+msgid "License"
+msgstr "Lizenz"
+
+#: admin/opsiLicenses/opsiLicense-list.xml:57
+msgid "Actions"
+msgstr "Aktionen"
+
+#: admin/opsiLicenses/opsiLicense-list.xml:68
+msgid "Create"
+msgstr "Anlegen"
+
+#: admin/opsiLicenses/opsiLicense-list.xml:86
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: admin/opsiLicenses/opsiLicense-list.xml:93
+msgid "Remove"
+msgstr "Entfernen"
+
+#: admin/opsiLicenses/opsiLicense-list.xml:108
+#, fuzzy
+msgid "Edit license"
+msgstr "Benutzer bearbeiten"
+
+#: admin/opsiLicenses/opsiLicense-list.xml:116
+#, fuzzy
+msgid "Remove license"
+msgstr "Benutzer entfernen"
+
 #: admin/opsiLicenses/class_licensePoolGeneric.inc:262
 msgid "unlimited"
 msgstr "unbegrenzt"
@@ -374,12 +360,6 @@ msgstr "Windows Software-IDs"
 msgid "Licenses"
 msgstr "Lizenzen"
 
-#: admin/opsiLicenses/main.inc:53 admin/opsiLicenses/main.inc:57
-#: admin/opsiLicenses/class_opsiLicenses.inc:26
-#: admin/opsiLicenses/class_opsiLicenses.inc:27
-msgid "Software licenses"
-msgstr "Softwarelizenzen"
-
 #: admin/opsiLicenses/licenseUsageByHost.tpl:14
 #: admin/opsiLicenses/licenseGeneric.tpl:217
 msgid "Reserved for"
@@ -389,13 +369,10 @@ msgstr "Reserviert für"
 msgid "Licenses used"
 msgstr "Verwendete Lizenzen"
 
-#: admin/opsiLicenses/class_opsiLicenses.inc:131
-msgid "Permission"
-msgstr "Berechtigung"
-
-#: admin/opsiLicenses/class_opsiLicenses.inc:174
-msgid "Permission error"
-msgstr "Berechtigungsfehler"
+#: admin/opsiLicenses/class_opsiLicenses.inc:25
+#: admin/opsiLicenses/class_opsiLicenses.inc:26
+msgid "Software licenses"
+msgstr "Softwarelizenzen"
 
 #: admin/opsiLicenses/licenseGeneric.tpl:33
 msgid "Partner"
@@ -435,5 +412,35 @@ msgstr "Installierte Produkte"
 msgid "License usage by product"
 msgstr "Lizenznutzung"
 
+#~ msgid "Select all"
+#~ msgstr "Alle auswählen"
+
+#~ msgid "License pools"
+#~ msgstr "Lizenzpools"
+
+#~ msgid "Regular expression for matching license pools"
+#~ msgstr "Regulärer Ausdruck zum Erkennen von Lizenzpools"
+
+#~ msgid "edit"
+#~ msgstr "Bearbeiten"
+
+#~ msgid "Edit this entry"
+#~ msgstr "Diesen Eintrag bearbeiten"
+
+#~ msgid "delete"
+#~ msgstr "Entfernen"
+
+#~ msgid "Delete this entry"
+#~ msgstr "Diesen Eintrag entfernen"
+
+#~ msgid "Number of listed license pools"
+#~ msgstr "Anzahl der angezeigten Lizenzpools"
+
+#~ msgid "Permission"
+#~ msgstr "Berechtigung"
+
+#~ msgid "Permission error"
+#~ msgstr "Berechtigungsfehler"
+
 #~ msgid "Usage"
 #~ msgstr "Nutzung"
diff --git a/gosa-plugins/opsi/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/opsi/locale/fr/LC_MESSAGES/messages.po
index d8517516b..c7cc8b7f0 100644
--- a/gosa-plugins/opsi/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/opsi/locale/fr/LC_MESSAGES/messages.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2009-10-06 17:15+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -45,10 +45,11 @@ msgid "Retry"
 msgstr "Réessayer"
 
 #: admin/opsi/generic.tpl:18 admin/opsi/generic.tpl:37
-#: admin/opsi/class_opsigeneric.inc:248 admin/opsi/class_opsigeneric.inc:253
-#: admin/opsi/class_opsigeneric.inc:256 admin/opsi/class_opsigeneric.inc:770
+#: admin/opsi/class_opsigeneric.inc:225 admin/opsi/class_opsigeneric.inc:230
+#: admin/opsi/class_opsigeneric.inc:233 admin/opsi/class_opsigeneric.inc:747
 #: admin/opsiLicenses/class_licenseGeneric.inc:232
 #: admin/opsiLicenses/class_licenseGeneric.inc:278
+#: admin/opsiLicenses/opsiLicense-list.xml:41
 #: admin/opsiLicenses/class_licensePoolGeneric.inc:527
 #: admin/opsiLicenses/licenseGeneric.tpl:19
 #: admin/opsiLicenses/licensePoolGeneric.tpl:18
@@ -56,11 +57,11 @@ msgid "Name"
 msgstr "Nom"
 
 #: admin/opsi/generic.tpl:27 admin/opsi/generic.tpl:46
-#: admin/opsi/class_opsigeneric.inc:262 admin/opsi/class_opsigeneric.inc:771
+#: admin/opsi/class_opsigeneric.inc:239 admin/opsi/class_opsigeneric.inc:748
 msgid "MAC address"
 msgstr "Adresse MAC"
 
-#: admin/opsi/generic.tpl:56 admin/opsi/class_opsigeneric.inc:774
+#: admin/opsi/generic.tpl:56 admin/opsi/class_opsigeneric.inc:751
 msgid "Netboot product"
 msgstr "Produit Netboot"
 
@@ -68,8 +69,9 @@ msgstr "Produit Netboot"
 msgid "Configure product"
 msgstr "Configurer le produit"
 
-#: admin/opsi/generic.tpl:80 admin/opsi/class_opsigeneric.inc:772
+#: admin/opsi/generic.tpl:80 admin/opsi/class_opsigeneric.inc:749
 #: admin/opsiLicenses/class_licenseGeneric.inc:279
+#: admin/opsiLicenses/opsiLicense-list.xml:49
 #: admin/opsiLicenses/class_licensePoolGeneric.inc:528
 #: admin/opsiLicenses/licenseGeneric.tpl:49
 #: admin/opsiLicenses/licensePoolGeneric.tpl:30
@@ -88,7 +90,7 @@ msgstr "Produits installés"
 msgid "Available products"
 msgstr "Produits disponibles"
 
-#: admin/opsi/generic.tpl:120 admin/opsi/class_opsigeneric.inc:776
+#: admin/opsi/generic.tpl:120 admin/opsi/class_opsigeneric.inc:753
 msgid "Action"
 msgstr ""
 
@@ -108,7 +110,7 @@ msgstr "Réveiller"
 msgid "Execute"
 msgstr "Exécuter"
 
-#: admin/opsi/class_opsi.inc:75 admin/opsi/class_opsigeneric.inc:766
+#: admin/opsi/class_opsi.inc:75 admin/opsi/class_opsigeneric.inc:743
 msgid "Opsi"
 msgstr ""
 
@@ -121,21 +123,21 @@ msgstr "Plus d'un serveur Opsi on été trouvés, j'utilise le premier '%s'."
 msgid "Service infrastructure"
 msgstr "Infrastructure de service"
 
-#: admin/opsi/class_opsigeneric.inc:254
+#: admin/opsi/class_opsigeneric.inc:231
 msgid "The field 'Name' must contain a domain part!"
 msgstr "Le champ 'nom' doit contenir le nom complet incluant le domaine !"
 
-#: admin/opsi/class_opsigeneric.inc:302 admin/opsi/class_opsigeneric.inc:303
-#: admin/opsi/class_opsigeneric.inc:305 admin/opsi/class_opsigeneric.inc:306
+#: admin/opsi/class_opsigeneric.inc:279 admin/opsi/class_opsigeneric.inc:280
+#: admin/opsi/class_opsigeneric.inc:282 admin/opsi/class_opsigeneric.inc:283
 msgid "OPSI"
 msgstr ""
 
-#: admin/opsi/class_opsigeneric.inc:423 admin/opsi/class_opsigeneric.inc:436
-#: admin/opsi/class_opsigeneric.inc:460 admin/opsi/class_opsigeneric.inc:471
-#: admin/opsi/class_opsigeneric.inc:477 admin/opsi/class_opsigeneric.inc:494
-#: admin/opsi/class_opsigeneric.inc:512 admin/opsi/class_opsigeneric.inc:518
-#: admin/opsi/class_opsigeneric.inc:547 admin/opsi/class_opsigeneric.inc:587
-#: admin/opsi/class_opsigeneric.inc:734
+#: admin/opsi/class_opsigeneric.inc:400 admin/opsi/class_opsigeneric.inc:413
+#: admin/opsi/class_opsigeneric.inc:437 admin/opsi/class_opsigeneric.inc:448
+#: admin/opsi/class_opsigeneric.inc:454 admin/opsi/class_opsigeneric.inc:471
+#: admin/opsi/class_opsigeneric.inc:489 admin/opsi/class_opsigeneric.inc:495
+#: admin/opsi/class_opsigeneric.inc:524 admin/opsi/class_opsigeneric.inc:564
+#: admin/opsi/class_opsigeneric.inc:711
 #: admin/opsiLicenses/class_licenseUsage.inc:61
 #: admin/opsiLicenses/class_licenseUsageByHost.inc:65
 #: admin/opsiLicenses/class_licenseUsageByHost.inc:74
@@ -150,26 +152,26 @@ msgstr ""
 #: admin/opsiLicenses/class_licensePoolGeneric.inc:454
 #: admin/opsiLicenses/class_licensePoolGeneric.inc:475
 #: admin/opsiLicenses/class_licensePoolGeneric.inc:502
-#: admin/opsiLicenses/class_opsiLicenses.inc:299
+#: admin/opsiLicenses/class_filterOpsiLicense.inc:32
 #: admin/opsiLicenses/class_licenseByProduct.inc:64
 msgid "Error"
 msgstr "Erreur"
 
-#: admin/opsi/class_opsigeneric.inc:760
+#: admin/opsi/class_opsigeneric.inc:737
 #: admin/opsiLicenses/class_licenseGeneric.inc:270
 #: admin/opsiLicenses/licensePoolGeneric.tpl:15
 msgid "Generic"
 msgstr "Informations"
 
-#: admin/opsi/class_opsigeneric.inc:761
+#: admin/opsi/class_opsigeneric.inc:738
 msgid "OPSI generic"
 msgstr "Informations OPSI"
 
-#: admin/opsi/class_opsigeneric.inc:773
+#: admin/opsi/class_opsigeneric.inc:750
 msgid "Note"
 msgstr ""
 
-#: admin/opsi/class_opsigeneric.inc:775
+#: admin/opsi/class_opsigeneric.inc:752
 msgid "Local product"
 msgstr "Produit local"
 
@@ -201,7 +203,7 @@ msgstr "Propriétés du produit"
 msgid "Warning"
 msgstr "Avertissement"
 
-#: admin/opsiLicenses/remove.tpl:7
+#: admin/opsiLicenses/remove.tpl:6
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
@@ -231,62 +233,10 @@ msgstr "Veuillez vérifier si le service Gosa (gosa-si) fonctionne."
 msgid "License usage"
 msgstr "Utilisation des Licences"
 
-#: admin/opsiLicenses/class_divListLicenses.inc:52
-#: admin/opsiLicenses/class_divListLicenses.inc:53
-msgid "List of license pools"
-msgstr "Liste des réservoir de licences"
-
-#: admin/opsiLicenses/class_divListLicenses.inc:64
-msgid "Select all"
-msgstr "Sélectionner tout"
-
-#: admin/opsiLicenses/class_divListLicenses.inc:70
-msgid "License pools"
-msgstr "Réservoir de licences"
-
-#: admin/opsiLicenses/class_divListLicenses.inc:71
-#: admin/opsiLicenses/class_divListLicenses.inc:96
-msgid "Actions"
-msgstr ""
-
-#: admin/opsiLicenses/class_divListLicenses.inc:75
-msgid "Regular expression for matching license pools"
-msgstr "Expression régulière concordant avec les "
-
-#: admin/opsiLicenses/class_divListLicenses.inc:101
-msgid "Create"
-msgstr "Créer"
-
-#: admin/opsiLicenses/class_divListLicenses.inc:103
-#: admin/opsiLicenses/class_divListLicenses.inc:173
-#: admin/opsiLicenses/class_opsiLicenses.inc:141
-#: admin/opsiLicenses/licenseGeneric.tpl:10
-msgid "License"
-msgstr "licence"
-
-#: admin/opsiLicenses/class_divListLicenses.inc:111
-msgid "Remove"
-msgstr "Supprimer"
-
-#: admin/opsiLicenses/class_divListLicenses.inc:147
-msgid "edit"
-msgstr "éditer"
-
-#: admin/opsiLicenses/class_divListLicenses.inc:148
-msgid "Edit this entry"
-msgstr "Editer cette entrée"
-
-#: admin/opsiLicenses/class_divListLicenses.inc:151
-msgid "delete"
-msgstr "supprimer"
-
-#: admin/opsiLicenses/class_divListLicenses.inc:152
-msgid "Delete this entry"
-msgstr "Supprimer cette entrée"
-
-#: admin/opsiLicenses/class_divListLicenses.inc:189
-msgid "Number of listed license pools"
-msgstr "Nombre de réservoir de licences listés"
+#: admin/opsiLicenses/opsiLicense-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filtres"
 
 #: admin/opsiLicenses/class_licenseGeneric.inc:127
 #: admin/opsiLicenses/class_licensePoolGeneric.inc:271
@@ -335,6 +285,42 @@ msgstr "Utilisé par"
 msgid "License reservation"
 msgstr "Réservation de licence"
 
+#: admin/opsiLicenses/opsiLicense-list.xml:11
+msgid "List of license pools"
+msgstr "Liste des réservoir de licences"
+
+#: admin/opsiLicenses/opsiLicense-list.xml:15
+#: admin/opsiLicenses/opsiLicense-list.xml:74
+#: admin/opsiLicenses/licenseGeneric.tpl:10
+msgid "License"
+msgstr "licence"
+
+#: admin/opsiLicenses/opsiLicense-list.xml:57
+msgid "Actions"
+msgstr ""
+
+#: admin/opsiLicenses/opsiLicense-list.xml:68
+msgid "Create"
+msgstr "Créer"
+
+#: admin/opsiLicenses/opsiLicense-list.xml:86
+msgid "Edit"
+msgstr "Editer"
+
+#: admin/opsiLicenses/opsiLicense-list.xml:93
+msgid "Remove"
+msgstr "Supprimer"
+
+#: admin/opsiLicenses/opsiLicense-list.xml:108
+#, fuzzy
+msgid "Edit license"
+msgstr "Editer cet utilisateur"
+
+#: admin/opsiLicenses/opsiLicense-list.xml:116
+#, fuzzy
+msgid "Remove license"
+msgstr "Suppression de l'utilisateur"
+
 #: admin/opsiLicenses/class_licensePoolGeneric.inc:262
 msgid "unlimited"
 msgstr "illimité"
@@ -371,12 +357,6 @@ msgstr "IDs logiciel Windows"
 msgid "Licenses"
 msgstr "licences"
 
-#: admin/opsiLicenses/main.inc:53 admin/opsiLicenses/main.inc:57
-#: admin/opsiLicenses/class_opsiLicenses.inc:26
-#: admin/opsiLicenses/class_opsiLicenses.inc:27
-msgid "Software licenses"
-msgstr "Licences logicielles"
-
 #: admin/opsiLicenses/licenseUsageByHost.tpl:14
 #: admin/opsiLicenses/licenseGeneric.tpl:217
 msgid "Reserved for"
@@ -386,13 +366,10 @@ msgstr "Réservé pour"
 msgid "Licenses used"
 msgstr "Licences utilisées"
 
-#: admin/opsiLicenses/class_opsiLicenses.inc:131
-msgid "Permission"
-msgstr "Permissions"
-
-#: admin/opsiLicenses/class_opsiLicenses.inc:174
-msgid "Permission error"
-msgstr "Erreur de permissions"
+#: admin/opsiLicenses/class_opsiLicenses.inc:25
+#: admin/opsiLicenses/class_opsiLicenses.inc:26
+msgid "Software licenses"
+msgstr "Licences logicielles"
 
 #: admin/opsiLicenses/licenseGeneric.tpl:33
 msgid "Partner"
@@ -431,3 +408,32 @@ msgstr "Utilisation par produit"
 msgid "License usage by product"
 msgstr "Utilisation des licences par produit"
 
+#~ msgid "Select all"
+#~ msgstr "Sélectionner tout"
+
+#~ msgid "License pools"
+#~ msgstr "Réservoir de licences"
+
+#~ msgid "Regular expression for matching license pools"
+#~ msgstr "Expression régulière concordant avec les "
+
+#~ msgid "edit"
+#~ msgstr "éditer"
+
+#~ msgid "Edit this entry"
+#~ msgstr "Editer cette entrée"
+
+#~ msgid "delete"
+#~ msgstr "supprimer"
+
+#~ msgid "Delete this entry"
+#~ msgstr "Supprimer cette entrée"
+
+#~ msgid "Number of listed license pools"
+#~ msgstr "Nombre de réservoir de licences listés"
+
+#~ msgid "Permission"
+#~ msgstr "Permissions"
+
+#~ msgid "Permission error"
+#~ msgstr "Erreur de permissions"
diff --git a/gosa-plugins/opsi/locale/messages.po b/gosa-plugins/opsi/locale/messages.po
index 05c61142a..90ac10ac6 100644
--- a/gosa-plugins/opsi/locale/messages.po
+++ b/gosa-plugins/opsi/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,10 +38,11 @@ msgid "Retry"
 msgstr ""
 
 #: admin/opsi/generic.tpl:18 admin/opsi/generic.tpl:37
-#: admin/opsi/class_opsigeneric.inc:248 admin/opsi/class_opsigeneric.inc:253
-#: admin/opsi/class_opsigeneric.inc:256 admin/opsi/class_opsigeneric.inc:770
+#: admin/opsi/class_opsigeneric.inc:225 admin/opsi/class_opsigeneric.inc:230
+#: admin/opsi/class_opsigeneric.inc:233 admin/opsi/class_opsigeneric.inc:747
 #: admin/opsiLicenses/class_licenseGeneric.inc:232
 #: admin/opsiLicenses/class_licenseGeneric.inc:278
+#: admin/opsiLicenses/opsiLicense-list.xml:41
 #: admin/opsiLicenses/class_licensePoolGeneric.inc:527
 #: admin/opsiLicenses/licenseGeneric.tpl:19
 #: admin/opsiLicenses/licensePoolGeneric.tpl:18
@@ -49,11 +50,11 @@ msgid "Name"
 msgstr ""
 
 #: admin/opsi/generic.tpl:27 admin/opsi/generic.tpl:46
-#: admin/opsi/class_opsigeneric.inc:262 admin/opsi/class_opsigeneric.inc:771
+#: admin/opsi/class_opsigeneric.inc:239 admin/opsi/class_opsigeneric.inc:748
 msgid "MAC address"
 msgstr ""
 
-#: admin/opsi/generic.tpl:56 admin/opsi/class_opsigeneric.inc:774
+#: admin/opsi/generic.tpl:56 admin/opsi/class_opsigeneric.inc:751
 msgid "Netboot product"
 msgstr ""
 
@@ -61,8 +62,9 @@ msgstr ""
 msgid "Configure product"
 msgstr ""
 
-#: admin/opsi/generic.tpl:80 admin/opsi/class_opsigeneric.inc:772
+#: admin/opsi/generic.tpl:80 admin/opsi/class_opsigeneric.inc:749
 #: admin/opsiLicenses/class_licenseGeneric.inc:279
+#: admin/opsiLicenses/opsiLicense-list.xml:49
 #: admin/opsiLicenses/class_licensePoolGeneric.inc:528
 #: admin/opsiLicenses/licenseGeneric.tpl:49
 #: admin/opsiLicenses/licensePoolGeneric.tpl:30
@@ -81,7 +83,7 @@ msgstr ""
 msgid "Available products"
 msgstr ""
 
-#: admin/opsi/generic.tpl:120 admin/opsi/class_opsigeneric.inc:776
+#: admin/opsi/generic.tpl:120 admin/opsi/class_opsigeneric.inc:753
 msgid "Action"
 msgstr ""
 
@@ -101,7 +103,7 @@ msgstr ""
 msgid "Execute"
 msgstr ""
 
-#: admin/opsi/class_opsi.inc:75 admin/opsi/class_opsigeneric.inc:766
+#: admin/opsi/class_opsi.inc:75 admin/opsi/class_opsigeneric.inc:743
 msgid "Opsi"
 msgstr ""
 
@@ -114,21 +116,21 @@ msgstr ""
 msgid "Service infrastructure"
 msgstr ""
 
-#: admin/opsi/class_opsigeneric.inc:254
+#: admin/opsi/class_opsigeneric.inc:231
 msgid "The field 'Name' must contain a domain part!"
 msgstr ""
 
-#: admin/opsi/class_opsigeneric.inc:302 admin/opsi/class_opsigeneric.inc:303
-#: admin/opsi/class_opsigeneric.inc:305 admin/opsi/class_opsigeneric.inc:306
+#: admin/opsi/class_opsigeneric.inc:279 admin/opsi/class_opsigeneric.inc:280
+#: admin/opsi/class_opsigeneric.inc:282 admin/opsi/class_opsigeneric.inc:283
 msgid "OPSI"
 msgstr ""
 
-#: admin/opsi/class_opsigeneric.inc:423 admin/opsi/class_opsigeneric.inc:436
-#: admin/opsi/class_opsigeneric.inc:460 admin/opsi/class_opsigeneric.inc:471
-#: admin/opsi/class_opsigeneric.inc:477 admin/opsi/class_opsigeneric.inc:494
-#: admin/opsi/class_opsigeneric.inc:512 admin/opsi/class_opsigeneric.inc:518
-#: admin/opsi/class_opsigeneric.inc:547 admin/opsi/class_opsigeneric.inc:587
-#: admin/opsi/class_opsigeneric.inc:734
+#: admin/opsi/class_opsigeneric.inc:400 admin/opsi/class_opsigeneric.inc:413
+#: admin/opsi/class_opsigeneric.inc:437 admin/opsi/class_opsigeneric.inc:448
+#: admin/opsi/class_opsigeneric.inc:454 admin/opsi/class_opsigeneric.inc:471
+#: admin/opsi/class_opsigeneric.inc:489 admin/opsi/class_opsigeneric.inc:495
+#: admin/opsi/class_opsigeneric.inc:524 admin/opsi/class_opsigeneric.inc:564
+#: admin/opsi/class_opsigeneric.inc:711
 #: admin/opsiLicenses/class_licenseUsage.inc:61
 #: admin/opsiLicenses/class_licenseUsageByHost.inc:65
 #: admin/opsiLicenses/class_licenseUsageByHost.inc:74
@@ -143,26 +145,26 @@ msgstr ""
 #: admin/opsiLicenses/class_licensePoolGeneric.inc:454
 #: admin/opsiLicenses/class_licensePoolGeneric.inc:475
 #: admin/opsiLicenses/class_licensePoolGeneric.inc:502
-#: admin/opsiLicenses/class_opsiLicenses.inc:299
+#: admin/opsiLicenses/class_filterOpsiLicense.inc:32
 #: admin/opsiLicenses/class_licenseByProduct.inc:64
 msgid "Error"
 msgstr ""
 
-#: admin/opsi/class_opsigeneric.inc:760
+#: admin/opsi/class_opsigeneric.inc:737
 #: admin/opsiLicenses/class_licenseGeneric.inc:270
 #: admin/opsiLicenses/licensePoolGeneric.tpl:15
 msgid "Generic"
 msgstr ""
 
-#: admin/opsi/class_opsigeneric.inc:761
+#: admin/opsi/class_opsigeneric.inc:738
 msgid "OPSI generic"
 msgstr ""
 
-#: admin/opsi/class_opsigeneric.inc:773
+#: admin/opsi/class_opsigeneric.inc:750
 msgid "Note"
 msgstr ""
 
-#: admin/opsi/class_opsigeneric.inc:775
+#: admin/opsi/class_opsigeneric.inc:752
 msgid "Local product"
 msgstr ""
 
@@ -194,7 +196,7 @@ msgstr ""
 msgid "Warning"
 msgstr ""
 
-#: admin/opsiLicenses/remove.tpl:7
+#: admin/opsiLicenses/remove.tpl:6
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
@@ -219,61 +221,8 @@ msgstr ""
 msgid "License usage"
 msgstr ""
 
-#: admin/opsiLicenses/class_divListLicenses.inc:52
-#: admin/opsiLicenses/class_divListLicenses.inc:53
-msgid "List of license pools"
-msgstr ""
-
-#: admin/opsiLicenses/class_divListLicenses.inc:64
-msgid "Select all"
-msgstr ""
-
-#: admin/opsiLicenses/class_divListLicenses.inc:70
-msgid "License pools"
-msgstr ""
-
-#: admin/opsiLicenses/class_divListLicenses.inc:71
-#: admin/opsiLicenses/class_divListLicenses.inc:96
-msgid "Actions"
-msgstr ""
-
-#: admin/opsiLicenses/class_divListLicenses.inc:75
-msgid "Regular expression for matching license pools"
-msgstr ""
-
-#: admin/opsiLicenses/class_divListLicenses.inc:101
-msgid "Create"
-msgstr ""
-
-#: admin/opsiLicenses/class_divListLicenses.inc:103
-#: admin/opsiLicenses/class_divListLicenses.inc:173
-#: admin/opsiLicenses/class_opsiLicenses.inc:141
-#: admin/opsiLicenses/licenseGeneric.tpl:10
-msgid "License"
-msgstr ""
-
-#: admin/opsiLicenses/class_divListLicenses.inc:111
-msgid "Remove"
-msgstr ""
-
-#: admin/opsiLicenses/class_divListLicenses.inc:147
-msgid "edit"
-msgstr ""
-
-#: admin/opsiLicenses/class_divListLicenses.inc:148
-msgid "Edit this entry"
-msgstr ""
-
-#: admin/opsiLicenses/class_divListLicenses.inc:151
-msgid "delete"
-msgstr ""
-
-#: admin/opsiLicenses/class_divListLicenses.inc:152
-msgid "Delete this entry"
-msgstr ""
-
-#: admin/opsiLicenses/class_divListLicenses.inc:189
-msgid "Number of listed license pools"
+#: admin/opsiLicenses/opsiLicense-filter.tpl:3
+msgid "Filter"
 msgstr ""
 
 #: admin/opsiLicenses/class_licenseGeneric.inc:127
@@ -323,6 +272,40 @@ msgstr ""
 msgid "License reservation"
 msgstr ""
 
+#: admin/opsiLicenses/opsiLicense-list.xml:11
+msgid "List of license pools"
+msgstr ""
+
+#: admin/opsiLicenses/opsiLicense-list.xml:15
+#: admin/opsiLicenses/opsiLicense-list.xml:74
+#: admin/opsiLicenses/licenseGeneric.tpl:10
+msgid "License"
+msgstr ""
+
+#: admin/opsiLicenses/opsiLicense-list.xml:57
+msgid "Actions"
+msgstr ""
+
+#: admin/opsiLicenses/opsiLicense-list.xml:68
+msgid "Create"
+msgstr ""
+
+#: admin/opsiLicenses/opsiLicense-list.xml:86
+msgid "Edit"
+msgstr ""
+
+#: admin/opsiLicenses/opsiLicense-list.xml:93
+msgid "Remove"
+msgstr ""
+
+#: admin/opsiLicenses/opsiLicense-list.xml:108
+msgid "Edit license"
+msgstr ""
+
+#: admin/opsiLicenses/opsiLicense-list.xml:116
+msgid "Remove license"
+msgstr ""
+
 #: admin/opsiLicenses/class_licensePoolGeneric.inc:262
 msgid "unlimited"
 msgstr ""
@@ -359,12 +342,6 @@ msgstr ""
 msgid "Licenses"
 msgstr ""
 
-#: admin/opsiLicenses/main.inc:53 admin/opsiLicenses/main.inc:57
-#: admin/opsiLicenses/class_opsiLicenses.inc:26
-#: admin/opsiLicenses/class_opsiLicenses.inc:27
-msgid "Software licenses"
-msgstr ""
-
 #: admin/opsiLicenses/licenseUsageByHost.tpl:14
 #: admin/opsiLicenses/licenseGeneric.tpl:217
 msgid "Reserved for"
@@ -374,12 +351,9 @@ msgstr ""
 msgid "Licenses used"
 msgstr ""
 
-#: admin/opsiLicenses/class_opsiLicenses.inc:131
-msgid "Permission"
-msgstr ""
-
-#: admin/opsiLicenses/class_opsiLicenses.inc:174
-msgid "Permission error"
+#: admin/opsiLicenses/class_opsiLicenses.inc:25
+#: admin/opsiLicenses/class_opsiLicenses.inc:26
+msgid "Software licenses"
 msgstr ""
 
 #: admin/opsiLicenses/licenseGeneric.tpl:33
diff --git a/gosa-plugins/phpgw/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/phpgw/locale/de/LC_MESSAGES/messages.po
index bbdb5afa2..ada6807a2 100644
--- a/gosa-plugins/phpgw/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpgw/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2008-04-03 14:24+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
diff --git a/gosa-plugins/phpgw/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/phpgw/locale/es/LC_MESSAGES/messages.po
index 912c1dfd0..d19ef33b1 100644
--- a/gosa-plugins/phpgw/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpgw/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
diff --git a/gosa-plugins/phpgw/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/phpgw/locale/fr/LC_MESSAGES/messages.po
index 45de02207..c41cea0d0 100644
--- a/gosa-plugins/phpgw/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpgw/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2009-06-30 11:28+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
diff --git a/gosa-plugins/phpgw/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/phpgw/locale/it/LC_MESSAGES/messages.po
index 1f1c71d57..4294e6b27 100644
--- a/gosa-plugins/phpgw/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpgw/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
diff --git a/gosa-plugins/phpgw/locale/messages.po b/gosa-plugins/phpgw/locale/messages.po
index f81e5c6bc..c901c392a 100644
--- a/gosa-plugins/phpgw/locale/messages.po
+++ b/gosa-plugins/phpgw/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gosa-plugins/phpgw/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/phpgw/locale/nl/LC_MESSAGES/messages.po
index 37d9da16c..e44e322f4 100644
--- a/gosa-plugins/phpgw/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpgw/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
diff --git a/gosa-plugins/phpgw/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/phpgw/locale/pl/LC_MESSAGES/messages.po
index 76292ac58..e490918a5 100644
--- a/gosa-plugins/phpgw/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpgw/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
diff --git a/gosa-plugins/phpgw/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/phpgw/locale/ru/LC_MESSAGES/messages.po
index 4abaef317..ff4574e69 100644
--- a/gosa-plugins/phpgw/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpgw/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
diff --git a/gosa-plugins/phpgw/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/phpgw/locale/zh/LC_MESSAGES/messages.po
index aa1655caf..ab479de78 100644
--- a/gosa-plugins/phpgw/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpgw/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:05+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
diff --git a/gosa-plugins/phpscheduleit/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/phpscheduleit/locale/de/LC_MESSAGES/messages.po
index 966c8c42a..1bc8897c8 100644
--- a/gosa-plugins/phpscheduleit/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpscheduleit/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2008-04-03 16:03+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
diff --git a/gosa-plugins/phpscheduleit/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/phpscheduleit/locale/es/LC_MESSAGES/messages.po
index c5c524b37..3f6427cc4 100644
--- a/gosa-plugins/phpscheduleit/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpscheduleit/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
diff --git a/gosa-plugins/phpscheduleit/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/phpscheduleit/locale/fr/LC_MESSAGES/messages.po
index 6009353c4..ee5952bf8 100644
--- a/gosa-plugins/phpscheduleit/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpscheduleit/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2008-06-08 15:37+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
diff --git a/gosa-plugins/phpscheduleit/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/phpscheduleit/locale/it/LC_MESSAGES/messages.po
index d3b130ddd..2dabcf7d3 100644
--- a/gosa-plugins/phpscheduleit/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpscheduleit/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
diff --git a/gosa-plugins/phpscheduleit/locale/messages.po b/gosa-plugins/phpscheduleit/locale/messages.po
index d2c6f7c71..3c13ca9bf 100644
--- a/gosa-plugins/phpscheduleit/locale/messages.po
+++ b/gosa-plugins/phpscheduleit/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gosa-plugins/phpscheduleit/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/phpscheduleit/locale/nl/LC_MESSAGES/messages.po
index 38cbd462b..210d16973 100644
--- a/gosa-plugins/phpscheduleit/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpscheduleit/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
diff --git a/gosa-plugins/phpscheduleit/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/phpscheduleit/locale/pl/LC_MESSAGES/messages.po
index 0f115ac25..b573c8b74 100644
--- a/gosa-plugins/phpscheduleit/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpscheduleit/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
diff --git a/gosa-plugins/phpscheduleit/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/phpscheduleit/locale/ru/LC_MESSAGES/messages.po
index c5f885a24..c066782cd 100644
--- a/gosa-plugins/phpscheduleit/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpscheduleit/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
diff --git a/gosa-plugins/phpscheduleit/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/phpscheduleit/locale/zh/LC_MESSAGES/messages.po
index b23842e27..910cda200 100644
--- a/gosa-plugins/phpscheduleit/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpscheduleit/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
diff --git a/gosa-plugins/pptp/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/pptp/locale/de/LC_MESSAGES/messages.po
index 2e05ec387..ba8aef483 100644
--- a/gosa-plugins/pptp/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pptp/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2008-04-03 16:13+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
diff --git a/gosa-plugins/pptp/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/pptp/locale/es/LC_MESSAGES/messages.po
index af89425ab..23cbade01 100644
--- a/gosa-plugins/pptp/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pptp/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
diff --git a/gosa-plugins/pptp/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/pptp/locale/fr/LC_MESSAGES/messages.po
index 978f77985..0844416ae 100644
--- a/gosa-plugins/pptp/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pptp/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2008-06-08 15:38+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
diff --git a/gosa-plugins/pptp/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/pptp/locale/it/LC_MESSAGES/messages.po
index 8f8636149..e6039e13c 100644
--- a/gosa-plugins/pptp/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pptp/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
diff --git a/gosa-plugins/pptp/locale/messages.po b/gosa-plugins/pptp/locale/messages.po
index 4ed90f720..d91d281e3 100644
--- a/gosa-plugins/pptp/locale/messages.po
+++ b/gosa-plugins/pptp/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gosa-plugins/pptp/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/pptp/locale/nl/LC_MESSAGES/messages.po
index c41d1d6f2..63a24e5fa 100644
--- a/gosa-plugins/pptp/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pptp/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
diff --git a/gosa-plugins/pptp/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/pptp/locale/pl/LC_MESSAGES/messages.po
index aeec805ae..aa7f4b881 100644
--- a/gosa-plugins/pptp/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pptp/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
diff --git a/gosa-plugins/pptp/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/pptp/locale/ru/LC_MESSAGES/messages.po
index 58337431c..60f28737f 100644
--- a/gosa-plugins/pptp/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pptp/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
diff --git a/gosa-plugins/pptp/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/pptp/locale/zh/LC_MESSAGES/messages.po
index 7cb62d3a6..c7e2a34f3 100644
--- a/gosa-plugins/pptp/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pptp/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:37+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
diff --git a/gosa-plugins/pureftpd/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/pureftpd/locale/de/LC_MESSAGES/messages.po
index 018400565..cab22ad16 100644
--- a/gosa-plugins/pureftpd/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pureftpd/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:38+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2008-04-03 14:25+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
diff --git a/gosa-plugins/pureftpd/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/pureftpd/locale/es/LC_MESSAGES/messages.po
index c2e1fc6d2..ffab633dd 100644
--- a/gosa-plugins/pureftpd/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pureftpd/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:38+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
diff --git a/gosa-plugins/pureftpd/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/pureftpd/locale/fr/LC_MESSAGES/messages.po
index 66d41cad0..077b00bb6 100644
--- a/gosa-plugins/pureftpd/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pureftpd/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:38+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2008-07-24 01:32+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: french <fr@li.org>\n"
diff --git a/gosa-plugins/pureftpd/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/pureftpd/locale/it/LC_MESSAGES/messages.po
index f94426d88..b74595c24 100644
--- a/gosa-plugins/pureftpd/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pureftpd/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:38+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
diff --git a/gosa-plugins/pureftpd/locale/messages.po b/gosa-plugins/pureftpd/locale/messages.po
index a2cf4387f..85542a1b6 100644
--- a/gosa-plugins/pureftpd/locale/messages.po
+++ b/gosa-plugins/pureftpd/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:38+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gosa-plugins/pureftpd/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/pureftpd/locale/nl/LC_MESSAGES/messages.po
index 3994a6f87..541f9be02 100644
--- a/gosa-plugins/pureftpd/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pureftpd/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:38+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
diff --git a/gosa-plugins/pureftpd/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/pureftpd/locale/pl/LC_MESSAGES/messages.po
index 417e844a5..03e1d6a12 100644
--- a/gosa-plugins/pureftpd/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pureftpd/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:38+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
diff --git a/gosa-plugins/pureftpd/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/pureftpd/locale/ru/LC_MESSAGES/messages.po
index b75ddd0f1..bd21c7688 100644
--- a/gosa-plugins/pureftpd/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pureftpd/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:38+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
diff --git a/gosa-plugins/pureftpd/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/pureftpd/locale/zh/LC_MESSAGES/messages.po
index b3cef2d11..b9182b9b5 100644
--- a/gosa-plugins/pureftpd/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pureftpd/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:38+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
diff --git a/gosa-plugins/rolemanagement/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/rolemanagement/locale/de/LC_MESSAGES/messages.po
index f9be70f56..14aec353a 100644
--- a/gosa-plugins/rolemanagement/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/rolemanagement/locale/de/LC_MESSAGES/messages.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:38+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2009-07-03 17:31+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: de <kde-i18n-de@kde.org>\n"
@@ -23,36 +23,20 @@ msgstr ""
 "X-Generator: Lokalize 0.3\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: admin/roleManagement/class_roleManagement.inc:26
-#: admin/roleManagement/class_roleGeneric.inc:389
-#: admin/roleManagement/main.inc:53
+#: admin/roleManagement/class_roleManagement.inc:25
+#: admin/roleManagement/class_roleGeneric.inc:401
 msgid "Roles"
 msgstr "Rollen"
 
-#: admin/roleManagement/class_roleManagement.inc:27
-msgid "Manage roles"
-msgstr "Rollen verwalten"
-
-#: admin/roleManagement/class_roleManagement.inc:162
-msgid "Permission"
-msgstr "Berechtigung"
-
-#: admin/roleManagement/class_roleManagement.inc:178
-#: admin/roleManagement/class_divListRole.inc:70
-#: admin/roleManagement/class_divListRole.inc:117
-#: admin/roleManagement/class_divListRole.inc:205
-msgid "Role"
-msgstr "Rolle"
-
-#: admin/roleManagement/class_roleManagement.inc:212
-msgid "Permission error"
-msgstr "Berechtigungsfehler"
+#: admin/roleManagement/class_roleManagement.inc:26
+msgid "Role management"
+msgstr "Rollen-Verwaltung"
 
 #: admin/roleManagement/remove.tpl:2
 msgid "Warning"
 msgstr "Warnung"
 
-#: admin/roleManagement/remove.tpl:7
+#: admin/roleManagement/remove.tpl:6
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
@@ -66,129 +50,114 @@ msgstr ""
 "Wenn Sie sicher sind, drücken Sie 'Entfernen' um fortzufahren oder "
 "'Abbrechen' zum Abbruch."
 
-#: admin/roleManagement/class_roleGeneric.inc:216
-#: admin/roleManagement/class_roleGeneric.inc:225
-#: admin/roleManagement/class_roleGeneric.inc:392
+#: admin/roleManagement/class_roleGeneric.inc:220
+#: admin/roleManagement/class_roleGeneric.inc:229
+#: admin/roleManagement/class_roleGeneric.inc:404
+#: admin/roleManagement/role-list.xml:41
 #: admin/roleManagement/roleGeneric.tpl:11
 msgid "Name"
 msgstr "Name"
 
-#: admin/roleManagement/class_roleGeneric.inc:246
+#: admin/roleManagement/class_roleGeneric.inc:250
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: admin/roleManagement/class_roleGeneric.inc:264
-#: admin/roleManagement/class_roleGeneric.inc:298
+#: admin/roleManagement/class_roleGeneric.inc:268
+#: admin/roleManagement/class_roleGeneric.inc:310
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: admin/roleManagement/class_roleGeneric.inc:383
+#: admin/roleManagement/class_roleGeneric.inc:395
 #: admin/roleManagement/roleGeneric.tpl:6
 msgid "Generic"
 msgstr "Allgemein"
 
-#: admin/roleManagement/class_roleGeneric.inc:384
+#: admin/roleManagement/class_roleGeneric.inc:396
 msgid "Role generic"
 msgstr "Allgemeine Rolleneinstellungen"
 
-#: admin/roleManagement/class_roleGeneric.inc:393
+#: admin/roleManagement/class_roleGeneric.inc:405
+#: admin/roleManagement/role-list.xml:49
 #: admin/roleManagement/roleGeneric.tpl:19
 msgid "Description"
 msgstr "Beschreibung"
 
-#: admin/roleManagement/class_roleGeneric.inc:394
-#: admin/roleManagement/class_divListRole.inc:104
+#: admin/roleManagement/class_roleGeneric.inc:406
+#: admin/roleManagement/role-list.tpl:13
 #: admin/roleManagement/roleGeneric.tpl:29
 msgid "Base"
 msgstr "Basis"
 
-#: admin/roleManagement/class_roleGeneric.inc:395
+#: admin/roleManagement/class_roleGeneric.inc:407
 msgid "Telefon number"
 msgstr "Telefonnummer"
 
-#: admin/roleManagement/class_roleGeneric.inc:396
+#: admin/roleManagement/class_roleGeneric.inc:408
 #: admin/roleManagement/roleGeneric.tpl:56
 msgid "Fax number"
 msgstr "Faxnummer"
 
-#: admin/roleManagement/class_roleGeneric.inc:397
+#: admin/roleManagement/class_roleGeneric.inc:409
 #: admin/roleManagement/roleGeneric.tpl:68
 msgid "Occupants"
 msgstr "Rollen-Inhaber"
 
-#: admin/roleManagement/paste_generic.tpl:4
-msgid "Group name"
-msgstr "Gruppenname"
-
-#: admin/roleManagement/paste_generic.tpl:7
-msgid "Please enter the new object group name"
-msgstr "Bitte geben Sie einen Namen für die neue Objektgruppe ein"
-
-#: admin/roleManagement/class_divListRole.inc:52
-#: admin/roleManagement/class_divListRole.inc:53
+#: admin/roleManagement/role-list.xml:11
 msgid "List of roles"
 msgstr "Liste der Rollen"
 
-#: admin/roleManagement/class_divListRole.inc:64
-msgid "Select all"
-msgstr "Alle auswählen"
-
-#: admin/roleManagement/class_divListRole.inc:70
-msgid "Department"
-msgstr "Abteilung"
+#: admin/roleManagement/role-list.xml:15 admin/roleManagement/role-list.xml:74
+msgid "Role"
+msgstr "Rolle"
 
-#: admin/roleManagement/class_divListRole.inc:71
-#: admin/roleManagement/class_divListRole.inc:110
+#: admin/roleManagement/role-list.xml:57
 msgid "Actions"
 msgstr "Aktionen"
 
-#: admin/roleManagement/class_divListRole.inc:80
-msgid "Regular expression for matching role names"
-msgstr "Regulärer Ausdruck zum Erkennen von Rollennamen"
-
-#: admin/roleManagement/class_divListRole.inc:107
-msgid "Submit department"
-msgstr "Aktualisieren"
-
-#: admin/roleManagement/class_divListRole.inc:107
-msgid "Submit"
-msgstr "Übertragen"
-
-#: admin/roleManagement/class_divListRole.inc:115
+#: admin/roleManagement/role-list.xml:68
 msgid "Create"
 msgstr "Anlegen"
 
-#: admin/roleManagement/class_divListRole.inc:123
+#: admin/roleManagement/role-list.xml:86
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: admin/roleManagement/role-list.xml:93
 msgid "Remove"
 msgstr "Entfernen"
 
-#: admin/roleManagement/class_divListRole.inc:168
-msgid "edit"
-msgstr "Bearbeiten"
+#: admin/roleManagement/role-list.xml:125
+#, fuzzy
+msgid "Edit role"
+msgstr "ACL-Rolle bearbeiten"
 
-#: admin/roleManagement/class_divListRole.inc:169
-msgid "Edit this entry"
-msgstr "Diesen Eintrag bearbeiten"
+#: admin/roleManagement/role-list.xml:138
+#, fuzzy
+msgid "Remove role"
+msgstr "Benutzer entfernen"
 
-#: admin/roleManagement/class_divListRole.inc:174
-msgid "delete"
-msgstr "Entfernen"
+#: admin/roleManagement/role-list.tpl:13
+msgid "Update"
+msgstr "Aktualisieren"
 
-#: admin/roleManagement/class_divListRole.inc:175
-msgid "Delete this entry"
-msgstr "Diesen Eintrag entfernen"
+#: admin/roleManagement/role-list.tpl:13
+msgid "Submit"
+msgstr "Übertragen"
 
-#: admin/roleManagement/class_divListRole.inc:222
-msgid "Number of listed roles"
-msgstr "Anzahl der angezeigten Rollen"
+#: admin/roleManagement/paste_generic.tpl:4
+#, fuzzy
+msgid "Role name"
+msgstr "Rollen-Verwaltung"
 
-#: admin/roleManagement/class_divListRole.inc:223
-msgid "Number of listed departments"
-msgstr "Anzahl der angezeigten Abteilungen"
+#: admin/roleManagement/paste_generic.tpl:7
+#, fuzzy
+msgid "Please enter the new object role name"
+msgstr "Bitte geben Sie einen Namen für die neue Objektgruppe ein"
 
-#: admin/roleManagement/main.inc:57
-msgid "Role management"
-msgstr "Rollen-Verwaltung"
+#: admin/roleManagement/role-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filter"
 
 #: admin/roleManagement/roleGeneric.tpl:34
 msgid "Choose subtree to place user in"
@@ -233,3 +202,45 @@ msgstr "Zeige die Objekte, auf die Folgendes passt"
 #: admin/roleManagement/occupantSelect.tpl:35
 msgid "Regular expression for matching object names"
 msgstr "Regulärer Ausdruck zum Erkennen von Objekt-Namen"
+
+#~ msgid "Manage roles"
+#~ msgstr "Rollen verwalten"
+
+#~ msgid "Permission"
+#~ msgstr "Berechtigung"
+
+#~ msgid "Permission error"
+#~ msgstr "Berechtigungsfehler"
+
+#~ msgid "Group name"
+#~ msgstr "Gruppenname"
+
+#~ msgid "Select all"
+#~ msgstr "Alle auswählen"
+
+#~ msgid "Department"
+#~ msgstr "Abteilung"
+
+#~ msgid "Regular expression for matching role names"
+#~ msgstr "Regulärer Ausdruck zum Erkennen von Rollennamen"
+
+#~ msgid "Submit department"
+#~ msgstr "Aktualisieren"
+
+#~ msgid "edit"
+#~ msgstr "Bearbeiten"
+
+#~ msgid "Edit this entry"
+#~ msgstr "Diesen Eintrag bearbeiten"
+
+#~ msgid "delete"
+#~ msgstr "Entfernen"
+
+#~ msgid "Delete this entry"
+#~ msgstr "Diesen Eintrag entfernen"
+
+#~ msgid "Number of listed roles"
+#~ msgstr "Anzahl der angezeigten Rollen"
+
+#~ msgid "Number of listed departments"
+#~ msgstr "Anzahl der angezeigten Abteilungen"
diff --git a/gosa-plugins/rolemanagement/locale/en/LC_MESSAGES/messages.po b/gosa-plugins/rolemanagement/locale/en/LC_MESSAGES/messages.po
index c250e6d3a..20b984b26 100644
--- a/gosa-plugins/rolemanagement/locale/en/LC_MESSAGES/messages.po
+++ b/gosa-plugins/rolemanagement/locale/en/LC_MESSAGES/messages.po
@@ -1,33 +1,17 @@
-#: admin/roleManagement/class_roleManagement.inc:26
-#: admin/roleManagement/class_roleGeneric.inc:389
-#: admin/roleManagement/main.inc:53
+#: admin/roleManagement/class_roleManagement.inc:25
+#: admin/roleManagement/class_roleGeneric.inc:401
 msgid "Roles"
 msgstr ""
 
-#: admin/roleManagement/class_roleManagement.inc:27
-msgid "Manage roles"
-msgstr ""
-
-#: admin/roleManagement/class_roleManagement.inc:162
-msgid "Permission"
-msgstr ""
-
-#: admin/roleManagement/class_roleManagement.inc:178
-#: admin/roleManagement/class_divListRole.inc:70
-#: admin/roleManagement/class_divListRole.inc:117
-#: admin/roleManagement/class_divListRole.inc:205
-msgid "Role"
-msgstr ""
-
-#: admin/roleManagement/class_roleManagement.inc:212
-msgid "Permission error"
+#: admin/roleManagement/class_roleManagement.inc:26
+msgid "Role management"
 msgstr ""
 
 #: admin/roleManagement/remove.tpl:2
 msgid "Warning"
 msgstr ""
 
-#: admin/roleManagement/remove.tpl:7
+#: admin/roleManagement/remove.tpl:6
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
@@ -37,128 +21,108 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:216
-#: admin/roleManagement/class_roleGeneric.inc:225
-#: admin/roleManagement/class_roleGeneric.inc:392
+#: admin/roleManagement/class_roleGeneric.inc:220
+#: admin/roleManagement/class_roleGeneric.inc:229
+#: admin/roleManagement/class_roleGeneric.inc:404
+#: admin/roleManagement/role-list.xml:41
 #: admin/roleManagement/roleGeneric.tpl:11
 msgid "Name"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:246
+#: admin/roleManagement/class_roleGeneric.inc:250
 msgid "Unknown"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:264
-#: admin/roleManagement/class_roleGeneric.inc:298
+#: admin/roleManagement/class_roleGeneric.inc:268
+#: admin/roleManagement/class_roleGeneric.inc:310
 msgid "LDAP error"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:383
+#: admin/roleManagement/class_roleGeneric.inc:395
 #: admin/roleManagement/roleGeneric.tpl:6
 msgid "Generic"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:384
+#: admin/roleManagement/class_roleGeneric.inc:396
 msgid "Role generic"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:393
+#: admin/roleManagement/class_roleGeneric.inc:405
+#: admin/roleManagement/role-list.xml:49
 #: admin/roleManagement/roleGeneric.tpl:19
 msgid "Description"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:394
-#: admin/roleManagement/class_divListRole.inc:104
+#: admin/roleManagement/class_roleGeneric.inc:406
+#: admin/roleManagement/role-list.tpl:13
 #: admin/roleManagement/roleGeneric.tpl:29
 msgid "Base"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:395
+#: admin/roleManagement/class_roleGeneric.inc:407
 msgid "Telefon number"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:396
+#: admin/roleManagement/class_roleGeneric.inc:408
 #: admin/roleManagement/roleGeneric.tpl:56
 msgid "Fax number"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:397
+#: admin/roleManagement/class_roleGeneric.inc:409
 #: admin/roleManagement/roleGeneric.tpl:68
 msgid "Occupants"
 msgstr ""
 
-#: admin/roleManagement/paste_generic.tpl:4
-msgid "Group name"
-msgstr ""
-
-#: admin/roleManagement/paste_generic.tpl:7
-msgid "Please enter the new object group name"
-msgstr ""
-
-#: admin/roleManagement/class_divListRole.inc:52
-#: admin/roleManagement/class_divListRole.inc:53
+#: admin/roleManagement/role-list.xml:11
 msgid "List of roles"
 msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:64
-msgid "Select all"
-msgstr ""
-
-#: admin/roleManagement/class_divListRole.inc:70
-msgid "Department"
+#: admin/roleManagement/role-list.xml:15 admin/roleManagement/role-list.xml:74
+msgid "Role"
 msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:71
-#: admin/roleManagement/class_divListRole.inc:110
+#: admin/roleManagement/role-list.xml:57
 msgid "Actions"
 msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:80
-msgid "Regular expression for matching role names"
-msgstr ""
-
-#: admin/roleManagement/class_divListRole.inc:107
-msgid "Submit department"
-msgstr ""
-
-#: admin/roleManagement/class_divListRole.inc:107
-msgid "Submit"
+#: admin/roleManagement/role-list.xml:68
+msgid "Create"
 msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:115
-msgid "Create"
+#: admin/roleManagement/role-list.xml:86
+msgid "Edit"
 msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:123
+#: admin/roleManagement/role-list.xml:93
 msgid "Remove"
 msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:168
-msgid "edit"
+#: admin/roleManagement/role-list.xml:125
+msgid "Edit role"
 msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:169
-msgid "Edit this entry"
+#: admin/roleManagement/role-list.xml:138
+msgid "Remove role"
 msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:174
-msgid "delete"
+#: admin/roleManagement/role-list.tpl:13
+msgid "Update"
 msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:175
-msgid "Delete this entry"
+#: admin/roleManagement/role-list.tpl:13
+msgid "Submit"
 msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:222
-msgid "Number of listed roles"
+#: admin/roleManagement/paste_generic.tpl:4
+msgid "Role name"
 msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:223
-msgid "Number of listed departments"
+#: admin/roleManagement/paste_generic.tpl:7
+msgid "Please enter the new object role name"
 msgstr ""
 
-#: admin/roleManagement/main.inc:57
-msgid "Role management"
+#: admin/roleManagement/role-filter.tpl:3
+msgid "Filter"
 msgstr ""
 
 #: admin/roleManagement/roleGeneric.tpl:34
diff --git a/gosa-plugins/rolemanagement/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/rolemanagement/locale/es/LC_MESSAGES/messages.po
index 4e1c6f321..87f2fb485 100644
--- a/gosa-plugins/rolemanagement/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/rolemanagement/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:38+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2008-12-08 11:29+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <kde-i18n-doc@lists.kde.org>\n"
@@ -18,38 +18,22 @@ msgstr ""
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/roleManagement/class_roleManagement.inc:26
-#: admin/roleManagement/class_roleGeneric.inc:389
-#: admin/roleManagement/main.inc:53
+#: admin/roleManagement/class_roleManagement.inc:25
+#: admin/roleManagement/class_roleGeneric.inc:401
 #, fuzzy
 msgid "Roles"
 msgstr "Rol"
 
-#: admin/roleManagement/class_roleManagement.inc:27
+#: admin/roleManagement/class_roleManagement.inc:26
 #, fuzzy
-msgid "Manage roles"
-msgstr "Usuarios del dominio"
-
-#: admin/roleManagement/class_roleManagement.inc:162
-msgid "Permission"
-msgstr "Permiso"
-
-#: admin/roleManagement/class_roleManagement.inc:178
-#: admin/roleManagement/class_divListRole.inc:70
-#: admin/roleManagement/class_divListRole.inc:117
-#: admin/roleManagement/class_divListRole.inc:205
-msgid "Role"
-msgstr "Rol"
-
-#: admin/roleManagement/class_roleManagement.inc:212
-msgid "Permission error"
-msgstr "Error de Permisos"
+msgid "Role management"
+msgstr "Administración de ACL"
 
 #: admin/roleManagement/remove.tpl:2
 msgid "Warning"
 msgstr "Aviso"
 
-#: admin/roleManagement/remove.tpl:7
+#: admin/roleManagement/remove.tpl:6
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
@@ -63,134 +47,115 @@ msgstr ""
 "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o "
 "<i>Cancelar</i> para Abortar."
 
-#: admin/roleManagement/class_roleGeneric.inc:216
-#: admin/roleManagement/class_roleGeneric.inc:225
-#: admin/roleManagement/class_roleGeneric.inc:392
+#: admin/roleManagement/class_roleGeneric.inc:220
+#: admin/roleManagement/class_roleGeneric.inc:229
+#: admin/roleManagement/class_roleGeneric.inc:404
+#: admin/roleManagement/role-list.xml:41
 #: admin/roleManagement/roleGeneric.tpl:11
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/roleManagement/class_roleGeneric.inc:246
+#: admin/roleManagement/class_roleGeneric.inc:250
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: admin/roleManagement/class_roleGeneric.inc:264
-#: admin/roleManagement/class_roleGeneric.inc:298
+#: admin/roleManagement/class_roleGeneric.inc:268
+#: admin/roleManagement/class_roleGeneric.inc:310
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: admin/roleManagement/class_roleGeneric.inc:383
+#: admin/roleManagement/class_roleGeneric.inc:395
 #: admin/roleManagement/roleGeneric.tpl:6
 msgid "Generic"
 msgstr "Genérico"
 
-#: admin/roleManagement/class_roleGeneric.inc:384
+#: admin/roleManagement/class_roleGeneric.inc:396
 #, fuzzy
 msgid "Role generic"
 msgstr "Nombre del Rol"
 
-#: admin/roleManagement/class_roleGeneric.inc:393
+#: admin/roleManagement/class_roleGeneric.inc:405
+#: admin/roleManagement/role-list.xml:49
 #: admin/roleManagement/roleGeneric.tpl:19
 msgid "Description"
 msgstr "Descripción"
 
-#: admin/roleManagement/class_roleGeneric.inc:394
-#: admin/roleManagement/class_divListRole.inc:104
+#: admin/roleManagement/class_roleGeneric.inc:406
+#: admin/roleManagement/role-list.tpl:13
 #: admin/roleManagement/roleGeneric.tpl:29
 msgid "Base"
 msgstr "Base"
 
-#: admin/roleManagement/class_roleGeneric.inc:395
+#: admin/roleManagement/class_roleGeneric.inc:407
 msgid "Telefon number"
 msgstr "Número de teléfono"
 
-#: admin/roleManagement/class_roleGeneric.inc:396
+#: admin/roleManagement/class_roleGeneric.inc:408
 #: admin/roleManagement/roleGeneric.tpl:56
 msgid "Fax number"
 msgstr "Número de Fax"
 
-#: admin/roleManagement/class_roleGeneric.inc:397
+#: admin/roleManagement/class_roleGeneric.inc:409
 #: admin/roleManagement/roleGeneric.tpl:68
 msgid "Occupants"
 msgstr ""
 
-#: admin/roleManagement/paste_generic.tpl:4
-msgid "Group name"
-msgstr "Nombre del grupo"
-
-#: admin/roleManagement/paste_generic.tpl:7
-msgid "Please enter the new object group name"
-msgstr "Por favor introduzca un nuevo nombre del grupo de objetos"
-
-#: admin/roleManagement/class_divListRole.inc:52
-#: admin/roleManagement/class_divListRole.inc:53
+#: admin/roleManagement/role-list.xml:11
 #, fuzzy
 msgid "List of roles"
 msgstr "Lista de usuarios"
 
-#: admin/roleManagement/class_divListRole.inc:64
-msgid "Select all"
-msgstr "Seleccione todos"
-
-#: admin/roleManagement/class_divListRole.inc:70
-msgid "Department"
-msgstr "Departamento"
+#: admin/roleManagement/role-list.xml:15 admin/roleManagement/role-list.xml:74
+msgid "Role"
+msgstr "Rol"
 
-#: admin/roleManagement/class_divListRole.inc:71
-#: admin/roleManagement/class_divListRole.inc:110
+#: admin/roleManagement/role-list.xml:57
 msgid "Actions"
 msgstr "Acciones"
 
-#: admin/roleManagement/class_divListRole.inc:80
-#, fuzzy
-msgid "Regular expression for matching role names"
-msgstr "Expresión regular para buscar nombres de grupos"
-
-#: admin/roleManagement/class_divListRole.inc:107
-msgid "Submit department"
-msgstr "Enviar departamento"
-
-#: admin/roleManagement/class_divListRole.inc:107
-msgid "Submit"
-msgstr "Enviar"
-
-#: admin/roleManagement/class_divListRole.inc:115
+#: admin/roleManagement/role-list.xml:68
 msgid "Create"
 msgstr "Crear"
 
-#: admin/roleManagement/class_divListRole.inc:123
+#: admin/roleManagement/role-list.xml:86
+msgid "Edit"
+msgstr "Editar"
+
+#: admin/roleManagement/role-list.xml:93
 msgid "Remove"
 msgstr "Eliminar"
 
-#: admin/roleManagement/class_divListRole.inc:168
-msgid "edit"
-msgstr "editar"
+#: admin/roleManagement/role-list.xml:125
+#, fuzzy
+msgid "Edit role"
+msgstr "Editar rol"
 
-#: admin/roleManagement/class_divListRole.inc:169
-msgid "Edit this entry"
-msgstr "Editar esta entrada"
+#: admin/roleManagement/role-list.xml:138
+#, fuzzy
+msgid "Remove role"
+msgstr "Eliminar foto"
 
-#: admin/roleManagement/class_divListRole.inc:174
-msgid "delete"
-msgstr "eliminar"
+#: admin/roleManagement/role-list.tpl:13
+msgid "Update"
+msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:175
-msgid "Delete this entry"
-msgstr "Eliminar esta entrada"
+#: admin/roleManagement/role-list.tpl:13
+msgid "Submit"
+msgstr "Enviar"
 
-#: admin/roleManagement/class_divListRole.inc:222
-#, fuzzy
-msgid "Number of listed roles"
-msgstr "Eliminar grupo seleccionado"
+#: admin/roleManagement/paste_generic.tpl:4
+msgid "Role name"
+msgstr "Nombre del Rol"
 
-#: admin/roleManagement/class_divListRole.inc:223
-msgid "Number of listed departments"
-msgstr "Número de departamentos"
+#: admin/roleManagement/paste_generic.tpl:7
+#, fuzzy
+msgid "Please enter the new object role name"
+msgstr "Por favor introduzca un nuevo nombre del grupo de objetos"
 
-#: admin/roleManagement/main.inc:57
+#: admin/roleManagement/role-filter.tpl:3
 #, fuzzy
-msgid "Role management"
-msgstr "Administración de ACL"
+msgid "Filter"
+msgstr "Filtros"
 
 #: admin/roleManagement/roleGeneric.tpl:34
 msgid "Choose subtree to place user in"
@@ -236,6 +201,51 @@ msgstr "Mostrar objetos que coincidan"
 msgid "Regular expression for matching object names"
 msgstr "Expresiones regulares para buscar nombre de objetos"
 
+#, fuzzy
+#~ msgid "Manage roles"
+#~ msgstr "Usuarios del dominio"
+
+#~ msgid "Permission"
+#~ msgstr "Permiso"
+
+#~ msgid "Permission error"
+#~ msgstr "Error de Permisos"
+
+#~ msgid "Group name"
+#~ msgstr "Nombre del grupo"
+
+#~ msgid "Select all"
+#~ msgstr "Seleccione todos"
+
+#~ msgid "Department"
+#~ msgstr "Departamento"
+
+#, fuzzy
+#~ msgid "Regular expression for matching role names"
+#~ msgstr "Expresión regular para buscar nombres de grupos"
+
+#~ msgid "Submit department"
+#~ msgstr "Enviar departamento"
+
+#~ msgid "edit"
+#~ msgstr "editar"
+
+#~ msgid "Edit this entry"
+#~ msgstr "Editar esta entrada"
+
+#~ msgid "delete"
+#~ msgstr "eliminar"
+
+#~ msgid "Delete this entry"
+#~ msgstr "Eliminar esta entrada"
+
+#, fuzzy
+#~ msgid "Number of listed roles"
+#~ msgstr "Eliminar grupo seleccionado"
+
+#~ msgid "Number of listed departments"
+#~ msgstr "Número de departamentos"
+
 #, fuzzy
 #~ msgid "role"
 #~ msgstr "Roles ACL"
diff --git a/gosa-plugins/rolemanagement/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/rolemanagement/locale/fr/LC_MESSAGES/messages.po
index afec0a037..f49964779 100644
--- a/gosa-plugins/rolemanagement/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/rolemanagement/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:38+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2009-09-17 10:23+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -14,37 +14,21 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: admin/roleManagement/class_roleManagement.inc:26
-#: admin/roleManagement/class_roleGeneric.inc:389
-#: admin/roleManagement/main.inc:53
+#: admin/roleManagement/class_roleManagement.inc:25
+#: admin/roleManagement/class_roleGeneric.inc:401
 #, fuzzy
 msgid "Roles"
 msgstr "Rôle"
 
-#: admin/roleManagement/class_roleManagement.inc:27
-msgid "Manage roles"
-msgstr "Gèrer les rôles"
-
-#: admin/roleManagement/class_roleManagement.inc:162
-msgid "Permission"
-msgstr "Permissions"
-
-#: admin/roleManagement/class_roleManagement.inc:178
-#: admin/roleManagement/class_divListRole.inc:70
-#: admin/roleManagement/class_divListRole.inc:117
-#: admin/roleManagement/class_divListRole.inc:205
-msgid "Role"
-msgstr "Rôle"
-
-#: admin/roleManagement/class_roleManagement.inc:212
-msgid "Permission error"
-msgstr "Erreur de permissions"
+#: admin/roleManagement/class_roleManagement.inc:26
+msgid "Role management"
+msgstr "Gestion des rôles"
 
 #: admin/roleManagement/remove.tpl:2
 msgid "Warning"
 msgstr "Avertissement"
 
-#: admin/roleManagement/remove.tpl:7
+#: admin/roleManagement/remove.tpl:6
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
@@ -59,129 +43,114 @@ msgstr ""
 "D'accord - si vous êtes sur - cliquez sur 'Supprimer' pour continuer ou sur "
 "'Annuler' pour abandonner."
 
-#: admin/roleManagement/class_roleGeneric.inc:216
-#: admin/roleManagement/class_roleGeneric.inc:225
-#: admin/roleManagement/class_roleGeneric.inc:392
+#: admin/roleManagement/class_roleGeneric.inc:220
+#: admin/roleManagement/class_roleGeneric.inc:229
+#: admin/roleManagement/class_roleGeneric.inc:404
+#: admin/roleManagement/role-list.xml:41
 #: admin/roleManagement/roleGeneric.tpl:11
 msgid "Name"
 msgstr "Nom"
 
-#: admin/roleManagement/class_roleGeneric.inc:246
+#: admin/roleManagement/class_roleGeneric.inc:250
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: admin/roleManagement/class_roleGeneric.inc:264
-#: admin/roleManagement/class_roleGeneric.inc:298
+#: admin/roleManagement/class_roleGeneric.inc:268
+#: admin/roleManagement/class_roleGeneric.inc:310
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: admin/roleManagement/class_roleGeneric.inc:383
+#: admin/roleManagement/class_roleGeneric.inc:395
 #: admin/roleManagement/roleGeneric.tpl:6
 msgid "Generic"
 msgstr "Informations"
 
-#: admin/roleManagement/class_roleGeneric.inc:384
+#: admin/roleManagement/class_roleGeneric.inc:396
 msgid "Role generic"
 msgstr "Rôle par défaut"
 
-#: admin/roleManagement/class_roleGeneric.inc:393
+#: admin/roleManagement/class_roleGeneric.inc:405
+#: admin/roleManagement/role-list.xml:49
 #: admin/roleManagement/roleGeneric.tpl:19
 msgid "Description"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:394
-#: admin/roleManagement/class_divListRole.inc:104
+#: admin/roleManagement/class_roleGeneric.inc:406
+#: admin/roleManagement/role-list.tpl:13
 #: admin/roleManagement/roleGeneric.tpl:29
 msgid "Base"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:395
+#: admin/roleManagement/class_roleGeneric.inc:407
 msgid "Telefon number"
 msgstr "Numéro de téléphone"
 
-#: admin/roleManagement/class_roleGeneric.inc:396
+#: admin/roleManagement/class_roleGeneric.inc:408
 #: admin/roleManagement/roleGeneric.tpl:56
 msgid "Fax number"
 msgstr "Numéro de fax"
 
-#: admin/roleManagement/class_roleGeneric.inc:397
+#: admin/roleManagement/class_roleGeneric.inc:409
 #: admin/roleManagement/roleGeneric.tpl:68
 msgid "Occupants"
 msgstr ""
 
-#: admin/roleManagement/paste_generic.tpl:4
-msgid "Group name"
-msgstr "Nom du groupe"
-
-#: admin/roleManagement/paste_generic.tpl:7
-msgid "Please enter the new object group name"
-msgstr "Veuillez entrer un nouveau nom pour le groupe d'objet"
-
-#: admin/roleManagement/class_divListRole.inc:52
-#: admin/roleManagement/class_divListRole.inc:53
+#: admin/roleManagement/role-list.xml:11
 msgid "List of roles"
 msgstr "Liste des rôles"
 
-#: admin/roleManagement/class_divListRole.inc:64
-msgid "Select all"
-msgstr "Sélectionner tout"
-
-#: admin/roleManagement/class_divListRole.inc:70
-msgid "Department"
-msgstr "Département"
+#: admin/roleManagement/role-list.xml:15 admin/roleManagement/role-list.xml:74
+msgid "Role"
+msgstr "Rôle"
 
-#: admin/roleManagement/class_divListRole.inc:71
-#: admin/roleManagement/class_divListRole.inc:110
+#: admin/roleManagement/role-list.xml:57
 msgid "Actions"
 msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:80
-msgid "Regular expression for matching role names"
-msgstr "Expression régulière correspondant à des noms de rôles"
-
-#: admin/roleManagement/class_divListRole.inc:107
-msgid "Submit department"
-msgstr "Soumettre le département"
-
-#: admin/roleManagement/class_divListRole.inc:107
-msgid "Submit"
-msgstr "Soumettre"
-
-#: admin/roleManagement/class_divListRole.inc:115
+#: admin/roleManagement/role-list.xml:68
 msgid "Create"
 msgstr "Créer"
 
-#: admin/roleManagement/class_divListRole.inc:123
+#: admin/roleManagement/role-list.xml:86
+msgid "Edit"
+msgstr "Editer"
+
+#: admin/roleManagement/role-list.xml:93
 msgid "Remove"
 msgstr "Supprimer"
 
-#: admin/roleManagement/class_divListRole.inc:168
-msgid "edit"
-msgstr "éditer"
+#: admin/roleManagement/role-list.xml:125
+#, fuzzy
+msgid "Edit role"
+msgstr "Editer un rôle acl"
 
-#: admin/roleManagement/class_divListRole.inc:169
-msgid "Edit this entry"
-msgstr "Editer cette entrée"
+#: admin/roleManagement/role-list.xml:138
+#, fuzzy
+msgid "Remove role"
+msgstr "Suppression de l'utilisateur"
 
-#: admin/roleManagement/class_divListRole.inc:174
-msgid "delete"
-msgstr "supprimer"
+#: admin/roleManagement/role-list.tpl:13
+msgid "Update"
+msgstr "Mise à jour"
 
-#: admin/roleManagement/class_divListRole.inc:175
-msgid "Delete this entry"
-msgstr "Supprimer cette entrée"
+#: admin/roleManagement/role-list.tpl:13
+msgid "Submit"
+msgstr "Soumettre"
 
-#: admin/roleManagement/class_divListRole.inc:222
-msgid "Number of listed roles"
-msgstr "Nombre de rôles affichés"
+#: admin/roleManagement/paste_generic.tpl:4
+#, fuzzy
+msgid "Role name"
+msgstr "Gestion des rôles"
 
-#: admin/roleManagement/class_divListRole.inc:223
-msgid "Number of listed departments"
-msgstr "Nombre de département listés"
+#: admin/roleManagement/paste_generic.tpl:7
+#, fuzzy
+msgid "Please enter the new object role name"
+msgstr "Veuillez entrer un nouveau nom pour le groupe d'objet"
 
-#: admin/roleManagement/main.inc:57
-msgid "Role management"
-msgstr "Gestion des rôles"
+#: admin/roleManagement/role-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filtres"
 
 #: admin/roleManagement/roleGeneric.tpl:34
 msgid "Choose subtree to place user in"
@@ -226,3 +195,45 @@ msgstr "Afficher les objets correspondants"
 #: admin/roleManagement/occupantSelect.tpl:35
 msgid "Regular expression for matching object names"
 msgstr "Expression régulière pour trouver les objets correspondants"
+
+#~ msgid "Manage roles"
+#~ msgstr "Gèrer les rôles"
+
+#~ msgid "Permission"
+#~ msgstr "Permissions"
+
+#~ msgid "Permission error"
+#~ msgstr "Erreur de permissions"
+
+#~ msgid "Group name"
+#~ msgstr "Nom du groupe"
+
+#~ msgid "Select all"
+#~ msgstr "Sélectionner tout"
+
+#~ msgid "Department"
+#~ msgstr "Département"
+
+#~ msgid "Regular expression for matching role names"
+#~ msgstr "Expression régulière correspondant à des noms de rôles"
+
+#~ msgid "Submit department"
+#~ msgstr "Soumettre le département"
+
+#~ msgid "edit"
+#~ msgstr "éditer"
+
+#~ msgid "Edit this entry"
+#~ msgstr "Editer cette entrée"
+
+#~ msgid "delete"
+#~ msgstr "supprimer"
+
+#~ msgid "Delete this entry"
+#~ msgstr "Supprimer cette entrée"
+
+#~ msgid "Number of listed roles"
+#~ msgstr "Nombre de rôles affichés"
+
+#~ msgid "Number of listed departments"
+#~ msgstr "Nombre de département listés"
diff --git a/gosa-plugins/rolemanagement/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/rolemanagement/locale/it/LC_MESSAGES/messages.po
index 948e93b3d..2c619c78c 100644
--- a/gosa-plugins/rolemanagement/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/rolemanagement/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:38+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -15,40 +15,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: admin/roleManagement/class_roleManagement.inc:26
-#: admin/roleManagement/class_roleGeneric.inc:389
-#: admin/roleManagement/main.inc:53
+#: admin/roleManagement/class_roleManagement.inc:25
+#: admin/roleManagement/class_roleGeneric.inc:401
 #, fuzzy
 msgid "Roles"
 msgstr "Ruolo"
 
-#: admin/roleManagement/class_roleManagement.inc:27
-#, fuzzy
-msgid "Manage roles"
-msgstr "Utenti di Dominio"
-
-#: admin/roleManagement/class_roleManagement.inc:162
-#, fuzzy
-msgid "Permission"
-msgstr "Permessi"
-
-#: admin/roleManagement/class_roleManagement.inc:178
-#: admin/roleManagement/class_divListRole.inc:70
-#: admin/roleManagement/class_divListRole.inc:117
-#: admin/roleManagement/class_divListRole.inc:205
-msgid "Role"
-msgstr "Ruolo"
-
-#: admin/roleManagement/class_roleManagement.inc:212
+#: admin/roleManagement/class_roleManagement.inc:26
 #, fuzzy
-msgid "Permission error"
-msgstr "Permessi"
+msgid "Role management"
+msgstr "Riferimenti"
 
 #: admin/roleManagement/remove.tpl:2
 msgid "Warning"
 msgstr "Attenzione"
 
-#: admin/roleManagement/remove.tpl:7
+#: admin/roleManagement/remove.tpl:6
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
@@ -61,140 +43,119 @@ msgstr ""
 "Quindi - Se sei sicuro - premi <i>Rimuovi</i> per continuare o <i>Annulla</"
 "i> per abortire."
 
-#: admin/roleManagement/class_roleGeneric.inc:216
-#: admin/roleManagement/class_roleGeneric.inc:225
-#: admin/roleManagement/class_roleGeneric.inc:392
+#: admin/roleManagement/class_roleGeneric.inc:220
+#: admin/roleManagement/class_roleGeneric.inc:229
+#: admin/roleManagement/class_roleGeneric.inc:404
+#: admin/roleManagement/role-list.xml:41
 #: admin/roleManagement/roleGeneric.tpl:11
 msgid "Name"
 msgstr "Cognome"
 
-#: admin/roleManagement/class_roleGeneric.inc:246
+#: admin/roleManagement/class_roleGeneric.inc:250
 msgid "Unknown"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:264
-#: admin/roleManagement/class_roleGeneric.inc:298
+#: admin/roleManagement/class_roleGeneric.inc:268
+#: admin/roleManagement/class_roleGeneric.inc:310
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: admin/roleManagement/class_roleGeneric.inc:383
+#: admin/roleManagement/class_roleGeneric.inc:395
 #: admin/roleManagement/roleGeneric.tpl:6
 msgid "Generic"
 msgstr "Generale"
 
-#: admin/roleManagement/class_roleGeneric.inc:384
+#: admin/roleManagement/class_roleGeneric.inc:396
 #, fuzzy
 msgid "Role generic"
 msgstr "Cognome"
 
-#: admin/roleManagement/class_roleGeneric.inc:393
+#: admin/roleManagement/class_roleGeneric.inc:405
+#: admin/roleManagement/role-list.xml:49
 #: admin/roleManagement/roleGeneric.tpl:19
 msgid "Description"
 msgstr "Descrizione"
 
-#: admin/roleManagement/class_roleGeneric.inc:394
-#: admin/roleManagement/class_divListRole.inc:104
+#: admin/roleManagement/class_roleGeneric.inc:406
+#: admin/roleManagement/role-list.tpl:13
 #: admin/roleManagement/roleGeneric.tpl:29
 msgid "Base"
 msgstr "Base"
 
-#: admin/roleManagement/class_roleGeneric.inc:395
+#: admin/roleManagement/class_roleGeneric.inc:407
 #, fuzzy
 msgid "Telefon number"
 msgstr "Numero di telefono"
 
-#: admin/roleManagement/class_roleGeneric.inc:396
+#: admin/roleManagement/class_roleGeneric.inc:408
 #: admin/roleManagement/roleGeneric.tpl:56
 #, fuzzy
 msgid "Fax number"
 msgstr "Numero di telefono"
 
-#: admin/roleManagement/class_roleGeneric.inc:397
+#: admin/roleManagement/class_roleGeneric.inc:409
 #: admin/roleManagement/roleGeneric.tpl:68
 msgid "Occupants"
 msgstr ""
 
-#: admin/roleManagement/paste_generic.tpl:4
-msgid "Group name"
-msgstr "Nome gruppo"
-
-#: admin/roleManagement/paste_generic.tpl:7
-#, fuzzy
-msgid "Please enter the new object group name"
-msgstr "Inserisci la URI del server LDAP"
-
-#: admin/roleManagement/class_divListRole.inc:52
-#: admin/roleManagement/class_divListRole.inc:53
+#: admin/roleManagement/role-list.xml:11
 #, fuzzy
 msgid "List of roles"
 msgstr "Lista degli utenti"
 
-#: admin/roleManagement/class_divListRole.inc:64
-#, fuzzy
-msgid "Select all"
-msgstr "Rimuovi"
-
-#: admin/roleManagement/class_divListRole.inc:70
-msgid "Department"
-msgstr "Dipartimento"
+#: admin/roleManagement/role-list.xml:15 admin/roleManagement/role-list.xml:74
+msgid "Role"
+msgstr "Ruolo"
 
-#: admin/roleManagement/class_divListRole.inc:71
-#: admin/roleManagement/class_divListRole.inc:110
+#: admin/roleManagement/role-list.xml:57
 msgid "Actions"
 msgstr "Azioni"
 
-#: admin/roleManagement/class_divListRole.inc:80
-#, fuzzy
-msgid "Regular expression for matching role names"
-msgstr "Espressioni regolare per selezionare il nome del gruppo"
-
-#: admin/roleManagement/class_divListRole.inc:107
-msgid "Submit department"
-msgstr "Imposta dipartimento"
-
-#: admin/roleManagement/class_divListRole.inc:107
-msgid "Submit"
-msgstr ""
-
-#: admin/roleManagement/class_divListRole.inc:115
+#: admin/roleManagement/role-list.xml:68
 msgid "Create"
 msgstr "Creare"
 
-#: admin/roleManagement/class_divListRole.inc:123
+#: admin/roleManagement/role-list.xml:86
+msgid "Edit"
+msgstr "Modifica"
+
+#: admin/roleManagement/role-list.xml:93
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: admin/roleManagement/class_divListRole.inc:168
-msgid "edit"
-msgstr "modifica"
+#: admin/roleManagement/role-list.xml:125
+#, fuzzy
+msgid "Edit role"
+msgstr "Modifica contatto"
 
-#: admin/roleManagement/class_divListRole.inc:169
-msgid "Edit this entry"
-msgstr "Modifica questo record"
+#: admin/roleManagement/role-list.xml:138
+#, fuzzy
+msgid "Remove role"
+msgstr "Oggetti membri"
 
-#: admin/roleManagement/class_divListRole.inc:174
-msgid "delete"
-msgstr "elimina"
+#: admin/roleManagement/role-list.tpl:13
+msgid "Update"
+msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:175
-msgid "Delete this entry"
-msgstr "Elimina questo record"
+#: admin/roleManagement/role-list.tpl:13
+msgid "Submit"
+msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:222
+#: admin/roleManagement/paste_generic.tpl:4
 #, fuzzy
-msgid "Number of listed roles"
-msgstr "Nome del gruppo"
+msgid "Role name"
+msgstr "Cognome"
 
-#: admin/roleManagement/class_divListRole.inc:223
+#: admin/roleManagement/paste_generic.tpl:7
 #, fuzzy
-msgid "Number of listed departments"
-msgstr "Imposta dipartimento"
+msgid "Please enter the new object role name"
+msgstr "Inserisci la URI del server LDAP"
 
-#: admin/roleManagement/main.inc:57
+#: admin/roleManagement/role-filter.tpl:3
 #, fuzzy
-msgid "Role management"
-msgstr "Riferimenti"
+msgid "Filter"
+msgstr "Filtri"
 
 #: admin/roleManagement/roleGeneric.tpl:34
 msgid "Choose subtree to place user in"
@@ -243,6 +204,55 @@ msgstr ""
 msgid "Regular expression for matching object names"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Manage roles"
+#~ msgstr "Utenti di Dominio"
+
+#, fuzzy
+#~ msgid "Permission"
+#~ msgstr "Permessi"
+
+#, fuzzy
+#~ msgid "Permission error"
+#~ msgstr "Permessi"
+
+#~ msgid "Group name"
+#~ msgstr "Nome gruppo"
+
+#, fuzzy
+#~ msgid "Select all"
+#~ msgstr "Rimuovi"
+
+#~ msgid "Department"
+#~ msgstr "Dipartimento"
+
+#, fuzzy
+#~ msgid "Regular expression for matching role names"
+#~ msgstr "Espressioni regolare per selezionare il nome del gruppo"
+
+#~ msgid "Submit department"
+#~ msgstr "Imposta dipartimento"
+
+#~ msgid "edit"
+#~ msgstr "modifica"
+
+#~ msgid "Edit this entry"
+#~ msgstr "Modifica questo record"
+
+#~ msgid "delete"
+#~ msgstr "elimina"
+
+#~ msgid "Delete this entry"
+#~ msgstr "Elimina questo record"
+
+#, fuzzy
+#~ msgid "Number of listed roles"
+#~ msgstr "Nome del gruppo"
+
+#, fuzzy
+#~ msgid "Number of listed departments"
+#~ msgstr "Imposta dipartimento"
+
 #, fuzzy
 #~ msgid "role"
 #~ msgstr "ACL"
diff --git a/gosa-plugins/rolemanagement/locale/messages.po b/gosa-plugins/rolemanagement/locale/messages.po
index 0a72bab31..5a5747f04 100644
--- a/gosa-plugins/rolemanagement/locale/messages.po
+++ b/gosa-plugins/rolemanagement/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:38+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,36 +16,20 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/roleManagement/class_roleManagement.inc:26
-#: admin/roleManagement/class_roleGeneric.inc:389
-#: admin/roleManagement/main.inc:53
+#: admin/roleManagement/class_roleManagement.inc:25
+#: admin/roleManagement/class_roleGeneric.inc:401
 msgid "Roles"
 msgstr ""
 
-#: admin/roleManagement/class_roleManagement.inc:27
-msgid "Manage roles"
-msgstr ""
-
-#: admin/roleManagement/class_roleManagement.inc:162
-msgid "Permission"
-msgstr ""
-
-#: admin/roleManagement/class_roleManagement.inc:178
-#: admin/roleManagement/class_divListRole.inc:70
-#: admin/roleManagement/class_divListRole.inc:117
-#: admin/roleManagement/class_divListRole.inc:205
-msgid "Role"
-msgstr ""
-
-#: admin/roleManagement/class_roleManagement.inc:212
-msgid "Permission error"
+#: admin/roleManagement/class_roleManagement.inc:26
+msgid "Role management"
 msgstr ""
 
 #: admin/roleManagement/remove.tpl:2
 msgid "Warning"
 msgstr ""
 
-#: admin/roleManagement/remove.tpl:7
+#: admin/roleManagement/remove.tpl:6
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
@@ -55,128 +39,108 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:216
-#: admin/roleManagement/class_roleGeneric.inc:225
-#: admin/roleManagement/class_roleGeneric.inc:392
+#: admin/roleManagement/class_roleGeneric.inc:220
+#: admin/roleManagement/class_roleGeneric.inc:229
+#: admin/roleManagement/class_roleGeneric.inc:404
+#: admin/roleManagement/role-list.xml:41
 #: admin/roleManagement/roleGeneric.tpl:11
 msgid "Name"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:246
+#: admin/roleManagement/class_roleGeneric.inc:250
 msgid "Unknown"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:264
-#: admin/roleManagement/class_roleGeneric.inc:298
+#: admin/roleManagement/class_roleGeneric.inc:268
+#: admin/roleManagement/class_roleGeneric.inc:310
 msgid "LDAP error"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:383
+#: admin/roleManagement/class_roleGeneric.inc:395
 #: admin/roleManagement/roleGeneric.tpl:6
 msgid "Generic"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:384
+#: admin/roleManagement/class_roleGeneric.inc:396
 msgid "Role generic"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:393
+#: admin/roleManagement/class_roleGeneric.inc:405
+#: admin/roleManagement/role-list.xml:49
 #: admin/roleManagement/roleGeneric.tpl:19
 msgid "Description"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:394
-#: admin/roleManagement/class_divListRole.inc:104
+#: admin/roleManagement/class_roleGeneric.inc:406
+#: admin/roleManagement/role-list.tpl:13
 #: admin/roleManagement/roleGeneric.tpl:29
 msgid "Base"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:395
+#: admin/roleManagement/class_roleGeneric.inc:407
 msgid "Telefon number"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:396
+#: admin/roleManagement/class_roleGeneric.inc:408
 #: admin/roleManagement/roleGeneric.tpl:56
 msgid "Fax number"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:397
+#: admin/roleManagement/class_roleGeneric.inc:409
 #: admin/roleManagement/roleGeneric.tpl:68
 msgid "Occupants"
 msgstr ""
 
-#: admin/roleManagement/paste_generic.tpl:4
-msgid "Group name"
-msgstr ""
-
-#: admin/roleManagement/paste_generic.tpl:7
-msgid "Please enter the new object group name"
-msgstr ""
-
-#: admin/roleManagement/class_divListRole.inc:52
-#: admin/roleManagement/class_divListRole.inc:53
+#: admin/roleManagement/role-list.xml:11
 msgid "List of roles"
 msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:64
-msgid "Select all"
-msgstr ""
-
-#: admin/roleManagement/class_divListRole.inc:70
-msgid "Department"
+#: admin/roleManagement/role-list.xml:15 admin/roleManagement/role-list.xml:74
+msgid "Role"
 msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:71
-#: admin/roleManagement/class_divListRole.inc:110
+#: admin/roleManagement/role-list.xml:57
 msgid "Actions"
 msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:80
-msgid "Regular expression for matching role names"
-msgstr ""
-
-#: admin/roleManagement/class_divListRole.inc:107
-msgid "Submit department"
-msgstr ""
-
-#: admin/roleManagement/class_divListRole.inc:107
-msgid "Submit"
+#: admin/roleManagement/role-list.xml:68
+msgid "Create"
 msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:115
-msgid "Create"
+#: admin/roleManagement/role-list.xml:86
+msgid "Edit"
 msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:123
+#: admin/roleManagement/role-list.xml:93
 msgid "Remove"
 msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:168
-msgid "edit"
+#: admin/roleManagement/role-list.xml:125
+msgid "Edit role"
 msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:169
-msgid "Edit this entry"
+#: admin/roleManagement/role-list.xml:138
+msgid "Remove role"
 msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:174
-msgid "delete"
+#: admin/roleManagement/role-list.tpl:13
+msgid "Update"
 msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:175
-msgid "Delete this entry"
+#: admin/roleManagement/role-list.tpl:13
+msgid "Submit"
 msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:222
-msgid "Number of listed roles"
+#: admin/roleManagement/paste_generic.tpl:4
+msgid "Role name"
 msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:223
-msgid "Number of listed departments"
+#: admin/roleManagement/paste_generic.tpl:7
+msgid "Please enter the new object role name"
 msgstr ""
 
-#: admin/roleManagement/main.inc:57
-msgid "Role management"
+#: admin/roleManagement/role-filter.tpl:3
+msgid "Filter"
 msgstr ""
 
 #: admin/roleManagement/roleGeneric.tpl:34
diff --git a/gosa-plugins/rolemanagement/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/rolemanagement/locale/nl/LC_MESSAGES/messages.po
index c8299e754..fbd64775c 100644
--- a/gosa-plugins/rolemanagement/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/rolemanagement/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:38+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -19,40 +19,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/roleManagement/class_roleManagement.inc:26
-#: admin/roleManagement/class_roleGeneric.inc:389
-#: admin/roleManagement/main.inc:53
+#: admin/roleManagement/class_roleManagement.inc:25
+#: admin/roleManagement/class_roleGeneric.inc:401
 #, fuzzy
 msgid "Roles"
 msgstr "Funktie"
 
-#: admin/roleManagement/class_roleManagement.inc:27
-#, fuzzy
-msgid "Manage roles"
-msgstr "Windows gebruikers"
-
-#: admin/roleManagement/class_roleManagement.inc:162
-#, fuzzy
-msgid "Permission"
-msgstr "Rechten"
-
-#: admin/roleManagement/class_roleManagement.inc:178
-#: admin/roleManagement/class_divListRole.inc:70
-#: admin/roleManagement/class_divListRole.inc:117
-#: admin/roleManagement/class_divListRole.inc:205
-msgid "Role"
-msgstr "Funktie"
-
-#: admin/roleManagement/class_roleManagement.inc:212
+#: admin/roleManagement/class_roleManagement.inc:26
 #, fuzzy
-msgid "Permission error"
-msgstr "Rechten"
+msgid "Role management"
+msgstr "Blokkeerlijst beheer"
 
 #: admin/roleManagement/remove.tpl:2
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: admin/roleManagement/remove.tpl:7
+#: admin/roleManagement/remove.tpl:6
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
@@ -66,140 +48,119 @@ msgstr ""
 "Indien u zeker bent drukt u dan 'Verwijderen' om door te gaan of 'Annuleren' "
 "om te annuleren."
 
-#: admin/roleManagement/class_roleGeneric.inc:216
-#: admin/roleManagement/class_roleGeneric.inc:225
-#: admin/roleManagement/class_roleGeneric.inc:392
+#: admin/roleManagement/class_roleGeneric.inc:220
+#: admin/roleManagement/class_roleGeneric.inc:229
+#: admin/roleManagement/class_roleGeneric.inc:404
+#: admin/roleManagement/role-list.xml:41
 #: admin/roleManagement/roleGeneric.tpl:11
 msgid "Name"
 msgstr "Naam"
 
-#: admin/roleManagement/class_roleGeneric.inc:246
+#: admin/roleManagement/class_roleGeneric.inc:250
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: admin/roleManagement/class_roleGeneric.inc:264
-#: admin/roleManagement/class_roleGeneric.inc:298
+#: admin/roleManagement/class_roleGeneric.inc:268
+#: admin/roleManagement/class_roleGeneric.inc:310
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP fout:"
 
-#: admin/roleManagement/class_roleGeneric.inc:383
+#: admin/roleManagement/class_roleGeneric.inc:395
 #: admin/roleManagement/roleGeneric.tpl:6
 msgid "Generic"
 msgstr "Algemeen"
 
-#: admin/roleManagement/class_roleGeneric.inc:384
+#: admin/roleManagement/class_roleGeneric.inc:396
 #, fuzzy
 msgid "Role generic"
 msgstr "Hernoemen"
 
-#: admin/roleManagement/class_roleGeneric.inc:393
+#: admin/roleManagement/class_roleGeneric.inc:405
+#: admin/roleManagement/role-list.xml:49
 #: admin/roleManagement/roleGeneric.tpl:19
 msgid "Description"
 msgstr "Omschrijving"
 
-#: admin/roleManagement/class_roleGeneric.inc:394
-#: admin/roleManagement/class_divListRole.inc:104
+#: admin/roleManagement/class_roleGeneric.inc:406
+#: admin/roleManagement/role-list.tpl:13
 #: admin/roleManagement/roleGeneric.tpl:29
 msgid "Base"
 msgstr "Basis"
 
-#: admin/roleManagement/class_roleGeneric.inc:395
+#: admin/roleManagement/class_roleGeneric.inc:407
 #, fuzzy
 msgid "Telefon number"
 msgstr "Telefoonnummer"
 
-#: admin/roleManagement/class_roleGeneric.inc:396
+#: admin/roleManagement/class_roleGeneric.inc:408
 #: admin/roleManagement/roleGeneric.tpl:56
 #, fuzzy
 msgid "Fax number"
 msgstr "Serienummer"
 
-#: admin/roleManagement/class_roleGeneric.inc:397
+#: admin/roleManagement/class_roleGeneric.inc:409
 #: admin/roleManagement/roleGeneric.tpl:68
 msgid "Occupants"
 msgstr ""
 
-#: admin/roleManagement/paste_generic.tpl:4
-msgid "Group name"
-msgstr "Groepnaam"
-
-#: admin/roleManagement/paste_generic.tpl:7
-#, fuzzy
-msgid "Please enter the new object group name"
-msgstr "Geef a.u.b. een nieuwe naam op"
-
-#: admin/roleManagement/class_divListRole.inc:52
-#: admin/roleManagement/class_divListRole.inc:53
+#: admin/roleManagement/role-list.xml:11
 #, fuzzy
 msgid "List of roles"
 msgstr "Lijst met gebruikers"
 
-#: admin/roleManagement/class_divListRole.inc:64
-#, fuzzy
-msgid "Select all"
-msgstr "Selecteer"
-
-#: admin/roleManagement/class_divListRole.inc:70
-msgid "Department"
-msgstr "Afdeling"
+#: admin/roleManagement/role-list.xml:15 admin/roleManagement/role-list.xml:74
+msgid "Role"
+msgstr "Funktie"
 
-#: admin/roleManagement/class_divListRole.inc:71
-#: admin/roleManagement/class_divListRole.inc:110
+#: admin/roleManagement/role-list.xml:57
 msgid "Actions"
 msgstr "Acties"
 
-#: admin/roleManagement/class_divListRole.inc:80
-#, fuzzy
-msgid "Regular expression for matching role names"
-msgstr "Reguliere expressie voor overeenkomende groepnamen"
-
-#: admin/roleManagement/class_divListRole.inc:107
-msgid "Submit department"
-msgstr "Verwerk afdeling"
-
-#: admin/roleManagement/class_divListRole.inc:107
-msgid "Submit"
-msgstr "Verwerk"
-
-#: admin/roleManagement/class_divListRole.inc:115
+#: admin/roleManagement/role-list.xml:68
 msgid "Create"
 msgstr "Aanmaken"
 
-#: admin/roleManagement/class_divListRole.inc:123
+#: admin/roleManagement/role-list.xml:86
+msgid "Edit"
+msgstr "Bewerken"
+
+#: admin/roleManagement/role-list.xml:93
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: admin/roleManagement/class_divListRole.inc:168
-msgid "edit"
-msgstr "Bewerk"
+#: admin/roleManagement/role-list.xml:125
+#, fuzzy
+msgid "Edit role"
+msgstr "Bewerk share"
 
-#: admin/roleManagement/class_divListRole.inc:169
-msgid "Edit this entry"
-msgstr "Bewerk deze invoer"
+#: admin/roleManagement/role-list.xml:138
+#, fuzzy
+msgid "Remove role"
+msgstr "Lidmaatschap objecten"
 
-#: admin/roleManagement/class_divListRole.inc:174
-msgid "delete"
-msgstr "Verwijder"
+#: admin/roleManagement/role-list.tpl:13
+msgid "Update"
+msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:175
-msgid "Delete this entry"
-msgstr "Verwijder deze invoer"
+#: admin/roleManagement/role-list.tpl:13
+msgid "Submit"
+msgstr "Verwerk"
 
-#: admin/roleManagement/class_divListRole.inc:222
+#: admin/roleManagement/paste_generic.tpl:4
 #, fuzzy
-msgid "Number of listed roles"
-msgstr "Naam van de groep"
+msgid "Role name"
+msgstr "Hernoemen"
 
-#: admin/roleManagement/class_divListRole.inc:223
+#: admin/roleManagement/paste_generic.tpl:7
 #, fuzzy
-msgid "Number of listed departments"
-msgstr "Naam van de afdeling"
+msgid "Please enter the new object role name"
+msgstr "Geef a.u.b. een nieuwe naam op"
 
-#: admin/roleManagement/main.inc:57
+#: admin/roleManagement/role-filter.tpl:3
 #, fuzzy
-msgid "Role management"
-msgstr "Blokkeerlijst beheer"
+msgid "Filter"
+msgstr "Filters"
 
 #: admin/roleManagement/roleGeneric.tpl:34
 msgid "Choose subtree to place user in"
@@ -246,6 +207,55 @@ msgstr "Toon overeenkomende objecten"
 msgid "Regular expression for matching object names"
 msgstr "Reguliere expressie voor overeenkomende objectnamen"
 
+#, fuzzy
+#~ msgid "Manage roles"
+#~ msgstr "Windows gebruikers"
+
+#, fuzzy
+#~ msgid "Permission"
+#~ msgstr "Rechten"
+
+#, fuzzy
+#~ msgid "Permission error"
+#~ msgstr "Rechten"
+
+#~ msgid "Group name"
+#~ msgstr "Groepnaam"
+
+#, fuzzy
+#~ msgid "Select all"
+#~ msgstr "Selecteer"
+
+#~ msgid "Department"
+#~ msgstr "Afdeling"
+
+#, fuzzy
+#~ msgid "Regular expression for matching role names"
+#~ msgstr "Reguliere expressie voor overeenkomende groepnamen"
+
+#~ msgid "Submit department"
+#~ msgstr "Verwerk afdeling"
+
+#~ msgid "edit"
+#~ msgstr "Bewerk"
+
+#~ msgid "Edit this entry"
+#~ msgstr "Bewerk deze invoer"
+
+#~ msgid "delete"
+#~ msgstr "Verwijder"
+
+#~ msgid "Delete this entry"
+#~ msgstr "Verwijder deze invoer"
+
+#, fuzzy
+#~ msgid "Number of listed roles"
+#~ msgstr "Naam van de groep"
+
+#, fuzzy
+#~ msgid "Number of listed departments"
+#~ msgstr "Naam van de afdeling"
+
 #, fuzzy
 #~ msgid "role"
 #~ msgstr "Rechten"
diff --git a/gosa-plugins/rolemanagement/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/rolemanagement/locale/pl/LC_MESSAGES/messages.po
index c73086e13..24a2fe9c6 100644
--- a/gosa-plugins/rolemanagement/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/rolemanagement/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:38+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -14,40 +14,22 @@ msgstr ""
 "X-Poedit-SourceCharset: iso-8859-2\n"
 "X-Poedit-Basepath: tedst\n"
 
-#: admin/roleManagement/class_roleManagement.inc:26
-#: admin/roleManagement/class_roleGeneric.inc:389
-#: admin/roleManagement/main.inc:53
+#: admin/roleManagement/class_roleManagement.inc:25
+#: admin/roleManagement/class_roleGeneric.inc:401
 #, fuzzy
 msgid "Roles"
 msgstr "Pełniona funkcja"
 
-#: admin/roleManagement/class_roleManagement.inc:27
-#, fuzzy
-msgid "Manage roles"
-msgstr "Użytkownicy domeny"
-
-#: admin/roleManagement/class_roleManagement.inc:162
-#, fuzzy
-msgid "Permission"
-msgstr "Uprawnienia"
-
-#: admin/roleManagement/class_roleManagement.inc:178
-#: admin/roleManagement/class_divListRole.inc:70
-#: admin/roleManagement/class_divListRole.inc:117
-#: admin/roleManagement/class_divListRole.inc:205
-msgid "Role"
-msgstr "Pełniona funkcja"
-
-#: admin/roleManagement/class_roleManagement.inc:212
+#: admin/roleManagement/class_roleManagement.inc:26
 #, fuzzy
-msgid "Permission error"
-msgstr "Uprawnienia"
+msgid "Role management"
+msgstr "Zarządzanie ACL"
 
 #: admin/roleManagement/remove.tpl:2
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: admin/roleManagement/remove.tpl:7
+#: admin/roleManagement/remove.tpl:6
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
@@ -59,138 +41,117 @@ msgstr ""
 "Jeśli jesteś pewien - naciśnij 'Usuń' aby kontynuować lub 'Anuluj' aby "
 "anulować."
 
-#: admin/roleManagement/class_roleGeneric.inc:216
-#: admin/roleManagement/class_roleGeneric.inc:225
-#: admin/roleManagement/class_roleGeneric.inc:392
+#: admin/roleManagement/class_roleGeneric.inc:220
+#: admin/roleManagement/class_roleGeneric.inc:229
+#: admin/roleManagement/class_roleGeneric.inc:404
+#: admin/roleManagement/role-list.xml:41
 #: admin/roleManagement/roleGeneric.tpl:11
 msgid "Name"
 msgstr "Imię"
 
-#: admin/roleManagement/class_roleGeneric.inc:246
+#: admin/roleManagement/class_roleGeneric.inc:250
 msgid "Unknown"
 msgstr "Nieznane"
 
-#: admin/roleManagement/class_roleGeneric.inc:264
-#: admin/roleManagement/class_roleGeneric.inc:298
+#: admin/roleManagement/class_roleGeneric.inc:268
+#: admin/roleManagement/class_roleGeneric.inc:310
 #, fuzzy
 msgid "LDAP error"
 msgstr "błąd LDAP:"
 
-#: admin/roleManagement/class_roleGeneric.inc:383
+#: admin/roleManagement/class_roleGeneric.inc:395
 #: admin/roleManagement/roleGeneric.tpl:6
 msgid "Generic"
 msgstr "Ogólne"
 
-#: admin/roleManagement/class_roleGeneric.inc:384
+#: admin/roleManagement/class_roleGeneric.inc:396
 #, fuzzy
 msgid "Role generic"
 msgstr "Zmień nazwę"
 
-#: admin/roleManagement/class_roleGeneric.inc:393
+#: admin/roleManagement/class_roleGeneric.inc:405
+#: admin/roleManagement/role-list.xml:49
 #: admin/roleManagement/roleGeneric.tpl:19
 msgid "Description"
 msgstr "Opis"
 
-#: admin/roleManagement/class_roleGeneric.inc:394
-#: admin/roleManagement/class_divListRole.inc:104
+#: admin/roleManagement/class_roleGeneric.inc:406
+#: admin/roleManagement/role-list.tpl:13
 #: admin/roleManagement/roleGeneric.tpl:29
 msgid "Base"
 msgstr "Kontener"
 
-#: admin/roleManagement/class_roleGeneric.inc:395
+#: admin/roleManagement/class_roleGeneric.inc:407
 msgid "Telefon number"
 msgstr "Numer telefonu"
 
-#: admin/roleManagement/class_roleGeneric.inc:396
+#: admin/roleManagement/class_roleGeneric.inc:408
 #: admin/roleManagement/roleGeneric.tpl:56
 msgid "Fax number"
 msgstr "Numer fax"
 
-#: admin/roleManagement/class_roleGeneric.inc:397
+#: admin/roleManagement/class_roleGeneric.inc:409
 #: admin/roleManagement/roleGeneric.tpl:68
 msgid "Occupants"
 msgstr ""
 
-#: admin/roleManagement/paste_generic.tpl:4
-msgid "Group name"
-msgstr "Nazwa grupy"
-
-#: admin/roleManagement/paste_generic.tpl:7
-#, fuzzy
-msgid "Please enter the new object group name"
-msgstr "Proszę podać nową nazwę."
-
-#: admin/roleManagement/class_divListRole.inc:52
-#: admin/roleManagement/class_divListRole.inc:53
+#: admin/roleManagement/role-list.xml:11
 #, fuzzy
 msgid "List of roles"
 msgstr "Lista użytkowników"
 
-#: admin/roleManagement/class_divListRole.inc:64
-#, fuzzy
-msgid "Select all"
-msgstr "Wybierz"
-
-#: admin/roleManagement/class_divListRole.inc:70
-msgid "Department"
-msgstr "Departament"
+#: admin/roleManagement/role-list.xml:15 admin/roleManagement/role-list.xml:74
+msgid "Role"
+msgstr "Pełniona funkcja"
 
-#: admin/roleManagement/class_divListRole.inc:71
-#: admin/roleManagement/class_divListRole.inc:110
+#: admin/roleManagement/role-list.xml:57
 msgid "Actions"
 msgstr "Akcje"
 
-#: admin/roleManagement/class_divListRole.inc:80
-#, fuzzy
-msgid "Regular expression for matching role names"
-msgstr "Wyrażenie regularne dla dopasowania nazw grup"
-
-#: admin/roleManagement/class_divListRole.inc:107
-msgid "Submit department"
-msgstr "Zatwierdź departament"
-
-#: admin/roleManagement/class_divListRole.inc:107
-msgid "Submit"
-msgstr "Wyślij"
-
-#: admin/roleManagement/class_divListRole.inc:115
+#: admin/roleManagement/role-list.xml:68
 msgid "Create"
 msgstr "Utwórz"
 
-#: admin/roleManagement/class_divListRole.inc:123
+#: admin/roleManagement/role-list.xml:86
+msgid "Edit"
+msgstr "Edytuj"
+
+#: admin/roleManagement/role-list.xml:93
 msgid "Remove"
 msgstr "Usuń"
 
-#: admin/roleManagement/class_divListRole.inc:168
-msgid "edit"
-msgstr "edytuj"
+#: admin/roleManagement/role-list.xml:125
+#, fuzzy
+msgid "Edit role"
+msgstr "Edytuj makro"
 
-#: admin/roleManagement/class_divListRole.inc:169
-msgid "Edit this entry"
-msgstr "Edytuj ten obiekt"
+#: admin/roleManagement/role-list.xml:138
+#, fuzzy
+msgid "Remove role"
+msgstr "Usuń obiekt"
 
-#: admin/roleManagement/class_divListRole.inc:174
-msgid "delete"
-msgstr "Usuń"
+#: admin/roleManagement/role-list.tpl:13
+msgid "Update"
+msgstr "Aktualizuj"
 
-#: admin/roleManagement/class_divListRole.inc:175
-msgid "Delete this entry"
-msgstr "Usuń ten obiekt"
+#: admin/roleManagement/role-list.tpl:13
+msgid "Submit"
+msgstr "Wyślij"
 
-#: admin/roleManagement/class_divListRole.inc:222
+#: admin/roleManagement/paste_generic.tpl:4
 #, fuzzy
-msgid "Number of listed roles"
-msgstr "Nazwa grupy"
+msgid "Role name"
+msgstr "Zmień nazwę"
 
-#: admin/roleManagement/class_divListRole.inc:223
+#: admin/roleManagement/paste_generic.tpl:7
 #, fuzzy
-msgid "Number of listed departments"
-msgstr "Nazwa departamentu"
+msgid "Please enter the new object role name"
+msgstr "Proszę podać nową nazwę."
 
-#: admin/roleManagement/main.inc:57
+#: admin/roleManagement/role-filter.tpl:3
 #, fuzzy
-msgid "Role management"
-msgstr "Zarządzanie ACL"
+msgid "Filter"
+msgstr "Filtry"
 
 #: admin/roleManagement/roleGeneric.tpl:34
 msgid "Choose subtree to place user in"
@@ -237,6 +198,55 @@ msgstr "Wyświetl obiekty pasujące"
 msgid "Regular expression for matching object names"
 msgstr "Wyrażenie regularne dla dopasowania nazw obiektów"
 
+#, fuzzy
+#~ msgid "Manage roles"
+#~ msgstr "Użytkownicy domeny"
+
+#, fuzzy
+#~ msgid "Permission"
+#~ msgstr "Uprawnienia"
+
+#, fuzzy
+#~ msgid "Permission error"
+#~ msgstr "Uprawnienia"
+
+#~ msgid "Group name"
+#~ msgstr "Nazwa grupy"
+
+#, fuzzy
+#~ msgid "Select all"
+#~ msgstr "Wybierz"
+
+#~ msgid "Department"
+#~ msgstr "Departament"
+
+#, fuzzy
+#~ msgid "Regular expression for matching role names"
+#~ msgstr "Wyrażenie regularne dla dopasowania nazw grup"
+
+#~ msgid "Submit department"
+#~ msgstr "Zatwierdź departament"
+
+#~ msgid "edit"
+#~ msgstr "edytuj"
+
+#~ msgid "Edit this entry"
+#~ msgstr "Edytuj ten obiekt"
+
+#~ msgid "delete"
+#~ msgstr "Usuń"
+
+#~ msgid "Delete this entry"
+#~ msgstr "Usuń ten obiekt"
+
+#, fuzzy
+#~ msgid "Number of listed roles"
+#~ msgstr "Nazwa grupy"
+
+#, fuzzy
+#~ msgid "Number of listed departments"
+#~ msgstr "Nazwa departamentu"
+
 #, fuzzy
 #~ msgid "role"
 #~ msgstr "ACLe"
diff --git a/gosa-plugins/rolemanagement/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/rolemanagement/locale/ru/LC_MESSAGES/messages.po
index 77b03d744..7dadcd4d9 100644
--- a/gosa-plugins/rolemanagement/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/rolemanagement/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:38+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -14,40 +14,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: poEdit 1.3.1\n"
 
-#: admin/roleManagement/class_roleManagement.inc:26
-#: admin/roleManagement/class_roleGeneric.inc:389
-#: admin/roleManagement/main.inc:53
+#: admin/roleManagement/class_roleManagement.inc:25
+#: admin/roleManagement/class_roleGeneric.inc:401
 #, fuzzy
 msgid "Roles"
 msgstr "Роль"
 
-#: admin/roleManagement/class_roleManagement.inc:27
-#, fuzzy
-msgid "Manage roles"
-msgstr "Пользователи домена"
-
-#: admin/roleManagement/class_roleManagement.inc:162
-#, fuzzy
-msgid "Permission"
-msgstr "Права для членов группы"
-
-#: admin/roleManagement/class_roleManagement.inc:178
-#: admin/roleManagement/class_divListRole.inc:70
-#: admin/roleManagement/class_divListRole.inc:117
-#: admin/roleManagement/class_divListRole.inc:205
-msgid "Role"
-msgstr "Роль"
-
-#: admin/roleManagement/class_roleManagement.inc:212
+#: admin/roleManagement/class_roleManagement.inc:26
 #, fuzzy
-msgid "Permission error"
-msgstr "Права для членов группы"
+msgid "Role management"
+msgstr "Управление подразделениями"
 
 #: admin/roleManagement/remove.tpl:2
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: admin/roleManagement/remove.tpl:7
+#: admin/roleManagement/remove.tpl:6
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
@@ -62,146 +44,120 @@ msgstr ""
 "Если вы уверены в своих действиях, нажмите на кнопку <i>Удалить</i>, иначе "
 "нажмите <i>Отмена</i>."
 
-#: admin/roleManagement/class_roleGeneric.inc:216
-#: admin/roleManagement/class_roleGeneric.inc:225
-#: admin/roleManagement/class_roleGeneric.inc:392
+#: admin/roleManagement/class_roleGeneric.inc:220
+#: admin/roleManagement/class_roleGeneric.inc:229
+#: admin/roleManagement/class_roleGeneric.inc:404
+#: admin/roleManagement/role-list.xml:41
 #: admin/roleManagement/roleGeneric.tpl:11
 msgid "Name"
 msgstr "Фамилия"
 
-#: admin/roleManagement/class_roleGeneric.inc:246
+#: admin/roleManagement/class_roleGeneric.inc:250
 #, fuzzy
 msgid "Unknown"
 msgstr "состояние неизвестно"
 
-#: admin/roleManagement/class_roleGeneric.inc:264
-#: admin/roleManagement/class_roleGeneric.inc:298
+#: admin/roleManagement/class_roleGeneric.inc:268
+#: admin/roleManagement/class_roleGeneric.inc:310
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
 
-#: admin/roleManagement/class_roleGeneric.inc:383
+#: admin/roleManagement/class_roleGeneric.inc:395
 #: admin/roleManagement/roleGeneric.tpl:6
 msgid "Generic"
 msgstr "Общее"
 
-#: admin/roleManagement/class_roleGeneric.inc:384
+#: admin/roleManagement/class_roleGeneric.inc:396
 #, fuzzy
 msgid "Role generic"
 msgstr "Имя сервера"
 
-#: admin/roleManagement/class_roleGeneric.inc:393
+#: admin/roleManagement/class_roleGeneric.inc:405
+#: admin/roleManagement/role-list.xml:49
 #: admin/roleManagement/roleGeneric.tpl:19
 msgid "Description"
 msgstr "Описание"
 
-#: admin/roleManagement/class_roleGeneric.inc:394
-#: admin/roleManagement/class_divListRole.inc:104
+#: admin/roleManagement/class_roleGeneric.inc:406
+#: admin/roleManagement/role-list.tpl:13
 #: admin/roleManagement/roleGeneric.tpl:29
 msgid "Base"
 msgstr "Ветка"
 
-#: admin/roleManagement/class_roleGeneric.inc:395
+#: admin/roleManagement/class_roleGeneric.inc:407
 #, fuzzy
 msgid "Telefon number"
 msgstr "Телефонные номера"
 
-#: admin/roleManagement/class_roleGeneric.inc:396
+#: admin/roleManagement/class_roleGeneric.inc:408
 #: admin/roleManagement/roleGeneric.tpl:56
 #, fuzzy
 msgid "Fax number"
 msgstr "Терминал"
 
-#: admin/roleManagement/class_roleGeneric.inc:397
+#: admin/roleManagement/class_roleGeneric.inc:409
 #: admin/roleManagement/roleGeneric.tpl:68
 msgid "Occupants"
 msgstr ""
 
-#: admin/roleManagement/paste_generic.tpl:4
-msgid "Group name"
-msgstr "Группа"
-
-#: admin/roleManagement/paste_generic.tpl:7
-#, fuzzy
-msgid "Please enter the new object group name"
-msgstr "Введите адрес сервера"
-
-#: admin/roleManagement/class_divListRole.inc:52
-#: admin/roleManagement/class_divListRole.inc:53
+#: admin/roleManagement/role-list.xml:11
 #, fuzzy
 msgid "List of roles"
 msgstr "Список пользователей"
 
-#: admin/roleManagement/class_divListRole.inc:64
-#, fuzzy
-msgid "Select all"
-msgstr "Удалить"
-
-#: admin/roleManagement/class_divListRole.inc:70
-msgid "Department"
-msgstr "Подразделение"
+#: admin/roleManagement/role-list.xml:15 admin/roleManagement/role-list.xml:74
+msgid "Role"
+msgstr "Роль"
 
-#: admin/roleManagement/class_divListRole.inc:71
-#: admin/roleManagement/class_divListRole.inc:110
+#: admin/roleManagement/role-list.xml:57
 msgid "Actions"
 msgstr "Действия"
 
-#: admin/roleManagement/class_divListRole.inc:80
-#, fuzzy
-msgid "Regular expression for matching role names"
-msgstr "Регулярное выражение, соответствующее именам групп"
-
-#: admin/roleManagement/class_divListRole.inc:107
-#, fuzzy
-msgid "Submit department"
-msgstr "Показать подразделения"
-
-#: admin/roleManagement/class_divListRole.inc:107
-msgid "Submit"
-msgstr ""
-
-#: admin/roleManagement/class_divListRole.inc:115
+#: admin/roleManagement/role-list.xml:68
 msgid "Create"
 msgstr "Создать"
 
-#: admin/roleManagement/class_divListRole.inc:123
+#: admin/roleManagement/role-list.xml:86
+msgid "Edit"
+msgstr "Изменить"
+
+#: admin/roleManagement/role-list.xml:93
 msgid "Remove"
 msgstr "Удалить"
 
-#: admin/roleManagement/class_divListRole.inc:168
+#: admin/roleManagement/role-list.xml:125
 #, fuzzy
-msgid "edit"
-msgstr "Изменить"
+msgid "Edit role"
+msgstr "Пользователи домена"
 
-#: admin/roleManagement/class_divListRole.inc:169
+#: admin/roleManagement/role-list.xml:138
 #, fuzzy
-msgid "Edit this entry"
-msgstr "Редактиовать объект"
+msgid "Remove role"
+msgstr "Включаемые объекты"
 
-#: admin/roleManagement/class_divListRole.inc:174
-#, fuzzy
-msgid "delete"
-msgstr "Удалить"
+#: admin/roleManagement/role-list.tpl:13
+msgid "Update"
+msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:175
-#, fuzzy
-msgid "Delete this entry"
-msgstr "Удалить"
+#: admin/roleManagement/role-list.tpl:13
+msgid "Submit"
+msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:222
+#: admin/roleManagement/paste_generic.tpl:4
 #, fuzzy
-msgid "Number of listed roles"
-msgstr "Название группы"
+msgid "Role name"
+msgstr "Имя сервера"
 
-#: admin/roleManagement/class_divListRole.inc:223
+#: admin/roleManagement/paste_generic.tpl:7
 #, fuzzy
-msgid "Number of listed departments"
-msgstr "Подразделение"
+msgid "Please enter the new object role name"
+msgstr "Введите адрес сервера"
 
-#: admin/roleManagement/main.inc:57
+#: admin/roleManagement/role-filter.tpl:3
 #, fuzzy
-msgid "Role management"
-msgstr "Управление подразделениями"
+msgid "Filter"
+msgstr "Фильтры"
 
 #: admin/roleManagement/roleGeneric.tpl:34
 msgid "Choose subtree to place user in"
@@ -251,6 +207,60 @@ msgstr "Показать совпадения объектов"
 msgid "Regular expression for matching object names"
 msgstr "Регулярное выражение, соответствующее именам объектов"
 
+#, fuzzy
+#~ msgid "Manage roles"
+#~ msgstr "Пользователи домена"
+
+#, fuzzy
+#~ msgid "Permission"
+#~ msgstr "Права для членов группы"
+
+#, fuzzy
+#~ msgid "Permission error"
+#~ msgstr "Права для членов группы"
+
+#~ msgid "Group name"
+#~ msgstr "Группа"
+
+#, fuzzy
+#~ msgid "Select all"
+#~ msgstr "Удалить"
+
+#~ msgid "Department"
+#~ msgstr "Подразделение"
+
+#, fuzzy
+#~ msgid "Regular expression for matching role names"
+#~ msgstr "Регулярное выражение, соответствующее именам групп"
+
+#, fuzzy
+#~ msgid "Submit department"
+#~ msgstr "Показать подразделения"
+
+#, fuzzy
+#~ msgid "edit"
+#~ msgstr "Изменить"
+
+#, fuzzy
+#~ msgid "Edit this entry"
+#~ msgstr "Редактиовать объект"
+
+#, fuzzy
+#~ msgid "delete"
+#~ msgstr "Удалить"
+
+#, fuzzy
+#~ msgid "Delete this entry"
+#~ msgstr "Удалить"
+
+#, fuzzy
+#~ msgid "Number of listed roles"
+#~ msgstr "Название группы"
+
+#, fuzzy
+#~ msgid "Number of listed departments"
+#~ msgstr "Подразделение"
+
 #, fuzzy
 #~ msgid "role"
 #~ msgstr "Доступ"
diff --git a/gosa-plugins/rolemanagement/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/rolemanagement/locale/zh/LC_MESSAGES/messages.po
index 51879b645..dd5981059 100644
--- a/gosa-plugins/rolemanagement/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/rolemanagement/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:38+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -16,40 +16,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: admin/roleManagement/class_roleManagement.inc:26
-#: admin/roleManagement/class_roleGeneric.inc:389
-#: admin/roleManagement/main.inc:53
+#: admin/roleManagement/class_roleManagement.inc:25
+#: admin/roleManagement/class_roleGeneric.inc:401
 #, fuzzy
 msgid "Roles"
 msgstr "角色"
 
-#: admin/roleManagement/class_roleManagement.inc:27
-#, fuzzy
-msgid "Manage roles"
-msgstr "域用户"
-
-#: admin/roleManagement/class_roleManagement.inc:162
-#, fuzzy
-msgid "Permission"
-msgstr "允许"
-
-#: admin/roleManagement/class_roleManagement.inc:178
-#: admin/roleManagement/class_divListRole.inc:70
-#: admin/roleManagement/class_divListRole.inc:117
-#: admin/roleManagement/class_divListRole.inc:205
-msgid "Role"
-msgstr "角色"
-
-#: admin/roleManagement/class_roleManagement.inc:212
+#: admin/roleManagement/class_roleManagement.inc:26
 #, fuzzy
-msgid "Permission error"
-msgstr "允许"
+msgid "Role management"
+msgstr "管理"
 
 #: admin/roleManagement/remove.tpl:2
 msgid "Warning"
 msgstr "警告"
 
-#: admin/roleManagement/remove.tpl:7
+#: admin/roleManagement/remove.tpl:6
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
@@ -59,139 +41,119 @@ msgstr "请再次检查您是否要这么做，因为 GOsa 没有办法将您的
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "所以，如果您确定，请按“删除”继续，否则按“取消”退出。"
 
-#: admin/roleManagement/class_roleGeneric.inc:216
-#: admin/roleManagement/class_roleGeneric.inc:225
-#: admin/roleManagement/class_roleGeneric.inc:392
+#: admin/roleManagement/class_roleGeneric.inc:220
+#: admin/roleManagement/class_roleGeneric.inc:229
+#: admin/roleManagement/class_roleGeneric.inc:404
+#: admin/roleManagement/role-list.xml:41
 #: admin/roleManagement/roleGeneric.tpl:11
 msgid "Name"
 msgstr "名称"
 
-#: admin/roleManagement/class_roleGeneric.inc:246
+#: admin/roleManagement/class_roleGeneric.inc:250
 msgid "Unknown"
 msgstr "未知"
 
-#: admin/roleManagement/class_roleGeneric.inc:264
-#: admin/roleManagement/class_roleGeneric.inc:298
+#: admin/roleManagement/class_roleGeneric.inc:268
+#: admin/roleManagement/class_roleGeneric.inc:310
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
 
-#: admin/roleManagement/class_roleGeneric.inc:383
+#: admin/roleManagement/class_roleGeneric.inc:395
 #: admin/roleManagement/roleGeneric.tpl:6
 msgid "Generic"
 msgstr "通用配置"
 
-#: admin/roleManagement/class_roleGeneric.inc:384
+#: admin/roleManagement/class_roleGeneric.inc:396
 #, fuzzy
 msgid "Role generic"
 msgstr "重命名"
 
-#: admin/roleManagement/class_roleGeneric.inc:393
+#: admin/roleManagement/class_roleGeneric.inc:405
+#: admin/roleManagement/role-list.xml:49
 #: admin/roleManagement/roleGeneric.tpl:19
 msgid "Description"
 msgstr "描述"
 
-#: admin/roleManagement/class_roleGeneric.inc:394
-#: admin/roleManagement/class_divListRole.inc:104
+#: admin/roleManagement/class_roleGeneric.inc:406
+#: admin/roleManagement/role-list.tpl:13
 #: admin/roleManagement/roleGeneric.tpl:29
 msgid "Base"
 msgstr "位置"
 
-#: admin/roleManagement/class_roleGeneric.inc:395
+#: admin/roleManagement/class_roleGeneric.inc:407
 #, fuzzy
 msgid "Telefon number"
 msgstr "电话号码"
 
-#: admin/roleManagement/class_roleGeneric.inc:396
+#: admin/roleManagement/class_roleGeneric.inc:408
 #: admin/roleManagement/roleGeneric.tpl:56
 #, fuzzy
 msgid "Fax number"
 msgstr "系列号"
 
-#: admin/roleManagement/class_roleGeneric.inc:397
+#: admin/roleManagement/class_roleGeneric.inc:409
 #: admin/roleManagement/roleGeneric.tpl:68
 msgid "Occupants"
 msgstr ""
 
-#: admin/roleManagement/paste_generic.tpl:4
-msgid "Group name"
-msgstr "组名"
-
-#: admin/roleManagement/paste_generic.tpl:7
-msgid "Please enter the new object group name"
-msgstr "请输入新对象组名称"
-
-#: admin/roleManagement/class_divListRole.inc:52
-#: admin/roleManagement/class_divListRole.inc:53
+#: admin/roleManagement/role-list.xml:11
 #, fuzzy
 msgid "List of roles"
 msgstr "用户列表"
 
-#: admin/roleManagement/class_divListRole.inc:64
-#, fuzzy
-msgid "Select all"
-msgstr "选择"
-
-#: admin/roleManagement/class_divListRole.inc:70
-msgid "Department"
-msgstr "部门"
+#: admin/roleManagement/role-list.xml:15 admin/roleManagement/role-list.xml:74
+msgid "Role"
+msgstr "角色"
 
-#: admin/roleManagement/class_divListRole.inc:71
-#: admin/roleManagement/class_divListRole.inc:110
+#: admin/roleManagement/role-list.xml:57
 msgid "Actions"
 msgstr "动作"
 
-#: admin/roleManagement/class_divListRole.inc:80
-#, fuzzy
-msgid "Regular expression for matching role names"
-msgstr "用于匹配组名的正则表达式"
-
-#: admin/roleManagement/class_divListRole.inc:107
-msgid "Submit department"
-msgstr "提交部门"
-
-#: admin/roleManagement/class_divListRole.inc:107
-msgid "Submit"
-msgstr "提交"
-
-#: admin/roleManagement/class_divListRole.inc:115
+#: admin/roleManagement/role-list.xml:68
 msgid "Create"
 msgstr "创建"
 
-#: admin/roleManagement/class_divListRole.inc:123
+#: admin/roleManagement/role-list.xml:86
+msgid "Edit"
+msgstr "编辑"
+
+#: admin/roleManagement/role-list.xml:93
 msgid "Remove"
 msgstr "删除"
 
-#: admin/roleManagement/class_divListRole.inc:168
-msgid "edit"
-msgstr "编辑"
+#: admin/roleManagement/role-list.xml:125
+#, fuzzy
+msgid "Edit role"
+msgstr "编辑宏"
 
-#: admin/roleManagement/class_divListRole.inc:169
-msgid "Edit this entry"
-msgstr "编辑这条记录"
+#: admin/roleManagement/role-list.xml:138
+#, fuzzy
+msgid "Remove role"
+msgstr "成员对象"
 
-#: admin/roleManagement/class_divListRole.inc:174
-msgid "delete"
-msgstr "删除"
+#: admin/roleManagement/role-list.tpl:13
+msgid "Update"
+msgstr ""
 
-#: admin/roleManagement/class_divListRole.inc:175
-msgid "Delete this entry"
-msgstr "删除这个条目"
+#: admin/roleManagement/role-list.tpl:13
+msgid "Submit"
+msgstr "提交"
 
-#: admin/roleManagement/class_divListRole.inc:222
+#: admin/roleManagement/paste_generic.tpl:4
 #, fuzzy
-msgid "Number of listed roles"
-msgstr "组名称"
+msgid "Role name"
+msgstr "重命名"
 
-#: admin/roleManagement/class_divListRole.inc:223
+#: admin/roleManagement/paste_generic.tpl:7
 #, fuzzy
-msgid "Number of listed departments"
-msgstr "部门名称"
+msgid "Please enter the new object role name"
+msgstr "请输入新对象组名称"
 
-#: admin/roleManagement/main.inc:57
+#: admin/roleManagement/role-filter.tpl:3
 #, fuzzy
-msgid "Role management"
-msgstr "管理"
+msgid "Filter"
+msgstr "过滤器"
 
 #: admin/roleManagement/roleGeneric.tpl:34
 msgid "Choose subtree to place user in"
@@ -238,6 +200,55 @@ msgstr "显示匹配对象"
 msgid "Regular expression for matching object names"
 msgstr "匹配对象名的正则表达式"
 
+#, fuzzy
+#~ msgid "Manage roles"
+#~ msgstr "域用户"
+
+#, fuzzy
+#~ msgid "Permission"
+#~ msgstr "允许"
+
+#, fuzzy
+#~ msgid "Permission error"
+#~ msgstr "允许"
+
+#~ msgid "Group name"
+#~ msgstr "组名"
+
+#, fuzzy
+#~ msgid "Select all"
+#~ msgstr "选择"
+
+#~ msgid "Department"
+#~ msgstr "部门"
+
+#, fuzzy
+#~ msgid "Regular expression for matching role names"
+#~ msgstr "用于匹配组名的正则表达式"
+
+#~ msgid "Submit department"
+#~ msgstr "提交部门"
+
+#~ msgid "edit"
+#~ msgstr "编辑"
+
+#~ msgid "Edit this entry"
+#~ msgstr "编辑这条记录"
+
+#~ msgid "delete"
+#~ msgstr "删除"
+
+#~ msgid "Delete this entry"
+#~ msgstr "删除这个条目"
+
+#, fuzzy
+#~ msgid "Number of listed roles"
+#~ msgstr "组名称"
+
+#, fuzzy
+#~ msgid "Number of listed departments"
+#~ msgstr "部门名称"
+
 #, fuzzy
 #~ msgid "role"
 #~ msgstr "MAC 地址"
diff --git a/gosa-plugins/rsyslog/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/rsyslog/locale/de/LC_MESSAGES/messages.po
index dd53ff5b1..df6c379d8 100644
--- a/gosa-plugins/rsyslog/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/rsyslog/locale/de/LC_MESSAGES/messages.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-29 15:03+0100\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2009-10-05 15:19+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: de <kde-i18n-de@kde.org>\n"
@@ -100,99 +100,100 @@ msgstr "%s Einträge passten auf den Filter"
 msgid "The selected server '%s' does not exists!"
 msgstr "Der ausgewählte Server '%s' existiert nicht!"
 
-#: addons/rsyslog/class_rsyslog.inc:302
+#: addons/rsyslog/class_rsyslog.inc:304
 msgid "Emergency"
 msgstr "Notfall"
 
-#: addons/rsyslog/class_rsyslog.inc:303
+#: addons/rsyslog/class_rsyslog.inc:305
 msgid "Alert"
 msgstr "Alarm"
 
-#: addons/rsyslog/class_rsyslog.inc:304
+#: addons/rsyslog/class_rsyslog.inc:306
 msgid "Critical"
 msgstr "Kritisch"
 
-#: addons/rsyslog/class_rsyslog.inc:305 addons/rsyslog/rSyslog.tpl:62
+#: addons/rsyslog/class_rsyslog.inc:307 addons/rsyslog/rSyslog.tpl:62
 msgid "Error"
 msgstr "Fehler"
 
-#: addons/rsyslog/class_rsyslog.inc:306
+#: addons/rsyslog/class_rsyslog.inc:308
 msgid "Warning"
 msgstr "Warnung"
 
-#: addons/rsyslog/class_rsyslog.inc:307
+#: addons/rsyslog/class_rsyslog.inc:309
 msgid "Notice"
 msgstr "Hinweis"
 
-#: addons/rsyslog/class_rsyslog.inc:308
+#: addons/rsyslog/class_rsyslog.inc:310
 msgid "Informational"
 msgstr "Informativ"
 
-#: addons/rsyslog/class_rsyslog.inc:309
+#: addons/rsyslog/class_rsyslog.inc:311
 msgid "Debug"
 msgstr "Fehlersuche"
 
-#: addons/rsyslog/class_rsyslog.inc:315 addons/rsyslog/class_rsyslog.inc:350
+#: addons/rsyslog/class_rsyslog.inc:317 addons/rsyslog/class_rsyslog.inc:352
+#, php-format
 msgid "Unknown (%s)"
 msgstr "Unbekannt (%s)"
 
-#: addons/rsyslog/class_rsyslog.inc:321
+#: addons/rsyslog/class_rsyslog.inc:323
 msgid "Kernel"
 msgstr "Kern"
 
-#: addons/rsyslog/class_rsyslog.inc:322
+#: addons/rsyslog/class_rsyslog.inc:324
 msgid "User level"
 msgstr "Benutzer Ebene"
 
-#: addons/rsyslog/class_rsyslog.inc:323
+#: addons/rsyslog/class_rsyslog.inc:325
 msgid "Mail system"
 msgstr "Mailsystem"
 
-#: addons/rsyslog/class_rsyslog.inc:324
+#: addons/rsyslog/class_rsyslog.inc:326
 msgid "System daemon"
 msgstr "Systemdienste"
 
-#: addons/rsyslog/class_rsyslog.inc:325 addons/rsyslog/class_rsyslog.inc:331
+#: addons/rsyslog/class_rsyslog.inc:327 addons/rsyslog/class_rsyslog.inc:333
 msgid "Security"
 msgstr "Sicherheit"
 
-#: addons/rsyslog/class_rsyslog.inc:326
+#: addons/rsyslog/class_rsyslog.inc:328
 msgid "Internal"
 msgstr "Intern"
 
-#: addons/rsyslog/class_rsyslog.inc:327
+#: addons/rsyslog/class_rsyslog.inc:329
 msgid "Printing"
 msgstr "Drucksystem"
 
-#: addons/rsyslog/class_rsyslog.inc:328
+#: addons/rsyslog/class_rsyslog.inc:330
 msgid "News"
 msgstr "Newssystem"
 
-#: addons/rsyslog/class_rsyslog.inc:329
+#: addons/rsyslog/class_rsyslog.inc:331
 msgid "UUCP"
 msgstr "UUCP"
 
-#: addons/rsyslog/class_rsyslog.inc:330
+#: addons/rsyslog/class_rsyslog.inc:332
 msgid "Cron"
 msgstr "Cron"
 
-#: addons/rsyslog/class_rsyslog.inc:332
+#: addons/rsyslog/class_rsyslog.inc:334
 msgid "FTP"
 msgstr "FTP"
 
-#: addons/rsyslog/class_rsyslog.inc:333
+#: addons/rsyslog/class_rsyslog.inc:335
 msgid "NTP"
 msgstr "NTP"
 
-#: addons/rsyslog/class_rsyslog.inc:334
+#: addons/rsyslog/class_rsyslog.inc:336
 msgid "Log audit"
 msgstr "Log audit"
 
-#: addons/rsyslog/class_rsyslog.inc:335
+#: addons/rsyslog/class_rsyslog.inc:337
 msgid "Log alert"
 msgstr "Log alarm"
 
-#: addons/rsyslog/class_rsyslog.inc:336
+#: addons/rsyslog/class_rsyslog.inc:338
 msgid "Clock"
 msgstr "Zeit"
 
diff --git a/gosa-plugins/samba/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/samba/locale/de/LC_MESSAGES/messages.po
index 4fe39863a..c9600d9fa 100644
--- a/gosa-plugins/samba/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/samba/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2009-06-22 15:55+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
@@ -48,8 +48,8 @@ msgstr "Netzwerk"
 
 #: admin/systems/samba/class_winGeneric.inc:170
 #: admin/systems/samba/class_winGeneric.inc:293
-#: personal/samba/class_sambaAccount.inc:958
-#: personal/samba/class_sambaAccount.inc:1298
+#: personal/samba/class_sambaAccount.inc:943
+#: personal/samba/class_sambaAccount.inc:1290
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
@@ -75,12 +75,12 @@ msgid "Generic"
 msgstr "Allgemein"
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:107
-#: personal/samba/class_sambaAccount.inc:981
-#: personal/samba/class_sambaAccount.inc:1455
+#: personal/samba/class_sambaAccount.inc:966
+#: personal/samba/class_sambaAccount.inc:1447
 msgid "Home directory"
 msgstr "Basisverzeichnis"
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1406
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1398
 msgid "Domain"
 msgstr "Domäne"
 
@@ -93,8 +93,8 @@ msgid "Script path"
 msgstr "Anmeldeskript"
 
 #: personal/samba/samba3.tpl:53 personal/samba/samba3.tpl:120
-#: personal/samba/class_sambaAccount.inc:982
-#: personal/samba/class_sambaAccount.inc:1456
+#: personal/samba/class_sambaAccount.inc:967
+#: personal/samba/class_sambaAccount.inc:1448
 msgid "Profile path"
 msgstr "Profil-Pfad"
 
@@ -102,11 +102,11 @@ msgstr "Profil-Pfad"
 msgid "Terminal Server"
 msgstr "Terminal-Server"
 
-#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1409
+#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1401
 msgid "Allow login on terminal server"
 msgstr "Anmeldung am Terminalserver zulassen"
 
-#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1410
+#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1402
 msgid "Inherit client config"
 msgstr "Client-Konfiguration übernehmen"
 
@@ -122,18 +122,18 @@ msgstr "Arbeitsverzeichnis"
 msgid "Timeout settings (in minutes)"
 msgstr "Zeitlimit (in Minuten)"
 
-#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:989
-#: personal/samba/class_sambaAccount.inc:1463
+#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:1455
 msgid "Connection"
 msgstr "Verbinden"
 
-#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:990
-#: personal/samba/class_sambaAccount.inc:1464
+#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:975
+#: personal/samba/class_sambaAccount.inc:1456
 msgid "Disconnection"
 msgstr "Trennen"
 
-#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:991
-#: personal/samba/class_sambaAccount.inc:1465
+#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:976
+#: personal/samba/class_sambaAccount.inc:1457
 msgid "IDLE"
 msgstr "Leerlauf"
 
@@ -177,7 +177,7 @@ msgstr "Zugriffsoptionen"
 msgid "The password never expires"
 msgstr "Passwort läuft nie ab"
 
-#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1412
+#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1404
 msgid "Login from windows client requires no password"
 msgstr "Die Anmeldung vom Windows-Client erfordert kein Passwort"
 
@@ -185,15 +185,15 @@ msgstr "Die Anmeldung vom Windows-Client erfordert kein Passwort"
 msgid "Allow user to change password from client"
 msgstr "Der Benutzer darf das Passwort vom Client aus ändern"
 
-#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1414
+#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1406
 msgid "Lock samba account"
 msgstr "Samba-Konto sperren"
 
-#: personal/samba/samba3.tpl:350
+#: personal/samba/samba3.tpl:350 personal/samba/class_sambaAccount.inc:988
 msgid "Password expires on"
 msgstr "Passwort läuft ab am"
 
-#: personal/samba/samba3.tpl:377
+#: personal/samba/samba3.tpl:377 personal/samba/class_sambaAccount.inc:985
 msgid "Account expires after"
 msgstr "Konto läuft ab am"
 
@@ -226,14 +226,14 @@ msgid "Hour"
 msgstr "Stunde"
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:214
-#: personal/samba/class_sambaAccount.inc:226
-#: personal/samba/class_sambaAccount.inc:227
-#: personal/samba/class_sambaAccount.inc:236
-#: personal/samba/class_sambaAccount.inc:237
-#: personal/samba/class_sambaAccount.inc:239
-#: personal/samba/class_sambaAccount.inc:240
-#: personal/samba/class_sambaAccount.inc:1393
+#: personal/samba/class_sambaAccount.inc:199
+#: personal/samba/class_sambaAccount.inc:211
+#: personal/samba/class_sambaAccount.inc:212
+#: personal/samba/class_sambaAccount.inc:221
+#: personal/samba/class_sambaAccount.inc:222
+#: personal/samba/class_sambaAccount.inc:224
+#: personal/samba/class_sambaAccount.inc:225
+#: personal/samba/class_sambaAccount.inc:1385
 msgid "Samba"
 msgstr "Samba"
 
@@ -241,321 +241,321 @@ msgstr "Samba"
 msgid "This does something"
 msgstr "Dies tut etwas"
 
-#: personal/samba/class_sambaAccount.inc:240
+#: personal/samba/class_sambaAccount.inc:225
 msgid "POSIX"
 msgstr "POSIX"
 
-#: personal/samba/class_sambaAccount.inc:357
+#: personal/samba/class_sambaAccount.inc:342
 msgid "Error"
 msgstr "Fehler"
 
-#: personal/samba/class_sambaAccount.inc:357
+#: personal/samba/class_sambaAccount.inc:342
 msgid "Please select an entry!"
 msgstr "Bitte wählen Sie einen Eintrag!"
 
-#: personal/samba/class_sambaAccount.inc:452
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:794
+#: personal/samba/class_sambaAccount.inc:437
+#: personal/samba/class_sambaAccount.inc:753
+#: personal/samba/class_sambaAccount.inc:761
+#: personal/samba/class_sambaAccount.inc:779
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: personal/samba/class_sambaAccount.inc:453
+#: personal/samba/class_sambaAccount.inc:438
 msgid "input on, notify on"
 msgstr "Eingabe EIN, Benachrichtigen EIN"
 
-#: personal/samba/class_sambaAccount.inc:454
+#: personal/samba/class_sambaAccount.inc:439
 msgid "input on, notify off"
 msgstr "Eingabe EIN, Benachrichtigen AUS"
 
-#: personal/samba/class_sambaAccount.inc:455
+#: personal/samba/class_sambaAccount.inc:440
 msgid "input off, notify on"
 msgstr "Eingabe AUS, Benachrichtigen EIN"
 
-#: personal/samba/class_sambaAccount.inc:456
+#: personal/samba/class_sambaAccount.inc:441
 msgid "input off, nofify off"
 msgstr "Eingabe AUS, Benachrichtigen AUS"
 
-#: personal/samba/class_sambaAccount.inc:458
+#: personal/samba/class_sambaAccount.inc:443
 msgid "disconnect"
 msgstr "trennen"
 
-#: personal/samba/class_sambaAccount.inc:459
+#: personal/samba/class_sambaAccount.inc:444
 msgid "reset"
 msgstr "zurücksetzen"
 
-#: personal/samba/class_sambaAccount.inc:461
+#: personal/samba/class_sambaAccount.inc:446
 msgid "from any client"
 msgstr "von jedem Client"
 
-#: personal/samba/class_sambaAccount.inc:462
+#: personal/samba/class_sambaAccount.inc:447
 msgid "from previous client only"
 msgstr "nur von vorherigem Client"
 
-#: personal/samba/class_sambaAccount.inc:623
+#: personal/samba/class_sambaAccount.inc:608
 #, php-format
 msgid "The password is outdated since %s, by domain policy."
 msgstr "Das Passwort ist aufgrund der Domänen-Richtline seit %s abgelaufen."
 
-#: personal/samba/class_sambaAccount.inc:627
+#: personal/samba/class_sambaAccount.inc:612
 #, php-format
 msgid "The password is valid till %s, by user policy."
 msgstr "Das Passwort ist aufgrund der Benutzer-Richtline bis %s gültig."
 
-#: personal/samba/class_sambaAccount.inc:630
+#: personal/samba/class_sambaAccount.inc:615
 #, php-format
 msgid "The password is valid till %s, by domain policy."
 msgstr "Das Passwort ist aufgrund der Domänen-Richtline bis %s gültig."
 
-#: personal/samba/class_sambaAccount.inc:748
-#: personal/samba/class_sambaAccount.inc:754
-#: personal/samba/class_sambaAccount.inc:760
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:794
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
+#: personal/samba/class_sambaAccount.inc:733
+#: personal/samba/class_sambaAccount.inc:739
+#: personal/samba/class_sambaAccount.inc:745
+#: personal/samba/class_sambaAccount.inc:753
+#: personal/samba/class_sambaAccount.inc:761
+#: personal/samba/class_sambaAccount.inc:769
+#: personal/samba/class_sambaAccount.inc:779
+#: personal/samba/class_sambaAccount.inc:785
+#: personal/samba/class_sambaAccount.inc:793
 msgid "default"
 msgstr "Standard"
 
-#: personal/samba/class_sambaAccount.inc:754
-#: personal/samba/class_sambaAccount.inc:760
+#: personal/samba/class_sambaAccount.inc:739
+#: personal/samba/class_sambaAccount.inc:745
 msgid "Off"
 msgstr "Aus"
 
-#: personal/samba/class_sambaAccount.inc:762
+#: personal/samba/class_sambaAccount.inc:747
 msgid "On"
 msgstr "An"
 
-#: personal/samba/class_sambaAccount.inc:770
-#: personal/samba/class_sambaAccount.inc:778
+#: personal/samba/class_sambaAccount.inc:755
+#: personal/samba/class_sambaAccount.inc:763
 msgid "seconds"
 msgstr "Sekunden"
 
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:788
-#: personal/samba/class_sambaAccount.inc:880
+#: personal/samba/class_sambaAccount.inc:769
+#: personal/samba/class_sambaAccount.inc:773
+#: personal/samba/class_sambaAccount.inc:865
 msgid "minutes"
 msgstr "Minuten"
 
-#: personal/samba/class_sambaAccount.inc:786
+#: personal/samba/class_sambaAccount.inc:771
 msgid "forever"
 msgstr "dauerhaft"
 
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
+#: personal/samba/class_sambaAccount.inc:785
+#: personal/samba/class_sambaAccount.inc:793
 msgid "off"
 msgstr "aus"
 
-#: personal/samba/class_sambaAccount.inc:802
-#: personal/samba/class_sambaAccount.inc:810
+#: personal/samba/class_sambaAccount.inc:787
+#: personal/samba/class_sambaAccount.inc:795
 msgid "on"
 msgstr "an"
 
-#: personal/samba/class_sambaAccount.inc:818
-#: personal/samba/class_sambaAccount.inc:826
-#: personal/samba/class_sambaAccount.inc:834
-#: personal/samba/class_sambaAccount.inc:842
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:864
-#: personal/samba/class_sambaAccount.inc:870
+#: personal/samba/class_sambaAccount.inc:803
+#: personal/samba/class_sambaAccount.inc:811
+#: personal/samba/class_sambaAccount.inc:819
+#: personal/samba/class_sambaAccount.inc:827
+#: personal/samba/class_sambaAccount.inc:835
+#: personal/samba/class_sambaAccount.inc:843
+#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:855
 msgid "unset"
 msgstr "nicht gesetzt"
 
-#: personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:857
 msgid "immediately"
 msgstr "sofort"
 
-#: personal/samba/class_sambaAccount.inc:878
+#: personal/samba/class_sambaAccount.inc:863
 msgid "days"
 msgstr "Tage"
 
-#: personal/samba/class_sambaAccount.inc:879
+#: personal/samba/class_sambaAccount.inc:864
 msgid "hours"
 msgstr "Stunden"
 
-#: personal/samba/class_sambaAccount.inc:886
+#: personal/samba/class_sambaAccount.inc:871
 msgid "Domain attributes"
 msgstr "Eigenschaften der Domäne"
 
-#: personal/samba/class_sambaAccount.inc:887
-#: personal/samba/class_sambaAccount.inc:888
+#: personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:873
 msgid "Min password length"
 msgstr "Minimale Passwort-Länge"
 
-#: personal/samba/class_sambaAccount.inc:889
+#: personal/samba/class_sambaAccount.inc:874
 msgid "Password history"
 msgstr "Passwort-Historie"
 
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:875
 msgid "Force password change"
 msgstr "Erzwinge Änderung des Passwortes"
 
-#: personal/samba/class_sambaAccount.inc:891
+#: personal/samba/class_sambaAccount.inc:876
 msgid "Maximum password age"
 msgstr "Maximales Passwort-Alter"
 
-#: personal/samba/class_sambaAccount.inc:892
+#: personal/samba/class_sambaAccount.inc:877
 msgid "Minimum password age"
 msgstr "Minimales Passwort-Alter"
 
-#: personal/samba/class_sambaAccount.inc:893
+#: personal/samba/class_sambaAccount.inc:878
 msgid "Lockout duration"
 msgstr "Dauer der Sperre"
 
-#: personal/samba/class_sambaAccount.inc:894
+#: personal/samba/class_sambaAccount.inc:879
 msgid "Bad lockout attempt"
 msgstr "Aussperren nach Anzahl fehlgeschlagener Anmeldungen"
 
-#: personal/samba/class_sambaAccount.inc:895
+#: personal/samba/class_sambaAccount.inc:880
 msgid "Disconnect time"
 msgstr "Zeit bis automatische Trennung"
 
-#: personal/samba/class_sambaAccount.inc:896
+#: personal/samba/class_sambaAccount.inc:881
 msgid "Refuse machine password change"
 msgstr "Verweigere Änderung der Passwörter für Computerkonten"
 
-#: personal/samba/class_sambaAccount.inc:898
+#: personal/samba/class_sambaAccount.inc:883
 msgid "User attributes"
 msgstr "Eigenschaften des Benutzers"
 
-#: personal/samba/class_sambaAccount.inc:899
+#: personal/samba/class_sambaAccount.inc:884
 msgid "SID"
 msgstr "SID"
 
-#: personal/samba/class_sambaAccount.inc:900
+#: personal/samba/class_sambaAccount.inc:885
 msgid "Last failed login"
 msgstr "Letzter Fehlschlag der Anmeldung"
 
-#: personal/samba/class_sambaAccount.inc:901
+#: personal/samba/class_sambaAccount.inc:886
 msgid "Logon attempts"
 msgstr "Anmeldeversuche"
 
-#: personal/samba/class_sambaAccount.inc:902
+#: personal/samba/class_sambaAccount.inc:887
 msgid "Last password update"
 msgstr "Letzte Passwortänderung"
 
-#: personal/samba/class_sambaAccount.inc:903
+#: personal/samba/class_sambaAccount.inc:888
 msgid "Last logon"
 msgstr "Letztes Login"
 
-#: personal/samba/class_sambaAccount.inc:904
+#: personal/samba/class_sambaAccount.inc:889
 msgid "Last logoff"
 msgstr "Letzte Abmeldung"
 
-#: personal/samba/class_sambaAccount.inc:905
+#: personal/samba/class_sambaAccount.inc:890
 msgid "Automatic logoff"
 msgstr "Automatische Abmeldung"
 
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:913
-#: personal/samba/class_sambaAccount.inc:1416
+#: personal/samba/class_sambaAccount.inc:893
+#: personal/samba/class_sambaAccount.inc:898
+#: personal/samba/class_sambaAccount.inc:1408
 msgid "Password expires"
 msgstr "Passwort läuft ab"
 
-#: personal/samba/class_sambaAccount.inc:908
+#: personal/samba/class_sambaAccount.inc:893
 msgid "No"
 msgstr "nein"
 
-#: personal/samba/class_sambaAccount.inc:910
+#: personal/samba/class_sambaAccount.inc:895
 #, php-format
 msgid "The password would expire on %s, but the password expiry is disabled."
 msgstr ""
 "Das Passwort läuft am %s ab, aber ablaufende Passwörter sind deaktiviert."
 
-#: personal/samba/class_sambaAccount.inc:916
+#: personal/samba/class_sambaAccount.inc:901
 msgid "Password change available"
 msgstr "Passwort-Änderung möglich"
 
-#: personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:959
 msgid "Home drive"
 msgstr "Basis-Laufwerk"
 
-#: personal/samba/class_sambaAccount.inc:977
+#: personal/samba/class_sambaAccount.inc:962
 msgid "Home path"
 msgstr "Basis-Pfad"
 
-#: personal/samba/class_sambaAccount.inc:1000
+#: personal/samba/class_sambaAccount.inc:993
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr "Die Benutzerverwaltung von Windows erlaubt höchstens acht Clients!"
 
-#: personal/samba/class_sambaAccount.inc:1018
+#: personal/samba/class_sambaAccount.inc:1011
 msgid "Information"
 msgstr "Information"
 
-#: personal/samba/class_sambaAccount.inc:1192
-#: personal/samba/class_sambaAccount.inc:1216
+#: personal/samba/class_sambaAccount.inc:1184
+#: personal/samba/class_sambaAccount.inc:1208
 msgid "Warning"
 msgstr "Warnung"
 
-#: personal/samba/class_sambaAccount.inc:1192
+#: personal/samba/class_sambaAccount.inc:1184
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 "Undefinierte Samba SID festgestellt. Bitte beheben Sie dieses Problem "
 "manuell!"
 
-#: personal/samba/class_sambaAccount.inc:1216
+#: personal/samba/class_sambaAccount.inc:1208
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 "Kann primäre Gruppe nicht in Samba-Gruppe überführen: die Gruppe kann nicht "
 "identifiziert werden!"
 
-#: personal/samba/class_sambaAccount.inc:1394 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1386 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr "Samba-Einstellungen"
 
-#: personal/samba/class_sambaAccount.inc:1398
+#: personal/samba/class_sambaAccount.inc:1390
 msgid "My account"
 msgstr "Mein Konto"
 
-#: personal/samba/class_sambaAccount.inc:1404
+#: personal/samba/class_sambaAccount.inc:1396
 msgid "Generic home directory"
 msgstr "Allgemeines Basisverzeichnis"
 
-#: personal/samba/class_sambaAccount.inc:1405
+#: personal/samba/class_sambaAccount.inc:1397
 msgid "Generic samba home drive"
 msgstr "Allgemeines Samba Basis-Laufwerk"
 
-#: personal/samba/class_sambaAccount.inc:1407
+#: personal/samba/class_sambaAccount.inc:1399
 msgid "Generic script path"
 msgstr "Allgemeiner Skript-Pfad"
 
-#: personal/samba/class_sambaAccount.inc:1408
+#: personal/samba/class_sambaAccount.inc:1400
 msgid "Generic profile path"
 msgstr "Allgemeiner Profil-Pfad"
 
-#: personal/samba/class_sambaAccount.inc:1411
+#: personal/samba/class_sambaAccount.inc:1403
 msgid "Allow user to change password"
 msgstr "Benutzer darf sein Passwort ändern"
 
-#: personal/samba/class_sambaAccount.inc:1413
+#: personal/samba/class_sambaAccount.inc:1405
 msgid "Password never expires"
 msgstr "Passwort läuft nie ab"
 
-#: personal/samba/class_sambaAccount.inc:1415
+#: personal/samba/class_sambaAccount.inc:1407
 msgid "Account expires"
 msgstr "Konto läuft ab"
 
-#: personal/samba/class_sambaAccount.inc:1417
+#: personal/samba/class_sambaAccount.inc:1409
 msgid "Limit Logon Time"
 msgstr "Limitiere Logon Zeit"
 
-#: personal/samba/class_sambaAccount.inc:1418
+#: personal/samba/class_sambaAccount.inc:1410
 msgid "Limit Logoff Time"
 msgstr "Limitiere Logoff Zeit"
 
-#: personal/samba/class_sambaAccount.inc:1419
+#: personal/samba/class_sambaAccount.inc:1411
 msgid "Logon hours"
 msgstr "Anmeldezeiten"
 
-#: personal/samba/class_sambaAccount.inc:1420
+#: personal/samba/class_sambaAccount.inc:1412
 msgid "Allow connection from"
 msgstr "Erlaube Verbindung von"
 
-#: personal/samba/class_sambaAccount.inc:1475
+#: personal/samba/class_sambaAccount.inc:1467
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
diff --git a/gosa-plugins/samba/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/samba/locale/es/LC_MESSAGES/messages.po
index 99cfedeaf..d020e3368 100644
--- a/gosa-plugins/samba/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/samba/locale/es/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2008-12-08 17:37+0100\n"
 "Last-Translator: Alejandro Escanero Blanco <aescanero@gmail.com>\n"
 "Language-Team: spanish <es@li.org>\n"
@@ -46,8 +46,8 @@ msgstr "red"
 
 #: admin/systems/samba/class_winGeneric.inc:170
 #: admin/systems/samba/class_winGeneric.inc:293
-#: personal/samba/class_sambaAccount.inc:958
-#: personal/samba/class_sambaAccount.inc:1298
+#: personal/samba/class_sambaAccount.inc:943
+#: personal/samba/class_sambaAccount.inc:1290
 msgid "LDAP error"
 msgstr "Error LDAP"
 
@@ -73,12 +73,12 @@ msgid "Generic"
 msgstr "Genérico"
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:107
-#: personal/samba/class_sambaAccount.inc:981
-#: personal/samba/class_sambaAccount.inc:1455
+#: personal/samba/class_sambaAccount.inc:966
+#: personal/samba/class_sambaAccount.inc:1447
 msgid "Home directory"
 msgstr "Directorio de usuario"
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1406
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1398
 msgid "Domain"
 msgstr "Dominio"
 
@@ -92,8 +92,8 @@ msgid "Script path"
 msgstr "Ruta del Script"
 
 #: personal/samba/samba3.tpl:53 personal/samba/samba3.tpl:120
-#: personal/samba/class_sambaAccount.inc:982
-#: personal/samba/class_sambaAccount.inc:1456
+#: personal/samba/class_sambaAccount.inc:967
+#: personal/samba/class_sambaAccount.inc:1448
 msgid "Profile path"
 msgstr "Ruta del Perfil"
 
@@ -101,11 +101,11 @@ msgstr "Ruta del Perfil"
 msgid "Terminal Server"
 msgstr "Servidor de terminal"
 
-#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1409
+#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1401
 msgid "Allow login on terminal server"
 msgstr "Permitir inicio de sesión en el servidor de terminal"
 
-#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1410
+#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1402
 msgid "Inherit client config"
 msgstr "Configuración predeterminada de cliente"
 
@@ -121,18 +121,18 @@ msgstr "Directorio de trabajo"
 msgid "Timeout settings (in minutes)"
 msgstr "Tiempo de desconexión (en minutos)"
 
-#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:989
-#: personal/samba/class_sambaAccount.inc:1463
+#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:1455
 msgid "Connection"
 msgstr "Conexión"
 
-#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:990
-#: personal/samba/class_sambaAccount.inc:1464
+#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:975
+#: personal/samba/class_sambaAccount.inc:1456
 msgid "Disconnection"
 msgstr "Desconexión"
 
-#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:991
-#: personal/samba/class_sambaAccount.inc:1465
+#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:976
+#: personal/samba/class_sambaAccount.inc:1457
 msgid "IDLE"
 msgstr "IDLE"
 
@@ -177,7 +177,7 @@ msgstr "Opciones de acceso"
 msgid "The password never expires"
 msgstr "La contraseña expira en"
 
-#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1412
+#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1404
 msgid "Login from windows client requires no password"
 msgstr "El inicio de sesión en windows no necesita contraseña"
 
@@ -185,15 +185,15 @@ msgstr "El inicio de sesión en windows no necesita contraseña"
 msgid "Allow user to change password from client"
 msgstr "Permitir al usuario cambiar contraseñas desde el cliente"
 
-#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1414
+#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1406
 msgid "Lock samba account"
 msgstr "Bloquear cuenta samba"
 
-#: personal/samba/samba3.tpl:350
+#: personal/samba/samba3.tpl:350 personal/samba/class_sambaAccount.inc:988
 msgid "Password expires on"
 msgstr "La contraseña caduca en"
 
-#: personal/samba/samba3.tpl:377
+#: personal/samba/samba3.tpl:377 personal/samba/class_sambaAccount.inc:985
 msgid "Account expires after"
 msgstr "La cuenta caducará después de"
 
@@ -227,14 +227,14 @@ msgid "Hour"
 msgstr "Hora"
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:214
-#: personal/samba/class_sambaAccount.inc:226
-#: personal/samba/class_sambaAccount.inc:227
-#: personal/samba/class_sambaAccount.inc:236
-#: personal/samba/class_sambaAccount.inc:237
-#: personal/samba/class_sambaAccount.inc:239
-#: personal/samba/class_sambaAccount.inc:240
-#: personal/samba/class_sambaAccount.inc:1393
+#: personal/samba/class_sambaAccount.inc:199
+#: personal/samba/class_sambaAccount.inc:211
+#: personal/samba/class_sambaAccount.inc:212
+#: personal/samba/class_sambaAccount.inc:221
+#: personal/samba/class_sambaAccount.inc:222
+#: personal/samba/class_sambaAccount.inc:224
+#: personal/samba/class_sambaAccount.inc:225
+#: personal/samba/class_sambaAccount.inc:1385
 msgid "Samba"
 msgstr "Samba"
 
@@ -242,350 +242,350 @@ msgstr "Samba"
 msgid "This does something"
 msgstr "Esto hace algo"
 
-#: personal/samba/class_sambaAccount.inc:240
+#: personal/samba/class_sambaAccount.inc:225
 msgid "POSIX"
 msgstr "POSIX"
 
-#: personal/samba/class_sambaAccount.inc:357
+#: personal/samba/class_sambaAccount.inc:342
 msgid "Error"
 msgstr "Error"
 
-#: personal/samba/class_sambaAccount.inc:357
+#: personal/samba/class_sambaAccount.inc:342
 msgid "Please select an entry!"
 msgstr "¡Por favor seleccione una entrada!"
 
-#: personal/samba/class_sambaAccount.inc:452
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:794
+#: personal/samba/class_sambaAccount.inc:437
+#: personal/samba/class_sambaAccount.inc:753
+#: personal/samba/class_sambaAccount.inc:761
+#: personal/samba/class_sambaAccount.inc:779
 msgid "disabled"
 msgstr "desactivado"
 
-#: personal/samba/class_sambaAccount.inc:453
+#: personal/samba/class_sambaAccount.inc:438
 msgid "input on, notify on"
 msgstr "entrada activada, notificación activada"
 
-#: personal/samba/class_sambaAccount.inc:454
+#: personal/samba/class_sambaAccount.inc:439
 msgid "input on, notify off"
 msgstr "entrada activada, notificación desactivada"
 
-#: personal/samba/class_sambaAccount.inc:455
+#: personal/samba/class_sambaAccount.inc:440
 msgid "input off, notify on"
 msgstr "entrada desactivada, notificación activada"
 
-#: personal/samba/class_sambaAccount.inc:456
+#: personal/samba/class_sambaAccount.inc:441
 msgid "input off, nofify off"
 msgstr "entrada desactivada, notificación desactivada"
 
-#: personal/samba/class_sambaAccount.inc:458
+#: personal/samba/class_sambaAccount.inc:443
 msgid "disconnect"
 msgstr "desconectar"
 
-#: personal/samba/class_sambaAccount.inc:459
+#: personal/samba/class_sambaAccount.inc:444
 msgid "reset"
 msgstr "Borrar"
 
-#: personal/samba/class_sambaAccount.inc:461
+#: personal/samba/class_sambaAccount.inc:446
 msgid "from any client"
 msgstr "desde cualquier cliente"
 
-#: personal/samba/class_sambaAccount.inc:462
+#: personal/samba/class_sambaAccount.inc:447
 msgid "from previous client only"
 msgstr "solo desde el cliente anterior"
 
-#: personal/samba/class_sambaAccount.inc:623
+#: personal/samba/class_sambaAccount.inc:608
 #, fuzzy, php-format
 msgid "The password is outdated since %s, by domain policy."
 msgstr "La nueva contraseña es demasiado corta."
 
-#: personal/samba/class_sambaAccount.inc:627
+#: personal/samba/class_sambaAccount.inc:612
 #, fuzzy, php-format
 msgid "The password is valid till %s, by user policy."
 msgstr ""
 "El valor indicado como diferencias mínimas de la contraseña no es un valor "
 "numérico."
 
-#: personal/samba/class_sambaAccount.inc:630
+#: personal/samba/class_sambaAccount.inc:615
 #, php-format
 msgid "The password is valid till %s, by domain policy."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:748
-#: personal/samba/class_sambaAccount.inc:754
-#: personal/samba/class_sambaAccount.inc:760
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:794
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
+#: personal/samba/class_sambaAccount.inc:733
+#: personal/samba/class_sambaAccount.inc:739
+#: personal/samba/class_sambaAccount.inc:745
+#: personal/samba/class_sambaAccount.inc:753
+#: personal/samba/class_sambaAccount.inc:761
+#: personal/samba/class_sambaAccount.inc:769
+#: personal/samba/class_sambaAccount.inc:779
+#: personal/samba/class_sambaAccount.inc:785
+#: personal/samba/class_sambaAccount.inc:793
 #, fuzzy
 msgid "default"
 msgstr "eliminar"
 
-#: personal/samba/class_sambaAccount.inc:754
-#: personal/samba/class_sambaAccount.inc:760
+#: personal/samba/class_sambaAccount.inc:739
+#: personal/samba/class_sambaAccount.inc:745
 msgid "Off"
 msgstr "Off"
 
-#: personal/samba/class_sambaAccount.inc:762
+#: personal/samba/class_sambaAccount.inc:747
 msgid "On"
 msgstr "On"
 
-#: personal/samba/class_sambaAccount.inc:770
-#: personal/samba/class_sambaAccount.inc:778
+#: personal/samba/class_sambaAccount.inc:755
+#: personal/samba/class_sambaAccount.inc:763
 msgid "seconds"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:788
-#: personal/samba/class_sambaAccount.inc:880
+#: personal/samba/class_sambaAccount.inc:769
+#: personal/samba/class_sambaAccount.inc:773
+#: personal/samba/class_sambaAccount.inc:865
 #, fuzzy
 msgid "minutes"
 msgstr "Impresora"
 
-#: personal/samba/class_sambaAccount.inc:786
+#: personal/samba/class_sambaAccount.inc:771
 #, fuzzy
 msgid "forever"
 msgstr "Servidor"
 
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
+#: personal/samba/class_sambaAccount.inc:785
+#: personal/samba/class_sambaAccount.inc:793
 #, fuzzy
 msgid "off"
 msgstr "Off"
 
-#: personal/samba/class_sambaAccount.inc:802
-#: personal/samba/class_sambaAccount.inc:810
+#: personal/samba/class_sambaAccount.inc:787
+#: personal/samba/class_sambaAccount.inc:795
 #, fuzzy
 msgid "on"
 msgstr "Abajo"
 
-#: personal/samba/class_sambaAccount.inc:818
-#: personal/samba/class_sambaAccount.inc:826
-#: personal/samba/class_sambaAccount.inc:834
-#: personal/samba/class_sambaAccount.inc:842
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:864
-#: personal/samba/class_sambaAccount.inc:870
+#: personal/samba/class_sambaAccount.inc:803
+#: personal/samba/class_sambaAccount.inc:811
+#: personal/samba/class_sambaAccount.inc:819
+#: personal/samba/class_sambaAccount.inc:827
+#: personal/samba/class_sambaAccount.inc:835
+#: personal/samba/class_sambaAccount.inc:843
+#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:855
 #, fuzzy
 msgid "unset"
 msgstr "Borrar"
 
-#: personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:857
 msgid "immediately"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:878
+#: personal/samba/class_sambaAccount.inc:863
 #, fuzzy
 msgid "days"
 msgstr "Domingo"
 
-#: personal/samba/class_sambaAccount.inc:879
+#: personal/samba/class_sambaAccount.inc:864
 #, fuzzy
 msgid "hours"
 msgstr "Hora"
 
-#: personal/samba/class_sambaAccount.inc:886
+#: personal/samba/class_sambaAccount.inc:871
 #, fuzzy
 msgid "Domain attributes"
 msgstr "Atributo de inicio de sesión"
 
-#: personal/samba/class_sambaAccount.inc:887
-#: personal/samba/class_sambaAccount.inc:888
+#: personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:873
 #, fuzzy
 msgid "Min password length"
 msgstr "Seguridad de contraseña"
 
-#: personal/samba/class_sambaAccount.inc:889
+#: personal/samba/class_sambaAccount.inc:874
 #, fuzzy
 msgid "Password history"
 msgstr "Almacén de claves"
 
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:875
 #, fuzzy
 msgid "Force password change"
 msgstr "Forzar el cambio de contraseña al iniciar"
 
-#: personal/samba/class_sambaAccount.inc:891
+#: personal/samba/class_sambaAccount.inc:876
 #, fuzzy
 msgid "Maximum password age"
 msgstr "Cambio de contraseña"
 
-#: personal/samba/class_sambaAccount.inc:892
+#: personal/samba/class_sambaAccount.inc:877
 #, fuzzy
 msgid "Minimum password age"
 msgstr "Contraseña de administrador"
 
-#: personal/samba/class_sambaAccount.inc:893
+#: personal/samba/class_sambaAccount.inc:878
 #, fuzzy
 msgid "Lockout duration"
 msgstr "Localización"
 
-#: personal/samba/class_sambaAccount.inc:894
+#: personal/samba/class_sambaAccount.inc:879
 msgid "Bad lockout attempt"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:895
+#: personal/samba/class_sambaAccount.inc:880
 #, fuzzy
 msgid "Disconnect time"
 msgstr "Desconexión"
 
-#: personal/samba/class_sambaAccount.inc:896
+#: personal/samba/class_sambaAccount.inc:881
 #, fuzzy
 msgid "Refuse machine password change"
 msgstr "Cambio de contraseña"
 
-#: personal/samba/class_sambaAccount.inc:898
+#: personal/samba/class_sambaAccount.inc:883
 #, fuzzy
 msgid "User attributes"
 msgstr "Atributo de inicio de sesión"
 
-#: personal/samba/class_sambaAccount.inc:899
+#: personal/samba/class_sambaAccount.inc:884
 #, fuzzy
 msgid "SID"
 msgstr "GID"
 
-#: personal/samba/class_sambaAccount.inc:900
+#: personal/samba/class_sambaAccount.inc:885
 #, fuzzy
 msgid "Last failed login"
 msgstr "Último inicio de sesión"
 
-#: personal/samba/class_sambaAccount.inc:901
+#: personal/samba/class_sambaAccount.inc:886
 #, fuzzy
 msgid "Logon attempts"
 msgstr "Atributo de inicio de sesión"
 
-#: personal/samba/class_sambaAccount.inc:902
+#: personal/samba/class_sambaAccount.inc:887
 #, fuzzy
 msgid "Last password update"
 msgstr "Repita la nueva contraseña"
 
-#: personal/samba/class_sambaAccount.inc:903
+#: personal/samba/class_sambaAccount.inc:888
 msgid "Last logon"
 msgstr "Último inicio de sesión"
 
-#: personal/samba/class_sambaAccount.inc:904
+#: personal/samba/class_sambaAccount.inc:889
 #, fuzzy
 msgid "Last logoff"
 msgstr "Último inicio de sesión"
 
-#: personal/samba/class_sambaAccount.inc:905
+#: personal/samba/class_sambaAccount.inc:890
 #, fuzzy
 msgid "Automatic logoff"
 msgstr "Automatico"
 
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:913
-#: personal/samba/class_sambaAccount.inc:1416
+#: personal/samba/class_sambaAccount.inc:893
+#: personal/samba/class_sambaAccount.inc:898
+#: personal/samba/class_sambaAccount.inc:1408
 msgid "Password expires"
 msgstr "La contraseña expira en"
 
-#: personal/samba/class_sambaAccount.inc:908
+#: personal/samba/class_sambaAccount.inc:893
 msgid "No"
 msgstr "No"
 
-#: personal/samba/class_sambaAccount.inc:910
+#: personal/samba/class_sambaAccount.inc:895
 #, fuzzy, php-format
 msgid "The password would expire on %s, but the password expiry is disabled."
 msgstr "No se ha asignado ningún valor al campo 'Nueva contraseña'."
 
-#: personal/samba/class_sambaAccount.inc:916
+#: personal/samba/class_sambaAccount.inc:901
 #, fuzzy
 msgid "Password change available"
 msgstr "La contraseñas deben ser cambiadas despues de %s días"
 
-#: personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:959
 msgid "Home drive"
 msgstr "Unidad inicial"
 
-#: personal/samba/class_sambaAccount.inc:977
+#: personal/samba/class_sambaAccount.inc:962
 msgid "Home path"
 msgstr "Ruta inicial"
 
-#: personal/samba/class_sambaAccount.inc:1000
+#: personal/samba/class_sambaAccount.inc:993
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr ""
 "¡El administrador de usuarios de windows solo permite ocho clientes como "
 "máximo!"
 
-#: personal/samba/class_sambaAccount.inc:1018
+#: personal/samba/class_sambaAccount.inc:1011
 msgid "Information"
 msgstr "Información"
 
-#: personal/samba/class_sambaAccount.inc:1192
-#: personal/samba/class_sambaAccount.inc:1216
+#: personal/samba/class_sambaAccount.inc:1184
+#: personal/samba/class_sambaAccount.inc:1208
 msgid "Warning"
 msgstr "Aviso"
 
-#: personal/samba/class_sambaAccount.inc:1192
+#: personal/samba/class_sambaAccount.inc:1184
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 "Se ha detectado un SID Samba sin definir. ¡Por favor solucione este problema "
 "manualmente!"
 
-#: personal/samba/class_sambaAccount.inc:1216
+#: personal/samba/class_sambaAccount.inc:1208
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 "No se puede convertir un grupo primario a grupo samba: ¡El grupo no puede "
 "ser identificado!"
 
-#: personal/samba/class_sambaAccount.inc:1394 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1386 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr "Parametros de samba"
 
-#: personal/samba/class_sambaAccount.inc:1398
+#: personal/samba/class_sambaAccount.inc:1390
 msgid "My account"
 msgstr "Mi cuenta"
 
-#: personal/samba/class_sambaAccount.inc:1404
+#: personal/samba/class_sambaAccount.inc:1396
 msgid "Generic home directory"
 msgstr "Directorio predeterminado de usuario"
 
-#: personal/samba/class_sambaAccount.inc:1405
+#: personal/samba/class_sambaAccount.inc:1397
 msgid "Generic samba home drive"
 msgstr "Unidad predeterminada de usuario samba"
 
-#: personal/samba/class_sambaAccount.inc:1407
+#: personal/samba/class_sambaAccount.inc:1399
 msgid "Generic script path"
 msgstr "Ruta predeterminada del Script"
 
-#: personal/samba/class_sambaAccount.inc:1408
+#: personal/samba/class_sambaAccount.inc:1400
 msgid "Generic profile path"
 msgstr "Ruta predeterminada del Perfil"
 
-#: personal/samba/class_sambaAccount.inc:1411
+#: personal/samba/class_sambaAccount.inc:1403
 msgid "Allow user to change password"
 msgstr "Permitir al usuario cambiar su contraseña"
 
-#: personal/samba/class_sambaAccount.inc:1413
+#: personal/samba/class_sambaAccount.inc:1405
 #, fuzzy
 msgid "Password never expires"
 msgstr "La contraseña expira en"
 
-#: personal/samba/class_sambaAccount.inc:1415
+#: personal/samba/class_sambaAccount.inc:1407
 msgid "Account expires"
 msgstr "La cuenta expirará después de"
 
-#: personal/samba/class_sambaAccount.inc:1417
+#: personal/samba/class_sambaAccount.inc:1409
 msgid "Limit Logon Time"
 msgstr "Tiempo máximo de inicio de sesión"
 
-#: personal/samba/class_sambaAccount.inc:1418
+#: personal/samba/class_sambaAccount.inc:1410
 msgid "Limit Logoff Time"
 msgstr "Tiempo máximo de cierre de sesión"
 
-#: personal/samba/class_sambaAccount.inc:1419
+#: personal/samba/class_sambaAccount.inc:1411
 msgid "Logon hours"
 msgstr "Horario de inicio de sesión"
 
-#: personal/samba/class_sambaAccount.inc:1420
+#: personal/samba/class_sambaAccount.inc:1412
 msgid "Allow connection from"
 msgstr "Permitir la conexión desde"
 
-#: personal/samba/class_sambaAccount.inc:1475
+#: personal/samba/class_sambaAccount.inc:1467
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
diff --git a/gosa-plugins/samba/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/samba/locale/fr/LC_MESSAGES/messages.po
index cafb01f74..7a33a6f8d 100644
--- a/gosa-plugins/samba/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/samba/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2009-10-02 18:11+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -42,8 +42,8 @@ msgstr "réseau"
 
 #: admin/systems/samba/class_winGeneric.inc:170
 #: admin/systems/samba/class_winGeneric.inc:293
-#: personal/samba/class_sambaAccount.inc:958
-#: personal/samba/class_sambaAccount.inc:1298
+#: personal/samba/class_sambaAccount.inc:943
+#: personal/samba/class_sambaAccount.inc:1290
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
@@ -69,12 +69,12 @@ msgid "Generic"
 msgstr "Informations"
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:107
-#: personal/samba/class_sambaAccount.inc:981
-#: personal/samba/class_sambaAccount.inc:1455
+#: personal/samba/class_sambaAccount.inc:966
+#: personal/samba/class_sambaAccount.inc:1447
 msgid "Home directory"
 msgstr "Répertoire Home"
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1406
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1398
 msgid "Domain"
 msgstr "Domaine"
 
@@ -87,8 +87,8 @@ msgid "Script path"
 msgstr "Chemin du Script"
 
 #: personal/samba/samba3.tpl:53 personal/samba/samba3.tpl:120
-#: personal/samba/class_sambaAccount.inc:982
-#: personal/samba/class_sambaAccount.inc:1456
+#: personal/samba/class_sambaAccount.inc:967
+#: personal/samba/class_sambaAccount.inc:1448
 msgid "Profile path"
 msgstr "Chemin du Profile"
 
@@ -96,11 +96,11 @@ msgstr "Chemin du Profile"
 msgid "Terminal Server"
 msgstr "Serveur de terminaux"
 
-#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1409
+#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1401
 msgid "Allow login on terminal server"
 msgstr "Permet la connexion sur un serveur de terminaux"
 
-#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1410
+#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1402
 msgid "Inherit client config"
 msgstr "Hérite de la configuration du client"
 
@@ -116,18 +116,18 @@ msgstr "Répertoire de travail"
 msgid "Timeout settings (in minutes)"
 msgstr "Configuration du temps d'attente (en minutes)"
 
-#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:989
-#: personal/samba/class_sambaAccount.inc:1463
+#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:1455
 msgid "Connection"
 msgstr "Connexion"
 
-#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:990
-#: personal/samba/class_sambaAccount.inc:1464
+#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:975
+#: personal/samba/class_sambaAccount.inc:1456
 msgid "Disconnection"
 msgstr "Déconnexion"
 
-#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:991
-#: personal/samba/class_sambaAccount.inc:1465
+#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:976
+#: personal/samba/class_sambaAccount.inc:1457
 msgid "IDLE"
 msgstr "En attente"
 
@@ -171,7 +171,7 @@ msgstr "Options d'accès"
 msgid "The password never expires"
 msgstr "Le mot de passe n'expire jamais"
 
-#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1412
+#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1404
 msgid "Login from windows client requires no password"
 msgstr ""
 "L'identification sur une station windows ne nécessite pas de mot de passe"
@@ -182,15 +182,15 @@ msgstr ""
 "Autoriser les utilisateurs à changer de mot de passe à partir d'une station "
 "cliente"
 
-#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1414
+#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1406
 msgid "Lock samba account"
 msgstr "Verrouiller le compte Samba"
 
-#: personal/samba/samba3.tpl:350
+#: personal/samba/samba3.tpl:350 personal/samba/class_sambaAccount.inc:988
 msgid "Password expires on"
 msgstr "Le mot de passe expirera le"
 
-#: personal/samba/samba3.tpl:377
+#: personal/samba/samba3.tpl:377 personal/samba/class_sambaAccount.inc:985
 msgid "Account expires after"
 msgstr "Le compte expire après"
 
@@ -223,14 +223,14 @@ msgid "Hour"
 msgstr "Heure"
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:214
-#: personal/samba/class_sambaAccount.inc:226
-#: personal/samba/class_sambaAccount.inc:227
-#: personal/samba/class_sambaAccount.inc:236
-#: personal/samba/class_sambaAccount.inc:237
-#: personal/samba/class_sambaAccount.inc:239
-#: personal/samba/class_sambaAccount.inc:240
-#: personal/samba/class_sambaAccount.inc:1393
+#: personal/samba/class_sambaAccount.inc:199
+#: personal/samba/class_sambaAccount.inc:211
+#: personal/samba/class_sambaAccount.inc:212
+#: personal/samba/class_sambaAccount.inc:221
+#: personal/samba/class_sambaAccount.inc:222
+#: personal/samba/class_sambaAccount.inc:224
+#: personal/samba/class_sambaAccount.inc:225
+#: personal/samba/class_sambaAccount.inc:1385
 msgid "Samba"
 msgstr ""
 
@@ -238,324 +238,324 @@ msgstr ""
 msgid "This does something"
 msgstr "Ceci fait quelque chose"
 
-#: personal/samba/class_sambaAccount.inc:240
+#: personal/samba/class_sambaAccount.inc:225
 msgid "POSIX"
 msgstr "UNIX"
 
-#: personal/samba/class_sambaAccount.inc:357
+#: personal/samba/class_sambaAccount.inc:342
 msgid "Error"
 msgstr "Erreur"
 
-#: personal/samba/class_sambaAccount.inc:357
+#: personal/samba/class_sambaAccount.inc:342
 msgid "Please select an entry!"
 msgstr "Veuillez sélectionner une entrée !"
 
-#: personal/samba/class_sambaAccount.inc:452
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:794
+#: personal/samba/class_sambaAccount.inc:437
+#: personal/samba/class_sambaAccount.inc:753
+#: personal/samba/class_sambaAccount.inc:761
+#: personal/samba/class_sambaAccount.inc:779
 msgid "disabled"
 msgstr "désactivé"
 
-#: personal/samba/class_sambaAccount.inc:453
+#: personal/samba/class_sambaAccount.inc:438
 msgid "input on, notify on"
 msgstr "entrée activée, notification activée"
 
-#: personal/samba/class_sambaAccount.inc:454
+#: personal/samba/class_sambaAccount.inc:439
 msgid "input on, notify off"
 msgstr "entrée activée, notification désactivée"
 
-#: personal/samba/class_sambaAccount.inc:455
+#: personal/samba/class_sambaAccount.inc:440
 msgid "input off, notify on"
 msgstr "entrée désactivée, notification activée"
 
-#: personal/samba/class_sambaAccount.inc:456
+#: personal/samba/class_sambaAccount.inc:441
 msgid "input off, nofify off"
 msgstr "entrée désactivée, notification désactivée"
 
-#: personal/samba/class_sambaAccount.inc:458
+#: personal/samba/class_sambaAccount.inc:443
 msgid "disconnect"
 msgstr "déconnecté"
 
-#: personal/samba/class_sambaAccount.inc:459
+#: personal/samba/class_sambaAccount.inc:444
 msgid "reset"
 msgstr "remise à zéro"
 
-#: personal/samba/class_sambaAccount.inc:461
+#: personal/samba/class_sambaAccount.inc:446
 msgid "from any client"
 msgstr "de n'importe quel client"
 
-#: personal/samba/class_sambaAccount.inc:462
+#: personal/samba/class_sambaAccount.inc:447
 msgid "from previous client only"
 msgstr "du client précédent seulement"
 
-#: personal/samba/class_sambaAccount.inc:623
+#: personal/samba/class_sambaAccount.inc:608
 #, php-format
 msgid "The password is outdated since %s, by domain policy."
 msgstr ""
 "Le mot de passe est trop vieux depuis %s selon à la politique du domaine."
 
-#: personal/samba/class_sambaAccount.inc:627
+#: personal/samba/class_sambaAccount.inc:612
 #, php-format
 msgid "The password is valid till %s, by user policy."
 msgstr ""
 "Le mot de passe est valide jusqu'au %s, suivant la politique utilisateur."
 
-#: personal/samba/class_sambaAccount.inc:630
+#: personal/samba/class_sambaAccount.inc:615
 #, php-format
 msgid "The password is valid till %s, by domain policy."
 msgstr "Le mot de passe est valide jusqu'au %s, selon la politique du domaine."
 
-#: personal/samba/class_sambaAccount.inc:748
-#: personal/samba/class_sambaAccount.inc:754
-#: personal/samba/class_sambaAccount.inc:760
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:794
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
+#: personal/samba/class_sambaAccount.inc:733
+#: personal/samba/class_sambaAccount.inc:739
+#: personal/samba/class_sambaAccount.inc:745
+#: personal/samba/class_sambaAccount.inc:753
+#: personal/samba/class_sambaAccount.inc:761
+#: personal/samba/class_sambaAccount.inc:769
+#: personal/samba/class_sambaAccount.inc:779
+#: personal/samba/class_sambaAccount.inc:785
+#: personal/samba/class_sambaAccount.inc:793
 msgid "default"
 msgstr "défaut"
 
-#: personal/samba/class_sambaAccount.inc:754
-#: personal/samba/class_sambaAccount.inc:760
+#: personal/samba/class_sambaAccount.inc:739
+#: personal/samba/class_sambaAccount.inc:745
 msgid "Off"
 msgstr "Eteint"
 
-#: personal/samba/class_sambaAccount.inc:762
+#: personal/samba/class_sambaAccount.inc:747
 msgid "On"
 msgstr "Ouvert"
 
-#: personal/samba/class_sambaAccount.inc:770
-#: personal/samba/class_sambaAccount.inc:778
+#: personal/samba/class_sambaAccount.inc:755
+#: personal/samba/class_sambaAccount.inc:763
 msgid "seconds"
 msgstr "secondes"
 
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:788
-#: personal/samba/class_sambaAccount.inc:880
+#: personal/samba/class_sambaAccount.inc:769
+#: personal/samba/class_sambaAccount.inc:773
+#: personal/samba/class_sambaAccount.inc:865
 msgid "minutes"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:786
+#: personal/samba/class_sambaAccount.inc:771
 msgid "forever"
 msgstr "indéfiniment"
 
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
+#: personal/samba/class_sambaAccount.inc:785
+#: personal/samba/class_sambaAccount.inc:793
 msgid "off"
 msgstr "Éteint"
 
-#: personal/samba/class_sambaAccount.inc:802
-#: personal/samba/class_sambaAccount.inc:810
+#: personal/samba/class_sambaAccount.inc:787
+#: personal/samba/class_sambaAccount.inc:795
 msgid "on"
 msgstr "Allumé"
 
-#: personal/samba/class_sambaAccount.inc:818
-#: personal/samba/class_sambaAccount.inc:826
-#: personal/samba/class_sambaAccount.inc:834
-#: personal/samba/class_sambaAccount.inc:842
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:864
-#: personal/samba/class_sambaAccount.inc:870
+#: personal/samba/class_sambaAccount.inc:803
+#: personal/samba/class_sambaAccount.inc:811
+#: personal/samba/class_sambaAccount.inc:819
+#: personal/samba/class_sambaAccount.inc:827
+#: personal/samba/class_sambaAccount.inc:835
+#: personal/samba/class_sambaAccount.inc:843
+#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:855
 msgid "unset"
 msgstr "non configuré"
 
-#: personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:857
 msgid "immediately"
 msgstr "immédiatement"
 
-#: personal/samba/class_sambaAccount.inc:878
+#: personal/samba/class_sambaAccount.inc:863
 msgid "days"
 msgstr "jours"
 
-#: personal/samba/class_sambaAccount.inc:879
+#: personal/samba/class_sambaAccount.inc:864
 msgid "hours"
 msgstr "heures"
 
-#: personal/samba/class_sambaAccount.inc:886
+#: personal/samba/class_sambaAccount.inc:871
 msgid "Domain attributes"
 msgstr "Attributs domaines"
 
-#: personal/samba/class_sambaAccount.inc:887
-#: personal/samba/class_sambaAccount.inc:888
+#: personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:873
 msgid "Min password length"
 msgstr "Taille minimale du mot de passe"
 
-#: personal/samba/class_sambaAccount.inc:889
+#: personal/samba/class_sambaAccount.inc:874
 msgid "Password history"
 msgstr "Historique des mots de passe"
 
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:875
 msgid "Force password change"
 msgstr "Forcer le changement de mot de passe"
 
-#: personal/samba/class_sambaAccount.inc:891
+#: personal/samba/class_sambaAccount.inc:876
 msgid "Maximum password age"
 msgstr "Durée de vie maximale du mot de passe"
 
-#: personal/samba/class_sambaAccount.inc:892
+#: personal/samba/class_sambaAccount.inc:877
 msgid "Minimum password age"
 msgstr "Durée de vie minimale du mot de passe"
 
-#: personal/samba/class_sambaAccount.inc:893
+#: personal/samba/class_sambaAccount.inc:878
 msgid "Lockout duration"
 msgstr "La durée de blocage"
 
-#: personal/samba/class_sambaAccount.inc:894
+#: personal/samba/class_sambaAccount.inc:879
 msgid "Bad lockout attempt"
 msgstr "Nombre de tentatives avant blocage"
 
-#: personal/samba/class_sambaAccount.inc:895
+#: personal/samba/class_sambaAccount.inc:880
 msgid "Disconnect time"
 msgstr "Forcer la déconnexion"
 
-#: personal/samba/class_sambaAccount.inc:896
+#: personal/samba/class_sambaAccount.inc:881
 msgid "Refuse machine password change"
 msgstr "Refuser le changement de mot de passe de la machine"
 
-#: personal/samba/class_sambaAccount.inc:898
+#: personal/samba/class_sambaAccount.inc:883
 msgid "User attributes"
 msgstr "Attributs de l'utilisateur"
 
-#: personal/samba/class_sambaAccount.inc:899
+#: personal/samba/class_sambaAccount.inc:884
 msgid "SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:900
+#: personal/samba/class_sambaAccount.inc:885
 msgid "Last failed login"
 msgstr "Dernière connexion ayant échouée"
 
-#: personal/samba/class_sambaAccount.inc:901
+#: personal/samba/class_sambaAccount.inc:886
 msgid "Logon attempts"
 msgstr "Nombre de tentative de connexion"
 
-#: personal/samba/class_sambaAccount.inc:902
+#: personal/samba/class_sambaAccount.inc:887
 msgid "Last password update"
 msgstr "Dernière mise à jour du mot de passe"
 
-#: personal/samba/class_sambaAccount.inc:903
+#: personal/samba/class_sambaAccount.inc:888
 msgid "Last logon"
 msgstr "Dernière connexion"
 
-#: personal/samba/class_sambaAccount.inc:904
+#: personal/samba/class_sambaAccount.inc:889
 msgid "Last logoff"
 msgstr "Dernière déconnexion"
 
-#: personal/samba/class_sambaAccount.inc:905
+#: personal/samba/class_sambaAccount.inc:890
 msgid "Automatic logoff"
 msgstr "Déconnexion Automatique"
 
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:913
-#: personal/samba/class_sambaAccount.inc:1416
+#: personal/samba/class_sambaAccount.inc:893
+#: personal/samba/class_sambaAccount.inc:898
+#: personal/samba/class_sambaAccount.inc:1408
 msgid "Password expires"
 msgstr "Le mot de passe expirera le"
 
-#: personal/samba/class_sambaAccount.inc:908
+#: personal/samba/class_sambaAccount.inc:893
 msgid "No"
 msgstr "Non"
 
-#: personal/samba/class_sambaAccount.inc:910
+#: personal/samba/class_sambaAccount.inc:895
 #, php-format
 msgid "The password would expire on %s, but the password expiry is disabled."
 msgstr ""
 "Le mot de passe devrait expirer le %s, mais l'expiration est désactivée."
 
-#: personal/samba/class_sambaAccount.inc:916
+#: personal/samba/class_sambaAccount.inc:901
 msgid "Password change available"
 msgstr "Le changement du mot est disponible"
 
-#: personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:959
 msgid "Home drive"
 msgstr "Répertoire Home"
 
-#: personal/samba/class_sambaAccount.inc:977
+#: personal/samba/class_sambaAccount.inc:962
 msgid "Home path"
 msgstr "Chemin du répertoire personnel"
 
-#: personal/samba/class_sambaAccount.inc:1000
+#: personal/samba/class_sambaAccount.inc:993
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr ""
 "Le gestionnaire d'utilisateurs windows accepte seulement huit clients. Vous "
 "en avez spécifiés plus de huit."
 
-#: personal/samba/class_sambaAccount.inc:1018
+#: personal/samba/class_sambaAccount.inc:1011
 msgid "Information"
 msgstr "Information"
 
-#: personal/samba/class_sambaAccount.inc:1192
-#: personal/samba/class_sambaAccount.inc:1216
+#: personal/samba/class_sambaAccount.inc:1184
+#: personal/samba/class_sambaAccount.inc:1208
 msgid "Warning"
 msgstr "Avertissement"
 
-#: personal/samba/class_sambaAccount.inc:1192
+#: personal/samba/class_sambaAccount.inc:1184
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 "Détection d'un SID Samba non défini. Veuillez fixer ceci manuellement !"
 
-#: personal/samba/class_sambaAccount.inc:1216
+#: personal/samba/class_sambaAccount.inc:1208
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 "Impossible de convertir le groupe primaire en un groupe primaire samba : le "
 "groupe ne peut être identifié !"
 
-#: personal/samba/class_sambaAccount.inc:1394 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1386 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr "Configuration Samba"
 
-#: personal/samba/class_sambaAccount.inc:1398
+#: personal/samba/class_sambaAccount.inc:1390
 msgid "My account"
 msgstr "Mon Compte"
 
-#: personal/samba/class_sambaAccount.inc:1404
+#: personal/samba/class_sambaAccount.inc:1396
 msgid "Generic home directory"
 msgstr "Répertoire Home de base"
 
-#: personal/samba/class_sambaAccount.inc:1405
+#: personal/samba/class_sambaAccount.inc:1397
 msgid "Generic samba home drive"
 msgstr "Lecteur réseau par défaut"
 
-#: personal/samba/class_sambaAccount.inc:1407
+#: personal/samba/class_sambaAccount.inc:1399
 msgid "Generic script path"
 msgstr "Chemin du script par défaut"
 
-#: personal/samba/class_sambaAccount.inc:1408
+#: personal/samba/class_sambaAccount.inc:1400
 msgid "Generic profile path"
 msgstr "Chemin par défaut du profil"
 
-#: personal/samba/class_sambaAccount.inc:1411
+#: personal/samba/class_sambaAccount.inc:1403
 msgid "Allow user to change password"
 msgstr "Autoriser les utilisateurs à changer de mot de passe"
 
-#: personal/samba/class_sambaAccount.inc:1413
+#: personal/samba/class_sambaAccount.inc:1405
 msgid "Password never expires"
 msgstr "Le mot de passe n'expire jamais"
 
-#: personal/samba/class_sambaAccount.inc:1415
+#: personal/samba/class_sambaAccount.inc:1407
 msgid "Account expires"
 msgstr "Le compte expire"
 
-#: personal/samba/class_sambaAccount.inc:1417
+#: personal/samba/class_sambaAccount.inc:1409
 msgid "Limit Logon Time"
 msgstr "Limiter les temps d'accès"
 
-#: personal/samba/class_sambaAccount.inc:1418
+#: personal/samba/class_sambaAccount.inc:1410
 msgid "Limit Logoff Time"
 msgstr "Limiter les heures de déconnections"
 
-#: personal/samba/class_sambaAccount.inc:1419
+#: personal/samba/class_sambaAccount.inc:1411
 msgid "Logon hours"
 msgstr "Heure de connexions"
 
-#: personal/samba/class_sambaAccount.inc:1420
+#: personal/samba/class_sambaAccount.inc:1412
 msgid "Allow connection from"
 msgstr "Permettre la connexion depuis"
 
-#: personal/samba/class_sambaAccount.inc:1475
+#: personal/samba/class_sambaAccount.inc:1467
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
diff --git a/gosa-plugins/samba/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/samba/locale/it/LC_MESSAGES/messages.po
index 0b32c4d7d..bb65a8f93 100644
--- a/gosa-plugins/samba/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/samba/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -46,8 +46,8 @@ msgstr "Aggiungi contatto"
 
 #: admin/systems/samba/class_winGeneric.inc:170
 #: admin/systems/samba/class_winGeneric.inc:293
-#: personal/samba/class_sambaAccount.inc:958
-#: personal/samba/class_sambaAccount.inc:1298
+#: personal/samba/class_sambaAccount.inc:943
+#: personal/samba/class_sambaAccount.inc:1290
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
@@ -77,12 +77,12 @@ msgid "Generic"
 msgstr "Generale"
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:107
-#: personal/samba/class_sambaAccount.inc:981
-#: personal/samba/class_sambaAccount.inc:1455
+#: personal/samba/class_sambaAccount.inc:966
+#: personal/samba/class_sambaAccount.inc:1447
 msgid "Home directory"
 msgstr "Home directory"
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1406
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1398
 msgid "Domain"
 msgstr "Dominio"
 
@@ -96,8 +96,8 @@ msgid "Script path"
 msgstr "Script path"
 
 #: personal/samba/samba3.tpl:53 personal/samba/samba3.tpl:120
-#: personal/samba/class_sambaAccount.inc:982
-#: personal/samba/class_sambaAccount.inc:1456
+#: personal/samba/class_sambaAccount.inc:967
+#: personal/samba/class_sambaAccount.inc:1448
 msgid "Profile path"
 msgstr "Path del profilo"
 
@@ -105,11 +105,11 @@ msgstr "Path del profilo"
 msgid "Terminal Server"
 msgstr "Terminal Server"
 
-#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1409
+#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1401
 msgid "Allow login on terminal server"
 msgstr "Permetti la connessione al Terminal Server"
 
-#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1410
+#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1402
 msgid "Inherit client config"
 msgstr "Eredita la configurazione del client"
 
@@ -125,18 +125,18 @@ msgstr "Cartella di lavoro"
 msgid "Timeout settings (in minutes)"
 msgstr "Timeout (in minuti)"
 
-#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:989
-#: personal/samba/class_sambaAccount.inc:1463
+#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:1455
 msgid "Connection"
 msgstr "Connessione"
 
-#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:990
-#: personal/samba/class_sambaAccount.inc:1464
+#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:975
+#: personal/samba/class_sambaAccount.inc:1456
 msgid "Disconnection"
 msgstr "Disconnessione "
 
-#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:991
-#: personal/samba/class_sambaAccount.inc:1465
+#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:976
+#: personal/samba/class_sambaAccount.inc:1457
 msgid "IDLE"
 msgstr ""
 
@@ -182,7 +182,7 @@ msgstr "Opzioni di accesso"
 msgid "The password never expires"
 msgstr "La password spira il"
 
-#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1412
+#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1404
 msgid "Login from windows client requires no password"
 msgstr "L'accesso ai client Windows non richiede password"
 
@@ -190,15 +190,15 @@ msgstr "L'accesso ai client Windows non richiede password"
 msgid "Allow user to change password from client"
 msgstr "Permetti all'utente di cambiare la propria password da un client"
 
-#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1414
+#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1406
 msgid "Lock samba account"
 msgstr "Blocca l'account samba"
 
-#: personal/samba/samba3.tpl:350
+#: personal/samba/samba3.tpl:350 personal/samba/class_sambaAccount.inc:988
 msgid "Password expires on"
 msgstr "La password spira il"
 
-#: personal/samba/samba3.tpl:377
+#: personal/samba/samba3.tpl:377 personal/samba/class_sambaAccount.inc:985
 msgid "Account expires after"
 msgstr "L'account spira dopo"
 
@@ -236,14 +236,14 @@ msgid "Hour"
 msgstr "ora"
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:214
-#: personal/samba/class_sambaAccount.inc:226
-#: personal/samba/class_sambaAccount.inc:227
-#: personal/samba/class_sambaAccount.inc:236
-#: personal/samba/class_sambaAccount.inc:237
-#: personal/samba/class_sambaAccount.inc:239
-#: personal/samba/class_sambaAccount.inc:240
-#: personal/samba/class_sambaAccount.inc:1393
+#: personal/samba/class_sambaAccount.inc:199
+#: personal/samba/class_sambaAccount.inc:211
+#: personal/samba/class_sambaAccount.inc:212
+#: personal/samba/class_sambaAccount.inc:221
+#: personal/samba/class_sambaAccount.inc:222
+#: personal/samba/class_sambaAccount.inc:224
+#: personal/samba/class_sambaAccount.inc:225
+#: personal/samba/class_sambaAccount.inc:1385
 msgid "Samba"
 msgstr "Samba"
 
@@ -251,355 +251,355 @@ msgstr "Samba"
 msgid "This does something"
 msgstr "Questo fa qualcosa"
 
-#: personal/samba/class_sambaAccount.inc:240
+#: personal/samba/class_sambaAccount.inc:225
 msgid "POSIX"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:357
+#: personal/samba/class_sambaAccount.inc:342
 msgid "Error"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:357
+#: personal/samba/class_sambaAccount.inc:342
 #, fuzzy
 msgid "Please select an entry!"
 msgstr "Prego inserire un numero di telefono valido!"
 
-#: personal/samba/class_sambaAccount.inc:452
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:794
+#: personal/samba/class_sambaAccount.inc:437
+#: personal/samba/class_sambaAccount.inc:753
+#: personal/samba/class_sambaAccount.inc:761
+#: personal/samba/class_sambaAccount.inc:779
 msgid "disabled"
 msgstr "disabilitato"
 
-#: personal/samba/class_sambaAccount.inc:453
+#: personal/samba/class_sambaAccount.inc:438
 msgid "input on, notify on"
 msgstr "input on, notifica on"
 
-#: personal/samba/class_sambaAccount.inc:454
+#: personal/samba/class_sambaAccount.inc:439
 msgid "input on, notify off"
 msgstr "input on, notifica off"
 
-#: personal/samba/class_sambaAccount.inc:455
+#: personal/samba/class_sambaAccount.inc:440
 msgid "input off, notify on"
 msgstr "input off, notifica on"
 
-#: personal/samba/class_sambaAccount.inc:456
+#: personal/samba/class_sambaAccount.inc:441
 msgid "input off, nofify off"
 msgstr "input off, notifica off"
 
-#: personal/samba/class_sambaAccount.inc:458
+#: personal/samba/class_sambaAccount.inc:443
 msgid "disconnect"
 msgstr "disconnetti"
 
-#: personal/samba/class_sambaAccount.inc:459
+#: personal/samba/class_sambaAccount.inc:444
 msgid "reset"
 msgstr "reset"
 
-#: personal/samba/class_sambaAccount.inc:461
+#: personal/samba/class_sambaAccount.inc:446
 msgid "from any client"
 msgstr "da qualsiasi client "
 
-#: personal/samba/class_sambaAccount.inc:462
+#: personal/samba/class_sambaAccount.inc:447
 msgid "from previous client only"
 msgstr "solo dal client precedente"
 
-#: personal/samba/class_sambaAccount.inc:623
+#: personal/samba/class_sambaAccount.inc:608
 #, fuzzy, php-format
 msgid "The password is outdated since %s, by domain policy."
 msgstr "La 'Nuova password' immessa è troppo corta."
 
-#: personal/samba/class_sambaAccount.inc:627
+#: personal/samba/class_sambaAccount.inc:612
 #, php-format
 msgid "The password is valid till %s, by user policy."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:630
+#: personal/samba/class_sambaAccount.inc:615
 #, php-format
 msgid "The password is valid till %s, by domain policy."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:748
-#: personal/samba/class_sambaAccount.inc:754
-#: personal/samba/class_sambaAccount.inc:760
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:794
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
+#: personal/samba/class_sambaAccount.inc:733
+#: personal/samba/class_sambaAccount.inc:739
+#: personal/samba/class_sambaAccount.inc:745
+#: personal/samba/class_sambaAccount.inc:753
+#: personal/samba/class_sambaAccount.inc:761
+#: personal/samba/class_sambaAccount.inc:769
+#: personal/samba/class_sambaAccount.inc:779
+#: personal/samba/class_sambaAccount.inc:785
+#: personal/samba/class_sambaAccount.inc:793
 #, fuzzy
 msgid "default"
 msgstr "elimina"
 
-#: personal/samba/class_sambaAccount.inc:754
-#: personal/samba/class_sambaAccount.inc:760
+#: personal/samba/class_sambaAccount.inc:739
+#: personal/samba/class_sambaAccount.inc:745
 msgid "Off"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:762
+#: personal/samba/class_sambaAccount.inc:747
 #, fuzzy
 msgid "On"
 msgstr "Opzioni"
 
-#: personal/samba/class_sambaAccount.inc:770
-#: personal/samba/class_sambaAccount.inc:778
+#: personal/samba/class_sambaAccount.inc:755
+#: personal/samba/class_sambaAccount.inc:763
 msgid "seconds"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:788
-#: personal/samba/class_sambaAccount.inc:880
+#: personal/samba/class_sambaAccount.inc:769
+#: personal/samba/class_sambaAccount.inc:773
+#: personal/samba/class_sambaAccount.inc:865
 #, fuzzy
 msgid "minutes"
 msgstr "Stampante"
 
-#: personal/samba/class_sambaAccount.inc:786
+#: personal/samba/class_sambaAccount.inc:771
 #, fuzzy
 msgid "forever"
 msgstr "Server"
 
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
+#: personal/samba/class_sambaAccount.inc:785
+#: personal/samba/class_sambaAccount.inc:793
 msgid "off"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:802
-#: personal/samba/class_sambaAccount.inc:810
+#: personal/samba/class_sambaAccount.inc:787
+#: personal/samba/class_sambaAccount.inc:795
 #, fuzzy
 msgid "on"
 msgstr "Dominio"
 
-#: personal/samba/class_sambaAccount.inc:818
-#: personal/samba/class_sambaAccount.inc:826
-#: personal/samba/class_sambaAccount.inc:834
-#: personal/samba/class_sambaAccount.inc:842
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:864
-#: personal/samba/class_sambaAccount.inc:870
+#: personal/samba/class_sambaAccount.inc:803
+#: personal/samba/class_sambaAccount.inc:811
+#: personal/samba/class_sambaAccount.inc:819
+#: personal/samba/class_sambaAccount.inc:827
+#: personal/samba/class_sambaAccount.inc:835
+#: personal/samba/class_sambaAccount.inc:843
+#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:855
 #, fuzzy
 msgid "unset"
 msgstr "Giugno"
 
-#: personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:857
 msgid "immediately"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:878
+#: personal/samba/class_sambaAccount.inc:863
 #, fuzzy
 msgid "days"
 msgstr "giorno"
 
-#: personal/samba/class_sambaAccount.inc:879
+#: personal/samba/class_sambaAccount.inc:864
 #, fuzzy
 msgid "hours"
 msgstr "ora"
 
-#: personal/samba/class_sambaAccount.inc:886
+#: personal/samba/class_sambaAccount.inc:871
 #, fuzzy
 msgid "Domain attributes"
 msgstr "Attributo DN delle persone"
 
-#: personal/samba/class_sambaAccount.inc:887
-#: personal/samba/class_sambaAccount.inc:888
+#: personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:873
 #, fuzzy
 msgid "Min password length"
 msgstr "Algorimo password"
 
-#: personal/samba/class_sambaAccount.inc:889
+#: personal/samba/class_sambaAccount.inc:874
 #, fuzzy
 msgid "Password history"
 msgstr "Algorimo password"
 
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:875
 #, fuzzy
 msgid "Force password change"
 msgstr "Cambia la password"
 
-#: personal/samba/class_sambaAccount.inc:891
+#: personal/samba/class_sambaAccount.inc:876
 #, fuzzy
 msgid "Maximum password age"
 msgstr "Cambia la password"
 
-#: personal/samba/class_sambaAccount.inc:892
+#: personal/samba/class_sambaAccount.inc:877
 #, fuzzy
 msgid "Minimum password age"
 msgstr "Password dell'amministratore"
 
-#: personal/samba/class_sambaAccount.inc:893
+#: personal/samba/class_sambaAccount.inc:878
 #, fuzzy
 msgid "Lockout duration"
 msgstr "Località"
 
-#: personal/samba/class_sambaAccount.inc:894
+#: personal/samba/class_sambaAccount.inc:879
 msgid "Bad lockout attempt"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:895
+#: personal/samba/class_sambaAccount.inc:880
 #, fuzzy
 msgid "Disconnect time"
 msgstr "Disconnessione "
 
-#: personal/samba/class_sambaAccount.inc:896
+#: personal/samba/class_sambaAccount.inc:881
 #, fuzzy
 msgid "Refuse machine password change"
 msgstr "Cambia la password"
 
-#: personal/samba/class_sambaAccount.inc:898
+#: personal/samba/class_sambaAccount.inc:883
 #, fuzzy
 msgid "User attributes"
 msgstr "Attributo DN delle persone"
 
-#: personal/samba/class_sambaAccount.inc:899
+#: personal/samba/class_sambaAccount.inc:884
 #, fuzzy
 msgid "SID"
 msgstr "GID"
 
-#: personal/samba/class_sambaAccount.inc:900
+#: personal/samba/class_sambaAccount.inc:885
 #, fuzzy
 msgid "Last failed login"
 msgstr "Scegli il tuo numero di telefono personale"
 
-#: personal/samba/class_sambaAccount.inc:901
+#: personal/samba/class_sambaAccount.inc:886
 #, fuzzy
 msgid "Logon attempts"
 msgstr "Attributo DN delle persone"
 
-#: personal/samba/class_sambaAccount.inc:902
+#: personal/samba/class_sambaAccount.inc:887
 #, fuzzy
 msgid "Last password update"
 msgstr "Nuova password"
 
-#: personal/samba/class_sambaAccount.inc:903
+#: personal/samba/class_sambaAccount.inc:888
 #, fuzzy
 msgid "Last logon"
 msgstr "Scegli il tuo numero di telefono personale"
 
-#: personal/samba/class_sambaAccount.inc:904
+#: personal/samba/class_sambaAccount.inc:889
 #, fuzzy
 msgid "Last logoff"
 msgstr "Scegli il tuo numero di telefono personale"
 
-#: personal/samba/class_sambaAccount.inc:905
+#: personal/samba/class_sambaAccount.inc:890
 #, fuzzy
 msgid "Automatic logoff"
 msgstr "automatico"
 
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:913
-#: personal/samba/class_sambaAccount.inc:1416
+#: personal/samba/class_sambaAccount.inc:893
+#: personal/samba/class_sambaAccount.inc:898
+#: personal/samba/class_sambaAccount.inc:1408
 #, fuzzy
 msgid "Password expires"
 msgstr "La password spira il"
 
-#: personal/samba/class_sambaAccount.inc:908
+#: personal/samba/class_sambaAccount.inc:893
 #, fuzzy
 msgid "No"
 msgstr "nessuno"
 
-#: personal/samba/class_sambaAccount.inc:910
+#: personal/samba/class_sambaAccount.inc:895
 #, fuzzy, php-format
 msgid "The password would expire on %s, but the password expiry is disabled."
 msgstr "La password immessa come 'Nuova password' è vuota"
 
-#: personal/samba/class_sambaAccount.inc:916
+#: personal/samba/class_sambaAccount.inc:901
 #, fuzzy
 msgid "Password change available"
 msgstr "Cambia la password"
 
-#: personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:959
 #, fuzzy
 msgid "Home drive"
 msgstr "Home directory"
 
-#: personal/samba/class_sambaAccount.inc:977
+#: personal/samba/class_sambaAccount.inc:962
 #, fuzzy
 msgid "Home path"
 msgstr "Telefono privato"
 
-#: personal/samba/class_sambaAccount.inc:1000
+#: personal/samba/class_sambaAccount.inc:993
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1018
+#: personal/samba/class_sambaAccount.inc:1011
 msgid "Information"
 msgstr "Informazioni"
 
-#: personal/samba/class_sambaAccount.inc:1192
-#: personal/samba/class_sambaAccount.inc:1216
+#: personal/samba/class_sambaAccount.inc:1184
+#: personal/samba/class_sambaAccount.inc:1208
 msgid "Warning"
 msgstr "Attenzione"
 
-#: personal/samba/class_sambaAccount.inc:1192
+#: personal/samba/class_sambaAccount.inc:1184
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1216
+#: personal/samba/class_sambaAccount.inc:1208
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1394 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1386 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr "Impostazioni Samba"
 
-#: personal/samba/class_sambaAccount.inc:1398
+#: personal/samba/class_sambaAccount.inc:1390
 msgid "My account"
 msgstr "Identità"
 
-#: personal/samba/class_sambaAccount.inc:1404
+#: personal/samba/class_sambaAccount.inc:1396
 #, fuzzy
 msgid "Generic home directory"
 msgstr "Home directory"
 
-#: personal/samba/class_sambaAccount.inc:1405
+#: personal/samba/class_sambaAccount.inc:1397
 msgid "Generic samba home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1407
+#: personal/samba/class_sambaAccount.inc:1399
 #, fuzzy
 msgid "Generic script path"
 msgstr "Script path"
 
-#: personal/samba/class_sambaAccount.inc:1408
+#: personal/samba/class_sambaAccount.inc:1400
 #, fuzzy
 msgid "Generic profile path"
 msgstr "Path del profilo"
 
-#: personal/samba/class_sambaAccount.inc:1411
+#: personal/samba/class_sambaAccount.inc:1403
 #, fuzzy
 msgid "Allow user to change password"
 msgstr "Permetti all'utente di cambiare la propria password da un client"
 
-#: personal/samba/class_sambaAccount.inc:1413
+#: personal/samba/class_sambaAccount.inc:1405
 #, fuzzy
 msgid "Password never expires"
 msgstr "La password spira il"
 
-#: personal/samba/class_sambaAccount.inc:1415
+#: personal/samba/class_sambaAccount.inc:1407
 #, fuzzy
 msgid "Account expires"
 msgstr "L'account spira dopo"
 
-#: personal/samba/class_sambaAccount.inc:1417
+#: personal/samba/class_sambaAccount.inc:1409
 msgid "Limit Logon Time"
 msgstr "Limita il tempo per la connessione"
 
-#: personal/samba/class_sambaAccount.inc:1418
+#: personal/samba/class_sambaAccount.inc:1410
 msgid "Limit Logoff Time"
 msgstr "Limita il tempo per la disconnessione"
 
-#: personal/samba/class_sambaAccount.inc:1419
+#: personal/samba/class_sambaAccount.inc:1411
 #, fuzzy
 msgid "Logon hours"
 msgstr "ora"
 
-#: personal/samba/class_sambaAccount.inc:1420
+#: personal/samba/class_sambaAccount.inc:1412
 #, fuzzy
 msgid "Allow connection from"
 msgstr "Permetti la connessione solo da queste workstation"
 
-#: personal/samba/class_sambaAccount.inc:1475
+#: personal/samba/class_sambaAccount.inc:1467
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
diff --git a/gosa-plugins/samba/locale/messages.po b/gosa-plugins/samba/locale/messages.po
index 035087259..6e25f4a15 100644
--- a/gosa-plugins/samba/locale/messages.po
+++ b/gosa-plugins/samba/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -44,8 +44,8 @@ msgstr ""
 
 #: admin/systems/samba/class_winGeneric.inc:170
 #: admin/systems/samba/class_winGeneric.inc:293
-#: personal/samba/class_sambaAccount.inc:958
-#: personal/samba/class_sambaAccount.inc:1298
+#: personal/samba/class_sambaAccount.inc:943
+#: personal/samba/class_sambaAccount.inc:1290
 msgid "LDAP error"
 msgstr ""
 
@@ -71,12 +71,12 @@ msgid "Generic"
 msgstr ""
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:107
-#: personal/samba/class_sambaAccount.inc:981
-#: personal/samba/class_sambaAccount.inc:1455
+#: personal/samba/class_sambaAccount.inc:966
+#: personal/samba/class_sambaAccount.inc:1447
 msgid "Home directory"
 msgstr ""
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1406
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1398
 msgid "Domain"
 msgstr ""
 
@@ -89,8 +89,8 @@ msgid "Script path"
 msgstr ""
 
 #: personal/samba/samba3.tpl:53 personal/samba/samba3.tpl:120
-#: personal/samba/class_sambaAccount.inc:982
-#: personal/samba/class_sambaAccount.inc:1456
+#: personal/samba/class_sambaAccount.inc:967
+#: personal/samba/class_sambaAccount.inc:1448
 msgid "Profile path"
 msgstr ""
 
@@ -98,11 +98,11 @@ msgstr ""
 msgid "Terminal Server"
 msgstr ""
 
-#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1409
+#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1401
 msgid "Allow login on terminal server"
 msgstr ""
 
-#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1410
+#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1402
 msgid "Inherit client config"
 msgstr ""
 
@@ -118,18 +118,18 @@ msgstr ""
 msgid "Timeout settings (in minutes)"
 msgstr ""
 
-#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:989
-#: personal/samba/class_sambaAccount.inc:1463
+#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:1455
 msgid "Connection"
 msgstr ""
 
-#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:990
-#: personal/samba/class_sambaAccount.inc:1464
+#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:975
+#: personal/samba/class_sambaAccount.inc:1456
 msgid "Disconnection"
 msgstr ""
 
-#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:991
-#: personal/samba/class_sambaAccount.inc:1465
+#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:976
+#: personal/samba/class_sambaAccount.inc:1457
 msgid "IDLE"
 msgstr ""
 
@@ -173,7 +173,7 @@ msgstr ""
 msgid "The password never expires"
 msgstr ""
 
-#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1412
+#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1404
 msgid "Login from windows client requires no password"
 msgstr ""
 
@@ -181,15 +181,15 @@ msgstr ""
 msgid "Allow user to change password from client"
 msgstr ""
 
-#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1414
+#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1406
 msgid "Lock samba account"
 msgstr ""
 
-#: personal/samba/samba3.tpl:350
+#: personal/samba/samba3.tpl:350 personal/samba/class_sambaAccount.inc:988
 msgid "Password expires on"
 msgstr ""
 
-#: personal/samba/samba3.tpl:377
+#: personal/samba/samba3.tpl:377 personal/samba/class_sambaAccount.inc:985
 msgid "Account expires after"
 msgstr ""
 
@@ -222,14 +222,14 @@ msgid "Hour"
 msgstr ""
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:214
-#: personal/samba/class_sambaAccount.inc:226
-#: personal/samba/class_sambaAccount.inc:227
-#: personal/samba/class_sambaAccount.inc:236
-#: personal/samba/class_sambaAccount.inc:237
-#: personal/samba/class_sambaAccount.inc:239
-#: personal/samba/class_sambaAccount.inc:240
-#: personal/samba/class_sambaAccount.inc:1393
+#: personal/samba/class_sambaAccount.inc:199
+#: personal/samba/class_sambaAccount.inc:211
+#: personal/samba/class_sambaAccount.inc:212
+#: personal/samba/class_sambaAccount.inc:221
+#: personal/samba/class_sambaAccount.inc:222
+#: personal/samba/class_sambaAccount.inc:224
+#: personal/samba/class_sambaAccount.inc:225
+#: personal/samba/class_sambaAccount.inc:1385
 msgid "Samba"
 msgstr ""
 
@@ -237,316 +237,316 @@ msgstr ""
 msgid "This does something"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:240
+#: personal/samba/class_sambaAccount.inc:225
 msgid "POSIX"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:357
+#: personal/samba/class_sambaAccount.inc:342
 msgid "Error"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:357
+#: personal/samba/class_sambaAccount.inc:342
 msgid "Please select an entry!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:452
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:794
+#: personal/samba/class_sambaAccount.inc:437
+#: personal/samba/class_sambaAccount.inc:753
+#: personal/samba/class_sambaAccount.inc:761
+#: personal/samba/class_sambaAccount.inc:779
 msgid "disabled"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:453
+#: personal/samba/class_sambaAccount.inc:438
 msgid "input on, notify on"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:454
+#: personal/samba/class_sambaAccount.inc:439
 msgid "input on, notify off"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:455
+#: personal/samba/class_sambaAccount.inc:440
 msgid "input off, notify on"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:456
+#: personal/samba/class_sambaAccount.inc:441
 msgid "input off, nofify off"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:458
+#: personal/samba/class_sambaAccount.inc:443
 msgid "disconnect"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:459
+#: personal/samba/class_sambaAccount.inc:444
 msgid "reset"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:461
+#: personal/samba/class_sambaAccount.inc:446
 msgid "from any client"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:462
+#: personal/samba/class_sambaAccount.inc:447
 msgid "from previous client only"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:623
+#: personal/samba/class_sambaAccount.inc:608
 #, php-format
 msgid "The password is outdated since %s, by domain policy."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:627
+#: personal/samba/class_sambaAccount.inc:612
 #, php-format
 msgid "The password is valid till %s, by user policy."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:630
+#: personal/samba/class_sambaAccount.inc:615
 #, php-format
 msgid "The password is valid till %s, by domain policy."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:748
-#: personal/samba/class_sambaAccount.inc:754
-#: personal/samba/class_sambaAccount.inc:760
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:794
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
+#: personal/samba/class_sambaAccount.inc:733
+#: personal/samba/class_sambaAccount.inc:739
+#: personal/samba/class_sambaAccount.inc:745
+#: personal/samba/class_sambaAccount.inc:753
+#: personal/samba/class_sambaAccount.inc:761
+#: personal/samba/class_sambaAccount.inc:769
+#: personal/samba/class_sambaAccount.inc:779
+#: personal/samba/class_sambaAccount.inc:785
+#: personal/samba/class_sambaAccount.inc:793
 msgid "default"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:754
-#: personal/samba/class_sambaAccount.inc:760
+#: personal/samba/class_sambaAccount.inc:739
+#: personal/samba/class_sambaAccount.inc:745
 msgid "Off"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:762
+#: personal/samba/class_sambaAccount.inc:747
 msgid "On"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:770
-#: personal/samba/class_sambaAccount.inc:778
+#: personal/samba/class_sambaAccount.inc:755
+#: personal/samba/class_sambaAccount.inc:763
 msgid "seconds"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:788
-#: personal/samba/class_sambaAccount.inc:880
+#: personal/samba/class_sambaAccount.inc:769
+#: personal/samba/class_sambaAccount.inc:773
+#: personal/samba/class_sambaAccount.inc:865
 msgid "minutes"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:786
+#: personal/samba/class_sambaAccount.inc:771
 msgid "forever"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
+#: personal/samba/class_sambaAccount.inc:785
+#: personal/samba/class_sambaAccount.inc:793
 msgid "off"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:802
-#: personal/samba/class_sambaAccount.inc:810
+#: personal/samba/class_sambaAccount.inc:787
+#: personal/samba/class_sambaAccount.inc:795
 msgid "on"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:818
-#: personal/samba/class_sambaAccount.inc:826
-#: personal/samba/class_sambaAccount.inc:834
-#: personal/samba/class_sambaAccount.inc:842
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:864
-#: personal/samba/class_sambaAccount.inc:870
+#: personal/samba/class_sambaAccount.inc:803
+#: personal/samba/class_sambaAccount.inc:811
+#: personal/samba/class_sambaAccount.inc:819
+#: personal/samba/class_sambaAccount.inc:827
+#: personal/samba/class_sambaAccount.inc:835
+#: personal/samba/class_sambaAccount.inc:843
+#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:855
 msgid "unset"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:857
 msgid "immediately"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:878
+#: personal/samba/class_sambaAccount.inc:863
 msgid "days"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:879
+#: personal/samba/class_sambaAccount.inc:864
 msgid "hours"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:886
+#: personal/samba/class_sambaAccount.inc:871
 msgid "Domain attributes"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:887
-#: personal/samba/class_sambaAccount.inc:888
+#: personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:873
 msgid "Min password length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:889
+#: personal/samba/class_sambaAccount.inc:874
 msgid "Password history"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:875
 msgid "Force password change"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:891
+#: personal/samba/class_sambaAccount.inc:876
 msgid "Maximum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:892
+#: personal/samba/class_sambaAccount.inc:877
 msgid "Minimum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:893
+#: personal/samba/class_sambaAccount.inc:878
 msgid "Lockout duration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:894
+#: personal/samba/class_sambaAccount.inc:879
 msgid "Bad lockout attempt"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:895
+#: personal/samba/class_sambaAccount.inc:880
 msgid "Disconnect time"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:896
+#: personal/samba/class_sambaAccount.inc:881
 msgid "Refuse machine password change"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:898
+#: personal/samba/class_sambaAccount.inc:883
 msgid "User attributes"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:899
+#: personal/samba/class_sambaAccount.inc:884
 msgid "SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:900
+#: personal/samba/class_sambaAccount.inc:885
 msgid "Last failed login"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:901
+#: personal/samba/class_sambaAccount.inc:886
 msgid "Logon attempts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:902
+#: personal/samba/class_sambaAccount.inc:887
 msgid "Last password update"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:903
+#: personal/samba/class_sambaAccount.inc:888
 msgid "Last logon"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:904
+#: personal/samba/class_sambaAccount.inc:889
 msgid "Last logoff"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:905
+#: personal/samba/class_sambaAccount.inc:890
 msgid "Automatic logoff"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:913
-#: personal/samba/class_sambaAccount.inc:1416
+#: personal/samba/class_sambaAccount.inc:893
+#: personal/samba/class_sambaAccount.inc:898
+#: personal/samba/class_sambaAccount.inc:1408
 msgid "Password expires"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:908
+#: personal/samba/class_sambaAccount.inc:893
 msgid "No"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:910
+#: personal/samba/class_sambaAccount.inc:895
 #, php-format
 msgid "The password would expire on %s, but the password expiry is disabled."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:916
+#: personal/samba/class_sambaAccount.inc:901
 msgid "Password change available"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:959
 msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:977
+#: personal/samba/class_sambaAccount.inc:962
 msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1000
+#: personal/samba/class_sambaAccount.inc:993
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1018
+#: personal/samba/class_sambaAccount.inc:1011
 msgid "Information"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1192
-#: personal/samba/class_sambaAccount.inc:1216
+#: personal/samba/class_sambaAccount.inc:1184
+#: personal/samba/class_sambaAccount.inc:1208
 msgid "Warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1192
+#: personal/samba/class_sambaAccount.inc:1184
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1216
+#: personal/samba/class_sambaAccount.inc:1208
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1394 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1386 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1398
+#: personal/samba/class_sambaAccount.inc:1390
 msgid "My account"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1404
+#: personal/samba/class_sambaAccount.inc:1396
 msgid "Generic home directory"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1405
+#: personal/samba/class_sambaAccount.inc:1397
 msgid "Generic samba home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1407
+#: personal/samba/class_sambaAccount.inc:1399
 msgid "Generic script path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1408
+#: personal/samba/class_sambaAccount.inc:1400
 msgid "Generic profile path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1411
+#: personal/samba/class_sambaAccount.inc:1403
 msgid "Allow user to change password"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1413
+#: personal/samba/class_sambaAccount.inc:1405
 msgid "Password never expires"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1415
+#: personal/samba/class_sambaAccount.inc:1407
 msgid "Account expires"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1417
+#: personal/samba/class_sambaAccount.inc:1409
 msgid "Limit Logon Time"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1418
+#: personal/samba/class_sambaAccount.inc:1410
 msgid "Limit Logoff Time"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1419
+#: personal/samba/class_sambaAccount.inc:1411
 msgid "Logon hours"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1420
+#: personal/samba/class_sambaAccount.inc:1412
 msgid "Allow connection from"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1475
+#: personal/samba/class_sambaAccount.inc:1467
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
diff --git a/gosa-plugins/samba/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/samba/locale/nl/LC_MESSAGES/messages.po
index 2491bfe6b..0adc31875 100644
--- a/gosa-plugins/samba/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/samba/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2008-06-09 17:22+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -47,8 +47,8 @@ msgstr "netwerk"
 
 #: admin/systems/samba/class_winGeneric.inc:170
 #: admin/systems/samba/class_winGeneric.inc:293
-#: personal/samba/class_sambaAccount.inc:958
-#: personal/samba/class_sambaAccount.inc:1298
+#: personal/samba/class_sambaAccount.inc:943
+#: personal/samba/class_sambaAccount.inc:1290
 msgid "LDAP error"
 msgstr "LDAP fout"
 
@@ -74,12 +74,12 @@ msgid "Generic"
 msgstr "Algemeen"
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:107
-#: personal/samba/class_sambaAccount.inc:981
-#: personal/samba/class_sambaAccount.inc:1455
+#: personal/samba/class_sambaAccount.inc:966
+#: personal/samba/class_sambaAccount.inc:1447
 msgid "Home directory"
 msgstr "Persoonlijke map"
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1406
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1398
 msgid "Domain"
 msgstr "Domein"
 
@@ -93,8 +93,8 @@ msgid "Script path"
 msgstr "Inlogscript"
 
 #: personal/samba/samba3.tpl:53 personal/samba/samba3.tpl:120
-#: personal/samba/class_sambaAccount.inc:982
-#: personal/samba/class_sambaAccount.inc:1456
+#: personal/samba/class_sambaAccount.inc:967
+#: personal/samba/class_sambaAccount.inc:1448
 msgid "Profile path"
 msgstr "Profielpad"
 
@@ -102,11 +102,11 @@ msgstr "Profielpad"
 msgid "Terminal Server"
 msgstr "Terminal Server"
 
-#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1409
+#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1401
 msgid "Allow login on terminal server"
 msgstr "Sta inloggen op de Terminal Server toe"
 
-#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1410
+#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1402
 msgid "Inherit client config"
 msgstr "Client configuratie voor initieel programma overnemen"
 
@@ -122,18 +122,18 @@ msgstr "Werkmap"
 msgid "Timeout settings (in minutes)"
 msgstr "Terminal Service timeouts (in minuten)"
 
-#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:989
-#: personal/samba/class_sambaAccount.inc:1463
+#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:1455
 msgid "Connection"
 msgstr "Max. verbindingsduur"
 
-#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:990
-#: personal/samba/class_sambaAccount.inc:1464
+#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:975
+#: personal/samba/class_sambaAccount.inc:1456
 msgid "Disconnection"
 msgstr "Max. verbrekingsduur"
 
-#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:991
-#: personal/samba/class_sambaAccount.inc:1465
+#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:976
+#: personal/samba/class_sambaAccount.inc:1457
 msgid "IDLE"
 msgstr "Max. inactiviteitsduur"
 
@@ -178,7 +178,7 @@ msgstr "Toegangsopties"
 msgid "The password never expires"
 msgstr "Algemeen profielpad"
 
-#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1412
+#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1404
 msgid "Login from windows client requires no password"
 msgstr "Inloggen op Windows werkstation zonder wachtwoord toestaan"
 
@@ -186,15 +186,15 @@ msgstr "Inloggen op Windows werkstation zonder wachtwoord toestaan"
 msgid "Allow user to change password from client"
 msgstr "Gebruiker mag zijn wachtwoord vanaf een werkstation wijzigen"
 
-#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1414
+#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1406
 msgid "Lock samba account"
 msgstr "Blokkeer Samba/Windows account"
 
-#: personal/samba/samba3.tpl:350
+#: personal/samba/samba3.tpl:350 personal/samba/class_sambaAccount.inc:988
 msgid "Password expires on"
 msgstr "Wachtwoord verloopt op"
 
-#: personal/samba/samba3.tpl:377
+#: personal/samba/samba3.tpl:377 personal/samba/class_sambaAccount.inc:985
 msgid "Account expires after"
 msgstr "Het account verloopt op"
 
@@ -227,14 +227,14 @@ msgid "Hour"
 msgstr "Uur"
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:214
-#: personal/samba/class_sambaAccount.inc:226
-#: personal/samba/class_sambaAccount.inc:227
-#: personal/samba/class_sambaAccount.inc:236
-#: personal/samba/class_sambaAccount.inc:237
-#: personal/samba/class_sambaAccount.inc:239
-#: personal/samba/class_sambaAccount.inc:240
-#: personal/samba/class_sambaAccount.inc:1393
+#: personal/samba/class_sambaAccount.inc:199
+#: personal/samba/class_sambaAccount.inc:211
+#: personal/samba/class_sambaAccount.inc:212
+#: personal/samba/class_sambaAccount.inc:221
+#: personal/samba/class_sambaAccount.inc:222
+#: personal/samba/class_sambaAccount.inc:224
+#: personal/samba/class_sambaAccount.inc:225
+#: personal/samba/class_sambaAccount.inc:1385
 msgid "Samba"
 msgstr "Samba"
 
@@ -242,351 +242,351 @@ msgstr "Samba"
 msgid "This does something"
 msgstr "Dit doet iets"
 
-#: personal/samba/class_sambaAccount.inc:240
+#: personal/samba/class_sambaAccount.inc:225
 msgid "POSIX"
 msgstr "POSIX"
 
-#: personal/samba/class_sambaAccount.inc:357
+#: personal/samba/class_sambaAccount.inc:342
 msgid "Error"
 msgstr "FOUT"
 
-#: personal/samba/class_sambaAccount.inc:357
+#: personal/samba/class_sambaAccount.inc:342
 msgid "Please select an entry!"
 msgstr "Selecteer a.u.b. een regel!"
 
-#: personal/samba/class_sambaAccount.inc:452
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:794
+#: personal/samba/class_sambaAccount.inc:437
+#: personal/samba/class_sambaAccount.inc:753
+#: personal/samba/class_sambaAccount.inc:761
+#: personal/samba/class_sambaAccount.inc:779
 msgid "disabled"
 msgstr "gedeactiveerd"
 
-#: personal/samba/class_sambaAccount.inc:453
+#: personal/samba/class_sambaAccount.inc:438
 msgid "input on, notify on"
 msgstr "invoer met notificatie"
 
-#: personal/samba/class_sambaAccount.inc:454
+#: personal/samba/class_sambaAccount.inc:439
 msgid "input on, notify off"
 msgstr "invoer zonder notificatie"
 
-#: personal/samba/class_sambaAccount.inc:455
+#: personal/samba/class_sambaAccount.inc:440
 msgid "input off, notify on"
 msgstr "geen invoer met notificatie"
 
-#: personal/samba/class_sambaAccount.inc:456
+#: personal/samba/class_sambaAccount.inc:441
 msgid "input off, nofify off"
 msgstr "geen invoer zonder notificatie"
 
-#: personal/samba/class_sambaAccount.inc:458
+#: personal/samba/class_sambaAccount.inc:443
 msgid "disconnect"
 msgstr "verbreken"
 
-#: personal/samba/class_sambaAccount.inc:459
+#: personal/samba/class_sambaAccount.inc:444
 msgid "reset"
 msgstr "herstellen"
 
-#: personal/samba/class_sambaAccount.inc:461
+#: personal/samba/class_sambaAccount.inc:446
 msgid "from any client"
 msgstr "vanaf elke client"
 
-#: personal/samba/class_sambaAccount.inc:462
+#: personal/samba/class_sambaAccount.inc:447
 msgid "from previous client only"
 msgstr "alleen vanaf vorige client"
 
-#: personal/samba/class_sambaAccount.inc:623
+#: personal/samba/class_sambaAccount.inc:608
 #, fuzzy, php-format
 msgid "The password is outdated since %s, by domain policy."
 msgstr "Het nieuw opgegeven wachtwoord is te kort."
 
-#: personal/samba/class_sambaAccount.inc:627
+#: personal/samba/class_sambaAccount.inc:612
 #, fuzzy, php-format
 msgid "The password is valid till %s, by user policy."
 msgstr "De sieve poort dient nummeriek te zijn."
 
-#: personal/samba/class_sambaAccount.inc:630
+#: personal/samba/class_sambaAccount.inc:615
 #, php-format
 msgid "The password is valid till %s, by domain policy."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:748
-#: personal/samba/class_sambaAccount.inc:754
-#: personal/samba/class_sambaAccount.inc:760
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:794
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
+#: personal/samba/class_sambaAccount.inc:733
+#: personal/samba/class_sambaAccount.inc:739
+#: personal/samba/class_sambaAccount.inc:745
+#: personal/samba/class_sambaAccount.inc:753
+#: personal/samba/class_sambaAccount.inc:761
+#: personal/samba/class_sambaAccount.inc:769
+#: personal/samba/class_sambaAccount.inc:779
+#: personal/samba/class_sambaAccount.inc:785
+#: personal/samba/class_sambaAccount.inc:793
 #, fuzzy
 msgid "default"
 msgstr "Verwijder"
 
-#: personal/samba/class_sambaAccount.inc:754
-#: personal/samba/class_sambaAccount.inc:760
+#: personal/samba/class_sambaAccount.inc:739
+#: personal/samba/class_sambaAccount.inc:745
 #, fuzzy
 msgid "Off"
 msgstr "Offline"
 
-#: personal/samba/class_sambaAccount.inc:762
+#: personal/samba/class_sambaAccount.inc:747
 #, fuzzy
 msgid "On"
 msgstr "Open"
 
-#: personal/samba/class_sambaAccount.inc:770
-#: personal/samba/class_sambaAccount.inc:778
+#: personal/samba/class_sambaAccount.inc:755
+#: personal/samba/class_sambaAccount.inc:763
 msgid "seconds"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:788
-#: personal/samba/class_sambaAccount.inc:880
+#: personal/samba/class_sambaAccount.inc:769
+#: personal/samba/class_sambaAccount.inc:773
+#: personal/samba/class_sambaAccount.inc:865
 #, fuzzy
 msgid "minutes"
 msgstr "Printer"
 
-#: personal/samba/class_sambaAccount.inc:786
+#: personal/samba/class_sambaAccount.inc:771
 #, fuzzy
 msgid "forever"
 msgstr "Server"
 
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
+#: personal/samba/class_sambaAccount.inc:785
+#: personal/samba/class_sambaAccount.inc:793
 #, fuzzy
 msgid "off"
 msgstr "Offline"
 
-#: personal/samba/class_sambaAccount.inc:802
-#: personal/samba/class_sambaAccount.inc:810
+#: personal/samba/class_sambaAccount.inc:787
+#: personal/samba/class_sambaAccount.inc:795
 #, fuzzy
 msgid "on"
 msgstr "Omlaag"
 
-#: personal/samba/class_sambaAccount.inc:818
-#: personal/samba/class_sambaAccount.inc:826
-#: personal/samba/class_sambaAccount.inc:834
-#: personal/samba/class_sambaAccount.inc:842
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:864
-#: personal/samba/class_sambaAccount.inc:870
+#: personal/samba/class_sambaAccount.inc:803
+#: personal/samba/class_sambaAccount.inc:811
+#: personal/samba/class_sambaAccount.inc:819
+#: personal/samba/class_sambaAccount.inc:827
+#: personal/samba/class_sambaAccount.inc:835
+#: personal/samba/class_sambaAccount.inc:843
+#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:855
 #, fuzzy
 msgid "unset"
 msgstr "herstellen"
 
-#: personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:857
 msgid "immediately"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:878
+#: personal/samba/class_sambaAccount.inc:863
 #, fuzzy
 msgid "days"
 msgstr "Achternaam"
 
-#: personal/samba/class_sambaAccount.inc:879
+#: personal/samba/class_sambaAccount.inc:864
 #, fuzzy
 msgid "hours"
 msgstr "Uur"
 
-#: personal/samba/class_sambaAccount.inc:886
+#: personal/samba/class_sambaAccount.inc:871
 #, fuzzy
 msgid "Domain attributes"
 msgstr "Telefoon attributen "
 
-#: personal/samba/class_sambaAccount.inc:887
-#: personal/samba/class_sambaAccount.inc:888
+#: personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:873
 #, fuzzy
 msgid "Min password length"
 msgstr "Wachtwoord encryptie"
 
-#: personal/samba/class_sambaAccount.inc:889
+#: personal/samba/class_sambaAccount.inc:874
 #, fuzzy
 msgid "Password history"
 msgstr "Wachtwoord encryptie"
 
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:875
 #, fuzzy
 msgid "Force password change"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: personal/samba/class_sambaAccount.inc:891
+#: personal/samba/class_sambaAccount.inc:876
 #, fuzzy
 msgid "Maximum password age"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: personal/samba/class_sambaAccount.inc:892
+#: personal/samba/class_sambaAccount.inc:877
 #, fuzzy
 msgid "Minimum password age"
 msgstr "Beheerders wachtwoord"
 
-#: personal/samba/class_sambaAccount.inc:893
+#: personal/samba/class_sambaAccount.inc:878
 #, fuzzy
 msgid "Lockout duration"
 msgstr "Plaats"
 
-#: personal/samba/class_sambaAccount.inc:894
+#: personal/samba/class_sambaAccount.inc:879
 msgid "Bad lockout attempt"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:895
+#: personal/samba/class_sambaAccount.inc:880
 #, fuzzy
 msgid "Disconnect time"
 msgstr "Max. verbrekingsduur"
 
-#: personal/samba/class_sambaAccount.inc:896
+#: personal/samba/class_sambaAccount.inc:881
 #, fuzzy
 msgid "Refuse machine password change"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: personal/samba/class_sambaAccount.inc:898
+#: personal/samba/class_sambaAccount.inc:883
 #, fuzzy
 msgid "User attributes"
 msgstr "Telefoon attributen "
 
-#: personal/samba/class_sambaAccount.inc:899
+#: personal/samba/class_sambaAccount.inc:884
 #, fuzzy
 msgid "SID"
 msgstr "GID"
 
-#: personal/samba/class_sambaAccount.inc:900
+#: personal/samba/class_sambaAccount.inc:885
 #, fuzzy
 msgid "Last failed login"
 msgstr "Achternaam"
 
-#: personal/samba/class_sambaAccount.inc:901
+#: personal/samba/class_sambaAccount.inc:886
 #, fuzzy
 msgid "Logon attempts"
 msgstr "Telefoon attributen "
 
-#: personal/samba/class_sambaAccount.inc:902
+#: personal/samba/class_sambaAccount.inc:887
 #, fuzzy
 msgid "Last password update"
 msgstr "Nieuw wachtwoord"
 
-#: personal/samba/class_sambaAccount.inc:903
+#: personal/samba/class_sambaAccount.inc:888
 #, fuzzy
 msgid "Last logon"
 msgstr "Achternaam"
 
-#: personal/samba/class_sambaAccount.inc:904
+#: personal/samba/class_sambaAccount.inc:889
 #, fuzzy
 msgid "Last logoff"
 msgstr "Achternaam"
 
-#: personal/samba/class_sambaAccount.inc:905
+#: personal/samba/class_sambaAccount.inc:890
 #, fuzzy
 msgid "Automatic logoff"
 msgstr "automatisch"
 
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:913
-#: personal/samba/class_sambaAccount.inc:1416
+#: personal/samba/class_sambaAccount.inc:893
+#: personal/samba/class_sambaAccount.inc:898
+#: personal/samba/class_sambaAccount.inc:1408
 msgid "Password expires"
 msgstr "Algemeen profielpad"
 
-#: personal/samba/class_sambaAccount.inc:908
+#: personal/samba/class_sambaAccount.inc:893
 msgid "No"
 msgstr "Nee"
 
-#: personal/samba/class_sambaAccount.inc:910
+#: personal/samba/class_sambaAccount.inc:895
 #, fuzzy, php-format
 msgid "The password would expire on %s, but the password expiry is disabled."
 msgstr "Het nieuw ingevoerde wachtwoord is leeg."
 
-#: personal/samba/class_sambaAccount.inc:916
+#: personal/samba/class_sambaAccount.inc:901
 #, fuzzy
 msgid "Password change available"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:959
 #, fuzzy
 msgid "Home drive"
 msgstr "Persoonlijke map"
 
-#: personal/samba/class_sambaAccount.inc:977
+#: personal/samba/class_sambaAccount.inc:962
 #, fuzzy
 msgid "Home path"
 msgstr "Telefoon Privé"
 
-#: personal/samba/class_sambaAccount.inc:1000
+#: personal/samba/class_sambaAccount.inc:993
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr "Het Windows gebruikersbeheer programma staat slechts acht clients toe!"
 
-#: personal/samba/class_sambaAccount.inc:1018
+#: personal/samba/class_sambaAccount.inc:1011
 msgid "Information"
 msgstr "Informatie"
 
-#: personal/samba/class_sambaAccount.inc:1192
-#: personal/samba/class_sambaAccount.inc:1216
+#: personal/samba/class_sambaAccount.inc:1184
+#: personal/samba/class_sambaAccount.inc:1208
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: personal/samba/class_sambaAccount.inc:1192
+#: personal/samba/class_sambaAccount.inc:1184
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 "Er is een ongedefinieerd SambaSID geselecteerd. Repareer dit probleem a.u.b. "
 "handmatig!"
 
-#: personal/samba/class_sambaAccount.inc:1216
+#: personal/samba/class_sambaAccount.inc:1208
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 "Kan primaire groep niet in een samba groep omzetten: group kan niet "
 "geidentificeerd worden"
 
-#: personal/samba/class_sambaAccount.inc:1394 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1386 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr "Samba Instellingen"
 
-#: personal/samba/class_sambaAccount.inc:1398
+#: personal/samba/class_sambaAccount.inc:1390
 msgid "My account"
 msgstr "Mijn account"
 
-#: personal/samba/class_sambaAccount.inc:1404
+#: personal/samba/class_sambaAccount.inc:1396
 msgid "Generic home directory"
 msgstr "Algemene persoonlijke map"
 
-#: personal/samba/class_sambaAccount.inc:1405
+#: personal/samba/class_sambaAccount.inc:1397
 msgid "Generic samba home drive"
 msgstr "Algemeen persoonlijk schijfstation"
 
-#: personal/samba/class_sambaAccount.inc:1407
+#: personal/samba/class_sambaAccount.inc:1399
 msgid "Generic script path"
 msgstr "Algemeen scriptpad"
 
-#: personal/samba/class_sambaAccount.inc:1408
+#: personal/samba/class_sambaAccount.inc:1400
 msgid "Generic profile path"
 msgstr "Windows werkstation"
 
-#: personal/samba/class_sambaAccount.inc:1411
+#: personal/samba/class_sambaAccount.inc:1403
 msgid "Allow user to change password"
 msgstr "Gebruiker mag het wachtwoord wijzigen"
 
-#: personal/samba/class_sambaAccount.inc:1413
+#: personal/samba/class_sambaAccount.inc:1405
 #, fuzzy
 msgid "Password never expires"
 msgstr "Algemeen profielpad"
 
-#: personal/samba/class_sambaAccount.inc:1415
+#: personal/samba/class_sambaAccount.inc:1407
 msgid "Account expires"
 msgstr "Account verloopt op"
 
-#: personal/samba/class_sambaAccount.inc:1417
+#: personal/samba/class_sambaAccount.inc:1409
 msgid "Limit Logon Time"
 msgstr "Stel laatste inlogtijd in op"
 
-#: personal/samba/class_sambaAccount.inc:1418
+#: personal/samba/class_sambaAccount.inc:1410
 msgid "Limit Logoff Time"
 msgstr "Stel laatste uitlogtijd in op"
 
-#: personal/samba/class_sambaAccount.inc:1419
+#: personal/samba/class_sambaAccount.inc:1411
 msgid "Logon hours"
 msgstr "Inlog tijden"
 
-#: personal/samba/class_sambaAccount.inc:1420
+#: personal/samba/class_sambaAccount.inc:1412
 msgid "Allow connection from"
 msgstr "Sta verbinding toe vanaf"
 
-#: personal/samba/class_sambaAccount.inc:1475
+#: personal/samba/class_sambaAccount.inc:1467
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
diff --git a/gosa-plugins/samba/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/samba/locale/pl/LC_MESSAGES/messages.po
index a8d1d7738..0ef457bb0 100644
--- a/gosa-plugins/samba/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/samba/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -43,8 +43,8 @@ msgstr "Dodaj inwentarz"
 
 #: admin/systems/samba/class_winGeneric.inc:170
 #: admin/systems/samba/class_winGeneric.inc:293
-#: personal/samba/class_sambaAccount.inc:958
-#: personal/samba/class_sambaAccount.inc:1298
+#: personal/samba/class_sambaAccount.inc:943
+#: personal/samba/class_sambaAccount.inc:1290
 #, fuzzy
 msgid "LDAP error"
 msgstr "błąd LDAP:"
@@ -74,12 +74,12 @@ msgid "Generic"
 msgstr "Ogólne"
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:107
-#: personal/samba/class_sambaAccount.inc:981
-#: personal/samba/class_sambaAccount.inc:1455
+#: personal/samba/class_sambaAccount.inc:966
+#: personal/samba/class_sambaAccount.inc:1447
 msgid "Home directory"
 msgstr "Katalog domowy"
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1406
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1398
 msgid "Domain"
 msgstr "Domena"
 
@@ -93,8 +93,8 @@ msgid "Script path"
 msgstr "Ścieżka do skryptu"
 
 #: personal/samba/samba3.tpl:53 personal/samba/samba3.tpl:120
-#: personal/samba/class_sambaAccount.inc:982
-#: personal/samba/class_sambaAccount.inc:1456
+#: personal/samba/class_sambaAccount.inc:967
+#: personal/samba/class_sambaAccount.inc:1448
 msgid "Profile path"
 msgstr "Ścieżka do profilu"
 
@@ -102,11 +102,11 @@ msgstr "Ścieżka do profilu"
 msgid "Terminal Server"
 msgstr "Terminal Server"
 
-#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1409
+#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1401
 msgid "Allow login on terminal server"
 msgstr "Zezwól na logowanie do serwera terminali"
 
-#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1410
+#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1402
 msgid "Inherit client config"
 msgstr "Odziedzicz konfigurację klienta"
 
@@ -122,18 +122,18 @@ msgstr "Katalog roboczy"
 msgid "Timeout settings (in minutes)"
 msgstr "Ustawienia Timeoutu (w minutach)"
 
-#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:989
-#: personal/samba/class_sambaAccount.inc:1463
+#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:1455
 msgid "Connection"
 msgstr "Połączenie"
 
-#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:990
-#: personal/samba/class_sambaAccount.inc:1464
+#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:975
+#: personal/samba/class_sambaAccount.inc:1456
 msgid "Disconnection"
 msgstr "Rozłączenie"
 
-#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:991
-#: personal/samba/class_sambaAccount.inc:1465
+#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:976
+#: personal/samba/class_sambaAccount.inc:1457
 msgid "IDLE"
 msgstr "BEZCZYNNY"
 
@@ -178,7 +178,7 @@ msgstr "Opcje dostępu"
 msgid "The password never expires"
 msgstr "Hasło wygasa"
 
-#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1412
+#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1404
 msgid "Login from windows client requires no password"
 msgstr "Logowanie z klienta windows nie wymaga hasła"
 
@@ -186,15 +186,15 @@ msgstr "Logowanie z klienta windows nie wymaga hasła"
 msgid "Allow user to change password from client"
 msgstr "Zezwól użytkownikowi na zmianę hasła z klienta"
 
-#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1414
+#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1406
 msgid "Lock samba account"
 msgstr "Zablokuj konto samba"
 
-#: personal/samba/samba3.tpl:350
+#: personal/samba/samba3.tpl:350 personal/samba/class_sambaAccount.inc:988
 msgid "Password expires on"
 msgstr "Hasło wygasa"
 
-#: personal/samba/samba3.tpl:377
+#: personal/samba/samba3.tpl:377 personal/samba/class_sambaAccount.inc:985
 msgid "Account expires after"
 msgstr "Konto wygasa po"
 
@@ -232,14 +232,14 @@ msgid "Hour"
 msgstr "godzina"
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:214
-#: personal/samba/class_sambaAccount.inc:226
-#: personal/samba/class_sambaAccount.inc:227
-#: personal/samba/class_sambaAccount.inc:236
-#: personal/samba/class_sambaAccount.inc:237
-#: personal/samba/class_sambaAccount.inc:239
-#: personal/samba/class_sambaAccount.inc:240
-#: personal/samba/class_sambaAccount.inc:1393
+#: personal/samba/class_sambaAccount.inc:199
+#: personal/samba/class_sambaAccount.inc:211
+#: personal/samba/class_sambaAccount.inc:212
+#: personal/samba/class_sambaAccount.inc:221
+#: personal/samba/class_sambaAccount.inc:222
+#: personal/samba/class_sambaAccount.inc:224
+#: personal/samba/class_sambaAccount.inc:225
+#: personal/samba/class_sambaAccount.inc:1385
 msgid "Samba"
 msgstr "Samba"
 
@@ -247,351 +247,351 @@ msgstr "Samba"
 msgid "This does something"
 msgstr "To robi coś"
 
-#: personal/samba/class_sambaAccount.inc:240
+#: personal/samba/class_sambaAccount.inc:225
 msgid "POSIX"
 msgstr "POSIX"
 
-#: personal/samba/class_sambaAccount.inc:357
+#: personal/samba/class_sambaAccount.inc:342
 msgid "Error"
 msgstr "Błąd"
 
-#: personal/samba/class_sambaAccount.inc:357
+#: personal/samba/class_sambaAccount.inc:342
 #, fuzzy
 msgid "Please select an entry!"
 msgstr "Proszę wybrać prawidłowy plik"
 
-#: personal/samba/class_sambaAccount.inc:452
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:794
+#: personal/samba/class_sambaAccount.inc:437
+#: personal/samba/class_sambaAccount.inc:753
+#: personal/samba/class_sambaAccount.inc:761
+#: personal/samba/class_sambaAccount.inc:779
 msgid "disabled"
 msgstr "wyłączone"
 
-#: personal/samba/class_sambaAccount.inc:453
+#: personal/samba/class_sambaAccount.inc:438
 msgid "input on, notify on"
 msgstr "input tak, notify tak"
 
-#: personal/samba/class_sambaAccount.inc:454
+#: personal/samba/class_sambaAccount.inc:439
 msgid "input on, notify off"
 msgstr "input tak, notify nie"
 
-#: personal/samba/class_sambaAccount.inc:455
+#: personal/samba/class_sambaAccount.inc:440
 msgid "input off, notify on"
 msgstr "input nie, notify tak"
 
-#: personal/samba/class_sambaAccount.inc:456
+#: personal/samba/class_sambaAccount.inc:441
 msgid "input off, nofify off"
 msgstr "input nie, notify nie"
 
-#: personal/samba/class_sambaAccount.inc:458
+#: personal/samba/class_sambaAccount.inc:443
 msgid "disconnect"
 msgstr "rozłącz"
 
-#: personal/samba/class_sambaAccount.inc:459
+#: personal/samba/class_sambaAccount.inc:444
 msgid "reset"
 msgstr "resetuj"
 
-#: personal/samba/class_sambaAccount.inc:461
+#: personal/samba/class_sambaAccount.inc:446
 msgid "from any client"
 msgstr "z każdego klienta"
 
-#: personal/samba/class_sambaAccount.inc:462
+#: personal/samba/class_sambaAccount.inc:447
 msgid "from previous client only"
 msgstr "tylko z poprzedniego klienta"
 
-#: personal/samba/class_sambaAccount.inc:623
+#: personal/samba/class_sambaAccount.inc:608
 #, fuzzy, php-format
 msgid "The password is outdated since %s, by domain policy."
 msgstr "Hasło podane jako nowe jest za krótkie."
 
-#: personal/samba/class_sambaAccount.inc:627
+#: personal/samba/class_sambaAccount.inc:612
 #, fuzzy, php-format
 msgid "The password is valid till %s, by user policy."
 msgstr "Port sieve musi być liczbą."
 
-#: personal/samba/class_sambaAccount.inc:630
+#: personal/samba/class_sambaAccount.inc:615
 #, php-format
 msgid "The password is valid till %s, by domain policy."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:748
-#: personal/samba/class_sambaAccount.inc:754
-#: personal/samba/class_sambaAccount.inc:760
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:794
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
+#: personal/samba/class_sambaAccount.inc:733
+#: personal/samba/class_sambaAccount.inc:739
+#: personal/samba/class_sambaAccount.inc:745
+#: personal/samba/class_sambaAccount.inc:753
+#: personal/samba/class_sambaAccount.inc:761
+#: personal/samba/class_sambaAccount.inc:769
+#: personal/samba/class_sambaAccount.inc:779
+#: personal/samba/class_sambaAccount.inc:785
+#: personal/samba/class_sambaAccount.inc:793
 #, fuzzy
 msgid "default"
 msgstr "Usuń"
 
-#: personal/samba/class_sambaAccount.inc:754
-#: personal/samba/class_sambaAccount.inc:760
+#: personal/samba/class_sambaAccount.inc:739
+#: personal/samba/class_sambaAccount.inc:745
 #, fuzzy
 msgid "Off"
 msgstr "Offline"
 
-#: personal/samba/class_sambaAccount.inc:762
+#: personal/samba/class_sambaAccount.inc:747
 #, fuzzy
 msgid "On"
 msgstr "Otwórz"
 
-#: personal/samba/class_sambaAccount.inc:770
-#: personal/samba/class_sambaAccount.inc:778
+#: personal/samba/class_sambaAccount.inc:755
+#: personal/samba/class_sambaAccount.inc:763
 msgid "seconds"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:788
-#: personal/samba/class_sambaAccount.inc:880
+#: personal/samba/class_sambaAccount.inc:769
+#: personal/samba/class_sambaAccount.inc:773
+#: personal/samba/class_sambaAccount.inc:865
 #, fuzzy
 msgid "minutes"
 msgstr "Drukarka"
 
-#: personal/samba/class_sambaAccount.inc:786
+#: personal/samba/class_sambaAccount.inc:771
 #, fuzzy
 msgid "forever"
 msgstr "Serwer"
 
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
+#: personal/samba/class_sambaAccount.inc:785
+#: personal/samba/class_sambaAccount.inc:793
 #, fuzzy
 msgid "off"
 msgstr "Offline"
 
-#: personal/samba/class_sambaAccount.inc:802
-#: personal/samba/class_sambaAccount.inc:810
+#: personal/samba/class_sambaAccount.inc:787
+#: personal/samba/class_sambaAccount.inc:795
 #, fuzzy
 msgid "on"
 msgstr "W dół"
 
-#: personal/samba/class_sambaAccount.inc:818
-#: personal/samba/class_sambaAccount.inc:826
-#: personal/samba/class_sambaAccount.inc:834
-#: personal/samba/class_sambaAccount.inc:842
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:864
-#: personal/samba/class_sambaAccount.inc:870
+#: personal/samba/class_sambaAccount.inc:803
+#: personal/samba/class_sambaAccount.inc:811
+#: personal/samba/class_sambaAccount.inc:819
+#: personal/samba/class_sambaAccount.inc:827
+#: personal/samba/class_sambaAccount.inc:835
+#: personal/samba/class_sambaAccount.inc:843
+#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:855
 #, fuzzy
 msgid "unset"
 msgstr "Czerwiec"
 
-#: personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:857
 msgid "immediately"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:878
+#: personal/samba/class_sambaAccount.inc:863
 #, fuzzy
 msgid "days"
 msgstr "dzień"
 
-#: personal/samba/class_sambaAccount.inc:879
+#: personal/samba/class_sambaAccount.inc:864
 #, fuzzy
 msgid "hours"
 msgstr "godzina"
 
-#: personal/samba/class_sambaAccount.inc:886
+#: personal/samba/class_sambaAccount.inc:871
 #, fuzzy
 msgid "Domain attributes"
 msgstr "Atrybuty telefonu"
 
-#: personal/samba/class_sambaAccount.inc:887
-#: personal/samba/class_sambaAccount.inc:888
+#: personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:873
 #, fuzzy
 msgid "Min password length"
 msgstr "Przechowywanie hasła"
 
-#: personal/samba/class_sambaAccount.inc:889
+#: personal/samba/class_sambaAccount.inc:874
 #, fuzzy
 msgid "Password history"
 msgstr "Przechowywanie hasła"
 
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:875
 #, fuzzy
 msgid "Force password change"
 msgstr "Wymuś zmianę hasła podczas logowania"
 
-#: personal/samba/class_sambaAccount.inc:891
+#: personal/samba/class_sambaAccount.inc:876
 #, fuzzy
 msgid "Maximum password age"
 msgstr "Brak uprawnień do zmiay hasła"
 
-#: personal/samba/class_sambaAccount.inc:892
+#: personal/samba/class_sambaAccount.inc:877
 #, fuzzy
 msgid "Minimum password age"
 msgstr "Hasło Administratora"
 
-#: personal/samba/class_sambaAccount.inc:893
+#: personal/samba/class_sambaAccount.inc:878
 #, fuzzy
 msgid "Lockout duration"
 msgstr "Lokalizacja"
 
-#: personal/samba/class_sambaAccount.inc:894
+#: personal/samba/class_sambaAccount.inc:879
 msgid "Bad lockout attempt"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:895
+#: personal/samba/class_sambaAccount.inc:880
 #, fuzzy
 msgid "Disconnect time"
 msgstr "Rozłączenie"
 
-#: personal/samba/class_sambaAccount.inc:896
+#: personal/samba/class_sambaAccount.inc:881
 #, fuzzy
 msgid "Refuse machine password change"
 msgstr "Brak uprawnień do zmiay hasła"
 
-#: personal/samba/class_sambaAccount.inc:898
+#: personal/samba/class_sambaAccount.inc:883
 #, fuzzy
 msgid "User attributes"
 msgstr "Atrybuty telefonu"
 
-#: personal/samba/class_sambaAccount.inc:899
+#: personal/samba/class_sambaAccount.inc:884
 #, fuzzy
 msgid "SID"
 msgstr "GID"
 
-#: personal/samba/class_sambaAccount.inc:900
+#: personal/samba/class_sambaAccount.inc:885
 #, fuzzy
 msgid "Last failed login"
 msgstr "Nazwisko"
 
-#: personal/samba/class_sambaAccount.inc:901
+#: personal/samba/class_sambaAccount.inc:886
 #, fuzzy
 msgid "Logon attempts"
 msgstr "Atrybuty telefonu"
 
-#: personal/samba/class_sambaAccount.inc:902
+#: personal/samba/class_sambaAccount.inc:887
 #, fuzzy
 msgid "Last password update"
 msgstr "Nowe hasło"
 
-#: personal/samba/class_sambaAccount.inc:903
+#: personal/samba/class_sambaAccount.inc:888
 #, fuzzy
 msgid "Last logon"
 msgstr "Nazwisko"
 
-#: personal/samba/class_sambaAccount.inc:904
+#: personal/samba/class_sambaAccount.inc:889
 #, fuzzy
 msgid "Last logoff"
 msgstr "Nazwisko"
 
-#: personal/samba/class_sambaAccount.inc:905
+#: personal/samba/class_sambaAccount.inc:890
 #, fuzzy
 msgid "Automatic logoff"
 msgstr "automatyczne"
 
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:913
-#: personal/samba/class_sambaAccount.inc:1416
+#: personal/samba/class_sambaAccount.inc:893
+#: personal/samba/class_sambaAccount.inc:898
+#: personal/samba/class_sambaAccount.inc:1408
 msgid "Password expires"
 msgstr "Hasło wygasa"
 
-#: personal/samba/class_sambaAccount.inc:908
+#: personal/samba/class_sambaAccount.inc:893
 msgid "No"
 msgstr "Nie"
 
-#: personal/samba/class_sambaAccount.inc:910
+#: personal/samba/class_sambaAccount.inc:895
 #, fuzzy, php-format
 msgid "The password would expire on %s, but the password expiry is disabled."
 msgstr "Hasło które podano jako 'Nowe hasło' jest puste."
 
-#: personal/samba/class_sambaAccount.inc:916
+#: personal/samba/class_sambaAccount.inc:901
 #, fuzzy
 msgid "Password change available"
 msgstr "Brak uprawnień do zmiay hasła"
 
-#: personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:959
 #, fuzzy
 msgid "Home drive"
 msgstr "Katalog domowy"
 
-#: personal/samba/class_sambaAccount.inc:977
+#: personal/samba/class_sambaAccount.inc:962
 #, fuzzy
 msgid "Home path"
 msgstr "Telefon domowy"
 
-#: personal/samba/class_sambaAccount.inc:1000
+#: personal/samba/class_sambaAccount.inc:993
 #, fuzzy
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr ""
 "User manager w windows zezwala tylko na 8 klientów. Podano więcej niż 8."
 
-#: personal/samba/class_sambaAccount.inc:1018
+#: personal/samba/class_sambaAccount.inc:1011
 msgid "Information"
 msgstr "Informacja"
 
-#: personal/samba/class_sambaAccount.inc:1192
-#: personal/samba/class_sambaAccount.inc:1216
+#: personal/samba/class_sambaAccount.inc:1184
+#: personal/samba/class_sambaAccount.inc:1208
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: personal/samba/class_sambaAccount.inc:1192
+#: personal/samba/class_sambaAccount.inc:1184
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1216
+#: personal/samba/class_sambaAccount.inc:1208
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1394 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1386 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr "Ustawienia Samba"
 
-#: personal/samba/class_sambaAccount.inc:1398
+#: personal/samba/class_sambaAccount.inc:1390
 msgid "My account"
 msgstr "Moje konto "
 
-#: personal/samba/class_sambaAccount.inc:1404
+#: personal/samba/class_sambaAccount.inc:1396
 msgid "Generic home directory"
 msgstr "Ogólny katalog domowy"
 
-#: personal/samba/class_sambaAccount.inc:1405
+#: personal/samba/class_sambaAccount.inc:1397
 msgid "Generic samba home drive"
 msgstr "Podstawowy dysk domowy samba"
 
-#: personal/samba/class_sambaAccount.inc:1407
+#: personal/samba/class_sambaAccount.inc:1399
 msgid "Generic script path"
 msgstr "Ogólna ścieżka do skryptu"
 
-#: personal/samba/class_sambaAccount.inc:1408
+#: personal/samba/class_sambaAccount.inc:1400
 msgid "Generic profile path"
 msgstr "Ogólna ścieżka do profilu"
 
-#: personal/samba/class_sambaAccount.inc:1411
+#: personal/samba/class_sambaAccount.inc:1403
 msgid "Allow user to change password"
 msgstr "Zezwól użytkownikowi na zmianę hasła"
 
-#: personal/samba/class_sambaAccount.inc:1413
+#: personal/samba/class_sambaAccount.inc:1405
 #, fuzzy
 msgid "Password never expires"
 msgstr "Hasło wygasa"
 
-#: personal/samba/class_sambaAccount.inc:1415
+#: personal/samba/class_sambaAccount.inc:1407
 msgid "Account expires"
 msgstr "Konto wygasa"
 
-#: personal/samba/class_sambaAccount.inc:1417
+#: personal/samba/class_sambaAccount.inc:1409
 msgid "Limit Logon Time"
 msgstr "Ogranicz czas logowania"
 
-#: personal/samba/class_sambaAccount.inc:1418
+#: personal/samba/class_sambaAccount.inc:1410
 msgid "Limit Logoff Time"
 msgstr "Ogranicz czas wylogowania"
 
-#: personal/samba/class_sambaAccount.inc:1419
+#: personal/samba/class_sambaAccount.inc:1411
 #, fuzzy
 msgid "Logon hours"
 msgstr "jedna godzina"
 
-#: personal/samba/class_sambaAccount.inc:1420
+#: personal/samba/class_sambaAccount.inc:1412
 msgid "Allow connection from"
 msgstr "Zezwól na połączenia z"
 
-#: personal/samba/class_sambaAccount.inc:1475
+#: personal/samba/class_sambaAccount.inc:1467
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
diff --git a/gosa-plugins/samba/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/samba/locale/ru/LC_MESSAGES/messages.po
index 31b64049a..2ad48d1dd 100644
--- a/gosa-plugins/samba/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/samba/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -45,8 +45,8 @@ msgstr "Добавить объект"
 
 #: admin/systems/samba/class_winGeneric.inc:170
 #: admin/systems/samba/class_winGeneric.inc:293
-#: personal/samba/class_sambaAccount.inc:958
-#: personal/samba/class_sambaAccount.inc:1298
+#: personal/samba/class_sambaAccount.inc:943
+#: personal/samba/class_sambaAccount.inc:1290
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
@@ -76,12 +76,12 @@ msgid "Generic"
 msgstr "Общее"
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:107
-#: personal/samba/class_sambaAccount.inc:981
-#: personal/samba/class_sambaAccount.inc:1455
+#: personal/samba/class_sambaAccount.inc:966
+#: personal/samba/class_sambaAccount.inc:1447
 msgid "Home directory"
 msgstr "Домашний каталог"
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1406
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1398
 msgid "Domain"
 msgstr "Домен"
 
@@ -95,8 +95,8 @@ msgid "Script path"
 msgstr "Путь к сценариям"
 
 #: personal/samba/samba3.tpl:53 personal/samba/samba3.tpl:120
-#: personal/samba/class_sambaAccount.inc:982
-#: personal/samba/class_sambaAccount.inc:1456
+#: personal/samba/class_sambaAccount.inc:967
+#: personal/samba/class_sambaAccount.inc:1448
 msgid "Profile path"
 msgstr "Путь к профилю"
 
@@ -104,11 +104,11 @@ msgstr "Путь к профилю"
 msgid "Terminal Server"
 msgstr "Терминальный сервер"
 
-#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1409
+#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1401
 msgid "Allow login on terminal server"
 msgstr "Разрешить вход на терминальный сервер"
 
-#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1410
+#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1402
 msgid "Inherit client config"
 msgstr "Унаследовать конфигурацию клиента"
 
@@ -124,18 +124,18 @@ msgstr "Рабочий каталог"
 msgid "Timeout settings (in minutes)"
 msgstr "Настройки таймаута (в минутах)"
 
-#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:989
-#: personal/samba/class_sambaAccount.inc:1463
+#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:1455
 msgid "Connection"
 msgstr "Подключение"
 
-#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:990
-#: personal/samba/class_sambaAccount.inc:1464
+#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:975
+#: personal/samba/class_sambaAccount.inc:1456
 msgid "Disconnection"
 msgstr "Отключение"
 
-#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:991
-#: personal/samba/class_sambaAccount.inc:1465
+#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:976
+#: personal/samba/class_sambaAccount.inc:1457
 msgid "IDLE"
 msgstr "Простой"
 
@@ -180,7 +180,7 @@ msgstr "Параметры доступа"
 msgid "The password never expires"
 msgstr "Срок действия пароля истекает"
 
-#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1412
+#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1404
 msgid "Login from windows client requires no password"
 msgstr "Не спрашивать пароль при входе в систему из Windows"
 
@@ -188,16 +188,16 @@ msgstr "Не спрашивать пароль при входе в систем
 msgid "Allow user to change password from client"
 msgstr "Разрешить пользователям менять пароль с клиента"
 
-#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1414
+#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1406
 #, fuzzy
 msgid "Lock samba account"
 msgstr "Удалить учетную запись Samba"
 
-#: personal/samba/samba3.tpl:350
+#: personal/samba/samba3.tpl:350 personal/samba/class_sambaAccount.inc:988
 msgid "Password expires on"
 msgstr "Срок действия пароля истекает"
 
-#: personal/samba/samba3.tpl:377
+#: personal/samba/samba3.tpl:377 personal/samba/class_sambaAccount.inc:985
 #, fuzzy
 msgid "Account expires after"
 msgstr "Учетная запись"
@@ -236,14 +236,14 @@ msgid "Hour"
 msgstr "час"
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:214
-#: personal/samba/class_sambaAccount.inc:226
-#: personal/samba/class_sambaAccount.inc:227
-#: personal/samba/class_sambaAccount.inc:236
-#: personal/samba/class_sambaAccount.inc:237
-#: personal/samba/class_sambaAccount.inc:239
-#: personal/samba/class_sambaAccount.inc:240
-#: personal/samba/class_sambaAccount.inc:1393
+#: personal/samba/class_sambaAccount.inc:199
+#: personal/samba/class_sambaAccount.inc:211
+#: personal/samba/class_sambaAccount.inc:212
+#: personal/samba/class_sambaAccount.inc:221
+#: personal/samba/class_sambaAccount.inc:222
+#: personal/samba/class_sambaAccount.inc:224
+#: personal/samba/class_sambaAccount.inc:225
+#: personal/samba/class_sambaAccount.inc:1385
 msgid "Samba"
 msgstr "Samba"
 
@@ -251,360 +251,360 @@ msgstr "Samba"
 msgid "This does something"
 msgstr "Что-то будет"
 
-#: personal/samba/class_sambaAccount.inc:240
+#: personal/samba/class_sambaAccount.inc:225
 msgid "POSIX"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:357
+#: personal/samba/class_sambaAccount.inc:342
 msgid "Error"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:357
+#: personal/samba/class_sambaAccount.inc:342
 #, fuzzy
 msgid "Please select an entry!"
 msgstr "Введите корректный серийный номер"
 
-#: personal/samba/class_sambaAccount.inc:452
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:794
+#: personal/samba/class_sambaAccount.inc:437
+#: personal/samba/class_sambaAccount.inc:753
+#: personal/samba/class_sambaAccount.inc:761
+#: personal/samba/class_sambaAccount.inc:779
 msgid "disabled"
 msgstr "отключен"
 
-#: personal/samba/class_sambaAccount.inc:453
+#: personal/samba/class_sambaAccount.inc:438
 msgid "input on, notify on"
 msgstr "входящие вкл, оповещение вкл"
 
-#: personal/samba/class_sambaAccount.inc:454
+#: personal/samba/class_sambaAccount.inc:439
 msgid "input on, notify off"
 msgstr "входящие вкл, оповещение выкл"
 
-#: personal/samba/class_sambaAccount.inc:455
+#: personal/samba/class_sambaAccount.inc:440
 msgid "input off, notify on"
 msgstr "входящие выкл, оповещение вкл"
 
-#: personal/samba/class_sambaAccount.inc:456
+#: personal/samba/class_sambaAccount.inc:441
 msgid "input off, nofify off"
 msgstr "входящие выкл, оповещение выкл"
 
-#: personal/samba/class_sambaAccount.inc:458
+#: personal/samba/class_sambaAccount.inc:443
 msgid "disconnect"
 msgstr "отключиться"
 
-#: personal/samba/class_sambaAccount.inc:459
+#: personal/samba/class_sambaAccount.inc:444
 msgid "reset"
 msgstr "сброс"
 
-#: personal/samba/class_sambaAccount.inc:461
+#: personal/samba/class_sambaAccount.inc:446
 msgid "from any client"
 msgstr "от любого клиента"
 
-#: personal/samba/class_sambaAccount.inc:462
+#: personal/samba/class_sambaAccount.inc:447
 msgid "from previous client only"
 msgstr "только от предыдущего клиента"
 
-#: personal/samba/class_sambaAccount.inc:623
+#: personal/samba/class_sambaAccount.inc:608
 #, fuzzy, php-format
 msgid "The password is outdated since %s, by domain policy."
 msgstr "Новый пароль слишком короткий."
 
-#: personal/samba/class_sambaAccount.inc:627
+#: personal/samba/class_sambaAccount.inc:612
 #, fuzzy, php-format
 msgid "The password is valid till %s, by user policy."
 msgstr "Значение поля \"Квота\" некорректно."
 
-#: personal/samba/class_sambaAccount.inc:630
+#: personal/samba/class_sambaAccount.inc:615
 #, php-format
 msgid "The password is valid till %s, by domain policy."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:748
-#: personal/samba/class_sambaAccount.inc:754
-#: personal/samba/class_sambaAccount.inc:760
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:794
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
+#: personal/samba/class_sambaAccount.inc:733
+#: personal/samba/class_sambaAccount.inc:739
+#: personal/samba/class_sambaAccount.inc:745
+#: personal/samba/class_sambaAccount.inc:753
+#: personal/samba/class_sambaAccount.inc:761
+#: personal/samba/class_sambaAccount.inc:769
+#: personal/samba/class_sambaAccount.inc:779
+#: personal/samba/class_sambaAccount.inc:785
+#: personal/samba/class_sambaAccount.inc:793
 #, fuzzy
 msgid "default"
 msgstr "Удалить"
 
-#: personal/samba/class_sambaAccount.inc:754
-#: personal/samba/class_sambaAccount.inc:760
+#: personal/samba/class_sambaAccount.inc:739
+#: personal/samba/class_sambaAccount.inc:745
 #, fuzzy
 msgid "Off"
 msgstr "не в сети"
 
-#: personal/samba/class_sambaAccount.inc:762
+#: personal/samba/class_sambaAccount.inc:747
 #, fuzzy
 msgid "On"
 msgstr "Параметры"
 
-#: personal/samba/class_sambaAccount.inc:770
-#: personal/samba/class_sambaAccount.inc:778
+#: personal/samba/class_sambaAccount.inc:755
+#: personal/samba/class_sambaAccount.inc:763
 msgid "seconds"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:788
-#: personal/samba/class_sambaAccount.inc:880
+#: personal/samba/class_sambaAccount.inc:769
+#: personal/samba/class_sambaAccount.inc:773
+#: personal/samba/class_sambaAccount.inc:865
 #, fuzzy
 msgid "minutes"
 msgstr "Принтер"
 
-#: personal/samba/class_sambaAccount.inc:786
+#: personal/samba/class_sambaAccount.inc:771
 #, fuzzy
 msgid "forever"
 msgstr "Сервер"
 
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
+#: personal/samba/class_sambaAccount.inc:785
+#: personal/samba/class_sambaAccount.inc:793
 #, fuzzy
 msgid "off"
 msgstr "не в сети"
 
-#: personal/samba/class_sambaAccount.inc:802
-#: personal/samba/class_sambaAccount.inc:810
+#: personal/samba/class_sambaAccount.inc:787
+#: personal/samba/class_sambaAccount.inc:795
 #, fuzzy
 msgid "on"
 msgstr "Домен"
 
-#: personal/samba/class_sambaAccount.inc:818
-#: personal/samba/class_sambaAccount.inc:826
-#: personal/samba/class_sambaAccount.inc:834
-#: personal/samba/class_sambaAccount.inc:842
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:864
-#: personal/samba/class_sambaAccount.inc:870
+#: personal/samba/class_sambaAccount.inc:803
+#: personal/samba/class_sambaAccount.inc:811
+#: personal/samba/class_sambaAccount.inc:819
+#: personal/samba/class_sambaAccount.inc:827
+#: personal/samba/class_sambaAccount.inc:835
+#: personal/samba/class_sambaAccount.inc:843
+#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:855
 #, fuzzy
 msgid "unset"
 msgstr "Июнь"
 
-#: personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:857
 msgid "immediately"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:878
+#: personal/samba/class_sambaAccount.inc:863
 #, fuzzy
 msgid "days"
 msgstr "день"
 
-#: personal/samba/class_sambaAccount.inc:879
+#: personal/samba/class_sambaAccount.inc:864
 #, fuzzy
 msgid "hours"
 msgstr "час"
 
-#: personal/samba/class_sambaAccount.inc:886
+#: personal/samba/class_sambaAccount.inc:871
 #, fuzzy
 msgid "Domain attributes"
 msgstr "Атрибут DN пользователей"
 
-#: personal/samba/class_sambaAccount.inc:887
-#: personal/samba/class_sambaAccount.inc:888
+#: personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:873
 #, fuzzy
 msgid "Min password length"
 msgstr "Хэширование паролей"
 
-#: personal/samba/class_sambaAccount.inc:889
+#: personal/samba/class_sambaAccount.inc:874
 #, fuzzy
 msgid "Password history"
 msgstr "Хэширование паролей"
 
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:875
 #, fuzzy
 msgid "Force password change"
 msgstr "Сменить пароль"
 
-#: personal/samba/class_sambaAccount.inc:891
+#: personal/samba/class_sambaAccount.inc:876
 #, fuzzy
 msgid "Maximum password age"
 msgstr "Сменить пароль"
 
-#: personal/samba/class_sambaAccount.inc:892
+#: personal/samba/class_sambaAccount.inc:877
 #, fuzzy
 msgid "Minimum password age"
 msgstr "Пароль администратора"
 
-#: personal/samba/class_sambaAccount.inc:893
+#: personal/samba/class_sambaAccount.inc:878
 #, fuzzy
 msgid "Lockout duration"
 msgstr "Местоположение"
 
-#: personal/samba/class_sambaAccount.inc:894
+#: personal/samba/class_sambaAccount.inc:879
 msgid "Bad lockout attempt"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:895
+#: personal/samba/class_sambaAccount.inc:880
 #, fuzzy
 msgid "Disconnect time"
 msgstr "Отключение"
 
-#: personal/samba/class_sambaAccount.inc:896
+#: personal/samba/class_sambaAccount.inc:881
 #, fuzzy
 msgid "Refuse machine password change"
 msgstr "Сменить пароль"
 
-#: personal/samba/class_sambaAccount.inc:898
+#: personal/samba/class_sambaAccount.inc:883
 #, fuzzy
 msgid "User attributes"
 msgstr "Атрибут DN пользователей"
 
-#: personal/samba/class_sambaAccount.inc:899
+#: personal/samba/class_sambaAccount.inc:884
 #, fuzzy
 msgid "SID"
 msgstr "GID"
 
-#: personal/samba/class_sambaAccount.inc:900
+#: personal/samba/class_sambaAccount.inc:885
 #, fuzzy
 msgid "Last failed login"
 msgstr "Список"
 
-#: personal/samba/class_sambaAccount.inc:901
+#: personal/samba/class_sambaAccount.inc:886
 #, fuzzy
 msgid "Logon attempts"
 msgstr "Атрибут DN пользователей"
 
-#: personal/samba/class_sambaAccount.inc:902
+#: personal/samba/class_sambaAccount.inc:887
 #, fuzzy
 msgid "Last password update"
 msgstr "Новый пароль"
 
-#: personal/samba/class_sambaAccount.inc:903
+#: personal/samba/class_sambaAccount.inc:888
 #, fuzzy
 msgid "Last logon"
 msgstr "Список"
 
-#: personal/samba/class_sambaAccount.inc:904
+#: personal/samba/class_sambaAccount.inc:889
 #, fuzzy
 msgid "Last logoff"
 msgstr "Список"
 
-#: personal/samba/class_sambaAccount.inc:905
+#: personal/samba/class_sambaAccount.inc:890
 #, fuzzy
 msgid "Automatic logoff"
 msgstr "автоматически"
 
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:913
-#: personal/samba/class_sambaAccount.inc:1416
+#: personal/samba/class_sambaAccount.inc:893
+#: personal/samba/class_sambaAccount.inc:898
+#: personal/samba/class_sambaAccount.inc:1408
 #, fuzzy
 msgid "Password expires"
 msgstr "Срок действия пароля истекает"
 
-#: personal/samba/class_sambaAccount.inc:908
+#: personal/samba/class_sambaAccount.inc:893
 #, fuzzy
 msgid "No"
 msgstr "нет"
 
-#: personal/samba/class_sambaAccount.inc:910
+#: personal/samba/class_sambaAccount.inc:895
 #, fuzzy, php-format
 msgid "The password would expire on %s, but the password expiry is disabled."
 msgstr "Вы не указали новый пароль."
 
-#: personal/samba/class_sambaAccount.inc:916
+#: personal/samba/class_sambaAccount.inc:901
 #, fuzzy
 msgid "Password change available"
 msgstr "Сменить пароль"
 
-#: personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:959
 #, fuzzy
 msgid "Home drive"
 msgstr "Домашний каталог"
 
-#: personal/samba/class_sambaAccount.inc:977
+#: personal/samba/class_sambaAccount.inc:962
 #, fuzzy
 msgid "Home path"
 msgstr "Домашний телефон"
 
-#: personal/samba/class_sambaAccount.inc:1000
+#: personal/samba/class_sambaAccount.inc:993
 #, fuzzy
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr ""
 "Менеджер пользователей Windows допускает подключение только восми клиентов. "
 "Вы указали больше чем восем."
 
-#: personal/samba/class_sambaAccount.inc:1018
+#: personal/samba/class_sambaAccount.inc:1011
 msgid "Information"
 msgstr "Информация"
 
-#: personal/samba/class_sambaAccount.inc:1192
-#: personal/samba/class_sambaAccount.inc:1216
+#: personal/samba/class_sambaAccount.inc:1184
+#: personal/samba/class_sambaAccount.inc:1208
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: personal/samba/class_sambaAccount.inc:1192
+#: personal/samba/class_sambaAccount.inc:1184
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1216
+#: personal/samba/class_sambaAccount.inc:1208
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1394 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1386 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr "Настройки Samba"
 
-#: personal/samba/class_sambaAccount.inc:1398
+#: personal/samba/class_sambaAccount.inc:1390
 msgid "My account"
 msgstr "Моя учетная запись"
 
-#: personal/samba/class_sambaAccount.inc:1404
+#: personal/samba/class_sambaAccount.inc:1396
 #, fuzzy
 msgid "Generic home directory"
 msgstr "Домашний каталог"
 
-#: personal/samba/class_sambaAccount.inc:1405
+#: personal/samba/class_sambaAccount.inc:1397
 msgid "Generic samba home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1407
+#: personal/samba/class_sambaAccount.inc:1399
 #, fuzzy
 msgid "Generic script path"
 msgstr "Путь к сценариям"
 
-#: personal/samba/class_sambaAccount.inc:1408
+#: personal/samba/class_sambaAccount.inc:1400
 #, fuzzy
 msgid "Generic profile path"
 msgstr "Путь к профилю"
 
-#: personal/samba/class_sambaAccount.inc:1411
+#: personal/samba/class_sambaAccount.inc:1403
 #, fuzzy
 msgid "Allow user to change password"
 msgstr "Разрешить пользователям менять пароль с клиента"
 
-#: personal/samba/class_sambaAccount.inc:1413
+#: personal/samba/class_sambaAccount.inc:1405
 #, fuzzy
 msgid "Password never expires"
 msgstr "Срок действия пароля истекает"
 
-#: personal/samba/class_sambaAccount.inc:1415
+#: personal/samba/class_sambaAccount.inc:1407
 #, fuzzy
 msgid "Account expires"
 msgstr "Учетная запись"
 
-#: personal/samba/class_sambaAccount.inc:1417
+#: personal/samba/class_sambaAccount.inc:1409
 msgid "Limit Logon Time"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1418
+#: personal/samba/class_sambaAccount.inc:1410
 msgid "Limit Logoff Time"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1419
+#: personal/samba/class_sambaAccount.inc:1411
 #, fuzzy
 msgid "Logon hours"
 msgstr "один час"
 
-#: personal/samba/class_sambaAccount.inc:1420
+#: personal/samba/class_sambaAccount.inc:1412
 #, fuzzy
 msgid "Allow connection from"
 msgstr "Разрешить подключения только от этой рабочей станции"
 
-#: personal/samba/class_sambaAccount.inc:1475
+#: personal/samba/class_sambaAccount.inc:1467
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
diff --git a/gosa-plugins/samba/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/samba/locale/zh/LC_MESSAGES/messages.po
index e97723bf0..a2452cdeb 100644
--- a/gosa-plugins/samba/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/samba/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -45,8 +45,8 @@ msgstr "添加清单(inventory)"
 
 #: admin/systems/samba/class_winGeneric.inc:170
 #: admin/systems/samba/class_winGeneric.inc:293
-#: personal/samba/class_sambaAccount.inc:958
-#: personal/samba/class_sambaAccount.inc:1298
+#: personal/samba/class_sambaAccount.inc:943
+#: personal/samba/class_sambaAccount.inc:1290
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
@@ -76,12 +76,12 @@ msgid "Generic"
 msgstr "通用配置"
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:107
-#: personal/samba/class_sambaAccount.inc:981
-#: personal/samba/class_sambaAccount.inc:1455
+#: personal/samba/class_sambaAccount.inc:966
+#: personal/samba/class_sambaAccount.inc:1447
 msgid "Home directory"
 msgstr "用户主目录"
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1406
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1398
 msgid "Domain"
 msgstr "域"
 
@@ -95,8 +95,8 @@ msgid "Script path"
 msgstr "脚本路径"
 
 #: personal/samba/samba3.tpl:53 personal/samba/samba3.tpl:120
-#: personal/samba/class_sambaAccount.inc:982
-#: personal/samba/class_sambaAccount.inc:1456
+#: personal/samba/class_sambaAccount.inc:967
+#: personal/samba/class_sambaAccount.inc:1448
 msgid "Profile path"
 msgstr "Profile path"
 
@@ -104,11 +104,11 @@ msgstr "Profile path"
 msgid "Terminal Server"
 msgstr "终端服务器"
 
-#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1409
+#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1401
 msgid "Allow login on terminal server"
 msgstr "允许登录到终端服务器"
 
-#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1410
+#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1402
 msgid "Inherit client config"
 msgstr "继承客户配置"
 
@@ -124,18 +124,18 @@ msgstr "工作目录"
 msgid "Timeout settings (in minutes)"
 msgstr "超时设置（分钟）"
 
-#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:989
-#: personal/samba/class_sambaAccount.inc:1463
+#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:1455
 msgid "Connection"
 msgstr "连接"
 
-#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:990
-#: personal/samba/class_sambaAccount.inc:1464
+#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:975
+#: personal/samba/class_sambaAccount.inc:1456
 msgid "Disconnection"
 msgstr "断开"
 
-#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:991
-#: personal/samba/class_sambaAccount.inc:1465
+#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:976
+#: personal/samba/class_sambaAccount.inc:1457
 msgid "IDLE"
 msgstr "闲"
 
@@ -181,7 +181,7 @@ msgstr "访问选项"
 msgid "The password never expires"
 msgstr "口令过期截止日"
 
-#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1412
+#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1404
 msgid "Login from windows client requires no password"
 msgstr "从 Windows 客户端登录不需要口令"
 
@@ -189,15 +189,15 @@ msgstr "从 Windows 客户端登录不需要口令"
 msgid "Allow user to change password from client"
 msgstr "允许用户从客户端修改口令"
 
-#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1414
+#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1406
 msgid "Lock samba account"
 msgstr "锁定 samba 账号"
 
-#: personal/samba/samba3.tpl:350
+#: personal/samba/samba3.tpl:350 personal/samba/class_sambaAccount.inc:988
 msgid "Password expires on"
 msgstr "口令过期截止日"
 
-#: personal/samba/samba3.tpl:377
+#: personal/samba/samba3.tpl:377 personal/samba/class_sambaAccount.inc:985
 msgid "Account expires after"
 msgstr "账号过期于"
 
@@ -231,14 +231,14 @@ msgid "Hour"
 msgstr "小时"
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:214
-#: personal/samba/class_sambaAccount.inc:226
-#: personal/samba/class_sambaAccount.inc:227
-#: personal/samba/class_sambaAccount.inc:236
-#: personal/samba/class_sambaAccount.inc:237
-#: personal/samba/class_sambaAccount.inc:239
-#: personal/samba/class_sambaAccount.inc:240
-#: personal/samba/class_sambaAccount.inc:1393
+#: personal/samba/class_sambaAccount.inc:199
+#: personal/samba/class_sambaAccount.inc:211
+#: personal/samba/class_sambaAccount.inc:212
+#: personal/samba/class_sambaAccount.inc:221
+#: personal/samba/class_sambaAccount.inc:222
+#: personal/samba/class_sambaAccount.inc:224
+#: personal/samba/class_sambaAccount.inc:225
+#: personal/samba/class_sambaAccount.inc:1385
 msgid "Samba"
 msgstr "Samba"
 
@@ -247,355 +247,355 @@ msgstr "Samba"
 msgid "This does something"
 msgstr "******"
 
-#: personal/samba/class_sambaAccount.inc:240
+#: personal/samba/class_sambaAccount.inc:225
 msgid "POSIX"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:357
+#: personal/samba/class_sambaAccount.inc:342
 msgid "Error"
 msgstr "错误"
 
-#: personal/samba/class_sambaAccount.inc:357
+#: personal/samba/class_sambaAccount.inc:342
 #, fuzzy
 msgid "Please select an entry!"
 msgstr "请选择一个有效文件。"
 
-#: personal/samba/class_sambaAccount.inc:452
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:794
+#: personal/samba/class_sambaAccount.inc:437
+#: personal/samba/class_sambaAccount.inc:753
+#: personal/samba/class_sambaAccount.inc:761
+#: personal/samba/class_sambaAccount.inc:779
 msgid "disabled"
 msgstr "禁用"
 
-#: personal/samba/class_sambaAccount.inc:453
+#: personal/samba/class_sambaAccount.inc:438
 msgid "input on, notify on"
 msgstr "输入打开，通知打开"
 
-#: personal/samba/class_sambaAccount.inc:454
+#: personal/samba/class_sambaAccount.inc:439
 msgid "input on, notify off"
 msgstr "输入打开，通知关闭"
 
-#: personal/samba/class_sambaAccount.inc:455
+#: personal/samba/class_sambaAccount.inc:440
 msgid "input off, notify on"
 msgstr "输入关闭，通知打开"
 
-#: personal/samba/class_sambaAccount.inc:456
+#: personal/samba/class_sambaAccount.inc:441
 msgid "input off, nofify off"
 msgstr "输入关闭，通知关闭"
 
-#: personal/samba/class_sambaAccount.inc:458
+#: personal/samba/class_sambaAccount.inc:443
 msgid "disconnect"
 msgstr "断开"
 
-#: personal/samba/class_sambaAccount.inc:459
+#: personal/samba/class_sambaAccount.inc:444
 msgid "reset"
 msgstr "重置"
 
-#: personal/samba/class_sambaAccount.inc:461
+#: personal/samba/class_sambaAccount.inc:446
 msgid "from any client"
 msgstr "从任意客户"
 
-#: personal/samba/class_sambaAccount.inc:462
+#: personal/samba/class_sambaAccount.inc:447
 msgid "from previous client only"
 msgstr "只从上一个客户"
 
-#: personal/samba/class_sambaAccount.inc:623
+#: personal/samba/class_sambaAccount.inc:608
 #, fuzzy, php-format
 msgid "The password is outdated since %s, by domain policy."
 msgstr "输入的新口令太短了。"
 
-#: personal/samba/class_sambaAccount.inc:627
+#: personal/samba/class_sambaAccount.inc:612
 #, fuzzy, php-format
 msgid "The password is valid till %s, by user policy."
 msgstr "Sieve 端口应为数字。"
 
-#: personal/samba/class_sambaAccount.inc:630
+#: personal/samba/class_sambaAccount.inc:615
 #, php-format
 msgid "The password is valid till %s, by domain policy."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:748
-#: personal/samba/class_sambaAccount.inc:754
-#: personal/samba/class_sambaAccount.inc:760
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:794
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
+#: personal/samba/class_sambaAccount.inc:733
+#: personal/samba/class_sambaAccount.inc:739
+#: personal/samba/class_sambaAccount.inc:745
+#: personal/samba/class_sambaAccount.inc:753
+#: personal/samba/class_sambaAccount.inc:761
+#: personal/samba/class_sambaAccount.inc:769
+#: personal/samba/class_sambaAccount.inc:779
+#: personal/samba/class_sambaAccount.inc:785
+#: personal/samba/class_sambaAccount.inc:793
 #, fuzzy
 msgid "default"
 msgstr "删除"
 
-#: personal/samba/class_sambaAccount.inc:754
-#: personal/samba/class_sambaAccount.inc:760
+#: personal/samba/class_sambaAccount.inc:739
+#: personal/samba/class_sambaAccount.inc:745
 msgid "Off"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:762
+#: personal/samba/class_sambaAccount.inc:747
 #, fuzzy
 msgid "On"
 msgstr "打开"
 
-#: personal/samba/class_sambaAccount.inc:770
-#: personal/samba/class_sambaAccount.inc:778
+#: personal/samba/class_sambaAccount.inc:755
+#: personal/samba/class_sambaAccount.inc:763
 msgid "seconds"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:788
-#: personal/samba/class_sambaAccount.inc:880
+#: personal/samba/class_sambaAccount.inc:769
+#: personal/samba/class_sambaAccount.inc:773
+#: personal/samba/class_sambaAccount.inc:865
 #, fuzzy
 msgid "minutes"
 msgstr "打印机"
 
-#: personal/samba/class_sambaAccount.inc:786
+#: personal/samba/class_sambaAccount.inc:771
 #, fuzzy
 msgid "forever"
 msgstr "服务器"
 
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
+#: personal/samba/class_sambaAccount.inc:785
+#: personal/samba/class_sambaAccount.inc:793
 msgid "off"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:802
-#: personal/samba/class_sambaAccount.inc:810
+#: personal/samba/class_sambaAccount.inc:787
+#: personal/samba/class_sambaAccount.inc:795
 #, fuzzy
 msgid "on"
 msgstr "关闭"
 
-#: personal/samba/class_sambaAccount.inc:818
-#: personal/samba/class_sambaAccount.inc:826
-#: personal/samba/class_sambaAccount.inc:834
-#: personal/samba/class_sambaAccount.inc:842
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:864
-#: personal/samba/class_sambaAccount.inc:870
+#: personal/samba/class_sambaAccount.inc:803
+#: personal/samba/class_sambaAccount.inc:811
+#: personal/samba/class_sambaAccount.inc:819
+#: personal/samba/class_sambaAccount.inc:827
+#: personal/samba/class_sambaAccount.inc:835
+#: personal/samba/class_sambaAccount.inc:843
+#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:855
 #, fuzzy
 msgid "unset"
 msgstr "六月"
 
-#: personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:857
 msgid "immediately"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:878
+#: personal/samba/class_sambaAccount.inc:863
 #, fuzzy
 msgid "days"
 msgstr "星期日"
 
-#: personal/samba/class_sambaAccount.inc:879
+#: personal/samba/class_sambaAccount.inc:864
 #, fuzzy
 msgid "hours"
 msgstr "小时"
 
-#: personal/samba/class_sambaAccount.inc:886
+#: personal/samba/class_sambaAccount.inc:871
 #, fuzzy
 msgid "Domain attributes"
 msgstr "电话属性"
 
-#: personal/samba/class_sambaAccount.inc:887
-#: personal/samba/class_sambaAccount.inc:888
+#: personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:873
 #, fuzzy
 msgid "Min password length"
 msgstr "口令存储"
 
-#: personal/samba/class_sambaAccount.inc:889
+#: personal/samba/class_sambaAccount.inc:874
 #, fuzzy
 msgid "Password history"
 msgstr "口令存储"
 
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:875
 #, fuzzy
 msgid "Force password change"
 msgstr "不允许修改口令"
 
-#: personal/samba/class_sambaAccount.inc:891
+#: personal/samba/class_sambaAccount.inc:876
 #, fuzzy
 msgid "Maximum password age"
 msgstr "不允许修改口令"
 
-#: personal/samba/class_sambaAccount.inc:892
+#: personal/samba/class_sambaAccount.inc:877
 #, fuzzy
 msgid "Minimum password age"
 msgstr "管理员口令"
 
-#: personal/samba/class_sambaAccount.inc:893
+#: personal/samba/class_sambaAccount.inc:878
 #, fuzzy
 msgid "Lockout duration"
 msgstr "位置"
 
-#: personal/samba/class_sambaAccount.inc:894
+#: personal/samba/class_sambaAccount.inc:879
 msgid "Bad lockout attempt"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:895
+#: personal/samba/class_sambaAccount.inc:880
 #, fuzzy
 msgid "Disconnect time"
 msgstr "断开"
 
-#: personal/samba/class_sambaAccount.inc:896
+#: personal/samba/class_sambaAccount.inc:881
 #, fuzzy
 msgid "Refuse machine password change"
 msgstr "不允许修改口令"
 
-#: personal/samba/class_sambaAccount.inc:898
+#: personal/samba/class_sambaAccount.inc:883
 #, fuzzy
 msgid "User attributes"
 msgstr "电话属性"
 
-#: personal/samba/class_sambaAccount.inc:899
+#: personal/samba/class_sambaAccount.inc:884
 #, fuzzy
 msgid "SID"
 msgstr "GID"
 
-#: personal/samba/class_sambaAccount.inc:900
+#: personal/samba/class_sambaAccount.inc:885
 #, fuzzy
 msgid "Last failed login"
 msgstr "姓"
 
-#: personal/samba/class_sambaAccount.inc:901
+#: personal/samba/class_sambaAccount.inc:886
 #, fuzzy
 msgid "Logon attempts"
 msgstr "电话属性"
 
-#: personal/samba/class_sambaAccount.inc:902
+#: personal/samba/class_sambaAccount.inc:887
 #, fuzzy
 msgid "Last password update"
 msgstr "新口令"
 
-#: personal/samba/class_sambaAccount.inc:903
+#: personal/samba/class_sambaAccount.inc:888
 #, fuzzy
 msgid "Last logon"
 msgstr "姓"
 
-#: personal/samba/class_sambaAccount.inc:904
+#: personal/samba/class_sambaAccount.inc:889
 #, fuzzy
 msgid "Last logoff"
 msgstr "姓"
 
-#: personal/samba/class_sambaAccount.inc:905
+#: personal/samba/class_sambaAccount.inc:890
 #, fuzzy
 msgid "Automatic logoff"
 msgstr "自动"
 
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:913
-#: personal/samba/class_sambaAccount.inc:1416
+#: personal/samba/class_sambaAccount.inc:893
+#: personal/samba/class_sambaAccount.inc:898
+#: personal/samba/class_sambaAccount.inc:1408
 #, fuzzy
 msgid "Password expires"
 msgstr "口令过期截止日"
 
-#: personal/samba/class_sambaAccount.inc:908
+#: personal/samba/class_sambaAccount.inc:893
 msgid "No"
 msgstr "否"
 
-#: personal/samba/class_sambaAccount.inc:910
+#: personal/samba/class_sambaAccount.inc:895
 #, fuzzy, php-format
 msgid "The password would expire on %s, but the password expiry is disabled."
 msgstr "输入的“新口令”为空。"
 
-#: personal/samba/class_sambaAccount.inc:916
+#: personal/samba/class_sambaAccount.inc:901
 #, fuzzy
 msgid "Password change available"
 msgstr "不允许修改口令"
 
-#: personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:959
 #, fuzzy
 msgid "Home drive"
 msgstr "用户主目录"
 
-#: personal/samba/class_sambaAccount.inc:977
+#: personal/samba/class_sambaAccount.inc:962
 #, fuzzy
 msgid "Home path"
 msgstr "住宅电话"
 
-#: personal/samba/class_sambaAccount.inc:1000
+#: personal/samba/class_sambaAccount.inc:993
 #, fuzzy
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr "Windows 用户管理员只允许八个客户。您指定的超过八个。"
 
-#: personal/samba/class_sambaAccount.inc:1018
+#: personal/samba/class_sambaAccount.inc:1011
 msgid "Information"
 msgstr "提示信息"
 
-#: personal/samba/class_sambaAccount.inc:1192
-#: personal/samba/class_sambaAccount.inc:1216
+#: personal/samba/class_sambaAccount.inc:1184
+#: personal/samba/class_sambaAccount.inc:1208
 msgid "Warning"
 msgstr "警告"
 
-#: personal/samba/class_sambaAccount.inc:1192
+#: personal/samba/class_sambaAccount.inc:1184
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1216
+#: personal/samba/class_sambaAccount.inc:1208
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1394 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1386 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr "Samba 设置"
 
-#: personal/samba/class_sambaAccount.inc:1398
+#: personal/samba/class_sambaAccount.inc:1390
 msgid "My account"
 msgstr "我的账号"
 
-#: personal/samba/class_sambaAccount.inc:1404
+#: personal/samba/class_sambaAccount.inc:1396
 #, fuzzy
 msgid "Generic home directory"
 msgstr "用户主目录"
 
-#: personal/samba/class_sambaAccount.inc:1405
+#: personal/samba/class_sambaAccount.inc:1397
 msgid "Generic samba home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1407
+#: personal/samba/class_sambaAccount.inc:1399
 #, fuzzy
 msgid "Generic script path"
 msgstr "脚本路径"
 
-#: personal/samba/class_sambaAccount.inc:1408
+#: personal/samba/class_sambaAccount.inc:1400
 #, fuzzy
 msgid "Generic profile path"
 msgstr "Profile path"
 
-#: personal/samba/class_sambaAccount.inc:1411
+#: personal/samba/class_sambaAccount.inc:1403
 #, fuzzy
 msgid "Allow user to change password"
 msgstr "允许用户从客户端修改口令"
 
-#: personal/samba/class_sambaAccount.inc:1413
+#: personal/samba/class_sambaAccount.inc:1405
 #, fuzzy
 msgid "Password never expires"
 msgstr "口令过期截止日"
 
-#: personal/samba/class_sambaAccount.inc:1415
+#: personal/samba/class_sambaAccount.inc:1407
 #, fuzzy
 msgid "Account expires"
 msgstr "账号过期于"
 
-#: personal/samba/class_sambaAccount.inc:1417
+#: personal/samba/class_sambaAccount.inc:1409
 msgid "Limit Logon Time"
 msgstr "限制登录时间"
 
-#: personal/samba/class_sambaAccount.inc:1418
+#: personal/samba/class_sambaAccount.inc:1410
 msgid "Limit Logoff Time"
 msgstr "限制退出时间"
 
-#: personal/samba/class_sambaAccount.inc:1419
+#: personal/samba/class_sambaAccount.inc:1411
 #, fuzzy
 msgid "Logon hours"
 msgstr "1 小时"
 
-#: personal/samba/class_sambaAccount.inc:1420
+#: personal/samba/class_sambaAccount.inc:1412
 #, fuzzy
 msgid "Allow connection from"
 msgstr "只允许从这些工作站建立连接"
 
-#: personal/samba/class_sambaAccount.inc:1475
+#: personal/samba/class_sambaAccount.inc:1467
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
diff --git a/gosa-plugins/scalix/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/scalix/locale/de/LC_MESSAGES/messages.po
index 6c70c4c28..0f3fc0d27 100644
--- a/gosa-plugins/scalix/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/scalix/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2008-04-04 09:28+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team:  <de@li.org>\n"
diff --git a/gosa-plugins/scalix/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/scalix/locale/es/LC_MESSAGES/messages.po
index 84cec3345..9ff124a28 100644
--- a/gosa-plugins/scalix/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/scalix/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
diff --git a/gosa-plugins/scalix/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/scalix/locale/fr/LC_MESSAGES/messages.po
index a0143ff30..f6e28777b 100644
--- a/gosa-plugins/scalix/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/scalix/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2008-07-24 01:33+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: french <fr@li.org>\n"
diff --git a/gosa-plugins/scalix/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/scalix/locale/it/LC_MESSAGES/messages.po
index 9d443ddac..8d50891b6 100644
--- a/gosa-plugins/scalix/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/scalix/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
diff --git a/gosa-plugins/scalix/locale/messages.po b/gosa-plugins/scalix/locale/messages.po
index 21e7dc3a8..349f4f3b4 100644
--- a/gosa-plugins/scalix/locale/messages.po
+++ b/gosa-plugins/scalix/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gosa-plugins/scalix/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/scalix/locale/nl/LC_MESSAGES/messages.po
index 9e83827f6..5389a6577 100644
--- a/gosa-plugins/scalix/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/scalix/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
diff --git a/gosa-plugins/scalix/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/scalix/locale/pl/LC_MESSAGES/messages.po
index 1f41f8899..7106e1966 100644
--- a/gosa-plugins/scalix/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/scalix/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
diff --git a/gosa-plugins/scalix/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/scalix/locale/ru/LC_MESSAGES/messages.po
index 4d2800ca5..2e4bc937c 100644
--- a/gosa-plugins/scalix/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/scalix/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
diff --git a/gosa-plugins/scalix/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/scalix/locale/zh/LC_MESSAGES/messages.po
index f2ce86c90..0ba7a152a 100644
--- a/gosa-plugins/scalix/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/scalix/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
diff --git a/gosa-plugins/squid/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/squid/locale/de/LC_MESSAGES/messages.po
index b75069b8e..ec9335985 100644
--- a/gosa-plugins/squid/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/squid/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2008-04-03 15:59+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
diff --git a/gosa-plugins/squid/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/squid/locale/es/LC_MESSAGES/messages.po
index 6dbed17c1..5436963d4 100644
--- a/gosa-plugins/squid/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/squid/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
diff --git a/gosa-plugins/squid/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/squid/locale/fr/LC_MESSAGES/messages.po
index 55b9de2cb..6d9df4cb9 100644
--- a/gosa-plugins/squid/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/squid/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2008-06-08 15:51+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
diff --git a/gosa-plugins/squid/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/squid/locale/it/LC_MESSAGES/messages.po
index 5f9ffcb14..3f2909acc 100644
--- a/gosa-plugins/squid/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/squid/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
diff --git a/gosa-plugins/squid/locale/messages.po b/gosa-plugins/squid/locale/messages.po
index 2b17043a0..9afbc30ae 100644
--- a/gosa-plugins/squid/locale/messages.po
+++ b/gosa-plugins/squid/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gosa-plugins/squid/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/squid/locale/nl/LC_MESSAGES/messages.po
index 27104eeb9..162053614 100644
--- a/gosa-plugins/squid/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/squid/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
diff --git a/gosa-plugins/squid/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/squid/locale/pl/LC_MESSAGES/messages.po
index 051b99301..5c6cddd0d 100644
--- a/gosa-plugins/squid/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/squid/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
diff --git a/gosa-plugins/squid/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/squid/locale/ru/LC_MESSAGES/messages.po
index 3e5b663a2..1e187ce6d 100644
--- a/gosa-plugins/squid/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/squid/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
diff --git a/gosa-plugins/squid/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/squid/locale/zh/LC_MESSAGES/messages.po
index c52c4fbb7..15a435622 100644
--- a/gosa-plugins/squid/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/squid/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
diff --git a/gosa-plugins/ssh/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/ssh/locale/de/LC_MESSAGES/messages.po
index 2802388b8..aad92c0a7 100644
--- a/gosa-plugins/ssh/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/ssh/locale/de/LC_MESSAGES/messages.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2009-08-26 15:37+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: de <kde-i18n-de@kde.org>\n"
diff --git a/gosa-plugins/ssh/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/ssh/locale/fr/LC_MESSAGES/messages.po
index 2c63ab14c..56f439d40 100644
--- a/gosa-plugins/ssh/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/ssh/locale/fr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2009-09-01 09:42+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
diff --git a/gosa-plugins/ssh/locale/messages.po b/gosa-plugins/ssh/locale/messages.po
index c800bf378..4bf0dac95 100644
--- a/gosa-plugins/ssh/locale/messages.po
+++ b/gosa-plugins/ssh/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gosa-plugins/sudo/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/sudo/locale/de/LC_MESSAGES/messages.po
index 9996c0053..cd539367f 100644
--- a/gosa-plugins/sudo/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/sudo/locale/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2008-12-03 15:08+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
@@ -16,15 +16,41 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: admin/sudo/sudo-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filter"
+
+#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:547
+#: admin/sudo/class_sudoGeneric.inc:552 admin/sudo/class_sudoGeneric.inc:557
+#: admin/sudo/class_sudoGeneric.inc:566 admin/sudo/class_sudoGeneric.inc:669
+#: admin/sudo/generic.tpl:7 admin/sudo/generic.tpl:34
+#: admin/sudo/sudo-list.xml:32 admin/sudo/paste_generic.tpl:5
+msgid "Name"
+msgstr "Name"
+
+#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:384
+#: admin/sudo/class_target_list_users.inc:177
+msgid "User"
+msgstr "Benutzer"
+
 #: admin/sudo/remove.tpl:2
 msgid "Warning"
 msgstr "Warnung"
 
-#: admin/sudo/remove.tpl:9
-msgid "If you're sure, press 'Delete' to continue or 'Cancel' to abort."
+#: admin/sudo/remove.tpl:6
+msgid ""
+"Please double check if you 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, weil GOsa keine Möglichkeit hat, die "
+"Daten wiederherzustellen."
+
+#: admin/sudo/remove.tpl:10
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
-"Wenn Sie sicher sind, klicken Sie auf 'Entfernen' um fortzufahren oder "
-"'Abbrechen' um die Aktion abzubrechen."
+"Wenn Sie sicher sind, drücken Sie 'Entfernen' um fortzufahren oder "
+"'Abbrechen' zum Abbruch."
 
 #: admin/sudo/class_sudoGeneric.inc:295
 msgid "Error"
@@ -42,11 +68,6 @@ msgstr "Vollzugriff"
 msgid "allow access to these hosts"
 msgstr "erlaube Zugriff auf diese Hosts"
 
-#: admin/sudo/class_sudoGeneric.inc:384
-#: admin/sudo/class_target_list_users.inc:177
-msgid "User"
-msgstr "Benutzer"
-
 #: admin/sudo/class_sudoGeneric.inc:385
 #: admin/sudo/class_target_list_users.inc:178
 msgid "Group"
@@ -56,25 +77,16 @@ msgstr "Gruppe"
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: admin/sudo/class_sudoGeneric.inc:547 admin/sudo/class_sudoGeneric.inc:552
-#: admin/sudo/class_sudoGeneric.inc:557 admin/sudo/class_sudoGeneric.inc:566
-#: admin/sudo/class_sudoGeneric.inc:669 admin/sudo/generic.tpl:7
-#: admin/sudo/generic.tpl:34 admin/sudo/paste_generic.tpl:5
-#: admin/sudo/class_divListSudo.inc:78
-msgid "Name"
-msgstr "Name"
-
-#: admin/sudo/class_sudoGeneric.inc:660
+#: admin/sudo/class_sudoGeneric.inc:660 admin/sudo/class_sudoManagement.inc:25
 msgid "Sudo"
 msgstr "Sudo"
 
 #: admin/sudo/class_sudoGeneric.inc:661 admin/sudo/class_sudoGeneric.inc:666
-#: admin/sudo/class_sudoManagement.inc:262
 msgid "Sudo role"
 msgstr "Sudo-Rolle"
 
 #: admin/sudo/class_sudoGeneric.inc:670 admin/sudo/generic.tpl:15
-#: admin/sudo/generic.tpl:44
+#: admin/sudo/generic.tpl:44 admin/sudo/sudo-list.xml:40
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -216,6 +228,40 @@ msgstr "Arbeitsstation"
 msgid "Terminal"
 msgstr "Terminal"
 
+#: admin/sudo/sudo-list.xml:11
+msgid "List of sudo roles"
+msgstr "Liste der sudo-Rollen"
+
+#: admin/sudo/sudo-list.xml:15 admin/sudo/sudo-list.xml:65
+msgid "Role"
+msgstr "Rolle"
+
+#: admin/sudo/sudo-list.xml:48
+msgid "Actions"
+msgstr "Aktionen"
+
+#: admin/sudo/sudo-list.xml:59
+msgid "Create"
+msgstr "Anlegen"
+
+#: admin/sudo/sudo-list.xml:72
+msgid "Default"
+msgstr "Vorgabe"
+
+#: admin/sudo/sudo-list.xml:85
+msgid "Remove"
+msgstr "Entfernen"
+
+#: admin/sudo/sudo-list.xml:117
+#, fuzzy
+msgid "Edit sudo role"
+msgstr "Liste der sudo-Rollen"
+
+#: admin/sudo/sudo-list.xml:130
+#, fuzzy
+msgid "Remove sudo role"
+msgstr "Sudo-Rollen verwalten"
+
 #: admin/sudo/class_target_list_users.inc:47
 msgid "Select the target objects"
 msgstr "Wählen Sie die Ziel-Objekte"
@@ -245,10 +291,6 @@ msgstr "Zeige Gruppen"
 msgid "Apply"
 msgstr "Anwenden"
 
-#: admin/sudo/main.inc:50 admin/sudo/main.inc:54
-msgid "Sudo role administration"
-msgstr "Administration der sudo-Rollen"
-
 #: admin/sudo/class_sudoOption.inc:154
 msgid "Unknown option"
 msgstr "Unbekannte Option"
@@ -299,70 +341,45 @@ msgstr "Zeige Systeme auf die folgendes passt"
 msgid "Regular expression for matching addresses"
 msgstr "Regulärer Ausdruck zum Abgleich der Addressen"
 
-#: admin/sudo/class_divListSudo.inc:51 admin/sudo/class_divListSudo.inc:52
-msgid "List of sudo roles"
-msgstr "Liste der sudo-Rollen"
+#: admin/sudo/class_sudoManagement.inc:26
+#, fuzzy
+msgid "Sudo management"
+msgstr "Samba-Verwaltung"
 
-#: admin/sudo/class_divListSudo.inc:72
-msgid "Select all"
-msgstr "Alles auswählen"
+#~ msgid "If you're sure, press 'Delete' to continue or 'Cancel' to abort."
+#~ msgstr ""
+#~ "Wenn Sie sicher sind, klicken Sie auf 'Entfernen' um fortzufahren oder "
+#~ "'Abbrechen' um die Aktion abzubrechen."
 
-#: admin/sudo/class_divListSudo.inc:78
-msgid "Department"
-msgstr "Abteilung"
+#~ msgid "Sudo role administration"
+#~ msgstr "Administration der sudo-Rollen"
 
-#: admin/sudo/class_divListSudo.inc:79 admin/sudo/class_divListSudo.inc:105
-msgid "Actions"
-msgstr "Aktionen"
-
-#: admin/sudo/class_divListSudo.inc:83
-msgid "Regular expression for matching role names"
-msgstr "Regulärer Ausdruck zum Abgleich der Rollen-Namen"
-
-#: admin/sudo/class_divListSudo.inc:85
-msgid "Regular expression for matching role member names"
-msgstr "Regulärer Ausdruck zum Abgleich der Mitglieds-Namen"
-
-#: admin/sudo/class_divListSudo.inc:107
-msgid "Create"
-msgstr "Anlegen"
-
-#: admin/sudo/class_divListSudo.inc:111
-msgid "Role"
-msgstr "Rolle"
+#~ msgid "Select all"
+#~ msgstr "Alles auswählen"
 
-#: admin/sudo/class_divListSudo.inc:112
-msgid "Default"
-msgstr "Vorgabe"
+#~ msgid "Department"
+#~ msgstr "Abteilung"
 
-#: admin/sudo/class_divListSudo.inc:119
-msgid "Remove"
-msgstr "Entfernen"
+#~ msgid "Regular expression for matching role names"
+#~ msgstr "Regulärer Ausdruck zum Abgleich der Rollen-Namen"
 
-#: admin/sudo/class_divListSudo.inc:171
-msgid "Edit this entry"
-msgstr "Diesen Eintrag bearbeiten"
+#~ msgid "Regular expression for matching role member names"
+#~ msgstr "Regulärer Ausdruck zum Abgleich der Mitglieds-Namen"
 
-#: admin/sudo/class_divListSudo.inc:178
-msgid "Delete this entry"
-msgstr "Diesen Eintrag löschen"
+#~ msgid "Edit this entry"
+#~ msgstr "Diesen Eintrag bearbeiten"
 
-#: admin/sudo/class_divListSudo.inc:220
-msgid "Number of listed roles"
-msgstr "Anzahl der angezeigten Rollen"
+#~ msgid "Delete this entry"
+#~ msgstr "Diesen Eintrag löschen"
 
-#: admin/sudo/class_sudoManagement.inc:31
-msgid "Sudo roles"
-msgstr "Sudo-Rollen"
+#~ msgid "Number of listed roles"
+#~ msgstr "Anzahl der angezeigten Rollen"
 
-#: admin/sudo/class_sudoManagement.inc:32
-msgid "Manage sudo roles"
-msgstr "Sudo-Rollen verwalten"
+#~ msgid "Sudo roles"
+#~ msgstr "Sudo-Rollen"
 
-#: admin/sudo/class_sudoManagement.inc:247
-msgid "Permission"
-msgstr "Berechtigung"
+#~ msgid "Permission"
+#~ msgstr "Berechtigung"
 
-#: admin/sudo/class_sudoManagement.inc:295
-msgid "Permission error"
-msgstr "Berechtigungs-Fehler"
+#~ msgid "Permission error"
+#~ msgstr "Berechtigungs-Fehler"
diff --git a/gosa-plugins/sudo/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/sudo/locale/es/LC_MESSAGES/messages.po
index 55f83eaf2..11657ca55 100644
--- a/gosa-plugins/sudo/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/sudo/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
@@ -17,13 +17,38 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: admin/sudo/sudo-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filtros"
+
+#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:547
+#: admin/sudo/class_sudoGeneric.inc:552 admin/sudo/class_sudoGeneric.inc:557
+#: admin/sudo/class_sudoGeneric.inc:566 admin/sudo/class_sudoGeneric.inc:669
+#: admin/sudo/generic.tpl:7 admin/sudo/generic.tpl:34
+#: admin/sudo/sudo-list.xml:32 admin/sudo/paste_generic.tpl:5
+msgid "Name"
+msgstr "Nombre"
+
+#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:384
+#: admin/sudo/class_target_list_users.inc:177
+msgid "User"
+msgstr "Usuario"
+
 #: admin/sudo/remove.tpl:2
 msgid "Warning"
 msgstr "Aviso"
 
-#: admin/sudo/remove.tpl:9
-#, fuzzy
-msgid "If you're sure, press 'Delete' to continue or 'Cancel' to abort."
+#: admin/sudo/remove.tpl:6
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+"Si está seguro de lo que quiere hacer pulse dos veces, ya que no hay forma "
+"de que GOsa pueda recuperar posteriormente esa información"
+
+#: admin/sudo/remove.tpl:10
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o "
 "<i>Cancelar</i> para Abortar."
@@ -44,11 +69,6 @@ msgstr "Acceso sin restricciones"
 msgid "allow access to these hosts"
 msgstr "Permitir el acceso a estos equipos"
 
-#: admin/sudo/class_sudoGeneric.inc:384
-#: admin/sudo/class_target_list_users.inc:177
-msgid "User"
-msgstr "Usuario"
-
 #: admin/sudo/class_sudoGeneric.inc:385
 #: admin/sudo/class_target_list_users.inc:178
 msgid "Group"
@@ -59,27 +79,18 @@ msgstr "Grupo"
 msgid "LDAP error"
 msgstr "Servicio LDAP"
 
-#: admin/sudo/class_sudoGeneric.inc:547 admin/sudo/class_sudoGeneric.inc:552
-#: admin/sudo/class_sudoGeneric.inc:557 admin/sudo/class_sudoGeneric.inc:566
-#: admin/sudo/class_sudoGeneric.inc:669 admin/sudo/generic.tpl:7
-#: admin/sudo/generic.tpl:34 admin/sudo/paste_generic.tpl:5
-#: admin/sudo/class_divListSudo.inc:78
-msgid "Name"
-msgstr "Nombre"
-
-#: admin/sudo/class_sudoGeneric.inc:660
+#: admin/sudo/class_sudoGeneric.inc:660 admin/sudo/class_sudoManagement.inc:25
 #, fuzzy
 msgid "Sudo"
 msgstr "Junio"
 
 #: admin/sudo/class_sudoGeneric.inc:661 admin/sudo/class_sudoGeneric.inc:666
-#: admin/sudo/class_sudoManagement.inc:262
 #, fuzzy
 msgid "Sudo role"
 msgstr "¡id desconocido!"
 
 #: admin/sudo/class_sudoGeneric.inc:670 admin/sudo/generic.tpl:15
-#: admin/sudo/generic.tpl:44
+#: admin/sudo/generic.tpl:44 admin/sudo/sudo-list.xml:40
 msgid "Description"
 msgstr "Descripción"
 
@@ -230,6 +241,42 @@ msgstr "Estación de trabajo"
 msgid "Terminal"
 msgstr "Terminal"
 
+#: admin/sudo/sudo-list.xml:11
+#, fuzzy
+msgid "List of sudo roles"
+msgstr "Lista de usuarios"
+
+#: admin/sudo/sudo-list.xml:15 admin/sudo/sudo-list.xml:65
+msgid "Role"
+msgstr "Rol"
+
+#: admin/sudo/sudo-list.xml:48
+msgid "Actions"
+msgstr "Acciones"
+
+#: admin/sudo/sudo-list.xml:59
+msgid "Create"
+msgstr "Crear"
+
+#: admin/sudo/sudo-list.xml:72
+#, fuzzy
+msgid "Default"
+msgstr "Eliminar"
+
+#: admin/sudo/sudo-list.xml:85
+msgid "Remove"
+msgstr "Eliminar"
+
+#: admin/sudo/sudo-list.xml:117
+#, fuzzy
+msgid "Edit sudo role"
+msgstr "¡id desconocido!"
+
+#: admin/sudo/sudo-list.xml:130
+#, fuzzy
+msgid "Remove sudo role"
+msgstr "¡id desconocido!"
+
 #: admin/sudo/class_target_list_users.inc:47
 #, fuzzy
 msgid "Select the target objects"
@@ -264,11 +311,6 @@ msgstr "grupos de teléfonos"
 msgid "Apply"
 msgstr "Aplicar"
 
-#: admin/sudo/main.inc:50 admin/sudo/main.inc:54
-#, fuzzy
-msgid "Sudo role administration"
-msgstr "Administración de grupo"
-
 #: admin/sudo/class_sudoOption.inc:154
 #, fuzzy
 msgid "Unknown option"
@@ -324,79 +366,57 @@ msgstr "Mostrar sistemas que coincidan con"
 msgid "Regular expression for matching addresses"
 msgstr "Expresiones regulares para buscar direcciones"
 
-#: admin/sudo/class_divListSudo.inc:51 admin/sudo/class_divListSudo.inc:52
+#: admin/sudo/class_sudoManagement.inc:26
 #, fuzzy
-msgid "List of sudo roles"
-msgstr "Lista de usuarios"
-
-#: admin/sudo/class_divListSudo.inc:72
-msgid "Select all"
-msgstr "Seleccione todos"
+msgid "Sudo management"
+msgstr "Administración Samba"
 
-#: admin/sudo/class_divListSudo.inc:78
-msgid "Department"
-msgstr "Departamento"
-
-#: admin/sudo/class_divListSudo.inc:79 admin/sudo/class_divListSudo.inc:105
-msgid "Actions"
-msgstr "Acciones"
-
-#: admin/sudo/class_divListSudo.inc:83
 #, fuzzy
-msgid "Regular expression for matching role names"
-msgstr "Expresión regular para buscar nombres de grupos"
+#~ msgid "If you're sure, press 'Delete' to continue or 'Cancel' to abort."
+#~ msgstr ""
+#~ "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o "
+#~ "<i>Cancelar</i> para Abortar."
 
-#: admin/sudo/class_divListSudo.inc:85
 #, fuzzy
-msgid "Regular expression for matching role member names"
-msgstr "Expresión regular para buscar nombres de grupos"
+#~ msgid "Sudo role administration"
+#~ msgstr "Administración de grupo"
 
-#: admin/sudo/class_divListSudo.inc:107
-msgid "Create"
-msgstr "Crear"
+#~ msgid "Select all"
+#~ msgstr "Seleccione todos"
 
-#: admin/sudo/class_divListSudo.inc:111
-msgid "Role"
-msgstr "Rol"
+#~ msgid "Department"
+#~ msgstr "Departamento"
 
-#: admin/sudo/class_divListSudo.inc:112
 #, fuzzy
-msgid "Default"
-msgstr "Eliminar"
+#~ msgid "Regular expression for matching role names"
+#~ msgstr "Expresión regular para buscar nombres de grupos"
 
-#: admin/sudo/class_divListSudo.inc:119
-msgid "Remove"
-msgstr "Eliminar"
+#, fuzzy
+#~ msgid "Regular expression for matching role member names"
+#~ msgstr "Expresión regular para buscar nombres de grupos"
 
-#: admin/sudo/class_divListSudo.inc:171
-msgid "Edit this entry"
-msgstr "Editar esta entrada"
+#~ msgid "Edit this entry"
+#~ msgstr "Editar esta entrada"
 
-#: admin/sudo/class_divListSudo.inc:178
-msgid "Delete this entry"
-msgstr "Eliminar esta entrada"
+#~ msgid "Delete this entry"
+#~ msgstr "Eliminar esta entrada"
 
-#: admin/sudo/class_divListSudo.inc:220
 #, fuzzy
-msgid "Number of listed roles"
-msgstr "Eliminar grupo seleccionado"
+#~ msgid "Number of listed roles"
+#~ msgstr "Eliminar grupo seleccionado"
 
-#: admin/sudo/class_sudoManagement.inc:31
 #, fuzzy
-msgid "Sudo roles"
-msgstr "¡id desconocido!"
+#~ msgid "Sudo roles"
+#~ msgstr "¡id desconocido!"
 
-#: admin/sudo/class_sudoManagement.inc:32
 #, fuzzy
-msgid "Manage sudo roles"
-msgstr "Usuarios del dominio"
+#~ msgid "Manage sudo roles"
+#~ msgstr "Usuarios del dominio"
 
-#: admin/sudo/class_sudoManagement.inc:247
 #, fuzzy
-msgid "Permission"
-msgstr "Permisos"
+#~ msgid "Permission"
+#~ msgstr "Permisos"
 
-#: admin/sudo/class_sudoManagement.inc:295
 #, fuzzy
-msgid "Permission error"
-msgstr "Permisos"
+#~ msgid "Permission error"
+#~ msgstr "Permisos"
diff --git a/gosa-plugins/sudo/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/sudo/locale/fr/LC_MESSAGES/messages.po
index 7c2b95f0d..89905468e 100644
--- a/gosa-plugins/sudo/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/sudo/locale/fr/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2009-06-30 11:33+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -16,15 +16,42 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
+#: admin/sudo/sudo-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filtres"
+
+#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:547
+#: admin/sudo/class_sudoGeneric.inc:552 admin/sudo/class_sudoGeneric.inc:557
+#: admin/sudo/class_sudoGeneric.inc:566 admin/sudo/class_sudoGeneric.inc:669
+#: admin/sudo/generic.tpl:7 admin/sudo/generic.tpl:34
+#: admin/sudo/sudo-list.xml:32 admin/sudo/paste_generic.tpl:5
+msgid "Name"
+msgstr "Nom"
+
+#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:384
+#: admin/sudo/class_target_list_users.inc:177
+msgid "User"
+msgstr "Utilisateur"
+
 #: admin/sudo/remove.tpl:2
 msgid "Warning"
 msgstr "Avertissement"
 
-#: admin/sudo/remove.tpl:9
-msgid "If you're sure, press 'Delete' to continue or 'Cancel' to abort."
+#: admin/sudo/remove.tpl:6
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+"Veuillez vérifier que vous voulez effectuer cette action. Toutes les données "
+"seront perdues étant donné qu'il est impossible pour GOsa de récupérer vos "
+"données."
+
+#: admin/sudo/remove.tpl:10
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
-"Si vous êtes sur, cliquez sur 'Effacer' pour continuer ou 'Annuler' pour "
-"arrêter."
+"D'accord - si vous êtes sur - cliquez sur 'Supprimer' pour continuer ou sur "
+"'Annuler' pour abandonner."
 
 #: admin/sudo/class_sudoGeneric.inc:295
 msgid "Error"
@@ -42,11 +69,6 @@ msgstr "accès complet"
 msgid "allow access to these hosts"
 msgstr "permettre l'accès a ces hôtes"
 
-#: admin/sudo/class_sudoGeneric.inc:384
-#: admin/sudo/class_target_list_users.inc:177
-msgid "User"
-msgstr "Utilisateur"
-
 #: admin/sudo/class_sudoGeneric.inc:385
 #: admin/sudo/class_target_list_users.inc:178
 msgid "Group"
@@ -56,25 +78,16 @@ msgstr "Groupes"
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: admin/sudo/class_sudoGeneric.inc:547 admin/sudo/class_sudoGeneric.inc:552
-#: admin/sudo/class_sudoGeneric.inc:557 admin/sudo/class_sudoGeneric.inc:566
-#: admin/sudo/class_sudoGeneric.inc:669 admin/sudo/generic.tpl:7
-#: admin/sudo/generic.tpl:34 admin/sudo/paste_generic.tpl:5
-#: admin/sudo/class_divListSudo.inc:78
-msgid "Name"
-msgstr "Nom"
-
-#: admin/sudo/class_sudoGeneric.inc:660
+#: admin/sudo/class_sudoGeneric.inc:660 admin/sudo/class_sudoManagement.inc:25
 msgid "Sudo"
 msgstr ""
 
 #: admin/sudo/class_sudoGeneric.inc:661 admin/sudo/class_sudoGeneric.inc:666
-#: admin/sudo/class_sudoManagement.inc:262
 msgid "Sudo role"
 msgstr "Rôle sudo"
 
 #: admin/sudo/class_sudoGeneric.inc:670 admin/sudo/generic.tpl:15
-#: admin/sudo/generic.tpl:44
+#: admin/sudo/generic.tpl:44 admin/sudo/sudo-list.xml:40
 msgid "Description"
 msgstr ""
 
@@ -216,6 +229,40 @@ msgstr "Stations de travail"
 msgid "Terminal"
 msgstr ""
 
+#: admin/sudo/sudo-list.xml:11
+msgid "List of sudo roles"
+msgstr "Liste des rôles sudo"
+
+#: admin/sudo/sudo-list.xml:15 admin/sudo/sudo-list.xml:65
+msgid "Role"
+msgstr "Rôle"
+
+#: admin/sudo/sudo-list.xml:48
+msgid "Actions"
+msgstr ""
+
+#: admin/sudo/sudo-list.xml:59
+msgid "Create"
+msgstr "Créer"
+
+#: admin/sudo/sudo-list.xml:72
+msgid "Default"
+msgstr "Défaut"
+
+#: admin/sudo/sudo-list.xml:85
+msgid "Remove"
+msgstr "Supprimer"
+
+#: admin/sudo/sudo-list.xml:117
+#, fuzzy
+msgid "Edit sudo role"
+msgstr "Liste des rôles sudo"
+
+#: admin/sudo/sudo-list.xml:130
+#, fuzzy
+msgid "Remove sudo role"
+msgstr "Gèrer les rôles sudo"
+
 #: admin/sudo/class_target_list_users.inc:47
 msgid "Select the target objects"
 msgstr "Sélectionner les objets cible"
@@ -245,10 +292,6 @@ msgstr "Montrer les groupes"
 msgid "Apply"
 msgstr "Appliquer"
 
-#: admin/sudo/main.inc:50 admin/sudo/main.inc:54
-msgid "Sudo role administration"
-msgstr "Administration des rôles sudo"
-
 #: admin/sudo/class_sudoOption.inc:154
 msgid "Unknown option"
 msgstr "Option inconnue"
@@ -299,72 +342,47 @@ msgstr "Afficher les systèmes correspondant"
 msgid "Regular expression for matching addresses"
 msgstr "Expression régulière pour sélectionner les adresses correspondantes"
 
-#: admin/sudo/class_divListSudo.inc:51 admin/sudo/class_divListSudo.inc:52
-msgid "List of sudo roles"
-msgstr "Liste des rôles sudo"
+#: admin/sudo/class_sudoManagement.inc:26
+#, fuzzy
+msgid "Sudo management"
+msgstr "Gestion SAMBA"
 
-#: admin/sudo/class_divListSudo.inc:72
-msgid "Select all"
-msgstr "Sélectionner tout"
+#~ msgid "If you're sure, press 'Delete' to continue or 'Cancel' to abort."
+#~ msgstr ""
+#~ "Si vous êtes sur, cliquez sur 'Effacer' pour continuer ou 'Annuler' pour "
+#~ "arrêter."
 
-#: admin/sudo/class_divListSudo.inc:78
-msgid "Department"
-msgstr "Département"
+#~ msgid "Sudo role administration"
+#~ msgstr "Administration des rôles sudo"
 
-#: admin/sudo/class_divListSudo.inc:79 admin/sudo/class_divListSudo.inc:105
-msgid "Actions"
-msgstr ""
+#~ msgid "Select all"
+#~ msgstr "Sélectionner tout"
 
-#: admin/sudo/class_divListSudo.inc:83
-msgid "Regular expression for matching role names"
-msgstr "Expressions régulières pour le nom des rôles correspondants"
+#~ msgid "Department"
+#~ msgstr "Département"
 
-#: admin/sudo/class_divListSudo.inc:85
-msgid "Regular expression for matching role member names"
-msgstr ""
-"Expressions régulières pour le nom des membres appartenant aux rôles "
-"correspondants"
-
-#: admin/sudo/class_divListSudo.inc:107
-msgid "Create"
-msgstr "Créer"
-
-#: admin/sudo/class_divListSudo.inc:111
-msgid "Role"
-msgstr "Rôle"
+#~ msgid "Regular expression for matching role names"
+#~ msgstr "Expressions régulières pour le nom des rôles correspondants"
 
-#: admin/sudo/class_divListSudo.inc:112
-msgid "Default"
-msgstr "Défaut"
+#~ msgid "Regular expression for matching role member names"
+#~ msgstr ""
+#~ "Expressions régulières pour le nom des membres appartenant aux rôles "
+#~ "correspondants"
 
-#: admin/sudo/class_divListSudo.inc:119
-msgid "Remove"
-msgstr "Supprimer"
+#~ msgid "Edit this entry"
+#~ msgstr "Editer cette entrée"
 
-#: admin/sudo/class_divListSudo.inc:171
-msgid "Edit this entry"
-msgstr "Editer cette entrée"
+#~ msgid "Delete this entry"
+#~ msgstr "Supprimer cette entrée"
 
-#: admin/sudo/class_divListSudo.inc:178
-msgid "Delete this entry"
-msgstr "Supprimer cette entrée"
+#~ msgid "Number of listed roles"
+#~ msgstr "Nombre de rôles listés"
 
-#: admin/sudo/class_divListSudo.inc:220
-msgid "Number of listed roles"
-msgstr "Nombre de rôles listés"
-
-#: admin/sudo/class_sudoManagement.inc:31
-msgid "Sudo roles"
-msgstr "Rôles Sudo"
-
-#: admin/sudo/class_sudoManagement.inc:32
-msgid "Manage sudo roles"
-msgstr "Gèrer les rôles sudo"
+#~ msgid "Sudo roles"
+#~ msgstr "Rôles Sudo"
 
-#: admin/sudo/class_sudoManagement.inc:247
-msgid "Permission"
-msgstr "Permissions"
+#~ msgid "Permission"
+#~ msgstr "Permissions"
 
-#: admin/sudo/class_sudoManagement.inc:295
-msgid "Permission error"
-msgstr "Erreur de permissions"
+#~ msgid "Permission error"
+#~ msgstr "Erreur de permissions"
diff --git a/gosa-plugins/sudo/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/sudo/locale/it/LC_MESSAGES/messages.po
index 0f37f44e3..d19e0657a 100644
--- a/gosa-plugins/sudo/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/sudo/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -15,13 +15,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
+#: admin/sudo/sudo-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filtri"
+
+#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:547
+#: admin/sudo/class_sudoGeneric.inc:552 admin/sudo/class_sudoGeneric.inc:557
+#: admin/sudo/class_sudoGeneric.inc:566 admin/sudo/class_sudoGeneric.inc:669
+#: admin/sudo/generic.tpl:7 admin/sudo/generic.tpl:34
+#: admin/sudo/sudo-list.xml:32 admin/sudo/paste_generic.tpl:5
+msgid "Name"
+msgstr "Cognome"
+
+#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:384
+#: admin/sudo/class_target_list_users.inc:177
+msgid "User"
+msgstr ""
+
 #: admin/sudo/remove.tpl:2
 msgid "Warning"
 msgstr "Attenzione"
 
-#: admin/sudo/remove.tpl:9
+#: admin/sudo/remove.tpl:6
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+
+#: admin/sudo/remove.tpl:10
 #, fuzzy
-msgid "If you're sure, press 'Delete' to continue or 'Cancel' to abort."
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 "Quindi - Se sei sicuro - premi <i>Rimuovi</i> per continuare o <i>Annulla</"
 "i> per abortire."
@@ -42,11 +66,6 @@ msgstr "accesso completo"
 msgid "allow access to these hosts"
 msgstr "accesso limitato ai seguenti host"
 
-#: admin/sudo/class_sudoGeneric.inc:384
-#: admin/sudo/class_target_list_users.inc:177
-msgid "User"
-msgstr ""
-
 #: admin/sudo/class_sudoGeneric.inc:385
 #: admin/sudo/class_target_list_users.inc:178
 msgid "Group"
@@ -57,27 +76,18 @@ msgstr "Gruppo"
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: admin/sudo/class_sudoGeneric.inc:547 admin/sudo/class_sudoGeneric.inc:552
-#: admin/sudo/class_sudoGeneric.inc:557 admin/sudo/class_sudoGeneric.inc:566
-#: admin/sudo/class_sudoGeneric.inc:669 admin/sudo/generic.tpl:7
-#: admin/sudo/generic.tpl:34 admin/sudo/paste_generic.tpl:5
-#: admin/sudo/class_divListSudo.inc:78
-msgid "Name"
-msgstr "Cognome"
-
-#: admin/sudo/class_sudoGeneric.inc:660
+#: admin/sudo/class_sudoGeneric.inc:660 admin/sudo/class_sudoManagement.inc:25
 #, fuzzy
 msgid "Sudo"
 msgstr "Cognome"
 
 #: admin/sudo/class_sudoGeneric.inc:661 admin/sudo/class_sudoGeneric.inc:666
-#: admin/sudo/class_sudoManagement.inc:262
 #, fuzzy
 msgid "Sudo role"
 msgstr "Cognome"
 
 #: admin/sudo/class_sudoGeneric.inc:670 admin/sudo/generic.tpl:15
-#: admin/sudo/generic.tpl:44
+#: admin/sudo/generic.tpl:44 admin/sudo/sudo-list.xml:40
 msgid "Description"
 msgstr "Descrizione"
 
@@ -233,6 +243,42 @@ msgstr ""
 msgid "Terminal"
 msgstr "Terminali"
 
+#: admin/sudo/sudo-list.xml:11
+#, fuzzy
+msgid "List of sudo roles"
+msgstr "Lista degli utenti"
+
+#: admin/sudo/sudo-list.xml:15 admin/sudo/sudo-list.xml:65
+msgid "Role"
+msgstr "Ruolo"
+
+#: admin/sudo/sudo-list.xml:48
+msgid "Actions"
+msgstr "Azioni"
+
+#: admin/sudo/sudo-list.xml:59
+msgid "Create"
+msgstr "Creare"
+
+#: admin/sudo/sudo-list.xml:72
+#, fuzzy
+msgid "Default"
+msgstr "Rimuovi"
+
+#: admin/sudo/sudo-list.xml:85
+msgid "Remove"
+msgstr "Rimuovi"
+
+#: admin/sudo/sudo-list.xml:117
+#, fuzzy
+msgid "Edit sudo role"
+msgstr "Lista degli utenti"
+
+#: admin/sudo/sudo-list.xml:130
+#, fuzzy
+msgid "Remove sudo role"
+msgstr "Utenti di Dominio"
+
 #: admin/sudo/class_target_list_users.inc:47
 msgid "Select the target objects"
 msgstr ""
@@ -266,11 +312,6 @@ msgstr "Mostra gruppi samba"
 msgid "Apply"
 msgstr "Applica"
 
-#: admin/sudo/main.inc:50 admin/sudo/main.inc:54
-#, fuzzy
-msgid "Sudo role administration"
-msgstr "Amministrazione dei gruppi di utenti"
-
 #: admin/sudo/class_sudoOption.inc:154
 #, fuzzy
 msgid "Unknown option"
@@ -326,80 +367,54 @@ msgstr "Mostra i sistemi che corrispondono a:"
 msgid "Regular expression for matching addresses"
 msgstr "Espressione regolare per selezionare l'indirizzo"
 
-#: admin/sudo/class_divListSudo.inc:51 admin/sudo/class_divListSudo.inc:52
+#: admin/sudo/class_sudoManagement.inc:26
 #, fuzzy
-msgid "List of sudo roles"
-msgstr "Lista degli utenti"
+msgid "Sudo management"
+msgstr "Dirigenza"
 
-#: admin/sudo/class_divListSudo.inc:72
 #, fuzzy
-msgid "Select all"
-msgstr "Rimuovi"
-
-#: admin/sudo/class_divListSudo.inc:78
-msgid "Department"
-msgstr "Dipartimento"
+#~ msgid "If you're sure, press 'Delete' to continue or 'Cancel' to abort."
+#~ msgstr ""
+#~ "Quindi - Se sei sicuro - premi <i>Rimuovi</i> per continuare o "
+#~ "<i>Annulla</i> per abortire."
 
-#: admin/sudo/class_divListSudo.inc:79 admin/sudo/class_divListSudo.inc:105
-msgid "Actions"
-msgstr "Azioni"
-
-#: admin/sudo/class_divListSudo.inc:83
 #, fuzzy
-msgid "Regular expression for matching role names"
-msgstr "Espressioni regolare per selezionare il nome del gruppo"
+#~ msgid "Sudo role administration"
+#~ msgstr "Amministrazione dei gruppi di utenti"
 
-#: admin/sudo/class_divListSudo.inc:85
 #, fuzzy
-msgid "Regular expression for matching role member names"
-msgstr "Espressioni regolare per selezionare il nome del gruppo"
+#~ msgid "Select all"
+#~ msgstr "Rimuovi"
 
-#: admin/sudo/class_divListSudo.inc:107
-msgid "Create"
-msgstr "Creare"
+#~ msgid "Department"
+#~ msgstr "Dipartimento"
 
-#: admin/sudo/class_divListSudo.inc:111
-msgid "Role"
-msgstr "Ruolo"
-
-#: admin/sudo/class_divListSudo.inc:112
 #, fuzzy
-msgid "Default"
-msgstr "Rimuovi"
-
-#: admin/sudo/class_divListSudo.inc:119
-msgid "Remove"
-msgstr "Rimuovi"
+#~ msgid "Regular expression for matching role names"
+#~ msgstr "Espressioni regolare per selezionare il nome del gruppo"
 
-#: admin/sudo/class_divListSudo.inc:171
-msgid "Edit this entry"
-msgstr "Modifica questo record"
+#, fuzzy
+#~ msgid "Regular expression for matching role member names"
+#~ msgstr "Espressioni regolare per selezionare il nome del gruppo"
 
-#: admin/sudo/class_divListSudo.inc:178
-msgid "Delete this entry"
-msgstr "Elimina questo record"
+#~ msgid "Edit this entry"
+#~ msgstr "Modifica questo record"
 
-#: admin/sudo/class_divListSudo.inc:220
-#, fuzzy
-msgid "Number of listed roles"
-msgstr "Nome del gruppo"
+#~ msgid "Delete this entry"
+#~ msgstr "Elimina questo record"
 
-#: admin/sudo/class_sudoManagement.inc:31
 #, fuzzy
-msgid "Sudo roles"
-msgstr "Utenti di Dominio"
+#~ msgid "Number of listed roles"
+#~ msgstr "Nome del gruppo"
 
-#: admin/sudo/class_sudoManagement.inc:32
 #, fuzzy
-msgid "Manage sudo roles"
-msgstr "Utenti di Dominio"
+#~ msgid "Sudo roles"
+#~ msgstr "Utenti di Dominio"
 
-#: admin/sudo/class_sudoManagement.inc:247
 #, fuzzy
-msgid "Permission"
-msgstr "Permessi"
+#~ msgid "Permission"
+#~ msgstr "Permessi"
 
-#: admin/sudo/class_sudoManagement.inc:295
 #, fuzzy
-msgid "Permission error"
-msgstr "Permessi"
+#~ msgid "Permission error"
+#~ msgstr "Permessi"
diff --git a/gosa-plugins/sudo/locale/messages.po b/gosa-plugins/sudo/locale/messages.po
index 62ae92fb6..6c67ece43 100644
--- a/gosa-plugins/sudo/locale/messages.po
+++ b/gosa-plugins/sudo/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,12 +16,35 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: admin/sudo/sudo-filter.tpl:3
+msgid "Filter"
+msgstr ""
+
+#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:547
+#: admin/sudo/class_sudoGeneric.inc:552 admin/sudo/class_sudoGeneric.inc:557
+#: admin/sudo/class_sudoGeneric.inc:566 admin/sudo/class_sudoGeneric.inc:669
+#: admin/sudo/generic.tpl:7 admin/sudo/generic.tpl:34
+#: admin/sudo/sudo-list.xml:32 admin/sudo/paste_generic.tpl:5
+msgid "Name"
+msgstr ""
+
+#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:384
+#: admin/sudo/class_target_list_users.inc:177
+msgid "User"
+msgstr ""
+
 #: admin/sudo/remove.tpl:2
 msgid "Warning"
 msgstr ""
 
-#: admin/sudo/remove.tpl:9
-msgid "If you're sure, press 'Delete' to continue or 'Cancel' to abort."
+#: admin/sudo/remove.tpl:6
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+
+#: admin/sudo/remove.tpl:10
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
 #: admin/sudo/class_sudoGeneric.inc:295
@@ -40,11 +63,6 @@ msgstr ""
 msgid "allow access to these hosts"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:384
-#: admin/sudo/class_target_list_users.inc:177
-msgid "User"
-msgstr ""
-
 #: admin/sudo/class_sudoGeneric.inc:385
 #: admin/sudo/class_target_list_users.inc:178
 msgid "Group"
@@ -54,25 +72,16 @@ msgstr ""
 msgid "LDAP error"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:547 admin/sudo/class_sudoGeneric.inc:552
-#: admin/sudo/class_sudoGeneric.inc:557 admin/sudo/class_sudoGeneric.inc:566
-#: admin/sudo/class_sudoGeneric.inc:669 admin/sudo/generic.tpl:7
-#: admin/sudo/generic.tpl:34 admin/sudo/paste_generic.tpl:5
-#: admin/sudo/class_divListSudo.inc:78
-msgid "Name"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:660
+#: admin/sudo/class_sudoGeneric.inc:660 admin/sudo/class_sudoManagement.inc:25
 msgid "Sudo"
 msgstr ""
 
 #: admin/sudo/class_sudoGeneric.inc:661 admin/sudo/class_sudoGeneric.inc:666
-#: admin/sudo/class_sudoManagement.inc:262
 msgid "Sudo role"
 msgstr ""
 
 #: admin/sudo/class_sudoGeneric.inc:670 admin/sudo/generic.tpl:15
-#: admin/sudo/generic.tpl:44
+#: admin/sudo/generic.tpl:44 admin/sudo/sudo-list.xml:40
 msgid "Description"
 msgstr ""
 
@@ -214,6 +223,38 @@ msgstr ""
 msgid "Terminal"
 msgstr ""
 
+#: admin/sudo/sudo-list.xml:11
+msgid "List of sudo roles"
+msgstr ""
+
+#: admin/sudo/sudo-list.xml:15 admin/sudo/sudo-list.xml:65
+msgid "Role"
+msgstr ""
+
+#: admin/sudo/sudo-list.xml:48
+msgid "Actions"
+msgstr ""
+
+#: admin/sudo/sudo-list.xml:59
+msgid "Create"
+msgstr ""
+
+#: admin/sudo/sudo-list.xml:72
+msgid "Default"
+msgstr ""
+
+#: admin/sudo/sudo-list.xml:85
+msgid "Remove"
+msgstr ""
+
+#: admin/sudo/sudo-list.xml:117
+msgid "Edit sudo role"
+msgstr ""
+
+#: admin/sudo/sudo-list.xml:130
+msgid "Remove sudo role"
+msgstr ""
+
 #: admin/sudo/class_target_list_users.inc:47
 msgid "Select the target objects"
 msgstr ""
@@ -243,10 +284,6 @@ msgstr ""
 msgid "Apply"
 msgstr ""
 
-#: admin/sudo/main.inc:50 admin/sudo/main.inc:54
-msgid "Sudo role administration"
-msgstr ""
-
 #: admin/sudo/class_sudoOption.inc:154
 msgid "Unknown option"
 msgstr ""
@@ -297,70 +334,6 @@ msgstr ""
 msgid "Regular expression for matching addresses"
 msgstr ""
 
-#: admin/sudo/class_divListSudo.inc:51 admin/sudo/class_divListSudo.inc:52
-msgid "List of sudo roles"
-msgstr ""
-
-#: admin/sudo/class_divListSudo.inc:72
-msgid "Select all"
-msgstr ""
-
-#: admin/sudo/class_divListSudo.inc:78
-msgid "Department"
-msgstr ""
-
-#: admin/sudo/class_divListSudo.inc:79 admin/sudo/class_divListSudo.inc:105
-msgid "Actions"
-msgstr ""
-
-#: admin/sudo/class_divListSudo.inc:83
-msgid "Regular expression for matching role names"
-msgstr ""
-
-#: admin/sudo/class_divListSudo.inc:85
-msgid "Regular expression for matching role member names"
-msgstr ""
-
-#: admin/sudo/class_divListSudo.inc:107
-msgid "Create"
-msgstr ""
-
-#: admin/sudo/class_divListSudo.inc:111
-msgid "Role"
-msgstr ""
-
-#: admin/sudo/class_divListSudo.inc:112
-msgid "Default"
-msgstr ""
-
-#: admin/sudo/class_divListSudo.inc:119
-msgid "Remove"
-msgstr ""
-
-#: admin/sudo/class_divListSudo.inc:171
-msgid "Edit this entry"
-msgstr ""
-
-#: admin/sudo/class_divListSudo.inc:178
-msgid "Delete this entry"
-msgstr ""
-
-#: admin/sudo/class_divListSudo.inc:220
-msgid "Number of listed roles"
-msgstr ""
-
-#: admin/sudo/class_sudoManagement.inc:31
-msgid "Sudo roles"
-msgstr ""
-
-#: admin/sudo/class_sudoManagement.inc:32
-msgid "Manage sudo roles"
-msgstr ""
-
-#: admin/sudo/class_sudoManagement.inc:247
-msgid "Permission"
-msgstr ""
-
-#: admin/sudo/class_sudoManagement.inc:295
-msgid "Permission error"
+#: admin/sudo/class_sudoManagement.inc:26
+msgid "Sudo management"
 msgstr ""
diff --git a/gosa-plugins/sudo/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/sudo/locale/nl/LC_MESSAGES/messages.po
index 09210acc1..82627114e 100644
--- a/gosa-plugins/sudo/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/sudo/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -19,13 +19,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: admin/sudo/sudo-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filters"
+
+#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:547
+#: admin/sudo/class_sudoGeneric.inc:552 admin/sudo/class_sudoGeneric.inc:557
+#: admin/sudo/class_sudoGeneric.inc:566 admin/sudo/class_sudoGeneric.inc:669
+#: admin/sudo/generic.tpl:7 admin/sudo/generic.tpl:34
+#: admin/sudo/sudo-list.xml:32 admin/sudo/paste_generic.tpl:5
+msgid "Name"
+msgstr "Naam"
+
+#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:384
+#: admin/sudo/class_target_list_users.inc:177
+msgid "User"
+msgstr "Gebruiker"
+
 #: admin/sudo/remove.tpl:2
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: admin/sudo/remove.tpl:9
-#, fuzzy
-msgid "If you're sure, press 'Delete' to continue or 'Cancel' to abort."
+#: admin/sudo/remove.tpl:6
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+"Controleer a.u.b. of u dit daadwerkelijk wil doen, aangezien er geen "
+"mogelijkheid voor GOsa is om uw data terug te krijgen."
+
+#: admin/sudo/remove.tpl:10
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 "Indien u zeker bent drukt u dan 'Verwijderen' om door te gaan of 'Annuleren' "
 "om te annuleren."
@@ -46,11 +71,6 @@ msgstr "volledige toegang"
 msgid "allow access to these hosts"
 msgstr "sta toegang op deze computers toe"
 
-#: admin/sudo/class_sudoGeneric.inc:384
-#: admin/sudo/class_target_list_users.inc:177
-msgid "User"
-msgstr "Gebruiker"
-
 #: admin/sudo/class_sudoGeneric.inc:385
 #: admin/sudo/class_target_list_users.inc:178
 msgid "Group"
@@ -61,27 +81,18 @@ msgstr "Groep"
 msgid "LDAP error"
 msgstr "LDAP fout:"
 
-#: admin/sudo/class_sudoGeneric.inc:547 admin/sudo/class_sudoGeneric.inc:552
-#: admin/sudo/class_sudoGeneric.inc:557 admin/sudo/class_sudoGeneric.inc:566
-#: admin/sudo/class_sudoGeneric.inc:669 admin/sudo/generic.tpl:7
-#: admin/sudo/generic.tpl:34 admin/sudo/paste_generic.tpl:5
-#: admin/sudo/class_divListSudo.inc:78
-msgid "Name"
-msgstr "Naam"
-
-#: admin/sudo/class_sudoGeneric.inc:660
+#: admin/sudo/class_sudoGeneric.inc:660 admin/sudo/class_sudoManagement.inc:25
 #, fuzzy
 msgid "Sudo"
 msgstr "Achternaam"
 
 #: admin/sudo/class_sudoGeneric.inc:661 admin/sudo/class_sudoGeneric.inc:666
-#: admin/sudo/class_sudoManagement.inc:262
 #, fuzzy
 msgid "Sudo role"
 msgstr "! onbekend id"
 
 #: admin/sudo/class_sudoGeneric.inc:670 admin/sudo/generic.tpl:15
-#: admin/sudo/generic.tpl:44
+#: admin/sudo/generic.tpl:44 admin/sudo/sudo-list.xml:40
 msgid "Description"
 msgstr "Omschrijving"
 
@@ -235,6 +246,42 @@ msgstr "Werkstation"
 msgid "Terminal"
 msgstr "Terminal"
 
+#: admin/sudo/sudo-list.xml:11
+#, fuzzy
+msgid "List of sudo roles"
+msgstr "Lijst met gebruikers"
+
+#: admin/sudo/sudo-list.xml:15 admin/sudo/sudo-list.xml:65
+msgid "Role"
+msgstr "Funktie"
+
+#: admin/sudo/sudo-list.xml:48
+msgid "Actions"
+msgstr "Acties"
+
+#: admin/sudo/sudo-list.xml:59
+msgid "Create"
+msgstr "Aanmaken"
+
+#: admin/sudo/sudo-list.xml:72
+#, fuzzy
+msgid "Default"
+msgstr "Verwijderen"
+
+#: admin/sudo/sudo-list.xml:85
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: admin/sudo/sudo-list.xml:117
+#, fuzzy
+msgid "Edit sudo role"
+msgstr "! onbekend id"
+
+#: admin/sudo/sudo-list.xml:130
+#, fuzzy
+msgid "Remove sudo role"
+msgstr "! onbekend id"
+
 #: admin/sudo/class_target_list_users.inc:47
 #, fuzzy
 msgid "Select the target objects"
@@ -269,11 +316,6 @@ msgstr "Toon Samba groepen"
 msgid "Apply"
 msgstr "Toepassen"
 
-#: admin/sudo/main.inc:50 admin/sudo/main.inc:54
-#, fuzzy
-msgid "Sudo role administration"
-msgstr "Groepen beheer"
-
 #: admin/sudo/class_sudoOption.inc:154
 #, fuzzy
 msgid "Unknown option"
@@ -329,80 +371,58 @@ msgstr "Toon de overeenkomende systemen"
 msgid "Regular expression for matching addresses"
 msgstr "Reguliere expresie voor overeenkomende adressen"
 
-#: admin/sudo/class_divListSudo.inc:51 admin/sudo/class_divListSudo.inc:52
+#: admin/sudo/class_sudoManagement.inc:26
 #, fuzzy
-msgid "List of sudo roles"
-msgstr "Lijst met gebruikers"
+msgid "Sudo management"
+msgstr "Systeembeheer"
 
-#: admin/sudo/class_divListSudo.inc:72
 #, fuzzy
-msgid "Select all"
-msgstr "Selecteer"
-
-#: admin/sudo/class_divListSudo.inc:78
-msgid "Department"
-msgstr "Afdeling"
+#~ msgid "If you're sure, press 'Delete' to continue or 'Cancel' to abort."
+#~ msgstr ""
+#~ "Indien u zeker bent drukt u dan 'Verwijderen' om door te gaan of "
+#~ "'Annuleren' om te annuleren."
 
-#: admin/sudo/class_divListSudo.inc:79 admin/sudo/class_divListSudo.inc:105
-msgid "Actions"
-msgstr "Acties"
-
-#: admin/sudo/class_divListSudo.inc:83
 #, fuzzy
-msgid "Regular expression for matching role names"
-msgstr "Reguliere expressie voor overeenkomende groepnamen"
+#~ msgid "Sudo role administration"
+#~ msgstr "Groepen beheer"
 
-#: admin/sudo/class_divListSudo.inc:85
 #, fuzzy
-msgid "Regular expression for matching role member names"
-msgstr "Reguliere expressie voor overeenkomende objectnamen"
+#~ msgid "Select all"
+#~ msgstr "Selecteer"
 
-#: admin/sudo/class_divListSudo.inc:107
-msgid "Create"
-msgstr "Aanmaken"
-
-#: admin/sudo/class_divListSudo.inc:111
-msgid "Role"
-msgstr "Funktie"
+#~ msgid "Department"
+#~ msgstr "Afdeling"
 
-#: admin/sudo/class_divListSudo.inc:112
 #, fuzzy
-msgid "Default"
-msgstr "Verwijderen"
+#~ msgid "Regular expression for matching role names"
+#~ msgstr "Reguliere expressie voor overeenkomende groepnamen"
 
-#: admin/sudo/class_divListSudo.inc:119
-msgid "Remove"
-msgstr "Verwijderen"
+#, fuzzy
+#~ msgid "Regular expression for matching role member names"
+#~ msgstr "Reguliere expressie voor overeenkomende objectnamen"
 
-#: admin/sudo/class_divListSudo.inc:171
-msgid "Edit this entry"
-msgstr "Bewerk deze invoer"
+#~ msgid "Edit this entry"
+#~ msgstr "Bewerk deze invoer"
 
-#: admin/sudo/class_divListSudo.inc:178
-msgid "Delete this entry"
-msgstr "Verwijder deze invoer"
+#~ msgid "Delete this entry"
+#~ msgstr "Verwijder deze invoer"
 
-#: admin/sudo/class_divListSudo.inc:220
 #, fuzzy
-msgid "Number of listed roles"
-msgstr "Naam van de groep"
+#~ msgid "Number of listed roles"
+#~ msgstr "Naam van de groep"
 
-#: admin/sudo/class_sudoManagement.inc:31
 #, fuzzy
-msgid "Sudo roles"
-msgstr "! onbekend id"
+#~ msgid "Sudo roles"
+#~ msgstr "! onbekend id"
 
-#: admin/sudo/class_sudoManagement.inc:32
 #, fuzzy
-msgid "Manage sudo roles"
-msgstr "Windows gebruikers"
+#~ msgid "Manage sudo roles"
+#~ msgstr "Windows gebruikers"
 
-#: admin/sudo/class_sudoManagement.inc:247
 #, fuzzy
-msgid "Permission"
-msgstr "Rechten"
+#~ msgid "Permission"
+#~ msgstr "Rechten"
 
-#: admin/sudo/class_sudoManagement.inc:295
 #, fuzzy
-msgid "Permission error"
-msgstr "Rechten"
+#~ msgid "Permission error"
+#~ msgstr "Rechten"
diff --git a/gosa-plugins/sudo/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/sudo/locale/pl/LC_MESSAGES/messages.po
index c957bd035..e31d6d2e9 100644
--- a/gosa-plugins/sudo/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/sudo/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -14,13 +14,36 @@ msgstr ""
 "X-Poedit-SourceCharset: iso-8859-2\n"
 "X-Poedit-Basepath: tedst\n"
 
+#: admin/sudo/sudo-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filtry"
+
+#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:547
+#: admin/sudo/class_sudoGeneric.inc:552 admin/sudo/class_sudoGeneric.inc:557
+#: admin/sudo/class_sudoGeneric.inc:566 admin/sudo/class_sudoGeneric.inc:669
+#: admin/sudo/generic.tpl:7 admin/sudo/generic.tpl:34
+#: admin/sudo/sudo-list.xml:32 admin/sudo/paste_generic.tpl:5
+msgid "Name"
+msgstr "Imię"
+
+#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:384
+#: admin/sudo/class_target_list_users.inc:177
+msgid "User"
+msgstr "Użytkownik"
+
 #: admin/sudo/remove.tpl:2
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: admin/sudo/remove.tpl:9
-#, fuzzy
-msgid "If you're sure, press 'Delete' to continue or 'Cancel' to abort."
+#: admin/sudo/remove.tpl:6
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr "Proszę upewnić się czy kontynuować, gdyż nie ma możliwości powrotu."
+
+#: admin/sudo/remove.tpl:10
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 "Jeśli jesteś pewien - naciśnij 'Usuń' aby kontynuować lub 'Anuluj' aby "
 "anulować."
@@ -41,11 +64,6 @@ msgstr "pełen dostęp"
 msgid "allow access to these hosts"
 msgstr "zezwól na dostęp do tych hostów"
 
-#: admin/sudo/class_sudoGeneric.inc:384
-#: admin/sudo/class_target_list_users.inc:177
-msgid "User"
-msgstr "Użytkownik"
-
 #: admin/sudo/class_sudoGeneric.inc:385
 #: admin/sudo/class_target_list_users.inc:178
 msgid "Group"
@@ -56,27 +74,18 @@ msgstr "Grupa"
 msgid "LDAP error"
 msgstr "błąd LDAP:"
 
-#: admin/sudo/class_sudoGeneric.inc:547 admin/sudo/class_sudoGeneric.inc:552
-#: admin/sudo/class_sudoGeneric.inc:557 admin/sudo/class_sudoGeneric.inc:566
-#: admin/sudo/class_sudoGeneric.inc:669 admin/sudo/generic.tpl:7
-#: admin/sudo/generic.tpl:34 admin/sudo/paste_generic.tpl:5
-#: admin/sudo/class_divListSudo.inc:78
-msgid "Name"
-msgstr "Imię"
-
-#: admin/sudo/class_sudoGeneric.inc:660
+#: admin/sudo/class_sudoGeneric.inc:660 admin/sudo/class_sudoManagement.inc:25
 #, fuzzy
 msgid "Sudo"
 msgstr "Nazwisko"
 
 #: admin/sudo/class_sudoGeneric.inc:661 admin/sudo/class_sudoGeneric.inc:666
-#: admin/sudo/class_sudoManagement.inc:262
 #, fuzzy
 msgid "Sudo role"
 msgstr "! nieznane id"
 
 #: admin/sudo/class_sudoGeneric.inc:670 admin/sudo/generic.tpl:15
-#: admin/sudo/generic.tpl:44
+#: admin/sudo/generic.tpl:44 admin/sudo/sudo-list.xml:40
 msgid "Description"
 msgstr "Opis"
 
@@ -230,6 +239,42 @@ msgstr "Stacja robocza"
 msgid "Terminal"
 msgstr "Terminal"
 
+#: admin/sudo/sudo-list.xml:11
+#, fuzzy
+msgid "List of sudo roles"
+msgstr "Lista użytkowników"
+
+#: admin/sudo/sudo-list.xml:15 admin/sudo/sudo-list.xml:65
+msgid "Role"
+msgstr "Pełniona funkcja"
+
+#: admin/sudo/sudo-list.xml:48
+msgid "Actions"
+msgstr "Akcje"
+
+#: admin/sudo/sudo-list.xml:59
+msgid "Create"
+msgstr "Utwórz"
+
+#: admin/sudo/sudo-list.xml:72
+#, fuzzy
+msgid "Default"
+msgstr "Usuń"
+
+#: admin/sudo/sudo-list.xml:85
+msgid "Remove"
+msgstr "Usuń"
+
+#: admin/sudo/sudo-list.xml:117
+#, fuzzy
+msgid "Edit sudo role"
+msgstr "! nieznane id"
+
+#: admin/sudo/sudo-list.xml:130
+#, fuzzy
+msgid "Remove sudo role"
+msgstr "! nieznane id"
+
 #: admin/sudo/class_target_list_users.inc:47
 #, fuzzy
 msgid "Select the target objects"
@@ -264,11 +309,6 @@ msgstr "Pokaż grupy samba"
 msgid "Apply"
 msgstr "Zastosuj"
 
-#: admin/sudo/main.inc:50 admin/sudo/main.inc:54
-#, fuzzy
-msgid "Sudo role administration"
-msgstr "Administracja Grupą"
-
 #: admin/sudo/class_sudoOption.inc:154
 #, fuzzy
 msgid "Unknown option"
@@ -324,80 +364,58 @@ msgstr "Wyświetl systemy pasujące"
 msgid "Regular expression for matching addresses"
 msgstr "Wyrażenie regularne dla dopasowania adresów"
 
-#: admin/sudo/class_divListSudo.inc:51 admin/sudo/class_divListSudo.inc:52
+#: admin/sudo/class_sudoManagement.inc:26
 #, fuzzy
-msgid "List of sudo roles"
-msgstr "Lista użytkowników"
+msgid "Sudo management"
+msgstr "Zarządzanie systemem"
 
-#: admin/sudo/class_divListSudo.inc:72
 #, fuzzy
-msgid "Select all"
-msgstr "Wybierz"
-
-#: admin/sudo/class_divListSudo.inc:78
-msgid "Department"
-msgstr "Departament"
+#~ msgid "If you're sure, press 'Delete' to continue or 'Cancel' to abort."
+#~ msgstr ""
+#~ "Jeśli jesteś pewien - naciśnij 'Usuń' aby kontynuować lub 'Anuluj' aby "
+#~ "anulować."
 
-#: admin/sudo/class_divListSudo.inc:79 admin/sudo/class_divListSudo.inc:105
-msgid "Actions"
-msgstr "Akcje"
-
-#: admin/sudo/class_divListSudo.inc:83
 #, fuzzy
-msgid "Regular expression for matching role names"
-msgstr "Wyrażenie regularne dla dopasowania nazw grup"
+#~ msgid "Sudo role administration"
+#~ msgstr "Administracja Grupą"
 
-#: admin/sudo/class_divListSudo.inc:85
 #, fuzzy
-msgid "Regular expression for matching role member names"
-msgstr "Wyrażenie regularne dla dopasowania nazw obiektów"
+#~ msgid "Select all"
+#~ msgstr "Wybierz"
 
-#: admin/sudo/class_divListSudo.inc:107
-msgid "Create"
-msgstr "Utwórz"
-
-#: admin/sudo/class_divListSudo.inc:111
-msgid "Role"
-msgstr "Pełniona funkcja"
+#~ msgid "Department"
+#~ msgstr "Departament"
 
-#: admin/sudo/class_divListSudo.inc:112
 #, fuzzy
-msgid "Default"
-msgstr "Usuń"
+#~ msgid "Regular expression for matching role names"
+#~ msgstr "Wyrażenie regularne dla dopasowania nazw grup"
 
-#: admin/sudo/class_divListSudo.inc:119
-msgid "Remove"
-msgstr "Usuń"
+#, fuzzy
+#~ msgid "Regular expression for matching role member names"
+#~ msgstr "Wyrażenie regularne dla dopasowania nazw obiektów"
 
-#: admin/sudo/class_divListSudo.inc:171
-msgid "Edit this entry"
-msgstr "Edytuj ten obiekt"
+#~ msgid "Edit this entry"
+#~ msgstr "Edytuj ten obiekt"
 
-#: admin/sudo/class_divListSudo.inc:178
-msgid "Delete this entry"
-msgstr "Usuń ten obiekt"
+#~ msgid "Delete this entry"
+#~ msgstr "Usuń ten obiekt"
 
-#: admin/sudo/class_divListSudo.inc:220
 #, fuzzy
-msgid "Number of listed roles"
-msgstr "Nazwa grupy"
+#~ msgid "Number of listed roles"
+#~ msgstr "Nazwa grupy"
 
-#: admin/sudo/class_sudoManagement.inc:31
 #, fuzzy
-msgid "Sudo roles"
-msgstr "! nieznane id"
+#~ msgid "Sudo roles"
+#~ msgstr "! nieznane id"
 
-#: admin/sudo/class_sudoManagement.inc:32
 #, fuzzy
-msgid "Manage sudo roles"
-msgstr "Użytkownicy domeny"
+#~ msgid "Manage sudo roles"
+#~ msgstr "Użytkownicy domeny"
 
-#: admin/sudo/class_sudoManagement.inc:247
 #, fuzzy
-msgid "Permission"
-msgstr "Uprawnienia"
+#~ msgid "Permission"
+#~ msgstr "Uprawnienia"
 
-#: admin/sudo/class_sudoManagement.inc:295
 #, fuzzy
-msgid "Permission error"
-msgstr "Uprawnienia"
+#~ msgid "Permission error"
+#~ msgstr "Uprawnienia"
diff --git a/gosa-plugins/sudo/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/sudo/locale/ru/LC_MESSAGES/messages.po
index 3d74c44f8..3db410d55 100644
--- a/gosa-plugins/sudo/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/sudo/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -14,13 +14,39 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: poEdit 1.3.1\n"
 
+#: admin/sudo/sudo-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Фильтры"
+
+#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:547
+#: admin/sudo/class_sudoGeneric.inc:552 admin/sudo/class_sudoGeneric.inc:557
+#: admin/sudo/class_sudoGeneric.inc:566 admin/sudo/class_sudoGeneric.inc:669
+#: admin/sudo/generic.tpl:7 admin/sudo/generic.tpl:34
+#: admin/sudo/sudo-list.xml:32 admin/sudo/paste_generic.tpl:5
+msgid "Name"
+msgstr "Фамилия"
+
+#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:384
+#: admin/sudo/class_target_list_users.inc:177
+msgid "User"
+msgstr "Пользователь"
+
 #: admin/sudo/remove.tpl:2
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: admin/sudo/remove.tpl:9
+#: admin/sudo/remove.tpl:6
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+"Подумайте еще раз, действительно ли вам нужно удаление, так как GOsa не "
+"сможет восстановить эти данные."
+
+#: admin/sudo/remove.tpl:10
 #, fuzzy
-msgid "If you're sure, press 'Delete' to continue or 'Cancel' to abort."
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 "Если вы уверены в своих действиях, нажмите на кнопку <i>Удалить</i>, иначе "
 "нажмите <i>Отмена</i>."
@@ -41,11 +67,6 @@ msgstr "полный доступ"
 msgid "allow access to these hosts"
 msgstr "разрешить доступ только на эти хосты"
 
-#: admin/sudo/class_sudoGeneric.inc:384
-#: admin/sudo/class_target_list_users.inc:177
-msgid "User"
-msgstr "Пользователь"
-
 #: admin/sudo/class_sudoGeneric.inc:385
 #: admin/sudo/class_target_list_users.inc:178
 msgid "Group"
@@ -56,27 +77,18 @@ msgstr "Группа"
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
 
-#: admin/sudo/class_sudoGeneric.inc:547 admin/sudo/class_sudoGeneric.inc:552
-#: admin/sudo/class_sudoGeneric.inc:557 admin/sudo/class_sudoGeneric.inc:566
-#: admin/sudo/class_sudoGeneric.inc:669 admin/sudo/generic.tpl:7
-#: admin/sudo/generic.tpl:34 admin/sudo/paste_generic.tpl:5
-#: admin/sudo/class_divListSudo.inc:78
-msgid "Name"
-msgstr "Фамилия"
-
-#: admin/sudo/class_sudoGeneric.inc:660
+#: admin/sudo/class_sudoGeneric.inc:660 admin/sudo/class_sudoManagement.inc:25
 #, fuzzy
 msgid "Sudo"
 msgstr "Имя сервера"
 
 #: admin/sudo/class_sudoGeneric.inc:661 admin/sudo/class_sudoGeneric.inc:666
-#: admin/sudo/class_sudoManagement.inc:262
 #, fuzzy
 msgid "Sudo role"
 msgstr "состояние неизвестно"
 
 #: admin/sudo/class_sudoGeneric.inc:670 admin/sudo/generic.tpl:15
-#: admin/sudo/generic.tpl:44
+#: admin/sudo/generic.tpl:44 admin/sudo/sudo-list.xml:40
 msgid "Description"
 msgstr "Описание"
 
@@ -231,6 +243,42 @@ msgstr "Рабочая станция"
 msgid "Terminal"
 msgstr "Терминалы"
 
+#: admin/sudo/sudo-list.xml:11
+#, fuzzy
+msgid "List of sudo roles"
+msgstr "Список пользователей"
+
+#: admin/sudo/sudo-list.xml:15 admin/sudo/sudo-list.xml:65
+msgid "Role"
+msgstr "Роль"
+
+#: admin/sudo/sudo-list.xml:48
+msgid "Actions"
+msgstr "Действия"
+
+#: admin/sudo/sudo-list.xml:59
+msgid "Create"
+msgstr "Создать"
+
+#: admin/sudo/sudo-list.xml:72
+#, fuzzy
+msgid "Default"
+msgstr "Удалить"
+
+#: admin/sudo/sudo-list.xml:85
+msgid "Remove"
+msgstr "Удалить"
+
+#: admin/sudo/sudo-list.xml:117
+#, fuzzy
+msgid "Edit sudo role"
+msgstr "состояние неизвестно"
+
+#: admin/sudo/sudo-list.xml:130
+#, fuzzy
+msgid "Remove sudo role"
+msgstr "состояние неизвестно"
+
 #: admin/sudo/class_target_list_users.inc:47
 #, fuzzy
 msgid "Select the target objects"
@@ -266,11 +314,6 @@ msgstr "Показать группы samba"
 msgid "Apply"
 msgstr "Применить"
 
-#: admin/sudo/main.inc:50 admin/sudo/main.inc:54
-#, fuzzy
-msgid "Sudo role administration"
-msgstr "Управление группами"
-
 #: admin/sudo/class_sudoOption.inc:154
 #, fuzzy
 msgid "Unknown option"
@@ -326,82 +369,60 @@ msgstr "Показать подходяшие системы"
 msgid "Regular expression for matching addresses"
 msgstr "Регулярное выражение для поиска адреса"
 
-#: admin/sudo/class_divListSudo.inc:51 admin/sudo/class_divListSudo.inc:52
+#: admin/sudo/class_sudoManagement.inc:26
 #, fuzzy
-msgid "List of sudo roles"
-msgstr "Список пользователей"
+msgid "Sudo management"
+msgstr "Управление системами"
 
-#: admin/sudo/class_divListSudo.inc:72
 #, fuzzy
-msgid "Select all"
-msgstr "Удалить"
-
-#: admin/sudo/class_divListSudo.inc:78
-msgid "Department"
-msgstr "Подразделение"
+#~ msgid "If you're sure, press 'Delete' to continue or 'Cancel' to abort."
+#~ msgstr ""
+#~ "Если вы уверены в своих действиях, нажмите на кнопку <i>Удалить</i>, "
+#~ "иначе нажмите <i>Отмена</i>."
 
-#: admin/sudo/class_divListSudo.inc:79 admin/sudo/class_divListSudo.inc:105
-msgid "Actions"
-msgstr "Действия"
-
-#: admin/sudo/class_divListSudo.inc:83
 #, fuzzy
-msgid "Regular expression for matching role names"
-msgstr "Регулярное выражение, соответствующее именам групп"
+#~ msgid "Sudo role administration"
+#~ msgstr "Управление группами"
 
-#: admin/sudo/class_divListSudo.inc:85
 #, fuzzy
-msgid "Regular expression for matching role member names"
-msgstr "Регулярное выражение, соответствующее именам объектов"
+#~ msgid "Select all"
+#~ msgstr "Удалить"
 
-#: admin/sudo/class_divListSudo.inc:107
-msgid "Create"
-msgstr "Создать"
-
-#: admin/sudo/class_divListSudo.inc:111
-msgid "Role"
-msgstr "Роль"
+#~ msgid "Department"
+#~ msgstr "Подразделение"
 
-#: admin/sudo/class_divListSudo.inc:112
 #, fuzzy
-msgid "Default"
-msgstr "Удалить"
+#~ msgid "Regular expression for matching role names"
+#~ msgstr "Регулярное выражение, соответствующее именам групп"
 
-#: admin/sudo/class_divListSudo.inc:119
-msgid "Remove"
-msgstr "Удалить"
+#, fuzzy
+#~ msgid "Regular expression for matching role member names"
+#~ msgstr "Регулярное выражение, соответствующее именам объектов"
 
-#: admin/sudo/class_divListSudo.inc:171
 #, fuzzy
-msgid "Edit this entry"
-msgstr "Редактиовать объект"
+#~ msgid "Edit this entry"
+#~ msgstr "Редактиовать объект"
 
-#: admin/sudo/class_divListSudo.inc:178
 #, fuzzy
-msgid "Delete this entry"
-msgstr "Удалить"
+#~ msgid "Delete this entry"
+#~ msgstr "Удалить"
 
-#: admin/sudo/class_divListSudo.inc:220
 #, fuzzy
-msgid "Number of listed roles"
-msgstr "Название группы"
+#~ msgid "Number of listed roles"
+#~ msgstr "Название группы"
 
-#: admin/sudo/class_sudoManagement.inc:31
 #, fuzzy
-msgid "Sudo roles"
-msgstr "состояние неизвестно"
+#~ msgid "Sudo roles"
+#~ msgstr "состояние неизвестно"
 
-#: admin/sudo/class_sudoManagement.inc:32
 #, fuzzy
-msgid "Manage sudo roles"
-msgstr "Пользователи домена"
+#~ msgid "Manage sudo roles"
+#~ msgstr "Пользователи домена"
 
-#: admin/sudo/class_sudoManagement.inc:247
 #, fuzzy
-msgid "Permission"
-msgstr "Права для членов группы"
+#~ msgid "Permission"
+#~ msgstr "Права для членов группы"
 
-#: admin/sudo/class_sudoManagement.inc:295
 #, fuzzy
-msgid "Permission error"
-msgstr "Права для членов группы"
+#~ msgid "Permission error"
+#~ msgstr "Права для членов группы"
diff --git a/gosa-plugins/sudo/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/sudo/locale/zh/LC_MESSAGES/messages.po
index b862fd0ec..6913352d1 100644
--- a/gosa-plugins/sudo/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/sudo/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -16,13 +16,36 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: admin/sudo/sudo-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "过滤器"
+
+#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:547
+#: admin/sudo/class_sudoGeneric.inc:552 admin/sudo/class_sudoGeneric.inc:557
+#: admin/sudo/class_sudoGeneric.inc:566 admin/sudo/class_sudoGeneric.inc:669
+#: admin/sudo/generic.tpl:7 admin/sudo/generic.tpl:34
+#: admin/sudo/sudo-list.xml:32 admin/sudo/paste_generic.tpl:5
+msgid "Name"
+msgstr "名称"
+
+#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:384
+#: admin/sudo/class_target_list_users.inc:177
+msgid "User"
+msgstr "用户"
+
 #: admin/sudo/remove.tpl:2
 msgid "Warning"
 msgstr "警告"
 
-#: admin/sudo/remove.tpl:9
-#, fuzzy
-msgid "If you're sure, press 'Delete' to continue or 'Cancel' to abort."
+#: admin/sudo/remove.tpl:6
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr "请再次检查您是否要这么做，因为 GOsa 没有办法将您的数据找回。"
+
+#: admin/sudo/remove.tpl:10
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "所以，如果您确定，请按“删除”继续，否则按“取消”退出。"
 
 #: admin/sudo/class_sudoGeneric.inc:295
@@ -41,11 +64,6 @@ msgstr "完全访问权限"
 msgid "allow access to these hosts"
 msgstr "允许访问这些主机"
 
-#: admin/sudo/class_sudoGeneric.inc:384
-#: admin/sudo/class_target_list_users.inc:177
-msgid "User"
-msgstr "用户"
-
 #: admin/sudo/class_sudoGeneric.inc:385
 #: admin/sudo/class_target_list_users.inc:178
 msgid "Group"
@@ -56,27 +74,18 @@ msgstr "组"
 msgid "LDAP error"
 msgstr "LDAP 错误:"
 
-#: admin/sudo/class_sudoGeneric.inc:547 admin/sudo/class_sudoGeneric.inc:552
-#: admin/sudo/class_sudoGeneric.inc:557 admin/sudo/class_sudoGeneric.inc:566
-#: admin/sudo/class_sudoGeneric.inc:669 admin/sudo/generic.tpl:7
-#: admin/sudo/generic.tpl:34 admin/sudo/paste_generic.tpl:5
-#: admin/sudo/class_divListSudo.inc:78
-msgid "Name"
-msgstr "名称"
-
-#: admin/sudo/class_sudoGeneric.inc:660
+#: admin/sudo/class_sudoGeneric.inc:660 admin/sudo/class_sudoManagement.inc:25
 #, fuzzy
 msgid "Sudo"
 msgstr "姓"
 
 #: admin/sudo/class_sudoGeneric.inc:661 admin/sudo/class_sudoGeneric.inc:666
-#: admin/sudo/class_sudoManagement.inc:262
 #, fuzzy
 msgid "Sudo role"
 msgstr "! 未知 id"
 
 #: admin/sudo/class_sudoGeneric.inc:670 admin/sudo/generic.tpl:15
-#: admin/sudo/generic.tpl:44
+#: admin/sudo/generic.tpl:44 admin/sudo/sudo-list.xml:40
 msgid "Description"
 msgstr "描述"
 
@@ -230,6 +239,42 @@ msgstr "工作站"
 msgid "Terminal"
 msgstr "终端"
 
+#: admin/sudo/sudo-list.xml:11
+#, fuzzy
+msgid "List of sudo roles"
+msgstr "用户列表"
+
+#: admin/sudo/sudo-list.xml:15 admin/sudo/sudo-list.xml:65
+msgid "Role"
+msgstr "角色"
+
+#: admin/sudo/sudo-list.xml:48
+msgid "Actions"
+msgstr "动作"
+
+#: admin/sudo/sudo-list.xml:59
+msgid "Create"
+msgstr "创建"
+
+#: admin/sudo/sudo-list.xml:72
+#, fuzzy
+msgid "Default"
+msgstr "删除"
+
+#: admin/sudo/sudo-list.xml:85
+msgid "Remove"
+msgstr "删除"
+
+#: admin/sudo/sudo-list.xml:117
+#, fuzzy
+msgid "Edit sudo role"
+msgstr "! 未知 id"
+
+#: admin/sudo/sudo-list.xml:130
+#, fuzzy
+msgid "Remove sudo role"
+msgstr "! 未知 id"
+
 #: admin/sudo/class_target_list_users.inc:47
 #, fuzzy
 msgid "Select the target objects"
@@ -264,11 +309,6 @@ msgstr "显示 samba 用户组"
 msgid "Apply"
 msgstr "应用"
 
-#: admin/sudo/main.inc:50 admin/sudo/main.inc:54
-#, fuzzy
-msgid "Sudo role administration"
-msgstr "组管理"
-
 #: admin/sudo/class_sudoOption.inc:154
 #, fuzzy
 msgid "Unknown option"
@@ -324,80 +364,56 @@ msgstr "显示匹配的系统"
 msgid "Regular expression for matching addresses"
 msgstr "匹配地址的正则表达式"
 
-#: admin/sudo/class_divListSudo.inc:51 admin/sudo/class_divListSudo.inc:52
+#: admin/sudo/class_sudoManagement.inc:26
 #, fuzzy
-msgid "List of sudo roles"
-msgstr "用户列表"
+msgid "Sudo management"
+msgstr "系统管理"
 
-#: admin/sudo/class_divListSudo.inc:72
 #, fuzzy
-msgid "Select all"
-msgstr "选择"
-
-#: admin/sudo/class_divListSudo.inc:78
-msgid "Department"
-msgstr "部门"
+#~ msgid "If you're sure, press 'Delete' to continue or 'Cancel' to abort."
+#~ msgstr "所以，如果您确定，请按“删除”继续，否则按“取消”退出。"
 
-#: admin/sudo/class_divListSudo.inc:79 admin/sudo/class_divListSudo.inc:105
-msgid "Actions"
-msgstr "动作"
-
-#: admin/sudo/class_divListSudo.inc:83
 #, fuzzy
-msgid "Regular expression for matching role names"
-msgstr "用于匹配组名的正则表达式"
+#~ msgid "Sudo role administration"
+#~ msgstr "组管理"
 
-#: admin/sudo/class_divListSudo.inc:85
 #, fuzzy
-msgid "Regular expression for matching role member names"
-msgstr "匹配对象名的正则表达式"
+#~ msgid "Select all"
+#~ msgstr "选择"
 
-#: admin/sudo/class_divListSudo.inc:107
-msgid "Create"
-msgstr "创建"
-
-#: admin/sudo/class_divListSudo.inc:111
-msgid "Role"
-msgstr "角色"
+#~ msgid "Department"
+#~ msgstr "部门"
 
-#: admin/sudo/class_divListSudo.inc:112
 #, fuzzy
-msgid "Default"
-msgstr "删除"
+#~ msgid "Regular expression for matching role names"
+#~ msgstr "用于匹配组名的正则表达式"
 
-#: admin/sudo/class_divListSudo.inc:119
-msgid "Remove"
-msgstr "删除"
+#, fuzzy
+#~ msgid "Regular expression for matching role member names"
+#~ msgstr "匹配对象名的正则表达式"
 
-#: admin/sudo/class_divListSudo.inc:171
-msgid "Edit this entry"
-msgstr "编辑这条记录"
+#~ msgid "Edit this entry"
+#~ msgstr "编辑这条记录"
 
-#: admin/sudo/class_divListSudo.inc:178
-msgid "Delete this entry"
-msgstr "删除这个条目"
+#~ msgid "Delete this entry"
+#~ msgstr "删除这个条目"
 
-#: admin/sudo/class_divListSudo.inc:220
 #, fuzzy
-msgid "Number of listed roles"
-msgstr "组名称"
+#~ msgid "Number of listed roles"
+#~ msgstr "组名称"
 
-#: admin/sudo/class_sudoManagement.inc:31
 #, fuzzy
-msgid "Sudo roles"
-msgstr "! 未知 id"
+#~ msgid "Sudo roles"
+#~ msgstr "! 未知 id"
 
-#: admin/sudo/class_sudoManagement.inc:32
 #, fuzzy
-msgid "Manage sudo roles"
-msgstr "域用户"
+#~ msgid "Manage sudo roles"
+#~ msgstr "域用户"
 
-#: admin/sudo/class_sudoManagement.inc:247
 #, fuzzy
-msgid "Permission"
-msgstr "允许"
+#~ msgid "Permission"
+#~ msgstr "允许"
 
-#: admin/sudo/class_sudoManagement.inc:295
 #, fuzzy
-msgid "Permission error"
-msgstr "允许"
+#~ msgid "Permission error"
+#~ msgstr "允许"
diff --git a/gosa-plugins/systems/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/systems/locale/de/LC_MESSAGES/messages.po
index 273b33b2d..327137f20 100644
--- a/gosa-plugins/systems/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/systems/locale/de/LC_MESSAGES/messages.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2008-12-19 08:43+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
@@ -77,16 +77,16 @@ msgstr ""
 "existieren."
 
 #: admin/systems/class_systemManagement.inc:369
-#: admin/systems/class_systemManagement.inc:489
-#: admin/systems/class_systemManagement.inc:526
-#: admin/systems/class_systemManagement.inc:534
-#: admin/systems/class_systemManagement.inc:584
-#: admin/systems/class_systemManagement.inc:592
-#: admin/systems/class_systemManagement.inc:607
-#: admin/systems/class_systemManagement.inc:615
-#: admin/systems/class_systemManagement.inc:654
-#: admin/systems/class_systemManagement.inc:748
-#: admin/systems/class_systemManagement.inc:1313
+#: admin/systems/class_systemManagement.inc:486
+#: admin/systems/class_systemManagement.inc:523
+#: admin/systems/class_systemManagement.inc:531
+#: admin/systems/class_systemManagement.inc:581
+#: admin/systems/class_systemManagement.inc:589
+#: admin/systems/class_systemManagement.inc:604
+#: admin/systems/class_systemManagement.inc:612
+#: admin/systems/class_systemManagement.inc:651
+#: admin/systems/class_systemManagement.inc:745
+#: admin/systems/class_systemManagement.inc:1306
 #: admin/systems/class_serverService.inc:186
 #: admin/systems/class_serverService.inc:236
 #: admin/systems/class_serverService.inc:363
@@ -128,16 +128,16 @@ msgstr "Interner Fehler"
 msgid "Cannot set mode to 'active'!"
 msgstr "Kann Modus nicht auf 'aktiv' setzen!"
 
-#: admin/systems/class_systemManagement.inc:615
+#: admin/systems/class_systemManagement.inc:612
 #: admin/systems/.svn/tmp/tempfile.tmp:606
 #: admin/systems/.svn/tmp/tempfile.2.tmp:610
 msgid "Editing this type of object is not supported yet!"
 msgstr ""
 "Bearbeiten von Objekten dieses Typs wird momentan noch nicht unterstützt!"
 
-#: admin/systems/class_systemManagement.inc:642
-#: admin/systems/class_systemManagement.inc:745
-#: admin/systems/class_systemManagement.inc:974
+#: admin/systems/class_systemManagement.inc:639
+#: admin/systems/class_systemManagement.inc:742
+#: admin/systems/class_systemManagement.inc:971
 #: admin/systems/.svn/tmp/tempfile.tmp:633
 #: admin/systems/.svn/tmp/tempfile.tmp:736
 #: admin/systems/.svn/tmp/tempfile.tmp:965
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Permission error"
 msgstr "Berechtigungsfehler"
 
-#: admin/systems/class_systemManagement.inc:642
-#: admin/systems/class_systemManagement.inc:745
+#: admin/systems/class_systemManagement.inc:639
+#: admin/systems/class_systemManagement.inc:742
 #: admin/systems/.svn/tmp/tempfile.tmp:633
 #: admin/systems/.svn/tmp/tempfile.tmp:736
 #: admin/systems/.svn/tmp/tempfile.2.tmp:637
@@ -156,7 +156,7 @@ msgstr "Berechtigungsfehler"
 msgid "You have no permission to change this password!"
 msgstr "Sie haben keine Berechtigung, um das Passwort zu ändern!"
 
-#: admin/systems/class_systemManagement.inc:654
+#: admin/systems/class_systemManagement.inc:651
 #: admin/systems/.svn/tmp/tempfile.tmp:645
 #: admin/systems/.svn/tmp/tempfile.2.tmp:649
 msgid ""
@@ -166,21 +166,21 @@ msgstr ""
 "Die Passworte, die Sie als 'Neues Passwort' und 'Wiederholung des neuen "
 "Passworts' eingegeben haben sind nicht identisch!"
 
-#: admin/systems/class_systemManagement.inc:729
+#: admin/systems/class_systemManagement.inc:726
 #: admin/systems/.svn/tmp/tempfile.tmp:720
 #: admin/systems/.svn/tmp/tempfile.2.tmp:724
 msgid "Password method"
 msgstr "Passwort-Methode"
 
-#: admin/systems/class_systemManagement.inc:729
+#: admin/systems/class_systemManagement.inc:726
 #: admin/systems/.svn/tmp/tempfile.tmp:720
 #: admin/systems/.svn/tmp/tempfile.2.tmp:724
 msgid "Password method crypt is missing. Cannot set system password."
 msgstr ""
 "Die Password-Methode CRYPT fehlt. Kann das System-Passwort nicht setzen."
 
-#: admin/systems/class_systemManagement.inc:735
-#: admin/systems/class_systemManagement.inc:1846
+#: admin/systems/class_systemManagement.inc:732
+#: admin/systems/class_systemManagement.inc:1841
 #: admin/systems/services/class_goService.inc:122
 #: admin/systems/services/class_goService.inc:150
 #: admin/systems/services/class_goService.inc:183
@@ -188,38 +188,38 @@ msgstr ""
 #: admin/systems/.svn/tmp/tempfile.tmp:1833
 #: admin/systems/.svn/tmp/tempfile.2.tmp:730
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1837
-#: admin/systems/class_servGeneric.inc:281
-#: admin/systems/class_servGeneric.inc:433 admin/systems/class_termDNS.inc:488
+#: admin/systems/class_servGeneric.inc:283
+#: admin/systems/class_servGeneric.inc:435 admin/systems/class_termDNS.inc:488
 #: admin/systems/class_termDNS.inc:794 admin/systems/class_termDNS.inc:813
 #: admin/systems/class_termDNS.inc:834 admin/systems/class_termDNS.inc:839
-#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:929
+#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:933
 #: admin/systems/class_componentGeneric.inc:160
 #: admin/systems/class_componentGeneric.inc:301
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: admin/systems/class_systemManagement.inc:748
+#: admin/systems/class_systemManagement.inc:745
 #: admin/systems/.svn/tmp/tempfile.tmp:739
 #: admin/systems/.svn/tmp/tempfile.2.tmp:743
 msgid "Cannot determine object to change password!"
 msgstr "Kann Objekt nicht erkennen, um das Passwort zu ändern."
 
-#: admin/systems/class_systemManagement.inc:855
+#: admin/systems/class_systemManagement.inc:852
 #: admin/systems/.svn/tmp/tempfile.tmp:846
 #: admin/systems/.svn/tmp/tempfile.2.tmp:850
-#: admin/systems/class_servGeneric.inc:165
-#: admin/systems/class_servGeneric.inc:453
+#: admin/systems/class_servGeneric.inc:167
+#: admin/systems/class_servGeneric.inc:455
 msgid "Service infrastructure"
 msgstr "Dienst-Infrastruktur"
 
-#: admin/systems/class_systemManagement.inc:900
+#: admin/systems/class_systemManagement.inc:897
 #: admin/systems/.svn/tmp/tempfile.tmp:891
 #: admin/systems/.svn/tmp/tempfile.2.tmp:895
 msgid "Permission"
 msgstr "Berechtigung"
 
-#: admin/systems/class_systemManagement.inc:1342
-#: admin/systems/class_systemManagement.inc:1657
+#: admin/systems/class_systemManagement.inc:1335
+#: admin/systems/class_systemManagement.inc:1652
 #: admin/systems/.svn/tmp/tempfile.tmp:1330
 #: admin/systems/.svn/tmp/tempfile.tmp:1644
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1334
@@ -227,8 +227,8 @@ msgstr "Berechtigung"
 msgid "New terminal"
 msgstr "Neues Terminal"
 
-#: admin/systems/class_systemManagement.inc:1344
-#: admin/systems/class_systemManagement.inc:1658
+#: admin/systems/class_systemManagement.inc:1337
+#: admin/systems/class_systemManagement.inc:1653
 #: admin/systems/.svn/tmp/tempfile.tmp:1332
 #: admin/systems/.svn/tmp/tempfile.tmp:1645
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1336
@@ -236,148 +236,148 @@ msgstr "Neues Terminal"
 msgid "New workstation"
 msgstr "Neue Arbeitsstation"
 
-#: admin/systems/class_systemManagement.inc:1346
+#: admin/systems/class_systemManagement.inc:1339
 #: admin/systems/.svn/tmp/tempfile.tmp:1334
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1338
 msgid "Unknown device"
 msgstr "Unbekanntes Gerät"
 
-#: admin/systems/class_systemManagement.inc:1348
+#: admin/systems/class_systemManagement.inc:1341
 #: admin/systems/.svn/tmp/tempfile.tmp:1336
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1340
 msgid "New Device"
 msgstr "Neues Gerät"
 
-#: admin/systems/class_systemManagement.inc:1373
+#: admin/systems/class_systemManagement.inc:1366
 #: admin/systems/.svn/tmp/tempfile.tmp:1361
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1365
 msgid "Terminal template for"
 msgstr "Terminal-Vorlage für"
 
-#: admin/systems/class_systemManagement.inc:1389
+#: admin/systems/class_systemManagement.inc:1382
 #: admin/systems/.svn/tmp/tempfile.tmp:1377
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1381
 msgid "Workstation template for"
 msgstr "Arbeitsstations-Vorlage für"
 
-#: admin/systems/class_systemManagement.inc:1634
+#: admin/systems/class_systemManagement.inc:1629
 #: admin/systems/.svn/tmp/tempfile.tmp:1621
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1625
 msgid "Template"
 msgstr "Vorlage"
 
-#: admin/systems/class_systemManagement.inc:1635
+#: admin/systems/class_systemManagement.inc:1630
 #: admin/systems/class_divListSystem.inc:199
 #: admin/systems/.svn/tmp/tempfile.tmp:1622
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1626
 msgid "Phone"
 msgstr "Telefon"
 
-#: admin/systems/class_systemManagement.inc:1636
+#: admin/systems/class_systemManagement.inc:1631
 #: admin/systems/.svn/tmp/tempfile.tmp:1623
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1627
 #: admin/systems/class_componentGeneric.inc:315
 msgid "Network device"
 msgstr "Netzwerk-Gerät"
 
-#: admin/systems/class_systemManagement.inc:1637
+#: admin/systems/class_systemManagement.inc:1632
 #: admin/systems/class_divListSystem.inc:203
 #: admin/systems/.svn/tmp/tempfile.tmp:1624
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1628
 msgid "Printer"
 msgstr "Drucker"
 
-#: admin/systems/class_systemManagement.inc:1639
+#: admin/systems/class_systemManagement.inc:1634
 #: admin/systems/.svn/tmp/tempfile.tmp:1626
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1630
 msgid "Windows workstation"
 msgstr "Windows-Arbeitsstation"
 
-#: admin/systems/class_systemManagement.inc:1641
+#: admin/systems/class_systemManagement.inc:1636
 #: admin/systems/class_divListSystem.inc:191
 #: admin/systems/.svn/tmp/tempfile.tmp:1628
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1632
 msgid "Workstation"
 msgstr "Arbeitsstation"
 
-#: admin/systems/class_systemManagement.inc:1642
+#: admin/systems/class_systemManagement.inc:1637
 #: admin/systems/class_divListSystem.inc:195
 #: admin/systems/.svn/tmp/tempfile.tmp:1629
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1633
-#: admin/systems/class_servGeneric.inc:509
+#: admin/systems/class_servGeneric.inc:511
 msgid "Server"
 msgstr "Server"
 
-#: admin/systems/class_systemManagement.inc:1643
+#: admin/systems/class_systemManagement.inc:1638
 #: admin/systems/class_divListSystem.inc:187
 #: admin/systems/.svn/tmp/tempfile.tmp:1630
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1634
 msgid "Terminal"
 msgstr "Terminal"
 
-#: admin/systems/class_systemManagement.inc:1645
+#: admin/systems/class_systemManagement.inc:1640
 #: admin/systems/.svn/tmp/tempfile.tmp:1632
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1636
 msgid "Locked workstation"
 msgstr "Gesperrte Arbeitsstation"
 
-#: admin/systems/class_systemManagement.inc:1646
+#: admin/systems/class_systemManagement.inc:1641
 #: admin/systems/.svn/tmp/tempfile.tmp:1633
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1637
 msgid "Locked server"
 msgstr "Gesperrter Server"
 
-#: admin/systems/class_systemManagement.inc:1647
+#: admin/systems/class_systemManagement.inc:1642
 #: admin/systems/.svn/tmp/tempfile.tmp:1634
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1638
 msgid "Locked terminal"
 msgstr "Gesperrtes Terminal"
 
-#: admin/systems/class_systemManagement.inc:1649
+#: admin/systems/class_systemManagement.inc:1644
 #: admin/systems/.svn/tmp/tempfile.tmp:1636
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1640
 msgid "Workstation error"
 msgstr "Arbeitsstationsfehler"
 
-#: admin/systems/class_systemManagement.inc:1650
+#: admin/systems/class_systemManagement.inc:1645
 #: admin/systems/.svn/tmp/tempfile.tmp:1637
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1641
 msgid "Server error"
 msgstr "Serverfehler"
 
-#: admin/systems/class_systemManagement.inc:1651
+#: admin/systems/class_systemManagement.inc:1646
 #: admin/systems/.svn/tmp/tempfile.tmp:1638
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1642
 msgid "Terminal error"
 msgstr "Terminalfehler"
 
-#: admin/systems/class_systemManagement.inc:1653
+#: admin/systems/class_systemManagement.inc:1648
 #: admin/systems/.svn/tmp/tempfile.tmp:1640
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1644
 msgid "Workstation busy"
 msgstr "Arbeitsstation beschäftigt"
 
-#: admin/systems/class_systemManagement.inc:1654
+#: admin/systems/class_systemManagement.inc:1649
 #: admin/systems/.svn/tmp/tempfile.tmp:1641
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1645
 msgid "Server busy"
 msgstr "Server ist ausgelastet"
 
-#: admin/systems/class_systemManagement.inc:1656
+#: admin/systems/class_systemManagement.inc:1651
 #: admin/systems/.svn/tmp/tempfile.tmp:1643
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1647
 msgid "New system from incoming"
 msgstr "Neues Gerät aus 'incoming'"
 
-#: admin/systems/class_systemManagement.inc:1662
+#: admin/systems/class_systemManagement.inc:1657
 #: admin/systems/class_divListSystem.inc:214
 #: admin/systems/.svn/tmp/tempfile.tmp:1649
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1653
 msgid "Opsi client"
 msgstr "OPSI Client"
 
-#: admin/systems/class_systemManagement.inc:1862
-#: admin/systems/class_systemManagement.inc:1863
+#: admin/systems/class_systemManagement.inc:1857
+#: admin/systems/class_systemManagement.inc:1858
 #: admin/systems/.svn/tmp/tempfile.tmp:1849
 #: admin/systems/.svn/tmp/tempfile.tmp:1850
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1853
@@ -385,7 +385,7 @@ msgstr "OPSI Client"
 msgid "Incoming objects"
 msgstr "Eingehende Objekte"
 
-#: admin/systems/class_systemManagement.inc:1868
+#: admin/systems/class_systemManagement.inc:1863
 #: admin/systems/.svn/tmp/tempfile.tmp:1855
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1859
 msgid "Incoming"
@@ -532,7 +532,7 @@ msgid "Display systems of user"
 msgstr "Zeige Systeme des Benutzers"
 
 #: admin/systems/class_divListSystem.inc:176
-#: admin/systems/class_servGeneric.inc:514 admin/systems/server.tpl:22
+#: admin/systems/class_servGeneric.inc:516 admin/systems/server.tpl:22
 #: admin/systems/class_componentGeneric.inc:319 admin/systems/component.tpl:17
 msgid "Base"
 msgstr "Basis"
@@ -664,9 +664,9 @@ msgstr "Kann den Dienst-Status nicht setzen bis der Server gespeichert wurde."
 msgid "Cannot update service status!"
 msgstr "Kann Dienst-Status nicht aktualisieren!"
 
-#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:339
-#: admin/systems/class_servGeneric.inc:344
-#: admin/systems/class_servGeneric.inc:355 admin/systems/server.tpl:6
+#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:341
+#: admin/systems/class_servGeneric.inc:346
+#: admin/systems/class_servGeneric.inc:357 admin/systems/server.tpl:6
 msgid "Server name"
 msgstr "Server-Name"
 
@@ -701,7 +701,7 @@ msgstr ""
 "diese löschen oder verändern."
 
 #: admin/systems/class_divListSystemService.inc:50
-#: admin/systems/class_servGeneric.inc:512
+#: admin/systems/class_servGeneric.inc:514
 #: admin/systems/class_componentGeneric.inc:318
 msgid "Name"
 msgstr "Name"
@@ -857,103 +857,103 @@ msgstr "Neues Passwort (Wiederholung)"
 msgid "Password strength"
 msgstr "Passwort-Stärke"
 
-#: admin/systems/class_servGeneric.inc:86
+#: admin/systems/class_servGeneric.inc:82
 msgid "Activated"
 msgstr "Aktiv"
 
-#: admin/systems/class_servGeneric.inc:87
+#: admin/systems/class_servGeneric.inc:83
 msgid "Locked"
 msgstr "Gesperrt"
 
-#: admin/systems/class_servGeneric.inc:148
+#: admin/systems/class_servGeneric.inc:150
 msgid "server"
 msgstr "Server"
 
-#: admin/systems/class_servGeneric.inc:169
+#: admin/systems/class_servGeneric.inc:171
 msgid "Event error"
 msgstr "Ereignisfehler"
 
-#: admin/systems/class_servGeneric.inc:170
+#: admin/systems/class_servGeneric.inc:172
 #, php-format
 msgid "Event '%s' is not available!"
 msgstr "Das Ereignis '%s' ist nicht verfügbar!"
 
-#: admin/systems/class_servGeneric.inc:225
+#: admin/systems/class_servGeneric.inc:227
 msgid "Switch off"
 msgstr "Ausschalten"
 
-#: admin/systems/class_servGeneric.inc:225
+#: admin/systems/class_servGeneric.inc:227
 msgid "Reboot"
 msgstr "Neustarten"
 
-#: admin/systems/class_servGeneric.inc:226
-#: admin/systems/class_servGeneric.inc:235
+#: admin/systems/class_servGeneric.inc:228
+#: admin/systems/class_servGeneric.inc:237
 msgid "System update"
 msgstr "Systemaktualisierung"
 
-#: admin/systems/class_servGeneric.inc:227
-#: admin/systems/class_servGeneric.inc:234
+#: admin/systems/class_servGeneric.inc:229
+#: admin/systems/class_servGeneric.inc:236
 msgid "Reinstall"
 msgstr "Neu-Installation"
 
-#: admin/systems/class_servGeneric.inc:228
+#: admin/systems/class_servGeneric.inc:230
 msgid "Rescan hardware"
 msgstr "Hardware neu erkennen"
 
-#: admin/systems/class_servGeneric.inc:229
-#: admin/systems/class_servGeneric.inc:236
+#: admin/systems/class_servGeneric.inc:231
+#: admin/systems/class_servGeneric.inc:238
 msgid "Memory test"
 msgstr "Speichertest"
 
-#: admin/systems/class_servGeneric.inc:230
-#: admin/systems/class_servGeneric.inc:237
+#: admin/systems/class_servGeneric.inc:232
+#: admin/systems/class_servGeneric.inc:239
 msgid "Force localboot"
 msgstr "Erzwinge lokalen Systemstart"
 
-#: admin/systems/class_servGeneric.inc:231
-#: admin/systems/class_servGeneric.inc:238
+#: admin/systems/class_servGeneric.inc:233
+#: admin/systems/class_servGeneric.inc:240
 msgid "System analysis"
 msgstr "Systemanalyse"
 
-#: admin/systems/class_servGeneric.inc:233
+#: admin/systems/class_servGeneric.inc:235
 msgid "Wake up"
 msgstr "Aufwecken"
 
-#: admin/systems/class_servGeneric.inc:369
+#: admin/systems/class_servGeneric.inc:371
 msgid "Software deployment"
 msgstr "Softwareverteilung"
 
-#: admin/systems/class_servGeneric.inc:370
+#: admin/systems/class_servGeneric.inc:372
 msgid ""
 "This host is currently installing, if you really want to save it, press 'OK'."
 msgstr ""
 "Der Host ist gerade mitten in der Installation - wenn Sie dennoch speichern "
 "möchten, drücken Sie auf 'OK'."
 
-#: admin/systems/class_servGeneric.inc:503
+#: admin/systems/class_servGeneric.inc:505
 #: admin/systems/class_componentGeneric.inc:309
 msgid "Generic"
 msgstr "Allgemein"
 
-#: admin/systems/class_servGeneric.inc:504
+#: admin/systems/class_servGeneric.inc:506
 msgid "Server generic"
 msgstr "Server (Allgemein)"
 
-#: admin/systems/class_servGeneric.inc:513 admin/systems/server.tpl:14
+#: admin/systems/class_servGeneric.inc:515 admin/systems/server.tpl:14
 #: admin/systems/class_componentGeneric.inc:320 admin/systems/component.tpl:35
 msgid "Description"
 msgstr "Beschreibung"
 
-#: admin/systems/class_servGeneric.inc:516
+#: admin/systems/class_servGeneric.inc:518
 msgid "Goto mode"
 msgstr "GOto-Modus"
 
-#: admin/systems/class_servGeneric.inc:517
+#: admin/systems/class_servGeneric.inc:519
 #: admin/systems/class_componentGeneric.inc:321
 msgid "Root password"
 msgstr "Root-Passwort"
 
-#: admin/systems/class_servGeneric.inc:518
+#: admin/systems/class_servGeneric.inc:520
 msgid "Action flag"
 msgstr "Ablaufstatus"
 
@@ -1002,14 +1002,14 @@ msgid "IP address %s"
 msgstr "IP-Adresse %s"
 
 #: admin/systems/class_termDNS.inc:611 admin/systems/class_termDNS.inc:623
-#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1006
+#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1010
 #: admin/systems/class_componentGeneric.inc:219
 #: admin/systems/class_componentGeneric.inc:222
 msgid "IP address"
 msgstr "IP-Adresse"
 
 #: admin/systems/class_termDNS.inc:616 admin/systems/class_termDNS.inc:633
-#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1007
+#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1011
 msgid "MAC address"
 msgstr "MAC-Adresse"
 
@@ -1043,27 +1043,27 @@ msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr ""
 "Es sind nur Kleinbuchstaben in Datensätzen erlaubt, bitte prüfen Sie '%ss'."
 
-#: admin/systems/class_termDNS.inc:946 admin/systems/class_termDNS.inc:966
+#: admin/systems/class_termDNS.inc:950 admin/systems/class_termDNS.inc:970
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: admin/systems/class_termDNS.inc:960
+#: admin/systems/class_termDNS.inc:964
 msgid "Delete"
 msgstr "Entfernen"
 
-#: admin/systems/class_termDNS.inc:997
+#: admin/systems/class_termDNS.inc:1001
 msgid "DNS"
 msgstr "DNS"
 
-#: admin/systems/class_termDNS.inc:998
+#: admin/systems/class_termDNS.inc:1002
 msgid "DNS settings"
 msgstr "DNS-Einstellungen"
 
-#: admin/systems/class_termDNS.inc:1013
+#: admin/systems/class_termDNS.inc:1017
 msgid "DNS configuration"
 msgstr "DNS-Konfiguration"
 
-#: admin/systems/class_termDNS.inc:1016
+#: admin/systems/class_termDNS.inc:1020
 msgid "DHCP configuration"
 msgstr "DHCP-Konfiguration"
 
diff --git a/gosa-plugins/systems/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/systems/locale/es/LC_MESSAGES/messages.po
index dca0486c8..c2bdded13 100644
--- a/gosa-plugins/systems/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/systems/locale/es/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2008-12-08 22:59+0100\n"
 "Last-Translator: Alejandro Escanero Blanco <aescanero@gmail.com>\n"
 "Language-Team: spanish <es@li.org>\n"
@@ -74,16 +74,16 @@ msgstr ""
 "ISO."
 
 #: admin/systems/class_systemManagement.inc:369
-#: admin/systems/class_systemManagement.inc:489
-#: admin/systems/class_systemManagement.inc:526
-#: admin/systems/class_systemManagement.inc:534
-#: admin/systems/class_systemManagement.inc:584
-#: admin/systems/class_systemManagement.inc:592
-#: admin/systems/class_systemManagement.inc:607
-#: admin/systems/class_systemManagement.inc:615
-#: admin/systems/class_systemManagement.inc:654
-#: admin/systems/class_systemManagement.inc:748
-#: admin/systems/class_systemManagement.inc:1313
+#: admin/systems/class_systemManagement.inc:486
+#: admin/systems/class_systemManagement.inc:523
+#: admin/systems/class_systemManagement.inc:531
+#: admin/systems/class_systemManagement.inc:581
+#: admin/systems/class_systemManagement.inc:589
+#: admin/systems/class_systemManagement.inc:604
+#: admin/systems/class_systemManagement.inc:612
+#: admin/systems/class_systemManagement.inc:651
+#: admin/systems/class_systemManagement.inc:745
+#: admin/systems/class_systemManagement.inc:1306
 #: admin/systems/class_serverService.inc:186
 #: admin/systems/class_serverService.inc:236
 #: admin/systems/class_serverService.inc:363
@@ -125,15 +125,15 @@ msgstr "error interno"
 msgid "Cannot set mode to 'active'!"
 msgstr "¡No se puede poner el modo a 'activo'!"
 
-#: admin/systems/class_systemManagement.inc:615
+#: admin/systems/class_systemManagement.inc:612
 #: admin/systems/.svn/tmp/tempfile.tmp:606
 #: admin/systems/.svn/tmp/tempfile.2.tmp:610
 msgid "Editing this type of object is not supported yet!"
 msgstr "¡No está soportado editar este tipo de objeto todavía!"
 
-#: admin/systems/class_systemManagement.inc:642
-#: admin/systems/class_systemManagement.inc:745
-#: admin/systems/class_systemManagement.inc:974
+#: admin/systems/class_systemManagement.inc:639
+#: admin/systems/class_systemManagement.inc:742
+#: admin/systems/class_systemManagement.inc:971
 #: admin/systems/.svn/tmp/tempfile.tmp:633
 #: admin/systems/.svn/tmp/tempfile.tmp:736
 #: admin/systems/.svn/tmp/tempfile.tmp:965
@@ -143,8 +143,8 @@ msgstr "¡No está soportado editar este tipo de objeto todavía!"
 msgid "Permission error"
 msgstr "Error de permisos"
 
-#: admin/systems/class_systemManagement.inc:642
-#: admin/systems/class_systemManagement.inc:745
+#: admin/systems/class_systemManagement.inc:639
+#: admin/systems/class_systemManagement.inc:742
 #: admin/systems/.svn/tmp/tempfile.tmp:633
 #: admin/systems/.svn/tmp/tempfile.tmp:736
 #: admin/systems/.svn/tmp/tempfile.2.tmp:637
@@ -152,7 +152,7 @@ msgstr "Error de permisos"
 msgid "You have no permission to change this password!"
 msgstr "¡No tiene permisos para cambiar esta contraseña!"
 
-#: admin/systems/class_systemManagement.inc:654
+#: admin/systems/class_systemManagement.inc:651
 #: admin/systems/.svn/tmp/tempfile.tmp:645
 #: admin/systems/.svn/tmp/tempfile.2.tmp:649
 msgid ""
@@ -162,13 +162,13 @@ msgstr ""
 "¡La contraseñas introducidas como nueva y reintroduzca contraseña no "
 "coinciden!"
 
-#: admin/systems/class_systemManagement.inc:729
+#: admin/systems/class_systemManagement.inc:726
 #: admin/systems/.svn/tmp/tempfile.tmp:720
 #: admin/systems/.svn/tmp/tempfile.2.tmp:724
 msgid "Password method"
 msgstr "Método de contraseña"
 
-#: admin/systems/class_systemManagement.inc:729
+#: admin/systems/class_systemManagement.inc:726
 #: admin/systems/.svn/tmp/tempfile.tmp:720
 #: admin/systems/.svn/tmp/tempfile.2.tmp:724
 msgid "Password method crypt is missing. Cannot set system password."
@@ -176,8 +176,8 @@ msgstr ""
 "No se encuentra método de codificación de contraseña. No se pueden "
 "introducir contraseñas de sistema."
 
-#: admin/systems/class_systemManagement.inc:735
-#: admin/systems/class_systemManagement.inc:1846
+#: admin/systems/class_systemManagement.inc:732
+#: admin/systems/class_systemManagement.inc:1841
 #: admin/systems/services/class_goService.inc:122
 #: admin/systems/services/class_goService.inc:150
 #: admin/systems/services/class_goService.inc:183
@@ -185,38 +185,38 @@ msgstr ""
 #: admin/systems/.svn/tmp/tempfile.tmp:1833
 #: admin/systems/.svn/tmp/tempfile.2.tmp:730
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1837
-#: admin/systems/class_servGeneric.inc:281
-#: admin/systems/class_servGeneric.inc:433 admin/systems/class_termDNS.inc:488
+#: admin/systems/class_servGeneric.inc:283
+#: admin/systems/class_servGeneric.inc:435 admin/systems/class_termDNS.inc:488
 #: admin/systems/class_termDNS.inc:794 admin/systems/class_termDNS.inc:813
 #: admin/systems/class_termDNS.inc:834 admin/systems/class_termDNS.inc:839
-#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:929
+#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:933
 #: admin/systems/class_componentGeneric.inc:160
 #: admin/systems/class_componentGeneric.inc:301
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: admin/systems/class_systemManagement.inc:748
+#: admin/systems/class_systemManagement.inc:745
 #: admin/systems/.svn/tmp/tempfile.tmp:739
 #: admin/systems/.svn/tmp/tempfile.2.tmp:743
 msgid "Cannot determine object to change password!"
 msgstr "¡No puedo encontrar el objeto para cambiarle la contraseña!"
 
-#: admin/systems/class_systemManagement.inc:855
+#: admin/systems/class_systemManagement.inc:852
 #: admin/systems/.svn/tmp/tempfile.tmp:846
 #: admin/systems/.svn/tmp/tempfile.2.tmp:850
-#: admin/systems/class_servGeneric.inc:165
-#: admin/systems/class_servGeneric.inc:453
+#: admin/systems/class_servGeneric.inc:167
+#: admin/systems/class_servGeneric.inc:455
 msgid "Service infrastructure"
 msgstr "Infraestructura de servicio"
 
-#: admin/systems/class_systemManagement.inc:900
+#: admin/systems/class_systemManagement.inc:897
 #: admin/systems/.svn/tmp/tempfile.tmp:891
 #: admin/systems/.svn/tmp/tempfile.2.tmp:895
 msgid "Permission"
 msgstr "Permisos"
 
-#: admin/systems/class_systemManagement.inc:1342
-#: admin/systems/class_systemManagement.inc:1657
+#: admin/systems/class_systemManagement.inc:1335
+#: admin/systems/class_systemManagement.inc:1652
 #: admin/systems/.svn/tmp/tempfile.tmp:1330
 #: admin/systems/.svn/tmp/tempfile.tmp:1644
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1334
@@ -224,8 +224,8 @@ msgstr "Permisos"
 msgid "New terminal"
 msgstr "Nuevo terminal"
 
-#: admin/systems/class_systemManagement.inc:1344
-#: admin/systems/class_systemManagement.inc:1658
+#: admin/systems/class_systemManagement.inc:1337
+#: admin/systems/class_systemManagement.inc:1653
 #: admin/systems/.svn/tmp/tempfile.tmp:1332
 #: admin/systems/.svn/tmp/tempfile.tmp:1645
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1336
@@ -233,149 +233,149 @@ msgstr "Nuevo terminal"
 msgid "New workstation"
 msgstr "Nueva estación de trabajo"
 
-#: admin/systems/class_systemManagement.inc:1346
+#: admin/systems/class_systemManagement.inc:1339
 #: admin/systems/.svn/tmp/tempfile.tmp:1334
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1338
 msgid "Unknown device"
 msgstr "Dispositivo desconocido"
 
-#: admin/systems/class_systemManagement.inc:1348
+#: admin/systems/class_systemManagement.inc:1341
 #: admin/systems/.svn/tmp/tempfile.tmp:1336
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1340
 msgid "New Device"
 msgstr "Nuevo Dispositivo"
 
-#: admin/systems/class_systemManagement.inc:1373
+#: admin/systems/class_systemManagement.inc:1366
 #: admin/systems/.svn/tmp/tempfile.tmp:1361
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1365
 msgid "Terminal template for"
 msgstr "Plantilla de terminal para"
 
-#: admin/systems/class_systemManagement.inc:1389
+#: admin/systems/class_systemManagement.inc:1382
 #: admin/systems/.svn/tmp/tempfile.tmp:1377
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1381
 msgid "Workstation template for"
 msgstr "Plantilla de estación de trabajo para"
 
-#: admin/systems/class_systemManagement.inc:1634
+#: admin/systems/class_systemManagement.inc:1629
 #: admin/systems/.svn/tmp/tempfile.tmp:1621
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1625
 msgid "Template"
 msgstr "Plantilla"
 
-#: admin/systems/class_systemManagement.inc:1635
+#: admin/systems/class_systemManagement.inc:1630
 #: admin/systems/class_divListSystem.inc:199
 #: admin/systems/.svn/tmp/tempfile.tmp:1622
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1626
 msgid "Phone"
 msgstr "Teléfono"
 
-#: admin/systems/class_systemManagement.inc:1636
+#: admin/systems/class_systemManagement.inc:1631
 #: admin/systems/.svn/tmp/tempfile.tmp:1623
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1627
 #: admin/systems/class_componentGeneric.inc:315
 msgid "Network device"
 msgstr "Dispositivo de Red"
 
-#: admin/systems/class_systemManagement.inc:1637
+#: admin/systems/class_systemManagement.inc:1632
 #: admin/systems/class_divListSystem.inc:203
 #: admin/systems/.svn/tmp/tempfile.tmp:1624
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1628
 msgid "Printer"
 msgstr "Impresora"
 
-#: admin/systems/class_systemManagement.inc:1639
+#: admin/systems/class_systemManagement.inc:1634
 #: admin/systems/.svn/tmp/tempfile.tmp:1626
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1630
 #, fuzzy
 msgid "Windows workstation"
 msgstr "estaciones de trabajo windows"
 
-#: admin/systems/class_systemManagement.inc:1641
+#: admin/systems/class_systemManagement.inc:1636
 #: admin/systems/class_divListSystem.inc:191
 #: admin/systems/.svn/tmp/tempfile.tmp:1628
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1632
 msgid "Workstation"
 msgstr "Estación de trabajo"
 
-#: admin/systems/class_systemManagement.inc:1642
+#: admin/systems/class_systemManagement.inc:1637
 #: admin/systems/class_divListSystem.inc:195
 #: admin/systems/.svn/tmp/tempfile.tmp:1629
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1633
-#: admin/systems/class_servGeneric.inc:509
+#: admin/systems/class_servGeneric.inc:511
 msgid "Server"
 msgstr "Servidor"
 
-#: admin/systems/class_systemManagement.inc:1643
+#: admin/systems/class_systemManagement.inc:1638
 #: admin/systems/class_divListSystem.inc:187
 #: admin/systems/.svn/tmp/tempfile.tmp:1630
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1634
 msgid "Terminal"
 msgstr "Terminal"
 
-#: admin/systems/class_systemManagement.inc:1645
+#: admin/systems/class_systemManagement.inc:1640
 #: admin/systems/.svn/tmp/tempfile.tmp:1632
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1636
 msgid "Locked workstation"
 msgstr "Estación de trabajo bloqueada"
 
-#: admin/systems/class_systemManagement.inc:1646
+#: admin/systems/class_systemManagement.inc:1641
 #: admin/systems/.svn/tmp/tempfile.tmp:1633
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1637
 msgid "Locked server"
 msgstr "Servidor bloqueado"
 
-#: admin/systems/class_systemManagement.inc:1647
+#: admin/systems/class_systemManagement.inc:1642
 #: admin/systems/.svn/tmp/tempfile.tmp:1634
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1638
 msgid "Locked terminal"
 msgstr "Terminal bloqueado"
 
-#: admin/systems/class_systemManagement.inc:1649
+#: admin/systems/class_systemManagement.inc:1644
 #: admin/systems/.svn/tmp/tempfile.tmp:1636
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1640
 msgid "Workstation error"
 msgstr "Error en estación de trabajo"
 
-#: admin/systems/class_systemManagement.inc:1650
+#: admin/systems/class_systemManagement.inc:1645
 #: admin/systems/.svn/tmp/tempfile.tmp:1637
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1641
 msgid "Server error"
 msgstr "Error en servidor"
 
-#: admin/systems/class_systemManagement.inc:1651
+#: admin/systems/class_systemManagement.inc:1646
 #: admin/systems/.svn/tmp/tempfile.tmp:1638
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1642
 msgid "Terminal error"
 msgstr "Error en terminal"
 
-#: admin/systems/class_systemManagement.inc:1653
+#: admin/systems/class_systemManagement.inc:1648
 #: admin/systems/.svn/tmp/tempfile.tmp:1640
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1644
 msgid "Workstation busy"
 msgstr "Estación de trabajo ocupada"
 
-#: admin/systems/class_systemManagement.inc:1654
+#: admin/systems/class_systemManagement.inc:1649
 #: admin/systems/.svn/tmp/tempfile.tmp:1641
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1645
 msgid "Server busy"
 msgstr "Servidor ocupado"
 
-#: admin/systems/class_systemManagement.inc:1656
+#: admin/systems/class_systemManagement.inc:1651
 #: admin/systems/.svn/tmp/tempfile.tmp:1643
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1647
 msgid "New system from incoming"
 msgstr "Nuevo sistema desde entrada"
 
-#: admin/systems/class_systemManagement.inc:1662
+#: admin/systems/class_systemManagement.inc:1657
 #: admin/systems/class_divListSystem.inc:214
 #: admin/systems/.svn/tmp/tempfile.tmp:1649
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1653
 msgid "Opsi client"
 msgstr "cliente Opsi"
 
-#: admin/systems/class_systemManagement.inc:1862
-#: admin/systems/class_systemManagement.inc:1863
+#: admin/systems/class_systemManagement.inc:1857
+#: admin/systems/class_systemManagement.inc:1858
 #: admin/systems/.svn/tmp/tempfile.tmp:1849
 #: admin/systems/.svn/tmp/tempfile.tmp:1850
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1853
@@ -383,7 +383,7 @@ msgstr "cliente Opsi"
 msgid "Incoming objects"
 msgstr "Objetos de entrada"
 
-#: admin/systems/class_systemManagement.inc:1868
+#: admin/systems/class_systemManagement.inc:1863
 #: admin/systems/.svn/tmp/tempfile.tmp:1855
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1859
 msgid "Incoming"
@@ -530,7 +530,7 @@ msgid "Display systems of user"
 msgstr "Mostrar sistemas del usuario"
 
 #: admin/systems/class_divListSystem.inc:176
-#: admin/systems/class_servGeneric.inc:514 admin/systems/server.tpl:22
+#: admin/systems/class_servGeneric.inc:516 admin/systems/server.tpl:22
 #: admin/systems/class_componentGeneric.inc:319 admin/systems/component.tpl:17
 msgid "Base"
 msgstr "Base"
@@ -663,9 +663,9 @@ msgstr ""
 msgid "Cannot update service status!"
 msgstr "¡No se puede actualizar el estado del servicio!"
 
-#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:339
-#: admin/systems/class_servGeneric.inc:344
-#: admin/systems/class_servGeneric.inc:355 admin/systems/server.tpl:6
+#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:341
+#: admin/systems/class_servGeneric.inc:346
+#: admin/systems/class_servGeneric.inc:357 admin/systems/server.tpl:6
 msgid "Server name"
 msgstr "Nombre del servidor"
 
@@ -700,7 +700,7 @@ msgstr ""
 "servicio del sistema."
 
 #: admin/systems/class_divListSystemService.inc:50
-#: admin/systems/class_servGeneric.inc:512
+#: admin/systems/class_servGeneric.inc:514
 #: admin/systems/class_componentGeneric.inc:318
 msgid "Name"
 msgstr "Nombre"
@@ -855,103 +855,103 @@ msgstr "Reintroduzca la contraseña"
 msgid "Password strength"
 msgstr "Resistencia de la contraseña"
 
-#: admin/systems/class_servGeneric.inc:86
+#: admin/systems/class_servGeneric.inc:82
 msgid "Activated"
 msgstr "Activado"
 
-#: admin/systems/class_servGeneric.inc:87
+#: admin/systems/class_servGeneric.inc:83
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: admin/systems/class_servGeneric.inc:148
+#: admin/systems/class_servGeneric.inc:150
 msgid "server"
 msgstr "Servidor"
 
-#: admin/systems/class_servGeneric.inc:169
+#: admin/systems/class_servGeneric.inc:171
 msgid "Event error"
 msgstr "Evento de error"
 
-#: admin/systems/class_servGeneric.inc:170
+#: admin/systems/class_servGeneric.inc:172
 #, php-format
 msgid "Event '%s' is not available!"
 msgstr "¡El evento '%s' no está disponible!"
 
-#: admin/systems/class_servGeneric.inc:225
+#: admin/systems/class_servGeneric.inc:227
 msgid "Switch off"
 msgstr "Apagar"
 
-#: admin/systems/class_servGeneric.inc:225
+#: admin/systems/class_servGeneric.inc:227
 msgid "Reboot"
 msgstr "Reiniciar"
 
-#: admin/systems/class_servGeneric.inc:226
-#: admin/systems/class_servGeneric.inc:235
+#: admin/systems/class_servGeneric.inc:228
+#: admin/systems/class_servGeneric.inc:237
 msgid "System update"
 msgstr "Actualización del sistema"
 
-#: admin/systems/class_servGeneric.inc:227
-#: admin/systems/class_servGeneric.inc:234
+#: admin/systems/class_servGeneric.inc:229
+#: admin/systems/class_servGeneric.inc:236
 msgid "Reinstall"
 msgstr "Reinstalar"
 
-#: admin/systems/class_servGeneric.inc:228
+#: admin/systems/class_servGeneric.inc:230
 msgid "Rescan hardware"
 msgstr "Buscar hardware"
 
-#: admin/systems/class_servGeneric.inc:229
-#: admin/systems/class_servGeneric.inc:236
+#: admin/systems/class_servGeneric.inc:231
+#: admin/systems/class_servGeneric.inc:238
 msgid "Memory test"
 msgstr "Chequeo de memoria"
 
-#: admin/systems/class_servGeneric.inc:230
-#: admin/systems/class_servGeneric.inc:237
+#: admin/systems/class_servGeneric.inc:232
+#: admin/systems/class_servGeneric.inc:239
 msgid "Force localboot"
 msgstr "Forzar inicio local"
 
-#: admin/systems/class_servGeneric.inc:231
-#: admin/systems/class_servGeneric.inc:238
+#: admin/systems/class_servGeneric.inc:233
+#: admin/systems/class_servGeneric.inc:240
 msgid "System analysis"
 msgstr "Análisis del sistema"
 
-#: admin/systems/class_servGeneric.inc:233
+#: admin/systems/class_servGeneric.inc:235
 msgid "Wake up"
 msgstr "Despertar"
 
-#: admin/systems/class_servGeneric.inc:369
+#: admin/systems/class_servGeneric.inc:371
 msgid "Software deployment"
 msgstr "Desarrollo de software"
 
-#: admin/systems/class_servGeneric.inc:370
+#: admin/systems/class_servGeneric.inc:372
 msgid ""
 "This host is currently installing, if you really want to save it, press 'OK'."
 msgstr ""
 "Esta maquina está actualmente instalando, si quiere realmente grabarla, "
 "pulse 'OK'."
 
-#: admin/systems/class_servGeneric.inc:503
+#: admin/systems/class_servGeneric.inc:505
 #: admin/systems/class_componentGeneric.inc:309
 msgid "Generic"
 msgstr "Genérico"
 
-#: admin/systems/class_servGeneric.inc:504
+#: admin/systems/class_servGeneric.inc:506
 msgid "Server generic"
 msgstr "Servidor genérico"
 
-#: admin/systems/class_servGeneric.inc:513 admin/systems/server.tpl:14
+#: admin/systems/class_servGeneric.inc:515 admin/systems/server.tpl:14
 #: admin/systems/class_componentGeneric.inc:320 admin/systems/component.tpl:35
 msgid "Description"
 msgstr "Descripción"
 
-#: admin/systems/class_servGeneric.inc:516
+#: admin/systems/class_servGeneric.inc:518
 msgid "Goto mode"
 msgstr "Pasar al modo"
 
-#: admin/systems/class_servGeneric.inc:517
+#: admin/systems/class_servGeneric.inc:519
 #: admin/systems/class_componentGeneric.inc:321
 msgid "Root password"
 msgstr "Contraseña de root"
 
-#: admin/systems/class_servGeneric.inc:518
+#: admin/systems/class_servGeneric.inc:520
 msgid "Action flag"
 msgstr "Marca de acción"
 
@@ -1001,14 +1001,14 @@ msgid "IP address %s"
 msgstr "Dirección IP %s"
 
 #: admin/systems/class_termDNS.inc:611 admin/systems/class_termDNS.inc:623
-#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1006
+#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1010
 #: admin/systems/class_componentGeneric.inc:219
 #: admin/systems/class_componentGeneric.inc:222
 msgid "IP address"
 msgstr "Dirección IP"
 
 #: admin/systems/class_termDNS.inc:616 admin/systems/class_termDNS.inc:633
-#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1007
+#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1011
 msgid "MAC address"
 msgstr "Dirección MAC"
 
@@ -1042,27 +1042,27 @@ msgstr ""
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr "Solo están permitidas minúsculas, por favor compruebe su '%ss'."
 
-#: admin/systems/class_termDNS.inc:946 admin/systems/class_termDNS.inc:966
+#: admin/systems/class_termDNS.inc:950 admin/systems/class_termDNS.inc:970
 msgid "Add"
 msgstr "Añadir"
 
-#: admin/systems/class_termDNS.inc:960
+#: admin/systems/class_termDNS.inc:964
 msgid "Delete"
 msgstr "Eliminar"
 
-#: admin/systems/class_termDNS.inc:997
+#: admin/systems/class_termDNS.inc:1001
 msgid "DNS"
 msgstr "DNS"
 
-#: admin/systems/class_termDNS.inc:998
+#: admin/systems/class_termDNS.inc:1002
 msgid "DNS settings"
 msgstr "Parametros de DNS"
 
-#: admin/systems/class_termDNS.inc:1013
+#: admin/systems/class_termDNS.inc:1017
 msgid "DNS configuration"
 msgstr "Configuración DNS"
 
-#: admin/systems/class_termDNS.inc:1016
+#: admin/systems/class_termDNS.inc:1020
 msgid "DHCP configuration"
 msgstr "Configuración DHCP"
 
diff --git a/gosa-plugins/systems/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/systems/locale/fr/LC_MESSAGES/messages.po
index 00bb03c5f..3ac39f67b 100644
--- a/gosa-plugins/systems/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/systems/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2009-10-06 17:19+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -63,19 +63,20 @@ msgstr "La création de l'image à échoué. veuillez lire le rapport ci dessous
 #: admin/systems/.svn/tmp/tempfile.2.tmp:295
 #, php-format
 msgid "Command '%s', specified for ISO creation doesn't seem to exist."
-msgstr "La commande '%s', utilisée dans la création de l'image ISO n'existe pas."
+msgstr ""
+"La commande '%s', utilisée dans la création de l'image ISO n'existe pas."
 
 #: admin/systems/class_systemManagement.inc:369
-#: admin/systems/class_systemManagement.inc:489
-#: admin/systems/class_systemManagement.inc:526
-#: admin/systems/class_systemManagement.inc:534
-#: admin/systems/class_systemManagement.inc:584
-#: admin/systems/class_systemManagement.inc:592
-#: admin/systems/class_systemManagement.inc:607
-#: admin/systems/class_systemManagement.inc:615
-#: admin/systems/class_systemManagement.inc:654
-#: admin/systems/class_systemManagement.inc:748
-#: admin/systems/class_systemManagement.inc:1313
+#: admin/systems/class_systemManagement.inc:486
+#: admin/systems/class_systemManagement.inc:523
+#: admin/systems/class_systemManagement.inc:531
+#: admin/systems/class_systemManagement.inc:581
+#: admin/systems/class_systemManagement.inc:589
+#: admin/systems/class_systemManagement.inc:604
+#: admin/systems/class_systemManagement.inc:612
+#: admin/systems/class_systemManagement.inc:651
+#: admin/systems/class_systemManagement.inc:745
+#: admin/systems/class_systemManagement.inc:1306
 #: admin/systems/class_serverService.inc:186
 #: admin/systems/class_serverService.inc:236
 #: admin/systems/class_serverService.inc:363
@@ -117,15 +118,15 @@ msgstr "Erreur interne"
 msgid "Cannot set mode to 'active'!"
 msgstr "Impossible de mettre le mode comme 'actif' !"
 
-#: admin/systems/class_systemManagement.inc:615
+#: admin/systems/class_systemManagement.inc:612
 #: admin/systems/.svn/tmp/tempfile.tmp:606
 #: admin/systems/.svn/tmp/tempfile.2.tmp:610
 msgid "Editing this type of object is not supported yet!"
 msgstr "L'édition de ce type d'objet n'est pas encore supporté !"
 
-#: admin/systems/class_systemManagement.inc:642
-#: admin/systems/class_systemManagement.inc:745
-#: admin/systems/class_systemManagement.inc:974
+#: admin/systems/class_systemManagement.inc:639
+#: admin/systems/class_systemManagement.inc:742
+#: admin/systems/class_systemManagement.inc:971
 #: admin/systems/.svn/tmp/tempfile.tmp:633
 #: admin/systems/.svn/tmp/tempfile.tmp:736
 #: admin/systems/.svn/tmp/tempfile.tmp:965
@@ -135,8 +136,8 @@ msgstr "L'édition de ce type d'objet n'est pas encore supporté !"
 msgid "Permission error"
 msgstr "Erreur de permissions"
 
-#: admin/systems/class_systemManagement.inc:642
-#: admin/systems/class_systemManagement.inc:745
+#: admin/systems/class_systemManagement.inc:639
+#: admin/systems/class_systemManagement.inc:742
 #: admin/systems/.svn/tmp/tempfile.tmp:633
 #: admin/systems/.svn/tmp/tempfile.tmp:736
 #: admin/systems/.svn/tmp/tempfile.2.tmp:637
@@ -144,7 +145,7 @@ msgstr "Erreur de permissions"
 msgid "You have no permission to change this password!"
 msgstr "Vous n'êtes pas autorisé à modifier le mot de passe !"
 
-#: admin/systems/class_systemManagement.inc:654
+#: admin/systems/class_systemManagement.inc:651
 #: admin/systems/.svn/tmp/tempfile.tmp:645
 #: admin/systems/.svn/tmp/tempfile.2.tmp:649
 msgid ""
@@ -154,13 +155,13 @@ msgstr ""
 "Le mot de passe entré dans le champ 'Nouveau mot de passe' et celui dans le "
 "champ 'Vérification du mot de passe' ne concordent pas !"
 
-#: admin/systems/class_systemManagement.inc:729
+#: admin/systems/class_systemManagement.inc:726
 #: admin/systems/.svn/tmp/tempfile.tmp:720
 #: admin/systems/.svn/tmp/tempfile.2.tmp:724
 msgid "Password method"
 msgstr "Format de stockage des mots de passe"
 
-#: admin/systems/class_systemManagement.inc:729
+#: admin/systems/class_systemManagement.inc:726
 #: admin/systems/.svn/tmp/tempfile.tmp:720
 #: admin/systems/.svn/tmp/tempfile.2.tmp:724
 msgid "Password method crypt is missing. Cannot set system password."
@@ -168,8 +169,8 @@ msgstr ""
 "La méthode de cryptage crypt est manquante. Impossible de créer le mot de "
 "passe."
 
-#: admin/systems/class_systemManagement.inc:735
-#: admin/systems/class_systemManagement.inc:1846
+#: admin/systems/class_systemManagement.inc:732
+#: admin/systems/class_systemManagement.inc:1841
 #: admin/systems/services/class_goService.inc:122
 #: admin/systems/services/class_goService.inc:150
 #: admin/systems/services/class_goService.inc:183
@@ -177,38 +178,38 @@ msgstr ""
 #: admin/systems/.svn/tmp/tempfile.tmp:1833
 #: admin/systems/.svn/tmp/tempfile.2.tmp:730
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1837
-#: admin/systems/class_servGeneric.inc:281
-#: admin/systems/class_servGeneric.inc:433 admin/systems/class_termDNS.inc:488
+#: admin/systems/class_servGeneric.inc:283
+#: admin/systems/class_servGeneric.inc:435 admin/systems/class_termDNS.inc:488
 #: admin/systems/class_termDNS.inc:794 admin/systems/class_termDNS.inc:813
 #: admin/systems/class_termDNS.inc:834 admin/systems/class_termDNS.inc:839
-#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:929
+#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:933
 #: admin/systems/class_componentGeneric.inc:160
 #: admin/systems/class_componentGeneric.inc:301
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: admin/systems/class_systemManagement.inc:748
+#: admin/systems/class_systemManagement.inc:745
 #: admin/systems/.svn/tmp/tempfile.tmp:739
 #: admin/systems/.svn/tmp/tempfile.2.tmp:743
 msgid "Cannot determine object to change password!"
 msgstr "Impossible de déterminer l'objet pour changer son mot de passe !"
 
-#: admin/systems/class_systemManagement.inc:855
+#: admin/systems/class_systemManagement.inc:852
 #: admin/systems/.svn/tmp/tempfile.tmp:846
 #: admin/systems/.svn/tmp/tempfile.2.tmp:850
-#: admin/systems/class_servGeneric.inc:165
-#: admin/systems/class_servGeneric.inc:453
+#: admin/systems/class_servGeneric.inc:167
+#: admin/systems/class_servGeneric.inc:455
 msgid "Service infrastructure"
 msgstr "Service d'infrastructure"
 
-#: admin/systems/class_systemManagement.inc:900
+#: admin/systems/class_systemManagement.inc:897
 #: admin/systems/.svn/tmp/tempfile.tmp:891
 #: admin/systems/.svn/tmp/tempfile.2.tmp:895
 msgid "Permission"
 msgstr "Permissions"
 
-#: admin/systems/class_systemManagement.inc:1342
-#: admin/systems/class_systemManagement.inc:1657
+#: admin/systems/class_systemManagement.inc:1335
+#: admin/systems/class_systemManagement.inc:1652
 #: admin/systems/.svn/tmp/tempfile.tmp:1330
 #: admin/systems/.svn/tmp/tempfile.tmp:1644
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1334
@@ -216,8 +217,8 @@ msgstr "Permissions"
 msgid "New terminal"
 msgstr "Nouveau terminal"
 
-#: admin/systems/class_systemManagement.inc:1344
-#: admin/systems/class_systemManagement.inc:1658
+#: admin/systems/class_systemManagement.inc:1337
+#: admin/systems/class_systemManagement.inc:1653
 #: admin/systems/.svn/tmp/tempfile.tmp:1332
 #: admin/systems/.svn/tmp/tempfile.tmp:1645
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1336
@@ -225,148 +226,148 @@ msgstr "Nouveau terminal"
 msgid "New workstation"
 msgstr "Nouvelle station de travail"
 
-#: admin/systems/class_systemManagement.inc:1346
+#: admin/systems/class_systemManagement.inc:1339
 #: admin/systems/.svn/tmp/tempfile.tmp:1334
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1338
 msgid "Unknown device"
 msgstr "Périphérique Inconnu"
 
-#: admin/systems/class_systemManagement.inc:1348
+#: admin/systems/class_systemManagement.inc:1341
 #: admin/systems/.svn/tmp/tempfile.tmp:1336
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1340
 msgid "New Device"
 msgstr "Nouveau périphérique"
 
-#: admin/systems/class_systemManagement.inc:1373
+#: admin/systems/class_systemManagement.inc:1366
 #: admin/systems/.svn/tmp/tempfile.tmp:1361
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1365
 msgid "Terminal template for"
 msgstr "Modèle de terminal pour "
 
-#: admin/systems/class_systemManagement.inc:1389
+#: admin/systems/class_systemManagement.inc:1382
 #: admin/systems/.svn/tmp/tempfile.tmp:1377
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1381
 msgid "Workstation template for"
 msgstr "Modèle de station de travail pour"
 
-#: admin/systems/class_systemManagement.inc:1634
+#: admin/systems/class_systemManagement.inc:1629
 #: admin/systems/.svn/tmp/tempfile.tmp:1621
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1625
 msgid "Template"
 msgstr "Modèle"
 
-#: admin/systems/class_systemManagement.inc:1635
+#: admin/systems/class_systemManagement.inc:1630
 #: admin/systems/class_divListSystem.inc:199
 #: admin/systems/.svn/tmp/tempfile.tmp:1622
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1626
 msgid "Phone"
 msgstr "Téléphone"
 
-#: admin/systems/class_systemManagement.inc:1636
+#: admin/systems/class_systemManagement.inc:1631
 #: admin/systems/.svn/tmp/tempfile.tmp:1623
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1627
 #: admin/systems/class_componentGeneric.inc:315
 msgid "Network device"
 msgstr "Périphérique réseau"
 
-#: admin/systems/class_systemManagement.inc:1637
+#: admin/systems/class_systemManagement.inc:1632
 #: admin/systems/class_divListSystem.inc:203
 #: admin/systems/.svn/tmp/tempfile.tmp:1624
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1628
 msgid "Printer"
 msgstr "Imprimante"
 
-#: admin/systems/class_systemManagement.inc:1639
+#: admin/systems/class_systemManagement.inc:1634
 #: admin/systems/.svn/tmp/tempfile.tmp:1626
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1630
 msgid "Windows workstation"
 msgstr "Ordinateur Windows"
 
-#: admin/systems/class_systemManagement.inc:1641
+#: admin/systems/class_systemManagement.inc:1636
 #: admin/systems/class_divListSystem.inc:191
 #: admin/systems/.svn/tmp/tempfile.tmp:1628
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1632
 msgid "Workstation"
 msgstr "Stations de travail"
 
-#: admin/systems/class_systemManagement.inc:1642
+#: admin/systems/class_systemManagement.inc:1637
 #: admin/systems/class_divListSystem.inc:195
 #: admin/systems/.svn/tmp/tempfile.tmp:1629
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1633
-#: admin/systems/class_servGeneric.inc:509
+#: admin/systems/class_servGeneric.inc:511
 msgid "Server"
 msgstr "Serveur"
 
-#: admin/systems/class_systemManagement.inc:1643
+#: admin/systems/class_systemManagement.inc:1638
 #: admin/systems/class_divListSystem.inc:187
 #: admin/systems/.svn/tmp/tempfile.tmp:1630
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1634
 msgid "Terminal"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1645
+#: admin/systems/class_systemManagement.inc:1640
 #: admin/systems/.svn/tmp/tempfile.tmp:1632
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1636
 msgid "Locked workstation"
 msgstr "Ordinateur verrouillé"
 
-#: admin/systems/class_systemManagement.inc:1646
+#: admin/systems/class_systemManagement.inc:1641
 #: admin/systems/.svn/tmp/tempfile.tmp:1633
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1637
 msgid "Locked server"
 msgstr "Serveur verrouillé"
 
-#: admin/systems/class_systemManagement.inc:1647
+#: admin/systems/class_systemManagement.inc:1642
 #: admin/systems/.svn/tmp/tempfile.tmp:1634
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1638
 msgid "Locked terminal"
 msgstr "Terminal verrouillé"
 
-#: admin/systems/class_systemManagement.inc:1649
+#: admin/systems/class_systemManagement.inc:1644
 #: admin/systems/.svn/tmp/tempfile.tmp:1636
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1640
 msgid "Workstation error"
 msgstr "Erreur d'ordinateur"
 
-#: admin/systems/class_systemManagement.inc:1650
+#: admin/systems/class_systemManagement.inc:1645
 #: admin/systems/.svn/tmp/tempfile.tmp:1637
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1641
 msgid "Server error"
 msgstr "Erreur du serveur"
 
-#: admin/systems/class_systemManagement.inc:1651
+#: admin/systems/class_systemManagement.inc:1646
 #: admin/systems/.svn/tmp/tempfile.tmp:1638
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1642
 msgid "Terminal error"
 msgstr "Erreur du terminal"
 
-#: admin/systems/class_systemManagement.inc:1653
+#: admin/systems/class_systemManagement.inc:1648
 #: admin/systems/.svn/tmp/tempfile.tmp:1640
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1644
 msgid "Workstation busy"
 msgstr "Ordinateur occupé"
 
-#: admin/systems/class_systemManagement.inc:1654
+#: admin/systems/class_systemManagement.inc:1649
 #: admin/systems/.svn/tmp/tempfile.tmp:1641
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1645
 msgid "Server busy"
 msgstr "Serveur occupé"
 
-#: admin/systems/class_systemManagement.inc:1656
+#: admin/systems/class_systemManagement.inc:1651
 #: admin/systems/.svn/tmp/tempfile.tmp:1643
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1647
 msgid "New system from incoming"
 msgstr "Nouveau système depuis incoming"
 
-#: admin/systems/class_systemManagement.inc:1662
+#: admin/systems/class_systemManagement.inc:1657
 #: admin/systems/class_divListSystem.inc:214
 #: admin/systems/.svn/tmp/tempfile.tmp:1649
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1653
 msgid "Opsi client"
 msgstr "Clients OPSI"
 
-#: admin/systems/class_systemManagement.inc:1862
-#: admin/systems/class_systemManagement.inc:1863
+#: admin/systems/class_systemManagement.inc:1857
+#: admin/systems/class_systemManagement.inc:1858
 #: admin/systems/.svn/tmp/tempfile.tmp:1849
 #: admin/systems/.svn/tmp/tempfile.tmp:1850
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1853
@@ -374,7 +375,7 @@ msgstr "Clients OPSI"
 msgid "Incoming objects"
 msgstr "Objets entrants"
 
-#: admin/systems/class_systemManagement.inc:1868
+#: admin/systems/class_systemManagement.inc:1863
 #: admin/systems/.svn/tmp/tempfile.tmp:1855
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1859
 msgid "Incoming"
@@ -521,7 +522,7 @@ msgid "Display systems of user"
 msgstr "Afficher les systèmes de l'utilisateur"
 
 #: admin/systems/class_divListSystem.inc:176
-#: admin/systems/class_servGeneric.inc:514 admin/systems/server.tpl:22
+#: admin/systems/class_servGeneric.inc:516 admin/systems/server.tpl:22
 #: admin/systems/class_componentGeneric.inc:319 admin/systems/component.tpl:17
 msgid "Base"
 msgstr ""
@@ -653,9 +654,9 @@ msgstr "Impossible de mettre à jour le statut avant que cela soit sauvé !"
 msgid "Cannot update service status!"
 msgstr "Impossible de mettre à jour le statut du service!"
 
-#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:339
-#: admin/systems/class_servGeneric.inc:344
-#: admin/systems/class_servGeneric.inc:355 admin/systems/server.tpl:6
+#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:341
+#: admin/systems/class_servGeneric.inc:346
+#: admin/systems/class_servGeneric.inc:357 admin/systems/server.tpl:6
 msgid "Server name"
 msgstr "Nom du serveur"
 
@@ -690,7 +691,7 @@ msgstr ""
 "ici."
 
 #: admin/systems/class_divListSystemService.inc:50
-#: admin/systems/class_servGeneric.inc:512
+#: admin/systems/class_servGeneric.inc:514
 #: admin/systems/class_componentGeneric.inc:318
 msgid "Name"
 msgstr "Nom"
@@ -845,102 +846,103 @@ msgstr "Confirmation du nouveau mot de passe"
 msgid "Password strength"
 msgstr "Niveau de sécurité du mot de passe"
 
-#: admin/systems/class_servGeneric.inc:86
+#: admin/systems/class_servGeneric.inc:82
 msgid "Activated"
 msgstr "Activé"
 
-#: admin/systems/class_servGeneric.inc:87
+#: admin/systems/class_servGeneric.inc:83
 msgid "Locked"
 msgstr "Verrouillé"
 
-#: admin/systems/class_servGeneric.inc:148
+#: admin/systems/class_servGeneric.inc:150
 msgid "server"
 msgstr "serveur"
 
-#: admin/systems/class_servGeneric.inc:169
+#: admin/systems/class_servGeneric.inc:171
 msgid "Event error"
 msgstr "Erreur d'événement"
 
-#: admin/systems/class_servGeneric.inc:170
+#: admin/systems/class_servGeneric.inc:172
 #, php-format
 msgid "Event '%s' is not available!"
 msgstr "L'événement '%s' n'est pas disponible !"
 
-#: admin/systems/class_servGeneric.inc:225
+#: admin/systems/class_servGeneric.inc:227
 msgid "Switch off"
 msgstr "Eteindre"
 
-#: admin/systems/class_servGeneric.inc:225
+#: admin/systems/class_servGeneric.inc:227
 msgid "Reboot"
 msgstr "Redémarrer"
 
-#: admin/systems/class_servGeneric.inc:226
-#: admin/systems/class_servGeneric.inc:235
+#: admin/systems/class_servGeneric.inc:228
+#: admin/systems/class_servGeneric.inc:237
 msgid "System update"
 msgstr "Mise à jour du système"
 
-#: admin/systems/class_servGeneric.inc:227
-#: admin/systems/class_servGeneric.inc:234
+#: admin/systems/class_servGeneric.inc:229
+#: admin/systems/class_servGeneric.inc:236
 msgid "Reinstall"
 msgstr "Reinstaller"
 
-#: admin/systems/class_servGeneric.inc:228
+#: admin/systems/class_servGeneric.inc:230
 msgid "Rescan hardware"
 msgstr "Recherche du matériel"
 
-#: admin/systems/class_servGeneric.inc:229
-#: admin/systems/class_servGeneric.inc:236
+#: admin/systems/class_servGeneric.inc:231
+#: admin/systems/class_servGeneric.inc:238
 msgid "Memory test"
 msgstr "Test mémoire"
 
-#: admin/systems/class_servGeneric.inc:230
-#: admin/systems/class_servGeneric.inc:237
+#: admin/systems/class_servGeneric.inc:232
+#: admin/systems/class_servGeneric.inc:239
 msgid "Force localboot"
 msgstr "Forcer un démarrage local"
 
-#: admin/systems/class_servGeneric.inc:231
-#: admin/systems/class_servGeneric.inc:238
+#: admin/systems/class_servGeneric.inc:233
+#: admin/systems/class_servGeneric.inc:240
 msgid "System analysis"
 msgstr "Analyse du système"
 
-#: admin/systems/class_servGeneric.inc:233
+#: admin/systems/class_servGeneric.inc:235
 msgid "Wake up"
 msgstr "Réveiller"
 
-#: admin/systems/class_servGeneric.inc:369
+#: admin/systems/class_servGeneric.inc:371
 msgid "Software deployment"
 msgstr "Déploiement de logiciel"
 
-#: admin/systems/class_servGeneric.inc:370
-msgid "This host is currently installing, if you really want to save it, press 'OK'."
+#: admin/systems/class_servGeneric.inc:372
+msgid ""
+"This host is currently installing, if you really want to save it, press 'OK'."
 msgstr ""
 "Cet hôte est actuellement en cours d'installation, si vous voulez vraiment "
 "le sauver, cliquez sur 'OK'."
 
-#: admin/systems/class_servGeneric.inc:503
+#: admin/systems/class_servGeneric.inc:505
 #: admin/systems/class_componentGeneric.inc:309
 msgid "Generic"
 msgstr "Informations"
 
-#: admin/systems/class_servGeneric.inc:504
+#: admin/systems/class_servGeneric.inc:506
 msgid "Server generic"
 msgstr "Serveur générique"
 
-#: admin/systems/class_servGeneric.inc:513 admin/systems/server.tpl:14
+#: admin/systems/class_servGeneric.inc:515 admin/systems/server.tpl:14
 #: admin/systems/class_componentGeneric.inc:320 admin/systems/component.tpl:35
 msgid "Description"
 msgstr "Description"
 
-#: admin/systems/class_servGeneric.inc:516
+#: admin/systems/class_servGeneric.inc:518
 msgid "Goto mode"
 msgstr "Mode Goto"
 
-#: admin/systems/class_servGeneric.inc:517
+#: admin/systems/class_servGeneric.inc:519
 #: admin/systems/class_componentGeneric.inc:321
 msgid "Root password"
 msgstr "Mot de passe root"
 
-#: admin/systems/class_servGeneric.inc:518
+#: admin/systems/class_servGeneric.inc:520
 msgid "Action flag"
 msgstr "Indicateur d'action"
 
@@ -965,7 +967,8 @@ msgid "Action"
 msgstr "Action"
 
 #: admin/systems/server.tpl:69
-msgid "System installation in progress, the FAI state cannot be changed right now."
+msgid ""
+"System installation in progress, the FAI state cannot be changed right now."
 msgstr ""
 "Le système est en cours d'installation, l'état FAI ne peut pas être changé "
 "maintenant."
@@ -988,14 +991,14 @@ msgid "IP address %s"
 msgstr "Adresse IP %s"
 
 #: admin/systems/class_termDNS.inc:611 admin/systems/class_termDNS.inc:623
-#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1006
+#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1010
 #: admin/systems/class_componentGeneric.inc:219
 #: admin/systems/class_componentGeneric.inc:222
 msgid "IP address"
 msgstr "Adresse IP"
 
 #: admin/systems/class_termDNS.inc:616 admin/systems/class_termDNS.inc:633
-#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1007
+#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1011
 msgid "MAC address"
 msgstr "Adresse MAC"
 
@@ -1028,29 +1031,30 @@ msgstr ""
 #: admin/systems/class_termDNS.inc:690
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
-msgstr "Seulement les minuscules sont autorisée, veuillez vérifier votre '%ss'."
+msgstr ""
+"Seulement les minuscules sont autorisée, veuillez vérifier votre '%ss'."
 
-#: admin/systems/class_termDNS.inc:946 admin/systems/class_termDNS.inc:966
+#: admin/systems/class_termDNS.inc:950 admin/systems/class_termDNS.inc:970
 msgid "Add"
 msgstr "Ajouter"
 
-#: admin/systems/class_termDNS.inc:960
+#: admin/systems/class_termDNS.inc:964
 msgid "Delete"
 msgstr "Supprimer"
 
-#: admin/systems/class_termDNS.inc:997
+#: admin/systems/class_termDNS.inc:1001
 msgid "DNS"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:998
+#: admin/systems/class_termDNS.inc:1002
 msgid "DNS settings"
 msgstr "Configuration DNS"
 
-#: admin/systems/class_termDNS.inc:1013
+#: admin/systems/class_termDNS.inc:1017
 msgid "DNS configuration"
 msgstr "Configuration du DNS"
 
-#: admin/systems/class_termDNS.inc:1016
+#: admin/systems/class_termDNS.inc:1020
 msgid "DHCP configuration"
 msgstr "Configuration de DHCP"
 
@@ -1069,4 +1073,3 @@ msgstr "Nom du périphérique"
 #: admin/systems/component.tpl:20
 msgid "Choose subtree to place component in"
 msgstr "Sélectionnez la branche où sera placée le composant"
-
diff --git a/gosa-plugins/systems/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/systems/locale/it/LC_MESSAGES/messages.po
index 3e66a05f6..5de44c79b 100644
--- a/gosa-plugins/systems/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/systems/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -61,16 +61,16 @@ msgid "Command '%s', specified for ISO creation doesn't seem to exist."
 msgstr ""
 
 #: admin/systems/class_systemManagement.inc:369
-#: admin/systems/class_systemManagement.inc:489
-#: admin/systems/class_systemManagement.inc:526
-#: admin/systems/class_systemManagement.inc:534
-#: admin/systems/class_systemManagement.inc:584
-#: admin/systems/class_systemManagement.inc:592
-#: admin/systems/class_systemManagement.inc:607
-#: admin/systems/class_systemManagement.inc:615
-#: admin/systems/class_systemManagement.inc:654
-#: admin/systems/class_systemManagement.inc:748
-#: admin/systems/class_systemManagement.inc:1313
+#: admin/systems/class_systemManagement.inc:486
+#: admin/systems/class_systemManagement.inc:523
+#: admin/systems/class_systemManagement.inc:531
+#: admin/systems/class_systemManagement.inc:581
+#: admin/systems/class_systemManagement.inc:589
+#: admin/systems/class_systemManagement.inc:604
+#: admin/systems/class_systemManagement.inc:612
+#: admin/systems/class_systemManagement.inc:651
+#: admin/systems/class_systemManagement.inc:745
+#: admin/systems/class_systemManagement.inc:1306
 #: admin/systems/class_serverService.inc:186
 #: admin/systems/class_serverService.inc:236
 #: admin/systems/class_serverService.inc:363
@@ -114,15 +114,15 @@ msgstr "Terminal Server"
 msgid "Cannot set mode to 'active'!"
 msgstr "Vai al dipartimento base"
 
-#: admin/systems/class_systemManagement.inc:615
+#: admin/systems/class_systemManagement.inc:612
 #: admin/systems/.svn/tmp/tempfile.tmp:606
 #: admin/systems/.svn/tmp/tempfile.2.tmp:610
 msgid "Editing this type of object is not supported yet!"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:642
-#: admin/systems/class_systemManagement.inc:745
-#: admin/systems/class_systemManagement.inc:974
+#: admin/systems/class_systemManagement.inc:639
+#: admin/systems/class_systemManagement.inc:742
+#: admin/systems/class_systemManagement.inc:971
 #: admin/systems/.svn/tmp/tempfile.tmp:633
 #: admin/systems/.svn/tmp/tempfile.tmp:736
 #: admin/systems/.svn/tmp/tempfile.tmp:965
@@ -133,8 +133,8 @@ msgstr ""
 msgid "Permission error"
 msgstr "Permessi"
 
-#: admin/systems/class_systemManagement.inc:642
-#: admin/systems/class_systemManagement.inc:745
+#: admin/systems/class_systemManagement.inc:639
+#: admin/systems/class_systemManagement.inc:742
 #: admin/systems/.svn/tmp/tempfile.tmp:633
 #: admin/systems/.svn/tmp/tempfile.tmp:736
 #: admin/systems/.svn/tmp/tempfile.2.tmp:637
@@ -143,7 +143,7 @@ msgstr "Permessi"
 msgid "You have no permission to change this password!"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: admin/systems/class_systemManagement.inc:654
+#: admin/systems/class_systemManagement.inc:651
 #: admin/systems/.svn/tmp/tempfile.tmp:645
 #: admin/systems/.svn/tmp/tempfile.2.tmp:649
 #, fuzzy
@@ -152,21 +152,21 @@ msgid ""
 "not match!"
 msgstr "Le password nuova e ripetuta non corrispondono"
 
-#: admin/systems/class_systemManagement.inc:729
+#: admin/systems/class_systemManagement.inc:726
 #: admin/systems/.svn/tmp/tempfile.tmp:720
 #: admin/systems/.svn/tmp/tempfile.2.tmp:724
 #, fuzzy
 msgid "Password method"
 msgstr "Algorimo password"
 
-#: admin/systems/class_systemManagement.inc:729
+#: admin/systems/class_systemManagement.inc:726
 #: admin/systems/.svn/tmp/tempfile.tmp:720
 #: admin/systems/.svn/tmp/tempfile.2.tmp:724
 msgid "Password method crypt is missing. Cannot set system password."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:735
-#: admin/systems/class_systemManagement.inc:1846
+#: admin/systems/class_systemManagement.inc:732
+#: admin/systems/class_systemManagement.inc:1841
 #: admin/systems/services/class_goService.inc:122
 #: admin/systems/services/class_goService.inc:150
 #: admin/systems/services/class_goService.inc:183
@@ -174,42 +174,42 @@ msgstr ""
 #: admin/systems/.svn/tmp/tempfile.tmp:1833
 #: admin/systems/.svn/tmp/tempfile.2.tmp:730
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1837
-#: admin/systems/class_servGeneric.inc:281
-#: admin/systems/class_servGeneric.inc:433 admin/systems/class_termDNS.inc:488
+#: admin/systems/class_servGeneric.inc:283
+#: admin/systems/class_servGeneric.inc:435 admin/systems/class_termDNS.inc:488
 #: admin/systems/class_termDNS.inc:794 admin/systems/class_termDNS.inc:813
 #: admin/systems/class_termDNS.inc:834 admin/systems/class_termDNS.inc:839
-#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:929
+#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:933
 #: admin/systems/class_componentGeneric.inc:160
 #: admin/systems/class_componentGeneric.inc:301
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: admin/systems/class_systemManagement.inc:748
+#: admin/systems/class_systemManagement.inc:745
 #: admin/systems/.svn/tmp/tempfile.tmp:739
 #: admin/systems/.svn/tmp/tempfile.2.tmp:743
 #, fuzzy
 msgid "Cannot determine object to change password!"
 msgstr "Cambia la password"
 
-#: admin/systems/class_systemManagement.inc:855
+#: admin/systems/class_systemManagement.inc:852
 #: admin/systems/.svn/tmp/tempfile.tmp:846
 #: admin/systems/.svn/tmp/tempfile.2.tmp:850
-#: admin/systems/class_servGeneric.inc:165
-#: admin/systems/class_servGeneric.inc:453
+#: admin/systems/class_servGeneric.inc:167
+#: admin/systems/class_servGeneric.inc:455
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "Cognome"
 
-#: admin/systems/class_systemManagement.inc:900
+#: admin/systems/class_systemManagement.inc:897
 #: admin/systems/.svn/tmp/tempfile.tmp:891
 #: admin/systems/.svn/tmp/tempfile.2.tmp:895
 #, fuzzy
 msgid "Permission"
 msgstr "Permessi"
 
-#: admin/systems/class_systemManagement.inc:1342
-#: admin/systems/class_systemManagement.inc:1657
+#: admin/systems/class_systemManagement.inc:1335
+#: admin/systems/class_systemManagement.inc:1652
 #: admin/systems/.svn/tmp/tempfile.tmp:1330
 #: admin/systems/.svn/tmp/tempfile.tmp:1644
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1334
@@ -218,8 +218,8 @@ msgstr "Permessi"
 msgid "New terminal"
 msgstr "Mostra terminali"
 
-#: admin/systems/class_systemManagement.inc:1344
-#: admin/systems/class_systemManagement.inc:1658
+#: admin/systems/class_systemManagement.inc:1337
+#: admin/systems/class_systemManagement.inc:1653
 #: admin/systems/.svn/tmp/tempfile.tmp:1332
 #: admin/systems/.svn/tmp/tempfile.tmp:1645
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1336
@@ -228,47 +228,47 @@ msgstr "Mostra terminali"
 msgid "New workstation"
 msgstr "Mostra workstation"
 
-#: admin/systems/class_systemManagement.inc:1346
+#: admin/systems/class_systemManagement.inc:1339
 #: admin/systems/.svn/tmp/tempfile.tmp:1334
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1338
 msgid "Unknown device"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1348
+#: admin/systems/class_systemManagement.inc:1341
 #: admin/systems/.svn/tmp/tempfile.tmp:1336
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1340
 #, fuzzy
 msgid "New Device"
 msgstr "Mostra dispositiva di rete"
 
-#: admin/systems/class_systemManagement.inc:1373
+#: admin/systems/class_systemManagement.inc:1366
 #: admin/systems/.svn/tmp/tempfile.tmp:1361
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1365
 #, fuzzy
 msgid "Terminal template for"
 msgstr "Terminal Server"
 
-#: admin/systems/class_systemManagement.inc:1389
+#: admin/systems/class_systemManagement.inc:1382
 #: admin/systems/.svn/tmp/tempfile.tmp:1377
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1381
 #, fuzzy
 msgid "Workstation template for"
 msgstr "Mostra workstation"
 
-#: admin/systems/class_systemManagement.inc:1634
+#: admin/systems/class_systemManagement.inc:1629
 #: admin/systems/.svn/tmp/tempfile.tmp:1621
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1625
 msgid "Template"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1635
+#: admin/systems/class_systemManagement.inc:1630
 #: admin/systems/class_divListSystem.inc:199
 #: admin/systems/.svn/tmp/tempfile.tmp:1622
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1626
 msgid "Phone"
 msgstr "Telefono"
 
-#: admin/systems/class_systemManagement.inc:1636
+#: admin/systems/class_systemManagement.inc:1631
 #: admin/systems/.svn/tmp/tempfile.tmp:1623
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1627
 #: admin/systems/class_componentGeneric.inc:315
@@ -276,36 +276,36 @@ msgstr "Telefono"
 msgid "Network device"
 msgstr "Mostra dispositiva di rete"
 
-#: admin/systems/class_systemManagement.inc:1637
+#: admin/systems/class_systemManagement.inc:1632
 #: admin/systems/class_divListSystem.inc:203
 #: admin/systems/.svn/tmp/tempfile.tmp:1624
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1628
 msgid "Printer"
 msgstr "Stampante"
 
-#: admin/systems/class_systemManagement.inc:1639
+#: admin/systems/class_systemManagement.inc:1634
 #: admin/systems/.svn/tmp/tempfile.tmp:1626
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1630
 #, fuzzy
 msgid "Windows workstation"
 msgstr "Mostra workstation"
 
-#: admin/systems/class_systemManagement.inc:1641
+#: admin/systems/class_systemManagement.inc:1636
 #: admin/systems/class_divListSystem.inc:191
 #: admin/systems/.svn/tmp/tempfile.tmp:1628
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1632
 msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1642
+#: admin/systems/class_systemManagement.inc:1637
 #: admin/systems/class_divListSystem.inc:195
 #: admin/systems/.svn/tmp/tempfile.tmp:1629
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1633
-#: admin/systems/class_servGeneric.inc:509
+#: admin/systems/class_servGeneric.inc:511
 msgid "Server"
 msgstr "Server"
 
-#: admin/systems/class_systemManagement.inc:1643
+#: admin/systems/class_systemManagement.inc:1638
 #: admin/systems/class_divListSystem.inc:187
 #: admin/systems/.svn/tmp/tempfile.tmp:1630
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1634
@@ -313,78 +313,78 @@ msgstr "Server"
 msgid "Terminal"
 msgstr "Terminali"
 
-#: admin/systems/class_systemManagement.inc:1645
+#: admin/systems/class_systemManagement.inc:1640
 #: admin/systems/.svn/tmp/tempfile.tmp:1632
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1636
 #, fuzzy
 msgid "Locked workstation"
 msgstr "Mostra workstation"
 
-#: admin/systems/class_systemManagement.inc:1646
+#: admin/systems/class_systemManagement.inc:1641
 #: admin/systems/.svn/tmp/tempfile.tmp:1633
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1637
 #, fuzzy
 msgid "Locked server"
 msgstr "Server"
 
-#: admin/systems/class_systemManagement.inc:1647
+#: admin/systems/class_systemManagement.inc:1642
 #: admin/systems/.svn/tmp/tempfile.tmp:1634
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1638
 #, fuzzy
 msgid "Locked terminal"
 msgstr "Mostra terminali"
 
-#: admin/systems/class_systemManagement.inc:1649
+#: admin/systems/class_systemManagement.inc:1644
 #: admin/systems/.svn/tmp/tempfile.tmp:1636
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1640
 #, fuzzy
 msgid "Workstation error"
 msgstr "Creare"
 
-#: admin/systems/class_systemManagement.inc:1650
+#: admin/systems/class_systemManagement.inc:1645
 #: admin/systems/.svn/tmp/tempfile.tmp:1637
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1641
 #, fuzzy
 msgid "Server error"
 msgstr "Stato"
 
-#: admin/systems/class_systemManagement.inc:1651
+#: admin/systems/class_systemManagement.inc:1646
 #: admin/systems/.svn/tmp/tempfile.tmp:1638
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1642
 #, fuzzy
 msgid "Terminal error"
 msgstr "Terminal Server"
 
-#: admin/systems/class_systemManagement.inc:1653
+#: admin/systems/class_systemManagement.inc:1648
 #: admin/systems/.svn/tmp/tempfile.tmp:1640
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1644
 #, fuzzy
 msgid "Workstation busy"
 msgstr "Mostra workstation"
 
-#: admin/systems/class_systemManagement.inc:1654
+#: admin/systems/class_systemManagement.inc:1649
 #: admin/systems/.svn/tmp/tempfile.tmp:1641
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1645
 #, fuzzy
 msgid "Server busy"
 msgstr "Server"
 
-#: admin/systems/class_systemManagement.inc:1656
+#: admin/systems/class_systemManagement.inc:1651
 #: admin/systems/.svn/tmp/tempfile.tmp:1643
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1647
 #, fuzzy
 msgid "New system from incoming"
 msgstr "Informazioni organizzazione"
 
-#: admin/systems/class_systemManagement.inc:1662
+#: admin/systems/class_systemManagement.inc:1657
 #: admin/systems/class_divListSystem.inc:214
 #: admin/systems/.svn/tmp/tempfile.tmp:1649
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1653
 msgid "Opsi client"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1862
-#: admin/systems/class_systemManagement.inc:1863
+#: admin/systems/class_systemManagement.inc:1857
+#: admin/systems/class_systemManagement.inc:1858
 #: admin/systems/.svn/tmp/tempfile.tmp:1849
 #: admin/systems/.svn/tmp/tempfile.tmp:1850
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1853
@@ -393,7 +393,7 @@ msgstr ""
 msgid "Incoming objects"
 msgstr "Oggetti membri"
 
-#: admin/systems/class_systemManagement.inc:1868
+#: admin/systems/class_systemManagement.inc:1863
 #: admin/systems/.svn/tmp/tempfile.tmp:1855
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1859
 #, fuzzy
@@ -558,7 +558,7 @@ msgid "Display systems of user"
 msgstr "Mostra l'indirizzo dell'utente"
 
 #: admin/systems/class_divListSystem.inc:176
-#: admin/systems/class_servGeneric.inc:514 admin/systems/server.tpl:22
+#: admin/systems/class_servGeneric.inc:516 admin/systems/server.tpl:22
 #: admin/systems/class_componentGeneric.inc:319 admin/systems/component.tpl:17
 msgid "Base"
 msgstr "Base"
@@ -708,9 +708,9 @@ msgstr ""
 msgid "Cannot update service status!"
 msgstr "Impossibile aprite il certificato selezionato!"
 
-#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:339
-#: admin/systems/class_servGeneric.inc:344
-#: admin/systems/class_servGeneric.inc:355 admin/systems/server.tpl:6
+#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:341
+#: admin/systems/class_servGeneric.inc:346
+#: admin/systems/class_servGeneric.inc:357 admin/systems/server.tpl:6
 #, fuzzy
 msgid "Server name"
 msgstr "Cognome"
@@ -748,7 +748,7 @@ msgid "Add, remove and configure the properties of system services here."
 msgstr ""
 
 #: admin/systems/class_divListSystemService.inc:50
-#: admin/systems/class_servGeneric.inc:512
+#: admin/systems/class_servGeneric.inc:514
 #: admin/systems/class_componentGeneric.inc:318
 msgid "Name"
 msgstr "Cognome"
@@ -933,112 +933,112 @@ msgstr "Ripeti la password"
 msgid "Password strength"
 msgstr "Algorimo password"
 
-#: admin/systems/class_servGeneric.inc:86
+#: admin/systems/class_servGeneric.inc:82
 #, fuzzy
 msgid "Activated"
 msgstr "Privato"
 
-#: admin/systems/class_servGeneric.inc:87
+#: admin/systems/class_servGeneric.inc:83
 msgid "Locked"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:148
+#: admin/systems/class_servGeneric.inc:150
 #, fuzzy
 msgid "server"
 msgstr "Server"
 
-#: admin/systems/class_servGeneric.inc:169
+#: admin/systems/class_servGeneric.inc:171
 #, fuzzy
 msgid "Event error"
 msgstr "Stato"
 
-#: admin/systems/class_servGeneric.inc:170
+#: admin/systems/class_servGeneric.inc:172
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "Cambia la password"
 
-#: admin/systems/class_servGeneric.inc:225
+#: admin/systems/class_servGeneric.inc:227
 msgid "Switch off"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:225
+#: admin/systems/class_servGeneric.inc:227
 #, fuzzy
 msgid "Reboot"
 msgstr "Root"
 
-#: admin/systems/class_servGeneric.inc:226
-#: admin/systems/class_servGeneric.inc:235
+#: admin/systems/class_servGeneric.inc:228
+#: admin/systems/class_servGeneric.inc:237
 #, fuzzy
 msgid "System update"
 msgstr "Dipartimento"
 
-#: admin/systems/class_servGeneric.inc:227
-#: admin/systems/class_servGeneric.inc:234
+#: admin/systems/class_servGeneric.inc:229
+#: admin/systems/class_servGeneric.inc:236
 msgid "Reinstall"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:228
+#: admin/systems/class_servGeneric.inc:230
 #, fuzzy
 msgid "Rescan hardware"
 msgstr "Dispositivo telefonico"
 
-#: admin/systems/class_servGeneric.inc:229
-#: admin/systems/class_servGeneric.inc:236
+#: admin/systems/class_servGeneric.inc:231
+#: admin/systems/class_servGeneric.inc:238
 msgid "Memory test"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:230
-#: admin/systems/class_servGeneric.inc:237
+#: admin/systems/class_servGeneric.inc:232
+#: admin/systems/class_servGeneric.inc:239
 msgid "Force localboot"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:231
-#: admin/systems/class_servGeneric.inc:238
+#: admin/systems/class_servGeneric.inc:233
+#: admin/systems/class_servGeneric.inc:240
 #, fuzzy
 msgid "System analysis"
 msgstr "Log di sitema"
 
-#: admin/systems/class_servGeneric.inc:233
+#: admin/systems/class_servGeneric.inc:235
 msgid "Wake up"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:369
+#: admin/systems/class_servGeneric.inc:371
 #, fuzzy
 msgid "Software deployment"
 msgstr "Dipartimento"
 
-#: admin/systems/class_servGeneric.inc:370
+#: admin/systems/class_servGeneric.inc:372
 msgid ""
 "This host is currently installing, if you really want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:503
+#: admin/systems/class_servGeneric.inc:505
 #: admin/systems/class_componentGeneric.inc:309
 msgid "Generic"
 msgstr "Generale"
 
-#: admin/systems/class_servGeneric.inc:504
+#: admin/systems/class_servGeneric.inc:506
 #, fuzzy
 msgid "Server generic"
 msgstr "Cognome"
 
-#: admin/systems/class_servGeneric.inc:513 admin/systems/server.tpl:14
+#: admin/systems/class_servGeneric.inc:515 admin/systems/server.tpl:14
 #: admin/systems/class_componentGeneric.inc:320 admin/systems/component.tpl:35
 msgid "Description"
 msgstr "Descrizione"
 
-#: admin/systems/class_servGeneric.inc:516
+#: admin/systems/class_servGeneric.inc:518
 #, fuzzy
 msgid "Goto mode"
 msgstr "nella cartella"
 
-#: admin/systems/class_servGeneric.inc:517
+#: admin/systems/class_servGeneric.inc:519
 #: admin/systems/class_componentGeneric.inc:321
 #, fuzzy
 msgid "Root password"
 msgstr "Cambia password"
 
-#: admin/systems/class_servGeneric.inc:518
+#: admin/systems/class_servGeneric.inc:520
 #, fuzzy
 msgid "Action flag"
 msgstr "Azione"
@@ -1091,7 +1091,7 @@ msgid "IP address %s"
 msgstr "Indirizzo principale"
 
 #: admin/systems/class_termDNS.inc:611 admin/systems/class_termDNS.inc:623
-#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1006
+#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1010
 #: admin/systems/class_componentGeneric.inc:219
 #: admin/systems/class_componentGeneric.inc:222
 #, fuzzy
@@ -1099,7 +1099,7 @@ msgid "IP address"
 msgstr "Indirizzo principale"
 
 #: admin/systems/class_termDNS.inc:616 admin/systems/class_termDNS.inc:633
-#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1007
+#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1011
 #, fuzzy
 msgid "MAC address"
 msgstr "Indirizzo principale"
@@ -1131,29 +1131,29 @@ msgstr ""
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:946 admin/systems/class_termDNS.inc:966
+#: admin/systems/class_termDNS.inc:950 admin/systems/class_termDNS.inc:970
 msgid "Add"
 msgstr "Aggiungi"
 
-#: admin/systems/class_termDNS.inc:960
+#: admin/systems/class_termDNS.inc:964
 msgid "Delete"
 msgstr "Rimuovi"
 
-#: admin/systems/class_termDNS.inc:997
+#: admin/systems/class_termDNS.inc:1001
 msgid "DNS"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:998
+#: admin/systems/class_termDNS.inc:1002
 #, fuzzy
 msgid "DNS settings"
 msgstr "Impostazioni Samba"
 
-#: admin/systems/class_termDNS.inc:1013
+#: admin/systems/class_termDNS.inc:1017
 #, fuzzy
 msgid "DNS configuration"
 msgstr "Scarica il file di  configurazione"
 
-#: admin/systems/class_termDNS.inc:1016
+#: admin/systems/class_termDNS.inc:1020
 #, fuzzy
 msgid "DHCP configuration"
 msgstr "Scarica il file di  configurazione"
diff --git a/gosa-plugins/systems/locale/messages.po b/gosa-plugins/systems/locale/messages.po
index b7d16fd37..fcca9d79b 100644
--- a/gosa-plugins/systems/locale/messages.po
+++ b/gosa-plugins/systems/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,16 +62,16 @@ msgid "Command '%s', specified for ISO creation doesn't seem to exist."
 msgstr ""
 
 #: admin/systems/class_systemManagement.inc:369
-#: admin/systems/class_systemManagement.inc:489
-#: admin/systems/class_systemManagement.inc:526
-#: admin/systems/class_systemManagement.inc:534
-#: admin/systems/class_systemManagement.inc:584
-#: admin/systems/class_systemManagement.inc:592
-#: admin/systems/class_systemManagement.inc:607
-#: admin/systems/class_systemManagement.inc:615
-#: admin/systems/class_systemManagement.inc:654
-#: admin/systems/class_systemManagement.inc:748
-#: admin/systems/class_systemManagement.inc:1313
+#: admin/systems/class_systemManagement.inc:486
+#: admin/systems/class_systemManagement.inc:523
+#: admin/systems/class_systemManagement.inc:531
+#: admin/systems/class_systemManagement.inc:581
+#: admin/systems/class_systemManagement.inc:589
+#: admin/systems/class_systemManagement.inc:604
+#: admin/systems/class_systemManagement.inc:612
+#: admin/systems/class_systemManagement.inc:651
+#: admin/systems/class_systemManagement.inc:745
+#: admin/systems/class_systemManagement.inc:1306
 #: admin/systems/class_serverService.inc:186
 #: admin/systems/class_serverService.inc:236
 #: admin/systems/class_serverService.inc:363
@@ -113,15 +113,15 @@ msgstr ""
 msgid "Cannot set mode to 'active'!"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:615
+#: admin/systems/class_systemManagement.inc:612
 #: admin/systems/.svn/tmp/tempfile.tmp:606
 #: admin/systems/.svn/tmp/tempfile.2.tmp:610
 msgid "Editing this type of object is not supported yet!"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:642
-#: admin/systems/class_systemManagement.inc:745
-#: admin/systems/class_systemManagement.inc:974
+#: admin/systems/class_systemManagement.inc:639
+#: admin/systems/class_systemManagement.inc:742
+#: admin/systems/class_systemManagement.inc:971
 #: admin/systems/.svn/tmp/tempfile.tmp:633
 #: admin/systems/.svn/tmp/tempfile.tmp:736
 #: admin/systems/.svn/tmp/tempfile.tmp:965
@@ -131,8 +131,8 @@ msgstr ""
 msgid "Permission error"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:642
-#: admin/systems/class_systemManagement.inc:745
+#: admin/systems/class_systemManagement.inc:639
+#: admin/systems/class_systemManagement.inc:742
 #: admin/systems/.svn/tmp/tempfile.tmp:633
 #: admin/systems/.svn/tmp/tempfile.tmp:736
 #: admin/systems/.svn/tmp/tempfile.2.tmp:637
@@ -140,7 +140,7 @@ msgstr ""
 msgid "You have no permission to change this password!"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:654
+#: admin/systems/class_systemManagement.inc:651
 #: admin/systems/.svn/tmp/tempfile.tmp:645
 #: admin/systems/.svn/tmp/tempfile.2.tmp:649
 msgid ""
@@ -148,20 +148,20 @@ msgid ""
 "not match!"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:729
+#: admin/systems/class_systemManagement.inc:726
 #: admin/systems/.svn/tmp/tempfile.tmp:720
 #: admin/systems/.svn/tmp/tempfile.2.tmp:724
 msgid "Password method"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:729
+#: admin/systems/class_systemManagement.inc:726
 #: admin/systems/.svn/tmp/tempfile.tmp:720
 #: admin/systems/.svn/tmp/tempfile.2.tmp:724
 msgid "Password method crypt is missing. Cannot set system password."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:735
-#: admin/systems/class_systemManagement.inc:1846
+#: admin/systems/class_systemManagement.inc:732
+#: admin/systems/class_systemManagement.inc:1841
 #: admin/systems/services/class_goService.inc:122
 #: admin/systems/services/class_goService.inc:150
 #: admin/systems/services/class_goService.inc:183
@@ -169,38 +169,38 @@ msgstr ""
 #: admin/systems/.svn/tmp/tempfile.tmp:1833
 #: admin/systems/.svn/tmp/tempfile.2.tmp:730
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1837
-#: admin/systems/class_servGeneric.inc:281
-#: admin/systems/class_servGeneric.inc:433 admin/systems/class_termDNS.inc:488
+#: admin/systems/class_servGeneric.inc:283
+#: admin/systems/class_servGeneric.inc:435 admin/systems/class_termDNS.inc:488
 #: admin/systems/class_termDNS.inc:794 admin/systems/class_termDNS.inc:813
 #: admin/systems/class_termDNS.inc:834 admin/systems/class_termDNS.inc:839
-#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:929
+#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:933
 #: admin/systems/class_componentGeneric.inc:160
 #: admin/systems/class_componentGeneric.inc:301
 msgid "LDAP error"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:748
+#: admin/systems/class_systemManagement.inc:745
 #: admin/systems/.svn/tmp/tempfile.tmp:739
 #: admin/systems/.svn/tmp/tempfile.2.tmp:743
 msgid "Cannot determine object to change password!"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:855
+#: admin/systems/class_systemManagement.inc:852
 #: admin/systems/.svn/tmp/tempfile.tmp:846
 #: admin/systems/.svn/tmp/tempfile.2.tmp:850
-#: admin/systems/class_servGeneric.inc:165
-#: admin/systems/class_servGeneric.inc:453
+#: admin/systems/class_servGeneric.inc:167
+#: admin/systems/class_servGeneric.inc:455
 msgid "Service infrastructure"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:900
+#: admin/systems/class_systemManagement.inc:897
 #: admin/systems/.svn/tmp/tempfile.tmp:891
 #: admin/systems/.svn/tmp/tempfile.2.tmp:895
 msgid "Permission"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1342
-#: admin/systems/class_systemManagement.inc:1657
+#: admin/systems/class_systemManagement.inc:1335
+#: admin/systems/class_systemManagement.inc:1652
 #: admin/systems/.svn/tmp/tempfile.tmp:1330
 #: admin/systems/.svn/tmp/tempfile.tmp:1644
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1334
@@ -208,8 +208,8 @@ msgstr ""
 msgid "New terminal"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1344
-#: admin/systems/class_systemManagement.inc:1658
+#: admin/systems/class_systemManagement.inc:1337
+#: admin/systems/class_systemManagement.inc:1653
 #: admin/systems/.svn/tmp/tempfile.tmp:1332
 #: admin/systems/.svn/tmp/tempfile.tmp:1645
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1336
@@ -217,148 +217,148 @@ msgstr ""
 msgid "New workstation"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1346
+#: admin/systems/class_systemManagement.inc:1339
 #: admin/systems/.svn/tmp/tempfile.tmp:1334
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1338
 msgid "Unknown device"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1348
+#: admin/systems/class_systemManagement.inc:1341
 #: admin/systems/.svn/tmp/tempfile.tmp:1336
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1340
 msgid "New Device"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1373
+#: admin/systems/class_systemManagement.inc:1366
 #: admin/systems/.svn/tmp/tempfile.tmp:1361
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1365
 msgid "Terminal template for"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1389
+#: admin/systems/class_systemManagement.inc:1382
 #: admin/systems/.svn/tmp/tempfile.tmp:1377
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1381
 msgid "Workstation template for"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1634
+#: admin/systems/class_systemManagement.inc:1629
 #: admin/systems/.svn/tmp/tempfile.tmp:1621
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1625
 msgid "Template"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1635
+#: admin/systems/class_systemManagement.inc:1630
 #: admin/systems/class_divListSystem.inc:199
 #: admin/systems/.svn/tmp/tempfile.tmp:1622
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1626
 msgid "Phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1636
+#: admin/systems/class_systemManagement.inc:1631
 #: admin/systems/.svn/tmp/tempfile.tmp:1623
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1627
 #: admin/systems/class_componentGeneric.inc:315
 msgid "Network device"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1637
+#: admin/systems/class_systemManagement.inc:1632
 #: admin/systems/class_divListSystem.inc:203
 #: admin/systems/.svn/tmp/tempfile.tmp:1624
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1628
 msgid "Printer"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1639
+#: admin/systems/class_systemManagement.inc:1634
 #: admin/systems/.svn/tmp/tempfile.tmp:1626
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1630
 msgid "Windows workstation"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1641
+#: admin/systems/class_systemManagement.inc:1636
 #: admin/systems/class_divListSystem.inc:191
 #: admin/systems/.svn/tmp/tempfile.tmp:1628
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1632
 msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1642
+#: admin/systems/class_systemManagement.inc:1637
 #: admin/systems/class_divListSystem.inc:195
 #: admin/systems/.svn/tmp/tempfile.tmp:1629
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1633
-#: admin/systems/class_servGeneric.inc:509
+#: admin/systems/class_servGeneric.inc:511
 msgid "Server"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1643
+#: admin/systems/class_systemManagement.inc:1638
 #: admin/systems/class_divListSystem.inc:187
 #: admin/systems/.svn/tmp/tempfile.tmp:1630
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1634
 msgid "Terminal"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1645
+#: admin/systems/class_systemManagement.inc:1640
 #: admin/systems/.svn/tmp/tempfile.tmp:1632
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1636
 msgid "Locked workstation"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1646
+#: admin/systems/class_systemManagement.inc:1641
 #: admin/systems/.svn/tmp/tempfile.tmp:1633
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1637
 msgid "Locked server"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1647
+#: admin/systems/class_systemManagement.inc:1642
 #: admin/systems/.svn/tmp/tempfile.tmp:1634
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1638
 msgid "Locked terminal"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1649
+#: admin/systems/class_systemManagement.inc:1644
 #: admin/systems/.svn/tmp/tempfile.tmp:1636
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1640
 msgid "Workstation error"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1650
+#: admin/systems/class_systemManagement.inc:1645
 #: admin/systems/.svn/tmp/tempfile.tmp:1637
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1641
 msgid "Server error"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1651
+#: admin/systems/class_systemManagement.inc:1646
 #: admin/systems/.svn/tmp/tempfile.tmp:1638
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1642
 msgid "Terminal error"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1653
+#: admin/systems/class_systemManagement.inc:1648
 #: admin/systems/.svn/tmp/tempfile.tmp:1640
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1644
 msgid "Workstation busy"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1654
+#: admin/systems/class_systemManagement.inc:1649
 #: admin/systems/.svn/tmp/tempfile.tmp:1641
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1645
 msgid "Server busy"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1656
+#: admin/systems/class_systemManagement.inc:1651
 #: admin/systems/.svn/tmp/tempfile.tmp:1643
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1647
 msgid "New system from incoming"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1662
+#: admin/systems/class_systemManagement.inc:1657
 #: admin/systems/class_divListSystem.inc:214
 #: admin/systems/.svn/tmp/tempfile.tmp:1649
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1653
 msgid "Opsi client"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1862
-#: admin/systems/class_systemManagement.inc:1863
+#: admin/systems/class_systemManagement.inc:1857
+#: admin/systems/class_systemManagement.inc:1858
 #: admin/systems/.svn/tmp/tempfile.tmp:1849
 #: admin/systems/.svn/tmp/tempfile.tmp:1850
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1853
@@ -366,7 +366,7 @@ msgstr ""
 msgid "Incoming objects"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1868
+#: admin/systems/class_systemManagement.inc:1863
 #: admin/systems/.svn/tmp/tempfile.tmp:1855
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1859
 msgid "Incoming"
@@ -510,7 +510,7 @@ msgid "Display systems of user"
 msgstr ""
 
 #: admin/systems/class_divListSystem.inc:176
-#: admin/systems/class_servGeneric.inc:514 admin/systems/server.tpl:22
+#: admin/systems/class_servGeneric.inc:516 admin/systems/server.tpl:22
 #: admin/systems/class_componentGeneric.inc:319 admin/systems/component.tpl:17
 msgid "Base"
 msgstr ""
@@ -642,9 +642,9 @@ msgstr ""
 msgid "Cannot update service status!"
 msgstr ""
 
-#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:339
-#: admin/systems/class_servGeneric.inc:344
-#: admin/systems/class_servGeneric.inc:355 admin/systems/server.tpl:6
+#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:341
+#: admin/systems/class_servGeneric.inc:346
+#: admin/systems/class_servGeneric.inc:357 admin/systems/server.tpl:6
 msgid "Server name"
 msgstr ""
 
@@ -677,7 +677,7 @@ msgid "Add, remove and configure the properties of system services here."
 msgstr ""
 
 #: admin/systems/class_divListSystemService.inc:50
-#: admin/systems/class_servGeneric.inc:512
+#: admin/systems/class_servGeneric.inc:514
 #: admin/systems/class_componentGeneric.inc:318
 msgid "Name"
 msgstr ""
@@ -827,101 +827,101 @@ msgstr ""
 msgid "Password strength"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:86
+#: admin/systems/class_servGeneric.inc:82
 msgid "Activated"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:87
+#: admin/systems/class_servGeneric.inc:83
 msgid "Locked"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:148
+#: admin/systems/class_servGeneric.inc:150
 msgid "server"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:169
+#: admin/systems/class_servGeneric.inc:171
 msgid "Event error"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:170
+#: admin/systems/class_servGeneric.inc:172
 #, php-format
 msgid "Event '%s' is not available!"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:225
+#: admin/systems/class_servGeneric.inc:227
 msgid "Switch off"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:225
+#: admin/systems/class_servGeneric.inc:227
 msgid "Reboot"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:226
-#: admin/systems/class_servGeneric.inc:235
+#: admin/systems/class_servGeneric.inc:228
+#: admin/systems/class_servGeneric.inc:237
 msgid "System update"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:227
-#: admin/systems/class_servGeneric.inc:234
+#: admin/systems/class_servGeneric.inc:229
+#: admin/systems/class_servGeneric.inc:236
 msgid "Reinstall"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:228
+#: admin/systems/class_servGeneric.inc:230
 msgid "Rescan hardware"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:229
-#: admin/systems/class_servGeneric.inc:236
+#: admin/systems/class_servGeneric.inc:231
+#: admin/systems/class_servGeneric.inc:238
 msgid "Memory test"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:230
-#: admin/systems/class_servGeneric.inc:237
+#: admin/systems/class_servGeneric.inc:232
+#: admin/systems/class_servGeneric.inc:239
 msgid "Force localboot"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:231
-#: admin/systems/class_servGeneric.inc:238
+#: admin/systems/class_servGeneric.inc:233
+#: admin/systems/class_servGeneric.inc:240
 msgid "System analysis"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:233
+#: admin/systems/class_servGeneric.inc:235
 msgid "Wake up"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:369
+#: admin/systems/class_servGeneric.inc:371
 msgid "Software deployment"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:370
+#: admin/systems/class_servGeneric.inc:372
 msgid ""
 "This host is currently installing, if you really want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:503
+#: admin/systems/class_servGeneric.inc:505
 #: admin/systems/class_componentGeneric.inc:309
 msgid "Generic"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:504
+#: admin/systems/class_servGeneric.inc:506
 msgid "Server generic"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:513 admin/systems/server.tpl:14
+#: admin/systems/class_servGeneric.inc:515 admin/systems/server.tpl:14
 #: admin/systems/class_componentGeneric.inc:320 admin/systems/component.tpl:35
 msgid "Description"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:516
+#: admin/systems/class_servGeneric.inc:518
 msgid "Goto mode"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:517
+#: admin/systems/class_servGeneric.inc:519
 #: admin/systems/class_componentGeneric.inc:321
 msgid "Root password"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:518
+#: admin/systems/class_servGeneric.inc:520
 msgid "Action flag"
 msgstr ""
 
@@ -968,14 +968,14 @@ msgid "IP address %s"
 msgstr ""
 
 #: admin/systems/class_termDNS.inc:611 admin/systems/class_termDNS.inc:623
-#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1006
+#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1010
 #: admin/systems/class_componentGeneric.inc:219
 #: admin/systems/class_componentGeneric.inc:222
 msgid "IP address"
 msgstr ""
 
 #: admin/systems/class_termDNS.inc:616 admin/systems/class_termDNS.inc:633
-#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1007
+#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1011
 msgid "MAC address"
 msgstr ""
 
@@ -1006,27 +1006,27 @@ msgstr ""
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:946 admin/systems/class_termDNS.inc:966
+#: admin/systems/class_termDNS.inc:950 admin/systems/class_termDNS.inc:970
 msgid "Add"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:960
+#: admin/systems/class_termDNS.inc:964
 msgid "Delete"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:997
+#: admin/systems/class_termDNS.inc:1001
 msgid "DNS"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:998
+#: admin/systems/class_termDNS.inc:1002
 msgid "DNS settings"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:1013
+#: admin/systems/class_termDNS.inc:1017
 msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:1016
+#: admin/systems/class_termDNS.inc:1020
 msgid "DHCP configuration"
 msgstr ""
 
diff --git a/gosa-plugins/systems/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/systems/locale/nl/LC_MESSAGES/messages.po
index e4286cc7e..21f446503 100644
--- a/gosa-plugins/systems/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/systems/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -74,16 +74,16 @@ msgstr ""
 "bestaat niet."
 
 #: admin/systems/class_systemManagement.inc:369
-#: admin/systems/class_systemManagement.inc:489
-#: admin/systems/class_systemManagement.inc:526
-#: admin/systems/class_systemManagement.inc:534
-#: admin/systems/class_systemManagement.inc:584
-#: admin/systems/class_systemManagement.inc:592
-#: admin/systems/class_systemManagement.inc:607
-#: admin/systems/class_systemManagement.inc:615
-#: admin/systems/class_systemManagement.inc:654
-#: admin/systems/class_systemManagement.inc:748
-#: admin/systems/class_systemManagement.inc:1313
+#: admin/systems/class_systemManagement.inc:486
+#: admin/systems/class_systemManagement.inc:523
+#: admin/systems/class_systemManagement.inc:531
+#: admin/systems/class_systemManagement.inc:581
+#: admin/systems/class_systemManagement.inc:589
+#: admin/systems/class_systemManagement.inc:604
+#: admin/systems/class_systemManagement.inc:612
+#: admin/systems/class_systemManagement.inc:651
+#: admin/systems/class_systemManagement.inc:745
+#: admin/systems/class_systemManagement.inc:1306
 #: admin/systems/class_serverService.inc:186
 #: admin/systems/class_serverService.inc:236
 #: admin/systems/class_serverService.inc:363
@@ -127,15 +127,15 @@ msgstr "Terminal server"
 msgid "Cannot set mode to 'active'!"
 msgstr "Ga naar basis afdelingen"
 
-#: admin/systems/class_systemManagement.inc:615
+#: admin/systems/class_systemManagement.inc:612
 #: admin/systems/.svn/tmp/tempfile.tmp:606
 #: admin/systems/.svn/tmp/tempfile.2.tmp:610
 msgid "Editing this type of object is not supported yet!"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:642
-#: admin/systems/class_systemManagement.inc:745
-#: admin/systems/class_systemManagement.inc:974
+#: admin/systems/class_systemManagement.inc:639
+#: admin/systems/class_systemManagement.inc:742
+#: admin/systems/class_systemManagement.inc:971
 #: admin/systems/.svn/tmp/tempfile.tmp:633
 #: admin/systems/.svn/tmp/tempfile.tmp:736
 #: admin/systems/.svn/tmp/tempfile.tmp:965
@@ -146,8 +146,8 @@ msgstr ""
 msgid "Permission error"
 msgstr "Rechten"
 
-#: admin/systems/class_systemManagement.inc:642
-#: admin/systems/class_systemManagement.inc:745
+#: admin/systems/class_systemManagement.inc:639
+#: admin/systems/class_systemManagement.inc:742
 #: admin/systems/.svn/tmp/tempfile.tmp:633
 #: admin/systems/.svn/tmp/tempfile.tmp:736
 #: admin/systems/.svn/tmp/tempfile.2.tmp:637
@@ -156,7 +156,7 @@ msgstr "Rechten"
 msgid "You have no permission to change this password!"
 msgstr "U heeft momenteel geen toestemming om uw wachtwoord te veranderen"
 
-#: admin/systems/class_systemManagement.inc:654
+#: admin/systems/class_systemManagement.inc:651
 #: admin/systems/.svn/tmp/tempfile.tmp:645
 #: admin/systems/.svn/tmp/tempfile.2.tmp:649
 #, fuzzy
@@ -167,21 +167,21 @@ msgstr ""
 "Het nieuwe wachtwoord en het herhaalde wachtwoord komen niet met elkaar "
 "overeen!"
 
-#: admin/systems/class_systemManagement.inc:729
+#: admin/systems/class_systemManagement.inc:726
 #: admin/systems/.svn/tmp/tempfile.tmp:720
 #: admin/systems/.svn/tmp/tempfile.2.tmp:724
 #, fuzzy
 msgid "Password method"
 msgstr "Wachtwoord encryptie"
 
-#: admin/systems/class_systemManagement.inc:729
+#: admin/systems/class_systemManagement.inc:726
 #: admin/systems/.svn/tmp/tempfile.tmp:720
 #: admin/systems/.svn/tmp/tempfile.2.tmp:724
 msgid "Password method crypt is missing. Cannot set system password."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:735
-#: admin/systems/class_systemManagement.inc:1846
+#: admin/systems/class_systemManagement.inc:732
+#: admin/systems/class_systemManagement.inc:1841
 #: admin/systems/services/class_goService.inc:122
 #: admin/systems/services/class_goService.inc:150
 #: admin/systems/services/class_goService.inc:183
@@ -189,42 +189,42 @@ msgstr ""
 #: admin/systems/.svn/tmp/tempfile.tmp:1833
 #: admin/systems/.svn/tmp/tempfile.2.tmp:730
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1837
-#: admin/systems/class_servGeneric.inc:281
-#: admin/systems/class_servGeneric.inc:433 admin/systems/class_termDNS.inc:488
+#: admin/systems/class_servGeneric.inc:283
+#: admin/systems/class_servGeneric.inc:435 admin/systems/class_termDNS.inc:488
 #: admin/systems/class_termDNS.inc:794 admin/systems/class_termDNS.inc:813
 #: admin/systems/class_termDNS.inc:834 admin/systems/class_termDNS.inc:839
-#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:929
+#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:933
 #: admin/systems/class_componentGeneric.inc:160
 #: admin/systems/class_componentGeneric.inc:301
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP fout:"
 
-#: admin/systems/class_systemManagement.inc:748
+#: admin/systems/class_systemManagement.inc:745
 #: admin/systems/.svn/tmp/tempfile.tmp:739
 #: admin/systems/.svn/tmp/tempfile.2.tmp:743
 #, fuzzy
 msgid "Cannot determine object to change password!"
 msgstr "Kan de objectnaam niet detecteren"
 
-#: admin/systems/class_systemManagement.inc:855
+#: admin/systems/class_systemManagement.inc:852
 #: admin/systems/.svn/tmp/tempfile.tmp:846
 #: admin/systems/.svn/tmp/tempfile.2.tmp:850
-#: admin/systems/class_servGeneric.inc:165
-#: admin/systems/class_servGeneric.inc:453
+#: admin/systems/class_servGeneric.inc:167
+#: admin/systems/class_servGeneric.inc:455
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "Apparaat naam"
 
-#: admin/systems/class_systemManagement.inc:900
+#: admin/systems/class_systemManagement.inc:897
 #: admin/systems/.svn/tmp/tempfile.tmp:891
 #: admin/systems/.svn/tmp/tempfile.2.tmp:895
 #, fuzzy
 msgid "Permission"
 msgstr "Rechten"
 
-#: admin/systems/class_systemManagement.inc:1342
-#: admin/systems/class_systemManagement.inc:1657
+#: admin/systems/class_systemManagement.inc:1335
+#: admin/systems/class_systemManagement.inc:1652
 #: admin/systems/.svn/tmp/tempfile.tmp:1330
 #: admin/systems/.svn/tmp/tempfile.tmp:1644
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1334
@@ -232,8 +232,8 @@ msgstr "Rechten"
 msgid "New terminal"
 msgstr "Nieuwe terminal"
 
-#: admin/systems/class_systemManagement.inc:1344
-#: admin/systems/class_systemManagement.inc:1658
+#: admin/systems/class_systemManagement.inc:1337
+#: admin/systems/class_systemManagement.inc:1653
 #: admin/systems/.svn/tmp/tempfile.tmp:1332
 #: admin/systems/.svn/tmp/tempfile.tmp:1645
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1336
@@ -241,45 +241,45 @@ msgstr "Nieuwe terminal"
 msgid "New workstation"
 msgstr "Nieuw werkstation"
 
-#: admin/systems/class_systemManagement.inc:1346
+#: admin/systems/class_systemManagement.inc:1339
 #: admin/systems/.svn/tmp/tempfile.tmp:1334
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1338
 #, fuzzy
 msgid "Unknown device"
 msgstr "Onbekend"
 
-#: admin/systems/class_systemManagement.inc:1348
+#: admin/systems/class_systemManagement.inc:1341
 #: admin/systems/.svn/tmp/tempfile.tmp:1336
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1340
 msgid "New Device"
 msgstr "Nieuw apparaat"
 
-#: admin/systems/class_systemManagement.inc:1373
+#: admin/systems/class_systemManagement.inc:1366
 #: admin/systems/.svn/tmp/tempfile.tmp:1361
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1365
 msgid "Terminal template for"
 msgstr "Terminal sjabloon voor"
 
-#: admin/systems/class_systemManagement.inc:1389
+#: admin/systems/class_systemManagement.inc:1382
 #: admin/systems/.svn/tmp/tempfile.tmp:1377
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1381
 msgid "Workstation template for"
 msgstr "Werkstation sjabloon voor"
 
-#: admin/systems/class_systemManagement.inc:1634
+#: admin/systems/class_systemManagement.inc:1629
 #: admin/systems/.svn/tmp/tempfile.tmp:1621
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1625
 msgid "Template"
 msgstr "Sjabloon"
 
-#: admin/systems/class_systemManagement.inc:1635
+#: admin/systems/class_systemManagement.inc:1630
 #: admin/systems/class_divListSystem.inc:199
 #: admin/systems/.svn/tmp/tempfile.tmp:1622
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1626
 msgid "Phone"
 msgstr "Telefoon"
 
-#: admin/systems/class_systemManagement.inc:1636
+#: admin/systems/class_systemManagement.inc:1631
 #: admin/systems/.svn/tmp/tempfile.tmp:1623
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1627
 #: admin/systems/class_componentGeneric.inc:315
@@ -287,106 +287,106 @@ msgstr "Telefoon"
 msgid "Network device"
 msgstr "Netwerk apparaten"
 
-#: admin/systems/class_systemManagement.inc:1637
+#: admin/systems/class_systemManagement.inc:1632
 #: admin/systems/class_divListSystem.inc:203
 #: admin/systems/.svn/tmp/tempfile.tmp:1624
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1628
 msgid "Printer"
 msgstr "Printer"
 
-#: admin/systems/class_systemManagement.inc:1639
+#: admin/systems/class_systemManagement.inc:1634
 #: admin/systems/.svn/tmp/tempfile.tmp:1626
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1630
 #, fuzzy
 msgid "Windows workstation"
 msgstr "Toon werkstations"
 
-#: admin/systems/class_systemManagement.inc:1641
+#: admin/systems/class_systemManagement.inc:1636
 #: admin/systems/class_divListSystem.inc:191
 #: admin/systems/.svn/tmp/tempfile.tmp:1628
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1632
 msgid "Workstation"
 msgstr "Werkstation"
 
-#: admin/systems/class_systemManagement.inc:1642
+#: admin/systems/class_systemManagement.inc:1637
 #: admin/systems/class_divListSystem.inc:195
 #: admin/systems/.svn/tmp/tempfile.tmp:1629
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1633
-#: admin/systems/class_servGeneric.inc:509
+#: admin/systems/class_servGeneric.inc:511
 msgid "Server"
 msgstr "Server"
 
-#: admin/systems/class_systemManagement.inc:1643
+#: admin/systems/class_systemManagement.inc:1638
 #: admin/systems/class_divListSystem.inc:187
 #: admin/systems/.svn/tmp/tempfile.tmp:1630
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1634
 msgid "Terminal"
 msgstr "Terminal"
 
-#: admin/systems/class_systemManagement.inc:1645
+#: admin/systems/class_systemManagement.inc:1640
 #: admin/systems/.svn/tmp/tempfile.tmp:1632
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1636
 #, fuzzy
 msgid "Locked workstation"
 msgstr "Nieuw werkstation"
 
-#: admin/systems/class_systemManagement.inc:1646
+#: admin/systems/class_systemManagement.inc:1641
 #: admin/systems/.svn/tmp/tempfile.tmp:1633
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1637
 #, fuzzy
 msgid "Locked server"
 msgstr "Ldap server"
 
-#: admin/systems/class_systemManagement.inc:1647
+#: admin/systems/class_systemManagement.inc:1642
 #: admin/systems/.svn/tmp/tempfile.tmp:1634
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1638
 #, fuzzy
 msgid "Locked terminal"
 msgstr "Nieuwe terminal"
 
-#: admin/systems/class_systemManagement.inc:1649
+#: admin/systems/class_systemManagement.inc:1644
 #: admin/systems/.svn/tmp/tempfile.tmp:1636
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1640
 #, fuzzy
 msgid "Workstation error"
 msgstr "Werkstation"
 
-#: admin/systems/class_systemManagement.inc:1650
+#: admin/systems/class_systemManagement.inc:1645
 #: admin/systems/.svn/tmp/tempfile.tmp:1637
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1641
 #, fuzzy
 msgid "Server error"
 msgstr "Servernaam"
 
-#: admin/systems/class_systemManagement.inc:1651
+#: admin/systems/class_systemManagement.inc:1646
 #: admin/systems/.svn/tmp/tempfile.tmp:1638
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1642
 #, fuzzy
 msgid "Terminal error"
 msgstr "Terminal server"
 
-#: admin/systems/class_systemManagement.inc:1653
+#: admin/systems/class_systemManagement.inc:1648
 #: admin/systems/.svn/tmp/tempfile.tmp:1640
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1644
 #, fuzzy
 msgid "Workstation busy"
 msgstr "Werkstation"
 
-#: admin/systems/class_systemManagement.inc:1654
+#: admin/systems/class_systemManagement.inc:1649
 #: admin/systems/.svn/tmp/tempfile.tmp:1641
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1645
 #, fuzzy
 msgid "Server busy"
 msgstr "Servers"
 
-#: admin/systems/class_systemManagement.inc:1656
+#: admin/systems/class_systemManagement.inc:1651
 #: admin/systems/.svn/tmp/tempfile.tmp:1643
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1647
 #, fuzzy
 msgid "New system from incoming"
 msgstr "Nieuw systeem uit inkomende wachtrij"
 
-#: admin/systems/class_systemManagement.inc:1662
+#: admin/systems/class_systemManagement.inc:1657
 #: admin/systems/class_divListSystem.inc:214
 #: admin/systems/.svn/tmp/tempfile.tmp:1649
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1653
@@ -394,8 +394,8 @@ msgstr "Nieuw systeem uit inkomende wachtrij"
 msgid "Opsi client"
 msgstr "Thin Client"
 
-#: admin/systems/class_systemManagement.inc:1862
-#: admin/systems/class_systemManagement.inc:1863
+#: admin/systems/class_systemManagement.inc:1857
+#: admin/systems/class_systemManagement.inc:1858
 #: admin/systems/.svn/tmp/tempfile.tmp:1849
 #: admin/systems/.svn/tmp/tempfile.tmp:1850
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1853
@@ -404,7 +404,7 @@ msgstr "Thin Client"
 msgid "Incoming objects"
 msgstr "Lidmaatschap objecten"
 
-#: admin/systems/class_systemManagement.inc:1868
+#: admin/systems/class_systemManagement.inc:1863
 #: admin/systems/.svn/tmp/tempfile.tmp:1855
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1859
 #, fuzzy
@@ -568,7 +568,7 @@ msgid "Display systems of user"
 msgstr "Toon systemen van gebruiker"
 
 #: admin/systems/class_divListSystem.inc:176
-#: admin/systems/class_servGeneric.inc:514 admin/systems/server.tpl:22
+#: admin/systems/class_servGeneric.inc:516 admin/systems/server.tpl:22
 #: admin/systems/class_componentGeneric.inc:319 admin/systems/component.tpl:17
 msgid "Base"
 msgstr "Basis"
@@ -715,9 +715,9 @@ msgstr ""
 msgid "Cannot update service status!"
 msgstr "Het opgegeven certificaat kon geopend worden!"
 
-#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:339
-#: admin/systems/class_servGeneric.inc:344
-#: admin/systems/class_servGeneric.inc:355 admin/systems/server.tpl:6
+#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:341
+#: admin/systems/class_servGeneric.inc:346
+#: admin/systems/class_servGeneric.inc:357 admin/systems/server.tpl:6
 msgid "Server name"
 msgstr "Servernaam"
 
@@ -757,7 +757,7 @@ msgstr ""
 "geweest zijn."
 
 #: admin/systems/class_divListSystemService.inc:50
-#: admin/systems/class_servGeneric.inc:512
+#: admin/systems/class_servGeneric.inc:514
 #: admin/systems/class_componentGeneric.inc:318
 msgid "Name"
 msgstr "Naam"
@@ -932,108 +932,108 @@ msgstr "Herhaal het nieuwe wachtwoord"
 msgid "Password strength"
 msgstr "Wachtwoord encryptie"
 
-#: admin/systems/class_servGeneric.inc:86
+#: admin/systems/class_servGeneric.inc:82
 msgid "Activated"
 msgstr "Geactiveerd"
 
-#: admin/systems/class_servGeneric.inc:87
+#: admin/systems/class_servGeneric.inc:83
 msgid "Locked"
 msgstr "Geblokkeerd"
 
-#: admin/systems/class_servGeneric.inc:148
+#: admin/systems/class_servGeneric.inc:150
 #, fuzzy
 msgid "server"
 msgstr "Server"
 
-#: admin/systems/class_servGeneric.inc:169
+#: admin/systems/class_servGeneric.inc:171
 #, fuzzy
 msgid "Event error"
 msgstr "Systeem status"
 
-#: admin/systems/class_servGeneric.inc:170
+#: admin/systems/class_servGeneric.inc:172
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: admin/systems/class_servGeneric.inc:225
+#: admin/systems/class_servGeneric.inc:227
 msgid "Switch off"
 msgstr "Uitschakelen"
 
-#: admin/systems/class_servGeneric.inc:225
+#: admin/systems/class_servGeneric.inc:227
 msgid "Reboot"
 msgstr "Herstarten"
 
-#: admin/systems/class_servGeneric.inc:226
-#: admin/systems/class_servGeneric.inc:235
+#: admin/systems/class_servGeneric.inc:228
+#: admin/systems/class_servGeneric.inc:237
 #, fuzzy
 msgid "System update"
 msgstr "Systeem / Afdeling"
 
-#: admin/systems/class_servGeneric.inc:227
-#: admin/systems/class_servGeneric.inc:234
+#: admin/systems/class_servGeneric.inc:229
+#: admin/systems/class_servGeneric.inc:236
 msgid "Reinstall"
 msgstr "Herinstalleer"
 
-#: admin/systems/class_servGeneric.inc:228
+#: admin/systems/class_servGeneric.inc:230
 msgid "Rescan hardware"
 msgstr "Hardware opnieuw scannen"
 
-#: admin/systems/class_servGeneric.inc:229
-#: admin/systems/class_servGeneric.inc:236
+#: admin/systems/class_servGeneric.inc:231
+#: admin/systems/class_servGeneric.inc:238
 msgid "Memory test"
 msgstr "Geheugentest"
 
-#: admin/systems/class_servGeneric.inc:230
-#: admin/systems/class_servGeneric.inc:237
+#: admin/systems/class_servGeneric.inc:232
+#: admin/systems/class_servGeneric.inc:239
 msgid "Force localboot"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:231
-#: admin/systems/class_servGeneric.inc:238
+#: admin/systems/class_servGeneric.inc:233
+#: admin/systems/class_servGeneric.inc:240
 msgid "System analysis"
 msgstr "Systeem analyse"
 
-#: admin/systems/class_servGeneric.inc:233
+#: admin/systems/class_servGeneric.inc:235
 msgid "Wake up"
 msgstr "Aanzetten"
 
-#: admin/systems/class_servGeneric.inc:369
+#: admin/systems/class_servGeneric.inc:371
 #, fuzzy
 msgid "Software deployment"
 msgstr "Systeembeheer"
 
-#: admin/systems/class_servGeneric.inc:370
+#: admin/systems/class_servGeneric.inc:372
 msgid ""
 "This host is currently installing, if you really want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:503
+#: admin/systems/class_servGeneric.inc:505
 #: admin/systems/class_componentGeneric.inc:309
 msgid "Generic"
 msgstr "Algemeen"
 
-#: admin/systems/class_servGeneric.inc:504
+#: admin/systems/class_servGeneric.inc:506
 #, fuzzy
 msgid "Server generic"
 msgstr "Servernaam"
 
-#: admin/systems/class_servGeneric.inc:513 admin/systems/server.tpl:14
+#: admin/systems/class_servGeneric.inc:515 admin/systems/server.tpl:14
 #: admin/systems/class_componentGeneric.inc:320 admin/systems/component.tpl:35
 msgid "Description"
 msgstr "Omschrijving"
 
-#: admin/systems/class_servGeneric.inc:516
+#: admin/systems/class_servGeneric.inc:518
 #, fuzzy
 msgid "Goto mode"
 msgstr "naar map"
 
-#: admin/systems/class_servGeneric.inc:517
+#: admin/systems/class_servGeneric.inc:519
 #: admin/systems/class_componentGeneric.inc:321
 #, fuzzy
 msgid "Root password"
 msgstr "Wachtwoord instellen"
 
-#: admin/systems/class_servGeneric.inc:518
+#: admin/systems/class_servGeneric.inc:520
 #, fuzzy
 msgid "Action flag"
 msgstr "Actie"
@@ -1083,7 +1083,7 @@ msgid "IP address %s"
 msgstr "IP adres"
 
 #: admin/systems/class_termDNS.inc:611 admin/systems/class_termDNS.inc:623
-#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1006
+#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1010
 #: admin/systems/class_componentGeneric.inc:219
 #: admin/systems/class_componentGeneric.inc:222
 #, fuzzy
@@ -1091,7 +1091,7 @@ msgid "IP address"
 msgstr "IP adres"
 
 #: admin/systems/class_termDNS.inc:616 admin/systems/class_termDNS.inc:633
-#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1007
+#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1011
 msgid "MAC address"
 msgstr "Hardware adres (MAC)"
 
@@ -1124,29 +1124,29 @@ msgstr ""
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr "Hoofdletters zijn niet toegestaan. Controleer uw '%ss'"
 
-#: admin/systems/class_termDNS.inc:946 admin/systems/class_termDNS.inc:966
+#: admin/systems/class_termDNS.inc:950 admin/systems/class_termDNS.inc:970
 msgid "Add"
 msgstr "Toevoegen"
 
-#: admin/systems/class_termDNS.inc:960
+#: admin/systems/class_termDNS.inc:964
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: admin/systems/class_termDNS.inc:997
+#: admin/systems/class_termDNS.inc:1001
 msgid "DNS"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:998
+#: admin/systems/class_termDNS.inc:1002
 #, fuzzy
 msgid "DNS settings"
 msgstr "Samba Instellingen"
 
-#: admin/systems/class_termDNS.inc:1013
+#: admin/systems/class_termDNS.inc:1017
 #, fuzzy
 msgid "DNS configuration"
 msgstr "FAX database"
 
-#: admin/systems/class_termDNS.inc:1016
+#: admin/systems/class_termDNS.inc:1020
 #, fuzzy
 msgid "DHCP configuration"
 msgstr "FAX database"
diff --git a/gosa-plugins/systems/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/systems/locale/pl/LC_MESSAGES/messages.po
index f20f75714..a449ca4a4 100644
--- a/gosa-plugins/systems/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/systems/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -65,16 +65,16 @@ msgid "Command '%s', specified for ISO creation doesn't seem to exist."
 msgstr "Polecenie '%s', podane jako POSTMODIFY dla dodatku '%s' nie istnieje."
 
 #: admin/systems/class_systemManagement.inc:369
-#: admin/systems/class_systemManagement.inc:489
-#: admin/systems/class_systemManagement.inc:526
-#: admin/systems/class_systemManagement.inc:534
-#: admin/systems/class_systemManagement.inc:584
-#: admin/systems/class_systemManagement.inc:592
-#: admin/systems/class_systemManagement.inc:607
-#: admin/systems/class_systemManagement.inc:615
-#: admin/systems/class_systemManagement.inc:654
-#: admin/systems/class_systemManagement.inc:748
-#: admin/systems/class_systemManagement.inc:1313
+#: admin/systems/class_systemManagement.inc:486
+#: admin/systems/class_systemManagement.inc:523
+#: admin/systems/class_systemManagement.inc:531
+#: admin/systems/class_systemManagement.inc:581
+#: admin/systems/class_systemManagement.inc:589
+#: admin/systems/class_systemManagement.inc:604
+#: admin/systems/class_systemManagement.inc:612
+#: admin/systems/class_systemManagement.inc:651
+#: admin/systems/class_systemManagement.inc:745
+#: admin/systems/class_systemManagement.inc:1306
 #: admin/systems/class_serverService.inc:186
 #: admin/systems/class_serverService.inc:236
 #: admin/systems/class_serverService.inc:363
@@ -118,15 +118,15 @@ msgstr "Terminal Server"
 msgid "Cannot set mode to 'active'!"
 msgstr "Utwórz nowy departament"
 
-#: admin/systems/class_systemManagement.inc:615
+#: admin/systems/class_systemManagement.inc:612
 #: admin/systems/.svn/tmp/tempfile.tmp:606
 #: admin/systems/.svn/tmp/tempfile.2.tmp:610
 msgid "Editing this type of object is not supported yet!"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:642
-#: admin/systems/class_systemManagement.inc:745
-#: admin/systems/class_systemManagement.inc:974
+#: admin/systems/class_systemManagement.inc:639
+#: admin/systems/class_systemManagement.inc:742
+#: admin/systems/class_systemManagement.inc:971
 #: admin/systems/.svn/tmp/tempfile.tmp:633
 #: admin/systems/.svn/tmp/tempfile.tmp:736
 #: admin/systems/.svn/tmp/tempfile.tmp:965
@@ -137,8 +137,8 @@ msgstr ""
 msgid "Permission error"
 msgstr "Uprawnienia"
 
-#: admin/systems/class_systemManagement.inc:642
-#: admin/systems/class_systemManagement.inc:745
+#: admin/systems/class_systemManagement.inc:639
+#: admin/systems/class_systemManagement.inc:742
 #: admin/systems/.svn/tmp/tempfile.tmp:633
 #: admin/systems/.svn/tmp/tempfile.tmp:736
 #: admin/systems/.svn/tmp/tempfile.2.tmp:637
@@ -147,7 +147,7 @@ msgstr "Uprawnienia"
 msgid "You have no permission to change this password!"
 msgstr "Brak uprawnień do zmiany własnego hasła w tym momencie"
 
-#: admin/systems/class_systemManagement.inc:654
+#: admin/systems/class_systemManagement.inc:651
 #: admin/systems/.svn/tmp/tempfile.tmp:645
 #: admin/systems/.svn/tmp/tempfile.2.tmp:649
 #, fuzzy
@@ -156,21 +156,21 @@ msgid ""
 "not match!"
 msgstr "Hasła podane jako nowe i powtórzone nie zgadzają się!"
 
-#: admin/systems/class_systemManagement.inc:729
+#: admin/systems/class_systemManagement.inc:726
 #: admin/systems/.svn/tmp/tempfile.tmp:720
 #: admin/systems/.svn/tmp/tempfile.2.tmp:724
 #, fuzzy
 msgid "Password method"
 msgstr "Przechowywanie hasła"
 
-#: admin/systems/class_systemManagement.inc:729
+#: admin/systems/class_systemManagement.inc:726
 #: admin/systems/.svn/tmp/tempfile.tmp:720
 #: admin/systems/.svn/tmp/tempfile.2.tmp:724
 msgid "Password method crypt is missing. Cannot set system password."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:735
-#: admin/systems/class_systemManagement.inc:1846
+#: admin/systems/class_systemManagement.inc:732
+#: admin/systems/class_systemManagement.inc:1841
 #: admin/systems/services/class_goService.inc:122
 #: admin/systems/services/class_goService.inc:150
 #: admin/systems/services/class_goService.inc:183
@@ -178,42 +178,42 @@ msgstr ""
 #: admin/systems/.svn/tmp/tempfile.tmp:1833
 #: admin/systems/.svn/tmp/tempfile.2.tmp:730
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1837
-#: admin/systems/class_servGeneric.inc:281
-#: admin/systems/class_servGeneric.inc:433 admin/systems/class_termDNS.inc:488
+#: admin/systems/class_servGeneric.inc:283
+#: admin/systems/class_servGeneric.inc:435 admin/systems/class_termDNS.inc:488
 #: admin/systems/class_termDNS.inc:794 admin/systems/class_termDNS.inc:813
 #: admin/systems/class_termDNS.inc:834 admin/systems/class_termDNS.inc:839
-#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:929
+#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:933
 #: admin/systems/class_componentGeneric.inc:160
 #: admin/systems/class_componentGeneric.inc:301
 #, fuzzy
 msgid "LDAP error"
 msgstr "błąd LDAP:"
 
-#: admin/systems/class_systemManagement.inc:748
+#: admin/systems/class_systemManagement.inc:745
 #: admin/systems/.svn/tmp/tempfile.tmp:739
 #: admin/systems/.svn/tmp/tempfile.2.tmp:743
 #, fuzzy
 msgid "Cannot determine object to change password!"
 msgstr "Nie można wykryć nazwy obiektu."
 
-#: admin/systems/class_systemManagement.inc:855
+#: admin/systems/class_systemManagement.inc:852
 #: admin/systems/.svn/tmp/tempfile.tmp:846
 #: admin/systems/.svn/tmp/tempfile.2.tmp:850
-#: admin/systems/class_servGeneric.inc:165
-#: admin/systems/class_servGeneric.inc:453
+#: admin/systems/class_servGeneric.inc:167
+#: admin/systems/class_servGeneric.inc:455
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "Nazwa usługi"
 
-#: admin/systems/class_systemManagement.inc:900
+#: admin/systems/class_systemManagement.inc:897
 #: admin/systems/.svn/tmp/tempfile.tmp:891
 #: admin/systems/.svn/tmp/tempfile.2.tmp:895
 #, fuzzy
 msgid "Permission"
 msgstr "Uprawnienia"
 
-#: admin/systems/class_systemManagement.inc:1342
-#: admin/systems/class_systemManagement.inc:1657
+#: admin/systems/class_systemManagement.inc:1335
+#: admin/systems/class_systemManagement.inc:1652
 #: admin/systems/.svn/tmp/tempfile.tmp:1330
 #: admin/systems/.svn/tmp/tempfile.tmp:1644
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1334
@@ -221,8 +221,8 @@ msgstr "Uprawnienia"
 msgid "New terminal"
 msgstr "Nowy terminal"
 
-#: admin/systems/class_systemManagement.inc:1344
-#: admin/systems/class_systemManagement.inc:1658
+#: admin/systems/class_systemManagement.inc:1337
+#: admin/systems/class_systemManagement.inc:1653
 #: admin/systems/.svn/tmp/tempfile.tmp:1332
 #: admin/systems/.svn/tmp/tempfile.tmp:1645
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1336
@@ -230,151 +230,151 @@ msgstr "Nowy terminal"
 msgid "New workstation"
 msgstr "Nowa stacja robocza"
 
-#: admin/systems/class_systemManagement.inc:1346
+#: admin/systems/class_systemManagement.inc:1339
 #: admin/systems/.svn/tmp/tempfile.tmp:1334
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1338
 #, fuzzy
 msgid "Unknown device"
 msgstr "Nieznane"
 
-#: admin/systems/class_systemManagement.inc:1348
+#: admin/systems/class_systemManagement.inc:1341
 #: admin/systems/.svn/tmp/tempfile.tmp:1336
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1340
 msgid "New Device"
 msgstr "Nowe urządzenie"
 
-#: admin/systems/class_systemManagement.inc:1373
+#: admin/systems/class_systemManagement.inc:1366
 #: admin/systems/.svn/tmp/tempfile.tmp:1361
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1365
 msgid "Terminal template for"
 msgstr "Szablon terminala dla"
 
-#: admin/systems/class_systemManagement.inc:1389
+#: admin/systems/class_systemManagement.inc:1382
 #: admin/systems/.svn/tmp/tempfile.tmp:1377
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1381
 msgid "Workstation template for"
 msgstr "Szablon stacji roboczej dla"
 
-#: admin/systems/class_systemManagement.inc:1634
+#: admin/systems/class_systemManagement.inc:1629
 #: admin/systems/.svn/tmp/tempfile.tmp:1621
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1625
 msgid "Template"
 msgstr "Szablon"
 
-#: admin/systems/class_systemManagement.inc:1635
+#: admin/systems/class_systemManagement.inc:1630
 #: admin/systems/class_divListSystem.inc:199
 #: admin/systems/.svn/tmp/tempfile.tmp:1622
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1626
 msgid "Phone"
 msgstr "Telefon"
 
-#: admin/systems/class_systemManagement.inc:1636
+#: admin/systems/class_systemManagement.inc:1631
 #: admin/systems/.svn/tmp/tempfile.tmp:1623
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1627
 #: admin/systems/class_componentGeneric.inc:315
 msgid "Network device"
 msgstr "Urządzenia sieciowe"
 
-#: admin/systems/class_systemManagement.inc:1637
+#: admin/systems/class_systemManagement.inc:1632
 #: admin/systems/class_divListSystem.inc:203
 #: admin/systems/.svn/tmp/tempfile.tmp:1624
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1628
 msgid "Printer"
 msgstr "Drukarka"
 
-#: admin/systems/class_systemManagement.inc:1639
+#: admin/systems/class_systemManagement.inc:1634
 #: admin/systems/.svn/tmp/tempfile.tmp:1626
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1630
 #, fuzzy
 msgid "Windows workstation"
 msgstr "Pokaż stacje robocze"
 
-#: admin/systems/class_systemManagement.inc:1641
+#: admin/systems/class_systemManagement.inc:1636
 #: admin/systems/class_divListSystem.inc:191
 #: admin/systems/.svn/tmp/tempfile.tmp:1628
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1632
 msgid "Workstation"
 msgstr "Stacja robocza"
 
-#: admin/systems/class_systemManagement.inc:1642
+#: admin/systems/class_systemManagement.inc:1637
 #: admin/systems/class_divListSystem.inc:195
 #: admin/systems/.svn/tmp/tempfile.tmp:1629
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1633
-#: admin/systems/class_servGeneric.inc:509
+#: admin/systems/class_servGeneric.inc:511
 msgid "Server"
 msgstr "Serwer"
 
-#: admin/systems/class_systemManagement.inc:1643
+#: admin/systems/class_systemManagement.inc:1638
 #: admin/systems/class_divListSystem.inc:187
 #: admin/systems/.svn/tmp/tempfile.tmp:1630
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1634
 msgid "Terminal"
 msgstr "Terminal"
 
-#: admin/systems/class_systemManagement.inc:1645
+#: admin/systems/class_systemManagement.inc:1640
 #: admin/systems/.svn/tmp/tempfile.tmp:1632
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1636
 #, fuzzy
 msgid "Locked workstation"
 msgstr "Nowa stacja robocza"
 
-#: admin/systems/class_systemManagement.inc:1646
+#: admin/systems/class_systemManagement.inc:1641
 #: admin/systems/.svn/tmp/tempfile.tmp:1633
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1637
 #, fuzzy
 msgid "Locked server"
 msgstr "Serwer Ldap"
 
-#: admin/systems/class_systemManagement.inc:1647
+#: admin/systems/class_systemManagement.inc:1642
 #: admin/systems/.svn/tmp/tempfile.tmp:1634
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1638
 #, fuzzy
 msgid "Locked terminal"
 msgstr "Nowy terminal"
 
-#: admin/systems/class_systemManagement.inc:1649
+#: admin/systems/class_systemManagement.inc:1644
 #: admin/systems/.svn/tmp/tempfile.tmp:1636
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1640
 #, fuzzy
 msgid "Workstation error"
 msgstr "Stacja robocza"
 
-#: admin/systems/class_systemManagement.inc:1650
+#: admin/systems/class_systemManagement.inc:1645
 #: admin/systems/.svn/tmp/tempfile.tmp:1637
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1641
 #, fuzzy
 msgid "Server error"
 msgstr "Nazwa serwera"
 
-#: admin/systems/class_systemManagement.inc:1651
+#: admin/systems/class_systemManagement.inc:1646
 #: admin/systems/.svn/tmp/tempfile.tmp:1638
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1642
 #, fuzzy
 msgid "Terminal error"
 msgstr "Terminal Server"
 
-#: admin/systems/class_systemManagement.inc:1653
+#: admin/systems/class_systemManagement.inc:1648
 #: admin/systems/.svn/tmp/tempfile.tmp:1640
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1644
 #, fuzzy
 msgid "Workstation busy"
 msgstr "Stacja robocza"
 
-#: admin/systems/class_systemManagement.inc:1654
+#: admin/systems/class_systemManagement.inc:1649
 #: admin/systems/.svn/tmp/tempfile.tmp:1641
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1645
 #, fuzzy
 msgid "Server busy"
 msgstr "Serwery"
 
-#: admin/systems/class_systemManagement.inc:1656
+#: admin/systems/class_systemManagement.inc:1651
 #: admin/systems/.svn/tmp/tempfile.tmp:1643
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1647
 #, fuzzy
 msgid "New system from incoming"
 msgstr "Nowy system dla nadchodzących"
 
-#: admin/systems/class_systemManagement.inc:1662
+#: admin/systems/class_systemManagement.inc:1657
 #: admin/systems/class_divListSystem.inc:214
 #: admin/systems/.svn/tmp/tempfile.tmp:1649
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1653
@@ -382,8 +382,8 @@ msgstr "Nowy system dla nadchodzących"
 msgid "Opsi client"
 msgstr "Cienki klient"
 
-#: admin/systems/class_systemManagement.inc:1862
-#: admin/systems/class_systemManagement.inc:1863
+#: admin/systems/class_systemManagement.inc:1857
+#: admin/systems/class_systemManagement.inc:1858
 #: admin/systems/.svn/tmp/tempfile.tmp:1849
 #: admin/systems/.svn/tmp/tempfile.tmp:1850
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1853
@@ -392,7 +392,7 @@ msgstr "Cienki klient"
 msgid "Incoming objects"
 msgstr "Przenieś obiekty"
 
-#: admin/systems/class_systemManagement.inc:1868
+#: admin/systems/class_systemManagement.inc:1863
 #: admin/systems/.svn/tmp/tempfile.tmp:1855
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1859
 #, fuzzy
@@ -557,7 +557,7 @@ msgid "Display systems of user"
 msgstr "Wyświetl systemy użytkownika"
 
 #: admin/systems/class_divListSystem.inc:176
-#: admin/systems/class_servGeneric.inc:514 admin/systems/server.tpl:22
+#: admin/systems/class_servGeneric.inc:516 admin/systems/server.tpl:22
 #: admin/systems/class_componentGeneric.inc:319 admin/systems/component.tpl:17
 msgid "Base"
 msgstr "Kontener"
@@ -703,9 +703,9 @@ msgstr "Nie można ustawić statusu podczas gdy nie zapisano tego serwera."
 msgid "Cannot update service status!"
 msgstr "Nie można otworzyć wybranego certyfikatu!"
 
-#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:339
-#: admin/systems/class_servGeneric.inc:344
-#: admin/systems/class_servGeneric.inc:355 admin/systems/server.tpl:6
+#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:341
+#: admin/systems/class_servGeneric.inc:346
+#: admin/systems/class_servGeneric.inc:357 admin/systems/server.tpl:6
 msgid "Server name"
 msgstr "Nazwa serwera"
 
@@ -741,7 +741,7 @@ msgid "Add, remove and configure the properties of system services here."
 msgstr "To menu umożliwia tworzenie, usuwanie oraz edycję właściwości usług."
 
 #: admin/systems/class_divListSystemService.inc:50
-#: admin/systems/class_servGeneric.inc:512
+#: admin/systems/class_servGeneric.inc:514
 #: admin/systems/class_componentGeneric.inc:318
 msgid "Name"
 msgstr "Imię"
@@ -900,108 +900,108 @@ msgstr "Powtórz nowe hasło"
 msgid "Password strength"
 msgstr "Przechowywanie hasła"
 
-#: admin/systems/class_servGeneric.inc:86
+#: admin/systems/class_servGeneric.inc:82
 msgid "Activated"
 msgstr "Aktywne"
 
-#: admin/systems/class_servGeneric.inc:87
+#: admin/systems/class_servGeneric.inc:83
 msgid "Locked"
 msgstr "Zablokowane"
 
-#: admin/systems/class_servGeneric.inc:148
+#: admin/systems/class_servGeneric.inc:150
 #, fuzzy
 msgid "server"
 msgstr "Serwer"
 
-#: admin/systems/class_servGeneric.inc:169
+#: admin/systems/class_servGeneric.inc:171
 #, fuzzy
 msgid "Event error"
 msgstr "Ustaw status"
 
-#: admin/systems/class_servGeneric.inc:170
+#: admin/systems/class_servGeneric.inc:172
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "Brak uprawnień do zmiay hasła"
 
-#: admin/systems/class_servGeneric.inc:225
+#: admin/systems/class_servGeneric.inc:227
 msgid "Switch off"
 msgstr "Wyłącz"
 
-#: admin/systems/class_servGeneric.inc:225
+#: admin/systems/class_servGeneric.inc:227
 msgid "Reboot"
 msgstr "Restartuj"
 
-#: admin/systems/class_servGeneric.inc:226
-#: admin/systems/class_servGeneric.inc:235
+#: admin/systems/class_servGeneric.inc:228
+#: admin/systems/class_servGeneric.inc:237
 #, fuzzy
 msgid "System update"
 msgstr "System / Departament"
 
-#: admin/systems/class_servGeneric.inc:227
-#: admin/systems/class_servGeneric.inc:234
+#: admin/systems/class_servGeneric.inc:229
+#: admin/systems/class_servGeneric.inc:236
 msgid "Reinstall"
 msgstr "Przeinstaluj"
 
-#: admin/systems/class_servGeneric.inc:228
+#: admin/systems/class_servGeneric.inc:230
 msgid "Rescan hardware"
 msgstr "Przeskanuj sprzęt"
 
-#: admin/systems/class_servGeneric.inc:229
-#: admin/systems/class_servGeneric.inc:236
+#: admin/systems/class_servGeneric.inc:231
+#: admin/systems/class_servGeneric.inc:238
 msgid "Memory test"
 msgstr "Test pamięci"
 
-#: admin/systems/class_servGeneric.inc:230
-#: admin/systems/class_servGeneric.inc:237
+#: admin/systems/class_servGeneric.inc:232
+#: admin/systems/class_servGeneric.inc:239
 msgid "Force localboot"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:231
-#: admin/systems/class_servGeneric.inc:238
+#: admin/systems/class_servGeneric.inc:233
+#: admin/systems/class_servGeneric.inc:240
 msgid "System analysis"
 msgstr "Analiza systemu"
 
-#: admin/systems/class_servGeneric.inc:233
+#: admin/systems/class_servGeneric.inc:235
 msgid "Wake up"
 msgstr "Zbudź"
 
-#: admin/systems/class_servGeneric.inc:369
+#: admin/systems/class_servGeneric.inc:371
 #, fuzzy
 msgid "Software deployment"
 msgstr "Zarządzanie systemem"
 
-#: admin/systems/class_servGeneric.inc:370
+#: admin/systems/class_servGeneric.inc:372
 msgid ""
 "This host is currently installing, if you really want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:503
+#: admin/systems/class_servGeneric.inc:505
 #: admin/systems/class_componentGeneric.inc:309
 msgid "Generic"
 msgstr "Ogólne"
 
-#: admin/systems/class_servGeneric.inc:504
+#: admin/systems/class_servGeneric.inc:506
 #, fuzzy
 msgid "Server generic"
 msgstr "Nazwa serwera"
 
-#: admin/systems/class_servGeneric.inc:513 admin/systems/server.tpl:14
+#: admin/systems/class_servGeneric.inc:515 admin/systems/server.tpl:14
 #: admin/systems/class_componentGeneric.inc:320 admin/systems/component.tpl:35
 msgid "Description"
 msgstr "Opis"
 
-#: admin/systems/class_servGeneric.inc:516
+#: admin/systems/class_servGeneric.inc:518
 #, fuzzy
 msgid "Goto mode"
 msgstr "do folferu"
 
-#: admin/systems/class_servGeneric.inc:517
+#: admin/systems/class_servGeneric.inc:519
 #: admin/systems/class_componentGeneric.inc:321
 #, fuzzy
 msgid "Root password"
 msgstr "Ustaw hasło"
 
-#: admin/systems/class_servGeneric.inc:518
+#: admin/systems/class_servGeneric.inc:520
 msgid "Action flag"
 msgstr "Flaga akcji"
 
@@ -1050,14 +1050,14 @@ msgid "IP address %s"
 msgstr "adres IP"
 
 #: admin/systems/class_termDNS.inc:611 admin/systems/class_termDNS.inc:623
-#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1006
+#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1010
 #: admin/systems/class_componentGeneric.inc:219
 #: admin/systems/class_componentGeneric.inc:222
 msgid "IP address"
 msgstr "adres IP"
 
 #: admin/systems/class_termDNS.inc:616 admin/systems/class_termDNS.inc:633
-#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1007
+#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1011
 msgid "MAC address"
 msgstr "Adres MAC"
 
@@ -1090,28 +1090,28 @@ msgstr ""
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr "Tylko małe litery są dozwolone, proszę sprawdzić '%s'."
 
-#: admin/systems/class_termDNS.inc:946 admin/systems/class_termDNS.inc:966
+#: admin/systems/class_termDNS.inc:950 admin/systems/class_termDNS.inc:970
 msgid "Add"
 msgstr "Dodaj"
 
-#: admin/systems/class_termDNS.inc:960
+#: admin/systems/class_termDNS.inc:964
 msgid "Delete"
 msgstr "Usuń"
 
-#: admin/systems/class_termDNS.inc:997
+#: admin/systems/class_termDNS.inc:1001
 msgid "DNS"
 msgstr "DNS"
 
-#: admin/systems/class_termDNS.inc:998
+#: admin/systems/class_termDNS.inc:1002
 msgid "DNS settings"
 msgstr "Ustawienia DNS"
 
-#: admin/systems/class_termDNS.inc:1013
+#: admin/systems/class_termDNS.inc:1017
 #, fuzzy
 msgid "DNS configuration"
 msgstr "Konfiguracja bazy FAX"
 
-#: admin/systems/class_termDNS.inc:1016
+#: admin/systems/class_termDNS.inc:1020
 #, fuzzy
 msgid "DHCP configuration"
 msgstr "Konfiguracja bazy FAX"
diff --git a/gosa-plugins/systems/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/systems/locale/ru/LC_MESSAGES/messages.po
index 88529db15..f9a35e109 100644
--- a/gosa-plugins/systems/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/systems/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -69,16 +69,16 @@ msgstr ""
 "Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
 
 #: admin/systems/class_systemManagement.inc:369
-#: admin/systems/class_systemManagement.inc:489
-#: admin/systems/class_systemManagement.inc:526
-#: admin/systems/class_systemManagement.inc:534
-#: admin/systems/class_systemManagement.inc:584
-#: admin/systems/class_systemManagement.inc:592
-#: admin/systems/class_systemManagement.inc:607
-#: admin/systems/class_systemManagement.inc:615
-#: admin/systems/class_systemManagement.inc:654
-#: admin/systems/class_systemManagement.inc:748
-#: admin/systems/class_systemManagement.inc:1313
+#: admin/systems/class_systemManagement.inc:486
+#: admin/systems/class_systemManagement.inc:523
+#: admin/systems/class_systemManagement.inc:531
+#: admin/systems/class_systemManagement.inc:581
+#: admin/systems/class_systemManagement.inc:589
+#: admin/systems/class_systemManagement.inc:604
+#: admin/systems/class_systemManagement.inc:612
+#: admin/systems/class_systemManagement.inc:651
+#: admin/systems/class_systemManagement.inc:745
+#: admin/systems/class_systemManagement.inc:1306
 #: admin/systems/class_serverService.inc:186
 #: admin/systems/class_serverService.inc:236
 #: admin/systems/class_serverService.inc:363
@@ -122,15 +122,15 @@ msgstr "Терминал-сервер"
 msgid "Cannot set mode to 'active'!"
 msgstr "Список подразделений"
 
-#: admin/systems/class_systemManagement.inc:615
+#: admin/systems/class_systemManagement.inc:612
 #: admin/systems/.svn/tmp/tempfile.tmp:606
 #: admin/systems/.svn/tmp/tempfile.2.tmp:610
 msgid "Editing this type of object is not supported yet!"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:642
-#: admin/systems/class_systemManagement.inc:745
-#: admin/systems/class_systemManagement.inc:974
+#: admin/systems/class_systemManagement.inc:639
+#: admin/systems/class_systemManagement.inc:742
+#: admin/systems/class_systemManagement.inc:971
 #: admin/systems/.svn/tmp/tempfile.tmp:633
 #: admin/systems/.svn/tmp/tempfile.tmp:736
 #: admin/systems/.svn/tmp/tempfile.tmp:965
@@ -141,8 +141,8 @@ msgstr ""
 msgid "Permission error"
 msgstr "Права для членов группы"
 
-#: admin/systems/class_systemManagement.inc:642
-#: admin/systems/class_systemManagement.inc:745
+#: admin/systems/class_systemManagement.inc:639
+#: admin/systems/class_systemManagement.inc:742
 #: admin/systems/.svn/tmp/tempfile.tmp:633
 #: admin/systems/.svn/tmp/tempfile.tmp:736
 #: admin/systems/.svn/tmp/tempfile.2.tmp:637
@@ -151,7 +151,7 @@ msgstr "Права для членов группы"
 msgid "You have no permission to change this password!"
 msgstr "Вам не разрешено менять пароль."
 
-#: admin/systems/class_systemManagement.inc:654
+#: admin/systems/class_systemManagement.inc:651
 #: admin/systems/.svn/tmp/tempfile.tmp:645
 #: admin/systems/.svn/tmp/tempfile.2.tmp:649
 #, fuzzy
@@ -160,21 +160,21 @@ msgid ""
 "not match!"
 msgstr "Введенные пароли не совпадают!"
 
-#: admin/systems/class_systemManagement.inc:729
+#: admin/systems/class_systemManagement.inc:726
 #: admin/systems/.svn/tmp/tempfile.tmp:720
 #: admin/systems/.svn/tmp/tempfile.2.tmp:724
 #, fuzzy
 msgid "Password method"
 msgstr "Хэширование паролей"
 
-#: admin/systems/class_systemManagement.inc:729
+#: admin/systems/class_systemManagement.inc:726
 #: admin/systems/.svn/tmp/tempfile.tmp:720
 #: admin/systems/.svn/tmp/tempfile.2.tmp:724
 msgid "Password method crypt is missing. Cannot set system password."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:735
-#: admin/systems/class_systemManagement.inc:1846
+#: admin/systems/class_systemManagement.inc:732
+#: admin/systems/class_systemManagement.inc:1841
 #: admin/systems/services/class_goService.inc:122
 #: admin/systems/services/class_goService.inc:150
 #: admin/systems/services/class_goService.inc:183
@@ -182,42 +182,42 @@ msgstr ""
 #: admin/systems/.svn/tmp/tempfile.tmp:1833
 #: admin/systems/.svn/tmp/tempfile.2.tmp:730
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1837
-#: admin/systems/class_servGeneric.inc:281
-#: admin/systems/class_servGeneric.inc:433 admin/systems/class_termDNS.inc:488
+#: admin/systems/class_servGeneric.inc:283
+#: admin/systems/class_servGeneric.inc:435 admin/systems/class_termDNS.inc:488
 #: admin/systems/class_termDNS.inc:794 admin/systems/class_termDNS.inc:813
 #: admin/systems/class_termDNS.inc:834 admin/systems/class_termDNS.inc:839
-#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:929
+#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:933
 #: admin/systems/class_componentGeneric.inc:160
 #: admin/systems/class_componentGeneric.inc:301
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
 
-#: admin/systems/class_systemManagement.inc:748
+#: admin/systems/class_systemManagement.inc:745
 #: admin/systems/.svn/tmp/tempfile.tmp:739
 #: admin/systems/.svn/tmp/tempfile.2.tmp:743
 #, fuzzy
 msgid "Cannot determine object to change password!"
 msgstr "Сменить пароль"
 
-#: admin/systems/class_systemManagement.inc:855
+#: admin/systems/class_systemManagement.inc:852
 #: admin/systems/.svn/tmp/tempfile.tmp:846
 #: admin/systems/.svn/tmp/tempfile.2.tmp:850
-#: admin/systems/class_servGeneric.inc:165
-#: admin/systems/class_servGeneric.inc:453
+#: admin/systems/class_servGeneric.inc:167
+#: admin/systems/class_servGeneric.inc:455
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "Имя сервера"
 
-#: admin/systems/class_systemManagement.inc:900
+#: admin/systems/class_systemManagement.inc:897
 #: admin/systems/.svn/tmp/tempfile.tmp:891
 #: admin/systems/.svn/tmp/tempfile.2.tmp:895
 #, fuzzy
 msgid "Permission"
 msgstr "Права для членов группы"
 
-#: admin/systems/class_systemManagement.inc:1342
-#: admin/systems/class_systemManagement.inc:1657
+#: admin/systems/class_systemManagement.inc:1335
+#: admin/systems/class_systemManagement.inc:1652
 #: admin/systems/.svn/tmp/tempfile.tmp:1330
 #: admin/systems/.svn/tmp/tempfile.tmp:1644
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1334
@@ -225,8 +225,8 @@ msgstr "Права для членов группы"
 msgid "New terminal"
 msgstr "Создать терминал"
 
-#: admin/systems/class_systemManagement.inc:1344
-#: admin/systems/class_systemManagement.inc:1658
+#: admin/systems/class_systemManagement.inc:1337
+#: admin/systems/class_systemManagement.inc:1653
 #: admin/systems/.svn/tmp/tempfile.tmp:1332
 #: admin/systems/.svn/tmp/tempfile.tmp:1645
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1336
@@ -234,47 +234,47 @@ msgstr "Создать терминал"
 msgid "New workstation"
 msgstr "Новая рабочая станция"
 
-#: admin/systems/class_systemManagement.inc:1346
+#: admin/systems/class_systemManagement.inc:1339
 #: admin/systems/.svn/tmp/tempfile.tmp:1334
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1338
 #, fuzzy
 msgid "Unknown device"
 msgstr "состояние неизвестно"
 
-#: admin/systems/class_systemManagement.inc:1348
+#: admin/systems/class_systemManagement.inc:1341
 #: admin/systems/.svn/tmp/tempfile.tmp:1336
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1340
 #, fuzzy
 msgid "New Device"
 msgstr "Сетевые устройства"
 
-#: admin/systems/class_systemManagement.inc:1373
+#: admin/systems/class_systemManagement.inc:1366
 #: admin/systems/.svn/tmp/tempfile.tmp:1361
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1365
 #, fuzzy
 msgid "Terminal template for"
 msgstr "Шаблон терминала"
 
-#: admin/systems/class_systemManagement.inc:1389
+#: admin/systems/class_systemManagement.inc:1382
 #: admin/systems/.svn/tmp/tempfile.tmp:1377
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1381
 msgid "Workstation template for"
 msgstr "Шаблон рабочей станции для"
 
-#: admin/systems/class_systemManagement.inc:1634
+#: admin/systems/class_systemManagement.inc:1629
 #: admin/systems/.svn/tmp/tempfile.tmp:1621
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1625
 msgid "Template"
 msgstr "Шаблон"
 
-#: admin/systems/class_systemManagement.inc:1635
+#: admin/systems/class_systemManagement.inc:1630
 #: admin/systems/class_divListSystem.inc:199
 #: admin/systems/.svn/tmp/tempfile.tmp:1622
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1626
 msgid "Phone"
 msgstr "Телефон"
 
-#: admin/systems/class_systemManagement.inc:1636
+#: admin/systems/class_systemManagement.inc:1631
 #: admin/systems/.svn/tmp/tempfile.tmp:1623
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1627
 #: admin/systems/class_componentGeneric.inc:315
@@ -282,36 +282,36 @@ msgstr "Телефон"
 msgid "Network device"
 msgstr "Сетевые устройства"
 
-#: admin/systems/class_systemManagement.inc:1637
+#: admin/systems/class_systemManagement.inc:1632
 #: admin/systems/class_divListSystem.inc:203
 #: admin/systems/.svn/tmp/tempfile.tmp:1624
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1628
 msgid "Printer"
 msgstr "Принтер"
 
-#: admin/systems/class_systemManagement.inc:1639
+#: admin/systems/class_systemManagement.inc:1634
 #: admin/systems/.svn/tmp/tempfile.tmp:1626
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1630
 #, fuzzy
 msgid "Windows workstation"
 msgstr "Показать рабочие станции"
 
-#: admin/systems/class_systemManagement.inc:1641
+#: admin/systems/class_systemManagement.inc:1636
 #: admin/systems/class_divListSystem.inc:191
 #: admin/systems/.svn/tmp/tempfile.tmp:1628
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1632
 msgid "Workstation"
 msgstr "Рабочая станция"
 
-#: admin/systems/class_systemManagement.inc:1642
+#: admin/systems/class_systemManagement.inc:1637
 #: admin/systems/class_divListSystem.inc:195
 #: admin/systems/.svn/tmp/tempfile.tmp:1629
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1633
-#: admin/systems/class_servGeneric.inc:509
+#: admin/systems/class_servGeneric.inc:511
 msgid "Server"
 msgstr "Сервер"
 
-#: admin/systems/class_systemManagement.inc:1643
+#: admin/systems/class_systemManagement.inc:1638
 #: admin/systems/class_divListSystem.inc:187
 #: admin/systems/.svn/tmp/tempfile.tmp:1630
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1634
@@ -319,70 +319,70 @@ msgstr "Сервер"
 msgid "Terminal"
 msgstr "Терминалы"
 
-#: admin/systems/class_systemManagement.inc:1645
+#: admin/systems/class_systemManagement.inc:1640
 #: admin/systems/.svn/tmp/tempfile.tmp:1632
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1636
 #, fuzzy
 msgid "Locked workstation"
 msgstr "Новая рабочая станция"
 
-#: admin/systems/class_systemManagement.inc:1646
+#: admin/systems/class_systemManagement.inc:1641
 #: admin/systems/.svn/tmp/tempfile.tmp:1633
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1637
 #, fuzzy
 msgid "Locked server"
 msgstr "Сервер подкачки"
 
-#: admin/systems/class_systemManagement.inc:1647
+#: admin/systems/class_systemManagement.inc:1642
 #: admin/systems/.svn/tmp/tempfile.tmp:1634
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1638
 #, fuzzy
 msgid "Locked terminal"
 msgstr "Создать терминал"
 
-#: admin/systems/class_systemManagement.inc:1649
+#: admin/systems/class_systemManagement.inc:1644
 #: admin/systems/.svn/tmp/tempfile.tmp:1636
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1640
 #, fuzzy
 msgid "Workstation error"
 msgstr "Рабочая станция"
 
-#: admin/systems/class_systemManagement.inc:1650
+#: admin/systems/class_systemManagement.inc:1645
 #: admin/systems/.svn/tmp/tempfile.tmp:1637
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1641
 #, fuzzy
 msgid "Server error"
 msgstr "Имя сервера"
 
-#: admin/systems/class_systemManagement.inc:1651
+#: admin/systems/class_systemManagement.inc:1646
 #: admin/systems/.svn/tmp/tempfile.tmp:1638
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1642
 #, fuzzy
 msgid "Terminal error"
 msgstr "Терминал-сервер"
 
-#: admin/systems/class_systemManagement.inc:1653
+#: admin/systems/class_systemManagement.inc:1648
 #: admin/systems/.svn/tmp/tempfile.tmp:1640
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1644
 #, fuzzy
 msgid "Workstation busy"
 msgstr "Рабочая станция"
 
-#: admin/systems/class_systemManagement.inc:1654
+#: admin/systems/class_systemManagement.inc:1649
 #: admin/systems/.svn/tmp/tempfile.tmp:1641
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1645
 #, fuzzy
 msgid "Server busy"
 msgstr "Серверы"
 
-#: admin/systems/class_systemManagement.inc:1656
+#: admin/systems/class_systemManagement.inc:1651
 #: admin/systems/.svn/tmp/tempfile.tmp:1643
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1647
 #, fuzzy
 msgid "New system from incoming"
 msgstr "Системная информация"
 
-#: admin/systems/class_systemManagement.inc:1662
+#: admin/systems/class_systemManagement.inc:1657
 #: admin/systems/class_divListSystem.inc:214
 #: admin/systems/.svn/tmp/tempfile.tmp:1649
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1653
@@ -390,8 +390,8 @@ msgstr "Системная информация"
 msgid "Opsi client"
 msgstr "Тонкий клиент"
 
-#: admin/systems/class_systemManagement.inc:1862
-#: admin/systems/class_systemManagement.inc:1863
+#: admin/systems/class_systemManagement.inc:1857
+#: admin/systems/class_systemManagement.inc:1858
 #: admin/systems/.svn/tmp/tempfile.tmp:1849
 #: admin/systems/.svn/tmp/tempfile.tmp:1850
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1853
@@ -400,7 +400,7 @@ msgstr "Тонкий клиент"
 msgid "Incoming objects"
 msgstr "Включаемые объекты"
 
-#: admin/systems/class_systemManagement.inc:1868
+#: admin/systems/class_systemManagement.inc:1863
 #: admin/systems/.svn/tmp/tempfile.tmp:1855
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1859
 #, fuzzy
@@ -565,7 +565,7 @@ msgid "Display systems of user"
 msgstr "Показать адреса пользователя"
 
 #: admin/systems/class_divListSystem.inc:176
-#: admin/systems/class_servGeneric.inc:514 admin/systems/server.tpl:22
+#: admin/systems/class_servGeneric.inc:516 admin/systems/server.tpl:22
 #: admin/systems/class_componentGeneric.inc:319 admin/systems/component.tpl:17
 msgid "Base"
 msgstr "Ветка"
@@ -718,9 +718,9 @@ msgstr ""
 msgid "Cannot update service status!"
 msgstr "Невозможно выбрать базу данных!"
 
-#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:339
-#: admin/systems/class_servGeneric.inc:344
-#: admin/systems/class_servGeneric.inc:355 admin/systems/server.tpl:6
+#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:341
+#: admin/systems/class_servGeneric.inc:346
+#: admin/systems/class_servGeneric.inc:357 admin/systems/server.tpl:6
 msgid "Server name"
 msgstr "Имя сервера"
 
@@ -760,7 +760,7 @@ msgstr ""
 "были запущены."
 
 #: admin/systems/class_divListSystemService.inc:50
-#: admin/systems/class_servGeneric.inc:512
+#: admin/systems/class_servGeneric.inc:514
 #: admin/systems/class_componentGeneric.inc:318
 msgid "Name"
 msgstr "Фамилия"
@@ -940,112 +940,112 @@ msgstr "Подтверждение"
 msgid "Password strength"
 msgstr "Хэширование паролей"
 
-#: admin/systems/class_servGeneric.inc:86
+#: admin/systems/class_servGeneric.inc:82
 #, fuzzy
 msgid "Activated"
 msgstr "Личный"
 
-#: admin/systems/class_servGeneric.inc:87
+#: admin/systems/class_servGeneric.inc:83
 msgid "Locked"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:148
+#: admin/systems/class_servGeneric.inc:150
 #, fuzzy
 msgid "server"
 msgstr "Сервер"
 
-#: admin/systems/class_servGeneric.inc:169
+#: admin/systems/class_servGeneric.inc:171
 #, fuzzy
 msgid "Event error"
 msgstr "Состояние системы"
 
-#: admin/systems/class_servGeneric.inc:170
+#: admin/systems/class_servGeneric.inc:172
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "Сменить пароль"
 
-#: admin/systems/class_servGeneric.inc:225
+#: admin/systems/class_servGeneric.inc:227
 msgid "Switch off"
 msgstr "Выключить"
 
-#: admin/systems/class_servGeneric.inc:225
+#: admin/systems/class_servGeneric.inc:227
 msgid "Reboot"
 msgstr "Перезагрузить"
 
-#: admin/systems/class_servGeneric.inc:226
-#: admin/systems/class_servGeneric.inc:235
+#: admin/systems/class_servGeneric.inc:228
+#: admin/systems/class_servGeneric.inc:237
 #, fuzzy
 msgid "System update"
 msgstr "Подразделение"
 
-#: admin/systems/class_servGeneric.inc:227
-#: admin/systems/class_servGeneric.inc:234
+#: admin/systems/class_servGeneric.inc:229
+#: admin/systems/class_servGeneric.inc:236
 msgid "Reinstall"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:228
+#: admin/systems/class_servGeneric.inc:230
 #, fuzzy
 msgid "Rescan hardware"
 msgstr "Телефонное оборудование"
 
-#: admin/systems/class_servGeneric.inc:229
-#: admin/systems/class_servGeneric.inc:236
+#: admin/systems/class_servGeneric.inc:231
+#: admin/systems/class_servGeneric.inc:238
 #, fuzzy
 msgid "Memory test"
 msgstr "Память"
 
-#: admin/systems/class_servGeneric.inc:230
-#: admin/systems/class_servGeneric.inc:237
+#: admin/systems/class_servGeneric.inc:232
+#: admin/systems/class_servGeneric.inc:239
 msgid "Force localboot"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:231
-#: admin/systems/class_servGeneric.inc:238
+#: admin/systems/class_servGeneric.inc:233
+#: admin/systems/class_servGeneric.inc:240
 #, fuzzy
 msgid "System analysis"
 msgstr "Системные журналы"
 
-#: admin/systems/class_servGeneric.inc:233
+#: admin/systems/class_servGeneric.inc:235
 msgid "Wake up"
 msgstr "Вернуть в обычный режим"
 
-#: admin/systems/class_servGeneric.inc:369
+#: admin/systems/class_servGeneric.inc:371
 #, fuzzy
 msgid "Software deployment"
 msgstr "Управление системами"
 
-#: admin/systems/class_servGeneric.inc:370
+#: admin/systems/class_servGeneric.inc:372
 msgid ""
 "This host is currently installing, if you really want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:503
+#: admin/systems/class_servGeneric.inc:505
 #: admin/systems/class_componentGeneric.inc:309
 msgid "Generic"
 msgstr "Общее"
 
-#: admin/systems/class_servGeneric.inc:504
+#: admin/systems/class_servGeneric.inc:506
 #, fuzzy
 msgid "Server generic"
 msgstr "Имя сервера"
 
-#: admin/systems/class_servGeneric.inc:513 admin/systems/server.tpl:14
+#: admin/systems/class_servGeneric.inc:515 admin/systems/server.tpl:14
 #: admin/systems/class_componentGeneric.inc:320 admin/systems/component.tpl:35
 msgid "Description"
 msgstr "Описание"
 
-#: admin/systems/class_servGeneric.inc:516
+#: admin/systems/class_servGeneric.inc:518
 #, fuzzy
 msgid "Goto mode"
 msgstr "в папку"
 
-#: admin/systems/class_servGeneric.inc:517
+#: admin/systems/class_servGeneric.inc:519
 #: admin/systems/class_componentGeneric.inc:321
 #, fuzzy
 msgid "Root password"
 msgstr "Изменить пароль"
 
-#: admin/systems/class_servGeneric.inc:518
+#: admin/systems/class_servGeneric.inc:520
 #, fuzzy
 msgid "Action flag"
 msgstr "Действие"
@@ -1097,7 +1097,7 @@ msgid "IP address %s"
 msgstr "IP-адрес"
 
 #: admin/systems/class_termDNS.inc:611 admin/systems/class_termDNS.inc:623
-#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1006
+#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1010
 #: admin/systems/class_componentGeneric.inc:219
 #: admin/systems/class_componentGeneric.inc:222
 #, fuzzy
@@ -1105,7 +1105,7 @@ msgid "IP address"
 msgstr "IP-адрес"
 
 #: admin/systems/class_termDNS.inc:616 admin/systems/class_termDNS.inc:633
-#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1007
+#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1011
 #, fuzzy
 msgid "MAC address"
 msgstr "MAC-адрес"
@@ -1137,30 +1137,30 @@ msgstr ""
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:946 admin/systems/class_termDNS.inc:966
+#: admin/systems/class_termDNS.inc:950 admin/systems/class_termDNS.inc:970
 msgid "Add"
 msgstr "Добавить"
 
-#: admin/systems/class_termDNS.inc:960
+#: admin/systems/class_termDNS.inc:964
 msgid "Delete"
 msgstr "Удалить"
 
-#: admin/systems/class_termDNS.inc:997
+#: admin/systems/class_termDNS.inc:1001
 #, fuzzy
 msgid "DNS"
 msgstr "DNS"
 
-#: admin/systems/class_termDNS.inc:998
+#: admin/systems/class_termDNS.inc:1002
 #, fuzzy
 msgid "DNS settings"
 msgstr "Настройки Samba"
 
-#: admin/systems/class_termDNS.inc:1013
+#: admin/systems/class_termDNS.inc:1017
 #, fuzzy
 msgid "DNS configuration"
 msgstr "Базы данных"
 
-#: admin/systems/class_termDNS.inc:1016
+#: admin/systems/class_termDNS.inc:1020
 #, fuzzy
 msgid "DHCP configuration"
 msgstr "Базы данных"
diff --git a/gosa-plugins/systems/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/systems/locale/zh/LC_MESSAGES/messages.po
index dd95cbd69..d239134e1 100644
--- a/gosa-plugins/systems/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/systems/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -68,16 +68,16 @@ msgid "Command '%s', specified for ISO creation doesn't seem to exist."
 msgstr "命令 '%s'，用于创建 ISO 好像并不存在。"
 
 #: admin/systems/class_systemManagement.inc:369
-#: admin/systems/class_systemManagement.inc:489
-#: admin/systems/class_systemManagement.inc:526
-#: admin/systems/class_systemManagement.inc:534
-#: admin/systems/class_systemManagement.inc:584
-#: admin/systems/class_systemManagement.inc:592
-#: admin/systems/class_systemManagement.inc:607
-#: admin/systems/class_systemManagement.inc:615
-#: admin/systems/class_systemManagement.inc:654
-#: admin/systems/class_systemManagement.inc:748
-#: admin/systems/class_systemManagement.inc:1313
+#: admin/systems/class_systemManagement.inc:486
+#: admin/systems/class_systemManagement.inc:523
+#: admin/systems/class_systemManagement.inc:531
+#: admin/systems/class_systemManagement.inc:581
+#: admin/systems/class_systemManagement.inc:589
+#: admin/systems/class_systemManagement.inc:604
+#: admin/systems/class_systemManagement.inc:612
+#: admin/systems/class_systemManagement.inc:651
+#: admin/systems/class_systemManagement.inc:745
+#: admin/systems/class_systemManagement.inc:1306
 #: admin/systems/class_serverService.inc:186
 #: admin/systems/class_serverService.inc:236
 #: admin/systems/class_serverService.inc:363
@@ -121,15 +121,15 @@ msgstr "终端服务器"
 msgid "Cannot set mode to 'active'!"
 msgstr "转到根部门"
 
-#: admin/systems/class_systemManagement.inc:615
+#: admin/systems/class_systemManagement.inc:612
 #: admin/systems/.svn/tmp/tempfile.tmp:606
 #: admin/systems/.svn/tmp/tempfile.2.tmp:610
 msgid "Editing this type of object is not supported yet!"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:642
-#: admin/systems/class_systemManagement.inc:745
-#: admin/systems/class_systemManagement.inc:974
+#: admin/systems/class_systemManagement.inc:639
+#: admin/systems/class_systemManagement.inc:742
+#: admin/systems/class_systemManagement.inc:971
 #: admin/systems/.svn/tmp/tempfile.tmp:633
 #: admin/systems/.svn/tmp/tempfile.tmp:736
 #: admin/systems/.svn/tmp/tempfile.tmp:965
@@ -140,8 +140,8 @@ msgstr ""
 msgid "Permission error"
 msgstr "允许"
 
-#: admin/systems/class_systemManagement.inc:642
-#: admin/systems/class_systemManagement.inc:745
+#: admin/systems/class_systemManagement.inc:639
+#: admin/systems/class_systemManagement.inc:742
 #: admin/systems/.svn/tmp/tempfile.tmp:633
 #: admin/systems/.svn/tmp/tempfile.tmp:736
 #: admin/systems/.svn/tmp/tempfile.2.tmp:637
@@ -150,7 +150,7 @@ msgstr "允许"
 msgid "You have no permission to change this password!"
 msgstr "现在您无权修改您的口令"
 
-#: admin/systems/class_systemManagement.inc:654
+#: admin/systems/class_systemManagement.inc:651
 #: admin/systems/.svn/tmp/tempfile.tmp:645
 #: admin/systems/.svn/tmp/tempfile.2.tmp:649
 #, fuzzy
@@ -159,21 +159,21 @@ msgid ""
 "not match!"
 msgstr "输入的新口令和重复口令不匹配！"
 
-#: admin/systems/class_systemManagement.inc:729
+#: admin/systems/class_systemManagement.inc:726
 #: admin/systems/.svn/tmp/tempfile.tmp:720
 #: admin/systems/.svn/tmp/tempfile.2.tmp:724
 #, fuzzy
 msgid "Password method"
 msgstr "口令存储"
 
-#: admin/systems/class_systemManagement.inc:729
+#: admin/systems/class_systemManagement.inc:726
 #: admin/systems/.svn/tmp/tempfile.tmp:720
 #: admin/systems/.svn/tmp/tempfile.2.tmp:724
 msgid "Password method crypt is missing. Cannot set system password."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:735
-#: admin/systems/class_systemManagement.inc:1846
+#: admin/systems/class_systemManagement.inc:732
+#: admin/systems/class_systemManagement.inc:1841
 #: admin/systems/services/class_goService.inc:122
 #: admin/systems/services/class_goService.inc:150
 #: admin/systems/services/class_goService.inc:183
@@ -181,42 +181,42 @@ msgstr ""
 #: admin/systems/.svn/tmp/tempfile.tmp:1833
 #: admin/systems/.svn/tmp/tempfile.2.tmp:730
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1837
-#: admin/systems/class_servGeneric.inc:281
-#: admin/systems/class_servGeneric.inc:433 admin/systems/class_termDNS.inc:488
+#: admin/systems/class_servGeneric.inc:283
+#: admin/systems/class_servGeneric.inc:435 admin/systems/class_termDNS.inc:488
 #: admin/systems/class_termDNS.inc:794 admin/systems/class_termDNS.inc:813
 #: admin/systems/class_termDNS.inc:834 admin/systems/class_termDNS.inc:839
-#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:929
+#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:933
 #: admin/systems/class_componentGeneric.inc:160
 #: admin/systems/class_componentGeneric.inc:301
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
 
-#: admin/systems/class_systemManagement.inc:748
+#: admin/systems/class_systemManagement.inc:745
 #: admin/systems/.svn/tmp/tempfile.tmp:739
 #: admin/systems/.svn/tmp/tempfile.2.tmp:743
 #, fuzzy
 msgid "Cannot determine object to change password!"
 msgstr "无法检测对象名称。"
 
-#: admin/systems/class_systemManagement.inc:855
+#: admin/systems/class_systemManagement.inc:852
 #: admin/systems/.svn/tmp/tempfile.tmp:846
 #: admin/systems/.svn/tmp/tempfile.2.tmp:850
-#: admin/systems/class_servGeneric.inc:165
-#: admin/systems/class_servGeneric.inc:453
+#: admin/systems/class_servGeneric.inc:167
+#: admin/systems/class_servGeneric.inc:455
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "设备名称"
 
-#: admin/systems/class_systemManagement.inc:900
+#: admin/systems/class_systemManagement.inc:897
 #: admin/systems/.svn/tmp/tempfile.tmp:891
 #: admin/systems/.svn/tmp/tempfile.2.tmp:895
 #, fuzzy
 msgid "Permission"
 msgstr "允许"
 
-#: admin/systems/class_systemManagement.inc:1342
-#: admin/systems/class_systemManagement.inc:1657
+#: admin/systems/class_systemManagement.inc:1335
+#: admin/systems/class_systemManagement.inc:1652
 #: admin/systems/.svn/tmp/tempfile.tmp:1330
 #: admin/systems/.svn/tmp/tempfile.tmp:1644
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1334
@@ -224,8 +224,8 @@ msgstr "允许"
 msgid "New terminal"
 msgstr "新终端"
 
-#: admin/systems/class_systemManagement.inc:1344
-#: admin/systems/class_systemManagement.inc:1658
+#: admin/systems/class_systemManagement.inc:1337
+#: admin/systems/class_systemManagement.inc:1653
 #: admin/systems/.svn/tmp/tempfile.tmp:1332
 #: admin/systems/.svn/tmp/tempfile.tmp:1645
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1336
@@ -233,45 +233,45 @@ msgstr "新终端"
 msgid "New workstation"
 msgstr "新工作站"
 
-#: admin/systems/class_systemManagement.inc:1346
+#: admin/systems/class_systemManagement.inc:1339
 #: admin/systems/.svn/tmp/tempfile.tmp:1334
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1338
 #, fuzzy
 msgid "Unknown device"
 msgstr "未知"
 
-#: admin/systems/class_systemManagement.inc:1348
+#: admin/systems/class_systemManagement.inc:1341
 #: admin/systems/.svn/tmp/tempfile.tmp:1336
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1340
 msgid "New Device"
 msgstr "新设备"
 
-#: admin/systems/class_systemManagement.inc:1373
+#: admin/systems/class_systemManagement.inc:1366
 #: admin/systems/.svn/tmp/tempfile.tmp:1361
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1365
 msgid "Terminal template for"
 msgstr "终端模板"
 
-#: admin/systems/class_systemManagement.inc:1389
+#: admin/systems/class_systemManagement.inc:1382
 #: admin/systems/.svn/tmp/tempfile.tmp:1377
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1381
 msgid "Workstation template for"
 msgstr "工作站模板"
 
-#: admin/systems/class_systemManagement.inc:1634
+#: admin/systems/class_systemManagement.inc:1629
 #: admin/systems/.svn/tmp/tempfile.tmp:1621
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1625
 msgid "Template"
 msgstr "模板"
 
-#: admin/systems/class_systemManagement.inc:1635
+#: admin/systems/class_systemManagement.inc:1630
 #: admin/systems/class_divListSystem.inc:199
 #: admin/systems/.svn/tmp/tempfile.tmp:1622
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1626
 msgid "Phone"
 msgstr "电话"
 
-#: admin/systems/class_systemManagement.inc:1636
+#: admin/systems/class_systemManagement.inc:1631
 #: admin/systems/.svn/tmp/tempfile.tmp:1623
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1627
 #: admin/systems/class_componentGeneric.inc:315
@@ -279,106 +279,106 @@ msgstr "电话"
 msgid "Network device"
 msgstr "网络设备"
 
-#: admin/systems/class_systemManagement.inc:1637
+#: admin/systems/class_systemManagement.inc:1632
 #: admin/systems/class_divListSystem.inc:203
 #: admin/systems/.svn/tmp/tempfile.tmp:1624
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1628
 msgid "Printer"
 msgstr "打印机"
 
-#: admin/systems/class_systemManagement.inc:1639
+#: admin/systems/class_systemManagement.inc:1634
 #: admin/systems/.svn/tmp/tempfile.tmp:1626
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1630
 #, fuzzy
 msgid "Windows workstation"
 msgstr "显示工作站"
 
-#: admin/systems/class_systemManagement.inc:1641
+#: admin/systems/class_systemManagement.inc:1636
 #: admin/systems/class_divListSystem.inc:191
 #: admin/systems/.svn/tmp/tempfile.tmp:1628
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1632
 msgid "Workstation"
 msgstr "工作站"
 
-#: admin/systems/class_systemManagement.inc:1642
+#: admin/systems/class_systemManagement.inc:1637
 #: admin/systems/class_divListSystem.inc:195
 #: admin/systems/.svn/tmp/tempfile.tmp:1629
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1633
-#: admin/systems/class_servGeneric.inc:509
+#: admin/systems/class_servGeneric.inc:511
 msgid "Server"
 msgstr "服务器"
 
-#: admin/systems/class_systemManagement.inc:1643
+#: admin/systems/class_systemManagement.inc:1638
 #: admin/systems/class_divListSystem.inc:187
 #: admin/systems/.svn/tmp/tempfile.tmp:1630
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1634
 msgid "Terminal"
 msgstr "终端"
 
-#: admin/systems/class_systemManagement.inc:1645
+#: admin/systems/class_systemManagement.inc:1640
 #: admin/systems/.svn/tmp/tempfile.tmp:1632
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1636
 #, fuzzy
 msgid "Locked workstation"
 msgstr "新工作站"
 
-#: admin/systems/class_systemManagement.inc:1646
+#: admin/systems/class_systemManagement.inc:1641
 #: admin/systems/.svn/tmp/tempfile.tmp:1633
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1637
 #, fuzzy
 msgid "Locked server"
 msgstr "LDAP 服务器"
 
-#: admin/systems/class_systemManagement.inc:1647
+#: admin/systems/class_systemManagement.inc:1642
 #: admin/systems/.svn/tmp/tempfile.tmp:1634
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1638
 #, fuzzy
 msgid "Locked terminal"
 msgstr "新终端"
 
-#: admin/systems/class_systemManagement.inc:1649
+#: admin/systems/class_systemManagement.inc:1644
 #: admin/systems/.svn/tmp/tempfile.tmp:1636
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1640
 #, fuzzy
 msgid "Workstation error"
 msgstr "工作站"
 
-#: admin/systems/class_systemManagement.inc:1650
+#: admin/systems/class_systemManagement.inc:1645
 #: admin/systems/.svn/tmp/tempfile.tmp:1637
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1641
 #, fuzzy
 msgid "Server error"
 msgstr "服务器名称"
 
-#: admin/systems/class_systemManagement.inc:1651
+#: admin/systems/class_systemManagement.inc:1646
 #: admin/systems/.svn/tmp/tempfile.tmp:1638
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1642
 #, fuzzy
 msgid "Terminal error"
 msgstr "终端服务器"
 
-#: admin/systems/class_systemManagement.inc:1653
+#: admin/systems/class_systemManagement.inc:1648
 #: admin/systems/.svn/tmp/tempfile.tmp:1640
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1644
 #, fuzzy
 msgid "Workstation busy"
 msgstr "工作站"
 
-#: admin/systems/class_systemManagement.inc:1654
+#: admin/systems/class_systemManagement.inc:1649
 #: admin/systems/.svn/tmp/tempfile.tmp:1641
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1645
 #, fuzzy
 msgid "Server busy"
 msgstr "服务器"
 
-#: admin/systems/class_systemManagement.inc:1656
+#: admin/systems/class_systemManagement.inc:1651
 #: admin/systems/.svn/tmp/tempfile.tmp:1643
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1647
 #, fuzzy
 msgid "New system from incoming"
 msgstr "新识别的系统"
 
-#: admin/systems/class_systemManagement.inc:1662
+#: admin/systems/class_systemManagement.inc:1657
 #: admin/systems/class_divListSystem.inc:214
 #: admin/systems/.svn/tmp/tempfile.tmp:1649
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1653
@@ -386,8 +386,8 @@ msgstr "新识别的系统"
 msgid "Opsi client"
 msgstr "瘦客户机"
 
-#: admin/systems/class_systemManagement.inc:1862
-#: admin/systems/class_systemManagement.inc:1863
+#: admin/systems/class_systemManagement.inc:1857
+#: admin/systems/class_systemManagement.inc:1858
 #: admin/systems/.svn/tmp/tempfile.tmp:1849
 #: admin/systems/.svn/tmp/tempfile.tmp:1850
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1853
@@ -396,7 +396,7 @@ msgstr "瘦客户机"
 msgid "Incoming objects"
 msgstr "成员对象"
 
-#: admin/systems/class_systemManagement.inc:1868
+#: admin/systems/class_systemManagement.inc:1863
 #: admin/systems/.svn/tmp/tempfile.tmp:1855
 #: admin/systems/.svn/tmp/tempfile.2.tmp:1859
 #, fuzzy
@@ -560,7 +560,7 @@ msgid "Display systems of user"
 msgstr "显示用户系统"
 
 #: admin/systems/class_divListSystem.inc:176
-#: admin/systems/class_servGeneric.inc:514 admin/systems/server.tpl:22
+#: admin/systems/class_servGeneric.inc:516 admin/systems/server.tpl:22
 #: admin/systems/class_componentGeneric.inc:319 admin/systems/component.tpl:17
 msgid "Base"
 msgstr "位置"
@@ -705,9 +705,9 @@ msgstr ""
 msgid "Cannot update service status!"
 msgstr "无法打开指定证书！"
 
-#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:339
-#: admin/systems/class_servGeneric.inc:344
-#: admin/systems/class_servGeneric.inc:355 admin/systems/server.tpl:6
+#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:341
+#: admin/systems/class_servGeneric.inc:346
+#: admin/systems/class_servGeneric.inc:357 admin/systems/server.tpl:6
 msgid "Server name"
 msgstr "服务器名称"
 
@@ -746,7 +746,7 @@ msgstr ""
 "统。"
 
 #: admin/systems/class_divListSystemService.inc:50
-#: admin/systems/class_servGeneric.inc:512
+#: admin/systems/class_servGeneric.inc:514
 #: admin/systems/class_componentGeneric.inc:318
 msgid "Name"
 msgstr "名称"
@@ -919,108 +919,108 @@ msgstr "重复新口令"
 msgid "Password strength"
 msgstr "口令存储"
 
-#: admin/systems/class_servGeneric.inc:86
+#: admin/systems/class_servGeneric.inc:82
 msgid "Activated"
 msgstr "活动"
 
-#: admin/systems/class_servGeneric.inc:87
+#: admin/systems/class_servGeneric.inc:83
 msgid "Locked"
 msgstr "锁定"
 
-#: admin/systems/class_servGeneric.inc:148
+#: admin/systems/class_servGeneric.inc:150
 #, fuzzy
 msgid "server"
 msgstr "服务器"
 
-#: admin/systems/class_servGeneric.inc:169
+#: admin/systems/class_servGeneric.inc:171
 #, fuzzy
 msgid "Event error"
 msgstr "PHP 错误"
 
-#: admin/systems/class_servGeneric.inc:170
+#: admin/systems/class_servGeneric.inc:172
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "不允许修改口令"
 
-#: admin/systems/class_servGeneric.inc:225
+#: admin/systems/class_servGeneric.inc:227
 msgid "Switch off"
 msgstr "关闭"
 
-#: admin/systems/class_servGeneric.inc:225
+#: admin/systems/class_servGeneric.inc:227
 msgid "Reboot"
 msgstr "重启"
 
-#: admin/systems/class_servGeneric.inc:226
-#: admin/systems/class_servGeneric.inc:235
+#: admin/systems/class_servGeneric.inc:228
+#: admin/systems/class_servGeneric.inc:237
 #, fuzzy
 msgid "System update"
 msgstr "系统 / 部门"
 
-#: admin/systems/class_servGeneric.inc:227
-#: admin/systems/class_servGeneric.inc:234
+#: admin/systems/class_servGeneric.inc:229
+#: admin/systems/class_servGeneric.inc:236
 msgid "Reinstall"
 msgstr "重新安装"
 
-#: admin/systems/class_servGeneric.inc:228
+#: admin/systems/class_servGeneric.inc:230
 msgid "Rescan hardware"
 msgstr "重新扫描硬件"
 
-#: admin/systems/class_servGeneric.inc:229
-#: admin/systems/class_servGeneric.inc:236
+#: admin/systems/class_servGeneric.inc:231
+#: admin/systems/class_servGeneric.inc:238
 msgid "Memory test"
 msgstr "内存测试"
 
-#: admin/systems/class_servGeneric.inc:230
-#: admin/systems/class_servGeneric.inc:237
+#: admin/systems/class_servGeneric.inc:232
+#: admin/systems/class_servGeneric.inc:239
 msgid "Force localboot"
 msgstr "强制本地启动"
 
-#: admin/systems/class_servGeneric.inc:231
-#: admin/systems/class_servGeneric.inc:238
+#: admin/systems/class_servGeneric.inc:233
+#: admin/systems/class_servGeneric.inc:240
 msgid "System analysis"
 msgstr "系统分析"
 
-#: admin/systems/class_servGeneric.inc:233
+#: admin/systems/class_servGeneric.inc:235
 msgid "Wake up"
 msgstr "唤醒"
 
-#: admin/systems/class_servGeneric.inc:369
+#: admin/systems/class_servGeneric.inc:371
 #, fuzzy
 msgid "Software deployment"
 msgstr "系统管理"
 
-#: admin/systems/class_servGeneric.inc:370
+#: admin/systems/class_servGeneric.inc:372
 msgid ""
 "This host is currently installing, if you really want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:503
+#: admin/systems/class_servGeneric.inc:505
 #: admin/systems/class_componentGeneric.inc:309
 msgid "Generic"
 msgstr "通用配置"
 
-#: admin/systems/class_servGeneric.inc:504
+#: admin/systems/class_servGeneric.inc:506
 #, fuzzy
 msgid "Server generic"
 msgstr "服务器名称"
 
-#: admin/systems/class_servGeneric.inc:513 admin/systems/server.tpl:14
+#: admin/systems/class_servGeneric.inc:515 admin/systems/server.tpl:14
 #: admin/systems/class_componentGeneric.inc:320 admin/systems/component.tpl:35
 msgid "Description"
 msgstr "描述"
 
-#: admin/systems/class_servGeneric.inc:516
+#: admin/systems/class_servGeneric.inc:518
 #, fuzzy
 msgid "Goto mode"
 msgstr "到目录"
 
-#: admin/systems/class_servGeneric.inc:517
+#: admin/systems/class_servGeneric.inc:519
 #: admin/systems/class_componentGeneric.inc:321
 #, fuzzy
 msgid "Root password"
 msgstr "设置口令"
 
-#: admin/systems/class_servGeneric.inc:518
+#: admin/systems/class_servGeneric.inc:520
 #, fuzzy
 msgid "Action flag"
 msgstr "行动"
@@ -1069,7 +1069,7 @@ msgid "IP address %s"
 msgstr "IP 地址"
 
 #: admin/systems/class_termDNS.inc:611 admin/systems/class_termDNS.inc:623
-#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1006
+#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1010
 #: admin/systems/class_componentGeneric.inc:219
 #: admin/systems/class_componentGeneric.inc:222
 #, fuzzy
@@ -1077,7 +1077,7 @@ msgid "IP address"
 msgstr "IP 地址"
 
 #: admin/systems/class_termDNS.inc:616 admin/systems/class_termDNS.inc:633
-#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1007
+#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1011
 msgid "MAC address"
 msgstr "MAC 地址"
 
@@ -1108,29 +1108,29 @@ msgstr "设备 IP '%s' 将自动作为'A'记录添加，请删除这条记录。
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr "只允许小写字母，请检查您的 '%ss'。"
 
-#: admin/systems/class_termDNS.inc:946 admin/systems/class_termDNS.inc:966
+#: admin/systems/class_termDNS.inc:950 admin/systems/class_termDNS.inc:970
 msgid "Add"
 msgstr "添加"
 
-#: admin/systems/class_termDNS.inc:960
+#: admin/systems/class_termDNS.inc:964
 msgid "Delete"
 msgstr "删除"
 
-#: admin/systems/class_termDNS.inc:997
+#: admin/systems/class_termDNS.inc:1001
 msgid "DNS"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:998
+#: admin/systems/class_termDNS.inc:1002
 #, fuzzy
 msgid "DNS settings"
 msgstr "Samba 设置"
 
-#: admin/systems/class_termDNS.inc:1013
+#: admin/systems/class_termDNS.inc:1017
 #, fuzzy
 msgid "DNS configuration"
 msgstr "PHP 安装检查"
 
-#: admin/systems/class_termDNS.inc:1016
+#: admin/systems/class_termDNS.inc:1020
 #, fuzzy
 msgid "DHCP configuration"
 msgstr "PHP 安装检查"
diff --git a/gosa-plugins/uw-imap/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/uw-imap/locale/de/LC_MESSAGES/messages.po
index e667ea6a4..ace33f20e 100644
--- a/gosa-plugins/uw-imap/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/uw-imap/locale/de/LC_MESSAGES/messages.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2009-02-27 09:56+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
diff --git a/gosa-plugins/uw-imap/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/uw-imap/locale/es/LC_MESSAGES/messages.po
index fe7665e4e..1e2f6bded 100644
--- a/gosa-plugins/uw-imap/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/uw-imap/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2008-12-08 11:29+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <kde-i18n-doc@lists.kde.org>\n"
diff --git a/gosa-plugins/uw-imap/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/uw-imap/locale/fr/LC_MESSAGES/messages.po
index bd40390f4..c3538d307 100644
--- a/gosa-plugins/uw-imap/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/uw-imap/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2009-03-06 23:13+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
diff --git a/gosa-plugins/uw-imap/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/uw-imap/locale/it/LC_MESSAGES/messages.po
index 21a95f75e..6e6822543 100644
--- a/gosa-plugins/uw-imap/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/uw-imap/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
diff --git a/gosa-plugins/uw-imap/locale/messages.po b/gosa-plugins/uw-imap/locale/messages.po
index 8c7c9c935..8dfad2699 100644
--- a/gosa-plugins/uw-imap/locale/messages.po
+++ b/gosa-plugins/uw-imap/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gosa-plugins/uw-imap/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/uw-imap/locale/nl/LC_MESSAGES/messages.po
index 9700ceda6..12a248bf9 100644
--- a/gosa-plugins/uw-imap/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/uw-imap/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
diff --git a/gosa-plugins/uw-imap/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/uw-imap/locale/pl/LC_MESSAGES/messages.po
index f9ff0ebd9..4e8470472 100644
--- a/gosa-plugins/uw-imap/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/uw-imap/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
diff --git a/gosa-plugins/uw-imap/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/uw-imap/locale/ru/LC_MESSAGES/messages.po
index a46b0cd0f..97a9ad556 100644
--- a/gosa-plugins/uw-imap/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/uw-imap/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
diff --git a/gosa-plugins/uw-imap/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/uw-imap/locale/zh/LC_MESSAGES/messages.po
index 67f0847b3..13a2a961b 100644
--- a/gosa-plugins/uw-imap/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/uw-imap/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:06+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
diff --git a/gosa-plugins/webdav/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/webdav/locale/de/LC_MESSAGES/messages.po
index 7e9557fc6..ea5af6f3a 100644
--- a/gosa-plugins/webdav/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/webdav/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:07+0100\n"
 "PO-Revision-Date: 2008-04-03 16:04+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
diff --git a/gosa-plugins/webdav/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/webdav/locale/es/LC_MESSAGES/messages.po
index 32538b8a6..c73f44a4a 100644
--- a/gosa-plugins/webdav/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/webdav/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:07+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
diff --git a/gosa-plugins/webdav/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/webdav/locale/fr/LC_MESSAGES/messages.po
index e389c6e02..e70130a14 100644
--- a/gosa-plugins/webdav/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/webdav/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:07+0100\n"
 "PO-Revision-Date: 2007-07-19 11:57+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
diff --git a/gosa-plugins/webdav/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/webdav/locale/it/LC_MESSAGES/messages.po
index 66d5b7166..8e7edca75 100644
--- a/gosa-plugins/webdav/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/webdav/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:07+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
diff --git a/gosa-plugins/webdav/locale/messages.po b/gosa-plugins/webdav/locale/messages.po
index a8e37b3c3..0d65861df 100644
--- a/gosa-plugins/webdav/locale/messages.po
+++ b/gosa-plugins/webdav/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gosa-plugins/webdav/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/webdav/locale/nl/LC_MESSAGES/messages.po
index bc6dc119c..36ee41b89 100644
--- a/gosa-plugins/webdav/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/webdav/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:07+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
diff --git a/gosa-plugins/webdav/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/webdav/locale/pl/LC_MESSAGES/messages.po
index 55ead1f7f..0cda5b244 100644
--- a/gosa-plugins/webdav/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/webdav/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:07+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
diff --git a/gosa-plugins/webdav/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/webdav/locale/ru/LC_MESSAGES/messages.po
index e4061ad76..c387931d8 100644
--- a/gosa-plugins/webdav/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/webdav/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:07+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
diff --git a/gosa-plugins/webdav/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/webdav/locale/zh/LC_MESSAGES/messages.po
index baaf60609..d6a865f78 100644
--- a/gosa-plugins/webdav/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/webdav/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:39+0200\n"
+"POT-Creation-Date: 2010-01-18 17:07+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"