updated french locale to lastest code

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

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 905ba00fff3a6ff810e6df791ee1e1c8168fa81e..6a4812362e869825c42bb07230388383abd8efa9 100644 (file)
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -1,3 +1,4 @@
+# translation of messages.po to Deutsch
 # translation of messages.po to de_DE
 # GOsa2 Translations
 # Copyright (C) 2003 GONICUS GmbH, Germany
@@ -8,14 +9,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"Report-Msgid-Bugs-To: Alfred Schröder <schroeder@gonicus.de>\n"
+"Report-Msgid-Bugs-To: Alfred Schroeder <schroeder@gonicus.de>\n"
 "POT-Creation-Date: 2003-09-19 13:41+0200\n"
-"PO-Revision-Date: 2005-07-01 16:01+0200\n"
-"Last-Translator:  <(null)>\n"
-"Language-Team:  <en@li.org>\n"
+"PO-Revision-Date: 2005-08-01 10:20+0200\n"
+"Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
+"Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.10\n"
 
 #: contrib/gosa.conf:4
 msgid "My account"
@@ -49,12 +51,17 @@ msgstr "Unix"
 
 #: contrib/gosa.conf:59 contrib/gosa.conf:70
 #: plugins/personal/mail/class_mailAccount.inc:22
+#: plugins/admin/groups/class_groupManagement.inc:383
+#: plugins/admin/users/class_userManagement.inc:665
 #: plugins/admin/ogroups/tabs_ogroups.inc:29
+#: plugins/admin/ogroups/class_ogroupManagement.inc:391
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Mail"
 
 #: contrib/gosa.conf:60 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/admin/groups/class_groupManagement.inc:384
+#: plugins/admin/users/class_userManagement.inc:668
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -69,20 +76,25 @@ msgstr "Konnektivit
 #: plugins/personal/generic/generic.tpl:362
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
+#: plugins/admin/users/class_userManagement.inc:667
 #: plugins/admin/departments/generic.tpl:62
 msgid "Fax"
 msgstr "Fax"
 
 #: contrib/gosa.conf:63 plugins/personal/generic/generic.tpl:214
 #: plugins/personal/generic/generic.tpl:352
-#: plugins/addons/addressbook/address_edit.tpl:41
-#: plugins/addons/addressbook/address_edit.tpl:89
 #: plugins/addons/addressbook/contents.tpl:14
+#: plugins/addons/addressbook/address_edit.tpl:48
+#: plugins/addons/addressbook/address_edit.tpl:96
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
+#: plugins/admin/groups/class_groupManagement.inc:386
+#: plugins/admin/users/class_userManagement.inc:666
 #: plugins/admin/departments/generic.tpl:58
+#: plugins/admin/systems/class_systemManagement.inc:664
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:48
+#: plugins/admin/ogroups/class_ogroupManagement.inc:481
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
@@ -110,7 +122,7 @@ msgstr "Zugriffsregeln"
 msgid "Options"
 msgstr "Optionen"
 
-#: contrib/gosa.conf:83 plugins/gofon/phoneaccount/class_phoneAccount.inc:224
+#: contrib/gosa.conf:83 plugins/gofon/phoneaccount/class_phoneAccount.inc:482
 msgid "Parameter"
 msgstr "Parameter"
 
@@ -134,177 +146,212 @@ msgstr "Datenbanken"
 msgid "Services"
 msgstr "Dienste"
 
-#: contrib/gosa.conf:150 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:151 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 msgid "Export"
 msgstr "Export"
 
-#: contrib/gosa.conf:151 plugins/personal/mail/generic.tpl:111
+#: contrib/gosa.conf:152 plugins/personal/mail/generic.tpl:112
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:117
 #: plugins/addons/ldapmanager/contentcsv.tpl:120
 msgid "Import"
 msgstr "Importieren"
 
-#: contrib/gosa.conf:152
+#: contrib/gosa.conf:153
 msgid "CSV Import"
 msgstr "CSV Import"
 
-#: contrib/gosa.conf:168
+#: contrib/gosa.conf:169
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
-#: contrib/gosa.conf:185
+#: contrib/gosa.conf:186
 msgid "German"
 msgstr "Deutsch"
 
-#: contrib/gosa.conf:186
+#: contrib/gosa.conf:187
 msgid "Russian"
 msgstr "Russisch"
 
-#: contrib/gosa.conf:187
+#: contrib/gosa.conf:188
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: contrib/gosa.conf:188
+#: contrib/gosa.conf:189
 msgid "French"
 msgstr "Französisch"
 
-#: contrib/gosa.conf:189
+#: contrib/gosa.conf:190
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: contrib/gosa.conf:190
+#: contrib/gosa.conf:191
 msgid "English"
 msgstr "Englisch"
 
-#: contrib/gosa.conf:191
+#: contrib/gosa.conf:192
 msgid "Italian"
 msgstr "Italienisch"
 
-#: plugins/personal/mail/mail_locals.tpl:6
-#: plugins/admin/groups/mail_locals.tpl:6
-msgid "Select addresses to add"
-msgstr "Wählen Sie die hinzuzufügenden Adressen"
+#: plugins/personal/mail/class_mailAccount.inc:23
+#: plugins/personal/password/class_password.inc:6
+#: plugins/personal/posix/class_posixAccount.inc:17
+#: plugins/personal/samba/class_sambaAccount.inc:25
+#: plugins/personal/generic/class_user.inc:17
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
+#: plugins/personal/connectivity/class_phpgwAccount.inc:6
+#: plugins/personal/connectivity/class_kolabAccount.inc:6
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
+#: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_intranetAccount.inc:16
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
+#: plugins/gofax/reports/class_faxreport.inc:7
+#: plugins/addons/addressbook/class_addressbook.inc:7
+#: plugins/addons/ldapmanager/class_csvimport.inc:7
+#: plugins/addons/ldapmanager/class_import.inc:7
+#: plugins/addons/ldapmanager/class_ldif.inc:8
+#: plugins/addons/ldapmanager/class_export.inc:8
+#: plugins/addons/logview/class_logview.inc:7
+#: plugins/admin/groups/class_groupManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:26
+#: plugins/admin/applications/class_applicationManagement.inc:26
+#: plugins/admin/departments/class_departmentManagement.inc:26
+#: plugins/admin/systems/class_systemManagement.inc:33
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
+#: plugins/gofon/reports/class_fonreport.inc:7
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
+msgid "This does something"
+msgstr "Dies tut etwas"
 
-#: plugins/personal/mail/mail_locals.tpl:26
-#: plugins/admin/groups/mail_locals.tpl:30
-msgid "Display addresses of department"
-msgstr "Zeige die Adressen der Abteilung"
+#: plugins/personal/mail/class_mailAccount.inc:79
+#: plugins/admin/groups/class_groupMail.inc:59
+#, php-format
+msgid "There is no mail method '%s' specified in your gosa.conf available."
+msgstr ""
+"Die in ihrer gosa.conf angegebene Zustellungs-Methode '%s' ist nicht "
+"verfügbar."
 
-#: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:39
-#: plugins/personal/posix/trust_machines.tpl:27
-#: plugins/personal/samba/samba3_workstations.tpl:27
-#: plugins/gofax/blocklists/headpage.tpl:58
-#: plugins/gofax/faxaccount/locals.tpl:31
-#: plugins/addons/addressbook/contents.tpl:81
-#: plugins/admin/groups/headpage.tpl:66
-#: plugins/admin/groups/group_objects.tpl:27
-#: plugins/admin/groups/mail_locals.tpl:33 plugins/admin/users/headpage.tpl:68
-#: plugins/admin/applications/headpage.tpl:49
-#: plugins/admin/departments/headpage.tpl:47
-#: plugins/admin/systems/headpage.tpl:62
-#: plugins/admin/ogroups/ogroup_objects.tpl:38
-#: plugins/admin/ogroups/headpage.tpl:61 plugins/gofon/macro/headpage.tpl:49
-msgid "Choose the department the search will be based on"
-msgstr "Wählen Sie die Abteilung, auf die die Suchfunktion angewandt wird"
+#: plugins/personal/mail/class_mailAccount.inc:163
+msgid "No DESC tag in vacation file:"
+msgstr "Kein DESC-Tag in der Abwesenheits-Datei:"
 
-#: plugins/personal/mail/mail_locals.tpl:30
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
-msgstr "Zeige die Adressen, auf die das Folgende passt"
+#: plugins/personal/mail/class_mailAccount.inc:200
+msgid "This account has no mail extensions."
+msgstr "Dieses Konto hat keine Mail-Erweiterungen."
 
-#: plugins/personal/mail/mail_locals.tpl:31
-#: plugins/personal/posix/trust_machines.tpl:31
-#: plugins/personal/samba/samba3_workstations.tpl:31
-#: plugins/admin/groups/mail_locals.tpl:45
-msgid "Regular expression for matching addresses"
-msgstr "Regulärer Ausdruck zum Abgleich mit Mail-Adressen"
+#: plugins/personal/mail/class_mailAccount.inc:209
+#: plugins/admin/groups/class_groupMail.inc:187
+#: plugins/admin/ogroups/class_mailogroup.inc:37
+msgid "Remove mail account"
+msgstr "Mail-Konto entfernen"
 
-#: plugins/personal/mail/mail_locals.tpl:32
-#: plugins/admin/groups/mail_locals.tpl:52
-msgid "Display addresses of user"
-msgstr "Zeige Adressen des Benutzers"
+#: plugins/personal/mail/class_mailAccount.inc:210
+#: plugins/admin/groups/class_groupMail.inc:188
+msgid ""
+"This account has mail features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Dieses Konto hat die Mail-Erweiterungen aktiviert. Sie können diese "
+"deaktivieren, indem Sie auf die Schaltfläche unten klicken."
 
-#: plugins/personal/mail/mail_locals.tpl:33
-#: plugins/admin/groups/mail_locals.tpl:55
-msgid "User name of which addresses are shown"
-msgstr "Benutzername, dessen Adressen angezeigt werden"
+#: plugins/personal/mail/class_mailAccount.inc:212
+#: plugins/admin/groups/class_groupMail.inc:190
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid "Create mail account"
+msgstr "Neues Mail-Konto erzeugen"
 
-#: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:126
-#: plugins/personal/posix/generic.tpl:73
-#: plugins/personal/posix/generic.tpl:135
-#: plugins/personal/posix/posix_groups.tpl:72
-#: plugins/personal/posix/trust_machines.tpl:39
-#: plugins/personal/samba/samba3.tpl:287
-#: plugins/personal/samba/samba3_workstations.tpl:39
-#: plugins/personal/connectivity/kolab.tpl:18
-#: plugins/personal/connectivity/class_kolabAccount.inc:200
-#: plugins/gofax/blocklists/generic.tpl:63
-#: plugins/gofax/faxaccount/generic.tpl:75
-#: plugins/gofax/faxaccount/locals.tpl:62
-#: plugins/gofax/faxaccount/lists.tpl:12 plugins/gofax/faxaccount/lists.tpl:16
-#: plugins/admin/groups/mail.tpl:54 plugins/admin/groups/mail.tpl:101
-#: plugins/admin/groups/class_groupMail.inc:404
-#: plugins/admin/groups/group_objects.tpl:39
-#: plugins/admin/groups/generic.tpl:88 plugins/admin/groups/mail_locals.tpl:66
-#: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/servservice.tpl:47
-#: plugins/admin/systems/phonesettings.tpl:181
-#: plugins/admin/systems/phonesettings.tpl:196
-#: plugins/admin/systems/startup.tpl:61 plugins/admin/systems/startup.tpl:75
-#: plugins/admin/systems/startup.tpl:95
-#: plugins/admin/ogroups/ogroup_objects.tpl:50
-#: plugins/admin/ogroups/generic.tpl:38
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:375
-#: plugins/gofon/phoneaccount/generic.tpl:11
-msgid "Add"
-msgstr "Hinzufügen"
+#: plugins/personal/mail/class_mailAccount.inc:212
+#: plugins/admin/groups/class_groupMail.inc:191
+msgid ""
+"This account has mail features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Dieses Konto hat keine Mail-Erweiterungen. Sie können diese aktivieren, wenn "
+"Sie auf die untere Schaltfläche klicken."
 
-#: plugins/personal/mail/mail_locals.tpl:43 plugins/personal/mail/main.inc:106
-#: plugins/personal/posix/posix_groups.tpl:74
-#: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112
-#: plugins/personal/samba/samba3_workstations.tpl:41
-#: plugins/personal/samba/main.inc:106
-#: plugins/personal/generic/password.tpl:19
-#: plugins/personal/generic/generic_picture.tpl:31
-#: plugins/personal/generic/generic_certs.tpl:78
-#: plugins/personal/generic/main.inc:160
-#: plugins/personal/connectivity/main.inc:118
-#: plugins/gofax/blocklists/generic.tpl:79
-#: plugins/gofax/blocklists/remove.tpl:17
-#: plugins/gofax/faxaccount/locals.tpl:64
-#: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/address_edit.tpl:108
-#: plugins/addons/addressbook/remove.tpl:17
-#: plugins/admin/groups/class_groupManagement.inc:261
-#: plugins/admin/groups/remove.tpl:17
-#: plugins/admin/groups/group_objects.tpl:41
-#: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/application_options.tpl:10
-#: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:509
-#: plugins/admin/users/template.tpl:46 plugins/admin/users/remove.tpl:17
-#: plugins/admin/applications/remove.tpl:16
-#: plugins/admin/applications/class_applicationManagement.inc:241
-#: plugins/admin/departments/remove.tpl:17
-#: plugins/admin/departments/class_departmentManagement.inc:230
-#: plugins/admin/systems/class_systemManagement.inc:442
-#: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
-#: plugins/admin/systems/chooser.tpl:18
-#: plugins/admin/ogroups/ogroup_objects.tpl:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:272
-#: plugins/admin/ogroups/remove.tpl:17
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:240
-#: plugins/gofon/macro/remove.tpl:16 plugins/gofon/phoneaccount/main.inc:106
-#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
-msgid "Cancel"
-msgstr "Abbrechen"
+#: plugins/personal/mail/class_mailAccount.inc:260
+msgid ""
+"You're trying to add an invalid email address to the list of forwarders."
+msgstr ""
+"Sie versuchen, eine ungültige Mail-Adresse in die Liste der Weiterleitungen "
+"aufzunehmen."
+
+#: plugins/personal/mail/class_mailAccount.inc:266
+#: plugins/admin/groups/class_groupMail.inc:250
+msgid "Adding your one of your own addresses to the forwarders makes no sense."
+msgstr ""
+"Das Hinzufügen Ihrer eigenen Adresse zu den Weiterleitungen macht keinen "
+"Sinn."
+
+#: plugins/personal/mail/class_mailAccount.inc:301
+#: plugins/personal/mail/class_mailAccount.inc:306
+#: plugins/admin/groups/class_groupMail.inc:278
+msgid ""
+"You're trying to add an invalid email address to the list of alternate "
+"addresses."
+msgstr "Sie versuchen eine ungültige Mail-Adresse in die Liste aufzunehmen."
+
+#: plugins/personal/mail/class_mailAccount.inc:316
+#: plugins/admin/groups/class_groupMail.inc:283
+msgid "The address you're trying to add is already used by user"
+msgstr ""
+"Die Adresse, die Sie gerade hinzufügen möchten, wird bereits von einem "
+"anderen Benutzer verwendet"
+
+#: plugins/personal/mail/class_mailAccount.inc:689
+msgid ""
+"There is no valid mailserver specified, please add one in the system setup."
+msgstr ""
+"Es wurde kein gültiger Mail-Server angegeben, bitte fügen Sie ein passendes "
+"System hinzu."
+
+#: plugins/personal/mail/class_mailAccount.inc:694
+#: plugins/admin/groups/class_groupMail.inc:610
+msgid "The required field 'Primary address' is not set."
+msgstr "Das benötigte Feld 'Primäre Adresse' ist nicht gesetzt."
+
+#: plugins/personal/mail/class_mailAccount.inc:698
+#: plugins/personal/mail/class_mailAccount.inc:702
+#: plugins/addons/addressbook/class_addressbook.inc:570
+#: plugins/admin/ogroups/class_mailogroup.inc:67
+msgid "Please enter a valid email address in 'Primary address' field."
+msgstr ""
+"Bitte geben Sie eine gültige E-Mail-Adresse in das Feld 'Primäre Adresse' "
+"ein."
+
+#: plugins/personal/mail/class_mailAccount.inc:709
+#: plugins/admin/groups/class_groupMail.inc:619
+#: plugins/admin/ogroups/class_mailogroup.inc:74
+msgid "The primary address you've entered is already in use."
+msgstr ""
+"Die primäre Adresse, welche Sie eingegeben haben, wird bereits benutzt."
+
+#: plugins/personal/mail/class_mailAccount.inc:715
+#: plugins/admin/groups/class_groupMail.inc:625
+msgid "Value in 'Quota size' is not valid."
+msgstr "Das Feld 'Kontingent-Größe' enthält einen ungültigen Wert."
+
+#: plugins/personal/mail/class_mailAccount.inc:724
+#: plugins/admin/groups/class_groupMail.inc:634
+msgid "Please specify a vaild mail size for mails to be rejected."
+msgstr ""
+"Bitte geben Sie eine gültige Größenbeschränkung für Mails an, die abgewiesen "
+"werden sollen."
+
+#: plugins/personal/mail/class_mailAccount.inc:734
+#: plugins/admin/groups/class_groupMail.inc:642
+msgid "You need to set the maximum mail size in order to reject anything."
+msgstr "Sie müssen die maximale Mail-Größe angeben, um Mails abzuweisen."
+
+#: plugins/personal/mail/class_mailAccount.inc:738
+msgid "You specified Spam settings, but there is no Folder specified."
+msgstr "Es wurde kein Ordner für die gewählten Spam-Einstellungen angegeben."
 
 #: plugins/personal/mail/generic.tpl:7 plugins/admin/groups/mail.tpl:10
 #: plugins/admin/ogroups/mail.tpl:10
@@ -312,6 +359,8 @@ msgid "Primary address"
 msgstr "Primäre Adresse"
 
 #: plugins/personal/mail/generic.tpl:11 plugins/admin/groups/mail.tpl:14
+#: plugins/admin/systems/class_systemManagement.inc:665
+#: plugins/admin/ogroups/class_ogroupManagement.inc:480
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
 msgstr "Server"
@@ -343,34 +392,59 @@ msgstr "Alternative Adressen"
 msgid "List of alternative mail addresses"
 msgstr "Liste alternativer Mail-Adressen"
 
-#: plugins/personal/mail/generic.tpl:58 plugins/personal/mail/generic.tpl:130
+#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
+#: plugins/personal/mail/mail_locals.tpl:41
+#: plugins/personal/posix/trust_machines.tpl:39
+#: plugins/personal/posix/posix_groups.tpl:72
+#: plugins/personal/posix/generic.tpl:73
+#: plugins/personal/posix/generic.tpl:135
+#: plugins/personal/samba/samba3.tpl:287
+#: plugins/personal/samba/samba3_workstations.tpl:39
+#: plugins/personal/connectivity/class_kolabAccount.inc:200
+#: plugins/personal/connectivity/kolab.tpl:18
+#: plugins/gofax/blocklists/generic.tpl:63
+#: plugins/gofax/faxaccount/generic.tpl:75
+#: plugins/gofax/faxaccount/locals.tpl:62
+#: plugins/gofax/faxaccount/lists.tpl:12 plugins/gofax/faxaccount/lists.tpl:16
+#: plugins/admin/groups/mail.tpl:54 plugins/admin/groups/mail.tpl:101
+#: plugins/admin/groups/class_groupMail.inc:404
+#: plugins/admin/groups/group_objects.tpl:49
+#: plugins/admin/groups/generic.tpl:88 plugins/admin/groups/mail_locals.tpl:68
+#: plugins/admin/systems/servservice.tpl:21
+#: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/startup.tpl:61 plugins/admin/systems/startup.tpl:75
+#: plugins/admin/systems/startup.tpl:95
+#: plugins/admin/systems/phonesettings.tpl:181
+#: plugins/admin/systems/phonesettings.tpl:196
+#: plugins/admin/ogroups/ogroup_objects.tpl:50
+#: plugins/admin/ogroups/generic.tpl:38
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:633
+#: plugins/gofon/phoneaccount/generic.tpl:11
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: plugins/personal/mail/generic.tpl:58 plugins/personal/mail/generic.tpl:131
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:137
 #: plugins/personal/samba/samba3.tpl:289
 #: plugins/personal/connectivity/kolab.tpl:20
 #: plugins/gofax/blocklists/generic.tpl:64
 #: plugins/gofax/blocklists/remove.tpl:15
-#: plugins/gofax/blocklists/headpage.tpl:18
 #: plugins/gofax/faxaccount/generic.tpl:77
 #: plugins/gofax/faxaccount/lists.tpl:13
 #: plugins/addons/addressbook/remove.tpl:15 plugins/admin/groups/mail.tpl:55
 #: plugins/admin/groups/mail.tpl:103 plugins/admin/groups/remove.tpl:15
-#: plugins/admin/groups/headpage.tpl:18 plugins/admin/groups/generic.tpl:90
-#: plugins/admin/users/remove.tpl:15 plugins/admin/users/headpage.tpl:19
+#: plugins/admin/groups/generic.tpl:90 plugins/admin/users/remove.tpl:15
 #: plugins/admin/applications/remove.tpl:14
-#: plugins/admin/applications/headpage.tpl:18
 #: plugins/admin/departments/remove.tpl:15
-#: plugins/admin/departments/headpage.tpl:18
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/remove.tpl:15 plugins/admin/systems/startup.tpl:62
+#: plugins/admin/systems/startup.tpl:76 plugins/admin/systems/startup.tpl:96
 #: plugins/admin/systems/phonesettings.tpl:182
 #: plugins/admin/systems/phonesettings.tpl:197
-#: plugins/admin/systems/remove.tpl:15 plugins/admin/systems/headpage.tpl:17
-#: plugins/admin/systems/startup.tpl:62 plugins/admin/systems/startup.tpl:76
-#: plugins/admin/systems/startup.tpl:96 plugins/admin/ogroups/generic.tpl:39
-#: plugins/admin/ogroups/remove.tpl:15 plugins/admin/ogroups/headpage.tpl:18
-#: plugins/gofon/macro/remove.tpl:14 plugins/gofon/macro/headpage.tpl:18
-#: plugins/gofon/phoneaccount/generic.tpl:13
+#: plugins/admin/ogroups/generic.tpl:39 plugins/admin/ogroups/remove.tpl:15
+#: plugins/gofon/phoneaccount/generic.tpl:13 plugins/gofon/macro/remove.tpl:14
 msgid "Delete"
 msgstr "Entfernen"
 
@@ -405,303 +479,222 @@ msgstr "W
 msgid "Move mails tagged with spam level greater than"
 msgstr "Verschiebe Mails mit einem SPAM-Level größer als"
 
-#: plugins/personal/mail/generic.tpl:82
+#: plugins/personal/mail/generic.tpl:83
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr ""
 "Wählen sie den 'SPAM'-Level - kleinere Werte reagieren empfindlicher auf SPAM"
 
-#: plugins/personal/mail/generic.tpl:85
+#: plugins/personal/mail/generic.tpl:86
 msgid "to folder"
 msgstr "in den Ordner"
 
-#: plugins/personal/mail/generic.tpl:92
+#: plugins/personal/mail/generic.tpl:93
 msgid "Reject mails bigger than"
 msgstr "Mails abweisen die größer sind als"
 
-#: plugins/personal/mail/generic.tpl:94
+#: plugins/personal/mail/generic.tpl:95
 #: plugins/personal/connectivity/pureftpd.tpl:40
 #: plugins/personal/connectivity/class_proxyAccount.inc:76
 msgid "MB"
 msgstr "MB"
 
-#: plugins/personal/mail/generic.tpl:100
+#: plugins/personal/mail/generic.tpl:101
 msgid "Vacation message"
 msgstr "Urlaubsbenachrichtigung"
 
-#: plugins/personal/mail/generic.tpl:117
+#: plugins/personal/mail/generic.tpl:118
 msgid "Forward messages to"
 msgstr "Nachrichten weiterleiten an"
 
-#: plugins/personal/mail/generic.tpl:128
+#: plugins/personal/mail/generic.tpl:129
 #: plugins/gofax/faxaccount/generic.tpl:76 plugins/admin/groups/mail.tpl:102
 msgid "Add local"
 msgstr "Lokale hinzufügen"
 
-#: plugins/personal/mail/generic.tpl:138
+#: plugins/personal/mail/generic.tpl:139
 msgid "Advanced mail options"
 msgstr "Erweiterte Mail-Einstellungen"
 
-#: plugins/personal/mail/generic.tpl:143
+#: plugins/personal/mail/generic.tpl:144
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 "Wählen Sie dies wenn der Benutzer Mails nur innerhalb seiner Domäne senden "
 "und empfangen darf"
 
-#: plugins/personal/mail/generic.tpl:144
+#: plugins/personal/mail/generic.tpl:145
 msgid "User is only allowed to send and receive local mails"
 msgstr "Der Benutzer darf nur lokale Mails senden und empfangen"
 
-#: plugins/personal/mail/generic.tpl:151
+#: plugins/personal/mail/generic.tpl:152
 msgid "Use custom sieve script"
 msgstr "Eigenes Sieve-Skript verwenden"
 
-#: plugins/personal/mail/generic.tpl:151
+#: plugins/personal/mail/generic.tpl:152
 msgid "disables all Mail options!"
-msgstr "schaltet alle übrigen Mail-Einstellungen aus!"
-
-#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
-#: plugins/personal/samba/main.inc:104
-#: plugins/personal/generic/generic_certs.tpl:76
-#: plugins/personal/generic/main.inc:158
-#: plugins/personal/connectivity/main.inc:116
-#: plugins/gofax/blocklists/generic.tpl:77
-#: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:259
-#: plugins/admin/users/class_userManagement.inc:507
-#: plugins/admin/applications/class_applicationManagement.inc:239
-#: plugins/admin/departments/class_departmentManagement.inc:228
-#: plugins/admin/systems/class_systemManagement.inc:440
-#: plugins/admin/ogroups/class_ogroupManagement.inc:270
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:238
-#: plugins/gofon/phoneaccount/main.inc:104
-msgid "Finish"
-msgstr "Speichern"
-
-#: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:120
-#: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:177
-#: plugins/personal/connectivity/main.inc:126
-#: plugins/gofax/faxaccount/main.inc:96
-#: plugins/gofon/phoneaccount/main.inc:111
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr ""
-"Betätigen sie den 'Bearbeiten'-Schalter unten um Informationen in diesem "
-"Dialog zu ändern"
-
-#: plugins/personal/mail/main.inc:115 plugins/personal/posix/main.inc:122
-#: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:170
-#: plugins/personal/connectivity/main.inc:127
-#: plugins/gofax/blocklists/headpage.tpl:17
-#: plugins/gofax/faxaccount/generic.tpl:90
-#: plugins/gofax/faxaccount/generic.tpl:96
-#: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
-#: plugins/admin/groups/headpage.tpl:17 plugins/admin/users/headpage.tpl:18
-#: plugins/admin/applications/headpage.tpl:17
-#: plugins/admin/departments/headpage.tpl:17
-#: plugins/admin/systems/headpage.tpl:16 plugins/admin/ogroups/headpage.tpl:17
-#: plugins/gofon/macro/headpage.tpl:17 plugins/gofon/phoneaccount/main.inc:112
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: plugins/personal/mail/main.inc:124
-msgid "User mail settings"
-msgstr "Benutzer Mail-Einstellungen"
-
-#: plugins/personal/mail/class_mailAccount.inc:23
-#: plugins/personal/password/class_password.inc:6
-#: plugins/personal/posix/class_posixAccount.inc:17
-#: plugins/personal/samba/class_sambaAccount.inc:25
-#: plugins/personal/generic/class_user.inc:17
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_proxyAccount.inc:6
-#: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_phpgwAccount.inc:6
-#: plugins/personal/connectivity/class_kolabAccount.inc:6
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
-#: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
-#: plugins/gofax/reports/class_faxreport.inc:7
-#: plugins/addons/addressbook/class_addressbook.inc:7
-#: plugins/addons/ldapmanager/class_csvimport.inc:7
-#: plugins/addons/ldapmanager/class_import.inc:7
-#: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:8
-#: plugins/addons/logview/class_logview.inc:7
-#: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:26
-#: plugins/admin/applications/class_applicationManagement.inc:26
-#: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/systems/class_systemManagement.inc:33
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-#: plugins/gofon/reports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Dies tut etwas"
-
-#: plugins/personal/mail/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:59
-#, php-format
-msgid "There is no mail method '%s' specified in your gosa.conf available."
-msgstr ""
-"Die in ihrer gosa.conf angegebene Zustellungs-Methode '%s' ist nicht "
-"verfügbar."
-
-#: plugins/personal/mail/class_mailAccount.inc:163
-msgid "No DESC tag in vacation file:"
-msgstr "Kein DESC-Tag in der Abwesenheits-Datei:"
-
-#: plugins/personal/mail/class_mailAccount.inc:200
-msgid "This account has no mail extensions."
-msgstr "Dieses Konto hat keine Mail-Erweiterungen."
-
-#: plugins/personal/mail/class_mailAccount.inc:209
-#: plugins/admin/groups/class_groupMail.inc:187
-#: plugins/admin/ogroups/class_mailogroup.inc:37
-msgid "Remove mail account"
-msgstr "Mail-Konto entfernen"
-
-#: plugins/personal/mail/class_mailAccount.inc:210
-#: plugins/admin/groups/class_groupMail.inc:188
-msgid ""
-"This account has mail features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Dieses Konto hat die Mail-Erweiterungen aktiviert. Sie können diese "
-"deaktivieren, indem Sie auf die Schaltfläche unten klicken."
-
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:190
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid "Create mail account"
-msgstr "Neues Mail-Konto erzeugen"
-
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:191
-msgid ""
-"This account has mail features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Dieses Konto hat keine Mail-Erweiterungen. Sie können diese aktivieren, wenn "
-"Sie auf die untere Schaltfläche klicken."
-
-#: plugins/personal/mail/class_mailAccount.inc:260
-msgid ""
-"You're trying to add an invalid email address to the list of forwarders."
-msgstr ""
-"Sie versuchen, eine ungültige Mail-Adresse in die Liste der Weiterleitungen "
-"aufzunehmen."
+msgstr "schaltet alle übrigen Mail-Einstellungen aus!"
 
-#: plugins/personal/mail/class_mailAccount.inc:266
-#: plugins/admin/groups/class_groupMail.inc:250
-msgid "Adding your one of your own addresses to the forwarders makes no sense."
-msgstr ""
-"Das Hinzufügen Ihrer eigenen Adresse zu den Weiterleitungen macht keinen "
-"Sinn."
+#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
+#: plugins/personal/samba/main.inc:104
+#: plugins/personal/generic/generic_certs.tpl:76
+#: plugins/personal/generic/main.inc:158
+#: plugins/personal/connectivity/main.inc:116
+#: plugins/gofax/blocklists/generic.tpl:77
+#: plugins/gofax/faxaccount/main.inc:89
+#: plugins/admin/groups/class_groupManagement.inc:338
+#: plugins/admin/users/class_userManagement.inc:583
+#: plugins/admin/applications/class_applicationManagement.inc:311
+#: plugins/admin/departments/class_departmentManagement.inc:344
+#: plugins/admin/systems/class_systemManagement.inc:508
+#: plugins/admin/ogroups/class_ogroupManagement.inc:347
+#: plugins/gofon/phoneaccount/main.inc:104
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
+msgid "Finish"
+msgstr "Speichern"
 
-#: plugins/personal/mail/class_mailAccount.inc:301
-#: plugins/personal/mail/class_mailAccount.inc:306
-#: plugins/admin/groups/class_groupMail.inc:278
-msgid ""
-"You're trying to add an invalid email address to the list of alternate "
-"addresses."
-msgstr "Sie versuchen eine ungültige Mail-Adresse in die Liste aufzunehmen."
+#: plugins/personal/mail/main.inc:106 plugins/personal/mail/mail_locals.tpl:43
+#: plugins/personal/posix/trust_machines.tpl:41
+#: plugins/personal/posix/posix_groups.tpl:74
+#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
+#: plugins/personal/samba/samba3_workstations.tpl:41
+#: plugins/personal/generic/password.tpl:19
+#: plugins/personal/generic/generic_picture.tpl:31
+#: plugins/personal/generic/generic_certs.tpl:78
+#: plugins/personal/generic/main.inc:160
+#: plugins/personal/connectivity/main.inc:118
+#: plugins/gofax/blocklists/generic.tpl:79
+#: plugins/gofax/blocklists/remove.tpl:17
+#: plugins/gofax/faxaccount/locals.tpl:64
+#: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/address_edit.tpl:115
+#: plugins/addons/addressbook/remove.tpl:17
+#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/remove.tpl:17
+#: plugins/admin/groups/application_options.tpl:10
+#: plugins/admin/groups/group_objects.tpl:51
+#: plugins/admin/groups/mail_admins.tpl:39
+#: plugins/admin/groups/mail_locals.tpl:70 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/template.tpl:46
+#: plugins/admin/users/class_userManagement.inc:585
+#: plugins/admin/users/remove.tpl:17 plugins/admin/applications/remove.tpl:16
+#: plugins/admin/applications/class_applicationManagement.inc:313
+#: plugins/admin/departments/remove.tpl:17
+#: plugins/admin/departments/class_departmentManagement.inc:346
+#: plugins/admin/systems/class_systemManagement.inc:510
+#: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
+#: plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/ogroups/ogroup_objects.tpl:52
+#: plugins/admin/ogroups/class_ogroupManagement.inc:349
+#: plugins/admin/ogroups/remove.tpl:17 plugins/gofon/phoneaccount/main.inc:106
+#: plugins/gofon/macro/remove.tpl:16
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
+#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
+msgid "Cancel"
+msgstr "Abbrechen"
 
-#: plugins/personal/mail/class_mailAccount.inc:316
-#: plugins/admin/groups/class_groupMail.inc:283
-msgid "The address you're trying to add is already used by user"
+#: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:120
+#: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:177
+#: plugins/personal/connectivity/main.inc:126
+#: plugins/gofax/faxaccount/main.inc:96
+#: plugins/gofon/phoneaccount/main.inc:111
+msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
-"Die Adresse, die Sie gerade hinzufügen möchten, wird bereits von einem "
-"anderen Benutzer verwendet"
+"Betätigen sie den 'Bearbeiten'-Schalter unten um Informationen in diesem "
+"Dialog zu ändern"
 
-#: plugins/personal/mail/class_mailAccount.inc:675
-msgid ""
-"There is no valid mailserver specified, please add one in the system setup."
-msgstr ""
-"Es wurde kein gültiger Mail-Server angegeben, bitte fügen Sie ein passendes "
-"System hinzu."
+#: plugins/personal/mail/main.inc:115 plugins/personal/posix/main.inc:122
+#: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:170
+#: plugins/personal/connectivity/main.inc:127
+#: plugins/gofax/faxaccount/generic.tpl:90
+#: plugins/gofax/faxaccount/generic.tpl:96
+#: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
+#: plugins/gofon/phoneaccount/main.inc:112
+msgid "Edit"
+msgstr "Bearbeiten"
 
