diff --git a/lam/locale/de_DE/LC_MESSAGES/messages.mo b/lam/locale/de_DE/LC_MESSAGES/messages.mo
index f70cd711..7768686a 100644
Binary files a/lam/locale/de_DE/LC_MESSAGES/messages.mo and b/lam/locale/de_DE/LC_MESSAGES/messages.mo differ
diff --git a/lam/locale/de_DE/LC_MESSAGES/messages.po b/lam/locale/de_DE/LC_MESSAGES/messages.po
index e3be5c92..bf38cb5f 100644
--- a/lam/locale/de_DE/LC_MESSAGES/messages.po
+++ b/lam/locale/de_DE/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: post@rolandgruber.de \n"
 "POT-Creation-Date: 2004-01-14 17:45+0200\n"
-"PO-Revision-Date: 2011-07-13 20:27+0200\n"
+"PO-Revision-Date: 2011-07-14 20:27+0200\n"
 "Last-Translator: Roland Gruber <post@rolandgruber.de>\n"
 "Language-Team: Deutsch <lam-i18n@lists.sourceforge.net>\n"
 "Language: \n"
@@ -644,7 +644,7 @@ msgstr "Neue Objektklasse hinzufügen"
 msgid "Add new object class to <b>%s</b>"
 msgstr "Neue Objektklasse zu <b>%s</b> hinzufügen"
 
-#: ../templates/3rdParty/pla/htdocs/add_oclass_form.php:97
+#: ../templates/3rdParty/pla/htdocs/add_oclass_form.php:95
 msgid "Add object class and attributes"
 msgstr "Objektklasse und Attribut hinzufügen"
 
@@ -888,7 +888,7 @@ msgstr "Anwendungsdaten"
 msgid "Are you sure you want to permanently delete these objects?"
 msgstr "Sollen diese Objekte wirklich gelöscht werden?"
 
-#: ../templates/3rdParty/pla/htdocs/delete_form.php:116
+#: ../templates/3rdParty/pla/htdocs/delete_form.php:107
 #: ../templates/3rdParty/pla/htdocs/mass_delete.php:51
 msgid "Are you sure you want to permanently delete this object?"
 msgstr "Soll dieses Objekt gelöscht werden?"
@@ -1304,10 +1304,10 @@ msgstr "Kann weiterleiten"
 #: ../templates/profedit/profilepage.php:230
 #: ../templates/profedit/profilemain.php:157
 #: ../templates/3rdParty/pla/htdocs/update_confirm.php:197
-#: ../templates/3rdParty/pla/htdocs/delete_form.php:92
-#: ../templates/3rdParty/pla/htdocs/delete_form.php:145
+#: ../templates/3rdParty/pla/htdocs/delete_form.php:83
+#: ../templates/3rdParty/pla/htdocs/delete_form.php:136
 #: ../templates/3rdParty/pla/htdocs/create_confirm.php:121
-#: ../templates/3rdParty/pla/htdocs/mass_delete.php:135
+#: ../templates/3rdParty/pla/htdocs/mass_delete.php:119
 #: ../templates/initsuff.php:189 ../lib/types/automountType.inc:199
 #: ../lib/types/automountType.inc:234 ../lib/types/dhcp.inc:277
 #: ../lib/modules/device.inc:251 ../lib/modules/sambaSamAccount.inc:1344
@@ -1478,7 +1478,7 @@ msgstr "Hier klicken wenn Sie nicht zur nächsten Seite weitergeleitet werden."
 msgid "Click to popup a dialog to select a date graphically"
 msgstr "Hiermit können Sie das Datum grafisch auswählen"
 
-#: ../templates/3rdParty/pla/lib/functions.php:2402
+#: ../templates/3rdParty/pla/lib/functions.php:2379
 msgid "Click to popup a dialog to select an entry (DN) graphically"
 msgstr "Hiermit können Sie den DN grafisch auswählen"
 
@@ -1694,7 +1694,7 @@ msgstr "Konnte Eintrag nicht löschen."
 msgid "Could not fetch binary data from LDAP server for attribute [%s]."
 msgstr "Konnte Binärdaten für Attribut [%s] nicht auslesen."
 
-#: ../templates/3rdParty/pla/lib/functions.php:1984
+#: ../templates/3rdParty/pla/lib/functions.php:1961
 #: ../templates/3rdParty/pla/htdocs/view_jpeg_photo.php:60
 #, php-format
 msgid "Could not fetch jpeg data from LDAP server for attribute [%s]."
@@ -1930,8 +1930,8 @@ msgstr "DHCP-Einstellungen"
 #: ../templates/3rdParty/pla/htdocs/copy.php:157
 #: ../templates/3rdParty/pla/htdocs/copy.php:161
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:35
-#: ../templates/3rdParty/pla/htdocs/delete_form.php:121
-#: ../templates/3rdParty/pla/htdocs/mass_delete.php:60 ../lib/modules.inc:382
+#: ../templates/3rdParty/pla/htdocs/delete_form.php:112
+#: ../templates/3rdParty/pla/htdocs/mass_delete.php:57 ../lib/modules.inc:382
 #: ../lib/modules.inc:1734
 msgid "DN"
 msgstr "DN"
@@ -2063,7 +2063,7 @@ msgstr "Vollmachten"
 #: ../templates/delete.php:107 ../templates/profedit/profilemain.php:156
 #: ../templates/profedit/profilemain.php:157
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:33
-#: ../templates/3rdParty/pla/htdocs/delete_form.php:133
+#: ../templates/3rdParty/pla/htdocs/delete_form.php:124
 #: ../lib/modules/posixAccount.inc:1191 ../lib/modules/kolabUser.inc:865
 #: ../lib/modules/nisnetgroup.inc:243 ../lib/lists.inc:425
 msgid "Delete"
@@ -2094,8 +2094,8 @@ msgstr "Nach kopieren löschen (verschieben):"
 msgid "Delete alias(es)"
 msgstr "Alias(e) löschen"
 
-#: ../templates/3rdParty/pla/htdocs/delete_form.php:81
-#: ../templates/3rdParty/pla/htdocs/mass_delete.php:126
+#: ../templates/3rdParty/pla/htdocs/delete_form.php:72
+#: ../templates/3rdParty/pla/htdocs/mass_delete.php:110
 #, php-format
 msgid "Delete all %s objects"
 msgstr "Alle %s-Objekte löschen"
