From bd68aae78a5d696e4ccb9c0d267486c283a6d9d2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 18 Oct 2013 08:49:59 -0400
Subject: [PATCH] Resolved differences from svn merge to trunk and git master

---
 interface/web/monitor/lib/lang/de_syslog_list.lng |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/interface/web/monitor/lib/lang/de_syslog_list.lng b/interface/web/monitor/lib/lang/de_syslog_list.lng
index bd879a0..4aa045a 100644
--- a/interface/web/monitor/lib/lang/de_syslog_list.lng
+++ b/interface/web/monitor/lib/lang/de_syslog_list.lng
@@ -2,6 +2,6 @@
 $wb['list_head_txt'] = 'ISPConfig Protokoll';
 $wb['tstamp_txt'] = 'Datum';
 $wb['server_id_txt'] = 'Server';
-$wb['loglevel_txt'] = 'Protokolllevel';
+$wb['loglevel_txt'] = 'Protokoll-Level';
 $wb['message_txt'] = 'Nachricht';
 ?>

--
Gitblit v1.9.1