From 20e30b45aaaf068b0391ff4679e4f44a0fae8d6e Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 24 Jan 2014 06:32:28 -0500
Subject: [PATCH]  Merge branch 'master' into 'master'

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

diff --git a/interface/web/admin/lib/lang/ru_server.lng b/interface/web/admin/lib/lang/ru_server.lng
index 79857c2..0a1638e 100644
--- a/interface/web/admin/lib/lang/ru_server.lng
+++ b/interface/web/admin/lib/lang/ru_server.lng
@@ -1,13 +1,15 @@
 <?php
-$wb['config_txt'] = 'config';
-$wb['btn_save_txt'] = 'Сохранить';
-$wb['btn_cancel_txt'] = 'Закончить';
-$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['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';
 ?>

--
Gitblit v1.9.1