-#: plugins/personal/mail/class_mailAccount.inc:680
-#: plugins/admin/groups/class_groupMail.inc:610
-msgid "The required field 'Primary address' is not set."
-msgstr "Das benötigte Feld 'Primäre Adresse' ist nicht gesetzt."
+#: plugins/personal/mail/main.inc:124
+msgid "User mail settings"
+msgstr "Benutzer Mail-Einstellungen"
 
-#: plugins/personal/mail/class_mailAccount.inc:684
-#: plugins/personal/mail/class_mailAccount.inc:688
-#: plugins/addons/addressbook/class_addressbook.inc:569
-#: plugins/admin/ogroups/class_mailogroup.inc:67
-msgid "Please enter a valid email address in 'Primary address' field."
-msgstr ""
-"Bitte geben Sie eine gültige E-Mail-Adresse in das Feld 'Primäre Adresse' "
-"ein."
+#: plugins/personal/mail/mail_locals.tpl:6
+#: plugins/admin/groups/mail_locals.tpl:6
+msgid "Select addresses to add"
+msgstr "Wählen Sie die hinzuzufügenden Adressen"
 
-#: plugins/personal/mail/class_mailAccount.inc:695
-#: plugins/admin/groups/class_groupMail.inc:619
-#: plugins/admin/ogroups/class_mailogroup.inc:74
-msgid "The primary address you've entered is already in use."
-msgstr ""
-"Die primäre Adresse, welche Sie eingegeben haben, wird bereits benutzt."
+#: plugins/personal/mail/mail_locals.tpl:20
+#: plugins/personal/posix/posix_groups.tpl:20
+#: plugins/personal/samba/samba3_workstations.tpl:20
+#: plugins/gofax/blocklists/headpage.tpl:29
+#: plugins/gofax/faxaccount/locals.tpl:19
+#: plugins/addons/addressbook/contents.tpl:58
+#: plugins/admin/groups/headpage.tpl:30
+#: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
+#: plugins/admin/applications/headpage.tpl:29
+#: plugins/admin/departments/headpage.tpl:29
+#: plugins/admin/systems/headpage.tpl:29
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/admin/ogroups/headpage.tpl:29 plugins/gofon/macro/headpage.tpl:29
+msgid "Filters"
+msgstr "Filter"
 
-#: plugins/personal/mail/class_mailAccount.inc:701
-#: plugins/admin/groups/class_groupMail.inc:625
-msgid "Value in 'Quota size' is not valid."
-msgstr "Das Feld 'Kontingent-Größe' enthält einen ungültigen Wert."
+#: plugins/personal/mail/mail_locals.tpl:26
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr "Zeige die Adressen der Abteilung"
 
-#: plugins/personal/mail/class_mailAccount.inc:710
-#: plugins/admin/groups/class_groupMail.inc:634
-msgid "Please specify a vaild mail size for mails to be rejected."
-msgstr ""
-"Bitte geben Sie eine gültige Größenbeschränkung für Mails an, die abgewiesen "
-"werden sollen."
+#: plugins/personal/mail/mail_locals.tpl:27
+#: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:39
+#: plugins/personal/samba/samba3_workstations.tpl:27
+#: plugins/gofax/faxaccount/locals.tpl:31
+#: plugins/addons/addressbook/contents.tpl:80
+#: plugins/admin/groups/group_objects.tpl:34
+#: plugins/admin/groups/mail_locals.tpl:35
+#: plugins/admin/ogroups/ogroup_objects.tpl:38
+msgid "Choose the department the search will be based on"
+msgstr "Wählen Sie die Abteilung, auf die die Suchfunktion angewandt wird"
 
-#: plugins/personal/mail/class_mailAccount.inc:720
-#: plugins/admin/groups/class_groupMail.inc:642
-msgid "You need to set the maximum mail size in order to reject anything."
-msgstr "Sie müssen die maximale Mail-Größe angeben, um Mails abzuweisen."
+#: plugins/personal/mail/mail_locals.tpl:30
+#: plugins/admin/groups/mail_locals.tpl:44
+msgid "Display addresses matching"
+msgstr "Zeige die Adressen, auf die das Folgende passt"
 
-#: plugins/personal/password/changed.tpl:2
-#: plugins/personal/password/password.tpl:2
-msgid "Change password"
-msgstr "Passwort ändern"
+#: plugins/personal/mail/mail_locals.tpl:31
+#: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/personal/samba/samba3_workstations.tpl:31
+#: plugins/admin/groups/mail_locals.tpl:47
+msgid "Regular expression for matching addresses"
+msgstr "Regulärer Ausdruck zum Abgleich mit Mail-Adressen"
 
-#: plugins/personal/password/changed.tpl:6
-msgid ""
-"You've successfully changed your password. Remember to change all programms "
-"configured to use it as well."
-msgstr ""
-"Sie haben erfolgreich Ihr Passwort geändert. Bitte denken Sie daran alle "
-"Programme anzupassen, die dieses Passwort auch benutzen."
+#: plugins/personal/mail/mail_locals.tpl:32
+#: plugins/admin/groups/mail_locals.tpl:54
+msgid "Display addresses of user"
+msgstr "Zeige Adressen des Benutzers"
 
-#: plugins/personal/password/changed.tpl:12
-#: plugins/personal/generic/main.inc:167 plugins/gofax/reports/detail.tpl:68
-#: plugins/addons/ldapmanager/contentimport.tpl:44
-#: plugins/addons/ldapmanager/contentcsv.tpl:122
-#: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1204
-#: ihtml/themes/altlinux/setup_useradmin.tpl:40
-#: ihtml/themes/altlinux/setup_step2.tpl:12
-#: ihtml/themes/altlinux/setup_step3.tpl:17
-#: ihtml/themes/altlinux/setup_step4.tpl:114
-#: ihtml/themes/altlinux/setup_finish.tpl:30
-#: ihtml/themes/default/setup_useradmin.tpl:40
-#: ihtml/themes/default/setup_step2.tpl:12
-#: ihtml/themes/default/setup_step3.tpl:17
-#: ihtml/themes/default/setup_step4.tpl:114
-#: ihtml/themes/default/setup_finish.tpl:30
-msgid "Back"
-msgstr "Zurück"
+#: plugins/personal/mail/mail_locals.tpl:33
+#: plugins/admin/groups/mail_locals.tpl:57
+msgid "User name of which addresses are shown"
+msgstr "Benutzername, dessen Adressen angezeigt werden"
 
 #: plugins/personal/password/class_password.inc:5
+#: plugins/admin/systems/class_systemManagement.inc:612
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 ihtml/themes/altlinux/login.tpl:35
 #: ihtml/themes/altlinux/login.tpl:39
 #: ihtml/themes/altlinux/setup_useradmin.tpl:30
-#: ihtml/themes/default/setup_useradmin.tpl:30
 #: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
+#: ihtml/themes/default/setup_useradmin.tpl:30
 msgid "Password"
 msgstr "Passwort"
 
+#: plugins/personal/password/password.tpl:2
+#: plugins/personal/password/changed.tpl:2
+#: plugins/admin/users/class_userManagement.inc:632
+msgid "Change password"
+msgstr "Passwort ändern"
+
 #: plugins/personal/password/password.tpl:6
 msgid ""
 "To change your personal password use the fields below. The changes take "
@@ -739,8 +732,7 @@ msgstr "Neues Passwort (Wiederholung)"
 
 #: plugins/personal/password/password.tpl:34
 #: plugins/personal/generic/password.tpl:17
-#: plugins/admin/users/password.tpl:21 plugins/admin/users/headpage.tpl:20
-#: plugins/admin/systems/headpage.tpl:18 plugins/admin/systems/password.tpl:25
+#: plugins/admin/users/password.tpl:21 plugins/admin/systems/password.tpl:25
 msgid "Set password"
 msgstr "Passwort setzen"
 
@@ -748,6 +740,32 @@ msgstr "Passwort setzen"
 msgid "Clear fields"
 msgstr "Felder löschen"
 
+#: plugins/personal/password/changed.tpl:6
+msgid ""
+"You've successfully changed your password. Remember to change all programms "
+"configured to use it as well."
+msgstr ""
+"Sie haben erfolgreich Ihr Passwort geändert. Bitte denken Sie daran alle "
+"Programme anzupassen, die dieses Passwort auch benutzen."
+
+#: plugins/personal/password/changed.tpl:12
+#: plugins/personal/generic/main.inc:167 plugins/gofax/reports/detail.tpl:68
+#: plugins/addons/ldapmanager/contentimport.tpl:44
+#: plugins/addons/ldapmanager/contentcsv.tpl:122
+#: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1269
+#: ihtml/themes/altlinux/setup_step2.tpl:12
+#: ihtml/themes/altlinux/setup_useradmin.tpl:40
+#: ihtml/themes/altlinux/setup_step3.tpl:17
+#: ihtml/themes/altlinux/setup_step4.tpl:114
+#: ihtml/themes/altlinux/setup_finish.tpl:30
+#: ihtml/themes/default/setup_useradmin.tpl:40
+#: ihtml/themes/default/setup_step2.tpl:12
+#: ihtml/themes/default/setup_step3.tpl:17
+#: ihtml/themes/default/setup_step4.tpl:114
+#: ihtml/themes/default/setup_finish.tpl:30
+msgid "Back"
+msgstr "Zurück"
+
 #: plugins/personal/password/main.inc:40
 msgid ""
 "The password you've entered as your current password doesn't match the real "
@@ -761,138 +779,77 @@ msgid "You need to specify your current password in order to proceed."
 msgstr "Sie müssen das aktuelle Passwort eingeben, um fortfahren zu können."
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:174
-msgid ""
-"The passwords you've entered as 'New password' and 'Repeated new password' "
-"do not match."
-msgstr ""
-"Die Passwörter, die Sie als 'Neues Passwort' und 'Neues Passwort "
-"(Wiederholung)' eingegeben haben sind nicht identisch."
-
-#: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:179
-msgid "The password you've entered as 'New password' is empty."
-msgstr ""
-"Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben ist leer."
-
-#: plugins/personal/password/main.inc:59
-msgid "The password used as new and current are too similar."
-msgstr "Das alte und neue Passwort sind sich zu ähnlich."
-
-#: plugins/personal/password/main.inc:64
-msgid "The password used as new is to short."
-msgstr ""
-"Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben, ist zu kurz."
-
-#: plugins/personal/password/main.inc:71
-msgid "You have no permissions to change your password."
-msgstr "Sie haben keine Berechtigung ihr Passwort zu ändern."
-
-#: plugins/personal/password/main.inc:89
-msgid "External password changer reported a problem: "
-msgstr "Das externe Passwort-Änderungsprogramm hat einen Fehler gemeldet:"
-
-#: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
-#: plugins/personal/samba/samba3.tpl:65
-#: plugins/personal/samba/class_sambaAccount.inc:626
-msgid "Home directory"
-msgstr "Basisverzeichnis"
-
-#: plugins/personal/posix/generic.tpl:13
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/generic.tpl:21
-msgid "Primary group"
-msgstr "Primäre Gruppe"
-
-#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/detail.tpl:46
-#: plugins/gofax/reports/contents.tpl:32 plugins/gofon/reports/contents.tpl:35
-msgid "Status"
-msgstr "Status"
-
-#: plugins/personal/posix/generic.tpl:39
-msgid "Force UID/GID"
-msgstr "Erzwinge UID/GID"
-
-#: plugins/personal/posix/generic.tpl:43
-msgid "UID"
-msgstr "UID"
+#: plugins/admin/users/class_userManagement.inc:252
+msgid ""
+"The passwords you've entered as 'New password' and 'Repeated new password' "
+"do not match."
+msgstr ""
+"Die Passwörter, die Sie als 'Neues Passwort' und 'Neues Passwort "
+"(Wiederholung)' eingegeben haben sind nicht identisch."
 
-#: plugins/personal/posix/generic.tpl:52
-msgid "GID"
-msgstr "GID"
+#: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
+#: plugins/admin/users/class_userManagement.inc:257
+msgid "The password you've entered as 'New password' is empty."
+msgstr ""
+"Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben ist leer."
 
-#: plugins/personal/posix/generic.tpl:64
-msgid "Group membership"
-msgstr "Gruppenmitgliedschaft"
+#: plugins/personal/password/main.inc:59
+msgid "The password used as new and current are too similar."
+msgstr "Das alte und neue Passwort sind sich zu ähnlich."
 
-#: plugins/personal/posix/generic.tpl:66
-msgid "(Warning: more than 16 groups are not supported by NFS!)"
-msgstr "(Warnung: mehr als 16 Gruppen werden von NFS nicht unterstützt!)"
+#: plugins/personal/password/main.inc:64
+msgid "The password used as new is to short."
+msgstr ""
+"Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben, ist zu kurz."
 
-#: plugins/personal/posix/generic.tpl:84
-msgid "Account"
-msgstr "Konto"
+#: plugins/personal/password/main.inc:71
+msgid "You have no permissions to change your password."
+msgstr "Sie haben keine Berechtigung ihr Passwort zu ändern."
 
-#: plugins/personal/posix/generic.tpl:98
-msgid "Environment"
-msgstr "Umgebung"
+#: plugins/personal/password/main.inc:89
+msgid "External password changer reported a problem: "
+msgstr "Das externe Passwort-Änderungsprogramm hat einen Fehler gemeldet:"
 
-#: plugins/personal/posix/generic.tpl:101
-msgid "Default printer"
-msgstr "Standard-Drucker"
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Wählen Sie die hinzuzufügenden Systeme"
 
-#: plugins/personal/posix/generic.tpl:110
-msgid "Default language"
-msgstr "Standard-Sprache"
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr "Zeige die Systeme der Abteilung"
 
-#: plugins/personal/posix/generic.tpl:123
-msgid "System trust"
-msgstr "System-Vertrauen"
+#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/systems/headpage.tpl:51
+msgid "Display systems matching"
+msgstr "Zeige die Systeme, auf die das Folgende passt"
 
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
 msgstr "Wählen Sie die hinzuzufügenden Gruppen"
 
-#: plugins/personal/posix/posix_groups.tpl:20
-#: plugins/gofax/blocklists/headpage.tpl:37
-#: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:58
-#: plugins/admin/groups/headpage.tpl:38
-#: plugins/admin/groups/group_objects.tpl:20
-#: plugins/admin/users/headpage.tpl:39
-#: plugins/admin/applications/headpage.tpl:37
-#: plugins/admin/departments/headpage.tpl:37
-#: plugins/admin/systems/headpage.tpl:37
-#: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/ogroups/headpage.tpl:38 plugins/gofon/macro/headpage.tpl:37
-msgid "Filters"
-msgstr "Filter"
-
 #: plugins/personal/posix/posix_groups.tpl:27
-#: plugins/admin/groups/headpage.tpl:47
+#: plugins/admin/groups/headpage.tpl:40
 msgid "Select to see groups that are primary groups of users"
 msgstr ""
 "Auswählen, um die Gruppen zu sehen, die primären Gruppen der Benutzer sind"
 
 #: plugins/personal/posix/posix_groups.tpl:27
-#: plugins/admin/groups/headpage.tpl:47
+#: plugins/admin/groups/headpage.tpl:41
 msgid "Show primary groups"
 msgstr "Zeige primäre Gruppen"
 
 #: plugins/personal/posix/posix_groups.tpl:28
-#: plugins/admin/groups/headpage.tpl:48
+#: plugins/admin/groups/headpage.tpl:44
 msgid "Select to see groups that have samba groups mappings"
 msgstr "Auswählen, um die Gruppen zu sehen, die Samba-Eigenschaften haben"
 
 #: plugins/personal/posix/posix_groups.tpl:28
-#: plugins/admin/groups/headpage.tpl:48
+#: plugins/admin/groups/headpage.tpl:45
 msgid "Show samba groups"
 msgstr "Zeige Samba-Gruppen"
 
 #: plugins/personal/posix/posix_groups.tpl:29
-#: plugins/admin/groups/headpage.tpl:49
+#: plugins/admin/groups/headpage.tpl:48
 msgid "Select to see groups that have applications configured"
 msgstr "Auswählen, um die Gruppen zu sehen, die Anwendungen zugeordnet haben"
 
@@ -902,47 +859,46 @@ msgid "Show application groups"
 msgstr "Zeige Anwendungs-Gruppen"
 
 #: plugins/personal/posix/posix_groups.tpl:30
-#: plugins/admin/groups/headpage.tpl:50
+#: plugins/admin/groups/headpage.tpl:52
 msgid "Select to see groups that have mail settings"
 msgstr "Auswählen, um die Gruppen zu sehen, die E-Mail-Eigenschaften haben"
 
 #: plugins/personal/posix/posix_groups.tpl:30
-#: plugins/admin/groups/headpage.tpl:50
+#: plugins/admin/groups/headpage.tpl:53
 msgid "Show mail groups"
 msgstr "Zeige E-Mail-Gruppen"
 
 #: plugins/personal/posix/posix_groups.tpl:31
-#: plugins/admin/groups/headpage.tpl:51
+#: plugins/admin/groups/headpage.tpl:56
 msgid "Select to see normal groups that have only functional aspects"
 msgstr "Auswählen, um die \"normalen\" Gruppen zu sehen"
 
 #: plugins/personal/posix/posix_groups.tpl:31
-#: plugins/admin/groups/headpage.tpl:51
+#: plugins/admin/groups/headpage.tpl:57
 msgid "Show functional groups"
 msgstr "Zeige Funktions-Gruppen"
 
 #: plugins/personal/posix/posix_groups.tpl:36
-#: plugins/admin/groups/headpage.tpl:65 plugins/admin/ogroups/headpage.tpl:60
 msgid "Display groups of department"
 msgstr "Zeige Gruppen der Abteilung"
 
 #: plugins/personal/posix/posix_groups.tpl:48
-#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:64
+#: plugins/admin/groups/headpage.tpl:66 plugins/admin/ogroups/headpage.tpl:51
 msgid "Display groups matching"
 msgstr "Zeige Gruppen, auf die zutrifft"
 
 #: plugins/personal/posix/posix_groups.tpl:51
-#: plugins/admin/groups/headpage.tpl:70 plugins/admin/ogroups/headpage.tpl:65
+#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:52
 msgid "Regular expression for matching group names"
 msgstr "Regulärer Ausdruck zum Suchen in Gruppen Namen"
 
 #: plugins/personal/posix/posix_groups.tpl:58
-#: plugins/admin/groups/headpage.tpl:71
+#: plugins/admin/groups/headpage.tpl:76
 msgid "Display groups of user"
 msgstr "Zeige Gruppen des Benutzers"
 
 #: plugins/personal/posix/posix_groups.tpl:61
-#: plugins/admin/groups/headpage.tpl:72
+#: plugins/admin/groups/headpage.tpl:80
 msgid "User name of which groups are shown"
 msgstr "Benutzername, dessen Gruppen angezeigt werden"
 
@@ -955,19 +911,64 @@ msgstr "Der Benutzer muss beim ersten Anmelden sein Passwort 
 msgid "Password expires on"
 msgstr "Passwort läuft ab am"
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
-msgstr "Wählen Sie die hinzuzufügenden Systeme"
+#: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
+#: plugins/personal/samba/samba3.tpl:65
+#: plugins/personal/samba/class_sambaAccount.inc:626
+msgid "Home directory"
+msgstr "Basisverzeichnis"
 
-#: plugins/personal/posix/trust_machines.tpl:26
-#: plugins/admin/systems/headpage.tpl:59
-msgid "Display systems of department"
-msgstr "Zeige die Systeme der Abteilung"
+#: plugins/personal/posix/generic.tpl:13
+msgid "Shell"
+msgstr "Shell"
 
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:71
-msgid "Display systems matching"
-msgstr "Zeige die Systeme, auf die das Folgende passt"
+#: plugins/personal/posix/generic.tpl:21
+msgid "Primary group"
+msgstr "Primäre Gruppe"
+
+#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/detail.tpl:46
+#: plugins/gofax/reports/contents.tpl:32 plugins/gofon/reports/contents.tpl:35
+msgid "Status"
+msgstr "Status"
+
+#: plugins/personal/posix/generic.tpl:39
+msgid "Force UID/GID"
+msgstr "Erzwinge UID/GID"
+
+#: plugins/personal/posix/generic.tpl:43
+msgid "UID"
+msgstr "UID"
+
+#: plugins/personal/posix/generic.tpl:52
+msgid "GID"
+msgstr "GID"
+
+#: plugins/personal/posix/generic.tpl:64
+msgid "Group membership"
+msgstr "Gruppenmitgliedschaft"
+
+#: plugins/personal/posix/generic.tpl:66
+msgid "(Warning: more than 16 groups are not supported by NFS!)"
+msgstr "(Warnung: mehr als 16 Gruppen werden von NFS nicht unterstützt!)"
+
+#: plugins/personal/posix/generic.tpl:84
+msgid "Account"
+msgstr "Konto"
+
+#: plugins/personal/posix/generic.tpl:98
+msgid "Environment"
+msgstr "Umgebung"
+
+#: plugins/personal/posix/generic.tpl:101
+msgid "Default printer"
+msgstr "Standard-Drucker"
+
+#: plugins/personal/posix/generic.tpl:110
+msgid "Default language"
+msgstr "Standard-Sprache"
+
+#: plugins/personal/posix/generic.tpl:123
+msgid "System trust"
+msgstr "System-Vertrauen"
 
 #: plugins/personal/posix/main.inc:131
 msgid "Unix settings"
@@ -978,31 +979,31 @@ msgstr "UNIX-Einstellungen"
 msgid "UNIX"
 msgstr "UNIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:132
-#: plugins/personal/posix/class_posixAccount.inc:942
+#: plugins/personal/posix/class_posixAccount.inc:133
+#: plugins/personal/posix/class_posixAccount.inc:957
 msgid "Group of user"
 msgstr "Gruppe des Benutzers"
 
-#: plugins/personal/posix/class_posixAccount.inc:172
+#: plugins/personal/posix/class_posixAccount.inc:173
 msgid "unconfigured"
 msgstr "unkonfiguriert"
 
-#: plugins/personal/posix/class_posixAccount.inc:190
+#: plugins/personal/posix/class_posixAccount.inc:191
 #: plugins/admin/systems/class_terminalService.inc:122
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:190
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:192
 msgid "automatic"
 msgstr "automatisch"
 
-#: plugins/personal/posix/class_posixAccount.inc:218
+#: plugins/personal/posix/class_posixAccount.inc:219
 msgid "This account has no unix extensions."
 msgstr "Dieses Konto hat keine UNIX-Erweiterungen."
 
-#: plugins/personal/posix/class_posixAccount.inc:238
-#: plugins/personal/posix/class_posixAccount.inc:241
+#: plugins/personal/posix/class_posixAccount.inc:239
+#: plugins/personal/posix/class_posixAccount.inc:242
 msgid "Remove posix account"
 msgstr "UNIX-Konto entfernen"
 
-#: plugins/personal/posix/class_posixAccount.inc:239
+#: plugins/personal/posix/class_posixAccount.inc:240
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
 "remove the samba account first."
@@ -1010,7 +1011,7 @@ msgstr ""
 "Dieses Konto hat UNIX-Erweiterungen aktiviert. Um sie zu deaktivieren, "
 "müssen Sie zunächst die Samba-Erweiterungen deaktivieren."
 
-#: plugins/personal/posix/class_posixAccount.inc:242
+#: plugins/personal/posix/class_posixAccount.inc:243
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
@@ -1018,11 +1019,11 @@ msgstr ""
 "Dieses Konto hat die UNIX-Erweiterungen aktiviert. Sie können diese durch "
 "einen Klick auf die untere Schaltfläche deaktivieren."
 
-#: plugins/personal/posix/class_posixAccount.inc:245
+#: plugins/personal/posix/class_posixAccount.inc:246
 msgid "Create posix account"
 msgstr "UNIX-Konto erstellen"
 
-#: plugins/personal/posix/class_posixAccount.inc:246
+#: plugins/personal/posix/class_posixAccount.inc:247
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
@@ -1056,7 +1057,7 @@ msgstr "Benutzer %s Tage vor dem Ablauf des Passwortes warnen"
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:220
+#: plugins/personal/generic/class_user.inc:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "January"
@@ -1067,7 +1068,7 @@ msgstr "Januar"
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:220
+#: plugins/personal/generic/class_user.inc:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "February"
@@ -1078,7 +1079,7 @@ msgstr "Februar"
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:220
+#: plugins/personal/generic/class_user.inc:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "March"
@@ -1089,7 +1090,7 @@ msgstr "M
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:220
+#: plugins/personal/generic/class_user.inc:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "April"
@@ -1100,7 +1101,7 @@ msgstr "April"
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:221
+#: plugins/personal/generic/class_user.inc:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "May"
@@ -1111,7 +1112,7 @@ msgstr "Mai"
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:221
+#: plugins/personal/generic/class_user.inc:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "June"
@@ -1122,7 +1123,7 @@ msgstr "Juni"
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:221
+#: plugins/personal/generic/class_user.inc:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "July"
@@ -1133,7 +1134,7 @@ msgstr "Juli"
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:221
+#: plugins/personal/generic/class_user.inc:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "August"
@@ -1144,7 +1145,7 @@ msgstr "August"
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:221
+#: plugins/personal/generic/class_user.inc:223
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "September"
@@ -1155,7 +1156,7 @@ msgstr "September"
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:222
+#: plugins/personal/generic/class_user.inc:224
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "October"
@@ -1166,7 +1167,7 @@ msgstr "Oktober"
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:222
+#: plugins/personal/generic/class_user.inc:224
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "November"
@@ -1177,7 +1178,7 @@ msgstr "November"
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:222
+#: plugins/personal/generic/class_user.inc:224
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "December"
@@ -1204,74 +1205,74 @@ msgstr "erlaube Zugriff auf diese Hosts"
 msgid "Failed: overriding lock"
 msgstr "Fehlgeschlagen: Lock wird ignoriert"
 
-#: plugins/personal/posix/class_posixAccount.inc:858
+#: plugins/personal/posix/class_posixAccount.inc:862
 msgid "The required field 'Home directory' is not set."
 msgstr "Das benötigte Feld 'Basisverzeichnis' ist nicht gesetzt."
 
-#: plugins/personal/posix/class_posixAccount.inc:861
+#: plugins/personal/posix/class_posixAccount.inc:865
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 "Bitte geben Sie einen gültigen Pfad in das Feld 'Basisverzeichnis' ein."
 
-#: plugins/personal/posix/class_posixAccount.inc:869
+#: plugins/personal/posix/class_posixAccount.inc:873
 msgid "Value specified as 'UID' is not valid."
 msgstr "Die von ihnen angebene 'UID' ist nicht korrekt."
 
-#: plugins/personal/posix/class_posixAccount.inc:872
+#: plugins/personal/posix/class_posixAccount.inc:876
 msgid "Value specified as 'UID' is too small."
 msgstr "Die von ihnen angebene 'UID' ist zu klein."
 
-#: plugins/personal/posix/class_posixAccount.inc:876
-#: plugins/admin/groups/class_groupGeneric.inc:610
+#: plugins/personal/posix/class_posixAccount.inc:880
+#: plugins/admin/groups/class_groupGeneric.inc:617
 msgid "Value specified as 'GID' is not valid."
 msgstr "Die von ihnen angebene 'GID' ist nicht korrekt."
 
-#: plugins/personal/posix/class_posixAccount.inc:879
-#: plugins/admin/groups/class_groupGeneric.inc:613
+#: plugins/personal/posix/class_posixAccount.inc:883
+#: plugins/admin/groups/class_groupGeneric.inc:620
 msgid "Value specified as 'GID' is too small."
 msgstr "Die von ihnen angebene 'GID' ist zu klein."
 
-#: plugins/personal/posix/class_posixAccount.inc:887
+#: plugins/personal/posix/class_posixAccount.inc:891
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr "Der von ihnen angegebene Wert 'shadowMin' ist nicht gültig."
 
-#: plugins/personal/posix/class_posixAccount.inc:892
+#: plugins/personal/posix/class_posixAccount.inc:896
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr "Der von ihnen angegebene Wert 'shadowMax' ist nicht gültig."
 
-#: plugins/personal/posix/class_posixAccount.inc:897
+#: plugins/personal/posix/class_posixAccount.inc:901
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr "Der von ihnen angegebene Wert 'shadowWarning' ist nicht gültig."
 
-#: plugins/personal/posix/class_posixAccount.inc:900
+#: plugins/personal/posix/class_posixAccount.inc:904
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr "'shadowWarning' in ohne die Angabe von 'shadowMax' ergibt keinen Sinn."
 
-#: plugins/personal/posix/class_posixAccount.inc:903
+#: plugins/personal/posix/class_posixAccount.inc:907
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 "Der angegebene Wert 'shadowWarning' sollte kleiner als 'shadowMax' sein."
 
-#: plugins/personal/posix/class_posixAccount.inc:906
+#: plugins/personal/posix/class_posixAccount.inc:910
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 "Der angegebene Wert 'shadowWarning' sollte größer als 'shadowMin' sein."
 
-#: plugins/personal/posix/class_posixAccount.inc:911
+#: plugins/personal/posix/class_posixAccount.inc:915
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr "Der von ihnen angegebene Wert 'shadowInactive' ist nicht gültig."
 
-#: plugins/personal/posix/class_posixAccount.inc:914
+#: plugins/personal/posix/class_posixAccount.inc:918
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr ""
 "'shadowInactive' in ohne die Angabe von 'shadowMax' ergibt keinen Sinn."
 
-#: plugins/personal/posix/class_posixAccount.inc:919
+#: plugins/personal/posix/class_posixAccount.inc:923
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr "Der angegebene Wert 'shadowMin' sollte kleiner als 'shadowMax' sein."
 
-#: plugins/personal/posix/class_posixAccount.inc:1021
-#: plugins/admin/groups/class_groupGeneric.inc:644
+#: plugins/personal/posix/class_posixAccount.inc:1036
+#: plugins/admin/groups/class_groupGeneric.inc:651
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 "Es sind zu viele Benutzer in der Datenbank. Es kann keine freie ID "
@@ -1403,6 +1404,10 @@ msgstr "Konto l
 msgid "Allow connection from these workstations only"
 msgstr "Erlaube Verbindungen nur von diesen Arbeitsstationen"
 
+#: plugins/personal/samba/main.inc:123
+msgid "Samba settings"
+msgstr "Samba-Einstellungen"
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "Wählen Sie die hinzuzufügenden Arbeitsstationen"
@@ -1415,10 +1420,6 @@ msgstr "Zeige die Arbeitsstationen der Abteilung"
 msgid "Display workstations matching"
 msgstr "Zeige die Arbeitsstationen, auf die Folgendes passt"
 
-#: plugins/personal/samba/main.inc:123
-msgid "Samba settings"
-msgstr "Samba-Einstellungen"
-
 #: plugins/personal/samba/class_sambaAccount.inc:193
 msgid "This account has no samba extensions."
 msgstr "Dieses Konto hat keine Samba-Erweiterungen."
@@ -1472,58 +1473,207 @@ msgstr "Eingabe AUS, Benachrichtigen EIN"
 msgid "input off, nofify off"
 msgstr "Eingabe AUS, Benachrichtigen AUS"
 
-#: plugins/personal/samba/class_sambaAccount.inc:456
-msgid "disconnect"
-msgstr "trennen"
+#: plugins/personal/samba/class_sambaAccount.inc:456
+msgid "disconnect"
+msgstr "trennen"
+
+#: plugins/personal/samba/class_sambaAccount.inc:457
+msgid "reset"
+msgstr "zurücksetzen"
+
+#: plugins/personal/samba/class_sambaAccount.inc:459
+msgid "from any client"
+msgstr "von jedem Client"
+
+#: plugins/personal/samba/class_sambaAccount.inc:460
+msgid "from previous client only"
+msgstr "nur von vorherigem Client"
+
+#: plugins/personal/samba/class_sambaAccount.inc:629
+#, php-format
+msgid "The value specified as '%s' contains invalid characters!"
+msgstr "Der als '%s' angegebene Wert enhält ungültige Zeichen!"
+
+#: plugins/personal/samba/class_sambaAccount.inc:639
+#, php-format
+msgid ""
+"The timeout property '%s' is checked and contains invalid or no characters!"
+msgstr ""
+"Die Zeitlimit Option '%s' ist ausgewählt, das entsprechende Feld enthält "
+"ungültige oder keine Zeichen!"
+
+#: plugins/personal/samba/class_sambaAccount.inc:645
+msgid ""
+"The windows user manager only allows eight clients. You've specified more "
+"than eight."
+msgstr ""
+"Die Windows Benutzerverwaltung erlaubt nur acht Clients. Sie haben mehr als "
+"acht angegeben."
+
+#: plugins/personal/samba/class_sambaAccount.inc:822
+msgid ""
+"Warning: This account has an undefined samba SID assigned. The problem can "
+"not be fixed by GOsa!"
+msgstr ""
+"Achtung: Diesem Konto ist eine unbekannte Samba-SID zugeordnet. GOsa kann "
+"dieses Problem nicht beheben!"
+
+#: plugins/personal/samba/class_sambaAccount.inc:847
+msgid ""
+"Warning: Can't identify users primary group - no conversion to a samba group "
+"possible!"
+msgstr ""
+"Warnung: Die primäre Benutzergruppe kann nicht identifiziert werden, kann "
+"daher keine Umwandlung in eine Samba-Gruppe vornehmen!"
+
+#: plugins/personal/generic/class_user.inc:233
+msgid "female"
+msgstr "weiblich"
+
+#: plugins/personal/generic/class_user.inc:233
+msgid "male"
+msgstr "männlich"
+
+#: plugins/personal/generic/class_user.inc:243
+msgid "This account has no valid GOsa extensions."
+msgstr "Dieses Konto hat keine gültigen GOsa-Erweiterungen."
+
+#: plugins/personal/generic/class_user.inc:272
+msgid "The specified file has not been uploaded via HTTP POST! Aborted."
+msgstr ""
+"Die angegebene Datei wurde nicht über HTTP POST übertragen! Aktion "
+"abgebrochen."
+
+#: plugins/personal/generic/class_user.inc:367
+msgid "Please enter a valid serial number"
+msgstr "Bitte geben Sie eine gültige Seriennummer ein"
+
+#: plugins/personal/generic/class_user.inc:404
+#, php-format
+msgid ""
+"Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
+msgstr ""
+"Zertifkat ist gültig im Zeitraum von <b>%s</b> bis <b>%s</b> (momentan: <b>%"
+"s</b>)."
+
+#: plugins/personal/generic/class_user.inc:404
+msgid "valid"
+msgstr "gültig"
+
+#: plugins/personal/generic/class_user.inc:404
+msgid "invalid"
+msgstr "ungültig"
+
+#: plugins/personal/generic/class_user.inc:408
+msgid "No certificate installed"
+msgstr "Kein Zertifikat eingerichtet"
+
+#: plugins/personal/generic/class_user.inc:808
+msgid "Kerberos database communication failed"
+msgstr "Die Kommunikation mit der Kerberos-Datenbank ist fehlgeschlagen"
+
+#: plugins/personal/generic/class_user.inc:825
+msgid "Can't remove user from kerberos database."
+msgstr "Benutzer kann nicht aus der Kerberos-Datenbank entfernt werden."
+
+#: plugins/personal/generic/class_user.inc:836
+msgid "Can't add user to kerberos database."
+msgstr "Benutzer kann nicht zur Kerberos-Datenbank hinzugefügt werden."
+
+#: plugins/personal/generic/class_user.inc:876
+msgid "You have no permissions to create a user on this 'Base'."
+msgstr ""
+"Sie haben keine Berechtigung, einen Benutzer innerhalb dieser 'Basis' "
+"anzulegen."
+
+#: plugins/personal/generic/class_user.inc:881
+msgid "You have no permissions to move a user from the original 'Base'."
+msgstr ""
+"Sie haben keine Berechtigung, einen Benutzer aus der ursprünglichen 'Basis' "
+"zu verschieben."
 
