From 08cc7f673c377bf88897743e340097e93f1e95f4 Mon Sep 17 00:00:00 2001 From: ftimme <ft@falkotimme.com> Date: Wed, 16 Jan 2013 09:30:05 -0500 Subject: [PATCH] - Changed regex for redirect path (Web sites, subdomains, vhost subdomains, alias domains) and web folder (vhost subdomains) so that ".." is not allowed (in order to prevent path traversals). - nginx: don't allow folders for proxy redirects (subdomains and alias domains); URL is required. - nginx: modified rewriting. --- 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