diff --git a/upload/ajax/change_tor_status.php b/upload/ajax/change_tor_status.php index 7d63c9569..89f9b0505 100644 --- a/upload/ajax/change_tor_status.php +++ b/upload/ajax/change_tor_status.php @@ -69,4 +69,4 @@ if ($tor['tor_status'] != TOR_NOT_APPROVED && $tor['checked_user_id'] != $userda change_tor_status($attach_id, $new_status); $this->response['attach_id'] = $attach_id; -$this->response['status'] = $bb_cfg['tor_icons'][$new_status] .' '. $lang['TOR_STATUS_NAME'][$new_status]. ' · ' . get_username($userdata['user_id']) . ' · '. delta_time(time()) . $lang['BACK']. ''; \ No newline at end of file +$this->response['status'] = $bb_cfg['tor_icons'][$new_status] .' '. $lang['TOR_STATUS_NAME'][$new_status]. ' · ' . $userdata['username'] . ' · '. delta_time(time()) . $lang['BACK']. ''; \ No newline at end of file diff --git a/upload/config.php b/upload/config.php index ee7d3eed9..084ff2131 100644 --- a/upload/config.php +++ b/upload/config.php @@ -56,8 +56,8 @@ $bb_cfg['js_ver'] = 1; $bb_cfg['css_ver'] = 1; // Increase number of revision after update -$bb_cfg['tp_version'] = '2.0.2'; -$bb_cfg['tp_release_state'] = 'TP II r190'; +$bb_cfg['tp_version'] = '2.0'; +$bb_cfg['tp_release_state'] = 'R191'; $bb_cfg['tp_release_date'] = '4-08-2011'; $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger diff --git a/upload/includes/ucp/usercp_register.php b/upload/includes/ucp/usercp_register.php index bb1dac985..a98e00a71 100644 --- a/upload/includes/ucp/usercp_register.php +++ b/upload/includes/ucp/usercp_register.php @@ -65,10 +65,10 @@ switch ($mode) } // Вывод начальной страницы с условиями регистрации - if (empty($_POST['reg_agreed'])) + /*if (empty($_POST['reg_agreed'])) { print_page('agreement.tpl'); - } + }*/ } // field => can_edit diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index 9eed2ae08..6cb98a6db 100644 --- a/upload/language/lang_english/lang_main.php +++ b/upload/language/lang_english/lang_main.php @@ -25,6 +25,7 @@ $lang['POSTED'] = 'Posted'; $lang['USERNAME'] = 'Username'; $lang['PASSWORD'] = 'Password'; $lang['EMAIL'] = 'Email'; +$lang['PM'] = 'PM'; $lang['POSTER'] = 'Poster'; $lang['AUTHOR'] = 'Author'; $lang['TIME'] = 'Time'; @@ -263,6 +264,7 @@ $lang['CODE'] = 'Code'; // comes before bbcode code output. $lang['CODE_COPIED'] = 'Code copied to clipboard'; $lang['CODE_COPY'] = 'copy to clipboard'; $lang['SPOILER_HEAD'] = 'hidden text'; +$lang['SPOILER_CLOSE'] = 'turn'; $lang['EDITED_TIME_TOTAL'] = 'Last edited by %s on %s; edited %d time in total'; // Last edited by me on 12 Oct 2001; edited 1 time in total $lang['EDITED_TIMES_TOTAL'] = 'Last edited by %s on %s; edited %d times in total'; // Last edited by me on 12 Oct 2001; edited 2 times in total @@ -1191,6 +1193,7 @@ $lang['MAGNET'] = 'Magnet'; //torrent status mod $lang['TOR_STATUS'] = 'Status'; $lang['TOR_STATUS_SELECT_ACTION'] = 'Select status'; +$lang['TOR_STATUS_NOT_SELECT'] = 'You have not selected status.'; $lang['TOR_STATUS_SELECT_ALL'] = 'All statuses'; $lang['TOR_STATUS_NAME'] = array( TOR_NOT_APPROVED => 'not checked', @@ -1567,6 +1570,16 @@ $lang['INVALID_DATE'] = 'Error date '; $lang['PROFILE_USER'] = 'Viewing profile'; $lang['GOOD_UPDATE'] = 'was successfully changed'; $lang['FORBADE_VIEWING'] = 'forbade visitors viewing your profile'; +$lang['DENY_VISITORS'] = 'Deny visitors viewing your profile:'; +$lang['BAN_USER'] = 'To prevent a user:'; +$lang['USER_NOT_ALLOWED'] = 'Users are not permitted:'; +$lang['HIDE_AVATARS'] = 'Show avatars'; +$lang['SHOW_CAPTION'] = 'Show your signature'; +$lang['DOWNLOAD_TORRENT'] = 'Download torrent'; +$lang['SEND_PM'] = 'Send PM'; +$lang['SEND_MESSAGE'] = 'Send message'; +$lang['EDIT_POST'] = 'Edit Post'; +$lang['NEW_THREADS'] = 'New Threads'; // Register $lang['CHOOSE_A_NAME'] = 'You should choose a name'; @@ -1574,8 +1587,10 @@ $lang['CHOOSE_E_MAIL'] = 'You must specify the e-mail'; $lang['CHOOSE_PASS'] = 'Field for the password must not be empty!'; $lang['CHOOSE_PASS_ERR'] = 'Entered passwords do not match'; $lang['CHOOSE_PASS_OK'] = 'Passwords match, you can proceed with the registration.'; - $lang['EMAILER_DISABLED'] = 'Sorry, this feature is temporarily not working'; +$lang['TERMS_ON'] = 'I agree with these terms and conditions'; +$lang['TERMS_OFF'] = 'I do not agree to these terms'; +$lang['JAVASCRIPT_ON_REGISTER'] = 'To register, heads necessary to enable JavaScript'; // Debug $lang['EXECUTION_TIME'] = 'Execution time:'; @@ -1589,4 +1604,10 @@ $lang['QUERIES'] = 'queries'; $lang['DOWNLOAD_INFO'] = 'Download free and at maximum speed!'; $lang['HOW_TO_DOWNLOAD'] = 'How to Download?'; $lang['WHAT_IS_A_TORRENT'] = 'What is a torrent?'; -$lang['RATINGS_AND_LIMITATIONS'] = 'Ratings and Limitations'; \ No newline at end of file +$lang['RATINGS_AND_LIMITATIONS'] = 'Ratings and Limitations'; + +$lang['SCREENSHOTS_RULES'] = 'Read the rules laid out screenshots!'; +$lang['GO_TO_PAGE'] = 'Go to page ...'; +$lang['EDIT'] = 'Edit'; +$lang['SAVE'] = 'Save'; +$lang['NEW_WINDOW'] = 'in a new window'; \ No newline at end of file diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index 51030da2f..397ced247 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -30,6 +30,7 @@ $lang['POSTED'] = 'Добавлено'; $lang['USERNAME'] = 'Имя'; $lang['PASSWORD'] = 'Пароль'; $lang['EMAIL'] = 'Email'; +$lang['PM'] = 'ЛС'; $lang['POSTER'] = 'Автор'; $lang['AUTHOR'] = 'Автор'; $lang['TIME'] = 'Время'; @@ -266,6 +267,8 @@ $lang['CODE'] = 'Код'; // comes before bbcode code output. $lang['CODE_COPIED'] = 'Код скопирован в буфер обмена'; $lang['CODE_COPY'] = 'скопировать в буфер обмена'; $lang['SPOILER_HEAD'] = 'скрытый текст'; +$lang['SPOILER_CLOSE'] = 'свернуть'; + $lang['EDITED_TIME_TOTAL'] = 'Последний раз редактировалось: %s (%s), всего редактировалось %d раз'; // Last edited by me on 12 Oct 2001, edited 1 time in total $lang['EDITED_TIMES_TOTAL'] = 'Последний раз редактировалось: %s (%s), всего редактировалось %d раз(а)'; // Last edited by me on 12 Oct 2001, edited 2 times in total @@ -1198,6 +1201,7 @@ $lang['MAGNET'] = 'Magnet'; //torrent status mod $lang['TOR_STATUS'] = 'Статус'; $lang['TOR_STATUS_SELECT_ACTION'] = 'Выберите статус'; +$lang['TOR_STATUS_NOT_SELECT'] = 'Вы не выбрали статус.'; $lang['TOR_STATUS_SELECT_ALL'] = 'Все статусы'; $lang['TOR_STATUS_NAME'] = array( TOR_NOT_APPROVED => 'не проверено', @@ -1575,6 +1579,16 @@ $lang['INVALID_DATE'] = 'Ошибка даты '; $lang['PROFILE_USER'] = 'Профиль пользователя'; $lang['GOOD_UPDATE'] = 'был успешно изменён'; $lang['FORBADE_VIEWING'] = 'запретил гостям просмотр своего профиля'; +$lang['DENY_VISITORS'] = 'Запретить гостям просмотр вашего профиля:'; +$lang['BAN_USER'] = 'Запретить пользователю:'; +$lang['USER_NOT_ALLOWED'] = 'Пользователю запрещено:'; +$lang['HIDE_AVATARS'] = 'Показывать аватар'; +$lang['SHOW_CAPTION'] = 'Показывать подпись'; +$lang['DOWNLOAD_TORRENT'] = 'Скачивать торренты'; +$lang['SEND_PM'] = 'Отправлять ЛС'; +$lang['SEND_MESSAGE'] = 'Отправлять сообщения'; +$lang['EDIT_POST'] = 'Редактировать сообщения'; +$lang['NEW_THREADS'] = 'Создавать темы'; // Регистрация @@ -1586,8 +1600,11 @@ $lang['CHOOSE_PASS_ERR'] = 'Введённые пароли не совпада $lang['CHOOSE_PASS_ERR_20'] = 'Пароль должен быть не длиннее 20 символов'; $lang['CHOOSE_PASS_OK'] = 'Пароли совпадают, можете продолжить регистрацию.'; $lang['CHOOSE_PASS_FAILED'] = 'Для изменения пароля вы должны правильно указать текущий пароль'; - $lang['EMAILER_DISABLED'] = 'Извините, эта функция временно не работает'; +$lang['TERMS_ON'] = 'Я согласен с этими условиями'; +$lang['TERMS_OFF'] = 'Я не согласен с этими условиями'; +$lang['JAVASCRIPT_ON_REGISTER'] = 'Для регистрации необходимo включить JavaScript'; + // Debug $lang['EXECUTION_TIME'] = 'Время выполнения:'; @@ -1602,3 +1619,9 @@ $lang['DOWNLOAD_INFO'] = 'Скачать бесплатно и на максим $lang['HOW_TO_DOWNLOAD'] = 'Как скачивать?'; $lang['WHAT_IS_A_TORRENT'] = 'Что такое торрент?'; $lang['RATINGS_AND_LIMITATIONS'] = 'Рейтинг и ограничения'; + +$lang['SCREENSHOTS_RULES'] = 'Прочтите правила выкладывания скриншотов!'; +$lang['GO_TO_PAGE'] = 'К странице...'; +$lang['EDIT'] = 'Изменить'; +$lang['SAVE'] = 'Сохранить'; +$lang['NEW_WINDOW'] = 'в новом окне'; \ No newline at end of file diff --git a/upload/memberlist.php b/upload/memberlist.php index 41725c4bd..9679518aa 100644 --- a/upload/memberlist.php +++ b/upload/memberlist.php @@ -152,7 +152,7 @@ $template->assign_vars(array( )); // per-letter selection end -$sql = "SELECT username, user_id, user_opt, user_posts, user_regdate, user_from, user_website, user_email, user_icq, user_avatar, user_avatar_type +$sql = "SELECT username, user_id, user_opt, user_posts, user_regdate, user_from, user_website, user_avatar, user_avatar_type FROM ". BB_USERS ." WHERE user_id NOT IN(". EXCLUDED_USERS_CSV .")"; if ( $username ) @@ -212,9 +212,9 @@ if ( $row = DB()->sql_fetchrow($result) ) } else { - $template->assign_block_vars('no_username', array( + $template->assign_block_vars('no_username', array( 'NO_USER_ID_SPECIFIED' => $lang['NO_USER_ID_SPECIFIED'] ) - ); + ); } $paginationurl = "memberlist.php?mode=$mode&order=$sort_order&letter=$by_letter"; if ($paginationusername) $paginationurl .= "&username=$paginationusername"; diff --git a/upload/templates/default/agreement.tpl b/upload/templates/default/agreement.tpl index 8b3446d02..69faa8dc9 100644 --- a/upload/templates/default/agreement.tpl +++ b/upload/templates/default/agreement.tpl @@ -14,9 +14,9 @@
- Я согласен с этими условиями + {L_TERMS_ON}

- Я не согласен с этими условиями + {L_TERMS_OFF}
@@ -24,4 +24,4 @@ - + diff --git a/upload/templates/default/login.tpl b/upload/templates/default/login.tpl index f43135db2..8835a8f07 100644 --- a/upload/templates/default/login.tpl +++ b/upload/templates/default/login.tpl @@ -18,7 +18,7 @@

{LOGIN_ERR_MSG}

-

Для получения доступа к мод/админ опциям необходимо еще раз ввести пароль

+

{L_ADMIN_REAUTHENTICATE}

{L_ENTER_PASSWORD}

@@ -36,7 +36,7 @@ - Код: + {L_CODE} {CAPTCHA_HTML} diff --git a/upload/templates/default/memberlist.tpl b/upload/templates/default/memberlist.tpl index 6cdb9f472..aced3b28c 100644 --- a/upload/templates/default/memberlist.tpl +++ b/upload/templates/default/memberlist.tpl @@ -21,8 +21,7 @@ # {L_USERNAME} - PM - {L_EMAIL} + {L_PM} {L_LOCATION} {L_JOINED} {L_POSTS_SHORT} @@ -39,12 +38,10 @@ {memberrow.ROW_NUMBER} {memberrow.USERNAME} {memberrow.PM} - {memberrow.EMAIL} -
{memberrow.FROM}{memberrow.FLAG}
diff --git a/upload/templates/default/page_header.tpl b/upload/templates/default/page_header.tpl index acb2d30ac..799a625ae 100644 --- a/upload/templates/default/page_header.tpl +++ b/upload/templates/default/page_header.tpl @@ -81,13 +81,13 @@ function initSpoilers(context) { $('div.sp-body', context).each(function(){ var $sp_body = $(this); - var name = $.trim(this.title) || 'скрытый текст'; + var name = $.trim(this.title) || '{L_SPOILER_HEAD}'; this.title = ''; var $sp_head = $('
'+ name +'
'); $sp_head.insertBefore($sp_body).click(function(e){ if (!$sp_body.hasClass('inited')) { initPostImages($sp_body); - var $sp_fold_btn = $('
[свернуть]
').click(function(){ + var $sp_fold_btn = $('
[{L_SPOILER_CLOSE}]
').click(function(){ $.scrollTo($sp_head, { duration:200, axis:'y', offset:-200 }); $sp_head.click().animate({opacity: 0.1}, 500).animate({opacity: 1}, 700); }); @@ -119,7 +119,7 @@ function fixPostImage ($img) var banned_image_hosts = /imagebanana|hidebehind/i; // imageshack var src = $img[0].src; if (src.match(banned_image_hosts)) { - $img.wrap('').attr({ src: "{SMILES_URL}/tr_oops.gif", title: "Прочтите правила выкладывания скриншотов!" }); + $img.wrap('').attr({ src: "{SMILES_URL}/tr_oops.gif", title: "{L_SCREENSHOTS_RULES}" }); } return $img; } @@ -203,7 +203,7 @@ input[type="checkbox"] { margin-bottom: -1px; } -
Loading...
-
Error
+
{L_LOADING}
+
{L_ERROR}
@@ -300,7 +300,6 @@ function OpenInEditor ($file, $line) {L_HOME}· - {L_TRACKER}· {L_GALLERY}· {L_SEARCH}· @@ -327,20 +326,18 @@ function OpenInEditor ($file, $line)
- - - +
- {L_USER_WELCOME}  {THIS_USERNAME}  [ {L_LOGOUT} ] -
+ + - - + +
+ {L_USER_WELCOME}  {THIS_USERNAME}  [ {L_LOGOUT} ] + @@ -446,11 +443,11 @@ important_info
{L_YOUR_RATIO}{USER_RATIO}{L_NONE} (DL < {MIN_DL_FOR_RATIO})
{L_DOWNLOADED}{DOWN_TOTAL}
{L_UPLOADED}{UP_TOTAL}
{L_RELEASED}{RELEASED}
{L_BT_BONUS_UP}{UP_BONUS}
{L_RELEASED}{RELEASED}
{L_BT_BONUS_UP}{UP_BONUS}
diff --git a/upload/templates/default/privmsgs.tpl b/upload/templates/default/privmsgs.tpl index 56f7f77a6..06a3759ba 100644 --- a/upload/templates/default/privmsgs.tpl +++ b/upload/templates/default/privmsgs.tpl @@ -83,7 +83,7 @@ {listrow.L_PRIVMSG_FOLDER_ALT} - {listrow.SUBJECT} + {listrow.SUBJECT} {listrow.FROM} {listrow.DATE} diff --git a/upload/templates/default/usercp_register.tpl b/upload/templates/default/usercp_register.tpl index f8bc06eb9..9a8e05f56 100644 --- a/upload/templates/default/usercp_register.tpl +++ b/upload/templates/default/usercp_register.tpl @@ -177,7 +177,7 @@ ajax.callback.posts = function(data){ - Запретить гостям просмотр вашего профиля: + {L_DENY_VISITORS}    diff --git a/upload/templates/default/usercp_viewprofile.tpl b/upload/templates/default/usercp_viewprofile.tpl index 9a6bfbdf6..65d4c905e 100644 --- a/upload/templates/default/usercp_viewprofile.tpl +++ b/upload/templates/default/usercp_viewprofile.tpl @@ -174,25 +174,25 @@ $(document).ready(function(){
- Юзеру ЗАПРЕЩЕНО + {L_USER_NOT_ALLOWED}
diff --git a/upload/templates/default/viewforum.tpl b/upload/templates/default/viewforum.tpl index 87f34d5f0..90354b5f3 100644 --- a/upload/templates/default/viewforum.tpl +++ b/upload/templates/default/viewforum.tpl @@ -117,13 +117,13 @@ function mod_action (mode) topics += ','+ this.value; }); if(!topics){ - alert('Вы не выбрали ни одной темы.'); + alert('{L_NONE_SELECTED}'); return false; } if(mode == 'tor_status'){ status = $('#st option:selected').val(); if(status == '-1'){ - alert('Вы не выбрали статус.'); + alert('{L_TOR_STATUS_NOT_SELECT}'); return false; } ajax.mod_action(topics, mode, status); @@ -161,7 +161,7 @@ ajax.callback.mod_action = function(data) { {SELECT_ST} - +
@@ -169,7 +169,7 @@ ajax.callback.mod_action = function(data) { - +
@@ -177,8 +177,8 @@ ajax.callback.mod_action = function(data) { diff --git a/upload/templates/default/viewtopic_attach.tpl b/upload/templates/default/viewtopic_attach.tpl index 461aa7c20..6bbeba52e 100644 --- a/upload/templates/default/viewtopic_attach.tpl +++ b/upload/templates/default/viewtopic_attach.tpl @@ -280,7 +280,7 @@ {postrow.attach.tor_reged.TOR_STATUS_SELECT} - + @@ -337,7 +337,7 @@ -   +   {TOR_HELP_LINKS}