@@ -2137,7 +2137,7 @@ msgstr "Objekt löschen"
 msgid "Delete organisational unit"
 msgstr "Organisational Unit löschen"
 
-#: ../templates/3rdParty/pla/lib/functions.php:2052
+#: ../templates/3rdParty/pla/lib/functions.php:2029
 #: ../lib/modules/inetOrgPerson.inc:1170
 msgid "Delete photo"
 msgstr "Foto löschen"
@@ -2205,8 +2205,8 @@ msgstr "Löscht einen IP-Adressbereich."
 msgid "Deleting"
 msgstr "Lösche"
 
-#: ../templates/3rdParty/pla/htdocs/delete_form.php:82
-#: ../templates/3rdParty/pla/htdocs/delete_form.php:134
+#: ../templates/3rdParty/pla/htdocs/delete_form.php:73
+#: ../templates/3rdParty/pla/htdocs/delete_form.php:125
 msgid "Deleting Object(s)"
 msgstr "Lösche Objekt(e)"
 
@@ -2233,8 +2233,8 @@ msgstr "Unternehmensbereich(e)"
 
 #: ../templates/schema/schema.php:87 ../templates/schema/schema.php:141
 #: ../templates/schema/schema.php:344
-#: ../templates/3rdParty/pla/lib/functions.php:1936
-#: ../templates/3rdParty/pla/lib/functions.php:1940
+#: ../templates/3rdParty/pla/lib/functions.php:1913
+#: ../templates/3rdParty/pla/lib/functions.php:1917
 #: ../templates/3rdParty/pla/htdocs/add_value_form.php:139
 #: ../templates/3rdParty/pla/htdocs/import.php:101
 #: ../lib/types/automountType.inc:79 ../lib/types/nisObjectType.inc:80
@@ -2702,17 +2702,15 @@ msgid "Equipment"
 msgstr "Equipment"
 
 #: ../templates/config/mainmanage.php:215
-#: ../templates/3rdParty/pla/lib/functions.php:162
-#: ../templates/3rdParty/pla/lib/functions.php:552
-#: ../templates/3rdParty/pla/lib/functions.php:554
+#: ../templates/3rdParty/pla/lib/functions.php:529
+#: ../templates/3rdParty/pla/lib/functions.php:531
 #: ../templates/3rdParty/pla/lib/ds_myldap.php:217
-#: ../templates/3rdParty/pla/lib/ds_myldap.php:1420
 #: ../templates/3rdParty/pla/htdocs/import.php:79
 msgid "Error"
 msgstr "Fehler"
 
-#: ../templates/3rdParty/pla/lib/functions.php:1935
-#: ../templates/3rdParty/pla/lib/functions.php:1939
+#: ../templates/3rdParty/pla/lib/functions.php:1912
+#: ../templates/3rdParty/pla/lib/functions.php:1916
 msgid "Error number"
 msgstr "Fehlernummer"
 
@@ -2834,8 +2832,7 @@ msgid "Fax number"
 msgstr "Faxnummer"
 
 #: ../templates/config/mainmanage.php:219
-#: ../templates/3rdParty/pla/lib/functions.php:164
-#: ../templates/3rdParty/pla/lib/functions.php:574
+#: ../templates/3rdParty/pla/lib/functions.php:551
 #: ../templates/3rdParty/pla/tools/unserialize.php:14
 #: ../templates/3rdParty/pla/htdocs/import.php:48
 msgid "File"
@@ -2988,7 +2985,7 @@ msgstr "Vollständiger Name"
 msgid "Full name for Asterisk voicemail mailbox."
 msgstr "Vollständiger Name für den Anrufbeantworter."
 
-#: ../templates/3rdParty/pla/lib/functions.php:578
+#: ../templates/3rdParty/pla/lib/functions.php:555
 #: ../templates/3rdParty/pla/tools/unserialize.php:17
 msgid "Function"
 msgstr "Funktion"
@@ -3054,7 +3051,7 @@ msgid "Generate random password"
 msgstr "Zufälliges Passwort generieren"
 
 #: ../templates/3rdParty/pla/lib/functions.php:63
-#: ../templates/3rdParty/pla/lib/functions.php:636
+#: ../templates/3rdParty/pla/lib/functions.php:613
 msgid "Generic Error"
 msgstr "Allgemeiner Fehler"
 
@@ -3859,9 +3856,14 @@ msgstr "Bild nicht verfügbar"
 msgid "Import"
 msgstr "Import"
 
-#: ../templates/3rdParty/pla/htdocs/add_oclass_form.php:65
-msgid "In order to add these objectClass(es) to this entry, you must specify"
+#: ../templates/3rdParty/pla/htdocs/add_oclass_form.php:64
+#, php-format
+msgid ""
+"In order to add these objectClass(es) to this entry, you must specify <b>%s</"
+"b> new attributes that this object class requires."
 msgstr ""
+"Um diese Objektklasse(n) hinzuzufügen, müssen Sie <b>%s</b> neue Attribute "
+"angeben."
 
 #: ../templates/3rdParty/pla/htdocs/export_form.php:87
 msgid "Include system attributes"
@@ -4158,7 +4160,7 @@ msgstr "LDAP-Operation war erfolgreich."
 msgid "LDAP password"
 msgstr "LDAP-Passwort"
 
-#: ../templates/3rdParty/pla/lib/functions.php:1932
+#: ../templates/3rdParty/pla/lib/functions.php:1909
 msgid "LDAP said"
 msgstr "LDAP meldet"
 
@@ -4366,8 +4368,8 @@ msgstr "Liste der erlaubten Codecs."
 msgid "List of disallowed codecs."
 msgstr "Liste der unerlaubten Codecs."
 
-#: ../templates/3rdParty/pla/htdocs/delete_form.php:103
-#: ../templates/3rdParty/pla/htdocs/mass_delete.php:104
+#: ../templates/3rdParty/pla/htdocs/delete_form.php:94
+#: ../templates/3rdParty/pla/htdocs/mass_delete.php:88
 msgid "List of entries to be deleted:"
 msgstr "Liste der zu löschenden Einträge:"
 
