From e2a219e2971cbbc048c34470e435df4eea752a82 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Wed, 29 Jun 2016 05:27:58 -0400
Subject: [PATCH] Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

---
 interface/web/admin/lib/lang/ru_server.lng |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/interface/web/admin/lib/lang/ru_server.lng b/interface/web/admin/lib/lang/ru_server.lng
index 5575e65..320e610 100644
--- a/interface/web/admin/lib/lang/ru_server.lng
+++ b/interface/web/admin/lib/lang/ru_server.lng
@@ -10,5 +10,7 @@
 $wb['active_txt'] = 'Активен?';
 $wb['mirror_server_id_txt'] = 'Зеркало сервера';
 $wb['- None -'] = '- нет -';
+$wb['proxy_server_txt'] = 'Proxy-Server';
+$wb['firewall_server_txt'] = 'Firewall-Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
 ?>
-

--
Gitblit v1.9.1