diff --git a/upload/config.php b/upload/config.php index 4f7f83a26..640872691 100644 --- a/upload/config.php +++ b/upload/config.php @@ -57,7 +57,7 @@ $bb_cfg['css_ver'] = 1; // Increase number of revision after update $bb_cfg['tp_version'] = '2.1 Stable'; -$bb_cfg['tp_release_state'] = 'R249'; +$bb_cfg['tp_release_state'] = 'R250'; $bb_cfg['tp_release_date'] = '23-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/topic_templates/games.php b/upload/includes/topic_templates/games.php index 819cffe35..09f507b8b 100644 --- a/upload/includes/topic_templates/games.php +++ b/upload/includes/topic_templates/games.php @@ -25,6 +25,7 @@ if (@$_REQUEST['preview'] && is_array($_POST['msg'])) 'cd_image_type', 'can_play_xbox360', 'localization', + 'local_voice', 'translation_type', 'medicine', 'multiplayer', @@ -53,12 +54,15 @@ if (@$_REQUEST['preview'] && is_array($_POST['msg'])) $subject = $msg['release_name']; $subject .= ($msg['year']) ? ' ('. trim($msg['year'], '/') .')' : ''; $subject .= ($msg['publisher']) ? ' ('. trim($msg['publisher'], '/') .')' : ''; - $subject .= ($msg['localization']) ? ' ('. trim($msg['localization'], '/') .')' : ''; - $subject .= ($msg['source_type']) ? ' ['. trim($msg['source_type'], '/') .']' : ''; - if ($msg['localization'] == 'Multi5') - { - $subject .= ' [multi5]'; - } + if ($msg['localization'] == $lang['TPL']['UI_LANG_OPTIONS'][0]) $subject .= ' (ENG+RUS)'; + if ($msg['localization'] == $lang['TPL']['UI_LANG_OPTIONS'][1]) $subject .= ' (ENG)'; + if ($msg['localization'] == $lang['TPL']['UI_LANG_OPTIONS'][2]) $subject .= ' (RUS)'; + if ($msg['localization'] == $lang['TPL']['UI_LANG_OPTIONS'][3]) $subject .= ' (DEU)'; + + if ($msg['source_type'] == $lang['TPL']['SOURCE_TYPE_OPTIONS'][0]) $subject .= ' [L]'; + if ($msg['source_type'] == $lang['TPL']['SOURCE_TYPE_OPTIONS'][1]) $subject .= ' [P]'; + if ($msg['source_type'] == $lang['TPL']['SOURCE_TYPE_OPTIONS'][2]) $subject .= ' [Rip]'; + if ($msg['source_type'] == $lang['TPL']['SOURCE_TYPE_OPTIONS'][3]) $subject .= ' [RePack]'; } } \ No newline at end of file diff --git a/upload/includes/topic_templates/tpl_selects.php b/upload/includes/topic_templates/tpl_selects.php index b4cbd9a6c..72fca6ae4 100644 --- a/upload/includes/topic_templates/tpl_selects.php +++ b/upload/includes/topic_templates/tpl_selects.php @@ -4,19 +4,24 @@ if (!defined('IN_PHPBB')) die(basename(__FILE__)); $selects = array( 'SEL_VIDEO_QUALITY' => array( + 'VHSRip', + 'TVRip', + 'SATRip', + 'CamRip', + 'TeleCine', + 'TeleSynch', + 'DVDScreener', 'DVDRip', + 'DVDRip-AVC', 'DVD5', "DVD5 {$lang['TPL']['COMPRESSED']}", 'DVD9', 'HDTV', 'HDTVRip', - 'TVRip', - 'TeleCine', - 'TeleSynch', - 'CamRip', - 'SATRip', - 'VHSRip', - 'DVDScreener', + 'HDTVRip-AVC', + 'BDRip', + 'BDRip-AVC', + 'BDRemux', ), 'SEL_VIDEO_CODECS' => array( @@ -39,6 +44,7 @@ $selects = array( 'MKV', 'WMV', 'MPEG', + 'FLV', ), 'SEL_AUDIO_CODECS' => array( diff --git a/upload/language/lang_english/lang_topic_templates.php b/upload/language/lang_english/lang_topic_templates.php index 52e0a14b0..1e5494ad2 100644 --- a/upload/language/lang_english/lang_topic_templates.php +++ b/upload/language/lang_english/lang_topic_templates.php @@ -42,6 +42,7 @@ $lang['TPL']['KBPS'] = 'kbps'; $lang['TPL']['LANG'] = 'Language'; $lang['TPL']['LOCAL'] = 'loc.'; $lang['TPL']['LOCALIZATION'] = 'Localization'; +$lang['TPL']['LOCAL_VOICE'] = 'Sound language'; $lang['TPL']['MANUFACTURER'] = 'Manufacturer'; $lang['TPL']['MANUFACTURER_URL'] = "Manufacturer's Site"; $lang['TPL']['MED'] = 'fix.'; @@ -95,7 +96,7 @@ $lang['TPL']['VERSION'] = 'Version'; $lang['TPL']['VIDEO'] = 'Video'; $lang['TPL']['VIDEO_BITRATE'] = 'Video bitrate'; $lang['TPL']['VIDEO_CODEC'] = 'Video codec'; -$lang['TPL']['VISTA_COMPATIBLE'] = 'Vista compatibility'; +$lang['TPL']['VISTA_COMPATIBLE'] = 'Windows7 compatibility'; $lang['TPL']['Y'] = '%s y.'; $lang['TPL']['YEAR'] = 'Year'; $lang['TPL']['YEAR_EXP'] = 'Year must a four-digit number'; @@ -121,7 +122,7 @@ $lang['TPL']['LANG_OPTIONS'] = array( ); $lang['TPL']['UI_LANG_OPTIONS'] = array( - 'english', + 0 => 'english', ); $lang['TPL']['UI_LANG_OPTIONS_PS'] = array( @@ -135,8 +136,10 @@ $lang['TPL']['AUDIOBOOK_TYPE_OPTIONS'] = array( ); $lang['TPL']['SOURCE_TYPE_OPTIONS'] = array( - 'licensed', - 'pirated', + 0 => 'licensed', + 1 => 'pirated', + 2 => 'Rip', + 3 => 'RePack', ); $lang['TPL']['MULTIPLAYER_OPTIONS'] = array( diff --git a/upload/language/lang_russian/lang_topic_templates.php b/upload/language/lang_russian/lang_topic_templates.php index b5f2f4cb4..39f7a6751 100644 --- a/upload/language/lang_russian/lang_topic_templates.php +++ b/upload/language/lang_russian/lang_topic_templates.php @@ -42,6 +42,7 @@ $lang['TPL']['KBPS'] = 'kbps'; $lang['TPL']['LANG'] = 'Язык'; $lang['TPL']['LOCAL'] = 'рус.'; $lang['TPL']['LOCALIZATION'] = 'Язык интерфейса'; +$lang['TPL']['LOCAL_VOICE'] = 'Язык озвучки'; $lang['TPL']['MANUFACTURER'] = 'Производитель'; $lang['TPL']['MANUFACTURER_URL'] = 'Сайт производителя'; $lang['TPL']['MED'] = 'таб.'; @@ -95,7 +96,7 @@ $lang['TPL']['VERSION'] = 'Версия'; $lang['TPL']['VIDEO'] = 'Видео'; $lang['TPL']['VIDEO_BITRATE'] = 'Битрейт видео'; $lang['TPL']['VIDEO_CODEC'] = 'Видео кодек'; -$lang['TPL']['VISTA_COMPATIBLE'] = 'Совместимость с Vista'; +$lang['TPL']['VISTA_COMPATIBLE'] = 'Совместимость с Windows7'; $lang['TPL']['Y'] = '%s г.'; $lang['TPL']['YEAR'] = 'Год выпуска'; $lang['TPL']['YEAR_EXP'] = 'Год выпуска должен быть четырехзначным числом'; @@ -135,10 +136,10 @@ $lang['TPL']['UI_LANG_OPTIONS_PS'] = array( ); $lang['TPL']['UI_LANG_OPTIONS'] = array( - 'английский + русский', - 'только английский', - 'только русский', - 'немецкий', + 0 => 'английский + русский', + 1 => 'только английский', + 2 => 'только русский', + 3 => 'немецкий', ); $lang['TPL']['AUDIOBOOK_TYPE_OPTIONS'] = array( @@ -148,8 +149,10 @@ $lang['TPL']['AUDIOBOOK_TYPE_OPTIONS'] = array( ); $lang['TPL']['SOURCE_TYPE_OPTIONS'] = array( - 'лицензия', - 'пиратка', + 0 => 'лицензия', + 1 => 'пиратка', + 2 => 'Rip', + 3 => 'RePack', ); $lang['TPL']['MULTIPLAYER_OPTIONS'] = array( diff --git a/upload/templates/default/topic_templates/games.tpl b/upload/templates/default/topic_templates/games.tpl index e2d7a9e37..e18114507 100644 --- a/upload/templates/default/topic_templates/games.tpl +++ b/upload/templates/default/topic_templates/games.tpl @@ -1,6 +1,7 @@   {L_LOCALIZATION}:   + {L_LOCAL_VOICE}:   {L_MEDICINE}: