Merge branch 'v2-stable' into beta

Conflicts:

	src/lang/de/main.php
This commit is contained in:
Andre Lorbach 2011-02-16 16:38:17 +01:00
commit 2d16e45abd
2 changed files with 2 additions and 2 deletions

View File

@ -53,7 +53,7 @@ $content['LN_GEN_GLOBAL'] = "Global";
$content['LN_GEN_USERONLY_LONG'] = "Eigene Einstellungen <br>(Nur f&uuml;r Ihren Benutzer)";
$content['LN_GEN_GROUPONLY_LONG'] = "Einstellungen f&uuml;r die Gruppe <br>(Nur f&uuml;r die ausgew&auml;hlte Gruppe)";
$content['LN_GEN_GROUPONLYNAME'] = "Gruppe '%1'";
$content['LN_ADMIN_POPUPHELP'] = "Details f%uuml;r diese Funktion";
$content['LN_ADMIN_POPUPHELP'] = "Details f&uuml;r diese Funktion";
$content['LN_ADMIN_DBSTATS'] = "Anzeige der Datenbankinformationen.";
$content['LN_ADMIN_CLEARDATA'] = "Wenn Sie alte Datenbankeintr&auml;ge l&ouml;schen wollen, benutzen Sie diese Funktion.";
$content['LN_UPDATE_AVAILABLE'] = "Update available";

View File

@ -107,7 +107,7 @@ $content['LN_GEN_UNKNOWN'] = "Unbekannt";
$content['LN_MENU_SEARCH'] = "Suchen";
$content['LN_MENU_SHOWEVENTS'] = "Meldungen";
$content['LN_MENU_HELP'] = "Hilfe";
$content['LN_MENU_DOC'] = "Doikumentation";
$content['LN_MENU_DOC'] = "Dokumentation";
$content['LN_MENU_FORUM'] = "Support Forum";
$content['LN_MENU_WIKI'] = "LogAnalyzer Wiki";
$content['LN_MENU_PROSERVICES'] = "Professionelle Unterst&uuml;tzung";