-#: plugins/personal/samba/class_sambaAccount.inc:457
-msgid "reset"
-msgstr "zurücksetzen"
+#: plugins/personal/generic/class_user.inc:887
+#: plugins/addons/addressbook/class_addressbook.inc:527
+#: plugins/admin/users/class_userManagement.inc:501
+msgid "The required field 'Name' is not set."
+msgstr "Das benötigte Feld 'Name' ist nicht gesetzt."
 
-#: plugins/personal/samba/class_sambaAccount.inc:459
-msgid "from any client"
-msgstr "von jedem Client"
+#: plugins/personal/generic/class_user.inc:896
+msgid "There's already a person with this 'Login' in the database."
+msgstr "Die von Ihnen angegebene 'Kennung' ist bereits vergeben."
 
-#: plugins/personal/samba/class_sambaAccount.inc:460
-msgid "from previous client only"
-msgstr "nur von vorherigem Client"
+#: plugins/personal/generic/class_user.inc:902
+#: plugins/addons/addressbook/class_addressbook.inc:531
+#: plugins/admin/users/class_userManagement.inc:504
+msgid "The required field 'Given name' is not set."
+msgstr "Das benötigte Feld 'Vorname' ist nicht gesetzt."
 
-#: plugins/personal/samba/class_sambaAccount.inc:629
-#, php-format
-msgid "The value specified as '%s' contains invalid characters!"
-msgstr "Der als '%s' angegebene Wert enhält ungültige Zeichen!"
+#: plugins/personal/generic/class_user.inc:905
+msgid "The required field 'Login' is not set."
+msgstr "Das benötigte Feld 'Kennung' ist nicht gesetzt."
 
-#: plugins/personal/samba/class_sambaAccount.inc:639
-#, php-format
+#: plugins/personal/generic/class_user.inc:912
 msgid ""
-"The timeout property '%s' is checked and contains invalid or no characters!"
+"There's already a person with this 'Name'/'Given name' combination in the "
+"database."
 msgstr ""
-"Die Zeitlimit Option '%s' ist ausgewählt, das entsprechende Feld enthält "
-"ungültige oder keine Zeichen!"
+"Die von Ihnen angegebene Kombination aus 'Name'/'Vorname' ist bereits in der "
+"Datenbank vorhanden."
 
-#: plugins/personal/samba/class_sambaAccount.inc:645
+#: plugins/personal/generic/class_user.inc:919
 msgid ""
-"The windows user manager only allows eight clients. You've specified more "
-"than eight."
+"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
 msgstr ""
-"Die Windows Benutzerverwaltung erlaubt nur acht Clients. Sie haben mehr als "
-"acht angegeben."
+"Das Feld 'Kennung' enthält ungültige Zeichen. Kleinbuchstaben, Zahlen und "
+"Bindestriche sind erlaubt."
 
-#: plugins/personal/samba/class_sambaAccount.inc:822
-msgid ""
-"Warning: This account has an undefined samba SID assigned. The problem can "
-"not be fixed by GOsa!"
-msgstr ""
-"Achtung: Diesem Konto ist eine unbekannte Samba-SID zugeordnet. GOsa kann "
-"dieses Problem nicht beheben!"
+#: plugins/personal/generic/class_user.inc:922
+msgid "The field 'Homepage' contains an invalid URL definition."
+msgstr "Das Feld 'Homepage' enthält eine ungültige Internetadresse."
 
-#: plugins/personal/samba/class_sambaAccount.inc:847
-msgid ""
-"Warning: Can't identify users primary group - no conversion to a samba group "
-"possible!"
-msgstr ""
-"Warnung: Die primäre Benutzergruppe kann nicht identifiziert werden, kann "
-"daher keine Umwandlung in eine Samba-Gruppe vornehmen!"
+#: plugins/personal/generic/class_user.inc:925
+#: plugins/personal/generic/class_user.inc:953
+#: plugins/addons/addressbook/class_addressbook.inc:537
+#: plugins/addons/addressbook/class_addressbook.inc:565
+#: plugins/admin/departments/class_departmentGeneric.inc:159
+msgid "The field 'Name' contains invalid characters."
+msgstr "Das Feld 'Name' enthält ungültige Zeichen."
+
+#: plugins/personal/generic/class_user.inc:928
+#: plugins/personal/generic/class_user.inc:950
+#: plugins/addons/addressbook/class_addressbook.inc:540
+#: plugins/addons/addressbook/class_addressbook.inc:562
+msgid "The field 'Given name' contains invalid characters."
+msgstr "Das Feld 'Vorname' enthält ungültige Zeichen."
+
+#: plugins/personal/generic/class_user.inc:933
+#: plugins/personal/generic/class_user.inc:936
+#: plugins/addons/addressbook/class_addressbook.inc:545
+#: plugins/addons/addressbook/class_addressbook.inc:548
+#: plugins/admin/departments/class_departmentGeneric.inc:162
+msgid "The field 'Phone' contains an invalid phone number."
+msgstr "Das Feld 'Telefon' enthält eine ungültige Telefonnummer."
+
+#: plugins/personal/generic/class_user.inc:939
+#: plugins/addons/addressbook/class_addressbook.inc:551
+#: plugins/admin/departments/class_departmentGeneric.inc:165
+msgid "The field 'Fax' contains an invalid phone number."
+msgstr "Das Feld 'Fax' enthält eine ungültige Telefonnummer."
+
+#: plugins/personal/generic/class_user.inc:942
+#: plugins/addons/addressbook/class_addressbook.inc:554
+msgid "The field 'Mobile' contains an invalid phone number."
+msgstr "Das Feld 'Mobil' enthält eine ungültige Telefonnummer"
+
+#: plugins/personal/generic/class_user.inc:945
+#: plugins/addons/addressbook/class_addressbook.inc:557
+msgid "The field 'Pager' contains an invalid phone number."
+msgstr "Das Feld 'Pager' enthält eine ungültige Telefonnummer."
+
+#: plugins/personal/generic/class_user.inc:1070
+msgid "Could not open specified certificate!"
+msgstr "Die angegebene Datei konnte nicht geöffnet werden!"
 
 #: plugins/personal/generic/password.tpl:2
 msgid ""
@@ -1536,40 +1686,31 @@ msgstr ""
 "Passwort an dieser Stelle noch einmal eingeben, damit es von GOsa in der "
 "gewünschten Verschlüsselung abgelegt werden kann."
 
-#: plugins/personal/generic/generic_picture.tpl:6
-#: plugins/personal/generic/generic.tpl:15
-msgid "Personal picture"
-msgstr "Bild"
-
-#: plugins/personal/generic/generic_picture.tpl:23
-msgid "Remove picture"
-msgstr "Bild entfernen"
-
-#: plugins/personal/generic/generic_picture.tpl:29
-#: plugins/addons/addressbook/address_edit.tpl:107
-msgid "Save"
-msgstr "Sichern"
-
 #: plugins/personal/generic/generic.tpl:6
 msgid "Personal information"
 msgstr "Persönliche Informationen"
 
+#: plugins/personal/generic/generic.tpl:15
+#: plugins/personal/generic/generic_picture.tpl:6
+msgid "Personal picture"
+msgstr "Bild"
+
 #: plugins/personal/generic/generic.tpl:17
 msgid "Change picture"
 msgstr "Bild ändern"
 
 #: plugins/personal/generic/generic.tpl:24
-#: plugins/addons/addressbook/address_edit.tpl:20
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:503
+#: plugins/addons/addressbook/address_edit.tpl:22
 #: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/addons/addressbook/class_addressbook.inc:504
 #: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
 msgid "Name"
 msgstr "Name"
 
 #: plugins/personal/generic/generic.tpl:30
-#: plugins/addons/addressbook/address_edit.tpl:20
-#: plugins/addons/addressbook/class_addressbook.inc:503
+#: plugins/addons/addressbook/address_edit.tpl:22
+#: plugins/addons/addressbook/class_addressbook.inc:504
 #: plugins/admin/users/template.tpl:23
 msgid "Given name"
 msgstr "Vorname"
@@ -1579,7 +1720,7 @@ msgid "Login"
 msgstr "Kennung"
 
 #: plugins/personal/generic/generic.tpl:42
-#: plugins/addons/addressbook/address_edit.tpl:26
+#: plugins/addons/addressbook/address_edit.tpl:33
 #: plugins/addons/addressbook/address_info.tpl:22
 msgid "Personal title"
 msgstr "Titel"
@@ -1621,8 +1762,8 @@ msgstr "W
 
 #: plugins/personal/generic/generic.tpl:111
 #: plugins/personal/generic/generic.tpl:255
-#: plugins/addons/addressbook/address_edit.tpl:37
-#: plugins/addons/addressbook/address_edit.tpl:86
+#: plugins/addons/addressbook/address_edit.tpl:44
+#: plugins/addons/addressbook/address_edit.tpl:93
 #: plugins/addons/addressbook/address_info.tpl:33
 #: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/admin/departments/generic.tpl:54
@@ -1667,8 +1808,16 @@ msgid "Organization"
 msgstr "Organisation"
 
 #: plugins/personal/generic/generic.tpl:177
-#: plugins/addons/addressbook/address_edit.tpl:68
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:308
+#: plugins/addons/addressbook/address_edit.tpl:75
 #: plugins/addons/addressbook/address_info.tpl:64
+#: plugins/admin/groups/class_groupManagement.inc:394
+#: plugins/admin/users/class_userManagement.inc:640
+#: plugins/admin/applications/class_applicationManagement.inc:364
+#: plugins/admin/systems/class_systemManagement.inc:553
+#: plugins/admin/ogroups/class_ogroupManagement.inc:411
+#: plugins/admin/ogroups/class_ogroupManagement.inc:479
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #: plugins/generic/references/class_reference.inc:38
 msgid "Department"
 msgstr "Abteilung"
@@ -1691,14 +1840,14 @@ msgid "Room No."
 msgstr "Zimmer-Nr."
 
 #: plugins/personal/generic/generic.tpl:221
-#: plugins/addons/addressbook/address_edit.tpl:44
 #: plugins/addons/addressbook/contents.tpl:15
+#: plugins/addons/addressbook/address_edit.tpl:51
 #: plugins/addons/addressbook/address_info.tpl:40
 msgid "Mobile"
 msgstr "Mobiltelefon"
 
 #: plugins/personal/generic/generic.tpl:225
-#: plugins/addons/addressbook/address_edit.tpl:95
+#: plugins/addons/addressbook/address_edit.tpl:102
 #: plugins/addons/addressbook/address_info.tpl:91
 msgid "Pager"
 msgstr "Pager"
@@ -1748,7 +1897,7 @@ msgid "Street"
 msgstr "Straße"
 
 #: plugins/personal/generic/generic.tpl:329
-#: plugins/addons/addressbook/address_edit.tpl:74
+#: plugins/addons/addressbook/address_edit.tpl:81
 #: plugins/addons/addressbook/address_info.tpl:70
 msgid "Postal code"
 msgstr "Postleitzahl"
@@ -1765,10 +1914,19 @@ msgstr "Verwenden sie den Telefon-Reiter"
 msgid "Last delivery"
 msgstr "letzte Übermittlung"
 
-#: plugins/personal/generic/generic.tpl:378
+#: plugins/personal/generic/generic.tpl:377
 msgid "Public visible"
 msgstr "Öffentlich sichtbar"
 
+#: plugins/personal/generic/generic_picture.tpl:23
+msgid "Remove picture"
+msgstr "Bild entfernen"
+
+#: plugins/personal/generic/generic_picture.tpl:29
+#: plugins/addons/addressbook/address_edit.tpl:114
+msgid "Save"
+msgstr "Sichern"
+
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr "Standard-Zertifikat"
@@ -1779,7 +1937,7 @@ msgstr "Standard-Zertifikat"
 #: plugins/personal/connectivity/class_kolabAccount.inc:203
 #: plugins/admin/groups/class_groupMail.inc:408
 #: plugins/admin/applications/class_applicationParameters.inc:94
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:377
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:635
 #: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
 msgid "Remove"
 msgstr "Entfernen"
@@ -1796,188 +1954,127 @@ msgstr "PKCS12-Zertifikat"
 msgid "Certificate serial number"
 msgstr "Zertifikat-Seriennummer"
 
-#: plugins/personal/generic/class_user.inc:231
-msgid "female"
-msgstr "weiblich"
-
-#: plugins/personal/generic/class_user.inc:231
-msgid "male"
-msgstr "männlich"
-
-#: plugins/personal/generic/class_user.inc:241
-msgid "This account has no valid GOsa extensions."
-msgstr "Dieses Konto hat keine gültigen GOsa-Erweiterungen."
-
-#: plugins/personal/generic/class_user.inc:270
-msgid "The specified file has not been uploaded via HTTP POST! Aborted."
-msgstr ""
-"Die angegebene Datei wurde nicht über HTTP POST übertragen! Aktion "
-"abgebrochen."
+#: plugins/personal/generic/main.inc:107
+msgid "You are not allowed to set your password!"
+msgstr "Sie haben keine Berechtigung ihr Passwort zu ändern!"
 
-#: plugins/personal/generic/class_user.inc:365
-msgid "Please enter a valid serial number"
-msgstr "Bitte geben Sie eine gültige Seriennummer ein"
+#: plugins/personal/generic/main.inc:187
+msgid "Generic user information"
+msgstr "Generische Benutzer-Information"
 
-#: plugins/personal/generic/class_user.inc:402
-#, php-format
-msgid ""
-"Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
-msgstr ""
-"Zertifkat ist gültig im Zeitraum von <b>%s</b> bis <b>%s</b> (momentan: <b>%"
-"s</b>)."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
+msgstr "FTP"
 
-#: plugins/personal/generic/class_user.inc:402
-msgid "valid"
-msgstr "gültig"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
+msgid "Value specified as 'Upload bandwidth' is not valid."
+msgstr "Die von Ihnen angegebene 'Upload-Bandbreite' ist nicht gültig."
 
-#: plugins/personal/generic/class_user.inc:402
-msgid "invalid"
-msgstr "ungültig"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
+msgid "Value specified as 'Download bandwidth' is not valid."
+msgstr "Die von Ihnen angegebene 'Download-Bandbreite' ist nicht gültig."
 
-#: plugins/personal/generic/class_user.inc:406
-msgid "No certificate installed"
-msgstr "Kein Zertifikat eingerichtet"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
+msgid "Value specified as 'Files' is not valid."
+msgstr "Das Feld 'Dateien' enthält eine ungültige Eingabe."
 
-#: plugins/personal/generic/class_user.inc:800
-msgid "Kerberos database communication failed"
-msgstr "Die Kommunikation mit der Kerberos-Datenbank ist fehlgeschlagen"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
+msgid "Value specified as 'Size' is not valid."
+msgstr "Das Feld 'Größe' enthält eine ungültige Eingabe."
 
-#: plugins/personal/generic/class_user.inc:817
-msgid "Can't remove user from kerberos database."
-msgstr "Benutzer kann nicht aus der Kerberos-Datenbank entfernt werden."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+msgid "Value specified as 'Ratio' is not valid."
+msgstr "Das Feld 'Verhältins' enthält eine ungültige Eingabe."
 
-#: plugins/personal/generic/class_user.inc:828
-msgid "Can't add user to kerberos database."
-msgstr "Benutzer kann nicht zur Kerberos-Datenbank hinzugefügt werden."
+#: plugins/personal/connectivity/class_phpgwAccount.inc:5
+msgid "PHPGroupware"
+msgstr "PHPGroupware"
 
-#: plugins/personal/generic/class_user.inc:868
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr ""
-"Sie haben keine Berechtigung, einen Benutzer innerhalb dieser 'Basis' "
-"anzulegen."
+#: plugins/personal/connectivity/proxy.tpl:16
+msgid "Proxy account"
+msgstr "Proxy Konto"
 
-#: plugins/personal/generic/class_user.inc:873
-msgid "You have no permissions to move a user from the original 'Base'."
+#: plugins/personal/connectivity/proxy.tpl:24
+msgid "Filter unwanted content (i.e. pornographic or violence related)"
 msgstr ""
-"Sie haben keine Berechtigung, einen Benutzer aus der ursprünglichen 'Basis' "
-"zu verschieben."
+"Filtern von ungewollten Inhalten (z.B. pornografische oder gewalttätige "
+"Inhalte)"
 
-#: plugins/personal/generic/class_user.inc:879
-#: plugins/addons/addressbook/class_addressbook.inc:526
-#: plugins/admin/users/class_userManagement.inc:425
-msgid "The required field 'Name' is not set."
-msgstr "Das benötigte Feld 'Name' ist nicht gesetzt."
+#: plugins/personal/connectivity/proxy.tpl:35
+msgid "Limit proxy access to working time"
+msgstr "Inhaltsfilterung nur während der Arbeitszeit"
 
-#: plugins/personal/generic/class_user.inc:888
-msgid "There's already a person with this 'Login' in the database."
-msgstr "Die von Ihnen angegebene 'Kennung' ist bereits vergeben."
+#: plugins/personal/connectivity/proxy.tpl:69
+msgid "Restrict proxy usage by quota"
+msgstr "Proxynutzung durch Kontingent einschränken"
 
-#: plugins/personal/generic/class_user.inc:894
-#: plugins/addons/addressbook/class_addressbook.inc:530
-#: plugins/admin/users/class_userManagement.inc:428
-msgid "The required field 'Given name' is not set."
-msgstr "Das benötigte Feld 'Vorname' ist nicht gesetzt."
+#: plugins/personal/connectivity/proxy.tpl:80
+msgid "per"
+msgstr "pro"
 
-#: plugins/personal/generic/class_user.inc:897
-msgid "The required field 'Login' is not set."
-msgstr "Das benötigte Feld 'Kennung' ist nicht gesetzt."
+#: plugins/personal/connectivity/class_kolabAccount.inc:5
+msgid "Kolab"
+msgstr "Kolab"
 
-#: plugins/personal/generic/class_user.inc:904
+#: plugins/personal/connectivity/class_kolabAccount.inc:102
 msgid ""
-"There's already a person with this 'Name'/'Given name' combination in the "
-"database."
+"You're trying to add an invalid email address to the list of delegations."
 msgstr ""
-"Die von Ihnen angegebene Kombination aus 'Name'/'Vorname' ist bereits in der "
-"Datenbank vorhanden."
+"Sie versuchen, eine ungültige Mail-Adresse in die Liste der Stellvertreter "
+"aufzunehmen."
 
-#: plugins/personal/generic/class_user.inc:911
+#: plugins/personal/connectivity/class_kolabAccount.inc:110
 msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
+"The mail address you're trying to add is no primary mail address of an "
+"existing user."
 msgstr ""
-"Das Feld 'Kennung' enthält ungültige Zeichen. Kleinbuchstaben, Zahlen und "
-"Bindestriche sind erlaubt."
-
-#: plugins/personal/generic/class_user.inc:914
-msgid "The field 'Homepage' contains an invalid URL definition."
-msgstr "Das Feld 'Homepage' enthält eine ungültige Internetadresse."
-
-#: plugins/personal/generic/class_user.inc:917
-#: plugins/personal/generic/class_user.inc:945
-#: plugins/addons/addressbook/class_addressbook.inc:536
-#: plugins/addons/addressbook/class_addressbook.inc:564
-#: plugins/admin/departments/class_departmentGeneric.inc:155
-msgid "The field 'Name' contains invalid characters."
-msgstr "Das Feld 'Name' enthält ungültige Zeichen."
-
-#: plugins/personal/generic/class_user.inc:920
-#: plugins/personal/generic/class_user.inc:942
-#: plugins/addons/addressbook/class_addressbook.inc:539
-#: plugins/addons/addressbook/class_addressbook.inc:561
-msgid "The field 'Given name' contains invalid characters."
-msgstr "Das Feld 'Vorname' enthält ungültige Zeichen."
-
-#: plugins/personal/generic/class_user.inc:925
-#: plugins/personal/generic/class_user.inc:928
-#: plugins/addons/addressbook/class_addressbook.inc:544
-#: plugins/addons/addressbook/class_addressbook.inc:547
-#: plugins/admin/departments/class_departmentGeneric.inc:158
-msgid "The field 'Phone' contains an invalid phone number."
-msgstr "Das Feld 'Telefon' enthält eine ungültige Telefonnummer."
-
-#: plugins/personal/generic/class_user.inc:931
-#: plugins/addons/addressbook/class_addressbook.inc:550
-#: plugins/admin/departments/class_departmentGeneric.inc:161
-msgid "The field 'Fax' contains an invalid phone number."
-msgstr "Das Feld 'Fax' enthält eine ungültige Telefonnummer."
-
-#: plugins/personal/generic/class_user.inc:934
-#: plugins/addons/addressbook/class_addressbook.inc:553
-msgid "The field 'Mobile' contains an invalid phone number."
-msgstr "Das Feld 'Mobil' enthält eine ungültige Telefonnummer"
+"Die Adresse, die Sie gerade hinzufügen möchten, ist keine primäre Mail-"
+"Adresse eines bestehenden Benutzers"
 
-#: plugins/personal/generic/class_user.inc:937
-#: plugins/addons/addressbook/class_addressbook.inc:556
-msgid "The field 'Pager' contains an invalid phone number."
-msgstr "Das Feld 'Pager' enthält eine ungültige Telefonnummer."
+#: plugins/personal/connectivity/class_kolabAccount.inc:137
+msgid "Always accept"
+msgstr "Immer annehmen"
 
-#: plugins/personal/generic/class_user.inc:1062
-msgid "Could not open specified certificate!"
-msgstr "Die angegebene Datei konnte nicht geöffnet werden!"
+#: plugins/personal/connectivity/class_kolabAccount.inc:138
+msgid "Always reject"
+msgstr "Immer ablehnen"
 
-#: plugins/personal/generic/main.inc:107
-msgid "You are not allowed to set your password!"
-msgstr "Sie haben keine Berechtigung ihr Passwort zu ändern!"
+#: plugins/personal/connectivity/class_kolabAccount.inc:139
+msgid "Reject if conflicts"
+msgstr "Im Konfliktfall ablehnen"
 
-#: plugins/personal/generic/main.inc:187
-msgid "Generic user information"
-msgstr "Generische Benutzer-Information"
+#: plugins/personal/connectivity/class_kolabAccount.inc:140
+msgid "Manual if conflicts"
+msgstr "Im Konfliktfall manuell bearbeiten"
 
-#: plugins/personal/connectivity/proxy.tpl:16
-msgid "Proxy account"
-msgstr "Proxy Konto"
+#: plugins/personal/connectivity/class_kolabAccount.inc:141
+msgid "Manual"
+msgstr "Manuell"
 
-#: plugins/personal/connectivity/proxy.tpl:24
-msgid "Filter unwanted content (i.e. pornographic or violence related)"
-msgstr ""
-"Filtern von ungewollten Inhalten (z.B. pornografische oder gewalttätige "
-"Inhalte)"
+#: plugins/personal/connectivity/class_kolabAccount.inc:177
+msgid "Anonymous"
+msgstr "Anonym"
 
-#: plugins/personal/connectivity/proxy.tpl:35
-msgid "Limit proxy access to working time"
-msgstr "Inhaltsfilterung nur während der Arbeitszeit"
+#: plugins/personal/connectivity/class_kolabAccount.inc:229
+msgid "The value specified as Free Busy future needs to be an integer."
+msgstr "Der Wert für Intervall muß eine Ganzzahl sein."
 
-#: plugins/personal/connectivity/proxy.tpl:69
-msgid "Restrict proxy usage by quota"
-msgstr "Proxynutzung durch Kontingent einschränken"
+#: plugins/personal/connectivity/class_kolabAccount.inc:234
+msgid "The value specified as Free Busy Information URL is invalid."
+msgstr "Der Wert für Information URL is ungültig."
 
-#: plugins/personal/connectivity/proxy.tpl:79
-msgid "per"
-msgstr "pro"
+#: plugins/personal/connectivity/class_kolabAccount.inc:248
+#, php-format
+msgid "The invitation policy entry for address '%s' is not valid."
+msgstr "Die Einladungs-Richtlinie für die Adresse '%s' ist ungültig."
 
-#: plugins/personal/connectivity/intranet.tpl:1
-msgid "Intranet account"
-msgstr "Intranet Konto"
+#: plugins/personal/connectivity/class_kolabAccount.inc:256
+#, php-format
+msgid "There's no mail user with address '%s' for your invitation policy!"
+msgstr ""
+"Es gibt keinen Mail Benutzer mit der Adresse %s für Ihre Einladungs-"
+"Richtlinie!"
 
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
 msgid "WebDAV"
@@ -2033,6 +2130,47 @@ msgstr "Tage"
 msgid "Invitation policy"
 msgstr "Einladungs-Richtlinie"
 
+#: plugins/personal/connectivity/webdav.tpl:1
+msgid "WebDAV account"
+msgstr "WebDAV Konto"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
+msgid "Open-Xchange"
+msgstr "Open-Xchange"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
+msgid ""
+"This account has <b>OpenXchange</b> features disabled. Posix features are "
+"needed for openXchange accounts, enable them first."
+msgstr ""
+"Dieses Konto hat die OpenXchange-Erweiterungen deaktiviert. Um diese zu "
+"aktivieren werden die UNIX-Erweiterungen benötigt. Aktivieren Sie diese."
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
+msgid ""
+"This account has <b>OpenXchange</b> features disabled. Mail features are "
+"needed for openXchange accounts, enable them first."
+msgstr ""
+"Dieses Konto hat die OpenXchange-Erweiterungen deaktiviert. Um diese zu "
+"aktivieren werden die Mail-Erweiterungen benötigt. Aktivieren Sie diese."
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
+msgid "Couldn't Connect To Postgresql Database"
+msgstr "Die PostgreSQL-Datenbank kann nicht erreicht werden"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
+msgid "Needed Parameters to openexchange connectivity plugin failed!"
+msgstr ""
+"Benötigte Parameter für Open-Xchange Konnektivitätserweiterung "
+"fehlgeschlagen!"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
+msgid "PHP4 module for Postgresql Database Failed!"
+msgstr "PHP4-Erweiterung für PostgreSQL Datenbank fehlgeschlagen!"
+
 #: plugins/personal/connectivity/pureftpd.tpl:1
 msgid "FTP account"
 msgstr "FTP Konto"
@@ -2078,269 +2216,91 @@ msgstr "Hoch- / runtergeladene Dateien"
 msgid "Check to disable FTP Access"
 msgstr "Wählen Sie diese Option um den FTP-Zugriff zu deaktivieren"
 
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Temporary disable FTP access"
-msgstr "Temporäres Abschalten des FTP-Zugriffs"
-
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "Open-Xchange Account"
-msgstr "Open-Xchange Konto"
-
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "disabled, no Postgresql support detected"
-msgstr "deaktiviert, keine PostgreSQL-Unterstützung erkannt"
-
-#: plugins/personal/connectivity/oxchange.tpl:4
-msgid "Open-Xchange account"
-msgstr "Open-Xchange Konto"
-
-#: plugins/personal/connectivity/oxchange.tpl:13
-msgid "Remember"
-msgstr "Erinnern"
-
-#: plugins/personal/connectivity/oxchange.tpl:17
-msgid "Appointment Days"
-msgstr "Tage für Termin"
-
-#: plugins/personal/connectivity/oxchange.tpl:21
-msgid "Task Days"
-msgstr "Tage für Aufgabe"
-
-#: plugins/personal/connectivity/oxchange.tpl:33
-msgid "User Information"
-msgstr "Benutzer Information"
-
-#: plugins/personal/connectivity/oxchange.tpl:37
-msgid "User Timezone"
-msgstr "Zeitzone des Benutzers"
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:5
-#: plugins/generic/references/class_reference.inc:32
-msgid "Proxy"
-msgstr "Proxy"
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:76
-msgid "KB"
-msgstr "KB"
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:76
-msgid "GB"
-msgstr "GB"
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "hour"
-msgstr "Stunde"
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "day"
-msgstr "Tag"
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "week"
-msgstr "Woche"
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "month"
-msgstr "Monat"
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:128
-msgid "Numerical value for Quota Setting is empty."
-msgstr "Das Numerische Feld der Kontingent-Einstellung ist leer."
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:131
-msgid "Numerical value for Quota Setting is not valid."
-msgstr ""
-"Das Numerische Feld der Kontingent-Einstellung enthält einen ungültigen Wert."
-
-#: plugins/personal/connectivity/class_intranetAccount.inc:14
-msgid "Intranet"
-msgstr "Intranet"
-
-#: plugins/personal/connectivity/class_phpgwAccount.inc:5
-msgid "PHPGroupware"
-msgstr "PHPGroupware"
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:5
-msgid "Kolab"
-msgstr "Kolab"
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:102
-msgid ""
-"You're trying to add an invalid email address to the list of delegations."
-msgstr ""
-"Sie versuchen, eine ungültige Mail-Adresse in die Liste der Stellvertreter "
-"aufzunehmen."
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:110
-msgid ""
-"The mail address you're trying to add is no primary mail address of an "
-"existing user."
-msgstr ""
-"Die Adresse, die Sie gerade hinzufügen möchten, ist keine primäre Mail-"
-"Adresse eines bestehenden Benutzers"
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:137
-msgid "Always accept"
-msgstr "Immer annehmen"
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:138
-msgid "Always reject"
-msgstr "Immer ablehnen"
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:139
-msgid "Reject if conflicts"
-msgstr "Im Konfliktfall ablehnen"
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:140
-msgid "Manual if conflicts"
-msgstr "Im Konfliktfall manuell bearbeiten"
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:141
-msgid "Manual"
-msgstr "Manuell"
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:177
-msgid "Anonymous"
-msgstr "Anonym"
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:229
-msgid "The value specified as Free Busy future needs to be an integer."
-msgstr "Der Wert für Intervall muß eine Ganzzahl sein."
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:234
-msgid "The value specified as Free Busy Information URL is invalid."
-msgstr "Der Wert für Information URL is ungültig."
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:248
-#, php-format
-msgid "The invitation policy entry for address '%s' is not valid."
-msgstr "Die Einladungs-Richtlinie für die Adresse '%s' ist ungültig."
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:256
-#, php-format
-msgid "There's no mail user with address '%s' for your invitation policy!"
-msgstr ""
-"Es gibt keinen Mail Benutzer mit der Adresse %s für Ihre Einladungs-"
-"Richtlinie!"
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
-#: plugins/generic/references/class_reference.inc:34
-msgid "FTP"
-msgstr "FTP"
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
-msgid "Value specified as 'Upload bandwidth' is not valid."
-msgstr "Die von Ihnen angegebene 'Upload-Bandbreite' ist nicht gültig."
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
-msgid "Value specified as 'Download bandwidth' is not valid."
-msgstr "Die von Ihnen angegebene 'Download-Bandbreite' ist nicht gültig."
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
-msgid "Value specified as 'Files' is not valid."
-msgstr "Das Feld 'Dateien' enthält eine ungültige Eingabe."
+#: plugins/personal/connectivity/pureftpd.tpl:67
+msgid "Temporary disable FTP access"
+msgstr "Temporäres Abschalten des FTP-Zugriffs"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
-msgid "Value specified as 'Size' is not valid."
-msgstr "Das Feld 'Größe' enthält eine ungültige Eingabe."
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "Open-Xchange Account"
+msgstr "Open-Xchange Konto"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
-msgid "Value specified as 'Ratio' is not valid."
-msgstr "Das Feld 'Verhältins' enthält eine ungültige Eingabe."
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "disabled, no Postgresql support detected"
+msgstr "deaktiviert, keine PostgreSQL-Unterstützung erkannt"
 
-#: plugins/personal/connectivity/webdav.tpl:1
-msgid "WebDAV account"
-msgstr "WebDAV Konto"
+#: plugins/personal/connectivity/oxchange.tpl:4
+msgid "Open-Xchange account"
+msgstr "Open-Xchange Konto"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
-msgid "Open-Xchange"
-msgstr "Open-Xchange"
+#: plugins/personal/connectivity/oxchange.tpl:13
+msgid "Remember"
+msgstr "Erinnern"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
-msgid ""
-"This account has <b>OpenXchange</b> features disabled. Posix features are "
-"needed for openXchange accounts, enable them first."
-msgstr ""
-"Dieses Konto hat die OpenXchange-Erweiterungen deaktiviert. Um diese zu "
-"aktivieren werden die UNIX-Erweiterungen benötigt. Aktivieren Sie diese."
+#: plugins/personal/connectivity/oxchange.tpl:17
+msgid "Appointment Days"
+msgstr "Tage für Termin"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
-msgid ""
-"This account has <b>OpenXchange</b> features disabled. Mail features are "
-"needed for openXchange accounts, enable them first."
-msgstr ""
-"Dieses Konto hat die OpenXchange-Erweiterungen deaktiviert. Um diese zu "
-"aktivieren werden die Mail-Erweiterungen benötigt. Aktivieren Sie diese."
+#: plugins/personal/connectivity/oxchange.tpl:21
+msgid "Task Days"
+msgstr "Tage für Aufgabe"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:774
-msgid "Couldn't Connect To Postgresql Database"
-msgstr "Die PostgreSQL-Datenbank kann nicht erreicht werden"
+#: plugins/personal/connectivity/oxchange.tpl:33
+msgid "User Information"
+msgstr "Benutzer Information"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:778
-msgid "Needed Parameters to openexchange connectivity plugin failed!"
-msgstr ""
-"Benötigte Parameter für Open-Xchange Konnektivitätserweiterung "
-"fehlgeschlagen!"
+#: plugins/personal/connectivity/oxchange.tpl:37
+msgid "User Timezone"
+msgstr "Zeitzone des Benutzers"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:782
-msgid "PHP4 module for Postgresql Database Failed!"
-msgstr "PHP4-Erweiterung für PostgreSQL Datenbank fehlgeschlagen!"
+#: plugins/personal/connectivity/intranet.tpl:1
+msgid "Intranet account"
+msgstr "Intranet Konto"
 
 #: plugins/personal/connectivity/class_connectivity.inc:60
 msgid "This account has no connectivity extensions."
 msgstr "Dieses Konto hat keine Konnektivitäts-Erweiterungen."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:5
