From deb3716e433556f4d259a98ac3969169d11d779a Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Wed, 26 Mar 2014 05:45:41 -0400
Subject: [PATCH]  Merge branch 'master_fixes' into 'master'

---
 interface/web/admin/lib/lang/ru_server.lng |    3 ++-
 1 files changed, 2 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..0a1638e 100644
--- a/interface/web/admin/lib/lang/ru_server.lng
+++ b/interface/web/admin/lib/lang/ru_server.lng
@@ -10,5 +10,6 @@
 $wb['active_txt'] = 'Активен?';
 $wb['mirror_server_id_txt'] = 'Зеркало сервера';
 $wb['- None -'] = '- нет -';
+$wb['proxy_server_txt'] = 'Proxy-Server';
+$wb['firewall_server_txt'] = 'Firewall-Server';
 ?>
-

--
Gitblit v1.9.1