diff --git a/upload/ajax/change_tor_status.php b/upload/ajax/change_tor_status.php index 38f520802..9b439ad77 100644 --- a/upload/ajax/change_tor_status.php +++ b/upload/ajax/change_tor_status.php @@ -2,8 +2,6 @@ if (!defined('IN_AJAX')) die(basename(__FILE__)); -global $bb_cfg; - global $userdata, $bb_cfg, $lang; if (!isset($this->request['attach_id'])) diff --git a/upload/ajax/mod_action.php b/upload/ajax/mod_action.php index 6a7d8645c..ae858586c 100644 --- a/upload/ajax/mod_action.php +++ b/upload/ajax/mod_action.php @@ -2,8 +2,6 @@ if (!defined('IN_AJAX')) die(basename(__FILE__)); -global $bb_cfg; - global $userdata, $bb_cfg, $lang; $mode = (string) $this->request['mode']; diff --git a/upload/attach_mod/displaying.php b/upload/attach_mod/displaying.php index 4b26d4111..ed7974129 100644 --- a/upload/attach_mod/displaying.php +++ b/upload/attach_mod/displaying.php @@ -1,15 +1,5 @@ assign_vars(array( - 'L_DESCRIPTION' => $lang['DESCRIPTION'], - 'L_DOWNLOAD' => $lang['DOWNLOAD'], - 'L_FILENAME' => $lang['FILE_NAME'], - 'L_FILESIZE' => $lang['FILESIZE']) - ); - // define category $image = FALSE; $stream = FALSE; diff --git a/upload/attach_mod/displaying_torrent.php b/upload/attach_mod/displaying_torrent.php index 6e6affad7..f199b247f 100644 --- a/upload/attach_mod/displaying_torrent.php +++ b/upload/attach_mod/displaying_torrent.php @@ -1,9 +1,8 @@ assign_vars(array( 'TOR_CONTROLS' => true, 'TOR_ACTION' => "torrent.php", - - //torrent status mod 'TOR_STATUS' => "torstatus.php", - //end torrent status mod - 'TOR_ATTACH_ID' => $attach_id, )); @@ -233,13 +228,10 @@ if ($tor_reged && $tor_info) 'DL_LINK_CLASS' => (isset($bt_userdata['user_status'])) ? $dl_link_css[$bt_userdata['user_status']] : 'genmed', 'DL_TITLE_CLASS' => (isset($bt_userdata['user_status'])) ? $dl_status_css[$bt_userdata['user_status']] : 'gen', 'FILESIZE' => $tor_file_size, - 'MAGNET' => $tor_magnet, - 'DOWNLOAD_COUNT' => sprintf($lang['DOWNLOAD_NUMBER'], $download_count), 'REGED_TIME' => bb_date($tor_info['reg_time']), 'REGED_DELTA' => delta_time($tor_info['reg_time']), - 'TORRENT_SIZE' => humn_size($tor_size), 'COMPLETED' => sprintf($lang['DOWNLOAD_NUMBER'], $tor_info['complete_count']), )); diff --git a/upload/attach_mod/includes/functions_admin.php b/upload/attach_mod/includes/functions_admin.php index 63355c7e4..307187d71 100644 --- a/upload/attach_mod/includes/functions_admin.php +++ b/upload/attach_mod/includes/functions_admin.php @@ -1,12 +1,4 @@ assign_block_vars('switch_upload_limits', array()); $template->assign_vars(array( - 'L_UACP' => $lang['UACP'], 'U_UACP' => BB_ROOT ."profile.php?mode=attachcp&u=$user_id&sid={$userdata['session_id']}", 'UPLOADED' => sprintf($lang['USER_UPLOADED_PROFILE'], $user_uploaded), 'QUOTA' => sprintf($lang['USER_QUOTA_PROFILE'], $user_quota), diff --git a/upload/attach_mod/includes/functions_selects.php b/upload/attach_mod/includes/functions_selects.php index 5e3d45783..9f4b8962d 100644 --- a/upload/attach_mod/includes/functions_selects.php +++ b/upload/attach_mod/includes/functions_selects.php @@ -1,12 +1,4 @@ attachment_thumbnail_list, $this->thumbnail); $this->file_comment = ''; - - // This Variable is set to FALSE here, because the Attachment Mod enter Attachments into the - // Database in two modes, one if the id_list is 0 and the second one if post_attach is true - // Since post_attach is automatically switched to true if an Attachment got added to the filesystem, - // but we are assigning an id of 0 here, we have to reset the post_attach variable to FALSE. - // - // This is very relevant, because it could happen that the post got not submitted, but we do not - // know this circumstance here. We could be at the posting page or we could be redirected to the entered - // post. :) $this->post_attach = FALSE; } } @@ -592,7 +558,6 @@ class attach_parent $this->attachment_id_list[$actual_element] = $actual_id_list[$actual_element]; $this->attachment_thumbnail_list[$actual_element] = $this->thumbnail; $this->file_comment = ''; - } } @@ -793,12 +758,7 @@ class attach_parent $u_rules_id = $forum_id; $template->assign_vars(array( - 'L_ADD_ATTACHMENT_TITLE' => $lang['ADD_ATTACHMENT_TITLE'], - 'L_POSTED_ATTACHMENTS' => $lang['POSTED_ATTACHMENTS'], - 'L_FILE_NAME' => $lang['FILE_NAME'], - 'L_FILE_COMMENT' => $lang['FILE_COMMENT'], 'RULES' => ''. $lang['ALLOWED_EXTENSIONS_AND_SIZES'] .'', - 'ADD_ATTACH_HIDDEN_FIELDS' => $s_hidden, )); @@ -829,11 +789,6 @@ class attach_parent if ($this->add_attachment_body) { $template->assign_vars(array( - 'TPL_ADD_ATTACHMENT' => true, - 'L_ADD_ATTACH_TITLE' => $lang['ADD_ATTACHMENT_TITLE'], - 'L_ADD_ATTACH_EXPLAIN' => $lang['ADD_ATTACHMENT_EXPLAIN'], - 'L_ADD_ATTACHMENT' => $lang['ADD_ATTACHMENT'], - 'FILE_COMMENT' => htmlspecialchars($this->file_comment), 'FILESIZE' => $attach_config['max_filesize'], 'FILENAME' => htmlspecialchars($this->filename), @@ -846,11 +801,6 @@ class attach_parent { $template->assign_vars(array( 'TPL_POSTED_ATTACHMENTS' => true, - 'L_POSTED_ATTACHMENTS' => $lang['POSTED_ATTACHMENTS'], - 'L_UPDATE_COMMENT' => $lang['UPDATE_COMMENT'], - 'L_UPLOAD_NEW_VERSION' => $lang['UPLOAD_NEW_VERSION'], - 'L_DELETE_ATTACHMENT' => $lang['DELETE_ATTACHMENT'], - 'L_DELETE_THUMBNAIL' => $lang['DELETE_THUMBNAIL'], )); for ($i = 0; $i < sizeof($this->attachment_list); $i++) diff --git a/upload/bt/includes/init_tr.php b/upload/bt/includes/init_tr.php index 86ed7e9e7..a96d06b06 100644 --- a/upload/bt/includes/init_tr.php +++ b/upload/bt/includes/init_tr.php @@ -3,10 +3,7 @@ if (!defined('IN_TRACKER')) die(basename(__FILE__)); // Exit if tracker is disabled -if ($tr_cfg['off']) -{ - tr_die($tr_cfg['off_reason']); -} +if ($tr_cfg['off']) tr_die($tr_cfg['off_reason']); // // Functions diff --git a/upload/bt/scrape.php b/upload/bt/scrape.php index 20643eb4b..20f50e786 100644 --- a/upload/bt/scrape.php +++ b/upload/bt/scrape.php @@ -4,10 +4,7 @@ define('IN_TRACKER', true); define('BB_ROOT', './../'); require(BB_ROOT .'common.php'); -if (!$tr_cfg['scrape']) -{ - msg_die('Please disable SCRAPE!'); -} +if (!$tr_cfg['scrape']) msg_die('Please disable SCRAPE!'); if($bb_cfg['announce_type'] == 'xbt') { diff --git a/upload/config.php b/upload/config.php index 2947f9deb..b6b091d50 100644 --- a/upload/config.php +++ b/upload/config.php @@ -57,8 +57,8 @@ $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 r161'; -$bb_cfg['tp_release_date'] = '26-07-2011'; +$bb_cfg['tp_release_state'] = 'TP II r162'; +$bb_cfg['tp_release_date'] = '27-07-2011'; $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger $bb_cfg['srv_overloaded_msg'] = "Извините, в данный момент сервер перегружен\nПопробуйте повторить запрос через несколько минут"; diff --git a/upload/config_mods.php b/upload/config_mods.php index d6fcfc3be..7d4f203c0 100644 --- a/upload/config_mods.php +++ b/upload/config_mods.php @@ -8,6 +8,7 @@ - Gallery - Magnet links - No avatar + - CallSeed */ if (!defined('BB_ROOT')) die(basename(__FILE__)); @@ -33,4 +34,7 @@ $bb_cfg['no_avatar'] = 'images/avatars/gallery/noavatar.png'; // Birthday $bb_cfg['birthday']['enabled'] = true; $bb_cfg['birthday']['max_user_age'] = 100; -$bb_cfg['birthday']['min_user_age'] = 10; \ No newline at end of file +$bb_cfg['birthday']['min_user_age'] = 10; + +// CallSeed +$bb_cfg['callseed'] = false; \ No newline at end of file diff --git a/upload/includes/bbcode.php b/upload/includes/bbcode.php index 22bca8df5..5967cac14 100644 --- a/upload/includes/bbcode.php +++ b/upload/includes/bbcode.php @@ -172,7 +172,6 @@ function generate_smilies($mode) $template->assign_block_vars('switch_smilies_extra', array()); $template->assign_vars(array( - 'L_MORE_SMILIES' => $lang['MORE_EMOTICONS'], 'U_MORE_SMILIES' => append_sid("posting.php?mode=smilies")) ); } diff --git a/upload/includes/functions.php b/upload/includes/functions.php index a014e0088..bd9b6a4ef 100644 --- a/upload/includes/functions.php +++ b/upload/includes/functions.php @@ -2733,7 +2733,7 @@ function get_path_from_id ($id, $ext_id, $base_path, $first_div, $sec_div) return ($base_path ? "$base_path/" : '') . ($id % $sec_div) .'/'. $id . ($ext ? ".$ext" : ''); } -function send_pm($user_id, $subject, $message) +/*function send_pm($user_id, $subject, $message) { global $userdata; $subject = DB()->escape($subject); @@ -2751,4 +2751,4 @@ function send_pm($user_id, $subject, $message) user_last_privmsg = ". TIMENOW .", user_newest_pm_id = $pm_id WHERE user_id = $user_id"); -} \ No newline at end of file +}*/ \ No newline at end of file diff --git a/upload/includes/page_footer.php b/upload/includes/page_footer.php index 2a9e8725b..eb874db34 100644 --- a/upload/includes/page_footer.php +++ b/upload/includes/page_footer.php @@ -12,7 +12,6 @@ if (!empty($template)) 'TRANSLATION_INFO' => isset($lang['TRANSLATION_INFO']) ? $lang['TRANSLATION_INFO'] : '', 'SHOW_ADMIN_LINK' => (IS_ADMIN && !defined('IN_ADMIN')), 'ADMIN_LINK_HREF' => "admin/index.php", - 'L_GOTO_ADMINCP' => $lang['ADMIN_PANEL'], )); diff --git a/upload/includes/topic_templates.php b/upload/includes/topic_templates.php index 42660a5b0..d0132bef2 100644 --- a/upload/includes/topic_templates.php +++ b/upload/includes/topic_templates.php @@ -1,10 +1,6 @@ fetch_row($sql)) require(INC_DIR .'topic_templates/tpl_selects.php'); $template->assign_vars(array( - 'PAGE_TITLE' => $lang['BT_NEW_RELEASE'], + 'PAGE_TITLE' => $lang['NEW_RELEASE'], 'FORUM_NAME' => htmlCHR($post_info['forum_name']), 'S_ACTION' => append_sid("posting.php?mode=newtopic&tpl=1&". POST_FORUM_URL .'='. $post_info['forum_id']), 'S_CANCEL_ACTION' => append_sid(FORUM_URL . $post_info['forum_id']), @@ -94,12 +90,7 @@ if ($topic_tpl = DB()->fetch_row($sql)) 'REGULAR_TOPIC_BUTTON' => true, # (IS_MOD || IS_ADMIN), 'REGULAR_TOPIC_HREF' => append_sid("posting.php?mode=newtopic&". POST_FORUM_URL .'='. $post_info['forum_id']), - 'L_POST_REGULAR_TOPIC' => $lang['POST_REGULAR_TOPIC'], - 'L_BACK' => $lang['BT_BACK'], - 'L_ERROR' => $lang['BT_BAD_FIELDS'], - 'L_NEXT' => $lang['BT_NEXT'], - 'L_RELEASE_WELCOME' => $lang['BT_FILL_FORM'], 'L_TITLE' => $lang['TPL']['RELEASE_NAME'], 'L_TITLE_DESC' => $lang['TPL']['RELEASE_NAME_DESC'], 'L_ORIGINAL_TITLE' => $lang['TPL']['ORIGINAL_NAME'], diff --git a/upload/includes/topic_templates/tpl_selects.php b/upload/includes/topic_templates/tpl_selects.php index 104a4f835..b4cbd9a6c 100644 --- a/upload/includes/topic_templates/tpl_selects.php +++ b/upload/includes/topic_templates/tpl_selects.php @@ -22,7 +22,7 @@ $selects = array( 'SEL_VIDEO_CODECS' => array( 'DivX', 'XviD', - "{$lang['BT_OTHER']} MPEG4", + "{$lang['OTHER']} MPEG4", 'VPx', 'MPEG1', 'MPEG2', diff --git a/upload/includes/torrent_show_dl_list.php b/upload/includes/torrent_show_dl_list.php index ed7a958b6..d5953b07f 100644 --- a/upload/includes/torrent_show_dl_list.php +++ b/upload/includes/torrent_show_dl_list.php @@ -131,7 +131,6 @@ if ($show_dl_buttons) '; $template->assign_vars(array( - 'L_NONE' => $lang['NONE'], 'DL_HIDDEN_FIELDS' => $dl_hidden_fields, 'S_DL_ACTION' => append_sid("dl_list.php?". POST_TOPIC_URL ."=$topic_id"), )); diff --git a/upload/includes/ucp/torrent_userprofile.php b/upload/includes/ucp/torrent_userprofile.php index 391a3471c..958b19a92 100644 --- a/upload/includes/ucp/torrent_userprofile.php +++ b/upload/includes/ucp/torrent_userprofile.php @@ -22,7 +22,6 @@ if ($profile_user_id == $userdata['user_id']) { $template->assign_vars(array( 'EDIT_PROF' => true, - 'L_EDIT_PROF' => $lang['EDIT_PROFILE'], 'EDIT_PROF_HREF' => append_sid("profile.php?mode=editprofile"), )); } @@ -39,7 +38,7 @@ if (IS_ADMIN) $template->assign_vars(array( 'SHOW_PASSKEY' => true, 'S_GEN_PASSKEY' => ''. $lang['BT_GEN_PASSKEY_URL'] .'', - 'CAN_EDIT_RATIO' => IS_SUPER_ADMIN, + 'CAN_EDIT_RATIO' => IS_ADMIN, )); } else @@ -172,18 +171,6 @@ if (!IS_USER || $profile_user_id == $userdata['user_id']) $page_cfg['dl_links_user_id'] = $profile_user_id; } -$template->assign_vars(array( - 'U_TORRENT_PROFILE' => append_sid("profile.php?mode=viewprofile&u=". $profiledata['user_id']) . '#torrent', - 'L_TORRENT_PROFILE' => $lang['VIEW_TORRENT_PROFILE'], - 'L_UP_TOTAL' => $lang['PROFILE_UP_TOTAL'], - 'L_DOWN_TOTAL' => $lang['PROFILE_DOWN_TOTAL'], - 'L_BONUS' => $lang['PROFILE_BONUS'], - 'L_TOTAL_RELEASED' => $lang['PROFILE_RELEASED'], - 'L_USER_RATIO' => $lang['PROFILE_RATIO'], - 'L_MAX_SPEED' => $lang['PROFILE_MAX_SPEED'], - 'L_IT_WILL_BE_DOWN' => $lang['PROFILE_IT_WILL_BE_DOWNLOADED'], -)); - $sql = 'SELECT SUM(speed_up) as speed_up, SUM(speed_down) as speed_down FROM '. BB_BT_TRACKER .' WHERE user_id = ' . $profile_user_id . ''; diff --git a/upload/includes/ucp/usercp_avatar.php b/upload/includes/ucp/usercp_avatar.php index 210aaec1d..d07cb403c 100644 --- a/upload/includes/ucp/usercp_avatar.php +++ b/upload/includes/ucp/usercp_avatar.php @@ -1,25 +1,4 @@ DB()->escape($avatar_category . '/' . $avatar_filename), 'user_avatar_type' => USER_AVATAR_GALLERY); } diff --git a/upload/includes/ucp/usercp_email.php b/upload/includes/ucp/usercp_email.php index 399e4ec52..02bf72d76 100644 --- a/upload/includes/ucp/usercp_email.php +++ b/upload/includes/ucp/usercp_email.php @@ -121,11 +121,8 @@ if ( $row = DB()->fetch_row($sql) ) $template->assign_vars(array( 'USERNAME' => $username, - 'S_HIDDEN_FIELDS' => '', 'S_POST_ACTION' => append_sid("profile.php?mode=email&" . POST_USERS_URL . "=$user_id"), - - 'L_MESSAGE_BODY_DESC' => $lang['EMAIL_MESSAGE_DESC'], )); print_page('usercp_email.tpl'); diff --git a/upload/includes/ucp/usercp_viewprofile.php b/upload/includes/ucp/usercp_viewprofile.php index 852c17b09..bd040d37a 100644 --- a/upload/includes/ucp/usercp_viewprofile.php +++ b/upload/includes/ucp/usercp_viewprofile.php @@ -155,7 +155,6 @@ $template->assign_vars(array( 'U_SEARCH_USER' => "search.php?search_author=1&uid={$profiledata['user_id']}", 'U_SEARCH_TOPICS' => "search.php?uid={$profiledata['user_id']}&myt=1", 'U_SEARCH_RELEASES' => "tracker.php?rid={$profiledata['user_id']}#results", - 'L_SEARCH_RELEASES' => $lang['SEARCH_USER_RELEASES'], 'S_PROFILE_ACTION' => "profile.php", @@ -170,8 +169,6 @@ include(INC_DIR .'ucp/torrent_userprofile.php'); $template->assign_vars(array( 'SHOW_ACCESS_PRIVILEGE' => IS_ADMIN, - 'L_ACCESS' => $lang['ACCESS'], - 'L_ACCESS_SRV_LOAD' => $lang['ACCESS_SRV_LOAD'], 'IGNORE_SRV_LOAD' => ($profiledata['user_level'] != USER || $profiledata['ignore_srv_load']) ? $lang['NO'] : $lang['YES'], 'IGNORE_SRV_LOAD_EDIT' => ($profiledata['user_level'] == USER), )); diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index c5abdd098..630bb713c 100644 --- a/upload/language/lang_english/lang_main.php +++ b/upload/language/lang_english/lang_main.php @@ -1050,11 +1050,14 @@ $lang['VIEWED'] = 'Viewed'; $lang['DOWNLOAD_NUMBER'] = '%d times'; // replace %d with count $lang['EXTENSION_DISABLED_AFTER_POSTING'] = 'The Extension \'%s\' was deactivated by an board admin, therefore this Attachment is not displayed.'; // used in Posts and PM's, replace %s with mime type +$lang['ATTACHMENT'] = 'Attachments'; +$lang['ATTACHMENT_THUMBNAIL'] = 'Attachment Thumbnail'; + // Posting/PM -> Posting Attachments $lang['ADD_ATTACHMENT'] = 'Add Attachment'; $lang['ADD_ATTACHMENT_TITLE'] = 'Add an Attachment'; $lang['ADD_ATTACHMENT_EXPLAIN'] = 'If you do not want to add an Attachment to your Post, please leave the Fields blank'; -$lang['FILE_NAME'] = 'Filename'; +$lang['FILENAME'] = 'Filename'; $lang['FILE_COMMENT'] = 'File Comment'; // Posting/PM -> Posted Attachments @@ -1277,7 +1280,7 @@ $lang['SEARCH_DL_COMPLETE_DOWNLOADS'] = 'Completed Downloads'; $lang['SEARCH_DL_CANCEL'] = 'Canceled'; $lang['CUR_DOWNLOADS'] = 'Current Downloads'; $lang['CUR_UPLOADS'] = 'Current Uploads'; -$lang['SEARCH_USER_RELEASES'] = 'Find all current releases'; +$lang['SEARCH_RELEASES'] = 'Find all current releases'; $lang['TOR_SEARCH_TITLE'] = 'Torrent search options'; $lang['OPEN_TOPIC'] = 'Open topic'; @@ -1290,15 +1293,14 @@ $lang['ONLY_1_TOR_PER_POST'] = 'You can register only one torrent in one post'; $lang['ONLY_1_TOR_PER_TOPIC'] = 'You can register only one torrent in one topic'; $lang['VIEWING_USER_BT_PROFILE'] = 'Viewing torrent-profile :: %s'; // %s is username $lang['CUR_ACTIVE_DLS'] = 'Currently active torrents'; -$lang['VIEW_TORRENT_PROFILE'] = 'Torrent-profile'; -$lang['PROFILE_UP_TOTAL'] = 'Total uploaded'; -$lang['PROFILE_DOWN_TOTAL'] = 'Total downloaded'; -$lang['PROFILE_BONUS'] = 'Bonus'; -$lang['PROFILE_RELEASED'] = 'Total released'; -$lang['PROFILE_RATIO'] = 'Ratio'; -$lang['PROFILE_MAX_SPEED'] = 'Speed'; -$lang['PROFILE_IT_WILL_BE_DOWNLOADED'] = 'it will start to be considered after it will be downloaded'; +$lang['UP_TOTAL'] = 'Total uploaded'; +$lang['DOWN_TOTAL'] = 'Total downloaded'; +$lang['BONUS'] = 'Bonus'; +$lang['TOTAL_RELEASED'] = 'Total released'; +$lang['USER_RATIO'] = 'Ratio'; +$lang['MAX_SPEED'] = 'Speed'; +$lang['IT_WILL_BE_DOWN'] = 'it will start to be considered after it will be downloaded'; $lang['CURR_PASSKEY'] = 'Current passkey:'; $lang['SPMODE_FULL'] = 'Show peers in full details'; @@ -1541,4 +1543,11 @@ $lang['TRACKER_S'] = 'on tracker'; $lang['NOTICE'] = '!ATTENTION!'; $lang['POWERED'] = 'Powered by TorrentPier © Meithar'; $lang['DIVE'] = 'The forum is submitted on base phpBB © phpBB Group'; -$lang['COPY'] = 'The site does not give electronic versions of products, and is engaged only in a collecting and cataloguing of the references sent and published at a forum by our readers. If you are the legal owner of any submitted material and do not wish that the reference to him{it} was in our catalogue, contact us and we shall immediately remove her. Files for an exchange on tracker are given by users of a site, and the administration does not bear the responsibility for their maintenance. The request to not fill in the files protected by copyrights, and also files of the illegal maintenance!'; \ No newline at end of file +$lang['COPY'] = 'The site does not give electronic versions of products, and is engaged only in a collecting and cataloguing of the references sent and published at a forum by our readers. If you are the legal owner of any submitted material and do not wish that the reference to him{it} was in our catalogue, contact us and we shall immediately remove her. Files for an exchange on tracker are given by users of a site, and the administration does not bear the responsibility for their maintenance. The request to not fill in the files protected by copyrights, and also files of the illegal maintenance!'; + +$lang['CALLSEED'] = 'Downloaded the call'; +// FILELIST +$lang['FILELIST'] = 'Filelist'; +$lang['COLLAPSE'] = 'Collapse directory'; +$lang['EXPAND'] = 'Expand'; +$lang['SWITCH'] = 'Switch'; \ No newline at end of file diff --git a/upload/language/lang_english/lang_topic_templates.php b/upload/language/lang_english/lang_topic_templates.php index fb9308176..52e0a14b0 100644 --- a/upload/language/lang_english/lang_topic_templates.php +++ b/upload/language/lang_english/lang_topic_templates.php @@ -4,12 +4,12 @@ $lang['RELEASE'] = 'Release Templates'; $lang['RELEASED'] = 'Released'; $lang['RELEASES'] = 'Releases'; -$lang['BT_BACK'] = 'Back'; -$lang['BT_BAD_FIELDS'] = 'Invalid fields'; -$lang['BT_FILL_FORM'] = 'Pleae fill in the releae form'; -$lang['BT_NEW_RELEASE'] = 'New release'; -$lang['BT_NEXT'] = 'Continue'; -$lang['BT_OTHER'] = 'Other'; +$lang['BACK'] = 'Back'; +$lang['ERROR'] = 'Invalid fields'; +$lang['RELEASE_WELCOME'] = 'Pleae fill in the releae form'; +$lang['NEW_RELEASE'] = 'New release'; +$lang['NEXT'] = 'Continue'; +$lang['OTHER'] = 'Other'; $lang['TPL']['AGE'] = 'Age'; $lang['TPL']['ANNOTATION'] = 'Annotation'; diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index f7ecee291..3c67522f2 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -1059,11 +1059,14 @@ $lang['VIEWED'] = 'Просмотров'; $lang['DOWNLOAD_NUMBER'] = '%d раз'; // replace %d with count $lang['EXTENSION_DISABLED_AFTER_POSTING'] = 'The Extension \'%s\' was deactivated by an board admin, therefore this Attachment is not displayed.'; // used in Posts and PM's, replace %s with mime type +$lang['ATTACHMENT'] = 'Вложения'; +$lang['ATTACHMENT_THUMBNAIL'] = 'Вложение Миниатюра'; + // Posting/PM -> Posting Attachments $lang['ADD_ATTACHMENT'] = 'Прикрепить файл'; $lang['ADD_ATTACHMENT_TITLE'] = 'Прикрепить файл'; $lang['ADD_ATTACHMENT_EXPLAIN'] = 'Если вы не хотите прикреплять файл, оставьте это поле пустым'; -$lang['FILE_NAME'] = 'Имя файла'; +$lang['FILENAME'] = 'Имя файла'; $lang['FILE_COMMENT'] = 'Комментарий'; // Posting/PM -> Posted Attachments @@ -1286,7 +1289,7 @@ $lang['SEARCH_DL_COMPLETE_DOWNLOADS'] = 'Прошлые закачки'; $lang['SEARCH_DL_CANCEL'] = 'Отмененные'; $lang['CUR_DOWNLOADS'] = 'Текущие закачки'; $lang['CUR_UPLOADS'] = 'Текущие раздачи'; -$lang['SEARCH_USER_RELEASES'] = 'Найти все текущие раздачи'; +$lang['SEARCH_RELEASES'] = 'Найти все текущие раздачи'; $lang['TOR_SEARCH_TITLE'] = 'Опции показа торрентов'; $lang['OPEN_TOPIC'] = 'Открыть топик'; @@ -1299,15 +1302,14 @@ $lang['ONLY_1_TOR_PER_POST'] = 'Вы не можете зарегистриро $lang['ONLY_1_TOR_PER_TOPIC'] = 'Вы не можете зарегистрировать еще один торрент для этого топика'; $lang['VIEWING_USER_BT_PROFILE'] = 'Torrent-профиль пользователя %s'; // %s is username $lang['CUR_ACTIVE_DLS'] = 'Текущие активные torrent\'ы'; -$lang['VIEW_TORRENT_PROFILE'] = 'Torrent-профиль'; -$lang['PROFILE_UP_TOTAL'] = 'Всего отдано'; -$lang['PROFILE_DOWN_TOTAL'] = 'Всего скачано'; -$lang['PROFILE_BONUS'] = 'Бонус'; -$lang['PROFILE_RELEASED'] = 'Отдано на своих раздачах'; -$lang['PROFILE_RATIO'] = 'Рейтинг'; -$lang['PROFILE_MAX_SPEED'] = 'Скорость'; -$lang['PROFILE_IT_WILL_BE_DOWNLOADED'] = 'начнет учитываться после того как будет скачано'; +$lang['UP_TOTAL'] = 'Всего отдано'; +$lang['DOWN_TOTAL'] = 'Всего скачано'; +$lang['BONUS'] = 'Бонус'; +$lang['TOTAL_RELEASED'] = 'Отдано на своих раздачах'; +$lang['USER_RATIO'] = 'Рейтинг'; +$lang['MAX_SPEED'] = 'Скорость'; +$lang['IT_WILL_BE_DOWN'] = 'начнет учитываться после того как будет скачано'; $lang['SPMODE_FULL'] = 'Подробная статистика пиров'; $lang['CURR_PASSKEY'] = 'Текущий passkey:'; @@ -1551,4 +1553,11 @@ $lang['TRACKER_S'] = 'по трекеру'; $lang['NOTICE'] = '!ВНИМАНИЕ!'; $lang['POWERED'] = 'Powered by TorrentPier © Meithar'; $lang['DIVE'] = 'Форум представлен на базе phpBB © phpBB Group'; -$lang['COPY'] = 'Сайт не предоставляет электронные версии произведений, а занимается лишь коллекционированием и каталогизацией ссылок, присылаемых и публикуемых на форуме нашими читателями. Если вы являетесь правообладателем какого-либо представленного материала и не желаете чтобы ссылка на него находилась в нашем каталоге, свяжитесь с нами и мы незамедлительно удалим её. Файлы для обмена на трекере предоставлены пользователями сайта, и администрация не несёт ответственности за их содержание. Просьба не заливать файлы, защищенные авторскими правами, а также файлы нелегального содержания!'; \ No newline at end of file +$lang['COPY'] = 'Сайт не предоставляет электронные версии произведений, а занимается лишь коллекционированием и каталогизацией ссылок, присылаемых и публикуемых на форуме нашими читателями. Если вы являетесь правообладателем какого-либо представленного материала и не желаете чтобы ссылка на него находилась в нашем каталоге, свяжитесь с нами и мы незамедлительно удалим её. Файлы для обмена на трекере предоставлены пользователями сайта, и администрация не несёт ответственности за их содержание. Просьба не заливать файлы, защищенные авторскими правами, а также файлы нелегального содержания!'; + +$lang['CALLSEED'] = 'Позвать скачавших'; +// FILELIST +$lang['FILELIST'] = 'Список файлов'; +$lang['COLLAPSE'] = 'Свернуть директории'; +$lang['EXPAND'] = 'Развернуть'; +$lang['SWITCH'] = 'Переключить'; diff --git a/upload/language/lang_russian/lang_topic_templates.php b/upload/language/lang_russian/lang_topic_templates.php index aa0f81f9b..b5f2f4cb4 100644 --- a/upload/language/lang_russian/lang_topic_templates.php +++ b/upload/language/lang_russian/lang_topic_templates.php @@ -4,12 +4,12 @@ $lang['RELEASE'] = 'Шаблоны для релизов'; $lang['RELEASED'] = 'На своих раздачах'; $lang['RELEASES'] = 'Релизы'; -$lang['BT_BACK'] = 'Назад'; -$lang['BT_BAD_FIELDS'] = 'Неверно заполнены поля'; -$lang['BT_FILL_FORM'] = 'Заполните форму для релиза'; -$lang['BT_NEW_RELEASE'] = 'Новый релиз'; -$lang['BT_NEXT'] = 'Продолжить'; -$lang['BT_OTHER'] = 'Другой'; +$lang['BACK'] = 'Назад'; +$lang['ERROR'] = 'Неверно заполнены поля'; +$lang['RELEASE_WELCOME'] = 'Заполните форму для релиза'; +$lang['NEW_RELEASE'] = 'Новый релиз'; +$lang['NEXT'] = 'Продолжить'; +$lang['OTHER'] = 'Другой'; $lang['TPL']['AGE'] = 'Возраст'; $lang['TPL']['ANNOTATION'] = 'Аннотация'; diff --git a/upload/templates/default/page_footer.tpl b/upload/templates/default/page_footer.tpl index 30f99c8d2..d61ab443a 100644 --- a/upload/templates/default/page_footer.tpl +++ b/upload/templates/default/page_footer.tpl @@ -40,7 +40,7 @@ -
{L_GOTO_ADMINCP}
+
{L_ADMIN_PANEL}

