From 62083141460db75d13cfec0acd1fa0ea52722034 Mon Sep 17 00:00:00 2001
From: moglia <moglia@ispconfig3>
Date: Tue, 23 Feb 2010 17:08:46 -0500
Subject: [PATCH] Modified loadUserProfile function i discovered using mailuser interface from horfic after many tests and debugs functions recive a value iguals to userid field not sys_userid. I keep sysuser_id testing for compatibility issues no have any idea if this used in another place and added aditional userid test.  Tested all things and used auto-response with roundcube with this modifications all worked fine. More info see here: http://www.howtoforge.com/forums/showthread.php?t=38437&page=15

---
 interface/web/admin/lib/lang/ru_language_complete.lng |   11 ++++++-----
 1 files changed, 6 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..c7ade3c 100644
--- a/interface/web/admin/lib/lang/ru_language_complete.lng
+++ b/interface/web/admin/lib/lang/ru_language_complete.lng
@@ -1,7 +1,8 @@
 <?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