From b4263138f9632d3a9c098a9e6ad1fdccee03fcc9 Mon Sep 17 00:00:00 2001
From: A. Täffner <darkalex@firesplash.de>
Date: Fri, 22 Jan 2016 13:18:41 -0500
Subject: [PATCH] Merge branch 'dns-dnssec' of git.ispconfig.org:darkalex/ispconfig3 into dns-dnssec

---
 interface/web/admin/lib/lang/ru_language_complete.lng |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/interface/web/admin/lib/lang/ru_language_complete.lng b/interface/web/admin/lib/lang/ru_language_complete.lng
index b5200ff..ba6bc36 100644
--- a/interface/web/admin/lib/lang/ru_language_complete.lng
+++ b/interface/web/admin/lib/lang/ru_language_complete.lng
@@ -1,7 +1,7 @@
 <?php
-$wb['list_head_txt'] = 'Merge the selected language file with the english master language file. <br />This adds missing strings from the english master language files to the selected language.';
-$wb['language_select_txt'] = 'Select language';
-$wb['btn_save_txt'] = 'Merge files now';
-$wb['btn_cancel_txt'] = 'Back';
-$wb['list_desc_txt'] = 'Merge the selected language file with the english master language file. <br />This adds missing strings from the english master language files to the selected language.';
+$wb['list_head_txt'] = 'Объединение языков';
+$wb['language_select_txt'] = 'Выберите язык';
+$wb['btn_save_txt'] = 'Объеденить';
+$wb['btn_cancel_txt'] = 'Назад';
+$wb['list_desc_txt'] = 'Объеденить выбранный язык с английским мастер-языком. <br />Это добавит пропущенные строки из мастер-языка.';
 ?>

--
Gitblit v1.9.1