From fc0edb2f00bcdc6baaaa29f9041e82f3003b9b44 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Sun, 07 Jun 2015 12:16:19 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

---
 interface/web/admin/lib/lang/de_server.lng |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/interface/web/admin/lib/lang/de_server.lng b/interface/web/admin/lib/lang/de_server.lng
index 4193d9b..50f8090 100644
--- a/interface/web/admin/lib/lang/de_server.lng
+++ b/interface/web/admin/lib/lang/de_server.lng
@@ -1,11 +1,15 @@
 <?php
 $wb['config_txt'] = 'Konfiguration';
 $wb['server_name_txt'] = 'Servername';
-$wb['mail_server_txt'] = 'Mailserver';
+$wb['mail_server_txt'] = 'E-Mailserver';
 $wb['web_server_txt'] = 'Webserver';
-$wb['dns_server_txt'] = 'DNS-Server';
-$wb['file_server_txt'] = 'Fileserver';
-$wb['db_server_txt'] = 'DB-Server';
-$wb['vserver_server_txt'] = 'VServer-Server';
+$wb['dns_server_txt'] = 'DNSserver';
+$wb['file_server_txt'] = 'Dateiserver';
+$wb['db_server_txt'] = 'Datenbankserver';
+$wb['vserver_server_txt'] = 'vServer';
 $wb['active_txt'] = 'Aktiv';
+$wb['mirror_server_id_txt'] = 'Ist Mirror von Server';
+$wb['- None -'] = '- Nichts ausgewählt -';
+$wb['proxy_server_txt'] = 'Proxy Server';
+$wb['firewall_server_txt'] = 'Firewall Server';
 ?>

--
Gitblit v1.9.1