From d5a0e44eb9b9123cf9ee2ff3c36c420166e38ff1 Mon Sep 17 00:00:00 2001 From: Exile Date: Sun, 31 Aug 2014 19:46:12 +0400 Subject: [PATCH] More lang MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Продолжение локализации. --- upload/ajax/avatar.php | 8 ++++---- upload/dl.php | 2 +- upload/includes/posting_tpl.php | 4 ++-- upload/language/en/html/copyright_holders.html | 6 +++--- upload/language/en/main.php | 9 +++++++-- upload/language/ru/main.php | 7 ++++++- upload/language/uk/main.php | 7 ++++++- upload/templates/admin/admin_cron.tpl | 2 +- upload/templates/admin/admin_forum_prune.tpl | 4 ++-- upload/templates/default/page_header.tpl | 2 +- upload/templates/default/viewtopic_poll.tpl | 2 +- 11 files changed, 34 insertions(+), 19 deletions(-) diff --git a/upload/ajax/avatar.php b/upload/ajax/avatar.php index eac82fc83..ef61deacf 100644 --- a/upload/ajax/avatar.php +++ b/upload/ajax/avatar.php @@ -2,19 +2,19 @@ if (!defined('IN_AJAX')) die(basename(__FILE__)); -global $bb_cfg, $user; +global $bb_cfg, $lang, $user; $mode = (string) $this->request['mode']; $user_id = (int) $this->request['user_id']; if (!$user_id OR !$u_data = get_userdata($user_id)) { - $this->ajax_die('invalid user_id'); + $this->ajax_die('Invalid user_id'); } if (!IS_ADMIN && $user_id != $user->id) { - $this->ajax_die('Не админ'); + $this->ajax_die($lang['NOT_ADMIN']); } switch ($mode) @@ -25,7 +25,7 @@ switch ($mode) $response = ''. $user_id .''; break; default: - $this->ajax_die('invalid mode'); + $this->ajax_die('Invalid mode'); } DB()->query("UPDATE ". BB_USERS ." SET avatar_ext_id = $new_ext_id WHERE user_id = $user_id LIMIT 1"); diff --git a/upload/dl.php b/upload/dl.php index 96e0a60eb..29f72bd3f 100644 --- a/upload/dl.php +++ b/upload/dl.php @@ -213,7 +213,7 @@ else $message .= '
'. CAPTCHA()->get_html() .'
'; $message .= ''; $message .= '  '; - $message .= ''; + $message .= ''; $message .= ''; $template->assign_vars(array( diff --git a/upload/includes/posting_tpl.php b/upload/includes/posting_tpl.php index 8240cb3d1..10a608a03 100644 --- a/upload/includes/posting_tpl.php +++ b/upload/includes/posting_tpl.php @@ -10,7 +10,7 @@ $sql = "SELECT forum_name, allow_reg_tracker, forum_tpl_id FROM ". BB_FORUMS ." if (!$forum_id OR !$f_data = DB()->fetch_row($sql)) { - bb_die('Форум не найден'); + bb_die($lang['FORUM_NOT_EXIST']); } // tpl_data $tpl_data = array(); @@ -25,7 +25,7 @@ if (!$f_data['forum_tpl_id'] OR !$tpl_data = DB()->fetch_row($sql)) } $template->assign_vars(array( - 'PAGE_TITLE' => 'Новый релиз', + 'PAGE_TITLE' => $lang['NEW_RELEASE'], 'FORUM_NAME' => $f_data['forum_name'], 'FORUM_ID' => $forum_id, 'TPL_FORM_ACTION' => POSTING_URL . "?mode=newtopic&f=$forum_id", diff --git a/upload/language/en/html/copyright_holders.html b/upload/language/en/html/copyright_holders.html index 9b1e41724..80c231eab 100644 --- a/upload/language/en/html/copyright_holders.html +++ b/upload/language/en/html/copyright_holders.html @@ -38,11 +38,11 @@ which indicated to us the following information:

WARNING!

-

а) We reserve the right to publish on the site of any information sent to us by mail

+

a) We reserve the right to publish on the site of any information sent to us by mail

-

