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/ru_server.lng |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/interface/web/admin/lib/lang/ru_server.lng b/interface/web/admin/lib/lang/ru_server.lng
index ea5c0a3..320e610 100644
--- a/interface/web/admin/lib/lang/ru_server.lng
+++ b/interface/web/admin/lib/lang/ru_server.lng
@@ -1,13 +1,16 @@
 <?php
-$wb['config_txt'] = 'config';
-$wb['server_name_txt'] = 'Серверname';
-$wb['mail_server_txt'] = 'Mailserver';
-$wb['web_server_txt'] = 'Webserver';
+$wb['config_txt'] = 'конфиг';
+$wb['server_name_txt'] = 'Имя сервера';
+$wb['mail_server_txt'] = 'Почтовый сервер';
+$wb['web_server_txt'] = 'Web-сервер';
 $wb['dns_server_txt'] = 'DNS-Сервер';
-$wb['file_server_txt'] = 'Fileserver';
+$wb['file_server_txt'] = 'Файл-сервер';
 $wb['db_server_txt'] = 'DB-Сервер';
-$wb['vserver_server_txt'] = 'VСервер-Сервер';
-$wb['active_txt'] = 'Активный';
-$wb['mirror_server_id_txt'] = 'Is mirror of Server';
-$wb['- None -'] = '- None -';
+$wb['vserver_server_txt'] = 'VСервер';
+$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