@@ -5274,7 +5276,7 @@ msgstr "Neuer Adressbereich"
 msgid "New recipient"
 msgstr "Neuer Empfänger"
 
-#: ../templates/3rdParty/pla/htdocs/add_oclass_form.php:84
+#: ../templates/3rdParty/pla/htdocs/add_oclass_form.php:82
 msgid "New required attributes"
 msgstr "Neue erforderliche Attribute"
 
@@ -5364,9 +5366,8 @@ msgstr "Keine NIS-Objekte gefunden!"
 
 #: ../templates/3rdParty/pla/lib/Template.php:558
 #: ../templates/3rdParty/pla/lib/Template.php:559
-#, fuzzy
 msgid "No RDN attribute was selected."
-msgstr "[Attribut gelöscht]"
+msgstr "Es wurde kein RDN-Attribut gewählt."
 
 #: ../lib/modules/sambaSamAccount.inc:1046
 #: ../lib/modules/sambaGroupMapping.inc:245
@@ -5394,9 +5395,9 @@ msgid "No changes were made."
 msgstr "Keine Änderungen vorgenommen."
 
 #: ../templates/3rdParty/pla/htdocs/add_value_form.php:83
-#, fuzzy, php-format
+#, php-format
 msgid "No current value for attribute <b>%s</b>."
-msgstr "Aktuelle Werte für Attribut:"
+msgstr "Derzeit kein Wert für das Attribut <b>%s</b>."
 
 #: ../templates/schema/schema.php:142
 msgid "No description"
@@ -5466,9 +5467,8 @@ msgid "No logo"
 msgstr "Kein Logo"
 
 #: ../templates/3rdParty/pla/htdocs/add_attr_form.php:157
-#, fuzzy
 msgid "No new attributes available for this entry"
-msgstr "(keine neuen Attribute verfügbar)"
+msgstr "Keine neuen Attribute für diesen Eintrag verfügbar"
 
 #: ../lib/lists.inc:107
 msgid "No objects found!"
@@ -5542,14 +5542,8 @@ msgid ""
 "Note: You may be required to enter new attributes that these objectClass(es) "
 "require"
 msgstr ""
-
-#: ../templates/3rdParty/pla/htdocs/delete_form.php:70
-#: ../templates/3rdParty/pla/htdocs/mass_delete.php:97
-msgid ""
-"Note: this is potentially very dangerous and you do this at your own risk. "
-"This operation cannot be undone. Take into consideration aliases, referrals, "
-"and other things that may cause problems."
-msgstr ""
+"Hinweis: Sie müssen ggf. zusätzliche Attribute angeben, die von diesen "
+"Objektklassen gefordert werden."
 
 #: ../templates/3rdParty/pla/lib/export_functions.php:456
 msgid "Nothing to export"
@@ -5629,12 +5623,8 @@ msgstr "OU-Editor"
 
 #: ../templates/tree/templates/creation/custom.php:70
 #: ../templates/schema/schema.php:63 ../templates/schema/schema.php:64
-msgid "Object classes"
-msgstr "Objektklassen"
-
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1324
-#, fuzzy
-msgid "ObjectClasses"
+msgid "Object classes"
 msgstr "Objektklassen"
 
 #: ../templates/schema/schema.php:150 ../templates/schema/schema.php:281
@@ -5684,12 +5674,7 @@ msgid "Ok"
 msgstr "Ok"
 
 #: ../templates/3rdParty/pla/htdocs/mass_update.php:98
-#, fuzzy
-msgid "Old Value"
-msgstr "Alter Wert"
-
 #: ../templates/3rdParty/pla/htdocs/update_confirm.php:55
-#, fuzzy
 msgid "Old value"
 msgstr "Alter Wert"
 
@@ -5719,13 +5704,9 @@ msgstr "Mindestens ein Fehler ist aufgetreten. Alle ungültigen Felder sind mark
 msgid "Operation statistics"
 msgstr "Befehlsstatistiken"
 
-#: ../templates/3rdParty/pla/lib/TemplateRender.php:1575
-#, fuzzy
-msgid "Optional Attributes"
-msgstr "Optionale Attribute"
-
 #: ../templates/tree/templates/creation/custom.php:209
 #: ../templates/schema/schema.php:382
+#: ../templates/3rdParty/pla/lib/TemplateRender.php:1575
 msgid "Optional attributes"
 msgstr "Optionale Attribute"
 
@@ -5755,12 +5736,11 @@ msgstr "Optionen für den Asterisk Anrufbeantworteraccount (z.B. sendvoicemail=y
 
 #: ../templates/3rdParty/pla/htdocs/import_form.php:39
 msgid "Or paste your LDIF here"
-msgstr ""
+msgstr "Oder geben Sie den LDIF-Text hier an"
 
 #: ../templates/3rdParty/pla/lib/QueryRender.php:166
-#, fuzzy
 msgid "Order by"
-msgstr "Sortierung"
+msgstr "Sortieren nach"
 
 #: ../templates/schema/schema.php:169
 msgid "Ordering"
@@ -5794,10 +5774,6 @@ msgstr "Organizational Unit"
 msgid "Other"
 msgstr "Andere"
 
-#: ../templates/3rdParty/pla/lib/ds_myldap.php:1419
-msgid "Our attempts to find your SCHEMA have failed"
-msgstr ""
-
 #: ../lib/modules/customScripts.inc:76 ../lib/modules/customScripts.inc:88
 #: ../lib/modules/customScripts.inc:97
 msgid "Output may contain HTML"
@@ -5860,10 +5836,6 @@ msgstr "PDF-Profil wurde erfolgreich gespeichert."
 msgid "PDUs sent"
 msgstr "PDUs gesendet"
 
-#: ../templates/3rdParty/pla/lib/common.php:198
-msgid "PHP Safe Mode"
-msgstr ""
-
 #: ../lib/modules/sambaSamAccount.inc:531
 msgid "Pacific Time (US & Canada)"
 msgstr "Pacific Time (USA & Kanada)"
@@ -5894,18 +5866,16 @@ msgid "Pager number for Asterisk voicemail."
 msgstr "Pager-Nummer für den Asterisk Anrufbeantworter."
 
 #: ../templates/3rdParty/pla/htdocs/entry_chooser.php:35
-#, fuzzy
 msgid "Parent DN"