б) We have no control over the actions of users who may be re-post links to information, which is the object of your copyright. Any information the forum, place automatically, without any control from any quarter whatsoever, which corresponds to the generally accepted international practice of placing information on the Internet. However, in any case, we consider all your queries regarding the reference to the information that violates your rights.

+

b) We have no control over the actions of users who may be re-post links to information, which is the object of your copyright. Any information the forum, place automatically, without any control from any quarter whatsoever, which corresponds to the generally accepted international practice of placing information on the Internet. However, in any case, we consider all your queries regarding the reference to the information that violates your rights.

-

в) According to the Law on Copyright and Related Rights, a reference to any data (information message), by itself, is not subject to copyright law (although it may violate the "Agreement on the use of the website"). Thus, it is not necessary to send letters containing threats or demands, as not having a real reason.

+

c) According to the Law on Copyright and Related Rights, a reference to any data (information message), by itself, is not subject to copyright law (although it may violate the "Agreement on the use of the website"). Thus, it is not necessary to send letters containing threats or demands, as not having a real reason.

diff --git a/upload/language/en/main.php b/upload/language/en/main.php index 2f1ad423c..9c01a03f0 100644 --- a/upload/language/en/main.php +++ b/upload/language/en/main.php @@ -1909,6 +1909,7 @@ $lang['SET_PRUNE_DATA'] = 'You have turned on auto-prune for this forum but did $lang['MOVE_AND_DELETE'] = 'Move and Delete'; $lang['DELETE_ALL_POSTS'] = 'Delete all posts'; +$lang['DELETE_ALL_TOPICS'] = 'Delete all topics, including announcements and sticky'; $lang['NOWHERE_TO_MOVE'] = 'Nowhere to move to'; $lang['EDIT_CATEGORY'] = 'Edit Category'; @@ -2533,7 +2534,8 @@ $lang['CRON_DISABLE'] = 'Disable'; $lang['CRON_ENABLE'] = 'Enable'; $lang['RUN_MAIN_CRON'] = 'Start cron'; -$lang['ADD_JOB'] = 'Add cron'; +$lang['ADD_JOB'] = 'Add cron job'; +$lang['DELETE_JOB'] = 'Are you sure you want to delete cron job?'; $lang['CRON_WORKS'] = 'Cron is now works or is broken -> '; $lang['REPAIR_CRON'] = 'Repair Cron'; @@ -2910,4 +2912,7 @@ $lang['NEW_POLL_U_START'] = 'Enable poll'; $lang['NEW_POLL_U_END'] = 'Finish poll'; $lang['NEW_POLL_M_TITLE'] = 'Title of poll'; $lang['NEW_POLL_M_VOTES'] = 'Options'; -$lang['NEW_POLL_M_EXPLAIN'] = 'Each row corresponds to one answer (max'; \ No newline at end of file +$lang['NEW_POLL_M_EXPLAIN'] = 'Each row corresponds to one answer (max'; + +$lang['OLD_BROWSER'] = 'You are using an outdated browser. The website will not display correctly.'; +$lang['GO_BACK'] = 'Go back'; \ No newline at end of file diff --git a/upload/language/ru/main.php b/upload/language/ru/main.php index 8509627f3..ab4b6e5bd 100644 --- a/upload/language/ru/main.php +++ b/upload/language/ru/main.php @@ -1909,6 +1909,7 @@ $lang['SET_PRUNE_DATA'] = 'Вы выбрали для этого форума а $lang['MOVE_AND_DELETE'] = 'Перенести и удалить'; $lang['DELETE_ALL_POSTS'] = 'Удалить все темы'; +$lang['DELETE_ALL_TOPICS'] = 'Удалить все темы, включая объявления и прилепленные'; $lang['NOWHERE_TO_MOVE'] = 'Некуда переносить'; $lang['EDIT_CATEGORY'] = 'Изменить категорию'; @@ -2534,6 +2535,7 @@ $lang['CRON_ENABLE'] = 'включить'; $lang['RUN_MAIN_CRON'] = 'Запустить крон'; $lang['ADD_JOB'] = 'Добавить задачу'; +$lang['DELETE_JOB'] = 'Вы действительно хотите удалить крон задачу?'; $lang['CRON_WORKS'] = 'Крон в данный момент запущен или завис · '; $lang['REPAIR_CRON'] = 'Восстановить'; @@ -2910,4 +2912,7 @@ $lang['NEW_POLL_U_START'] = 'Включить опрос'; $lang['NEW_POLL_U_END'] = 'Завершить опрос'; $lang['NEW_POLL_M_TITLE'] = 'Заголовок опроса'; $lang['NEW_POLL_M_VOTES'] = 'Варианты ответа'; -$lang['NEW_POLL_M_EXPLAIN'] = 'Каждая строка соответствует одному варианту ответа (максимум'; \ No newline at end of file +$lang['NEW_POLL_M_EXPLAIN'] = 'Каждая строка соответствует одному варианту ответа (максимум'; + +$lang['OLD_BROWSER'] = 'Вы используете устаревший браузер. Сайт может отображаться некорректно.'; +$lang['GO_BACK'] = 'Вернуться обратно'; \ No newline at end of file diff --git a/upload/language/uk/main.php b/upload/language/uk/main.php index 83f9fc449..83f237843 100644 --- a/upload/language/uk/main.php +++ b/upload/language/uk/main.php @@ -1909,6 +1909,7 @@ $lang['SET_PRUNE_DATA'] = 'Ви вибрали для цього форуму а $lang['MOVE_AND_DELETE'] = 'Перенести і видалити'; $lang['DELETE_ALL_POSTS'] = 'Видалити всі теми'; +$lang['DELETE_ALL_TOPICS'] = 'Видалити всі теми, включаючи оголошення і приліплені'; $lang['NOWHERE_TO_MOVE'] = 'Нікуди переносити'; $lang['EDIT_CATEGORY'] = 'Змінити категорію'; @@ -2534,6 +2535,7 @@ $lang['CRON_ENABLE'] = 'включити'; $lang['RUN_MAIN_CRON'] = 'Запустити крон'; $lang['ADD_JOB'] = 'Додати завдання'; +$lang['DELETE_JOB'] = 'Ви дійсно хочете видалити крон завдання?'; $lang['CRON_WORKS'] = 'Крон у даний момент запущений або завис · '; $lang['REPAIR_CRON'] = 'Відновити'; @@ -2910,4 +2912,7 @@ $lang['NEW_POLL_U_START'] = 'Включити опитування'; $lang['NEW_POLL_U_END'] = 'Завершити опитування'; $lang['NEW_POLL_M_TITLE'] = 'Заголовок опитування'; $lang['NEW_POLL_M_VOTES'] = 'Варіанти відповіді'; -$lang['NEW_POLL_M_EXPLAIN'] = 'Кожен рядок відповідає одному варіанту відповіді (максимум'; \ No newline at end of file +$lang['NEW_POLL_M_EXPLAIN'] = 'Кожен рядок відповідає одному варіанту відповіді (максимум'; + +$lang['OLD_BROWSER'] = 'Ви використовуєте застарілий браузер. Сайт може відображатися некоректно.'; +$lang['GO_BACK'] = 'Повернутися назад'; \ No newline at end of file diff --git a/upload/templates/admin/admin_cron.tpl b/upload/templates/admin/admin_cron.tpl index fb6159715..1ec6b1f94 100644 --- a/upload/templates/admin/admin_cron.tpl +++ b/upload/templates/admin/admin_cron.tpl @@ -93,7 +93,7 @@ tr.hl-tr:hover td { background-color: #CFC !important; } [Run] [Edit] - [Del] + [Del] diff --git a/upload/templates/admin/admin_forum_prune.tpl b/upload/templates/admin/admin_forum_prune.tpl index 969f2a234..888695299 100644 --- a/upload/templates/admin/admin_forum_prune.tpl +++ b/upload/templates/admin/admin_forum_prune.tpl @@ -34,8 +34,8 @@ -

{L_PRUNE_TOPICS_NOT_POSTED} {L_DAYS}

-

+

{L_PRUNE_TOPICS_NOT_POSTED} {L_DAYS}

+

diff --git a/upload/templates/default/page_header.tpl b/upload/templates/default/page_header.tpl index eab1df04f..eb386ad1d 100644 --- a/upload/templates/default/page_header.tpl +++ b/upload/templates/default/page_header.tpl @@ -233,7 +233,7 @@ function go_to_page ()