From ce6e1ddfd09c47fc3f80e4fccc238894cf560ddb Mon Sep 17 00:00:00 2001
From: A. Täffner <darkalex@firesplash.de>
Date: Fri, 22 Jan 2016 13:16:39 -0500
Subject: [PATCH] updated master, resolved conflicts

---
 interface/web/admin/lib/lang/ru_server_config.lng |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng
index 6a4080a..fbddb89 100644
--- a/interface/web/admin/lib/lang/ru_server_config.lng
+++ b/interface/web/admin/lib/lang/ru_server_config.lng
@@ -254,4 +254,6 @@
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
+$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
+$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
 ?>

--
Gitblit v1.9.1