tyler.durden/loganalyzer
1
0
Fork 0
mirror of https://github.com/rsyslog/loganalyzer.git synced 2025-09-26 03:09:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge issues

Browse Source 
Merge branch 'beta' into devel

Conflicts:

	src/lang/de/main.php
This commit is contained in:
Andre Lorbach 2008-05-20 10:50:15 +02:00
commit 7a4f73c49e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lang/de/main.php
View File

@ -117,9 +117,9 @@ $content['LN_CFG_DBPREF'] = "Tabellen Präfix";
$content['LN_CFG_DBUSER'] = "Datenbank Benutzer";
$content['LN_CFG_DBPASSWORD'] = "Datenbank Passwort";
$content['LN_CFG_PARAMMISSING'] = "Die folgenden Parameter können nicht gefunden werden: ";
$content['LN_CFG_SOURCETYPE'] = "Source Type";
$content['LN_CFG_DISKTYPEOPTIONS'] = "Disk Type Options";
$content['LN_CFG_LOGLINETYPE'] = "Logline type";
$content['LN_CFG_SOURCETYPE'] = "Quell-Typ";
$content['LN_CFG_DISKTYPEOPTIONS'] = "Disk-Typ Optionen";
$content['LN_CFG_LOGLINETYPE'] = "Logzeilentyp";
$content['LN_CFG_SYSLOGFILE'] = "Syslog Datei";
$content['LN_CFG_DATABASETYPEOPTIONS'] = "Datenbank Typ Optionen";
$content['LN_CFG_DBTABLETYPE'] = "Tabellen Typ";
@ -129,8 +129,8 @@ $content['LN_CFG_NAMEOFTHESOURCE'] = "Name der Quelle";
$content['LN_CFG_FIRSTSYSLOGSOURCE'] = "Erste Syslog Quelle";
// Details page
$content['LN_DETAILS_FORSYSLOGMSG'] = "Details for the syslog messages with id";
$content['LN_DETAILS_DETAILSFORMSG'] = "Details for message id";
$content['LN_DETAILS_FORSYSLOGMSG'] = "Details für syslog-Nachrichten mit der ID";
$content['LN_DETAILS_DETAILSFORMSG'] = "Details für Nachrichten-ID";
$content['LN_DETAIL_BACKTOLIST'] = "Back to Listview";
?>

2
src/templates/install.html
View File

@ -52,7 +52,7 @@
<td class="tableBackground">
<h1>Step 1 - Prerequisites</h1>
<p>Bevor you start installing phpLogCon, the Installer setup has to check a few things first.<br>
<p>Before you start installing phpLogCon, the Installer setup has to check a few things first.<br>
You may have to correct some file permissions first. <br><br>
Click on <input type="submit" value="Next"> to start the Test!</p>
<p>&nbsp;</p>