-msgstr "Elter von"
+msgstr "Eltern-DN"
 
 #: ../templates/schema/schema.php:364
 msgid "Parent to"
 msgstr "Elter von"
 
 #: ../templates/3rdParty/pla/htdocs/import.php:98
-#, fuzzy
-msgid "Parse Error"
-msgstr "Fehler"
+msgid "Parse error"
+msgstr "Einlesefehler"
 
 #: ../templates/lists/changePassword.php:241 ../templates/login.php:296
 #: ../templates/selfService/selfServiceLogin.php:226
@@ -5923,11 +5893,6 @@ msgstr "Fehler"
 msgid "Password"
 msgstr "Passwort"
 
-#: ../templates/3rdParty/pla/htdocs/password_checker.php:30
-#, fuzzy
-msgid "Password Checker Tool"
-msgstr "Passwortrichtlinie"
-
 #: ../lib/modules/sambaSamAccount.inc:272
 #: ../lib/modules/sambaSamAccount.inc:1088
 msgid "Password change at next login"
@@ -5944,6 +5909,10 @@ msgstr "Passwortänderung erforderlich"
 msgid "Password change requires old password"
 msgstr "Passwortänderung benötigt altes Passwort"
 
+#: ../templates/3rdParty/pla/htdocs/password_checker.php:30
+msgid "Password check"
+msgstr "Passwortprüfung"
+
 #: ../lib/modules/posixGroup.inc:473 ../lib/modules/sambaSamAccount.inc:97
 #: ../lib/modules/posixAccount.inc:79 ../lib/modules/posixAccount.inc:80
 msgid ""
@@ -6052,19 +6021,15 @@ msgstr "Passwortwarnung"
 msgid "Password warning must be are natural number."
 msgstr "Passwortwarnung muss eine natürliche Zahl sein."
 
-#: ../templates/config/confmain.php:474 ../lib/modules.inc:1026
+#: ../templates/config/confmain.php:474
+#: ../templates/3rdParty/pla/htdocs/password_checker.php:61
+#: ../lib/modules.inc:1026
 msgid "Passwords are different!"
 msgstr "Die Passwörter stimmen nicht überein!"
 
-#: ../templates/3rdParty/pla/htdocs/password_checker.php:61
-#, fuzzy
-msgid "Passwords do not match!"
-msgstr "Passwort läuft nicht ab"
-
 #: ../templates/3rdParty/pla/htdocs/password_checker.php:59
-#, fuzzy
-msgid "Passwords match!"
-msgstr "Passwortqualitätsprüfung"
+msgid "Passwords match."
+msgstr "Passwörter sind identisch."
 
 #: ../lib/types/nisObjectType.inc:77
 msgid "Path"
@@ -6092,8 +6057,7 @@ msgid "Path to key for DNS updates"
 msgstr "Pfad zum Schlüssel für DNS-Änderungen"
 
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:41
-#: ../templates/3rdParty/pla/htdocs/mass_delete.php:67
-#, fuzzy
+#: ../templates/3rdParty/pla/htdocs/mass_delete.php:64
 msgid "Permanently delete all children also?"
 msgstr "Sollen auch alle Untereinträge gelöscht werden?"
 
@@ -6145,10 +6109,6 @@ msgstr ""
 msgid "Please add at least one member."
 msgstr "Sie müssen mindestens ein Mitglied hinzufügen."
 
-#: ../templates/3rdParty/pla/lib/functions.php:172
-msgid "Please check and see if this bug has been reported"
-msgstr ""
-
 #: ../lib/modules/sambaSamAccount.inc:1040
 msgid "Please check your settings on the Unix page!"
 msgstr "Bitte überprüfen Sie Ihre Eingaben auf der Unix-Seite!"
@@ -6690,7 +6650,7 @@ msgstr ""
 
 #: ../templates/3rdParty/pla/htdocs/add_attr_form.php:172
 msgid "Please wait"
-msgstr ""
+msgstr "Bitte warten"
 
 #: ../lib/modules/kolabUser.inc:230
 msgid "Policy list has invalid format!"
@@ -6802,10 +6762,6 @@ msgstr "Der Benutzername ist ungültig!"
 msgid "Priority"
 msgstr "Priorität"
 
-#: ../templates/3rdParty/pla/lib/Template.php:1150
-msgid "Problem with autoFill() in template"
-msgstr ""
-
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1537
 msgid "Proceed &gt;&gt;"
 msgstr ""
@@ -7326,8 +7282,8 @@ msgstr "Anrufer-ID ausblenden"
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:587
 #: ../templates/3rdParty/pla/htdocs/update_confirm.php:198
 #: ../templates/3rdParty/pla/htdocs/update_confirm.php:231
-#: ../templates/3rdParty/pla/htdocs/delete_form.php:93
-#: ../templates/3rdParty/pla/htdocs/delete_form.php:146
+#: ../templates/3rdParty/pla/htdocs/delete_form.php:84
+#: ../templates/3rdParty/pla/htdocs/delete_form.php:137
 #: ../templates/3rdParty/pla/htdocs/create_confirm.php:122
 #: ../templates/3rdParty/pla/htdocs/create_confirm.php:137
 msgid "Retrieving DN"
@@ -7704,9 +7660,8 @@ msgstr "Seriennummer"
 #: ../templates/3rdParty/pla/lib/export_functions.php:205
 #: ../templates/3rdParty/pla/lib/HTMLTree.php:166
 #: ../templates/3rdParty/pla/htdocs/import.php:47
-#: ../templates/3rdParty/pla/htdocs/delete_form.php:119
+#: ../templates/3rdParty/pla/htdocs/delete_form.php:110
 #: ../templates/3rdParty/pla/htdocs/create_confirm.php:54
-#: ../templates/3rdParty/pla/htdocs/mass_delete.php:56
 #: ../templates/3rdParty/pla/htdocs/export_form.php:56
 msgid "Server"
 msgstr "Server"
@@ -7752,7 +7707,7 @@ msgstr "Serverstatistiken"
 msgid "Server time"
 msgstr "Serverzeit"
 
-#: ../templates/3rdParty/pla/lib/common.php:247
+#: ../templates/3rdParty/pla/lib/common.php:240
 #, fuzzy
 msgid "Session Timed Out"
 msgstr "Zeitbeschränkung für Sitzung"