-msgid "FAX Blocklists"
-msgstr "FAX Sperrlisten"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:121
-#, php-format
-msgid "You're about to delete the blocklist '%s'."
-msgstr "Sie möchten die Blockliste '%s' löschen."
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:135
-msgid "You have no permission to remove this blocklist."
-msgstr "Sie haben keine Berechtigung diese Blockliste zu entfernen."
+#: plugins/personal/connectivity/class_proxyAccount.inc:5
+#: plugins/generic/references/class_reference.inc:32
+msgid "Proxy"
+msgstr "Proxy"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:153
-msgid "Please specify a valid phone number."
-msgstr "Bitte geben Sie eine gültige Telefonnummer an."
+#: plugins/personal/connectivity/class_proxyAccount.inc:76
+msgid "KB"
+msgstr "KB"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:226
-msgid "send"
-msgstr "senden"
+#: plugins/personal/connectivity/class_proxyAccount.inc:76
+msgid "GB"
+msgstr "GB"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:226
-msgid "receive"
-msgstr "empfangen"
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
+msgid "hour"
+msgstr "Stunde"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:348
-msgid "You have no permissions to create a blocklist on this 'Base'."
-msgstr ""
-"Sie haben keine Berechtigung, eine Blocklist unter dieser 'Basis' anzulegen."
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
+msgid "day"
+msgstr "Tag"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:354
-#: plugins/admin/departments/class_departmentGeneric.inc:143
-msgid "Required field 'Name' is not set."
-msgstr "Das benötigte Feld 'Name' ist nicht ausgefüllt."
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
+msgid "week"
+msgstr "Woche"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:357
-msgid "Required field 'Name' contains invalid characters"
-msgstr "Das benötigte Feld 'Name' enthält ungültige Zeichen"
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
+msgid "month"
+msgstr "Monat"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:365
-msgid "Specified name is already used."
-msgstr "Der angegebene Name wird bereits verwendet."
+#: plugins/personal/connectivity/class_proxyAccount.inc:128
+msgid "Numerical value for Quota Setting is empty."
+msgstr "Das Numerische Feld der Kontingent-Einstellung ist leer."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:372
-msgid "No permission to create a blocklist on this base."
+#: plugins/personal/connectivity/class_proxyAccount.inc:131
+msgid "Numerical value for Quota Setting is not valid."
 msgstr ""
-"Sie haben keine Berechtigung, eine Sperrliste unterhalb dieser Basis "
-"anzulegen."
+"Das Numerische Feld der Kontingent-Einstellung enthält einen ungültigen Wert."
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:14
+msgid "Intranet"
+msgstr "Intranet"
 
 #: plugins/gofax/blocklists/generic.tpl:8
 msgid "List name"
@@ -2385,13 +2345,13 @@ msgid "Blocked numbers"
 msgstr "Gesperrte Nummern"
 
 #: plugins/gofax/blocklists/generic.tpl:67
-#: plugins/gofax/blocklists/headpage.tpl:25
+#: plugins/gofax/blocklists/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
-#: plugins/admin/groups/headpage.tpl:26 plugins/admin/users/headpage.tpl:27
-#: plugins/admin/applications/headpage.tpl:25
-#: plugins/admin/departments/headpage.tpl:25
-#: plugins/admin/systems/headpage.tpl:25 plugins/admin/ogroups/headpage.tpl:26
-#: plugins/gofon/macro/headpage.tpl:25
+#: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
+#: plugins/admin/applications/headpage.tpl:20
+#: plugins/admin/departments/headpage.tpl:20
+#: plugins/admin/systems/headpage.tpl:20 plugins/admin/ogroups/headpage.tpl:20
+#: plugins/gofon/macro/headpage.tpl:20
 msgid "Information"
 msgstr "Information"
 
@@ -2399,6 +2359,215 @@ msgstr "Information"
 msgid "Numbers can also contain wild cards."
 msgstr "Nummern können auch Platzhalter enthalten."
 
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:5
+msgid "FAX Blocklists"
+msgstr "FAX Sperrlisten"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:204
+#, php-format
+msgid "You're about to delete the blocklist '%s'."
+msgstr "Sie möchten die Blockliste '%s' löschen."
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:218
+msgid "You have no permission to remove this blocklist."
+msgstr "Sie haben keine Berechtigung diese Blockliste zu entfernen."
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:236
+msgid "Please specify a valid phone number."
+msgstr "Bitte geben Sie eine gültige Telefonnummer an."
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:292
+#: plugins/admin/groups/class_groupManagement.inc:358
+#: plugins/admin/users/class_userManagement.inc:620
+#: plugins/admin/applications/class_applicationManagement.inc:333
+#: plugins/admin/departments/class_departmentManagement.inc:282
+#: plugins/admin/systems/class_systemManagement.inc:534
+#: plugins/admin/ogroups/class_ogroupManagement.inc:367
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
+msgid "Go up one department"
+msgstr "Eine Abteilung nach oben"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:292
+#: plugins/admin/groups/class_groupManagement.inc:358
+#: plugins/admin/users/class_userManagement.inc:620
+#: plugins/admin/applications/class_applicationManagement.inc:333
+#: plugins/admin/departments/class_departmentManagement.inc:282
+#: plugins/admin/systems/class_systemManagement.inc:534
+#: plugins/admin/ogroups/class_ogroupManagement.inc:367
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
+msgid "Up"
+msgstr "Aufwärts"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:293
+#: plugins/admin/groups/class_groupManagement.inc:359
+#: plugins/admin/users/class_userManagement.inc:621
+#: plugins/admin/applications/class_applicationManagement.inc:334
+#: plugins/admin/departments/class_departmentManagement.inc:283
+#: plugins/admin/systems/class_systemManagement.inc:535
+#: plugins/admin/ogroups/class_ogroupManagement.inc:368
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
+msgid "Go to root department"
+msgstr "Gehe zur Wurzel-Abteilung"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:293
+#: plugins/admin/groups/class_groupManagement.inc:359
+#: plugins/admin/users/class_userManagement.inc:621
+#: plugins/admin/applications/class_applicationManagement.inc:334
+#: plugins/admin/departments/class_departmentManagement.inc:283
+#: plugins/admin/systems/class_systemManagement.inc:535
+#: plugins/admin/ogroups/class_ogroupManagement.inc:369
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
+msgid "Root"
+msgstr "Wurzel"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:294
+#: plugins/admin/groups/class_groupManagement.inc:360
+#: plugins/admin/users/class_userManagement.inc:622
+#: plugins/admin/applications/class_applicationManagement.inc:335
+#: plugins/admin/systems/class_systemManagement.inc:536
+#: plugins/admin/ogroups/class_ogroupManagement.inc:370
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:326
+msgid "Go to users department"
+msgstr "Gehe zur Abteilung des Benutzers"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:294
+#: plugins/admin/groups/class_groupManagement.inc:361
+#: plugins/admin/users/class_userManagement.inc:622
+#: plugins/admin/applications/class_applicationManagement.inc:335
+#: plugins/admin/departments/class_departmentManagement.inc:284
+#: plugins/admin/systems/class_systemManagement.inc:536
+#: plugins/admin/ogroups/class_ogroupManagement.inc:371
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:326
+msgid "Home"
+msgstr "Heimat"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:296
+msgid "Create new blocklist"
+msgstr "Erzeuge neue Sperrliste"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:296
+msgid "New Blocklist"
+msgstr "Neue Sperrlisten"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:297
+#: plugins/admin/groups/class_groupManagement.inc:366
+#: plugins/admin/users/class_userManagement.inc:627
+#: plugins/admin/applications/class_applicationManagement.inc:339
+#: plugins/admin/departments/class_departmentManagement.inc:288
+#: plugins/admin/systems/class_systemManagement.inc:540
+#: plugins/admin/ogroups/class_ogroupManagement.inc:375
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:330
+msgid "Current base"
+msgstr "Momentane Basis"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:298
+#: plugins/admin/groups/class_groupManagement.inc:367
+#: plugins/admin/users/class_userManagement.inc:628
+#: plugins/admin/applications/class_applicationManagement.inc:340
+#: plugins/admin/departments/class_departmentManagement.inc:289
+#: plugins/admin/systems/class_systemManagement.inc:541
+#: plugins/admin/ogroups/class_ogroupManagement.inc:376
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
+msgid "Submit department"
+msgstr "Aktualisieren"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:298
+#: plugins/admin/groups/class_groupManagement.inc:367
+#: plugins/admin/users/class_userManagement.inc:628
+#: plugins/admin/applications/class_applicationManagement.inc:340
+#: plugins/admin/departments/class_departmentManagement.inc:289
+#: plugins/admin/systems/class_systemManagement.inc:541
+#: plugins/admin/ogroups/class_ogroupManagement.inc:376
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
+msgid "Submit"
+msgstr "Übertragen"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:301
+#: plugins/admin/groups/class_groupManagement.inc:371
+#: plugins/admin/users/class_userManagement.inc:631
+#: plugins/admin/applications/class_applicationManagement.inc:344
+#: plugins/admin/departments/class_departmentManagement.inc:296
+#: plugins/admin/systems/class_systemManagement.inc:546
+#: plugins/admin/ogroups/class_ogroupManagement.inc:380
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
+msgid "edit"
+msgstr "Bearbeiten"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:301
+#: plugins/admin/users/class_userManagement.inc:631
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
+msgid "Edit user"
+msgstr "Benutzer bearbeiten"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:302
+#: plugins/admin/groups/class_groupManagement.inc:372
+#: plugins/admin/users/class_userManagement.inc:633
+#: plugins/admin/applications/class_applicationManagement.inc:345
+#: plugins/admin/departments/class_departmentManagement.inc:297
+#: plugins/admin/systems/class_systemManagement.inc:547
+#: plugins/admin/ogroups/class_ogroupManagement.inc:381
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+msgid "delete"
+msgstr "Entfernen"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:302
+#: plugins/admin/users/class_userManagement.inc:633
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+msgid "Delete user"
+msgstr "Benutzer entfernen"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:308
+msgid "Blocklist name"
+msgstr "Name der Sperrliste"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:309
+#: plugins/addons/addressbook/contents.tpl:42
+#: plugins/admin/groups/class_groupManagement.inc:396
+#: plugins/admin/users/class_userManagement.inc:642
+#: plugins/admin/applications/class_applicationManagement.inc:365
+#: plugins/admin/departments/class_departmentManagement.inc:303
+#: plugins/admin/systems/class_systemManagement.inc:554
+#: plugins/admin/ogroups/class_ogroupManagement.inc:402
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
+msgid "Actions"
+msgstr "Aktionen"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
+msgid "This table displays faxblocklists for the selected tree."
+msgstr "Diese Tabelle enthält Sperrlisten des ausgewählten Unterbaums."
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:368
+msgid "send"
+msgstr "senden"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:368
+msgid "receive"
+msgstr "empfangen"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:515
+msgid "You have no permissions to create a blocklist on this 'Base'."
+msgstr ""
+"Sie haben keine Berechtigung, eine Blocklist unter dieser 'Basis' anzulegen."
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:521
+#: plugins/admin/departments/class_departmentGeneric.inc:147
+msgid "Required field 'Name' is not set."
+msgstr "Das benötigte Feld 'Name' ist nicht ausgefüllt."
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:524
+msgid "Required field 'Name' contains invalid characters"
+msgstr "Das benötigte Feld 'Name' enthält ungültige Zeichen"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:532
+msgid "Specified name is already used."
+msgstr "Der angegebene Name wird bereits verwendet."
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:539
+msgid "No permission to create a blocklist on this base."
+msgstr ""
+"Sie haben keine Berechtigung, eine Sperrliste unterhalb dieser Basis "
+"anzulegen."
+
 #: plugins/gofax/blocklists/remove.tpl:2
 #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
@@ -2433,16 +2602,7 @@ msgstr ""
 msgid "List of blocklists"
 msgstr "Liste der Sperrlisten"
 
-#: plugins/gofax/blocklists/headpage.tpl:16
-#: plugins/admin/groups/headpage.tpl:16 plugins/admin/users/headpage.tpl:16
-#: plugins/admin/applications/headpage.tpl:16
-#: plugins/admin/departments/headpage.tpl:16
-#: plugins/admin/systems/headpage.tpl:15 plugins/admin/ogroups/headpage.tpl:16
-#: plugins/gofon/macro/headpage.tpl:16
-msgid "New"
-msgstr "Neu"
-
-#: plugins/gofax/blocklists/headpage.tpl:29
+#: plugins/gofax/blocklists/headpage.tpl:24
 msgid ""
 "This menu allows you to create, delete and edit selected blocklists. Having "
 "a large size of lists, you might prefer the range selectors on top of the "
@@ -2452,49 +2612,35 @@ msgstr ""
 "zu entfernen. Bei einer Vielzahl von Sperrlisten bietet sich die Verwendung "
 "der Bereichswahl an."
 
-#: plugins/gofax/blocklists/headpage.tpl:32
-msgid ""
-"-Edit- and -New...- will execute an assistant to aid you when performing "
-"changes on your blocklist. -Delete- will ask you for confirmation before "
-"really deleting anything."
-msgstr ""
-"Editieren- und -Neue Sperrliste- starten einen Assistenten, um Ihnen bei der "
-"Durchführung der enstprechenden Schritte zu helfen. - Löschen- führt eine "
-"Sicherheitsabfrage durch bevor der endgültige Löschvorgang erfolgt."
-
-#: plugins/gofax/blocklists/headpage.tpl:46
+#: plugins/gofax/blocklists/headpage.tpl:38
 msgid "Select to see send blocklists"
 msgstr "Wählen, um die Sperrlisten für ausgehende Anfragen zu sehen"
 
-#: plugins/gofax/blocklists/headpage.tpl:46
+#: plugins/gofax/blocklists/headpage.tpl:38
 msgid "Show send blocklists"
 msgstr "Zeige ausgehende Sperrlisten"
 
-#: plugins/gofax/blocklists/headpage.tpl:47
+#: plugins/gofax/blocklists/headpage.tpl:39
 msgid "Select to see receive blocklists"
 msgstr "Wählen, um die eingehende Sperrlisten zu sehen"
 
-#: plugins/gofax/blocklists/headpage.tpl:47
+#: plugins/gofax/blocklists/headpage.tpl:39
 msgid "Show receive blocklists"
 msgstr "Zeige eingehende Sperrlisten"
 
-#: plugins/gofax/blocklists/headpage.tpl:55
-msgid "Display lists of department"
-msgstr "Zeige die Sperrlisten der Abteilung"
-
-#: plugins/gofax/blocklists/headpage.tpl:69
+#: plugins/gofax/blocklists/headpage.tpl:48
 msgid "Display lists matching"
 msgstr "Zeige die Sperrlisten, auf die Folgendes passt"
 
-#: plugins/gofax/blocklists/headpage.tpl:72
+#: plugins/gofax/blocklists/headpage.tpl:51
 msgid "Regular expression for matching list names"
 msgstr "Regulärer Ausdruck zum Abgleich mit Sperrlisten-Namen"
 
-#: plugins/gofax/blocklists/headpage.tpl:80
+#: plugins/gofax/blocklists/headpage.tpl:62
 msgid "Display lists containing"
 msgstr "Zeige Listen die folgendes enthalten"
 
-#: plugins/gofax/blocklists/headpage.tpl:83
+#: plugins/gofax/blocklists/headpage.tpl:65
 msgid "Show lists containing entered numbers"
 msgstr "Zeige die Sperrlisten, die die eingegebenen Nummer enthalten"
 
@@ -2601,8 +2747,8 @@ msgid "List of predefined blocklists"
 msgstr "Liste von vordefinierten Sperrlisten"
 
 #: plugins/gofax/faxaccount/lists.tpl:37
-#: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1195
+#: plugins/admin/groups/application_options.tpl:8
+#: plugins/admin/groups/mail_admins.tpl:37 include/functions.inc:1260
 msgid "Apply"
 msgstr "Anwenden"
 
@@ -2611,7 +2757,7 @@ msgid "FAX settings"
 msgstr "FAX-Einstellungen"
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:6
-#: plugins/addons/addressbook/address_edit.tpl:92
+#: plugins/addons/addressbook/address_edit.tpl:99
 #: plugins/addons/addressbook/address_info.tpl:88
 #: plugins/generic/references/class_reference.inc:30
 msgid "FAX"
@@ -2666,6 +2812,14 @@ msgstr ""
 msgid "The mail address you've entered is invalid."
 msgstr "Die Mail Adresse, die Sie eingegeben haben, ist ungültig."
 
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:490
+msgid ""
+"Deliver fax to printer, is only possible if valid printer is given. Please "
+"correct your choice."
+msgstr ""
+"'Fax an Drucker weiterleiten' ist nur möglich, wenn ein gültiger Drucker "
+"angegeben wurde. Bitte korrigieren Sie Ihre Auswahl."
+
 #: plugins/gofax/reports/detail.tpl:6
 msgid "FAX preview - please wait"
 msgstr "FAX Vorschau - bitte warten"
@@ -2679,6 +2833,7 @@ msgid "FAX ID"
 msgstr "FAX-ID"
 
 #: plugins/gofax/reports/detail.tpl:22 plugins/gofax/reports/contents.tpl:30
+#: plugins/admin/ogroups/class_ogroupManagement.inc:476
 msgid "User"
 msgstr "Benutzer"
 
@@ -2714,46 +2869,13 @@ msgstr "
 msgid "# pages"
 msgstr "# Seiten"
 
-#: plugins/gofax/reports/class_faxreport.inc:6
-msgid "FAX Reports"
-msgstr "FAX-Berichte"
-
-#: plugins/gofax/reports/class_faxreport.inc:97
-#: plugins/gofax/reports/class_faxreport.inc:204
-msgid "Can't connect to fax database, no reports can be shown!"
-msgstr ""
-"Die FAX-Datenbank kann nicht erreicht werden. Es können keine Berichte "
-"angezeigt werden!"
-
-#: plugins/gofax/reports/class_faxreport.inc:101
-#: plugins/gofax/reports/class_faxreport.inc:208
-msgid "Can't select fax database for report generation!"
-msgstr ""
-"Die FAX-Datenbank kann bezüglich der Berichtgenerierung nicht ausgewählt "
-"werden!"
-
-#: plugins/gofax/reports/class_faxreport.inc:109
-#: plugins/gofax/reports/class_faxreport.inc:216
-msgid "Query for fax database failed!"
-msgstr "Die Anfrage zur FAX-Datenbank ist fehlgeschlagen!"
-
-#: plugins/gofax/reports/class_faxreport.inc:117
-msgid "You have no permission to retrieve informations about this fax id!"
-msgstr "Sie haben keine Berechtigung ein FAX mit dieser ID einzusehen!"
-
-#: plugins/gofax/reports/class_faxreport.inc:137
-#: plugins/gofax/reports/class_faxreport.inc:224
-#: plugins/gofon/reports/class_fonreport.inc:161
-msgid "Y-M-D"
-msgstr "D.M.Y"
-
 #: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/reports/contents.tpl:2
 msgid "Filter"
 msgstr "Filter"
 
 #: plugins/gofax/reports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:92
+#: plugins/addons/addressbook/contents.tpl:102
 #: plugins/addons/logview/contents.tpl:47 plugins/gofon/reports/contents.tpl:6
 msgid "Search for"
 msgstr "Suche nach"
@@ -2801,67 +2923,49 @@ msgstr "Empf
 msgid "Search returned no results..."
 msgstr "Die Suche verlief ergebnislos..."
 
+#: plugins/gofax/reports/class_faxreport.inc:6
+msgid "FAX Reports"
+msgstr "FAX-Berichte"
+
+#: plugins/gofax/reports/class_faxreport.inc:97
+#: plugins/gofax/reports/class_faxreport.inc:204
+msgid "Can't connect to fax database, no reports can be shown!"
+msgstr ""
+"Die FAX-Datenbank kann nicht erreicht werden. Es können keine Berichte "
+"angezeigt werden!"
+
+#: plugins/gofax/reports/class_faxreport.inc:101
+#: plugins/gofax/reports/class_faxreport.inc:208
+msgid "Can't select fax database for report generation!"
+msgstr ""
+"Die FAX-Datenbank kann bezüglich der Berichtgenerierung nicht ausgewählt "
+"werden!"
+
+#: plugins/gofax/reports/class_faxreport.inc:109
+#: plugins/gofax/reports/class_faxreport.inc:216
+msgid "Query for fax database failed!"
+msgstr "Die Anfrage zur FAX-Datenbank ist fehlgeschlagen!"
+
+#: plugins/gofax/reports/class_faxreport.inc:117
+msgid "You have no permission to retrieve informations about this fax id!"
+msgstr "Sie haben keine Berechtigung ein FAX mit dieser ID einzusehen!"
+
+#: plugins/gofax/reports/class_faxreport.inc:137
+#: plugins/gofax/reports/class_faxreport.inc:224
+#: plugins/gofon/reports/class_fonreport.inc:161
+msgid "Y-M-D"
+msgstr "D.M.Y"
+
 #: plugins/gofax/reports/main.inc:5
 msgid "FAX reports"
 msgstr "FAX-Berichte"
 
-#: plugins/addons/addressbook/dial.tpl:3
-msgid "Dial connection..."
-msgstr "Wähle Verbindung..."
-
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:359
-#: plugins/addons/addressbook/class_addressbook.inc:366
-#: plugins/addons/addressbook/class_addressbook.inc:370
-#: plugins/addons/addressbook/class_addressbook.inc:453
-msgid "Dial"
-msgstr "Wähle"
-
-#: plugins/addons/addressbook/address_edit.tpl:4
-msgid "Choose the department to store entry in"
-msgstr "Wählen Sie die Abteilung in der der Eintrag abgelegt werden soll"
-
-#: plugins/addons/addressbook/address_edit.tpl:16
-#: plugins/addons/addressbook/address_info.tpl:12
-msgid "Personal"
-msgstr "Persönlich"
-
-#: plugins/addons/addressbook/address_edit.tpl:23
-#: plugins/addons/addressbook/address_info.tpl:19
-msgid "Initials"
-msgstr "Initialien"
-
-#: plugins/addons/addressbook/address_edit.tpl:33
 #: plugins/addons/addressbook/contents.tpl:15
+#: plugins/addons/addressbook/address_edit.tpl:40
 #: plugins/addons/addressbook/address_info.tpl:29
 msgid "Private"
 msgstr "Privat"
 
-#: plugins/addons/addressbook/address_edit.tpl:47
-#: plugins/addons/addressbook/address_info.tpl:43
-msgid "Email"
-msgstr "Email"
-
-#: plugins/addons/addressbook/address_edit.tpl:57
-#: plugins/addons/addressbook/address_info.tpl:53
-msgid "Organizational"
-msgstr "Organisationsbezogen"
-
-#: plugins/addons/addressbook/address_edit.tpl:65
-#: plugins/addons/addressbook/address_info.tpl:61
-msgid "Company"
-msgstr "Firma"
-
-#: plugins/addons/addressbook/address_edit.tpl:71
-#: plugins/addons/addressbook/address_info.tpl:67
-msgid "City"
-msgstr "Stadt"
-
-#: plugins/addons/addressbook/address_edit.tpl:77
-#: plugins/addons/addressbook/address_info.tpl:73
-msgid "Country"
-msgstr "Land"
-
 #: plugins/addons/addressbook/contents.tpl:15
 msgid "Contact"
 msgstr "Kontakt"
@@ -2876,10 +2980,6 @@ msgstr ""
 "Mitarbeiter Ihrer Organisation. Bei Eingaben wie 'gon' wird dementsprechend "
 "sowohl 'Gonicus' als auch 'gone' gefunden."
 
-#: plugins/addons/addressbook/contents.tpl:42
-msgid "Actions"
-msgstr "Aktionen"
-
 #: plugins/addons/addressbook/contents.tpl:47
 msgid "Add entry"
 msgstr "Eintrag hinzufügen"
@@ -2908,22 +3008,73 @@ msgstr "W
 msgid "Show addressbook entries"
 msgstr "Zeige Adressbuch-Einträge"
 
-#: plugins/addons/addressbook/contents.tpl:78
+#: plugins/addons/addressbook/contents.tpl:77
 msgid "Display results for department"
 msgstr "Zeige Ergebnisse der Abteilung"
 
-#: plugins/addons/addressbook/contents.tpl:95
-msgid "Search string"
-msgstr "Suchtext"
-
-#: plugins/addons/addressbook/contents.tpl:103
+#: plugins/addons/addressbook/contents.tpl:90
 msgid "Match object"
 msgstr "Untersuchtes Objekt"
 
-#: plugins/addons/addressbook/contents.tpl:106
+#: plugins/addons/addressbook/contents.tpl:93
 msgid "Choose the object that will be searched in"
 msgstr "Wählen Sie das Objekt, auf das die Suchfunktion angewandt wird"
 
+#: plugins/addons/addressbook/contents.tpl:105
+msgid "Search string"
+msgstr "Suchtext"
+
+#: plugins/addons/addressbook/dial.tpl:3
+msgid "Dial connection..."
+msgstr "Wähle Verbindung..."
+
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/class_addressbook.inc:359
+#: plugins/addons/addressbook/class_addressbook.inc:366
+#: plugins/addons/addressbook/class_addressbook.inc:370
+#: plugins/addons/addressbook/class_addressbook.inc:454
+msgid "Dial"
+msgstr "Wähle"
+
+#: plugins/addons/addressbook/address_edit.tpl:7
+msgid "Choose the department to store entry in"
+msgstr "Wählen Sie die Abteilung in der der Eintrag abgelegt werden soll"
+
+#: plugins/addons/addressbook/address_edit.tpl:18
+#: plugins/addons/addressbook/address_info.tpl:12
+msgid "Personal"
+msgstr "Persönlich"
+
+#: plugins/addons/addressbook/address_edit.tpl:29
+#: plugins/addons/addressbook/address_info.tpl:19
+msgid "Initials"
+msgstr "Initialien"
+
+#: plugins/addons/addressbook/address_edit.tpl:54
+#: plugins/addons/addressbook/address_info.tpl:43
+msgid "Email"
+msgstr "Email"
+
+#: plugins/addons/addressbook/address_edit.tpl:64
+#: plugins/addons/addressbook/address_info.tpl:53
+msgid "Organizational"
+msgstr "Organisationsbezogen"
+
+#: plugins/addons/addressbook/address_edit.tpl:72
+#: plugins/addons/addressbook/address_info.tpl:61
+msgid "Company"
+msgstr "Firma"
+
+#: plugins/addons/addressbook/address_edit.tpl:78
+#: plugins/addons/addressbook/address_info.tpl:67
+msgid "City"
+msgstr "Stadt"
+
+#: plugins/addons/addressbook/address_edit.tpl:84
+#: plugins/addons/addressbook/address_info.tpl:73
+msgid "Country"
+msgstr "Land"
+
 #: plugins/addons/addressbook/remove.tpl:7
 msgid ""
 "This includes all addressbook data in this entry. Please double check if "
@@ -2975,53 +3126,53 @@ msgstr "Sichere Kontakt f
 msgid "Send mail to %s"
 msgstr "Sende eine Mail an %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:465
+#: plugins/addons/addressbook/class_addressbook.inc:466
 msgid "global addressbook"
 msgstr "dem globalen Adressbuch"
 
-#: plugins/addons/addressbook/class_addressbook.inc:468
+#: plugins/addons/addressbook/class_addressbook.inc:469
 msgid "organizations user database"
 msgstr "Nutzerdatenbank der Organisation"
 
-#: plugins/addons/addressbook/class_addressbook.inc:472
+#: plugins/addons/addressbook/class_addressbook.inc:473
 #, php-format
 msgid "Contact stored in %s"
 msgstr "Kontakt ist in %s abgelegt"
 
-#: plugins/addons/addressbook/class_addressbook.inc:474
+#: plugins/addons/addressbook/class_addressbook.inc:475
 msgid "Creating new entry in"
 msgstr "Erzeugen eines neuen Eintrag in"
 
-#: plugins/addons/addressbook/class_addressbook.inc:503
+#: plugins/addons/addressbook/class_addressbook.inc:504
 #: plugins/addons/logview/class_logview.inc:63
 #: plugins/addons/logview/class_logview.inc:77
 msgid "All"
 msgstr "Alle"
 
-#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/addons/addressbook/class_addressbook.inc:505
 msgid "Work phone"
 msgstr "Telefon (Arbeit)"
 
-#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/addons/addressbook/class_addressbook.inc:505
 msgid "Cell phone"
 msgstr "Mobiltelefon"
 
-#: plugins/addons/addressbook/class_addressbook.inc:505
+#: plugins/addons/addressbook/class_addressbook.inc:506
 msgid "Home phone"
 msgstr "Telefon (zu Hause)"
 
-#: plugins/addons/addressbook/class_addressbook.inc:505
+#: plugins/addons/addressbook/class_addressbook.inc:506
 msgid "User ID"
 msgstr "Benutzer ID"
 
-#: plugins/addons/addressbook/class_addressbook.inc:577
+#: plugins/addons/addressbook/class_addressbook.inc:578
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 "Es kann kein eindeutiger DN für diesen Eintrag erzeugt werden. Füllen Sie "
 "zusätzliche Felder aus."
 
-#: plugins/addons/addressbook/class_addressbook.inc:589
+#: plugins/addons/addressbook/class_addressbook.inc:590
 msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
@@ -3064,20 +3215,20 @@ msgstr ""
 msgid "Nothing to import!"
 msgstr "Nichts zu importieren!"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:299
-#: plugins/addons/ldapmanager/class_csvimport.inc:310
-#: plugins/addons/ldapmanager/class_csvimport.inc:315
-#: plugins/addons/ldapmanager/class_import.inc:58
-#: plugins/addons/ldapmanager/class_import.inc:66
+#: plugins/addons/ldapmanager/class_csvimport.inc:302
+#: plugins/addons/ldapmanager/class_csvimport.inc:313
+#: plugins/addons/ldapmanager/class_csvimport.inc:318
+#: plugins/addons/ldapmanager/class_import.inc:59
+#: plugins/addons/ldapmanager/class_import.inc:67
 msgid "There is no file uploaded."
 msgstr "Es wurden keine Datei hochgeladen."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:304
-#: plugins/addons/ldapmanager/class_import.inc:51
+#: plugins/addons/ldapmanager/class_csvimport.inc:307
+#: plugins/addons/ldapmanager/class_import.inc:52
 msgid "The specified file is empty."
 msgstr "Die angebene Datei ist leer."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:442
+#: plugins/addons/ldapmanager/class_csvimport.inc:446
 msgid "The selected file does not contain any CSV Data..."
 msgstr "Die gewählte Datei enthält keine CSV Daten..."
 
@@ -3156,7 +3307,7 @@ msgid "You've no permission to do LDAP imports."
 msgstr ""
 "Sie haben keine Berechtigung um Daten in die LDAP-Datenbank zu importieren."
 
-#: plugins/addons/ldapmanager/class_import.inc:104
+#: plugins/addons/ldapmanager/class_import.inc:105
 msgid "Unknown Error"
 msgstr "Unbekannter Fehler"
 
@@ -3314,83 +3465,44 @@ msgstr "Nachricht"
 msgid "System log view"
 msgstr "System Protokolle"
 
-#: plugins/admin/groups/mail.tpl:11
-msgid "Primary mail address for this shared folder"
-msgstr "Primäre Mail-Adresse dieses Austausch-Ordners"
-
-#: plugins/admin/groups/mail.tpl:16
-msgid "Select mail server to place user on"
-msgstr "Wählen Sie den Mail-Server auf dem der Benutzer angelegt werden soll"
-
-#: plugins/admin/groups/mail.tpl:66
-msgid "IMAP shared folders"
-msgstr "IMAP Austausch-Ordner"
-
-#: plugins/admin/groups/mail.tpl:70
-msgid "Default permission"
-msgstr "Standard-Berechtigungen"
-
-#: plugins/admin/groups/mail.tpl:79
-msgid "Member permission"
-msgstr "Mitglieder-Berechtigungen"
-
-#: plugins/admin/groups/mail.tpl:94
-msgid "Forward messages to non group members"
-msgstr "Weiterleiten der Nachrichten an nicht-Gruppenmitglieder"
-
-#: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:42
-msgid "Groups"
-msgstr "Gruppen"
-
-#: plugins/admin/groups/class_groupManagement.inc:204
-#, php-format
-msgid "You're about to delete the group '%s'."
-msgstr "Sie sind dabei die Gruppe '%s' zu löschen."
-
-#: plugins/admin/groups/class_groupManagement.inc:210
-#: plugins/admin/groups/class_groupManagement.inc:236
-msgid "You are not allowed to delete this group!"
-msgstr "Es ist Ihnen nicht erlaubt, diese Gruppe zu löschen!"
-
 #: plugins/admin/groups/class_groupGeneric.inc:109
 msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
 "Die SID dieser Gruppe kann weder im LDAP noch in der Konfigurationsdatei "
 "gefunden werden!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:141
+#: plugins/admin/groups/class_groupGeneric.inc:155
 msgid "This 'dn' is no group."
 msgstr "Diese 'dn' hat keine Gruppenerweiterungen."
 
-#: plugins/admin/groups/class_groupGeneric.inc:253
+#: plugins/admin/groups/class_groupGeneric.inc:260
 msgid "Samba group"
 msgstr "Samba-Gruppe"
 
-#: plugins/admin/groups/class_groupGeneric.inc:253
+#: plugins/admin/groups/class_groupGeneric.inc:260
 msgid "Domain admins"
 msgstr "Domänen-Administratoren"
 
-#: plugins/admin/groups/class_groupGeneric.inc:253
+#: plugins/admin/groups/class_groupGeneric.inc:260
 msgid "Domain users"
 msgstr "Domänen-Benutzer"
 
-#: plugins/admin/groups/class_groupGeneric.inc:254
+#: plugins/admin/groups/class_groupGeneric.inc:261
 msgid "Domain guests"
 msgstr "Domänen-Gäste"
 
-#: plugins/admin/groups/class_groupGeneric.inc:259
+#: plugins/admin/groups/class_groupGeneric.inc:266
 #, php-format
 msgid "Special group (%d)"
 msgstr "Spezielle Gruppe (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:574
-#: plugins/admin/ogroups/class_ogroup.inc:490
+#: plugins/admin/groups/class_groupGeneric.inc:581
+#: plugins/admin/ogroups/class_ogroup.inc:488
 msgid "You have no permissions to create a group on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, eine Gruppe unterhalb dieser 'Basis' anzulegen."
 
-#: plugins/admin/groups/class_groupGeneric.inc:584
+#: plugins/admin/groups/class_groupGeneric.inc:591
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -3398,28 +3510,40 @@ msgstr ""
 "Das Feld 'Name' enthält ungültige Zeichen. Kleinbuchstaben, Zahlen und "
 "Bindestriche sind erlaubt."
 
-#: plugins/admin/groups/class_groupGeneric.inc:595
 #: plugins/admin/groups/class_groupGeneric.inc:602
+#: plugins/admin/groups/class_groupGeneric.inc:609
 msgid "Value specified as 'Name' is already used."
 msgstr "Eine Gruppe mit diesem Namen existiert bereits."
 
