From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/admin/lib/lang/de_server_list.lng |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/interface/web/admin/lib/lang/de_server_list.lng b/interface/web/admin/lib/lang/de_server_list.lng
index e38a5db..c99a4b9 100644
--- a/interface/web/admin/lib/lang/de_server_list.lng
+++ b/interface/web/admin/lib/lang/de_server_list.lng
@@ -1,13 +1,14 @@
 <?php
 $wb['list_head_txt'] = 'Server';
 $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['mail_server_txt'] = 'E-Mail';
+$wb['web_server_txt'] = 'Web';
+$wb['dns_server_txt'] = 'DNS';
+$wb['file_server_txt'] = 'Datei';
+$wb['db_server_txt'] = 'Datenbank';
 $wb['vserver_server_txt'] = 'vServer';
 $wb['add_new_record_txt'] = 'Neuen Server hinzufügen';
-$wb['proxy_server_txt'] = 'Proxyserver';
-$wb['firewall_server_txt'] = 'Firewallserver';
+$wb['proxy_server_txt'] = 'Proxy';
+$wb['firewall_server_txt'] = 'Firewall';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>

--
Gitblit v1.9.1