diff --git a/upload/templates/default/posting.tpl b/upload/templates/default/posting.tpl index 1752dfcc7..fa19316c2 100644 --- a/upload/templates/default/posting.tpl +++ b/upload/templates/default/posting.tpl @@ -105,7 +105,7 @@ - {L_MORE_SMILIES} + {L_MORE_EMOTICONS} diff --git a/upload/templates/default/posting_attach.tpl b/upload/templates/default/posting_attach.tpl index 554c43df2..ecd6b90d3 100644 --- a/upload/templates/default/posting_attach.tpl +++ b/upload/templates/default/posting_attach.tpl @@ -2,7 +2,7 @@ - {L_ADD_ATTACH_TITLE} + {L_ADD_ATTACHMENT_TITLE} {L_FILE_NAME} @@ -11,7 +11,7 @@ -

{L_ADD_ATTACH_EXPLAIN}

+

{L_ADD_ATTACHMENT_EXPLAIN}

{RULES} diff --git a/upload/templates/default/posting_smilies.tpl b/upload/templates/default/posting_smilies.tpl index d9be37baf..f7577d261 100644 --- a/upload/templates/default/posting_smilies.tpl +++ b/upload/templates/default/posting_smilies.tpl @@ -31,7 +31,7 @@ function emoticon(text) { - {L_MORE_SMILIES} + {L_MORE_EMOTICONS} diff --git a/upload/templates/default/usercp_email.tpl b/upload/templates/default/usercp_email.tpl index 8bc717d18..9f9ec692a 100644 --- a/upload/templates/default/usercp_email.tpl +++ b/upload/templates/default/usercp_email.tpl @@ -21,7 +21,7 @@ - {L_MESSAGE_BODY}

{L_MESSAGE_BODY_DESC}

+ {L_MESSAGE_BODY}

{L_EMAIL_MESSAGE_DESC}

diff --git a/upload/templates/default/usercp_viewprofile.tpl b/upload/templates/default/usercp_viewprofile.tpl index 73aedb077..6648d5463 100644 --- a/upload/templates/default/usercp_viewprofile.tpl +++ b/upload/templates/default/usercp_viewprofile.tpl @@ -486,7 +486,7 @@ $(document).ready(function(){

- +

diff --git a/upload/templates/default/viewtopic_attach.tpl b/upload/templates/default/viewtopic_attach.tpl index 827b27aca..ad2fee15e 100644 --- a/upload/templates/default/viewtopic_attach.tpl +++ b/upload/templates/default/viewtopic_attach.tpl @@ -4,7 +4,7 @@
-{ATTACHMENT_ICON} Attachment +{ATTACHMENT_ICON} {L_ATTACHMENT}

{postrow.attach.denyrow.L_DENIED}

@@ -98,7 +98,7 @@
-{ATTACHMENT_ICON} Attachment ({postrow.attach.cat_images.FILESIZE} {postrow.attach.cat_images.SIZE_VAR}) +{ATTACHMENT_ICON} {L_ATTACHMENT} ({postrow.attach.cat_images.FILESIZE} {postrow.attach.cat_images.SIZE_VAR})

img

@@ -114,7 +114,7 @@
-{ATTACHMENT_ICON} Attachment Thumbnail +{ATTACHMENT_ICON} {L_ATTACHMENT_THUMBNAIL}

{postrow.attach.cat_thumb_images.DOWNLOAD_NAME}

@@ -134,7 +134,7 @@
-{postrow.attach.attachrow.S_UPLOAD_IMAGE} Attachment +{postrow.attach.attachrow.S_UPLOAD_IMAGE} {L_ATTACHMENT}

{postrow.attach.attachrow.DOWNLOAD_NAME} ({postrow.attach.attachrow.FILESIZE} {postrow.attach.attachrow.SIZE_VAR}, {L_DOWNLOADED}: {postrow.attach.attachrow.DOWNLOAD_COUNT}) @@ -257,7 +257,7 @@

{postrow.attach.tor_reged.S_UPLOAD_IMAGE}

{L_DOWNLOAD}

{postrow.attach.tor_reged.FILESIZE}

-

+

@@ -416,8 +416,9 @@ $(function(){ } #tor-filelist i { color: #7A7A7A; padding-left: 4px; } #tor-filelist s { color: #0000FF; text-decoration: none; } -#tor-filelist .b { font-weight: bold; } #tor-filelist .b > s { color: #800000; } +#tor-filelist .b { font-weight: bold; padding-left: 20px; background: transparent url('images/folder.gif') no-repeat 3px 50%;} +#tor-filelist ul li span { padding-left: 20px; background: transparent url('images/page.gif') no-repeat 3px 50%;} #tor-filelist .tor-root-dir { font-size: 13px; font-weight: bold; line-height: 12px; padding-left: 4px; } #tor-fl-treecontrol { padding: 2px 0 4px; } #tor-fl-treecontrol a { padding: 0 8px; font-size: 11px; text-decoration: none; } @@ -428,10 +429,18 @@ $(function(){
- + + - + +
+ +
загружается...
{L_LOADING}
diff --git a/upload/templates/default/viewtopic_torrent.tpl b/upload/templates/default/viewtopic_torrent.tpl index ddeff4395..7e01274d6 100644 --- a/upload/templates/default/viewtopic_torrent.tpl +++ b/upload/templates/default/viewtopic_torrent.tpl @@ -258,6 +258,7 @@ +