-#: plugins/admin/groups/remove.tpl:7
-msgid ""
-"This may be a primary user group. Please double check if you really want to "
-"do this since there is no way for GOsa to get your data back."
-msgstr ""
-"Bitte prüfen Sie, ob Sie die Aktion wirklich durchführen möchten, da GOsa "
-"die Daten nicht wiederherstellen kann."
+#: plugins/admin/groups/mail.tpl:11
+msgid "Primary mail address for this shared folder"
+msgstr "Primäre Mail-Adresse dieses Austausch-Ordners"
 
-#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
-msgid "Group administration"
-msgstr "Gruppenverwaltung"
+#: plugins/admin/groups/mail.tpl:16
+msgid "Select mail server to place user on"
+msgstr "Wählen Sie den Mail-Server auf dem der Benutzer angelegt werden soll"
+
+#: plugins/admin/groups/mail.tpl:66
+msgid "IMAP shared folders"
+msgstr "IMAP Austausch-Ordner"
+
+#: plugins/admin/groups/mail.tpl:70
+msgid "Default permission"
+msgstr "Standard-Berechtigungen"
+
+#: plugins/admin/groups/mail.tpl:79
+msgid "Member permission"
+msgstr "Mitglieder-Berechtigungen"
+
+#: plugins/admin/groups/mail.tpl:94
+msgid "Forward messages to non group members"
+msgstr "Weiterleiten der Nachrichten an nicht-Gruppenmitglieder"
 
 #: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
 msgid "List of groups"
 msgstr "Liste der Gruppen"
 
-#: plugins/admin/groups/headpage.tpl:30
+#: plugins/admin/groups/headpage.tpl:25
 msgid ""
 "This menu allows you to add, edit and remove selected groups. You may want "
 "to use the range selector on top of the group listbox, when working with a "
@@ -3429,22 +3553,91 @@ msgstr ""
 "entfernen. Bei einer Vielzahl von Gruppen bietet sich die Verwendung der "
 "Bereichsauswahl an."
 
-#: plugins/admin/groups/headpage.tpl:33 plugins/admin/ogroups/headpage.tpl:33
+#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
+msgid "Group administration"
+msgstr "Gruppenverwaltung"
+
+#: plugins/admin/groups/class_groupManagement.inc:25
+#: plugins/admin/ogroups/class_ogroupManagement.inc:42
+msgid "Groups"
+msgstr "Gruppen"
+
+#: plugins/admin/groups/class_groupManagement.inc:283
+#, php-format
+msgid "You're about to delete the group '%s'."
+msgstr "Sie sind dabei die Gruppe '%s' zu löschen."
+
+#: plugins/admin/groups/class_groupManagement.inc:289
+#: plugins/admin/groups/class_groupManagement.inc:315
+msgid "You are not allowed to delete this group!"
+msgstr "Es ist Ihnen nicht erlaubt, diese Gruppe zu löschen!"
+
+#: plugins/admin/groups/class_groupManagement.inc:363
+msgid "Create new group"
+msgstr "Neue Gruppe erstellen"
+
+#: plugins/admin/groups/class_groupManagement.inc:364
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+msgid "New"
+msgstr "Neu"
+
+#: plugins/admin/groups/class_groupManagement.inc:371
+#: plugins/admin/applications/class_applicationManagement.inc:344
+#: plugins/admin/departments/class_departmentManagement.inc:296
+#: plugins/admin/ogroups/class_ogroupManagement.inc:380
+msgid "Edit this entry"
+msgstr "Diesen Eintrag bearbeiten"
+
+#: plugins/admin/groups/class_groupManagement.inc:372
+#: plugins/admin/applications/class_applicationManagement.inc:345
+#: plugins/admin/departments/class_departmentManagement.inc:297
+#: plugins/admin/ogroups/class_ogroupManagement.inc:381
+msgid "Delete this entry"
+msgstr "Diesen Eintrag entfernen"
+
+#: plugins/admin/groups/class_groupManagement.inc:382
+#: plugins/admin/users/class_userManagement.inc:664
+msgid "Posix"
+msgstr "Posix"
+
+#: plugins/admin/groups/class_groupManagement.inc:385
+#: plugins/admin/applications/class_applicationManagement.inc:355
+#: plugins/admin/ogroups/class_ogroupManagement.inc:478
+#: plugins/gofon/reports/contents.tpl:34
+#: plugins/generic/references/class_reference.inc:42
+msgid "Application"
+msgstr "Anwendung"
+
+#: plugins/admin/groups/class_groupManagement.inc:394
+msgid "Groupname"
+msgstr "Name der Gruppe"
+
+#: plugins/admin/groups/class_groupManagement.inc:395
+#: plugins/admin/users/class_userManagement.inc:641
+#: plugins/admin/departments/generic.tpl:4
+#: plugins/admin/systems/terminal.tpl:1
+#: plugins/admin/systems/workstation.tpl:1
+#: plugins/admin/ogroups/class_ogroupManagement.inc:401
+msgid "Properties"
+msgstr "Eigenschaften"
+
+#: plugins/admin/groups/class_groupManagement.inc:400
+#: plugins/admin/applications/class_applicationManagement.inc:369
+#: plugins/admin/ogroups/class_ogroupManagement.inc:406
+msgid "This table displays all groups, in the selected tree."
+msgstr "Diese Tabelle enthält alle Gruppen des ausgewählten Unterbaums."
+
+#: plugins/admin/groups/remove.tpl:7
 msgid ""
-"-Edit- and -New...- will execute an assistant to aid you in editing group "
-"properties. -Delete- will ask for confirmation before removing groups."
+"This may be a primary user group. Please double check if you really want to "
+"do this since there is no way for GOsa to get your data back."
 msgstr ""
-"Bearbeiten- und -Neu...- führen einen Assistenten aus, der Sie bei der "
-"Bearbeitung der Gruppen-Eigenschaften unterstützt. - Löschen- führt eine "
-"Sicherheitsabfrage durch bevor der endgültige Löschvorgang erfolgt."
-
-#: plugins/admin/groups/headpage.tpl:60 plugins/admin/users/headpage.tpl:62
-msgid "Dive into LDAP subtrees when searching"
-msgstr "Unterbäume bei der Suche mit einbeziehen"
+"Bitte prüfen Sie, ob Sie die Aktion wirklich durchführen möchten, da GOsa "
+"die Daten nicht wiederherstellen kann."
 
-#: plugins/admin/groups/headpage.tpl:60 plugins/admin/users/headpage.tpl:62
-msgid "Search in subtrees"
-msgstr "Suche in Unterbäumen"
+#: plugins/admin/groups/application_options.tpl:1
+msgid "Application options"
+msgstr "Anwendungsoptionen"
 
 #: plugins/admin/groups/class_groupMail.inc:153
 msgid "read"
@@ -3484,6 +3677,17 @@ msgstr ""
 "Bitte geben Sie eine gültige E-Mail-Adresse in das Feld 'Primäre Adresse' "
 "ein."
 
+#: plugins/admin/groups/class_groupMail.inc:646
+msgid ""
+"Please choose valid permission settings. Default permission can't be emtpy."
+msgstr ""
+"Bitte wählen sie gültige Zugriffsrechte. Standard-Zugriffsrechte dürfen "
+"nicht leer sein."
+
+#: plugins/admin/groups/class_groupMail.inc:650
+msgid "Please select a valid mail server."
+msgstr "Bitte wählen Sie einen gültigen Mail-Server."
+
 #: plugins/admin/groups/acl.tpl:4
 msgid "Object"
 msgstr "Objekt"
@@ -3512,18 +3716,17 @@ msgstr "Verf
 msgid "Select users to add"
 msgstr "Wählen Sie die hinzuzufügenden Benutzer"
 
-#: plugins/admin/groups/group_objects.tpl:26
-#: plugins/admin/users/headpage.tpl:67
+#: plugins/admin/groups/group_objects.tpl:30
 msgid "Display users of department"
 msgstr "Zeige die Benutzer der Abteilung"
 
-#: plugins/admin/groups/group_objects.tpl:30
-#: plugins/admin/users/headpage.tpl:71
+#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/admin/users/headpage.tpl:48 plugins/admin/users/headpage.tpl:49
 msgid "Display users matching"
 msgstr "Zeige die Benutzer, auf die Folgendes passt"
 
-#: plugins/admin/groups/group_objects.tpl:31
-#: plugins/admin/users/headpage.tpl:72
+#: plugins/admin/groups/group_objects.tpl:41
+#: plugins/admin/users/headpage.tpl:49
 msgid "Regular expression for matching user names"
 msgstr "Regulärer Ausdruck zum Abgleich mit Benutzernamen"
 
@@ -3584,10 +3787,6 @@ msgstr "Gruppenmitglieder"
 msgid "Folder administrators"
 msgstr "Ordner-Administratoren"
 
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
-msgstr "Anwendungsoptionen"
-
 #: plugins/admin/groups/class_groupApplication.inc:61
 msgid "This 'dn' is no appgroup."
 msgstr "Diese 'dn' hat keine Anwendungs-Informationen"
@@ -3626,49 +3825,22 @@ msgstr ""
 msgid "The selected application has no options."
 msgstr "Die gewählte Anwendung hat keine Optionen."
 
+#: plugins/admin/groups/class_groupApplication.inc:278
+#, php-format
+msgid "The application named %s is no longer available and has been removed."
+msgstr ""
+"Die Applikation mit dem Namen %s ist nicht mehr verfügbar und wurde aus der "
+"Liste entfernt."
+
 #: plugins/admin/users/password.tpl:2
 msgid ""
 "To change the user password use the fields below. The changes take effect "
 "immediately. Please memorize the new password, because the user wouldn't be "
 "able to login without it."
 msgstr ""
-"Um das Benutzer-Passwort zu ändern, nutzen Sie die Felder unten. Die "
-"Änderungen werden sofort wirksam. Merken Sie sich das Passwort, da sich der "
-"Benutzer ohne dieses Passwort nicht anmelden kann."
-
-#: plugins/admin/users/class_userManagement.inc:25
-msgid "Users"
-msgstr "Benutzer"
-
-#: plugins/admin/users/class_userManagement.inc:157
-#: plugins/admin/users/class_userManagement.inc:208
-msgid "You are not allowed to set this users password!"
-msgstr "Es Ihnen nicht erlaubt das Passwort dieses Benutzers zu setzen!"
-
-#: plugins/admin/users/class_userManagement.inc:244
-#, php-format
-msgid "You're about to delete the user %s."
-msgstr "Sie löschen gerade den Benutzer %s."
-
-#: plugins/admin/users/class_userManagement.inc:250
-#: plugins/admin/users/class_userManagement.inc:278
-msgid "You are not allowed to delete this user!"
-msgstr "Es ist Ihnen nicht erlaubt, diesen Benutzer zu löschen!"
-
-#: plugins/admin/users/class_userManagement.inc:368
-#: plugins/admin/ogroups/class_ogroup.inc:203
-msgid "none"
-msgstr "keine"
-
-#: plugins/admin/users/class_userManagement.inc:437
-msgid "A person with the choosen name is already used in this tree."
-msgstr ""
-"Ein Person mit dem ausgewählten Namen ist in diesem Baum bereits angelegt."
-
-#: plugins/admin/users/class_userManagement.inc:618
-#: plugins/admin/users/template.tpl:11
-msgid "Template"
-msgstr "Vorlage"
+"Um das Benutzer-Passwort zu ändern, nutzen Sie die Felder unten. Die "
+"Änderungen werden sofort wirksam. Merken Sie sich das Passwort, da sich der "
+"Benutzer ohne dieses Passwort nicht anmelden kann."
 
 #: plugins/admin/users/template.tpl:2
 msgid "Creating a new user using templates"
@@ -3684,10 +3856,16 @@ msgstr ""
 "vereinfacht werden. Viele Datenbankeinträge lassen sich damit automatisch "
 "ausfüllen. Wählen sie <b>keine</b> um den Vorlagen-Dialog zu überspringen."
 
+#: plugins/admin/users/template.tpl:11
+#: plugins/admin/users/class_userManagement.inc:849
+#: plugins/admin/systems/class_systemManagement.inc:661
+msgid "Template"
+msgstr "Vorlage"
+
 #: plugins/admin/users/template.tpl:44
 #: ihtml/themes/altlinux/setup_introduction.tpl:12
-#: ihtml/themes/altlinux/setup_useradmin.tpl:41
 #: ihtml/themes/altlinux/setup_step2.tpl:13
+#: ihtml/themes/altlinux/setup_useradmin.tpl:41
 #: ihtml/themes/altlinux/setup_step3.tpl:18
 #: ihtml/themes/default/setup_introduction.tpl:12
 #: ihtml/themes/default/setup_useradmin.tpl:41
@@ -3696,6 +3874,77 @@ msgstr ""
 msgid "Continue"
 msgstr "Fortsetzen"
 
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
+msgstr "Benutzerverwaltung"
+
+#: plugins/admin/users/class_userManagement.inc:25
+msgid "Users"
+msgstr "Benutzer"
+
+#: plugins/admin/users/class_userManagement.inc:235
+#: plugins/admin/users/class_userManagement.inc:286
+msgid "You are not allowed to set this users password!"
+msgstr "Es Ihnen nicht erlaubt das Passwort dieses Benutzers zu setzen!"
+
+#: plugins/admin/users/class_userManagement.inc:322
+#, php-format
+msgid "You're about to delete the user %s."
+msgstr "Sie löschen gerade den Benutzer %s."
+
+#: plugins/admin/users/class_userManagement.inc:328
+#: plugins/admin/users/class_userManagement.inc:356
+msgid "You are not allowed to delete this user!"
+msgstr "Es ist Ihnen nicht erlaubt, diesen Benutzer zu löschen!"
+
+#: plugins/admin/users/class_userManagement.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:201
+msgid "none"
+msgstr "keine"
+
+#: plugins/admin/users/class_userManagement.inc:513
+msgid "A person with the choosen name is already used in this tree."
+msgstr ""
+"Ein Person mit dem ausgewählten Namen ist in diesem Baum bereits angelegt."
+
+#: plugins/admin/users/class_userManagement.inc:624
+msgid "Create new user"
+msgstr "Neuen Benutzer erstellen"
+
+#: plugins/admin/users/class_userManagement.inc:624
+#: plugins/admin/systems/class_systemManagement.inc:538
+msgid "New user"
+msgstr "Neuer Benutzer"
+
+#: plugins/admin/users/class_userManagement.inc:625
+msgid "Create new template"
+msgstr "Neue Vorlage erstellen"
+
+#: plugins/admin/users/class_userManagement.inc:625
+msgid "New template"
+msgstr "Neue Vorlage"
+
+#: plugins/admin/users/class_userManagement.inc:632
+msgid "password"
+msgstr "Passwort"
+
+#: plugins/admin/users/class_userManagement.inc:640
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
+#: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
+#: ihtml/themes/altlinux/setup_useradmin.tpl:22
+#: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
+#: ihtml/themes/default/setup_useradmin.tpl:22
+msgid "Username"
+msgstr "Benutzername"
+
+#: plugins/admin/users/class_userManagement.inc:645
+msgid "This table displays all users, in the selected tree."
+msgstr "Diese Tabelle enthält alle Benutzer dieses Unterbaums."
+
+#: plugins/admin/users/class_userManagement.inc:663
+msgid "GOsa"
+msgstr "GOsa"
+
 #: plugins/admin/users/remove.tpl:7
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -3710,11 +3959,7 @@ msgstr ""
 msgid "List of users"
 msgstr "Liste der Benutzer"
 
-#: plugins/admin/users/headpage.tpl:17
-msgid "New template"
-msgstr "Neue Vorlage"
-
-#: plugins/admin/users/headpage.tpl:31
+#: plugins/admin/users/headpage.tpl:24
 msgid ""
 "This menu allows you to create, edit and delete selected users. Having a "
 "great number of users, you may want to use the range selectors on top of the "
@@ -3724,108 +3969,57 @@ msgstr ""
 "entfernen. Bei einer Vielzahl von Benutzern bietet sich die Verwendung der "
 "Bereichsauswahl an."
 
-#: plugins/admin/users/headpage.tpl:34
-msgid ""
-"-Edit- and -New...- execute an assistant to aid you in managing your account "
-"informations. -Delete- will ask for confirmation before deleting users."
-msgstr ""
-"-Bearbeiten- und -Neu...- starten einen Assistenten, der Sie bei der "
-"Bearbeitung der Eigenschaften unterstützt. -Löschen- führt eine "
-"Sicherheitsabfrage durch bevor der endgültige Löschvorgang erfolgt."
-
-#: plugins/admin/users/headpage.tpl:48
+#: plugins/admin/users/headpage.tpl:38
 msgid "Select to see template pseudo users"
 msgstr "Wählen Sie dies um Vorlagen für Benutzer anzuzeigen"
 
-#: plugins/admin/users/headpage.tpl:48
+#: plugins/admin/users/headpage.tpl:38
 msgid "Show templates"
 msgstr "Zeige Vorlagen"
 
-#: plugins/admin/users/headpage.tpl:49
+#: plugins/admin/users/headpage.tpl:39
 msgid "Select to see users that have only a GOsa object"
 msgstr "Auswählen, um die Benutzer anzuzeigen, die nur ein GOsa-Objekt haben"
 
-#: plugins/admin/users/headpage.tpl:49
+#: plugins/admin/users/headpage.tpl:39
 msgid "Show functional users"
 msgstr "Zeige zweckbezogene Benutzer"
 
-#: plugins/admin/users/headpage.tpl:50
+#: plugins/admin/users/headpage.tpl:40
 msgid "Select to see users that have posix settings"
 msgstr "Auswählen, um die Benutzer mit UNIX-Konto zu sehen"
 
-#: plugins/admin/users/headpage.tpl:50
+#: plugins/admin/users/headpage.tpl:40
 msgid "Show unix users"
 msgstr "Zeige UNIX-Benutzer"
 
-#: plugins/admin/users/headpage.tpl:51
+#: plugins/admin/users/headpage.tpl:41
 msgid "Select to see users that have mail settings"
 msgstr "Auswählen, um die Benutzer zu sehen die eine Mail-Erweiterung besitzen"
 
-#: plugins/admin/users/headpage.tpl:51
+#: plugins/admin/users/headpage.tpl:41
 msgid "Show mail users"
 msgstr "Zeige Mail-Benutzer"
 
-#: plugins/admin/users/headpage.tpl:52
+#: plugins/admin/users/headpage.tpl:42
 msgid "Select to see users that have samba settings"
 msgstr "Auswählen, um die Benutzer zu sehen die SAMBA-Einstellungen besitzen"
 
-#: plugins/admin/users/headpage.tpl:52
+#: plugins/admin/users/headpage.tpl:42
 msgid "Show samba users"
 msgstr "Zeige SAMBA-Benutzer"
 
-#: plugins/admin/users/headpage.tpl:53
+#: plugins/admin/users/headpage.tpl:43
 msgid "Select to see users that have proxy settings"
 msgstr "Auswählen, um die Benutzer zu sehen die Proxy-Einstellungen besitzen"
 
-#: plugins/admin/users/headpage.tpl:53
+#: plugins/admin/users/headpage.tpl:43
 msgid "Show proxy users"
 msgstr "Zeige Proxy-Benutzer"
 
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
-msgstr "Benutzerverwaltung"
-
-#: plugins/admin/applications/class_applicationParameters.inc:47
-msgid "Remove options"
-msgstr "Optionen entfernen"
-
-#: plugins/admin/applications/class_applicationParameters.inc:48
-msgid "This application has options. You can disable them by clicking below."
-msgstr ""
-"Diese Anwendung hat Optionen. Sie können diese durch Betätigen der "
-"Schaltfläche unten entfernen."
-
-#: plugins/admin/applications/class_applicationParameters.inc:50
-msgid "Create options"
-msgstr "Optionen aktivieren"
-
-#: plugins/admin/applications/class_applicationParameters.inc:51
-msgid ""
-"This application has options disabled. You can enable them by clicking below."
-msgstr ""
-"Diese Anwendung hat keine Optionen. Sie können diese durch Betätigen der "
-"Schaltfläche unten hinzufügen."
-
-#: plugins/admin/applications/class_applicationParameters.inc:87
-msgid "Variable"
-msgstr "Variable"
-
-#: plugins/admin/applications/class_applicationParameters.inc:87
-#: plugins/gofon/macro/parameter.tpl:9
-msgid "Default value"
-msgstr "Standardwert"
-
-#: plugins/admin/applications/class_applicationParameters.inc:98
-msgid "Add option"
-msgstr "Option hinzufügen"
-
-#: plugins/admin/applications/class_applicationParameters.inc:149
-#, php-format
-msgid "Value '%s' specified as option name is not valid."
-msgstr "Der von Ihnen angegebene Optionsname '%s' ist ungültig."
-
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
+#: plugins/admin/applications/class_applicationManagement.inc:364
 msgid "Application name"
 msgstr "Name der Anwendung"
 
@@ -3881,6 +4075,45 @@ msgstr "Platziere das Symbol auf dem Desktop der Gruppenmitglieder"
 msgid "Place entry in members startmenu"
 msgstr "Platziere einen Eintrag im Startmenü der Gruppenmitglieder"
 
+#: plugins/admin/applications/class_applicationParameters.inc:47
+msgid "Remove options"
+msgstr "Optionen entfernen"
+
+#: plugins/admin/applications/class_applicationParameters.inc:48
+msgid "This application has options. You can disable them by clicking below."
+msgstr ""
+"Diese Anwendung hat Optionen. Sie können diese durch Betätigen der "
+"Schaltfläche unten entfernen."
+
+#: plugins/admin/applications/class_applicationParameters.inc:50
+msgid "Create options"
+msgstr "Optionen aktivieren"
+
+#: plugins/admin/applications/class_applicationParameters.inc:51
+msgid ""
+"This application has options disabled. You can enable them by clicking below."
+msgstr ""
+"Diese Anwendung hat keine Optionen. Sie können diese durch Betätigen der "
+"Schaltfläche unten hinzufügen."
+
+#: plugins/admin/applications/class_applicationParameters.inc:87
+msgid "Variable"
+msgstr "Variable"
+
+#: plugins/admin/applications/class_applicationParameters.inc:87
+#: plugins/gofon/macro/parameter.tpl:9
+msgid "Default value"
+msgstr "Standardwert"
+
+#: plugins/admin/applications/class_applicationParameters.inc:98
+msgid "Add option"
+msgstr "Option hinzufügen"
+
+#: plugins/admin/applications/class_applicationParameters.inc:149
+#, php-format
+msgid "Value '%s' specified as option name is not valid."
+msgstr "Der von Ihnen angegebene Optionsname '%s' ist ungültig."
+
 #: plugins/admin/applications/remove.tpl:7 plugins/gofon/macro/remove.tpl:7
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -3894,7 +4127,7 @@ msgstr ""
 msgid "List of applications"
 msgstr "Liste der Anwendungen"
 
-#: plugins/admin/applications/headpage.tpl:29
+#: plugins/admin/applications/headpage.tpl:24
 msgid ""
 "This menu allows you to add, edit and remove selected applications. You may "
 "want to use the range selector on top of the application listbox, when "
@@ -3904,24 +4137,12 @@ msgstr ""
 "zu entfernen. Bei einer Vielzahl von Anwendungen bietet sich die Verwendung "
 "der Bereichsauswahl an."
 
-#: plugins/admin/applications/headpage.tpl:32
-msgid ""
-"-Edit- and -New...- will execute an assistant to aid you in editing "
-"properties. -Delete- will ask for confirmation before removing applications."
-msgstr ""
-"Bearbeiten- und -Neu...- rufen einen Assistenten auf, der Ihnen bei der "
-"Bearbeitung der Eigenschaften hilft. -Löschen- führt eine Sicherheitsabfrage "
-"durch bevor der Anwendungseintrag gelöscht wird."
-
-#: plugins/admin/applications/headpage.tpl:46
-msgid "Display applications of department"
-msgstr "Zeige die Anwendungen der Abteilung"
-
-#: plugins/admin/applications/headpage.tpl:58
+#: plugins/admin/applications/headpage.tpl:38
+#: plugins/admin/applications/headpage.tpl:41
 msgid "Display applications matching"
 msgstr "Zeige die Anwendungen, auf die das Folgende passt"
 
-#: plugins/admin/applications/headpage.tpl:61
+#: plugins/admin/applications/headpage.tpl:44
 msgid "Regular expression for matching application names"
 msgstr "Regulärer Ausdruck zum Abgleich mit Anwendungsnamen"
 
@@ -3930,48 +4151,51 @@ msgstr "Regul
 msgid "Application management"
 msgstr "Anwendungsverwaltung"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:59
+#: plugins/admin/applications/class_applicationManagement.inc:257
+#, php-format
+msgid "You're about to delete the application '%s'."
+msgstr "Sind sind dabei den Anwendungseintrag '%s' zu löschen."
+
+#: plugins/admin/applications/class_applicationManagement.inc:263
+#: plugins/admin/applications/class_applicationManagement.inc:289
+msgid "You are not allowed to delete this application!"
+msgstr "Es ist Ihnen nicht erlaubt, diese Anwendung zu löschen!"
+
+#: plugins/admin/applications/class_applicationManagement.inc:337
+#: plugins/admin/ogroups/class_ogroupManagement.inc:373
+msgid "new"
+msgstr "Neu"
+
+#: plugins/admin/applications/class_applicationManagement.inc:337
+msgid "Create new application"
+msgstr "Neu Anwendung erstellen"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:63
 msgid "This 'dn' is no application."
 msgstr "Dieser 'DN' ist keine Anwendung."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:148
+#: plugins/admin/applications/class_applicationGeneric.inc:159
 msgid "The specified picture has not been uploaded correctly."
 msgstr "Das angegebene Bild wurde nicht korrekt übertragen."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:229
+#: plugins/admin/applications/class_applicationGeneric.inc:240
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung eine Anwendung unterhalb dieser 'Basis' "
 "anzulegen."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:234
+#: plugins/admin/applications/class_applicationGeneric.inc:245
 msgid "Required field 'Name' is not filled."
 msgstr "Das benötigte Feld 'Name' ist nicht ausgefüllt."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:237
+#: plugins/admin/applications/class_applicationGeneric.inc:248
 msgid "Required field 'Execute' is not filled."
 msgstr "Das benötigte Feld 'Auführen' ist nicht ausgefüllt."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:246
+#: plugins/admin/applications/class_applicationGeneric.inc:257
 msgid "There's already an application with this 'Name'."
 msgstr "Eine Anwendung mit diesem Namen existiert bereits."
 
-#: plugins/admin/applications/class_applicationManagement.inc:185
-#, php-format
-msgid "You're about to delete the application '%s'."
-msgstr "Sind sind dabei den Anwendungseintrag '%s' zu löschen."
-
-#: plugins/admin/applications/class_applicationManagement.inc:191
-#: plugins/admin/applications/class_applicationManagement.inc:217
-msgid "You are not allowed to delete this application!"
-msgstr "Es ist Ihnen nicht erlaubt, diese Anwendung zu löschen!"
-
-#: plugins/admin/departments/generic.tpl:4
-#: plugins/admin/systems/terminal.tpl:1
-#: plugins/admin/systems/workstation.tpl:1
-msgid "Properties"
-msgstr "Eigenschaften"
-
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr "Name der Abteilung"
@@ -4040,7 +4264,7 @@ msgstr ""
 msgid "List of departments"
 msgstr "Liste der Abteilungen"
 
-#: plugins/admin/departments/headpage.tpl:29
+#: plugins/admin/departments/headpage.tpl:24
 msgid ""
 "This menu allows you to create, delete and edit selected departments. Having "
 "a large size of departments, you might prefer the range selectors on top of "
@@ -4050,25 +4274,12 @@ msgstr ""
 "entfernen. Bei einer Vielzahl von Abteilungen bietet sich die Verwendung der "
 "Bereichswahl an."
 
-#: plugins/admin/departments/headpage.tpl:32
-msgid ""
-"-Edit- and -New...- will provide an assistant to aid you when performing "
-"changes on your departments. -Delete- will ask for confirmation before "
-"deleting departments."
-msgstr ""
-"Editieren- und -Neu...- starten einen Assistenten, um Ihnen bei der "
-"Durchführung der entsprechenden Schritte zu helfen. - Löschen- führt eine "
-"Sicherheitsabfrage durch bevor der endgültige Löschvorgang erfolgt."
-
-#: plugins/admin/departments/headpage.tpl:45
-msgid "Display subdepartments of"
-msgstr "Zeige die Unterabteilungen der Abteilung"
-
-#: plugins/admin/departments/headpage.tpl:56
+#: plugins/admin/departments/headpage.tpl:38
+#: plugins/admin/departments/headpage.tpl:41
 msgid "Display departments matching"
 msgstr "Zeige Abteilungen, auf die zutrifft"
 
-#: plugins/admin/departments/headpage.tpl:59
+#: plugins/admin/departments/headpage.tpl:45
 msgid "Regular expression for matching department names"
 msgstr "Regulärer Ausdruck zur Suche nach Abteilungs-Namen"
 
@@ -4076,44 +4287,69 @@ msgstr "Regul
 msgid "Department management"
 msgstr "Abteilungsverwaltung"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:129
+#: plugins/admin/departments/class_departmentManagement.inc:25
+#: plugins/admin/ogroups/class_ogroupManagement.inc:43
+#: plugins/admin/ogroups/class_ogroupManagement.inc:400
+msgid "Departments"
+msgstr "Abteilungen"
+
+#: plugins/admin/departments/class_departmentManagement.inc:190
+#, php-format
+msgid "You're about to delete the whole LDAP subtree placed under '%s'."
+msgstr ""
+"Sie sind dabei, einen gesamten LDAP-Baum unterhalb von '%s' zu löschen."
+
+#: plugins/admin/departments/class_departmentManagement.inc:207
+msgid "You have no permission to remove this department."
+msgstr "Sie haben keine Berechtigung diese Abteilung zu entfernen."
+
+#: plugins/admin/departments/class_departmentManagement.inc:284
+msgid "Go to users home department"
+msgstr "Gehe zur Abteilung des angemeldeten Benutzers"
+
+#: plugins/admin/departments/class_departmentManagement.inc:286
+msgid "Create new department"
+msgstr "Neue Abteilung erstellen"
+
+#: plugins/admin/departments/class_departmentManagement.inc:294
+msgid "This table displays all departments, in the selected tree."
+msgstr "Diese Tabelle enthält alle Abteilungen des gewählten Unterbaums"
+
+#: plugins/admin/departments/class_departmentManagement.inc:302
+msgid "Department name"
+msgstr "Name der Abteilung"
+
+#: plugins/admin/departments/class_departmentManagement.inc:312
+msgid "department"
+msgstr "Abteilung"
+
+#: plugins/admin/departments/class_departmentManagement.inc:389
+msgid ".."
+msgstr ".."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:133
 msgid "You have no permissions to create a department on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung eine Abteilung unterhalb dieser 'Basis' "
 "anzulegen."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:136
-#: plugins/admin/departments/class_departmentGeneric.inc:138
+#: plugins/admin/departments/class_departmentGeneric.inc:140
+#: plugins/admin/departments/class_departmentGeneric.inc:142
 msgid "Department with that 'Name' already exists."
 msgstr "Eine Abteilung mit diesem Namen existiert bereits."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:146
+#: plugins/admin/departments/class_departmentGeneric.inc:150
 msgid "Required field 'Description' is not set."
 msgstr "Das benötigte Feld 'Beschreibung' ist nicht gesetzt."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:151
+#: plugins/admin/departments/class_departmentGeneric.inc:155
 msgid "The field 'Name' contains the reserved word 'incoming'."
 msgstr "Das Feld 'Name' enthält das reservierte Wort 'incoming'."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:152
+#: plugins/admin/departments/class_departmentGeneric.inc:156
 msgid " Please choose another name."
 msgstr "Bitte wählen Sie einen anderen Namen."
 
-#: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:43
-msgid "Departments"
-msgstr "Abteilungen"
-
-#: plugins/admin/departments/class_departmentManagement.inc:130
-#, php-format
-msgid "You're about to delete the whole LDAP subtree placed under '%s'."
-msgstr ""
-"Sie sind dabei, einen gesamten LDAP-Baum unterhalb von '%s' zu löschen."
-
-#: plugins/admin/departments/class_departmentManagement.inc:145
-msgid "You have no permission to remove this department."
-msgstr "Sie haben keine Berechtigung diese Abteilung zu entfernen."
-
 #: plugins/admin/systems/class_terminalInfo.inc:53
 #: plugins/admin/systems/class_terminalInfo.inc:178
 msgid "present"
@@ -4164,24 +4400,28 @@ msgstr "IP-Adresse"
 msgid "MAC-address"
 msgstr "MAC-Adresse"
 
+#: plugins/admin/systems/class_servService.inc:177
+msgid "Terminal server, must have fontpath specified."
+msgstr "Terminal-Server benötigt einen Schrift-Suchpfad"
+
 #: plugins/admin/systems/class_winGeneric.inc:70
 #: plugins/admin/systems/class_componentGeneric.inc:48
 msgid "This 'dn' has no network features."
 msgstr "Diese 'dn' hat keine Netzwerk-Erweiterungen."
 
-#: plugins/admin/systems/class_winGeneric.inc:134
+#: plugins/admin/systems/class_winGeneric.inc:139
 #: plugins/admin/systems/class_componentGeneric.inc:110
 msgid "The required field 'Component name' is not set."
 msgstr "Das benötigte Feld 'Gerätename' ist nicht gesetzt."
 
-#: plugins/admin/systems/class_winGeneric.inc:148
+#: plugins/admin/systems/class_winGeneric.inc:153
 #: plugins/admin/systems/class_componentGeneric.inc:123
 msgid "You have no permissions to create a component on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, eine Komponente unterhalb dieser 'Basis' "
 "anzulegen."
 
-#: plugins/admin/systems/class_winGeneric.inc:158
+#: plugins/admin/systems/class_winGeneric.inc:163
 #: plugins/admin/systems/class_terminalGeneric.inc:236
 #: plugins/admin/systems/class_servGeneric.inc:180
 #: plugins/admin/systems/class_workstationGeneric.inc:242
@@ -4285,9 +4525,45 @@ msgstr "Scan-Dienst"
 msgid "Sound service"
 msgstr "Audio-Dienst"
 
-#: plugins/admin/systems/info.tpl:128
-msgid "GUI"
-msgstr "GUI"
+#: plugins/admin/systems/info.tpl:128
+msgid "GUI"
+msgstr "GUI"
+
+#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
+msgstr "Systemverwaltung"
+
+#: plugins/admin/systems/servservice.tpl:11
+msgid "Nfs Export"
+msgstr "NFS-Freigabe"
+
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
+msgstr "Zeit-Dienst"
+
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
+msgstr "LDAP-Dienst"
+
+#: plugins/admin/systems/servservice.tpl:72
+msgid "Terminal Service"
+msgstr "Terminal-Dienst"
+
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
+msgstr "Anmeldung sperren (temporär)"
+
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
+msgstr "Schrift-Suchpfad"
+
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
+msgstr "Protokoll-Dienst"
+
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
+msgstr "Druck-Dienst"
 
 #: plugins/admin/systems/class_terminalService.inc:83
 msgid "default"
@@ -4327,45 +4603,30 @@ msgstr "Bitte geben Sie einen g
 msgid "Please specify a valid HSync range."
 msgstr "Bitte geben Sie einen gültigen HSync-Bereich an."
 