@@ -9118,10 +9073,6 @@ msgstr "Es gibt bereits einen anderen Benutzer mit dieser Anrufer-ID."
 msgid "There is already another user with this mailbox name."
 msgstr "Es gibt bereits einen anderen Benutzer mit diesem Postfach."
 
-#: ../templates/3rdParty/pla/lib/Template.php:1151
-msgid "There is only 1 argument, when there should be two"
-msgstr ""
-
 #: ../templates/massDoUpload.php:129
 msgid "There were errors while uploading:"
 msgstr "Beim Upload traten Fehler auf:"
@@ -9756,7 +9707,7 @@ msgstr "Dieses Paar von Erweiterungsname und Priorität existiert bereits."
 msgid "This program is run after the login."
 msgstr "Dieses Programm wird nach der Anmeldung gestartet."
 
-#: ../templates/3rdParty/pla/htdocs/mass_delete.php:88
+#: ../templates/3rdParty/pla/htdocs/mass_delete.php:85
 #, php-format
 msgid "This request also includes %s children entries."
 msgstr ""
@@ -10024,7 +9975,7 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
-#: ../templates/3rdParty/pla/lib/functions.php:2123
+#: ../templates/3rdParty/pla/lib/functions.php:2100
 #, fuzzy
 msgid "Unable to Encrypt Password"
 msgstr "Passwort reaktivieren"
@@ -10135,7 +10086,7 @@ msgstr "Kann das Profil nicht laden!"
 msgid "Unable to read sambaSID attribute."
 msgstr "Konnte das Attribut sambaSID nicht lesen."
 
-#: ../templates/3rdParty/pla/lib/functions.php:1983
+#: ../templates/3rdParty/pla/lib/functions.php:1960
 #, fuzzy
 msgid "Unable to retrieve image"
 msgstr "Konnte Schema nicht auslesen!"
@@ -10206,10 +10157,6 @@ msgstr "Account entsperren"
 msgid "Unlock password"
 msgstr "Passwort reaktivieren"
 
-#: ../templates/3rdParty/pla/lib/functions.php:154
-msgid "Unrecognized error number"
-msgstr ""
-
 #: ../templates/masscreate.php:98 ../templates/config/confmodules.php:367
 msgid "Unsolved dependency:"
 msgstr "Ungelöste Abhängigkeit:"
@@ -10831,16 +10778,6 @@ msgstr ""
 msgid "You entered one or more invalid DNS servers."
 msgstr "Sie haben mindestens einen ungültigen DNS-Server angegeben."
 
-#: ../templates/3rdParty/pla/lib/functions.php:176
-msgid "You found a non-fatal phpLDAPadmin bug!"
-msgstr ""
-
-#: ../templates/3rdParty/pla/lib/common.php:199
-msgid ""
-"You have PHP Safe Mode enabled. This application may work unexpectedly in "
-"Safe Mode."
-msgstr ""
-
 #: ../templates/3rdParty/pla/lib/Template.php:417
 #: ../templates/3rdParty/pla/lib/Template.php:504
 msgid "You left the attribute value blank. Please go back and try again."
@@ -10908,9 +10845,9 @@ msgstr ""
 "Ihre PHP-Konfiguration erlaubt keine Dateiuploads. Bitte prüfen Sie Ihre php."
 "ini."
 
-#: ../templates/3rdParty/pla/lib/functions.php:2148
-#: ../templates/3rdParty/pla/lib/functions.php:2241
-#: ../templates/3rdParty/pla/lib/functions.php:2260
+#: ../templates/3rdParty/pla/lib/functions.php:2125
+#: ../templates/3rdParty/pla/lib/functions.php:2218
+#: ../templates/3rdParty/pla/lib/functions.php:2237
 msgid "Your PHP install does not have the mhash() function. Cannot do SHA hashes."
 msgstr ""
 
@@ -10918,8 +10855,8 @@ msgstr ""
 msgid "Your PHP install does not have the mhash() function. Cannot do hashes."
 msgstr ""
 
-#: ../templates/3rdParty/pla/lib/functions.php:2159
-#: ../templates/3rdParty/pla/lib/functions.php:2171
+#: ../templates/3rdParty/pla/lib/functions.php:2136
+#: ../templates/3rdParty/pla/lib/functions.php:2148
 msgid ""
 "Your PHP install does not have the mhash() or mhash_keygen_s2k() function. "
 "Cannot do S2K hashes."
@@ -10931,12 +10868,12 @@ msgid ""
 "PHP."
 msgstr ""
 
-#: ../templates/3rdParty/pla/lib/common.php:249
+#: ../templates/3rdParty/pla/lib/common.php:242
 #, fuzzy
 msgid "Your Session timed out after"
 msgstr "Zeitbeschränkung für Sitzung"
 
-#: ../templates/3rdParty/pla/lib/functions.php:297
+#: ../templates/3rdParty/pla/lib/functions.php:274
 msgid ""
 "Your config.php is missing Server Definitions. Please see the sample file "
 "config/config.php.example."
@@ -10969,18 +10906,18 @@ msgstr "Ihre Sitzung ist abgelaufen, bitte melden Sie sich erneut an."
 msgid "Your settings were successfully saved."
 msgstr "Ihre Einstellungen wurden erfolgreich gespeichert."
 
-#: ../templates/3rdParty/pla/lib/functions.php:2095
-#: ../templates/3rdParty/pla/lib/functions.php:2290
+#: ../templates/3rdParty/pla/lib/functions.php:2072
+#: ../templates/3rdParty/pla/lib/functions.php:2267
 msgid "Your system crypt library does not support blowfish encryption."
 msgstr ""
 
-#: ../templates/3rdParty/pla/lib/functions.php:2113
-#: ../templates/3rdParty/pla/lib/functions.php:2320
+#: ../templates/3rdParty/pla/lib/functions.php:2090
+#: ../templates/3rdParty/pla/lib/functions.php:2297
 msgid "Your system crypt library does not support extended DES encryption."
 msgstr ""
 
-#: ../templates/3rdParty/pla/lib/functions.php:2135
-#: ../templates/3rdParty/pla/lib/functions.php:2305
+#: ../templates/3rdParty/pla/lib/functions.php:2112
+#: ../templates/3rdParty/pla/lib/functions.php:2282
 msgid "Your system crypt library does not support md5crypt encryption."
 msgstr ""
 
