From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/admin/lib/lang/de_server.lng |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/interface/web/admin/lib/lang/de_server.lng b/interface/web/admin/lib/lang/de_server.lng
index eed5732..b32a67b 100644
--- a/interface/web/admin/lib/lang/de_server.lng
+++ b/interface/web/admin/lib/lang/de_server.lng
@@ -1,12 +1,16 @@
-<?php
-$wb['config_txt'] = 'Konfiguration';
-$wb['server_name_txt'] = 'Servername';
-$wb['mail_server_txt'] = '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['active_txt'] = 'Aktiv';
-?>
-
+<?php
+$wb['config_txt'] = 'Konfiguration';
+$wb['server_name_txt'] = 'Servername';
+$wb['mail_server_txt'] = 'E-Mailserver';
+$wb['web_server_txt'] = 'Webserver';
+$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';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+?>

--
Gitblit v1.9.1