-#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
-msgid "System management"
-msgstr "Systemverwaltung"
-
-#: plugins/admin/systems/class_servService.inc:179
-msgid "Terminal server, must have fontpath specified."
-msgstr "Terminal-Server benötigt einen Schrift-Suchpfad"
-
-#: plugins/admin/systems/servservice.tpl:11
-msgid "Nfs Export"
-msgstr "NFS-Freigabe"
-
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
-msgstr "Zeit-Dienst"
-
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
-msgstr "LDAP-Dienst"
-
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
-msgstr "Terminal-Dienst"
-
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
-msgstr "Anmeldung sperren (temporär)"
+#: plugins/admin/systems/class_servDB.inc:131
+#: plugins/admin/systems/class_servDB.inc:147
+#: plugins/admin/systems/class_servDB.inc:153
+#: plugins/admin/systems/class_servDB.inc:158
+#: plugins/admin/systems/class_servDB.inc:164
+#, php-format
+msgid "The attribute '%s' is empty or contains invalid characters."
+msgstr "Das Attribut '%s' ist leer oder enthält ungültige Zeichen."
 
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
-msgstr "Schrift-Suchpfad"
+#: plugins/admin/systems/class_servDB.inc:137
+#, php-format
+msgid "The imap connect string needs to be in the form '%s'."
+msgstr "Der IMAP-Verbindungsstring muss in der Form '%s' sein."
 
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
-msgstr "Protokoll-Dienst"
+#: plugins/admin/systems/class_servDB.inc:141
+msgid "The sieve port needs to be numeric."
+msgstr "Der Sieve-Port muss numerisch sein."
 
-#: plugins/admin/systems/servservice.tpl:101
-msgid "Print Service"
-msgstr "Druck-Dienst"
+#: plugins/admin/systems/class_servDB.inc:172
+#, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
+msgstr ""
+"Das Feld 'Serverbezeichnung' muss entweder ein Hostname oder eine IP-Adresse "
+"sein."
 
 #: plugins/admin/systems/server.tpl:6
 msgid "Server name"
@@ -4389,6 +4650,77 @@ msgstr "Aktion"
 msgid "Select action to execute for this server"
 msgstr "Wählen Sie die auszuführende Aktion für diesen Server"
 
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
+msgstr "Telefon-Name"
+
+#: plugins/admin/systems/terminal.tpl:9
+msgid "Terminal template"
+msgstr "Terminal-Vorlage"
+
+#: plugins/admin/systems/terminal.tpl:11
+msgid "Terminal name"
+msgstr "Terminal-Name"
+
+#: plugins/admin/systems/terminal.tpl:36
+#: plugins/admin/systems/workstation.tpl:36
+#: plugins/admin/systems/phonesettings.tpl:25
+msgid "Mode"
+msgstr "Modus"
+
+#: plugins/admin/systems/terminal.tpl:38
+#: plugins/admin/systems/workstation.tpl:38
+msgid "Select terminal mode"
+msgstr "Wählen Sie den Terminal-Modus"
+
+#: plugins/admin/systems/terminal.tpl:52
+#: plugins/admin/systems/workstation.tpl:52
+msgid "Root server"
+msgstr "Root-Server"
+
+#: plugins/admin/systems/terminal.tpl:54
+#: plugins/admin/systems/workstation.tpl:54
+msgid "Select NFS root filesystem to use"
+msgstr "Wählen Sie das NFS-Root-Dateisystem"
+
+#: plugins/admin/systems/terminal.tpl:60
+#: plugins/admin/systems/workstation.tpl:60
+msgid "Swap server"
+msgstr "Auslagerungs-Server"
+
+#: plugins/admin/systems/terminal.tpl:62
+#: plugins/admin/systems/workstation.tpl:62
+msgid "Choose NFS filesystem to place swap files on"
+msgstr ""
+"Wählen Sie das NFS-Dateisystem, in dem die Auslagerungsdateien abgelegt "
+"werden sollen"
+
+#: plugins/admin/systems/terminal.tpl:74
+#: plugins/admin/systems/workstation.tpl:74
+msgid "Syslog server"
+msgstr "Protokoll-Server"
+
+#: plugins/admin/systems/terminal.tpl:76
+#: plugins/admin/systems/workstation.tpl:76
+msgid "Choose server to use for logging"
+msgstr "Wählen Sie den Server, der für das Protokollieren genutzt werden soll"
+
+#: plugins/admin/systems/terminal.tpl:82
+#: plugins/admin/systems/workstation.tpl:82
+msgid "NTP server"
+msgstr "Zeit-Server"
+
+#: plugins/admin/systems/terminal.tpl:84
+#: plugins/admin/systems/workstation.tpl:84
+msgid "Choose server to use for synchronizing time"
+msgstr ""
+"Wählen Sie den Server, der zur Zeit-Synchronisation genutzt werden soll"
+
+#: plugins/admin/systems/terminal.tpl:103
+#: plugins/admin/systems/workstation.tpl:103
+msgid "Select action to execute for this terminal"
+msgstr "Wählen Sie die auszuführende Aktion für dieses Terminal"
+
 #: plugins/admin/systems/class_terminalGeneric.inc:63
 #: plugins/admin/systems/class_workstationGeneric.inc:71
 msgid "text"
@@ -4466,10 +4798,6 @@ msgstr ""
 msgid "The required field 'Terminal name' is not set."
 msgstr "Das benötigte Feld 'Terminal-Name' ist nicht gesetzt."
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
-msgstr "Telefon-Name"
-
 #: plugins/admin/systems/class_servGeneric.inc:49
 msgid "This 'dn' has no server features."
 msgstr "Diese 'dn' hat keine Server-Erweiterungen."
@@ -4484,73 +4812,6 @@ msgstr ""
 "Sie haben keine Berechtigung, einen Server unterhalb dieser 'Basis' "
 "anzulegen."
 
-#: plugins/admin/systems/terminal.tpl:9
-msgid "Terminal template"
-msgstr "Terminal-Vorlage"
-
-#: plugins/admin/systems/terminal.tpl:11
-msgid "Terminal name"
-msgstr "Terminal-Name"
-
-#: plugins/admin/systems/terminal.tpl:36
-#: plugins/admin/systems/workstation.tpl:36
-#: plugins/admin/systems/phonesettings.tpl:25
-msgid "Mode"
-msgstr "Modus"
-
-#: plugins/admin/systems/terminal.tpl:38
-#: plugins/admin/systems/workstation.tpl:38
-msgid "Select terminal mode"
-msgstr "Wählen Sie den Terminal-Modus"
-
-#: plugins/admin/systems/terminal.tpl:52
-#: plugins/admin/systems/workstation.tpl:52
-msgid "Root server"
-msgstr "Root-Server"
-
-#: plugins/admin/systems/terminal.tpl:54
-#: plugins/admin/systems/workstation.tpl:54
-msgid "Select NFS root filesystem to use"
-msgstr "Wählen Sie das NFS-Root-Dateisystem"
-
-#: plugins/admin/systems/terminal.tpl:60
-#: plugins/admin/systems/workstation.tpl:60
-msgid "Swap server"
-msgstr "Auslagerungs-Server"
-
-#: plugins/admin/systems/terminal.tpl:62
-#: plugins/admin/systems/workstation.tpl:62
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-"Wählen Sie das NFS-Dateisystem, in dem die Auslagerungsdateien abgelegt "
-"werden sollen"
-
-#: plugins/admin/systems/terminal.tpl:74
-#: plugins/admin/systems/workstation.tpl:74
-msgid "Syslog server"
-msgstr "Protokoll-Server"
-
-#: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/workstation.tpl:76
-msgid "Choose server to use for logging"
-msgstr "Wählen Sie den Server, der für das Protokollieren genutzt werden soll"
-
-#: plugins/admin/systems/terminal.tpl:82
-#: plugins/admin/systems/workstation.tpl:82
-msgid "NTP server"
-msgstr "Zeit-Server"
-
-#: plugins/admin/systems/terminal.tpl:84
-#: plugins/admin/systems/workstation.tpl:84
-msgid "Choose server to use for synchronizing time"
-msgstr ""
-"Wählen Sie den Server, der zur Zeit-Synchronisation genutzt werden soll"
-
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:103
-msgid "Select action to execute for this terminal"
-msgstr "Wählen Sie die auszuführende Aktion für dieses Terminal"
-
 #: plugins/admin/systems/class_servDHCP.inc:33
 msgid "Remove DHCP service"
 msgstr "DHCP-Dienst entfernen"
@@ -4575,6 +4836,18 @@ msgstr ""
 "Aktuell hat dieser Server keine DHCP-Funktionen aktiviert. Sie können diese "
 "durch einen Klick auf die Schaltfläche unten aktivieren."
 
+#: plugins/admin/systems/printer.tpl:6
+msgid "Printer name"
+msgstr "Druckername"
+
+#: plugins/admin/systems/printer.tpl:32
+msgid "Printer URL"
+msgstr "Drucker URL"
+
+#: plugins/admin/systems/printer.tpl:36
+msgid "Path to PPD"
+msgstr "Pfad zum PPD"
+
 #: plugins/admin/systems/class_workstationGeneric.inc:136
 msgid "This 'dn' has no workstation features."
 msgstr "Dieser 'DN' hat keine Arbeitsstations-Erweiterungen."
@@ -4593,58 +4866,154 @@ msgstr "Das ben
 msgid "Systems"
 msgstr "Systeme"
 
-#: plugins/admin/systems/class_systemManagement.inc:246
-msgid "You can't edit this object type yet!"
-msgstr "Dieser Objekt-Typ kann momentan noch nicht bearbeitet werden!"
+#: plugins/admin/systems/class_systemManagement.inc:314
+msgid "You can't edit this object type yet!"
+msgstr "Dieser Objekt-Typ kann momentan noch nicht bearbeitet werden!"
+
+#: plugins/admin/systems/class_systemManagement.inc:330
+msgid "Passwords entered as new and repeated do not match!"
+msgstr ""
+"Die Passworte, die Sie als 'Neues Passwort' und 'Wiederholung des neuen "
+"Passwort' eingegeben haben sind nicht identisch!"
+
+#: plugins/admin/systems/class_systemManagement.inc:343
+msgid "You are not allowed to set this systems password!"
+msgstr "Es Ihnen nicht erlaubt das Passwort für dieses Systems zu setzen!"
+
+#: plugins/admin/systems/class_systemManagement.inc:387
+#, php-format
+msgid "You're about to delete all information about the component at '%s'."
+msgstr ""
+"Sie sind dabei, alle Informationen über die Komponente auf '%s' zu löschen."
+
+#: plugins/admin/systems/class_systemManagement.inc:393
+#: plugins/admin/systems/class_systemManagement.inc:446
+msgid "You are not allowed to delete this component!"
+msgstr "Es ist Ihnen nicht erlaubt, diese Komponente zu löschen!"
+
+#: plugins/admin/systems/class_systemManagement.inc:538
+msgid "Create new system"
+msgstr "Neues System erstellen"
+
+#: plugins/admin/systems/class_systemManagement.inc:546
+msgid "Edit system"
+msgstr "System bearbeiten"
+
+#: plugins/admin/systems/class_systemManagement.inc:547
+msgid "Delete system"
+msgstr "Entferne System"
+
+#: plugins/admin/systems/class_systemManagement.inc:553
+msgid "System"
+msgstr "Systeme"
+
+#: plugins/admin/systems/class_systemManagement.inc:557
+msgid "This table displays all systems, in the selected tree."
+msgstr "Diese Tabelle enthält alle Systeme des gewählten Unterbaumes."
+
+#: plugins/admin/systems/class_systemManagement.inc:577
+msgid "Cups Server"
+msgstr "CUPS Server"
+
+#: plugins/admin/systems/class_systemManagement.inc:578
+msgid "Log Db"
+msgstr "Log-DB"
+
+#: plugins/admin/systems/class_systemManagement.inc:579
+msgid "Syslog Server"
+msgstr "Syslog-Server"
+
+#: plugins/admin/systems/class_systemManagement.inc:580
+msgid "Mail Server"
+msgstr "Mail-Server"
+
+#: plugins/admin/systems/class_systemManagement.inc:581
+msgid "Imap Server"
+msgstr "IMAP-Server"
+
+#: plugins/admin/systems/class_systemManagement.inc:582
+msgid "Nfs Server"
+msgstr "NFS-Server"
+
+#: plugins/admin/systems/class_systemManagement.inc:583
+msgid "Kerberos Server"
+msgstr "Kerberos-Server"
+
+#: plugins/admin/systems/class_systemManagement.inc:584
+msgid "Asterisk Server"
+msgstr "Asterisk-Server"
+
+#: plugins/admin/systems/class_systemManagement.inc:585
+msgid "Fax Server"
+msgstr "FAX-Server"
+
+#: plugins/admin/systems/class_systemManagement.inc:586
+msgid "Ldap Server"
+msgstr "LDAP-Server"
+
+#: plugins/admin/systems/class_systemManagement.inc:612
+msgid "Set root password"
+msgstr "root-Passwort setzen"
+
+#: plugins/admin/systems/class_systemManagement.inc:662
+#: plugins/admin/ogroups/class_ogroupManagement.inc:483
+msgid "Terminal"
+msgstr "Terminal"
+
+#: plugins/admin/systems/class_systemManagement.inc:663
+#: plugins/admin/ogroups/class_ogroupManagement.inc:482
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr "Arbeitsstation"
+
+#: plugins/admin/systems/class_systemManagement.inc:666
+msgid "New Terminal"
+msgstr "Neues Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:262
-msgid "Passwords entered as new and repeated do not match!"
-msgstr ""
-"Die Passworte, die Sie als 'Neues Passwort' und 'Wiederholung des neuen "
-"Passwort' eingegeben haben sind nicht identisch!"
+#: plugins/admin/systems/class_systemManagement.inc:667
+msgid "New Workstation"
+msgstr "Neue Arbeitsstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:275
-msgid "You are not allowed to set this systems password!"
-msgstr "Es Ihnen nicht erlaubt das Passwort für dieses Systems zu setzen!"
+#: plugins/admin/systems/class_systemManagement.inc:668
+msgid "Winstation"
+msgstr "Windows-Workstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:319
-#, php-format
-msgid "You're about to delete all information about the component at '%s'."
-msgstr ""
-"Sie sind dabei, alle Informationen über die Komponente auf '%s' zu löschen."
+#: plugins/admin/systems/class_systemManagement.inc:669
+msgid "Network Device"
+msgstr "Netzwerk-Gerät"
 
-#: plugins/admin/systems/class_systemManagement.inc:325
-#: plugins/admin/systems/class_systemManagement.inc:378
-msgid "You are not allowed to delete this component!"
-msgstr "Es ist Ihnen nicht erlaubt, diese Komponente zu löschen!"
+#: plugins/admin/systems/class_systemManagement.inc:670
+#: plugins/admin/ogroups/class_ogroupManagement.inc:49
+#: plugins/admin/ogroups/class_ogroupManagement.inc:484
+#: plugins/generic/references/class_reference.inc:52
+msgid "Printer"
+msgstr "Drucker"
 
-#: plugins/admin/systems/class_systemManagement.inc:644
+#: plugins/admin/systems/class_systemManagement.inc:855
 msgid "New terminal"
 msgstr "Neues Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:647
+#: plugins/admin/systems/class_systemManagement.inc:858
 msgid "New workstation"
 msgstr "Neue Arbeitsstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:663
-msgid "Thin client template for"
-msgstr "Thin-Client-Vorlage für"
+#: plugins/admin/systems/class_systemManagement.inc:875
+msgid "Terminal template for"
+msgstr "Terminal-Vorlage für"
 
-#: plugins/admin/systems/class_systemManagement.inc:675
+#: plugins/admin/systems/class_systemManagement.inc:886
 msgid "Workstation template for"
 msgstr "Arbeitsstations-Vorlage für"
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "Printer name"
-msgstr "Druckername"
-
-#: plugins/admin/systems/printer.tpl:32
-msgid "Printer URL"
-msgstr "Drucker URL"
+#: plugins/admin/systems/class_printGeneric.inc:57
+msgid "This 'dn' has no printer features."
+msgstr "Dieser 'DN' hat keine Drucker-Erweiterungen."
 
-#: plugins/admin/systems/printer.tpl:36
-msgid "Path to PPD"
-msgstr "Pfad zum PPD"
+#: plugins/admin/systems/class_printGeneric.inc:126
+msgid "You have no permissions to create a printer on this 'Base'."
+msgstr ""
+"Sie haben keine Berechtigung, einen Drucker unterhalb dieser 'Basis' "
+"anzulegen."
 
 #: plugins/admin/systems/class_servDNS.inc:33
 msgid "Remove DNS service"
@@ -4668,31 +5037,6 @@ msgstr ""
 "Aktuell hat dieser Server keine DNS-Funktionen aktiviert. Sie können diese "
 "durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/admin/systems/class_servDB.inc:131
-#: plugins/admin/systems/class_servDB.inc:147
-#: plugins/admin/systems/class_servDB.inc:153
-#: plugins/admin/systems/class_servDB.inc:158
-#: plugins/admin/systems/class_servDB.inc:164
-#, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
-msgstr "Das Attribut '%s' ist leer oder enthält ungültige Zeichen."
-
-#: plugins/admin/systems/class_servDB.inc:137
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
-msgstr "Der IMAP-Verbindungsstring muss in der Form '%s' sein."
-
-#: plugins/admin/systems/class_servDB.inc:141
-msgid "The sieve port needs to be numeric."
-msgstr "Der Sieve-Port muss numerisch sein."
-
-#: plugins/admin/systems/class_servDB.inc:172
-#, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
-msgstr ""
-"Das Feld 'Serverbezeichnung' muss entweder ein Hostname oder eine IP-Adresse "
-"sein."
-
 #: plugins/admin/systems/workstation.tpl:9
 msgid "Workstation template"
 msgstr "Vorlage für Arbeitsstation"
@@ -4761,11 +5105,11 @@ msgstr "Protokoll-Datenbank"
 msgid "Logging DB user"
 msgstr "Protokoll-DB Benutzer"
 
-#: plugins/admin/systems/class_servKolab.inc:88
+#: plugins/admin/systems/class_servKolab.inc:112
 msgid "Remove Kolab extension"
 msgstr "Kolab Erweiterung entfernen"
 
-#: plugins/admin/systems/class_servKolab.inc:88
+#: plugins/admin/systems/class_servKolab.inc:112
 msgid ""
 "This server has kolab features enabled. You can disable them by clicking "
 "below."
@@ -4773,11 +5117,11 @@ msgstr ""
 "Dieser Server hat die Kolab-Funtionen aktiviert. Sie können diese durch "
 "einen Klick auf die Schaltfläche unten deaktivieren."
 
-#: plugins/admin/systems/class_servKolab.inc:91
+#: plugins/admin/systems/class_servKolab.inc:115
 msgid "Add Kolab service"
 msgstr "Kolab Dienst hinzufügen"
 
-#: plugins/admin/systems/class_servKolab.inc:91
+#: plugins/admin/systems/class_servKolab.inc:115
 msgid ""
 "This server has kolab features disabled. You can enable them by clicking "
 "below."
@@ -4785,43 +5129,43 @@ msgstr ""
 "Aktuell hat dieser Server keine Kolab-Funktionen aktiviert. Sie können diese "
 "durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: plugins/admin/systems/class_servKolab.inc:119
+#: plugins/admin/systems/class_servKolab.inc:143
 #, php-format
 msgid "Include data from %s days in the past when creating free/busy lists"
 msgstr ""
 "Berücksichtige %s Tage in der Vergangenheit beim Erstellen von Frei/Belegt-"
 "Listen"
 
-#: plugins/admin/systems/class_servKolab.inc:125
+#: plugins/admin/systems/class_servKolab.inc:149
 #, php-format
 msgid "Warn users when using more than %s%% of their mail quota"
 msgstr "Warne Benutzer, wenn sie mehr als %s%% ihres Mail-Kontigentes benutzen"
 
-#: plugins/admin/systems/class_servKolab.inc:197
+#: plugins/admin/systems/class_servKolab.inc:221
 msgid "Future days in Free/Busy settings must be set."
 msgstr "Intervall für Frei/Belegt-Informationen muß gesetzt sein."
 
-#: plugins/admin/systems/class_servKolab.inc:199
+#: plugins/admin/systems/class_servKolab.inc:223
 msgid "Future days in Free/Busy settings must be a positive value."
 msgstr "Intervall für Frei/Belegt-Informationen muß ein positiver Wert sein."
 
-#: plugins/admin/systems/class_servKolab.inc:203
+#: plugins/admin/systems/class_servKolab.inc:227
 msgid "The given Quota settings value must be a number."
 msgstr "Der angegebene Kontingent-Wert muß numerisch sein."
 
-#: plugins/admin/systems/class_servKolab.inc:205
+#: plugins/admin/systems/class_servKolab.inc:229
 msgid "Please choose a value between 1 and 100 for Quota settings."
 msgstr "Bitte wählen Sie einen Kontingent-Wert zwischen 1 und 100."
 
-#: plugins/admin/systems/class_servKolab.inc:207
+#: plugins/admin/systems/class_servKolab.inc:231
 msgid "Future days must be a value."
 msgstr "Frei/Belegt-Intervall muß einen Wert besitzen."
 
-#: plugins/admin/systems/class_servKolab.inc:211
+#: plugins/admin/systems/class_servKolab.inc:235
 msgid "No SMTP privileged networks set."
 msgstr "Es sind keine SMTP privilegierte Netzwerke vorhanden."
 
-#: plugins/admin/systems/class_servKolab.inc:215
+#: plugins/admin/systems/class_servKolab.inc:239
 msgid "No SMTP smarthost/relayhost set."
 msgstr "Es ist kein SMTP smarthost/relayhost gesetzt."
 
@@ -4878,113 +5222,30 @@ msgstr "SMTP privilegierte Netzwerke"
 msgid "Hosts/networks allowed to relay"
 msgstr "Rechner/Netzwerke denen Weiterleitung erlaubt ist"
 
-#: plugins/admin/systems/servkolab.tpl:136
+#: plugins/admin/systems/servkolab.tpl:125
+msgid "Enter multiple values, seperated with"
+msgstr "Eingabe mehrerer Werte, getrennt durch"
+
+#: plugins/admin/systems/servkolab.tpl:138
 msgid "SMTP smarthost/relayhost"
 msgstr "SMTP smarthost/relayhost"
 
-#: plugins/admin/systems/servkolab.tpl:142
+#: plugins/admin/systems/servkolab.tpl:144
 msgid "Enable MX lookup for relayhost"
 msgstr "Aktiviere MX lookup für relayhost"
 
-#: plugins/admin/systems/servkolab.tpl:147
+#: plugins/admin/systems/servkolab.tpl:149
 msgid "Host used to relay mails"
 msgstr "Host für Mail Relay"
 
-#: plugins/admin/systems/servkolab.tpl:161
+#: plugins/admin/systems/servkolab.tpl:163
 msgid "Accept Internet Mail"
 msgstr "Akzeptiere Internet Mail"
 
-#: plugins/admin/systems/servkolab.tpl:167
+#: plugins/admin/systems/servkolab.tpl:169
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr "Akzeptiere Mails von anderen Domänen über nicht-authentifiziertes SMTP"
 
-#: plugins/admin/systems/class_printGeneric.inc:57
-msgid "This 'dn' has no printer features."
-msgstr "Dieser 'DN' hat keine Drucker-Erweiterungen."
-
-#: plugins/admin/systems/class_printGeneric.inc:126
-msgid "You have no permissions to create a printer on this 'Base'."
-msgstr ""
-"Sie haben keine Berechtigung, einen Drucker unterhalb dieser 'Basis' "
-"anzulegen."
-
-#: plugins/admin/systems/phonesettings.tpl:1
-msgid "Specific Phone settings"
-msgstr "Erweiterte Telefon-Einstellungen"
-
-#: plugins/admin/systems/phonesettings.tpl:9
-msgid "Phone type"
-msgstr "Telefon-Typ"
-
-#: plugins/admin/systems/phonesettings.tpl:10
-#: plugins/admin/systems/phonesettings.tpl:28
-#: plugins/admin/systems/phonesettings.tpl:38
-#: plugins/admin/systems/phonesettings.tpl:52
-#: plugins/admin/systems/phonesettings.tpl:83
-#: plugins/admin/systems/phonesettings.tpl:114
-#: plugins/admin/systems/phonesettings.tpl:161
-msgid "Choose a phone type"
-msgstr "Wählen Sie den Telefon-Typ"
-
-#: plugins/admin/systems/phonesettings.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:64
-msgid "refresh"
-msgstr "Aktualisieren"
-
-#: plugins/admin/systems/phonesettings.tpl:35
-msgid "DTMF mode"
-msgstr "DTMF-Modus"
-
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:90
-msgid "Default IP"
-msgstr "Standard IP-Adresse"
-
-#: plugins/admin/systems/phonesettings.tpl:59
-#: plugins/admin/systems/phonesettings.tpl:98
-msgid "Response timeout"
-msgstr "Wartezeit bis Antwort"
-
-#: plugins/admin/systems/phonesettings.tpl:80
-msgid "Modus"
-msgstr "Modus"
-
-#: plugins/admin/systems/phonesettings.tpl:111
-msgid "Authtype"
-msgstr "Authentifizierung"
-
-#: plugins/admin/systems/phonesettings.tpl:121
-msgid "Secret"
-msgstr "Passwort"
-
-#: plugins/admin/systems/phonesettings.tpl:129
-msgid "GoFonInkeys"
-msgstr "GOFon-Schlüssel (eingehend)"
-
-#: plugins/admin/systems/phonesettings.tpl:137
-msgid "GoFonOutKeys"
-msgstr "GOFon-Schlüssel (ausgehend)"
-
-#: plugins/admin/systems/phonesettings.tpl:150
-msgid "Account code"
-msgstr "Konto-Identifikation"
-
-#: plugins/admin/systems/phonesettings.tpl:158
-msgid "Trunk lines"
-msgstr "Leitungen zusammenfassen"
-
-#: plugins/admin/systems/phonesettings.tpl:173
-msgid "Hosts that are allowed to connect"
-msgstr "Erlaube diesen Rechnern die Verbindung"
-
-#: plugins/admin/systems/phonesettings.tpl:188
-msgid "Hosts that are not allowed to connect"
-msgstr "Verbiete diesen Rechnern die Verbindung"
-
-#: plugins/admin/systems/phonesettings.tpl:212
-msgid "MSN"
-msgstr "MSN"
-
 #: plugins/admin/systems/wingeneric.tpl:6
 msgid "Machine name"
 msgstr "Name des Systems"
@@ -5002,7 +5263,7 @@ msgstr ""
 msgid "List of systems"
 msgstr "Liste der Systeme"
 
-#: plugins/admin/systems/headpage.tpl:29
+#: plugins/admin/systems/headpage.tpl:24
 msgid ""
 "This menu allows you to add, remove and change the properties of specific "
 "systems. You can only add systems which have already been started once."
@@ -5011,98 +5272,79 @@ msgstr ""
 "Eigenschaften bestimmter Systeme verändern. Sie können nur Systeme "
 "hinzufügen, die bereits einmal im Netz gestartet wurden."
 
-#: plugins/admin/systems/headpage.tpl:32
-msgid ""
-"-Edit- will execute an assistant to aid you in changing the system "
-"properties. -Delete- will ask for confirmation before deleting systems."
-msgstr ""
-"-Bearbeiten- startet einen Assistenten, der Sie bei der Änderung der "
-"Eigenschaften eines Systems unterstützt. -Löschen- führt eine "
-"Sicherheitsabfrage durch bevor der endgültige Löschvorgang erfolgt."
-
-#: plugins/admin/systems/headpage.tpl:46
+#: plugins/admin/systems/headpage.tpl:38
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Select to see servers"
 msgstr "Wählen um Server anzuzeigen"
 
-#: plugins/admin/systems/headpage.tpl:46
+#: plugins/admin/systems/headpage.tpl:38
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Show servers"
 msgstr "Zeige Server"
 
-#: plugins/admin/systems/headpage.tpl:47
+#: plugins/admin/systems/headpage.tpl:39
 msgid "Select to see Linux terminals"
 msgstr "Wählen, um Linux Terminals zu sehen"
 
-#: plugins/admin/systems/headpage.tpl:47
+#: plugins/admin/systems/headpage.tpl:39
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Show terminals"
 msgstr "Zeige Terminals"
 
-#: plugins/admin/systems/headpage.tpl:48
+#: plugins/admin/systems/headpage.tpl:40
 msgid "Select to see Linux workstations"
 msgstr "Wählen, um Linux Arbeitsstationen zu sehen"
 
-#: plugins/admin/systems/headpage.tpl:48
+#: plugins/admin/systems/headpage.tpl:40
 #: plugins/admin/ogroups/ogroup_objects.tpl:32
 msgid "Show workstations"
 msgstr "Zeige Arbeitsstationen"
 
-#: plugins/admin/systems/headpage.tpl:49
+#: plugins/admin/systems/headpage.tpl:41
 msgid "Select to see MicroSoft Windows based workstations"
 msgstr "Auswählen um Microsoft Windows Arbeitsstationen zu sehen"
 
-#: plugins/admin/systems/headpage.tpl:49
+#: plugins/admin/systems/headpage.tpl:41
 msgid "Show windows based workstations"
 msgstr "Zeige Windows basierte Arbeitsstationen"
 
-#: plugins/admin/systems/headpage.tpl:50
+#: plugins/admin/systems/headpage.tpl:42
 msgid "Select to see network printers"
 msgstr "Wählen, um die 'Netzwerk-Drucker' zu sehen"
 
-#: plugins/admin/systems/headpage.tpl:50
+#: plugins/admin/systems/headpage.tpl:42
 msgid "Show network printers"
 msgstr "Zeige Netzwerk-Drucker"
 
-#: plugins/admin/systems/headpage.tpl:51
+#: plugins/admin/systems/headpage.tpl:43
 msgid "Select to see VOIP phones"
 msgstr "Wählen, um 'VoIP-Telefone' zu sehen"
 
-#: plugins/admin/systems/headpage.tpl:51
+#: plugins/admin/systems/headpage.tpl:43
 #: plugins/admin/ogroups/ogroup_objects.tpl:35
 msgid "Show phones"
 msgstr "Zeige Telefone"
 
-#: plugins/admin/systems/headpage.tpl:52
+#: plugins/admin/systems/headpage.tpl:44
 msgid "Select to see network devices"
 msgstr "Wählen, um Netzwerk-Geräte zu sehen"
 
-#: plugins/admin/systems/headpage.tpl:52
+#: plugins/admin/systems/headpage.tpl:44
 msgid "Show network devices"
 msgstr "Zeige Netzwerk-Geräte"
 
-#: plugins/admin/systems/headpage.tpl:74
+#: plugins/admin/systems/headpage.tpl:54
 msgid "Regular expression for matching system names"
 msgstr "Regulärer Ausdruck für System-Namen"
 
-#: plugins/admin/systems/headpage.tpl:82
+#: plugins/admin/systems/headpage.tpl:62
 msgid "Display terminal(s) of user"
 msgstr "Zeige Terminal(s) des Benutzers"
 
-#: plugins/admin/systems/headpage.tpl:85
+#: plugins/admin/systems/headpage.tpl:65
 msgid "User name of which terminal(s) are shown"
 msgstr "Benutzername, dessen Terminal(s) gezeigt werden"
 
-#: plugins/admin/systems/class_componentGeneric.inc:113
-#: plugins/admin/systems/class_phoneGeneric.inc:269
-msgid "The required field 'MAC-address' is not set."
-msgstr "Das benötigte Feld 'MAC-Adresse' ist nicht gesetzt."
-
-#: plugins/admin/systems/class_componentGeneric.inc:116
-#: plugins/admin/systems/class_phoneGeneric.inc:272
-msgid "The required field 'IP-address' is not set."
-msgstr "Das benötigte Feld 'IP-Adresse' ist nicht gesetzt."
-
 #: plugins/admin/systems/service.tpl:4
 msgid "Keyboard"
 msgstr "Tastatur"
@@ -5287,6 +5529,16 @@ msgid "Changing the password impinges on authentification only."
 msgstr ""
 "Das Ändern des Passwortes wirkt sich nur auf die Authentifizierung aus."
 
+#: plugins/admin/systems/class_componentGeneric.inc:113
+#: plugins/admin/systems/class_phoneGeneric.inc:269
+msgid "The required field 'MAC-address' is not set."
+msgstr "Das benötigte Feld 'MAC-Adresse' ist nicht gesetzt."
+
+#: plugins/admin/systems/class_componentGeneric.inc:116
+#: plugins/admin/systems/class_phoneGeneric.inc:272
+msgid "The required field 'IP-address' is not set."
+msgstr "Das benötigte Feld 'IP-Adresse' ist nicht gesetzt."
+
 #: plugins/admin/systems/component.tpl:6
 msgid "Device name"
 msgstr "Gerätename"
@@ -5429,10 +5681,12 @@ msgid "This 'dn' has no phone features."
 msgstr "Diese 'dn' hat keine Telefon-Erweiterungen."
 
 #: plugins/admin/systems/class_phoneGeneric.inc:176
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:366
 msgid "yes"
 msgstr "ja"
 
 #: plugins/admin/systems/class_phoneGeneric.inc:176
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:367
 msgid "no"
 msgstr "nein"
 
@@ -5448,31 +5702,100 @@ msgstr "Netzwerk-Einstellungen"
 msgid "The required field 'Phone name' is not set."
 msgstr "Das benötigte Feld 'Telefon-Name' ist nicht gesetzt."
 