@@ -11053,21 +10990,16 @@ msgstr "[Attribut gelöscht]"
 msgid "backupRootFileSystem"
 msgstr "sichereRootDateisystem"
 
-#: ../templates/3rdParty/pla/lib/functions.php:2407
+#: ../templates/3rdParty/pla/lib/functions.php:2384
 #, fuzzy
 msgid "browse"
 msgstr "Schema-Browser"
 
-#: ../templates/3rdParty/pla/lib/functions.php:2038
+#: ../templates/3rdParty/pla/lib/functions.php:2015
 #: ../templates/3rdParty/pla/htdocs/import.php:48
 msgid "bytes"
 msgstr ""
 
-#: ../templates/3rdParty/pla/lib/functions.php:164
-#, fuzzy
-msgid "caller"
-msgstr "Anrufer-ID"
-
 #: ../templates/schema/schema.php:218
 msgid "character"
 msgstr "Zeichen"
@@ -11231,11 +11163,6 @@ msgstr ""
 "ldaps://ldap.domain.com baut eine verschlüsselte Verbindung zu ldap.domain."
 "com auf."
 
-#: ../templates/3rdParty/pla/lib/functions.php:164
-#, fuzzy
-msgid "line"
-msgstr "Überschrift"
-
 #: ../templates/3rdParty/pla/lib/QueryRender.php:100
 #, fuzzy
 msgid "list"
@@ -11261,7 +11188,7 @@ msgstr "mail.ihredomain.de"
 msgid "members in group"
 msgstr "Domänengruppe"
 
-#: ../templates/3rdParty/pla/lib/common.php:250
+#: ../templates/3rdParty/pla/lib/common.php:243
 #, fuzzy
 msgid "min. of inactivity. You have been automatically logged out."
 msgstr ""
@@ -11281,11 +11208,6 @@ msgstr "meineGruppe"
 msgid "new"
 msgstr ""
 
-#: ../templates/3rdParty/pla/htdocs/add_oclass_form.php:66
-#, fuzzy
-msgid "new attributes"
-msgstr "Neues Attribut hinzufügen"
-
 #: ../templates/config/confmain.php:225 ../lib/modules/zarafaGroup.inc:419
 #: ../lib/modules/zarafaGroup.inc:426 ../lib/modules/zarafaGroup.inc:429
 #: ../lib/modules/sambaSamAccount.inc:558
@@ -11303,7 +11225,7 @@ msgstr "Neues Attribut hinzufügen"
 msgid "no"
 msgstr "nein"
 
-#: ../templates/3rdParty/pla/lib/functions.php:1940
+#: ../templates/3rdParty/pla/lib/functions.php:1917
 #, fuzzy
 msgid "no description available"
 msgstr "Keine Beschreibung"
@@ -11329,7 +11251,7 @@ msgstr "(keine neuen binären Attribute verfügbar)"
 #: ../templates/schema/schema.php:238 ../templates/schema/schema.php:287
 #: ../templates/schema/schema.php:353 ../templates/schema/schema.php:368
 #: ../templates/schema/schema.php:402 ../templates/schema/schema.php:424
-#: ../templates/3rdParty/pla/lib/functions.php:2736
+#: ../templates/3rdParty/pla/lib/functions.php:2713
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1573
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1581
 msgid "none"
@@ -11373,26 +11295,6 @@ msgstr "pc01,Raum 2.34"
 msgid "pc01,pc02"
 msgstr "pc01,pc02"
 
-#: ../templates/3rdParty/pla/htdocs/mass_delete.php:92
-#, fuzzy, php-format
-msgid ""
-"phpLDAPadmin can also recursively delete all %s of the child entries. See "
-"below for a list of all the entries that this action will delete. Do you "
-"want to do this?"
-msgstr ""
-"LAM kann diesen Eintrag rekursiv löschen. Es folgt eine Liste der zu "
-"löschenden Einträge. Wollen Sie alle diese Einträge löschen?"
-
-#: ../templates/3rdParty/pla/htdocs/delete_form.php:65
-#, fuzzy, php-format
-msgid ""
-"phpLDAPadmin can recursively delete this entry and all %s of its children. "
-"See below for a list of all the entries that this action will delete. Do you "
-"want to do this?"
-msgstr ""
-"LAM kann diesen Eintrag rekursiv löschen. Es folgt eine Liste der zu "
-"löschenden Einträge. Wollen Sie alle diese Einträge löschen?"
-
 #: ../templates/3rdParty/pla/lib/export_functions.php:71
 msgid "phpLDAPadmin has not been configured for that export type"
 msgstr ""
@@ -11401,7 +11303,7 @@ msgstr ""
 msgid "phpLDAPadmin has not been configured for that import type"
 msgstr ""
 
-#: ../templates/3rdParty/pla/lib/functions.php:2038
+#: ../templates/3rdParty/pla/lib/functions.php:2015
 msgid "pixels"
 msgstr ""
 
@@ -11484,10 +11386,6 @@ msgstr "test"
 msgid "test-start"
 msgstr "test-start"
 
-#: ../templates/3rdParty/pla/htdocs/add_oclass_form.php:67
-msgid "that this objectClass requires."
-msgstr ""
-
 #: ../templates/3rdParty/pla/htdocs/copy_form.php:32
 #: ../templates/3rdParty/pla/htdocs/rename_form.php:28
 #, fuzzy
