From ce6e1ddfd09c47fc3f80e4fccc238894cf560ddb Mon Sep 17 00:00:00 2001
From: A. Täffner <darkalex@firesplash.de>
Date: Fri, 22 Jan 2016 13:16:39 -0500
Subject: [PATCH] updated master, resolved conflicts

---
 interface/web/sites/lib/lang/de_database_user_list.lng |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/web/sites/lib/lang/de_database_user_list.lng b/interface/web/sites/lib/lang/de_database_user_list.lng
index 7ee8222..a2fef7c 100644
--- a/interface/web/sites/lib/lang/de_database_user_list.lng
+++ b/interface/web/sites/lib/lang/de_database_user_list.lng
@@ -1,5 +1,5 @@
 <?php
-$wb['list_head_txt'] = 'Datenbank Benutzer';
+$wb['list_head_txt'] = 'Datenbank-Benutzer';
 $wb['add_new_record_txt'] = 'Neuen Benutzer hinzufügen';
-$wb['database_user_txt'] = 'Datenbank Benutzer';
+$wb['database_user_txt'] = 'Datenbank-Benutzer';
 ?>

--
Gitblit v1.9.1