-#: plugins/admin/systems/class_phoneGeneric.inc:266
-msgid "The 'Phone name' '0' is reserved and cannot be used."
-msgstr "Der Telefon-Name '0' ist reserviert und kann nicht verwendet werden."
+#: plugins/admin/systems/class_phoneGeneric.inc:266
+msgid "The 'Phone name' '0' is reserved and cannot be used."
+msgstr "Der Telefon-Name '0' ist reserviert und kann nicht verwendet werden."
+
+#: plugins/admin/systems/class_phoneGeneric.inc:275
+msgid "Wrong IP format in field IP-address."
+msgstr "Ungültige IP-Adresse in Feld IP-Adresse"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:282
+msgid "You have no permissions to create a phone on this 'Base'."
+msgstr ""
+"Sie haben keine Berechtigung, ein Telefon unterhalb dieser 'Basis' anzulegen."
+
+#: plugins/admin/systems/phonesettings.tpl:1
+msgid "Specific Phone settings"
+msgstr "Erweiterte Telefon-Einstellungen"
+
+#: plugins/admin/systems/phonesettings.tpl:9
+msgid "Phone type"
+msgstr "Telefon-Typ"
+
+#: plugins/admin/systems/phonesettings.tpl:10
+#: plugins/admin/systems/phonesettings.tpl:28
+#: plugins/admin/systems/phonesettings.tpl:38
+#: plugins/admin/systems/phonesettings.tpl:52
+#: plugins/admin/systems/phonesettings.tpl:83
+#: plugins/admin/systems/phonesettings.tpl:114
+#: plugins/admin/systems/phonesettings.tpl:161
+msgid "Choose a phone type"
+msgstr "Wählen Sie den Telefon-Typ"
+
+#: plugins/admin/systems/phonesettings.tpl:13
+#: plugins/gofon/phoneaccount/generic.tpl:64
+msgid "refresh"
+msgstr "Aktualisieren"
+
+#: plugins/admin/systems/phonesettings.tpl:35
+msgid "DTMF mode"
+msgstr "DTMF-Modus"
+
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:90
+msgid "Default IP"
+msgstr "Standard IP-Adresse"
+
+#: plugins/admin/systems/phonesettings.tpl:59
+#: plugins/admin/systems/phonesettings.tpl:98
+msgid "Response timeout"
+msgstr "Wartezeit bis Antwort"
+
+#: plugins/admin/systems/phonesettings.tpl:80
+msgid "Modus"
+msgstr "Modus"
+
+#: plugins/admin/systems/phonesettings.tpl:111
+msgid "Authtype"
+msgstr "Authentifizierung"
+
+#: plugins/admin/systems/phonesettings.tpl:121
+msgid "Secret"
+msgstr "Passwort"
+
+#: plugins/admin/systems/phonesettings.tpl:129
+msgid "GoFonInkeys"
+msgstr "GOFon-Schlüssel (eingehend)"
+
+#: plugins/admin/systems/phonesettings.tpl:137
+msgid "GoFonOutKeys"
+msgstr "GOFon-Schlüssel (ausgehend)"
+
+#: plugins/admin/systems/phonesettings.tpl:150
+msgid "Account code"
+msgstr "Konto-Identifikation"
+
+#: plugins/admin/systems/phonesettings.tpl:158
+msgid "Trunk lines"
+msgstr "Leitungen zusammenfassen"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:275
-msgid "Wrong IP format in field IP-address."
-msgstr "Ungültige IP-Adresse in Feld IP-Adresse"
+#: plugins/admin/systems/phonesettings.tpl:173
+msgid "Hosts that are allowed to connect"
+msgstr "Erlaube diesen Rechnern die Verbindung"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:282
-msgid "You have no permissions to create a phone on this 'Base'."
-msgstr ""
-"Sie haben keine Berechtigung, ein Telefon unterhalb dieser 'Basis' anzulegen."
+#: plugins/admin/systems/phonesettings.tpl:188
+msgid "Hosts that are not allowed to connect"
+msgstr "Verbiete diesen Rechnern die Verbindung"
+
+#: plugins/admin/systems/phonesettings.tpl:210
+msgid "MSN"
+msgstr "MSN"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:19
 msgid "Terminals"
 msgstr "Arbeitsplätze"
 
-#: plugins/admin/ogroups/mail.tpl:7
-msgid "Mail distribution list"
-msgstr "Mail-Verteilerliste"
-
-#: plugins/admin/ogroups/mail.tpl:11
-msgid "Primary mail address for this distribution list"
-msgstr "Primäre Mail-Adresse der Verteilerliste"
-
 #: plugins/admin/ogroups/ogroup_objects.tpl:6
 msgid "Select objects to add"
 msgstr "Wählen Sie die hinzuzufügenden Objekte"
@@ -5555,8 +5878,69 @@ msgstr ""
 msgid "Select action to execute for this   group of terminals"
 msgstr "Wählen Sie die auszuführende Aktion für diese Gruppe von Terminals"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+#: plugins/admin/ogroups/class_ogroup.inc:95
+msgid "This 'dn' is no object group."
+msgstr "Diese 'dn' hat keine Objektgruppenerweiterungen."
+
+#: plugins/admin/ogroups/class_ogroup.inc:203
+msgid "too many different objects!"
+msgstr "zu viele unterschiedliche Objekte!"
+
+#: plugins/admin/ogroups/class_ogroup.inc:205
+msgid "users"
+msgstr "Benutzer"
+
+#: plugins/admin/ogroups/class_ogroup.inc:206
+msgid "groups"
+msgstr "Gruppen"
+
+#: plugins/admin/ogroups/class_ogroup.inc:207
+msgid "applications"
+msgstr "Anwendungen"
+
+#: plugins/admin/ogroups/class_ogroup.inc:208
+msgid "departments"
+msgstr "Abteilungen"
+
+#: plugins/admin/ogroups/class_ogroup.inc:209
+msgid "servers"
+msgstr "Server"
+
+#: plugins/admin/ogroups/class_ogroup.inc:210
+msgid "workstations"
+msgstr "Arbeitsstationen"
+
+#: plugins/admin/ogroups/class_ogroup.inc:211
+msgid "terminals"
+msgstr "Terminals"
+
+#: plugins/admin/ogroups/class_ogroup.inc:212
+msgid "phones"
+msgstr "Telefone"
+
+#: plugins/admin/ogroups/class_ogroup.inc:213
+msgid "printers"
+msgstr "Drucker"
+
+#: plugins/admin/ogroups/class_ogroup.inc:220
+msgid "and"
+msgstr "und"
+
+#: plugins/admin/ogroups/class_ogroup.inc:367
+msgid "Non existing dn: "
+msgstr "Unbekannte dn: "
+
+#: plugins/admin/ogroups/class_ogroup.inc:498
+msgid "Object groups need at least one member!"
+msgstr "Objektgruppen sollten mindestens ein Mitglied haben!"
+
+#: plugins/admin/ogroups/class_ogroup.inc:503
+msgid "You can combine two different object types at maximum only!"
+msgstr ""
+"Sie können maximal zwei verschiedene Objekttypen miteinander kombinieren!"
+
 #: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
 msgid "Object groups"
 msgstr "Objektgruppen"
 
@@ -5576,194 +5960,361 @@ msgstr "Thin Clients"
 msgid "Workstations"
 msgstr "Workstations"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:49
-#: plugins/generic/references/class_reference.inc:52
-msgid "Printer"
-msgstr "Drucker"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:149
+#: plugins/admin/ogroups/class_ogroupManagement.inc:226
 #, php-format
 msgid "You're about to delete the object group '%s'."
 msgstr "Sie sind dabei die Objektgruppe '%s' zu löschen."
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:155
-#: plugins/admin/ogroups/class_ogroupManagement.inc:181
+#: plugins/admin/ogroups/class_ogroupManagement.inc:232
+#: plugins/admin/ogroups/class_ogroupManagement.inc:258
 msgid "You are not allowed to delete this object group!"
 msgstr "Es ist Ihnen nicht erlaubt, diese Objektgruppe zu löschen!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:91
-msgid "This 'dn' is no object group."
-msgstr "Diese 'dn' hat keine Objektgruppenerweiterungen."
+#: plugins/admin/ogroups/class_ogroupManagement.inc:373
+msgid "Create new object group"
+msgstr "Erstelle neue Objektgruppe"
 
-#: plugins/admin/ogroups/class_ogroup.inc:205
-msgid "too many different objects!"
-msgstr "zu viele unterschiedliche Objekte!"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:400
+msgid "Name of object groups"
+msgstr "Name der Objektgruppe Gruppe"
 
-#: plugins/admin/ogroups/class_ogroup.inc:207
-msgid "users"
-msgstr "Benutzer"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:435
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
+msgstr "Objektgruppe"
 
-#: plugins/admin/ogroups/class_ogroup.inc:208
-msgid "groups"
-msgstr "Gruppen"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:477
+#: plugins/generic/references/class_reference.inc:36
+msgid "Group"
+msgstr "Gruppe"
 
-#: plugins/admin/ogroups/class_ogroup.inc:209
-msgid "applications"
-msgstr "Anwendungen"
+#: plugins/admin/ogroups/generic.tpl:9
+msgid "Name of the group"
+msgstr "Name der Gruppe"
 
-#: plugins/admin/ogroups/class_ogroup.inc:210
-msgid "departments"
-msgstr "Abteilungen"
+#: plugins/admin/ogroups/generic.tpl:32
+msgid "Member objects"
+msgstr "Zusammengefasste Objekte"
 
-#: plugins/admin/ogroups/class_ogroup.inc:211
-msgid "servers"
-msgstr "Server"
+#: plugins/admin/ogroups/remove.tpl:7
+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 Chance hat die Daten "
+"wiederherzustellen."
 
-#: plugins/admin/ogroups/class_ogroup.inc:212
-msgid "workstations"
-msgstr "Arbeitsstationen"
+#: plugins/admin/ogroups/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit or remove selected groups. You may want to "
+"use the range selector on top of the group listbox, when working with a "
+"large number of groups."
+msgstr ""
+"Dieses Menü erlaubt es Ihnen Gruppen hinzuzufügen, zu bearbeiten oder zu "
+"entfernen. Bei einer Vielzahl von Gruppen bietet sich die Verwendung der "
+"Bereichsauswahl an."
 
-#: plugins/admin/ogroups/class_ogroup.inc:213
-msgid "terminals"
-msgstr "Terminals"
+#: plugins/admin/ogroups/headpage.tpl:39
+msgid "Show groups containing users"
+msgstr "Zeige Gruppen mit Benutzern"
 
-#: plugins/admin/ogroups/class_ogroup.inc:214
-msgid "phones"
-msgstr "Telefone"
+#: plugins/admin/ogroups/headpage.tpl:40
+msgid "Show groups containing groups"
+msgstr "Zeige Gruppen mit Gruppen"
+
+#: plugins/admin/ogroups/headpage.tpl:41
+msgid "Show groups containing applications"
+msgstr "Zeige Gruppen mit Applikationen"
+
+#: plugins/admin/ogroups/headpage.tpl:42
+msgid "Show groups containing departments"
+msgstr "Zeige Gruppen mit Abteilungen"
+
+#: plugins/admin/ogroups/headpage.tpl:43
+msgid "Show groups containing servers"
+msgstr "Zeige Gruppen mit Servern"
+
+#: plugins/admin/ogroups/headpage.tpl:44
+msgid "Show groups containing workstations"
+msgstr "Zeige Gruppen mit Arbeitsstationen"
+
+#: plugins/admin/ogroups/headpage.tpl:45
+msgid "Show groups containing terminals"
+msgstr "Zeige Gruppen mit Terminals"
+
+#: plugins/admin/ogroups/headpage.tpl:46
+msgid "Show groups containing printers"
+msgstr "Zeige Gruppen mit Druckern"
+
+#: plugins/admin/ogroups/headpage.tpl:52
+msgid "Display object groups matching"
+msgstr "Zeige Objektgruppen auf die Folgendes passt"
+
+#: plugins/admin/ogroups/mail.tpl:7
+msgid "Mail distribution list"
+msgstr "Mail-Verteilerliste"
+
+#: plugins/admin/ogroups/mail.tpl:11
+msgid "Primary mail address for this distribution list"
+msgstr "Primäre Mail-Adresse der Verteilerliste"
+
+#: plugins/admin/ogroups/class_mailogroup.inc:38
+msgid ""
+"This group has mail features enabled. You can disable them by clicking below."
+msgstr ""
+"Diese Gruppe hat die Mail-Erweiterungen aktiviert. Sie können diese "
+"deaktivieren, indem Sie auf die Schaltfläche unten klicken."
+
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid ""
+"This group has mail features disabled. You can enable them by clicking below."
+msgstr ""
+"Diese Gruppe hat keine Mail-Erweiterungen. Sie können diese aktivieren, wenn "
+"Sie auf die untere Schaltfläche klicken."
+
+#: plugins/gofon/phoneaccount/main.inc:120
+msgid "Phone settings"
+msgstr "Telefon-Einstellungen"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:102
+msgid "no macro"
+msgstr "kein Makro"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:119
+msgid "undefined"
+msgstr "nicht definiert"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:868
+#: plugins/gofon/macro/class_gofonMacro.inc:181
+#, php-format
+msgid ""
+"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:223
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:879
+#: plugins/gofon/macro/class_gofonMacro.inc:192
+#, fuzzy, php-format
+msgid "Can't select database %s on %s."
+msgstr "Die angegebene Datenbank kann nicht ausgewählt werden."
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:432
+#, fuzzy
+msgid "Error while performing query "
+msgstr "Fehler"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:467
+msgid ""
+"The macro you selected in the past, is no longer available for you, please "
+"choose another one."
+msgstr ""
+"Das gewählte Makro ist nicht mehr verfügbar, bitte wählen Sie ein anderes."
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:538
+msgid "This account has no phone extensions."
+msgstr "Dieses Konto hat keine Telefon-Erweiterungen."
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:548
+msgid "Remove phone account"
+msgstr "Telefon-Konto entfernen"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:549
+msgid ""
+"This account has phone features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Dieses Konto hat die Telefon-Erweiterungen aktiviert. Sie können diese durch "
+"einen Klick auf die untere Schaltfläche deaktivieren."
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:551
+msgid "Create phone account"
+msgstr "Telefon-Konto erstellen"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:552
+msgid ""
+"This account has phone features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Dieses Konto hat keine gültigen Telefon-Erweiterungen. Sie können diese "
+"durch einen Klick auf die untere Schaltfläche aktivieren."
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:564
+msgid "Please enter a valid phone number!"
+msgstr "Bitte geben Sie eine gültige Telefonnummer ein"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:602
+msgid "Choose your private phone"
+msgstr "Wählen Sie Ihr privates Telefon"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:716
+#, php-format
+msgid "You need to specify at least one phone number!"
+msgstr "Bitte geben Sie mindestens eine Telefonnummer an!"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:723
+#, php-format
+msgid "The given PIN is not valid, only numbers are allowed for this type."
+msgstr ""
+"Die gewählte PIN ist ungültig, für diesen Typ dürfen lediglich Ziffern "
+"eingegeben werden."
 
-#: plugins/admin/ogroups/class_ogroup.inc:215
-msgid "printers"
-msgstr "Drucker"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:725
+#, php-format
+msgid "The given PIN is too short"
+msgstr "Der gewünschte PIN ist zu kurz"
 
-#: plugins/admin/ogroups/class_ogroup.inc:222
-msgid "and"
-msgstr "und"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:740
+#, php-format
+msgid "The number '%s' is no valid phone number!"
+msgstr "Die Nummer '%s' ist keine gültige Telefonnummer!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:369
-msgid "Non existing dn: "
-msgstr "Unbekannte dn: "
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:743
+#, php-format
+msgid "The timeout '%s' contains invalid characters!"
+msgstr "Das Zeitlimit '%s' enthält ungültige Zeichen!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:500
-msgid "Object groups need at least one member!"
-msgstr "Objektgruppen sollten mindestens ein Mitglied haben!"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:751
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:323
+#, php-format
+msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
+msgstr ""
+"Der Parameter '%s' enthält ungültige Zeichen. '!,#' wird als Feldtrenner "
+"verwendet"
 
-#: plugins/admin/ogroups/class_ogroup.inc:505
-msgid "You can combine two different object types at maximum only!"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:902
+msgid "Stop"
 msgstr ""
-"Sie können maximal zwei verschiedene Objekttypen miteinander kombinieren!"
 
-#: plugins/admin/ogroups/generic.tpl:9
-msgid "Name of the group"
-msgstr "Name der Gruppe"
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
+msgid "Phone numbers"
+msgstr "Telefonnummern"
 
-#: plugins/admin/ogroups/generic.tpl:32
-msgid "Member objects"
-msgstr "Zusammengefasste Objekte"
+#: plugins/gofon/phoneaccount/generic.tpl:38
+msgid "Forward calls to"
+msgstr "Anrufe weiterleiten an"
 
-#: plugins/admin/ogroups/class_mailogroup.inc:38
-msgid ""
-"This group has mail features enabled. You can disable them by clicking below."
-msgstr ""
-"Diese Gruppe hat die Mail-Erweiterungen aktiviert. Sie können diese "
-"deaktivieren, indem Sie auf die Schaltfläche unten klicken."
+#: plugins/gofon/phoneaccount/generic.tpl:40
+#: plugins/gofon/phoneaccount/generic.tpl:42
+msgid "Phone number"
+msgstr "Telefonnummer"
 
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid ""
-"This group has mail features disabled. You can enable them by clicking below."
-msgstr ""
-"Diese Gruppe hat keine Mail-Erweiterungen. Sie können diese aktivieren, wenn "
-"Sie auf die untere Schaltfläche klicken."
+#: plugins/gofon/phoneaccount/generic.tpl:42
+msgid "Timeout (s)"
+msgstr "Zeitlimit (s)"
 
-#: plugins/admin/ogroups/remove.tpl:7
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"GOsa to get your data back."
+#: plugins/gofon/phoneaccount/generic.tpl:57
+#: plugins/gofon/phoneaccount/generic.tpl:59
+msgid "Phone macro"
+msgstr "Telefon-Makro"
+
+#: plugins/gofon/phoneaccount/generic.tpl:75
+msgid "Phone PIN"
+msgstr "Telefon PIN"
+
+#: plugins/gofon/reports/class_fonreport.inc:6
+msgid "Phone Reports"
+msgstr "Telefon-Berichte"
+
+#: plugins/gofon/reports/class_fonreport.inc:141
+msgid "Can't connect to phone database, no reports can be shown!"
 msgstr ""
-"Bitte überprüfen Sie genau was Sie tun, weil GOsa keine Chance hat die Daten "
-"wiederherzustellen."
+"Die Telefon-Datenbank kann nicht erreicht werden. Es können keine Berichte "
+"angezeigt werden!"
 
-#: plugins/admin/ogroups/headpage.tpl:30
-msgid ""
-"This menu allows you to add, edit or remove selected groups. You may want to "
-"use the range selector on top of the group listbox, when working with a "
-"large number of groups."
+#: plugins/gofon/reports/class_fonreport.inc:145
+msgid "Can't select phone database for report generation!"
 msgstr ""
-"Dieses Menü erlaubt es Ihnen Gruppen hinzuzufügen, zu bearbeiten oder zu "
-"entfernen. Bei einer Vielzahl von Gruppen bietet sich die Verwendung der "
-"Bereichsauswahl an."
+"Die Telefon-Datenbank kann bezüglich der Berichterstellung nicht ausgewählt "
+"werden!"
 
-#: plugins/admin/ogroups/headpage.tpl:48
-msgid "Show groups containing users"
-msgstr "Zeige Gruppen mit Benutzern"
+#: plugins/gofon/reports/class_fonreport.inc:154
+msgid "Query for phone database failed!"
+msgstr "Die Anfrage zur Telefon-Datenbank ist fehlgeschlagen!"
 
-#: plugins/admin/ogroups/headpage.tpl:49
-msgid "Show groups containing groups"
-msgstr "Zeige Gruppen mit Gruppen"
+#: plugins/gofon/reports/contents.tpl:31
+msgid "Source"
+msgstr "Quelle"
 
-#: plugins/admin/ogroups/headpage.tpl:50
-msgid "Show groups containing applications"
-msgstr "Zeige Gruppen mit Applikationen"
+#: plugins/gofon/reports/contents.tpl:32
+msgid "Destination"
+msgstr "Ziel"
 
-#: plugins/admin/ogroups/headpage.tpl:51
-msgid "Show groups containing departments"
-msgstr "Zeige Gruppen mit Abteilungen"
+#: plugins/gofon/reports/contents.tpl:33
+msgid "Channel"
+msgstr "Kanal"
 
-#: plugins/admin/ogroups/headpage.tpl:52
-msgid "Show groups containing servers"
-msgstr "Zeige Gruppen mit Servern"
+#: plugins/gofon/reports/contents.tpl:36
+msgid "Duration"
+msgstr "Dauer"
 
-#: plugins/admin/ogroups/headpage.tpl:53
-msgid "Show groups containing workstations"
-msgstr "Zeige Gruppen mit Arbeitsstationen"
+#: plugins/gofon/reports/main.inc:5
+msgid "Phone reports"
+msgstr "Telefon-Berichte"
 
-#: plugins/admin/ogroups/headpage.tpl:54
-msgid "Show groups containing terminals"
-msgstr "Zeige Gruppen mit Terminals"
+#: plugins/gofon/macro/class_gofonMacro.inc:91
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:185
+msgid "This 'dn' is no phone macro."
+msgstr "Diese 'dn' ist kein Telefon-Makro."
 
-#: plugins/admin/ogroups/headpage.tpl:55
-msgid "Show groups containing printers"
-msgstr "Zeige Gruppen mit Druckern"
+#: plugins/gofon/macro/class_gofonMacro.inc:147
+msgid ""
+"This macro ist still in use. To delete this Macro ensure that nobody has "
+"selected this Macro."
+msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
-msgid "Phone macros"
-msgstr "Telefon-Makros"
+#: plugins/gofon/macro/class_gofonMacro.inc:232
+#, php-format
+msgid "Unable to parse macro contents on line: %s"
+msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:186
+#: plugins/gofon/macro/class_gofonMacro.inc:250
 #, php-format
-msgid "You're about to delete the macro '%s'."
-msgstr "Sie sind dabei das Makro '%s' zu löschen."
+msgid "Can't perform SELECT query in DB '%s'"
+msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:192
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:217
-msgid "You are not allowed to delete this macro!"
-msgstr "Es ist Ihnen nicht erlaubt dieses Makro zu löschen!"
+#: plugins/gofon/macro/class_gofonMacro.inc:259
+#: plugins/gofon/macro/class_gofonMacro.inc:267
+#, php-format
+msgid "Can't perform DELETE query in DB '%s'"
+msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:80
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:182
-msgid "This 'dn' is no phone macro."
-msgstr "Diese 'dn' ist kein Telefon-Makro."
+#: plugins/gofon/macro/class_gofonMacro.inc:281
+#, php-format
+msgid "Can't perform INSERT query in DB '%s'"
+msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:161
+#: plugins/gofon/macro/class_gofonMacro.inc:323
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr "Die Kennung '%s' exisitiert bereits."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:166
+#: plugins/gofon/macro/class_gofonMacro.inc:328
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr ""
 "Das Feld 'Angezeigter Name' darf nicht leer sein, um das Makro zu speichern"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:171
+#: plugins/gofon/macro/class_gofonMacro.inc:332
+msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:337
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 "Zugriffsrechte nicht ausreichend, kann Attribut '%s' in goFonMacro nicht "
 "ändern"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:180
+#: plugins/gofon/macro/class_gofonMacro.inc:343
 msgid "Makro length must be lower than 100 lines"
 msgstr "Das Makro darf nicht länger als 100 Zeilen sein"
 
+#: plugins/gofon/macro/class_gofonMacro.inc:348
+msgid "Please choose a valid  base."
+msgstr "Bitte wählen Sie eine gültige Basis."
+
 #: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
 msgid "Macro name"
 msgstr "Makro-Name"
@@ -5784,259 +6335,110 @@ msgstr "Sichtbar f
 msgid "Macro text"
 msgstr "Makro-Inhalt"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:230
-msgid "String"
-msgstr "Zeichenkette"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:231
-msgid "Combobox"
-msgstr "Auswahl-Liste"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:232
-msgid "Bool"
-msgstr "Schalter"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:238
-msgid "Delete unused"
-msgstr "Entferne"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:312
-#, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
-msgstr ""
-"Zugriffsrechte nicht ausreichend, kann Attribut '%s' in goFonMacro nicht "
-"ändern."
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:320
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:489
-#, php-format
-msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
-msgstr ""
-"Der Parameter '%s' enthält ungültige Zeichen. '!,#' wird als Feldtrenner "
-"verwendet"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:325
-#, php-format
-msgid "The parameter %s has incorrect value for type bool."
-msgstr "Der Parameter %s besitzt einen ungültigen Wert für Datentyp bool."
-
 #: plugins/gofon/macro/headpage.tpl:6
 msgid "List of macros"
 msgstr "Liste der Makros"
 
-#: plugins/gofon/macro/headpage.tpl:29
+#: plugins/gofon/macro/headpage.tpl:24
 msgid ""
 "This menu allows you to add, edit and remove selected macros. You may want "
 "to use the range selector on top of the macro listbox, when working with a "
 "large number of macros."
 msgstr ""
-"Dieses Menü erlaubt es Ihnen Makros hinzuzufügen, zu bearbeiten oder zu "
-"entfernen. Bei einer Vielzahl von Makros bietet sich die Verwendung der "
-"Bereichsauswahl an."
-
-#: plugins/gofon/macro/headpage.tpl:32
-msgid ""
-"-Edit- and -New...- will execute an assistant to aid you in editing "
-"properties. -Delete- will ask for confirmation before removing macros."
-msgstr ""
-"-Bearbeiten- und -Neu...- rufen einen Assistenten auf, der Ihnen bei der "
-"Bearbeitung der Eigenschaften hilft. -Löschen- führt eine Sicherheitsabfrage "
-"durch bevor das Makro gelöscht wird."
-
-#: plugins/gofon/macro/headpage.tpl:46
-msgid "Display macros of department"
-msgstr "Zeige Makros der Abteilung"
-
-#: plugins/gofon/macro/headpage.tpl:59
-msgid "Display macros  matching"
-msgstr "Zeige Makros, auf die zutrifft"
-
-#: plugins/gofon/macro/headpage.tpl:62
-msgid "Regular expression for matching macro names"
-msgstr "Regulärer Ausdruck zum Suchen in Makro-Namen"
-
-#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
-msgid "Phone macro management"
-msgstr "Telefon-Makro-Verwaltung"
-
-#: plugins/gofon/macro/parameter.tpl:3
-msgid "Argument"
-msgstr "Argument"
-
-#: plugins/gofon/macro/parameter.tpl:7
-msgid "type"
-msgstr "Typ"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:100
-msgid "no macro"
-msgstr "kein Makro"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:117
-msgid "undefined"
-msgstr "nicht definiert"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:209
-msgid ""
-"The macro you selected in the past, is no longer available for you, please "
-"choose another one."
-msgstr ""
-"Das gewählte Makro ist nicht mehr verfügbar, bitte wählen Sie ein anderes."
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:280
-msgid "This account has no phone extensions."
-msgstr "Dieses Konto hat keine Telefon-Erweiterungen."
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:290
-msgid "Remove phone account"
-msgstr "Telefon-Konto entfernen"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:291
-msgid ""
-"This account has phone features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Dieses Konto hat die Telefon-Erweiterungen aktiviert. Sie können diese durch "
-"einen Klick auf die untere Schaltfläche deaktivieren."
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:293
-msgid "Create phone account"
-msgstr "Telefon-Konto erstellen"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:294
-msgid ""
-"This account has phone features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Dieses Konto hat keine gültigen Telefon-Erweiterungen. Sie können diese "
-"durch einen Klick auf die untere Schaltfläche aktivieren."
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
-msgid "Please enter a valid phone number!"
-msgstr "Bitte geben Sie eine gültige Telefonnummer ein"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:344
-msgid "Choose your private phone"
-msgstr "Wählen Sie Ihr privates Telefon"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:454
-#, php-format
-msgid "You need to specify at least one phone number!"
-msgstr "Bitte geben Sie mindestens eine Telefonnummer an!"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:461
-#, php-format
-msgid "The given PIN is not valid, only numbers are allowed for this type."
-msgstr ""
-"Die gewählte PIN ist ungültig, für diesen Typ dürfen lediglich Ziffern "
-"eingegeben werden."
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:463
-#, php-format
-msgid "The given PIN is too short"
-msgstr "Der gewünschte PIN ist zu kurz"
+"Dieses Menü erlaubt es Ihnen Makros hinzuzufügen, zu bearbeiten oder zu "
+"entfernen. Bei einer Vielzahl von Makros bietet sich die Verwendung der "
+"Bereichsauswahl an."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:478
-#, php-format
-msgid "The number '%s' is no valid phone number!"
-msgstr "Die Nummer '%s' ist keine gültige Telefonnummer!"
+#: plugins/gofon/macro/headpage.tpl:38 plugins/gofon/macro/headpage.tpl:41
+msgid "Display macros  matching"
+msgstr "Zeige Makros, auf die zutrifft"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:481
-#, php-format
-msgid "The timeout '%s' contains invalid characters!"
-msgstr "Das Zeitlimit '%s' enthält ungültige Zeichen!"
+#: plugins/gofon/macro/headpage.tpl:44
+msgid "Regular expression for matching macro names"
+msgstr "Regulärer Ausdruck zum Suchen in Makro-Namen"
 
-#: plugins/gofon/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
-msgid "Phone numbers"
-msgstr "Telefonnummern"
+#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
+msgid "Phone macro management"
+msgstr "Telefon-Makro-Verwaltung"
 
-#: plugins/gofon/phoneaccount/generic.tpl:38
-msgid "Forward calls to"
-msgstr "Anrufe weiterleiten an"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:233
+msgid "String"
+msgstr "Zeichenkette"
 
-#: plugins/gofon/phoneaccount/generic.tpl:40
-#: plugins/gofon/phoneaccount/generic.tpl:42
-msgid "Phone number"
-msgstr "Telefonnummer"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:234
+msgid "Combobox"
+msgstr "Auswahl-Liste"
 
-#: plugins/gofon/phoneaccount/generic.tpl:42
-msgid "Timeout (s)"
-msgstr "Zeitlimit (s)"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:235
+msgid "Bool"
+msgstr "Schalter"
 
-#: plugins/gofon/phoneaccount/generic.tpl:57
-#: plugins/gofon/phoneaccount/generic.tpl:59
-msgid "Phone macro"
-msgstr "Telefon-Makro"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
+msgid "Delete unused"
+msgstr "Entferne"
 
-#: plugins/gofon/phoneaccount/generic.tpl:75
-msgid "Phone PIN"
-msgstr "Telefon PIN"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:315
+#, php-format
+msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
+msgstr ""
+"Zugriffsrechte nicht ausreichend, kann Attribut '%s' in goFonMacro nicht "
+"ändern."
 
-#: plugins/gofon/phoneaccount/main.inc:120
-msgid "Phone settings"
-msgstr "Telefon-Einstellungen"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:328
+#, php-format
+msgid "The parameter %s has incorrect value for type bool."
+msgstr "Der Parameter %s besitzt einen ungültigen Wert für Datentyp bool."
 
-#: plugins/gofon/reports/class_fonreport.inc:6
-msgid "Phone Reports"
-msgstr "Telefon-Berichte"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+msgid "Phone macros"
+msgstr "Telefon-Makros"
 
-#: plugins/gofon/reports/class_fonreport.inc:141
-msgid "Can't connect to phone database, no reports can be shown!"
-msgstr ""
-"Die Telefon-Datenbank kann nicht erreicht werden. Es können keine Berichte "
-"angezeigt werden!"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
+#, php-format
+msgid "You're about to delete the macro '%s'."
+msgstr "Sie sind dabei das Makro '%s' zu löschen."
 
-#: plugins/gofon/reports/class_fonreport.inc:145
-msgid "Can't select phone database for report generation!"
-msgstr ""
-"Die Telefon-Datenbank kann bezüglich der Berichterstellung nicht ausgewählt "
-"werden!"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
+msgid "You are not allowed to delete this macro!"
+msgstr "Es ist Ihnen nicht erlaubt dieses Makro zu löschen!"
 
-#: plugins/gofon/reports/class_fonreport.inc:154
-msgid "Query for phone database failed!"
-msgstr "Die Anfrage zur Telefon-Datenbank ist fehlgeschlagen!"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+msgid "Create new phone macro"
+msgstr "Neues Telefon-Makro erstellen"
 
-#: plugins/gofon/reports/contents.tpl:31
-msgid "Source"
-msgstr "Quelle"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+msgid "Visible"
+msgstr "Sichtbar"
 
-#: plugins/gofon/reports/contents.tpl:32
-msgid "Destination"
-msgstr "Ziel"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+msgid "This table displays all phone macros, in the selected tree."
+msgstr "Diese Tabelle enthält alle Telefon-Markos des gewählten Unterbaumes."
 
-#: plugins/gofon/reports/contents.tpl:33
-msgid "Channel"
-msgstr "Kanal"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:365
+msgid "Macro"
+msgstr "Makro"
 
-#: plugins/gofon/reports/contents.tpl:34
-#: plugins/generic/references/class_reference.inc:42
-msgid "Application"
-msgstr "Anwendung"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:366
+msgid "visible"
+msgstr "sichtbar"
 
-#: plugins/gofon/reports/contents.tpl:36
-msgid "Duration"
-msgstr "Dauer"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:367
+msgid "invisible"
+msgstr "unsichtbar"
 
-#: plugins/gofon/reports/main.inc:5
-msgid "Phone reports"
-msgstr "Telefon-Berichte"
+#: plugins/gofon/macro/parameter.tpl:3
+msgid "Argument"
+msgstr "Argument"
 
-#: plugins/generic/references/class_reference.inc:36
-msgid "Group"
-msgstr "Gruppe"
+#: plugins/gofon/macro/parameter.tpl:7
+msgid "type"
+msgstr "Typ"
 
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
 msgstr "Thin Client"
 
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
-msgstr "Arbeitsstation"
-
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
-msgstr "Objektgruppe"
-
 #: plugins/generic/references/contents.tpl:11
 msgid "Object name"
 msgstr "Objektname"
@@ -6076,36 +6478,6 @@ msgstr "Das GOsa Team"
 msgid "Welcome %s!"
 msgstr "Willkommen %s!"
 
-#: include/class_certificate.inc:35
-msgid "Can't open specified file, check accessibility and or existence"
-msgstr ""
-"Kann angegebene Datei nicht öffnen, prüfen Sie die Existenz und/oder "
-"Zugriffsrechte"
-
-#: include/class_certificate.inc:53
-msgid "Can't read specified certificate / or empty string given"
-msgstr ""
-"Kann angegebenes Zertifikat nicht lesen (oder es wurde eine leere "
-"Zeichenkette übergeben)"
-
-#: include/class_certificate.inc:80
-msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
-msgstr ""
-"Kann Zertifikat nicht laden, wahrscheinlich aufgrund eines nicht "
-"unterstützten Formats (benutzen Sie PEM/DER)"
-
-#: include/class_certificate.inc:95
-msgid "The Format must be PEM, to output certificate informations"
-msgstr "Um Zertifikatsinformationen anzuzeigen muss das Format PEM sein"
-
-#: include/class_certificate.inc:192
-msgid "Can't create/open File"
-msgstr "Kann Datei nicht anlegen/öffnen"
-
-#: include/class_certificate.inc:199
-msgid "No valid certificate loaded"
-msgstr "Kein gültiges Zertifikat geladen"
-
 #: include/php_setup.inc:71
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
@@ -6162,18 +6534,18 @@ msgstr "Fehler beim Verbinden mit dem LDAP-Server. Die Meldung lautet '%s'."
 msgid "User login failed. LDAP server said '%s'."
 msgstr "Anmeldung des Nutzers ist fehlgeschlagen. Die Meldung war '%s'."
 
-#: include/functions.inc:313
+#: include/functions.inc:312
 msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr "Die Kennung ist nicht eindeutig. Bitte prüfen Sie die LDAP-Datenbank."
 
-#: include/functions.inc:351
+#: include/functions.inc:350
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
 msgstr ""
 "Fehler beim Anlegen eines Locks. Die Parameter sind nicht korrekt gesetzt!"
 
-#: include/functions.inc:361
+#: include/functions.inc:360
 #, php-format
 msgid ""
 "Can't set locking information in LDAP database. Please check the 'config' "
@@ -6183,20 +6555,20 @@ msgstr ""
 "überprüfen Sie den \"Config\" Eintrag in der Datei gosa.conf! Der LDAP-"
 "Server meldete '%s'."
 
