From 412faba719fdd8a35707d42bbdbc66c0357b6648 Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Fri, 27 May 2011 05:39:08 -0400 Subject: [PATCH] Removed the files favicon.ico and robots.txt from conf-custom directory as they are already present in conf directory. The conf-custom directory is only for local overrides of files from conf directory, so conf-custom must stay empty in the source tree to allow administrators to override files on their servers. --- 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