diff --git a/lam/templates/3rdParty/pla/htdocs/add_oclass_form.php b/lam/templates/3rdParty/pla/htdocs/add_oclass_form.php
index cd276b12..4a6877f1 100644
--- a/lam/templates/3rdParty/pla/htdocs/add_oclass_form.php
+++ b/lam/templates/3rdParty/pla/htdocs/add_oclass_form.php
@@ -61,10 +61,8 @@ if (count($ldap['attrs']['need']) > 0) {
 	$request['page']->drawSubTitle();
 
 	echo '<div style="text-align: center">';
-	printf('<small>%s <b>%s</b> %s %s</small>',
-		_('In order to add these objectClass(es) to this entry, you must specify'),
-		count($ldap['attrs']['need']),_('new attributes'),
-		_('that this objectClass requires.'));
+	printf('<small>' . _('In order to add these objectClass(es) to this entry, you must specify <b>%s</b> new attributes that this object class requires.') . '</small>',
+		count($ldap['attrs']['need']));
 
 	echo '<br /><br />';
 
diff --git a/lam/templates/3rdParty/pla/htdocs/import.php b/lam/templates/3rdParty/pla/htdocs/import.php
index 051112d9..5f4a22ff 100644
--- a/lam/templates/3rdParty/pla/htdocs/import.php
+++ b/lam/templates/3rdParty/pla/htdocs/import.php
@@ -95,7 +95,7 @@ function display_pla_parse_error($request) {
 	echo '<tr>';
 	printf('<td class="img"><img src="%s/%s" /></td>',IMGDIR,'error-big.png');
 
-	printf('<td><h2>%s %s</h2></td>',$type['description'],_('Parse Error'));
+	printf('<td><h2>%s %s</h2></td>',$type['description'],_('Parse error'));
 	echo '</tr>';
 
 	printf('<tr><td><b>%s</b>:</td><td>%s</td></tr>',_('Description'),$request->error['message']);
diff --git a/lam/templates/3rdParty/pla/htdocs/mass_delete.php b/lam/templates/3rdParty/pla/htdocs/mass_delete.php
index 37c60e99..6378c8ea 100644
--- a/lam/templates/3rdParty/pla/htdocs/mass_delete.php
+++ b/lam/templates/3rdParty/pla/htdocs/mass_delete.php
@@ -52,9 +52,6 @@ if (count($request['parent']) == 1)
 else
 	printf('<tr><td colspan="4"><b>%s</b></td></tr>',_('Are you sure you want to permanently delete these objects?'));
 
-echo '<tr><td colspan="4">&nbsp;</td></tr>';
-printf('<tr><td style="width: 10%%;">%s:</td><td colspan="3" style="width: 75%%;"><b>%s</b></td></tr>',_('Server'),$app['server']->getName());
-
 foreach ($request['parent'] as $dn)
 	printf('<tr><td style="width: 10%%;"><acronym title="%s">%s</acronym></td><td colspan="3" style="width: 75%%;"><b>%s</b></td></tr>',
 		_('DN'),_('DN'),$dn);
@@ -88,19 +85,6 @@ if (count($request['children'])) {
 	printf(_('This request also includes %s children entries.'),count($request['children']));
 	echo '</td></tr>';
 
-	printf('<tr><td colspan="4">%s</td></tr>',
-		sprintf(_('phpLDAPadmin can also recursively delete all %s of the child entries. See below for a list of all the entries that this action will delete. Do you want to do this?'),count($request['children'])));
-
-	echo '<tr><td colspan="4">&nbsp;</td></tr>';
-
-	printf('<tr><td colspan="4"><small>%s</small></td></tr>',
-		_('Note: this is potentially very dangerous and you do this at your own risk. This operation cannot be undone. Take into consideration aliases, referrals, and other things that may cause problems.'));
-	echo "\n";
-
-	echo '<tr><td colspan="4">&nbsp;</td></tr>';
-
-	echo "\n";
-
 	printf('<tr><td colspan="4"><center><b>%s</b></center></td></tr>',_('List of entries to be deleted:'));
 	echo '<tr><td colspan="4">&nbsp;</td></tr>';
 
diff --git a/lam/templates/3rdParty/pla/htdocs/mass_update.php b/lam/templates/3rdParty/pla/htdocs/mass_update.php
index 214eb096..9f75081b 100644
--- a/lam/templates/3rdParty/pla/htdocs/mass_update.php
+++ b/lam/templates/3rdParty/pla/htdocs/mass_update.php
@@ -95,7 +95,7 @@ if (count($request['update'])) {
 			echo '</tr>';
 
 			printf('<tr class="list_item"><td class="blank">&nbsp;</td><td class="heading">dn</td><td class="value" style="width: 45%%;">%s</td><td class="value" style="width: 45%%;"><b>%s</b></td></tr>',
-				htmlspecialchars(dn_unescape($template->getDN())),_('Old Value'));
+				htmlspecialchars(dn_unescape($template->getDN())),_('Old value'));
 
 			foreach ($template->getLDAPmodify(true,$index) as $attribute) {
 				echo '<tr class="list_item">';
diff --git a/lam/templates/3rdParty/pla/htdocs/password_checker.php b/lam/templates/3rdParty/pla/htdocs/password_checker.php
index c616e2e7..3375196f 100644
--- a/lam/templates/3rdParty/pla/htdocs/password_checker.php
+++ b/lam/templates/3rdParty/pla/htdocs/password_checker.php
@@ -27,7 +27,7 @@ if (get_request('base64','REQUEST')) {
 
 $request['enc_type'] = get_enc_type($request['hash']);
 
-printf('<h3 class="subtitle">%s</h3>',_('Password Checker Tool'));
+printf('<h3 class="subtitle">%s</h3>',_('Password check'));
 
 echo '<form action="password_checker.php" method="post">';
 echo '<input type="hidden" name="action" value="compare" />';
@@ -56,9 +56,9 @@ if ($request['action'] == 'compare') {
 	echo '&nbsp;&nbsp;&nbsp;&nbsp;<b>';
 
 	if (password_check($request['hash'],$request['password'],$request['attribute']))
-		printf('<span class="good">%s</span>',_('Passwords match!'));
+		printf('<span class="good">%s</span>',_('Passwords match.'));
 	else
-		printf('<span class="bad">%s</span>',_('Passwords do not match!'));
+		printf('<span class="bad">%s</span>',_('Passwords are different!'));
 
 	echo '</b>';
 }
diff --git a/lam/templates/3rdParty/pla/lib/Template.php b/lam/templates/3rdParty/pla/lib/Template.php
index f7754acd..a3ac602c 100644
--- a/lam/templates/3rdParty/pla/lib/Template.php
+++ b/lam/templates/3rdParty/pla/lib/Template.php
@@ -1147,8 +1147,8 @@ class Template extends xmlTemplate {
 			case 'autoFill':
 				if (! preg_match('/;/',$arg)) {
 					system_message(array(
-						'title'=>_('Problem with autoFill() in template'),
-						'body'=>sprintf('%s (<b>%s</b>)',_('There is only 1 argument, when there should be two'),$attribute->getName(false)),
+						'title'=>('Problem with autoFill() in template'),
+						'body'=>sprintf('%s (<b>%s</b>)',('There is only 1 argument, when there should be two'),$attribute->getName(false)),
 						'type'=>'warn'));
 
 					return;
diff --git a/lam/templates/3rdParty/pla/lib/TemplateRender.php b/lam/templates/3rdParty/pla/lib/TemplateRender.php
index c9d41f72..f8860535 100644
--- a/lam/templates/3rdParty/pla/lib/TemplateRender.php
+++ b/lam/templates/3rdParty/pla/lib/TemplateRender.php
@@ -1321,7 +1321,7 @@ class TemplateRender extends PageRender {
 			$socs = array();
 
 		echo '<tr>';
-		printf('<td class="heading">%s</td>',_('ObjectClasses'));
+		printf('<td class="heading">%s</td>',_('Object classes'));
 		echo '<td><select name="new_values[objectclass][]" multiple="multiple" size="15">';
 
 		foreach ($socs as $name => $oclass) {
@@ -1572,7 +1572,7 @@ class TemplateRender extends PageRender {
 		else
 			printf('<tr class="noinput"><td colspan="2" style="text-align: center;">(%s)</td></tr>',_('none'));
 
-		printf('<tr><th colspan="2">%s</th></tr>',_('Optional Attributes'));
+		printf('<tr><th colspan="2">%s</th></tr>',_('Optional attributes'));
 		if (count($attrs['optional']))
 			foreach ($attrs['optional'] as $attribute)
 				$this->draw('Template',$attribute);
diff --git a/lam/templates/3rdParty/pla/lib/common.php b/lam/templates/3rdParty/pla/lib/common.php
index 8304d31f..a0a1fe84 100644
--- a/lam/templates/3rdParty/pla/lib/common.php
+++ b/lam/templates/3rdParty/pla/lib/common.php
@@ -192,13 +192,6 @@ if (isset($_SERVER['SERVER_SOFTWARE']) && ! isset($_SESSION[APPCONFIG])) {
 	$_SESSION[APPCONFIG]->CheckCustom();
 }
 
-# Check for safe mode.
-if (@ini_get('safe_mode') && ! get_request('cmd','GET'))
-	system_message(array(
-	'title'=>_('PHP Safe Mode'),
-	'body'=>_('You have PHP Safe Mode enabled. This application may work unexpectedly in Safe Mode.'),
-	'type'=>'info'));
-
 # Set our timezone, if it is specified in config.php
 if ($_SESSION[APPCONFIG]->getValue('appearance','timezone'))
 	date_default_timezone_set($_SESSION[APPCONFIG]->getValue('appearance','timezone'));
diff --git a/lam/templates/3rdParty/pla/lib/ds_myldap.php b/lam/templates/3rdParty/pla/lib/ds_myldap.php
index c149198b..47b0e73f 100644
--- a/lam/templates/3rdParty/pla/lib/ds_myldap.php
+++ b/lam/templates/3rdParty/pla/lib/ds_myldap.php
@@ -1416,8 +1416,8 @@ class myldap extends DS {
 			# We need to have objectclasses and attribues, so display an error, asking the user to get us this information.
 			if (in_array($schema_to_fetch,$schema_error_message_array))
 				system_message(array(
-					'title'=>sprintf('%s (%s)',_('Our attempts to find your SCHEMA have failed'),$schema_to_fetch),
-					'body'=>sprintf('<b>%s</b>: %s',_('Error'),$schema_error_message),
+					'title'=>sprintf('%s (%s)',('Our attempts to find your SCHEMA have failed'),$schema_to_fetch),
+					'body'=>sprintf('<b>%s</b>: %s',('Error'),$schema_error_message),
 					'type'=>'error'));
 			else
 				if (DEBUG_ENABLED)
diff --git a/lam/templates/3rdParty/pla/lib/functions.php b/lam/templates/3rdParty/pla/lib/functions.php
index 56854c2e..da652f3d 100644
--- a/lam/templates/3rdParty/pla/lib/functions.php
+++ b/lam/templates/3rdParty/pla/lib/functions.php
@@ -151,35 +151,12 @@ function app_error_handler($errno,$errstr,$file,$lineno) {
 		case E_USER_NOTICE: $errtype = 'E_USER_NOTICE'; break;
 		case E_ALL: $errtype = 'E_ALL'; break;
 
-		default: $errtype = sprintf('%s: %s',_('Unrecognized error number'),$errno);
+		default: $errtype = sprintf('%s: %s',('Unrecognized error number'),$errno);
 	}
 
 	# Take out extra spaces in error strings.
 	$errstr = preg_replace('/\s+/',' ',$errstr);
 
-	if ($errno == E_NOTICE) {
-		$body = '<table class="notice">';
-		$body .= sprintf('<tr><td>%s:</td><td><b>%s</b> (<b>%s</b>)</td></tr>',_('Error'),$errstr,$errtype);
-		$body .= sprintf('<tr><td>%s:</td><td><b>%s</b> %s <b>%s</b>, %s <b>%s</b></td></tr>',
-			_('File'),$file,_('line'),$lineno,_('caller'),$caller);
-		$body .= sprintf('<tr><td>Versions:</td><td>PLA: <b>%s</b>, PHP: <b>%s</b>, SAPI: <b>%s</b></td></tr>',
-			app_version(),phpversion(),php_sapi_name());
-		$body .= sprintf('<tr><td>Web server:</td><td><b>%s</b></td></tr>',isset($_SERVER['SERVER_SOFTWARE']) ? $_SERVER['SERVER_SOFTWARE'] : 'SCRIPT');
-
-		if (function_exists('get_href'))
-			$body .= sprintf('<tr><td colspan="2"><a href="%s" onclick="target=\'_blank\';"><center>%s.</center></a></td></tr>',
-				get_href('search_bug',"&summary_keyword=".rawurlencode($errstr)),
-				_('Please check and see if this bug has been reported'));
-		$body .= '</table>';
-
-		system_message(array(
-			'title'=>_('You found a non-fatal phpLDAPadmin bug!'),
-			'body'=>$body,
-			'type'=>'error'));
-
-		return;
-	}
-
 	# If this is a more serious error, call the error call.
 	error(sprintf('%s: %s',$errtype,$errstr),'error',null,true,true);
 }