-#: include/functions.inc:376
+#: include/functions.inc:375
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
 msgstr ""
 "Kann keinen Zugriffsschutz anlegen. Die Meldung des LDAP-Servers war '%s'."
 
-#: include/functions.inc:402
+#: include/functions.inc:401
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
 msgstr ""
 "Kann den Zugriffsschutz nicht entfernen. Die Meldung des LDAP-Servers war '%"
 "s'."
 
-#: include/functions.inc:432
+#: include/functions.inc:431
 msgid ""
 "Getting the lock from LDAP failed. Parameters are not set correctly, please "
 "check the source!"
@@ -6204,7 +6576,7 @@ msgstr ""
 "Es kann nicht geprüft werden, ob das Objekt gesperrt ist. Die Parameter sind "
 "nicht korrekt!"
 
-#: include/functions.inc:442
+#: include/functions.inc:441
 msgid ""
 "Can't get locking information in LDAP database. Please check the 'config' "
 "entry in gosa.conf!"
@@ -6212,7 +6584,7 @@ msgstr ""
 "Die Information über den Zugriffsschutz kann nicht aus der LDAP-Datenbank "
 "gelesen werden. Bitte prüfen Sie den \"Config\"-Eintrag in der gosa.conf!"
 
-#: include/functions.inc:450
+#: include/functions.inc:449
 msgid ""
 "Found multiple locks for object to be locked. This should not be possible - "
 "cleaning up multiple references."
@@ -6220,12 +6592,12 @@ msgstr ""
 "Mehrere Sperrungen für ein Objekt gefunden. Dies sollte nicht möglich sein, "
 "bitte entfernen Sie mehrfache Referenzen."
 
-#: include/functions.inc:522
+#: include/functions.inc:563
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Die Größenbeschränkung von %d Einträgen ist überschritten!"
 
-#: include/functions.inc:524
+#: include/functions.inc:565
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -6234,15 +6606,15 @@ msgstr ""
 "Verwende eine neue Größenbeschränkung von %s Einträgen und zeige diese "
 "Meldung bei Überschreitung wieder an"
 
-#: include/functions.inc:536
+#: include/functions.inc:577
 msgid "Configure"
 msgstr "Einstellen"
 
-#: include/functions.inc:541
+#: include/functions.inc:582
 msgid "incomplete"
 msgstr "unvollständig"
 
-#: include/functions.inc:924
+#: include/functions.inc:981
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
@@ -6252,15 +6624,15 @@ msgstr ""
 "gerade von '%s' benutzt. Bitte kontaktieren Sie diese Person, um das weitere "
 "Vorgehen abzuklären."
 
-#: include/functions.inc:1023
+#: include/functions.inc:1080
 msgid "LDAP error:"
 msgstr "LDAP-Fehler:"
 
-#: include/functions.inc:1469
+#: include/functions.inc:1534
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1512
+#: include/functions.inc:1577
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "GOsa Entwicklerversion (Rev %s)"
@@ -6331,6 +6703,24 @@ msgstr "Kann das SIEVE-Skript nicht 
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr "Kann das GOsa SIEVE-Skript nicht aktivieren. Die Meldung war '%s'."
 
+#: include/class_pluglist.inc:98
+msgid ""
+"Your gosa.conf information has changed partly. Please convert it using the "
+"contributed script fix_config.sh!"
+msgstr ""
+"Die Konfigurationsdatei gosa.conf hat sich teilweise geändert. Bitte "
+"konvertieren Sie diese mit dem beigefügten Skript fix_config.sh!"
+
+#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:14
+#: ihtml/themes/altlinux/framework.tpl:24
+#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
+msgid ""
+"You are currently editing a database entry. Do you want to dismiss the "
+"changes?"
+msgstr ""
+"Sie bearbeiten gerade einen Datenbankeintrag. Sollen die Daten verworfen "
+"werden?"
+
 #: include/class_plugin.inc:180
 msgid "This 'dn' has no account extensions."
 msgstr "Diese 'dn' hat keine Nutzerkonten Erweiterungen."
@@ -6339,7 +6729,7 @@ msgstr "Diese 'dn' hat keine Nutzerkonten Erweiterungen."
 msgid "This is an empty plugin."
 msgstr "Dies ist ein leeres Modul."
 
-#: include/class_plugin.inc:386
+#: include/class_plugin.inc:396
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
@@ -6347,7 +6737,7 @@ msgstr ""
 "Das in POSTCREATE angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/class_plugin.inc:412 include/class_password-methods.inc:178
+#: include/class_plugin.inc:422 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -6355,7 +6745,7 @@ msgstr ""
 "Das in POSTMODIFY angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/class_plugin.inc:438
+#: include/class_plugin.inc:448
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -6363,41 +6753,129 @@ msgstr ""
 "Das in POSTREMOVE angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
+#: include/class_config.inc:69
+#, php-format
+msgid "XML error in gosa.conf: %s at line %d"
+msgstr "XML-Fehler in der Datei gosa.conf: %s in Zeile %d"
+
+#: include/class_config.inc:195 html/index.php:140
+msgid "Can't bind to LDAP. Please contact the system administrator."
+msgstr ""
+"Kann den LDAP-Server nicht erreichen. Bitte benachrichtigen Sie den "
+"Administrator."
+
+#: include/class_config.inc:431
+msgid "SID and/or RIDBASE missing in your configuration!"
+msgstr "SID und/oder RIDBASE fehlen in der Konfiguration!"
+
 #: include/class_password-methods-ssha.inc:51
 msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr "Kann SSHA nicht benutzen (Fehlende Funktion mhash / sha1)"
 
-#: include/class_password-methods.inc:162
+#: include/class_password-methods.inc:165
 #, php-format
 msgid "Setting the password failed. LDAP server says '%s'."
 msgstr ""
 "Das Setzen des Passwortes ist fehlgeschlagen. Die Meldung vom LDAP-Server "
 "war '%s'."
 
-#: include/class_password-methods.inc:199
-msgid ""
-"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
-msgstr ""
-"Die Einstellung 'SMBHASH' in /etc/gosa/gosa.conf ist nicht korrekt! Das "
-"Samba-Passwort kann nicht geändert werden."
+#: include/class_password-methods.inc:202
+msgid ""
+"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
+msgstr ""
+"Die Einstellung 'SMBHASH' in /etc/gosa/gosa.conf ist nicht korrekt! Das "
+"Samba-Passwort kann nicht geändert werden."
+
+#: include/class_password-methods-kerberos.inc:43
+msgid ""
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
+msgstr ""
+"Achtung: Das Kerberos-Passwort kann nicht gesetzt werden. Die von Ihnen "
+"verwendete PHP-Version hat keine Unterstützung für Kerberos."
+
+#: include/class_password-methods-kerberos.inc:52
+msgid "Kerberos database communication failed!"
+msgstr "Die Kommunikation mit der Kerberos-Datenbank ist fehlgeschlagen!"
+
+#: include/class_password-methods-kerberos.inc:59
+msgid "Changing password in kerberos database failed!"
+msgstr ""
+"Die Änderung des Passworts in der Kerberos-Datenbank ist fehlgeschlagen!"
+
+#: include/class_password-methods-sha.inc:50
+msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+msgstr "Kann SHA nicht benutzen (fehlende Funktion mhash / sha1 / crypt)"
+
+#: include/class_ldap.inc:438
+#, php-format
+msgid ""
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
+msgstr ""
+"Das automatische Erzeugen des Objekt-Typs '%s' wird momentan nicht "
+"unterstützt. Bitte melden Sie dies an das Entwicklerteam."
+
+#: include/class_ldap.inc:671
+#, php-format
+msgid ""
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
+msgstr ""
+"Dies ist keine valide DN: '%s'.  Ein Block für den Import sollte mit "
+"'dn:...' beginnen in Zeile %s"
+
+#: include/class_ldap.inc:684
+#, php-format
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr "Der DN: '%s' (aus Zeile %s) existiert bereits in der LDAP-Datenbank."
+
+#: include/class_ldap.inc:700
+#, php-format
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+"Fehler beim Importieren von dn: '%s', bitte überprüfen Sie die LDIF-Datei ab "
+"Zeile %s!"
+
+#: include/class_certificate.inc:35
+msgid "Can't open specified file, check accessibility and or existence"
+msgstr ""
+"Kann angegebene Datei nicht öffnen, prüfen Sie die Existenz und/oder "
+"Zugriffsrechte"
+
+#: include/class_certificate.inc:53
+msgid "Can't read specified certificate / or empty string given"
+msgstr ""
+"Kann angegebenes Zertifikat nicht lesen (oder es wurde eine leere "
+"Zeichenkette übergeben)"
+
+#: include/class_certificate.inc:80
+msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
+msgstr ""
+"Kann Zertifikat nicht laden, wahrscheinlich aufgrund eines nicht "
+"unterstützten Formats (benutzen Sie PEM/DER)"
+
+#: include/class_certificate.inc:95
+msgid "The Format must be PEM, to output certificate informations"
+msgstr "Um Zertifikatsinformationen anzuzeigen muss das Format PEM sein"
+
+#: include/class_certificate.inc:192
+msgid "Can't create/open File"
+msgstr "Kann Datei nicht anlegen/öffnen"
+
+#: include/class_certificate.inc:199
+msgid "No valid certificate loaded"
+msgstr "Kein gültiges Zertifikat geladen"
 
-#: include/class_pluglist.inc:98
-msgid ""
-"Your gosa.conf information has changed partly. Please convert it using the "
-"contributed script fix_config.sh!"
-msgstr ""
-"Die Konfigurationsdatei gosa.conf hat sich teilweise geändert. Bitte "
-"konvertieren Sie diese mit dem beigefügten Skript fix_config.sh!"
+#: include/functions_helpviewer.inc:260
+#, php-format
+msgid "%s results for your search with the keyword %s interpreted as %s"
+msgstr "%s Ergebnisse für Ihre Suche nach %s (effektiv gesucht nach: %s)"
 
-#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:14
-#: ihtml/themes/altlinux/framework.tpl:24
-#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
-msgid ""
-"You are currently editing a database entry. Do you want to dismiss the "
-"changes?"
-msgstr ""
-"Sie bearbeiten gerade einen Datenbankeintrag. Sollen die Daten verworfen "
-"werden?"
+#: include/functions_helpviewer.inc:335
+#, php-format
+msgid "%s%% hit rate in file %s"
+msgstr "%s%% Trefferquote in Datei %s"
 
 #: include/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
@@ -6500,7 +6978,7 @@ msgstr ""
 msgid "Support for gofon enabled"
 msgstr "Unterstützung für GOfon aktiviert"
 
-#: include/functions_setup.inc:233
+#: include/functions_setup.inc:236
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
@@ -6508,31 +6986,31 @@ msgstr ""
 "Die Unterstützung für Kolab wurde deaktiviert, das passende Schema ist nicht "
 "installiert. Setze Mail Methode auf cyrus."
 
-#: include/functions_setup.inc:241
+#: include/functions_setup.inc:243
 msgid "Support for Kolab enabled"
 msgstr "Unterstützung für Kolab aktiviert"
 
-#: include/functions_setup.inc:258
+#: include/functions_setup.inc:261
 msgid "OK"
 msgstr "OK"
 
-#: include/functions_setup.inc:261
+#: include/functions_setup.inc:264
 msgid "Ignored"
 msgstr "Ignoriert"
 
-#: include/functions_setup.inc:263
+#: include/functions_setup.inc:266
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: include/functions_setup.inc:280
+#: include/functions_setup.inc:283
 msgid "PHP setup inspection"
 msgstr "Überprüfung des PHP-Setups"
 
-#: include/functions_setup.inc:281
+#: include/functions_setup.inc:284
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr "Prüfe auf eine PHP-Version (>=4.1.0)"
 
-#: include/functions_setup.inc:282
+#: include/functions_setup.inc:285
 msgid ""
 "PHP must be of version 4.1.0 or above for some functions and known bugs in "
 "PHP language."
@@ -6541,11 +7019,11 @@ msgstr ""
 "Funktionen, die in früheren Versionen fehlerhaft oder gar nicht "
 "implementiert waren."
 
-#: include/functions_setup.inc:285
+#: include/functions_setup.inc:288
 msgid "Checking if register_globals is set to 'off'"
 msgstr "Prüfe ob register_globals ausgeschaltet ist"
 
-#: include/functions_setup.inc:286
+#: include/functions_setup.inc:289
 msgid ""
 "register_globals is a PHP mechanism to register all global varibales to be "
 "accessible from scripts without changing the scope. This may be a security "
@@ -6555,40 +7033,40 @@ msgstr ""
 "für Skripte direkt zugänglich macht. Dies kann ein Sicherheitsrisiko sein. "
 "GOsa funktioniert mit beiden möglichen Einstellungen."
 
-#: include/functions_setup.inc:289
+#: include/functions_setup.inc:292
 msgid "Checking for ldap module"
 msgstr "Suche LDAP-Modul"
 
-#: include/functions_setup.inc:290
+#: include/functions_setup.inc:293
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr ""
 "GOsa benötigt dieses Modul für LDAP-Zugriffe, daher ist es unabkömmlich."
 
-#: include/functions_setup.inc:293
+#: include/functions_setup.inc:296
 msgid "Checking for XML functions"
 msgstr "Prüfe auf XML-Funktionen"
 
-#: include/functions_setup.inc:294
+#: include/functions_setup.inc:297
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 "Die XML-Funktionen werden benötigt, um die Konfigurationsdatei zu lesen."
 
-#: include/functions_setup.inc:297
+#: include/functions_setup.inc:300
 msgid "Checking for gettext support"
 msgstr "Prüfe auf gettext-Erweiterung"
 
-#: include/functions_setup.inc:298
+#: include/functions_setup.inc:301
 msgid "Gettext support is required for internationalized GOsa."
 msgstr ""
 "Gettext-Unterstützung wird für Übersetzungen benötigt (Anmerkung des "
 "Übersetzers: Da Sie diese Meldung in deutsch lesen können, ist davon "
 "auszugehen, daß ihr PHP gettext-fähig ist)."
 
-#: include/functions_setup.inc:300
+#: include/functions_setup.inc:303
 msgid "Checking for iconv support"
 msgstr "Prüfe auf iconv-Erweiterung"
 
-#: include/functions_setup.inc:301
+#: include/functions_setup.inc:304
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
@@ -6596,11 +7074,11 @@ msgstr ""
 "Dieses Modul wird von GOsa benutzt, um Informationen der samba-Erweiterung "
 "zu verarbeiten und wird daher benötigt."
 
-#: include/functions_setup.inc:304
+#: include/functions_setup.inc:307
 msgid "Checking for mhash module"
 msgstr "Suche mhash-Modul"
 
-#: include/functions_setup.inc:305
+#: include/functions_setup.inc:308
 msgid ""
 "To use SSHA encryption, you'll need this module. If you are just using crypt "
 "or md5 encryption, ignore this message. GOsa will run without it."
@@ -6608,11 +7086,11 @@ msgstr ""
 "Bei der Verwendung von speziellen Passwort-Verschlüsselungen (wie z.B. SSHA) "
 "wird dieses Modul benötigt. GOsa funktioniert auch ohne dieses Modul."
 
-#: include/functions_setup.inc:308
+#: include/functions_setup.inc:311
 msgid "Checking for imap module"
 msgstr "Suche IMAP-Modul"
 
-#: include/functions_setup.inc:309
+#: include/functions_setup.inc:312
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
@@ -6620,11 +7098,11 @@ msgstr ""
 "Das IMAP-Modul wird für die Kommunikation mit ihrem IMAP-Server benötigt. "
 "Dort können Benutzer verwaltet und Statusinformationen bezogen werden."
 
-#: include/functions_setup.inc:312
+#: include/functions_setup.inc:315
 msgid "Checking for getacl in imap"
 msgstr "Prüfe auf getacl im IMAP-Modul"
 
-#: include/functions_setup.inc:313
+#: include/functions_setup.inc:316
 msgid ""
 "The getacl support is needed for shared folder permissions. The standard "
 "IMAP module is not capable of reading acl's. You need a recend PHP version "
@@ -6635,20 +7113,20 @@ msgstr ""
 "Zugriffsregeln nicht. Sie benötigen entweder ein angepasstes oder ein recht "
 "aktuelles PHP um diese Funktion nutzen zu können."
 
-#: include/functions_setup.inc:316
+#: include/functions_setup.inc:319
 msgid "Checking for mysql module"
 msgstr "Suche MySQL-Modul"
 
-#: include/functions_setup.inc:317
+#: include/functions_setup.inc:320
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 "Das MySQL-Modul wird benötigt um FAX-Berichte anzuzeigen und auszuwerten."
 
-#: include/functions_setup.inc:320
+#: include/functions_setup.inc:323
 msgid "Checking for cups module"
 msgstr "Suche CUPS-Modul"
 
-#: include/functions_setup.inc:321
+#: include/functions_setup.inc:324
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
@@ -6656,11 +7134,11 @@ msgstr ""
 "Falls Sie eine Liste der verfügbaren Drucker über IPP auslesen möchten, "
 "benötigen Sie dieses Modul. Anderenfalls wird die printcap-Datei ausgewertet."
 
-#: include/functions_setup.inc:324
+#: include/functions_setup.inc:327
 msgid "Checking for kadm5 module"
 msgstr "Suche kadm5-Modul"
 
-#: include/functions_setup.inc:325
+#: include/functions_setup.inc:328
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
@@ -6668,48 +7146,48 @@ msgstr ""
 "Um Benutzer auch im Kerberos verwalten zu können, muß das kadm5-Modul "
 "installiert sein. Sie können es über das PEAR-Netzwerk beziehen."
 
-#: include/functions_setup.inc:328
+#: include/functions_setup.inc:331
 msgid "Checking for snmp Module"
 msgstr "Suche SNMP-Modul"
 
-#: include/functions_setup.inc:329
+#: include/functions_setup.inc:332
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 "Simple Network Management Protocol (SNMP) wird zur Client-Überwachung "
 "benötigt."
 
-#: include/functions_setup.inc:338
+#: include/functions_setup.inc:342
 msgid "Checking for some additional programms"
 msgstr "Suche einige zusätzliche Programme"
 
-#: include/functions_setup.inc:347
+#: include/functions_setup.inc:351
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr "Suche nach ImageMagick (>=5.4.0)"
 
-#: include/functions_setup.inc:348
+#: include/functions_setup.inc:352
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
 msgstr ""
 "ImageMagick wird für die Konvertierung von hochgeladenen Bildern verwendet."
 
-#: include/functions_setup.inc:351
+#: include/functions_setup.inc:355
 msgid "Checking imagick module for PHP"
 msgstr "Prüfe auf imagick Erweiterung"
 
-#: include/functions_setup.inc:352
+#: include/functions_setup.inc:356
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
 msgstr ""
 "ImageMagick wird für die Konvertierung von hochgeladenen Bildern verwendet."
 
-#: include/functions_setup.inc:359
+#: include/functions_setup.inc:363
 msgid "Checking for fping utility"
 msgstr "Suche fping-Programm"
 
-#: include/functions_setup.inc:360
+#: include/functions_setup.inc:364
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
@@ -6717,11 +7195,11 @@ msgstr ""
 "Fping wird benötigt, um den Status von Thin-Client basierenden Terminal zu "
 "überwachen."
 
-#: include/functions_setup.inc:375
+#: include/functions_setup.inc:379
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr "Suche einen Weg um LM/NT Passwort-Hashes zu generieren"
 
-#: include/functions_setup.inc:376
+#: include/functions_setup.inc:380
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
@@ -6729,11 +7207,11 @@ msgstr ""
 "Um Samba 2.x/3.x in Verbindung mit LDAP nutzen zu können, wird ein externes "
 "Programm benötigt, welches die Passwort-Hashes generieren kann."
 
-#: include/functions_setup.inc:389
+#: include/functions_setup.inc:393
 msgid "php.ini check -> session.auto_register"
 msgstr "php.ini Überprüfung -> session.auto_register"
 
-#: include/functions_setup.inc:390
+#: include/functions_setup.inc:394
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
@@ -6741,11 +7219,11 @@ msgstr ""
 "Um GOsa fehlerfrei benutzen zu können, muß die Option session.auto_register "
 "in Ihrer php.ini auf 'off' stehen."
 
-#: include/functions_setup.inc:393
+#: include/functions_setup.inc:397
 msgid "php.ini check -> implicit_flush"
 msgstr "php.ini Überprüfung -> implicit_flush"
 
-#: include/functions_setup.inc:394
+#: include/functions_setup.inc:398
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
@@ -6753,11 +7231,11 @@ msgstr ""
 "Diese Einstellung beeinflusst die Verarbeitung der Ausgabe. Stellen Sie "
 "diese auf 'off', um die Leistung zu erhöhen."
 
-#: include/functions_setup.inc:401
+#: include/functions_setup.inc:405
 msgid "php.ini check -> max_execution_time"
 msgstr "php.ini Überprüfung -> max_execution_time"
 
-#: include/functions_setup.inc:402
+#: include/functions_setup.inc:406
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
@@ -6765,11 +7243,11 @@ msgstr ""
 "Die Ausführungszeit sollte mindestens 30 Sekunden betragen, da einige "
 "Aktionen viel Zeit in Anspruch nehmen."
 
-#: include/functions_setup.inc:409
+#: include/functions_setup.inc:413
 msgid "php.ini check -> memory_limit"
 msgstr "php.ini Überprüfung -> memory_limit"
 
-#: include/functions_setup.inc:410
+#: include/functions_setup.inc:414
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
 "Increase it for larger setups."
@@ -6778,11 +7256,11 @@ msgstr ""
 "unvorhersehbare Probleme verursachen! Bei größeren Installationen sollte "
 "dieser Wert noch erweitert werden."
 
-#: include/functions_setup.inc:414
+#: include/functions_setup.inc:418
 msgid "php.ini check -> expose_php"
 msgstr "php.ini Überprüfung -> expose_php"
 
-#: include/functions_setup.inc:415
+#: include/functions_setup.inc:419
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any Information about the server you are running in this case."
@@ -6791,11 +7269,11 @@ msgstr ""
 "setzen. PHP wird in dieser Einstellung keine Informationen über Ihren "
 "laufenden Server senden."
 
-#: include/functions_setup.inc:419
+#: include/functions_setup.inc:423
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr "php.ini Überprüfung -> magic_quotes_gpc"
 
-#: include/functions_setup.inc:420
+#: include/functions_setup.inc:424
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
@@ -6803,11 +7281,11 @@ msgstr ""
 "Erhöhen Sie die Sicherheit des Server, indem sie magic_quotes_gpc auf 'on' "
 "stellen. PHP wird in dieser Einstellung alle 'quotes' in 'strings' umwandeln."
 
-#: include/functions_setup.inc:659
+#: include/functions_setup.inc:666
 msgid "You've to specify an ldap server before continuing!"
 msgstr "Sie müssen einen LDAP-Server angeben um fortzufahren!"
 
-#: include/functions_setup.inc:668 include/functions_setup.inc:750
+#: include/functions_setup.inc:675 include/functions_setup.inc:758
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
@@ -6815,8 +7293,8 @@ msgstr ""
 "Kann den angegebenen LDAP-Server nicht erreichen! Bitte stellen Sie sicher, "
 "dass er für GOsa erreichbar ist."
 
-#: include/functions_setup.inc:682 include/functions_setup.inc:755
-#: include/functions_setup.inc:760
+#: include/functions_setup.inc:689 include/functions_setup.inc:763
+#: include/functions_setup.inc:768
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
 "reachable for GOsa."
@@ -6824,7 +7302,7 @@ msgstr ""
 "Die Anmeldung am LDAP-Server ist fehlgeschlagen. Bitte stellen Sie sicher, "
 "dass der Server für GOsa erreichbar ist."
 
-#: include/functions_setup.inc:770
+#: include/functions_setup.inc:778
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
 "please check all informations twice"
@@ -6832,7 +7310,7 @@ msgstr ""
 "Die Verbindung zum Server war erfolgreich, dieser scheint jedoch leer zu "
 "sein.Bitte überprüfen Sie nochmals Ihre Angaben."
 
-#: include/functions_setup.inc:826
+#: include/functions_setup.inc:834
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
@@ -6841,7 +7319,7 @@ msgstr ""
 "Das Attribut '%s' ist in diesem Formular nicht angegeben. Bitte "
 "vervollständigen Sie Ihre Eingaben!"
 
-#: include/functions_setup.inc:857
+#: include/functions_setup.inc:865
 msgid ""
 "Can't read schema informations, GOsa needs to know your schema setup. Please "
 "verify that it is readable for GOsa"
@@ -6849,13 +7327,13 @@ msgstr ""
 "Kann von GOsa benötigte Schema-Informationen nicht lesen. Bitte stellen Sie "
 "sicher, dass diese lesbar sind."
 
-#: include/functions_setup.inc:866
+#: include/functions_setup.inc:874
 #, php-format
 msgid "Can't log into LDAP server. Reason was: %s."
 msgstr "Die Anmeldung am LDAP-Server ist fehlgeschlagen. Die Meldung war '%s'."
 
-#: include/functions_setup.inc:976 include/functions_setup.inc:999
-#: include/functions_setup.inc:1008 html/index.php:176
+#: include/functions_setup.inc:984 include/functions_setup.inc:1007
+#: include/functions_setup.inc:1016 html/index.php:176
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
@@ -6865,82 +7343,6 @@ msgstr ""
 "In ihrem Setup fehlt ein administratives Konto für GOsa, Sie sind deshalb "
 "nicht in der Lage irgendetwas einzustellen!"
 
-#: include/class_config.inc:69
-#, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr "XML-Fehler in der Datei gosa.conf: %s in Zeile %d"
-
-#: include/class_config.inc:195 html/index.php:140
-msgid "Can't bind to LDAP. Please contact the system administrator."
-msgstr ""
-"Kann den LDAP-Server nicht erreichen. Bitte benachrichtigen Sie den "
-"Administrator."
-
-#: include/class_config.inc:426
-msgid "SID and/or RIDBASE missing in your configuration!"
-msgstr "SID und/oder RIDBASE fehlen in der Konfiguration!"
-
-#: include/class_password-methods-sha.inc:50
-msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
-msgstr "Kann SHA nicht benutzen (fehlende Funktion mhash / sha1 / crypt)"
-
-#: include/class_password-methods-kerberos.inc:43
-msgid ""
-"Warning: Can't set kerberos password. Your PHP version has no kerberos "
-"support, password has not been changed."
-msgstr ""
-"Achtung: Das Kerberos-Passwort kann nicht gesetzt werden. Die von Ihnen "
-"verwendete PHP-Version hat keine Unterstützung für Kerberos."
-
-#: include/class_password-methods-kerberos.inc:52
-msgid "Kerberos database communication failed!"
-msgstr "Die Kommunikation mit der Kerberos-Datenbank ist fehlgeschlagen!"
-
-#: include/class_password-methods-kerberos.inc:59
-msgid "Changing password in kerberos database failed!"
-msgstr ""
-"Die Änderung des Passworts in der Kerberos-Datenbank ist fehlgeschlagen!"
-
-#: include/functions_helpviewer.inc:260
-#, php-format
-msgid "%s results for your search with the keyword %s interpreted as %s"
-msgstr "%s Ergebnisse für Ihre Suche nach %s (effektiv gesucht nach: %s)"
-
-#: include/functions_helpviewer.inc:335
-#, php-format
-msgid "%s%% hit rate in file %s"
-msgstr "%s%% Trefferquote in Datei %s"
-
-#: include/class_ldap.inc:398
-#, php-format
-msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
-msgstr ""
-"Das automatische Erzeugen des Objekt-Typs '%s' wird momentan nicht "
-"unterstützt. Bitte melden Sie dies an das Entwicklerteam."
-
-#: include/class_ldap.inc:631
-#, php-format
-msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-"Dies ist keine valide DN: '%s'.  Ein Block für den Import sollte mit "
-"'dn:...' beginnen in Zeile %s"
-
-#: include/class_ldap.inc:644
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
-msgstr "Der DN: '%s' (aus Zeile %s) existiert bereits in der LDAP-Datenbank."
-
-#: include/class_ldap.inc:660
-#, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
-msgstr ""
-"Fehler beim Importieren von dn: '%s', bitte überprüfen Sie die LDIF-Datei ab "
-"Zeile %s!"
-
 #: html/helpviewer.php:54
 msgid "Help is not available if you are not logged in."
 msgstr "Um die Hilfe zu betrachten, müssen Sie angemeldet sein."
@@ -7091,32 +7493,6 @@ msgstr ""
 "Ignoriere diesen Fehler und zeige alle Einträge die innerhalb der "
 "Größenbeschränkung liegen"
 
-#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
-msgid "Please use your <i>username</i> and <i>password</i> to log in"
-msgstr ""
-"Melden Sie sich bitte mit Ihrem <i>Benutzernamen</i> und Ihrem <i>Passwort</"
-"i> an"
-
-#: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
-#: ihtml/themes/default/setup_useradmin.tpl:22
-#: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
-msgid "Username"
-msgstr "Benutzername"
-
-#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
-#: ihtml/themes/default/login.tpl:44 ihtml/themes/default/login.tpl:47
-msgid "Directory"
-msgstr "Verzeichnis"
-
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
-msgid "Sign in"
-msgstr "Anmelden"
-
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
-msgid "Click here to log in"
-msgstr "Hier klicken zum Anmelden"
-
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr "Ein Sitzungskonflikt wurde festgestellt"
@@ -7147,6 +7523,25 @@ msgstr ""
 msgid "Logout"
 msgstr "Abmelden"
 
+#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
+msgid "Please use your <i>username</i> and <i>password</i> to log in"
+msgstr ""
+"Melden Sie sich bitte mit Ihrem <i>Benutzernamen</i> und Ihrem <i>Passwort</"
+"i> an"
+
+#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
+#: ihtml/themes/default/login.tpl:44 ihtml/themes/default/login.tpl:47
+msgid "Directory"
+msgstr "Verzeichnis"
+
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
+msgid "Sign in"
+msgstr "Anmelden"
+
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
+msgid "Click here to log in"
+msgstr "Hier klicken zum Anmelden"
+
 #: ihtml/themes/altlinux/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
 msgid "Welcome to the GOsa setup!"
@@ -7170,25 +7565,6 @@ msgstr ""
 "optionaler Werkzeuge geprüft und abschließend wird die LDAP-Verbindung "
 "konfiguriert."
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:3
-#: ihtml/themes/default/setup_useradmin.tpl:3
-msgid "You already have an Administrative Account and a Group."
-msgstr "Sie haben bereits ein administratives Konto und eine passende Gruppe."
-
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
-msgid ""
-"To provide full administrative access to GOsa, you need to create a special "
-"group which contains the administrative user. The setup program can assist "
-"you with this task. Enter the desired username and the password below to "
-"create the missing entries."
-msgstr ""
-"Um GOsa einen uneingeschränkten Zugang zu ermöglichen, müssen Sie eine "
-"spezielle Gruppe anlegen, die den administrativen Benutzer enthält.Das "
-"Einrichtungs-Programm kann Sie dabei unterstützen: Geben Sie den gewünschten "
-"Benutzernamen und das zugehörige Passwort in das untere Feld ein, um die "
-"fehlenden Einträge zu erstellen."
-
 #: ihtml/themes/altlinux/framework.tpl:15
 #: ihtml/themes/default/framework.tpl:15
 msgid "Main"
@@ -7209,6 +7585,24 @@ msgstr "Abmelden"
 msgid "Signed in:"
 msgstr "Angemeldet:"
 
+#: ihtml/themes/altlinux/setup_step2.tpl:1
+#: ihtml/themes/altlinux/setup_step3.tpl:1
+#: ihtml/themes/altlinux/setup_step4.tpl:1
+#: ihtml/themes/default/setup_step2.tpl:1
+#: ihtml/themes/default/setup_step3.tpl:1
+#: ihtml/themes/default/setup_step4.tpl:1
+msgid "Setup continued..."
+msgstr "Einrichtung wird fortgesetzt..."
+
+#: ihtml/themes/altlinux/setup_step2.tpl:4
+#: ihtml/themes/default/setup_step2.tpl:4
+msgid ""
+"Step two looks for a set of helper programms and checks if they have the "
+"correct minimum version."
+msgstr ""
+"Der zweite Schritt prüft auf die Verfügbarkeit einiger Hilfsprogramme und "
+"testet, ob sie in der richtigen Version vorliegen."
+
 #: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
 msgid "Locking conflict detected"
 msgstr "Ein Zugriffskonflikt wurde festgestellt"
@@ -7224,23 +7618,24 @@ msgstr ""
 "Webbrowser geschlossen. In einem solchen Fall können Sie den Konflikt durch "
 "einen Klick auf <i>Entfernen</i> beseitigen."
 
-#: ihtml/themes/altlinux/setup_step2.tpl:1
-#: ihtml/themes/altlinux/setup_step3.tpl:1
-#: ihtml/themes/altlinux/setup_step4.tpl:1
-#: ihtml/themes/default/setup_step2.tpl:1
-#: ihtml/themes/default/setup_step3.tpl:1
-#: ihtml/themes/default/setup_step4.tpl:1
-msgid "Setup continued..."
-msgstr "Einrichtung wird fortgesetzt..."
+#: ihtml/themes/altlinux/setup_useradmin.tpl:3
+#: ihtml/themes/default/setup_useradmin.tpl:3
+msgid "You already have an Administrative Account and a Group."
+msgstr "Sie haben bereits ein administratives Konto und eine passende Gruppe."
 
-#: ihtml/themes/altlinux/setup_step2.tpl:4
-#: ihtml/themes/default/setup_step2.tpl:4
+#: ihtml/themes/altlinux/setup_useradmin.tpl:10
+#: ihtml/themes/default/setup_useradmin.tpl:10
 msgid ""
-"Step two looks for a set of helper programms and checks if they have the "
-"correct minimum version."
+"To provide full administrative access to GOsa, you need to create a special "
+"group which contains the administrative user. The setup program can assist "
+"you with this task. Enter the desired username and the password below to "
+"create the missing entries."
 msgstr ""
-"Der zweite Schritt prüft auf die Verfügbarkeit einiger Hilfsprogramme und "
-"testet, ob sie in der richtigen Version vorliegen."
+"Um GOsa einen uneingeschränkten Zugang zu ermöglichen, müssen Sie eine "
+"spezielle Gruppe anlegen, die den administrativen Benutzer enthält.Das "
+"Einrichtungs-Programm kann Sie dabei unterstützen: Geben Sie den gewünschten "
+"Benutzernamen und das zugehörige Passwort in das untere Feld ein, um die "
+"fehlenden Einträge zu erstellen."
 
 #: ihtml/themes/altlinux/setup_step3.tpl:4
 #: ihtml/themes/default/setup_step3.tpl:4
@@ -7484,4 +7879,3 @@ msgstr ""
 "GOsa kann Fehler im PHP-Interpreter erzeugen (insbesondere bei Beta-"
 "Versionen). In einigen Fällen ist es hilfreich, das 'error_reporting' zu "
 "aktivieren (dies kann jedoch ein Sicherheitsrisiko darstellen)."
-