r171

чистка админки git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@171 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293

upload/admin/admin_attachments.php

@@ -400,36 +400,6 @@ if ($mode == 'manage')
 
 	$template->assign_vars(array(
 		'TPL_ATTACH_MANAGE' => true,
-
-		'L_MANAGE_TITLE' => $lang['ATTACH_SETTINGS'],
-		'L_MANAGE_EXPLAIN' => $lang['MANAGE_ATTACHMENTS_EXPLAIN'],
-		'L_ATTACHMENT_SETTINGS' => $lang['ATTACH_SETTINGS'],
-		'L_ATTACHMENT_FILESIZE_SETTINGS' => $lang['ATTACH_FILESIZE_SETTINGS'],
-		'L_ATTACHMENT_NUMBER_SETTINGS' => $lang['ATTACH_NUMBER_SETTINGS'],
-		'L_ATTACHMENT_OPTIONS_SETTINGS' => $lang['ATTACH_OPTIONS_SETTINGS'],
-		'L_ATTACHMENT_FTP_SETTINGS' => $lang['FTP_INFO'],
-		'L_NO_FTP_EXTENSIONS' => $lang['NO_FTP_EXTENSIONS_INSTALLED'],
-		'L_UPLOAD_DIR' => $lang['UPLOAD_DIRECTORY'],
-		'L_UPLOAD_DIR_EXPLAIN' => $lang['UPLOAD_DIRECTORY_EXPLAIN'],
-		'L_ATTACHMENT_IMG_PATH' => $lang['ATTACH_IMG_PATH'],
-		'L_IMG_PATH_EXPLAIN' => $lang['ATTACH_IMG_PATH_EXPLAIN'],
-		'L_ATTACHMENT_TOPIC_ICON' => $lang['ATTACH_TOPIC_ICON'],
-		'L_TOPIC_ICON_EXPLAIN' => $lang['ATTACH_TOPIC_ICON_EXPLAIN'],
-		'L_DISPLAY_ORDER' => $lang['ATTACH_DISPLAY_ORDER'],
-		'L_DISPLAY_ORDER_EXPLAIN' => $lang['ATTACH_DISPLAY_ORDER_EXPLAIN'],
-		'L_MAX_FILESIZE' => $lang['MAX_FILESIZE_ATTACH'],
-		'L_MAX_FILESIZE_EXPLAIN' => $lang['MAX_FILESIZE_ATTACH_EXPLAIN'],
-		'L_PM_ATTACH' => $lang['PM_ATTACHMENTS'],
-		'L_PM_ATTACH_EXPLAIN' => $lang['PM_ATTACHMENTS_EXPLAIN'],
-		'L_ATTACHMENT_FTP_PATH' => $lang['ATTACH_FTP_PATH'],
-		'L_ATTACHMENT_FTP_USER' => $lang['FTP_USERNAME'],
-		'L_ATTACHMENT_FTP_PASS' => $lang['FTP_PASSWORD'],
-		'L_ATTACHMENT_FTP_PATH_EXPLAIN' => $lang['ATTACH_FTP_PATH_EXPLAIN'],
-		'L_ATTACHMENT_FTP_SERVER' => $lang['FTP_SERVER'],
-		'L_ATTACHMENT_FTP_SERVER_EXPLAIN' => $lang['FTP_SERVER_EXPLAIN'],
-		'L_DOWNLOAD_PATH' => $lang['FTP_DOWNLOAD_PATH'],
-		'L_DOWNLOAD_PATH_EXPLAIN' => $lang['FTP_DOWNLOAD_PATH_EXPLAIN'],
-
 		'S_ATTACH_ACTION' => append_sid('admin_attachments.php?mode=manage'),
 		'S_FILESIZE' => $select_size_mode,
 		'S_FILESIZE_QUOTA' => $select_quota_size_mode,
@@ -531,35 +501,18 @@ if ($mode == 'cats')
 
 	$template->assign_vars(array(
 		'TPL_ATTACH_SPECIAL_CATEGORIES' => true,
-
-		'L_MANAGE_CAT_TITLE' => $lang['MANAGE_CATEGORIES'],
-		'L_MANAGE_CAT_EXPLAIN' => $lang['MANAGE_CATEGORIES_EXPLAIN'],
-		'L_SETTINGS_CAT_STREAM' => $lang['SETTINGS_CAT_STREAMS'],
-		'L_CREATE_THUMBNAIL' => $lang['IMAGE_CREATE_THUMBNAIL'],
-		'L_CREATE_THUMBNAIL_EXPLAIN' => $lang['IMAGE_CREATE_THUMBNAIL_EXPLAIN'],
-		'L_MIN_THUMB_FILESIZE' => $lang['IMAGE_MIN_THUMB_FILESIZE'],
-		'L_MIN_THUMB_FILESIZE_EXPLAIN' => $lang['IMAGE_MIN_THUMB_FILESIZE_EXPLAIN'],
-		'L_IMAGICK_PATH' => $lang['IMAGE_IMAGICK_PATH'],
-		'L_IMAGICK_PATH_EXPLAIN' => $lang['IMAGE_IMAGICK_PATH_EXPLAIN'],
-		'L_SEARCH_IMAGICK' => $lang['IMAGE_SEARCH_IMAGICK'],
-
 		'IMAGE_MAX_HEIGHT' => $new_attach['img_max_height'],
 		'IMAGE_MAX_WIDTH' => $new_attach['img_max_width'],
-
 		'IMAGE_LINK_HEIGHT' => $new_attach['img_link_height'],
 		'IMAGE_LINK_WIDTH' => $new_attach['img_link_width'],
 		'IMAGE_MIN_THUMB_FILESIZE' => $new_attach['img_min_thumb_filesize'],
 		'IMAGE_IMAGICK_PATH' => $new_attach['img_imagick'],
-
 		'DISPLAY_INLINED_YES' => $display_inlined_yes,
 		'DISPLAY_INLINED_NO' => $display_inlined_no,
-
 		'CREATE_THUMBNAIL_YES' => $create_thumbnail_yes,
 		'CREATE_THUMBNAIL_NO' => $create_thumbnail_no,
-
 		'USE_GD2_YES' => $use_gd2_yes,
 		'USE_GD2_NO' => $use_gd2_no,
-
 		'S_ASSIGNED_GROUP_IMAGES' => implode(', ', $s_assigned_group_images),
 		'S_ATTACH_ACTION' => append_sid('admin_attachments.php?mode=cats'))
 	);
@@ -854,13 +807,8 @@ if ($mode == 'quota')
 
 	$template->assign_vars(array(
 		'TPL_ATTACH_QUOTA' => true,
-
-		'L_MANAGE_QUOTAS_TITLE' => $lang['MANAGE_QUOTAS'],
-		'L_SIZE' => $lang['MAX_FILESIZE_ATTACH'],
 		'MAX_FILESIZE' => $max_add_filesize,
-
 		'S_FILESIZE' => size_select('add_size_select', $size),
-
 		'S_ATTACH_ACTION' => append_sid('admin_attachments.php?mode=quota'))
 	);
 

upload/admin/admin_board.php

@@ -14,8 +14,7 @@ require(INC_DIR .'functions_selects.php');
 //
 // Pull all config data
 //
-$sql = "SELECT *
+$sql = "SELECT * FROM " . BB_CONFIG;
-	FROM " . BB_CONFIG;
 if(!$result = DB()->sql_query($sql))
 {
 	message_die(CRITICAL_ERROR, "Could not query config information in admin_board", "", __LINE__, __FILE__, $sql);
@@ -63,8 +62,8 @@ $disable_board_no = ( !$new['board_disable'] ) ? "checked=\"checked\"" : "";
 $bbcode_yes = ( $new['allow_bbcode'] ) ? "checked=\"checked\"" : "";
 $bbcode_no = ( !$new['allow_bbcode'] ) ? "checked=\"checked\"" : "";
 
-$activation_none = ( $new['require_activation'] == USER_ACTIVATION_NONE ) ? "checked=\"checked\"" : "";
+$activation_none  = ( $new['require_activation'] == USER_ACTIVATION_NONE ) ? "checked=\"checked\"" : "";
-$activation_user = ( $new['require_activation'] == USER_ACTIVATION_SELF ) ? "checked=\"checked\"" : "";
+$activation_user  = ( $new['require_activation'] == USER_ACTIVATION_SELF ) ? "checked=\"checked\"" : "";
 $activation_admin = ( $new['require_activation'] == USER_ACTIVATION_ADMIN ) ? "checked=\"checked\"" : "";
 
 $confirm_yes = ($new['enable_confirm']) ? 'checked="checked"' : '';

upload/admin/admin_bt_tracker_cfg.php

@@ -51,8 +51,6 @@ set_tpl_vars      ($default_cfg_num, $tr_cfg);
 set_tpl_vars_lang ($default_cfg_num);
 
 $template->assign_vars(array(
-	'L_CONFIGURATION_TITLE' => $lang['TRACKER_CFG_TITLE'],
-
 	'IGNORE_REPORTED_IP' => $bb_cfg['ignore_reported_ip'],
 	'ANNOUNCE_INTERVAL'  => $bb_cfg['announce_interval'],
 	'PASSKEY_KEY'        => $bb_cfg['passkey_key'],

upload/admin/admin_cron.php

@@ -38,9 +38,7 @@ require(INC_DIR .'functions_admin_torrent.php');
 require(INC_DIR .'functions_admin_cron.php');
 
 if ($mode == 'list') {
-	$sql = "SELECT *
+	$sql = "SELECT * FROM ". BB_CRON ." ORDER BY cron_id";
-		FROM ". BB_CRON ."
-		ORDER BY cron_id";
 
 	if( !$result1 = DB()->sql_query($sql) )
 	{

upload/admin/admin_disallow.php

@@ -62,8 +62,7 @@ else if( isset($_POST['delete_name']) )
 //
 // Grab the current list of disallowed usernames...
 //
-$sql = "SELECT *
+$sql = "SELECT * FROM " . BB_DISALLOW;
-	FROM " . BB_DISALLOW;
 $result = DB()->sql_query($sql);
 if( !$result )
 {
@@ -95,13 +94,6 @@ $disallow_select .= '</select>';
 $template->assign_vars(array(
 	"S_DISALLOW_SELECT" => $disallow_select,
 	"S_FORM_ACTION" => append_sid("admin_disallow.php"),
-
-	"L_DISALLOW_TITLE" => $lang['DISALLOW_CONTROL'],
-	"L_DELETE_DISALLOW" => $lang['DELETE_DISALLOW_TITLE'],
-	"L_DELETE_EXPLAIN" => $lang['DELETE_DISALLOW_EXPLAIN'],
-	"L_ADD" => $lang['ADD_DISALLOW'],
-	"L_ADD_DISALLOW" => $lang['ADD_DISALLOW_TITLE'],
-	"L_ADD_EXPLAIN" => $lang['ADD_DISALLOW_EXPLAIN'],
 ));
 
 print_page('admin_disallow.tpl', 'admin');

upload/admin/admin_extensions.php

@@ -216,10 +216,6 @@ if ($mode == 'extensions')
 	// Extensions
 	$template->assign_vars(array(
 		'TPL_ATTACH_EXTENSIONS' => true,
-
-		'L_EXTENSIONS_TITLE' => $lang['MANAGE_EXTENSIONS'],
-		'L_EXTENSIONS_EXPLAIN' => $lang['MANAGE_EXTENSIONS_EXPLAIN'],
-
 		'S_CANCEL_ACTION' => append_sid("admin_extensions.php?mode=extensions"),
 		'S_ATTACH_ACTION' => append_sid("admin_extensions.php?mode=extensions"))
 	);
@@ -453,15 +449,8 @@ if ($mode == 'groups')
 
 	$template->assign_vars(array(
 		'TPL_ATTACH_EXTENSION_GROUPS' => true,
-
-		'L_EXTENSION_GROUPS_TITLE' => $lang['MANAGE_EXTENSION_GROUPS'],
-		'L_EXTENSION_GROUPS_EXPLAIN' => $lang['MANAGE_EXTENSION_GROUPS_EXPLAIN'],
-		'L_MAX_FILESIZE'				=> $lang['MAX_GROUPS_FILESIZE'],
-		'L_FORUM_PERMISSIONS'			=> $lang['EXT_GROUP_PERMISSIONS'],
-
 		'ADD_GROUP_NAME' => ( isset($submit) ) ? @$extension_group : '',
 		'MAX_FILESIZE' => $max_add_filesize,
-
 		'S_FILESIZE' => size_select('add_size_select', $size),
 		'S_ADD_DOWNLOAD_MODE' => download_select('add_download_mode'),
 		'S_SELECT_CAT' => category_select('add_category'),
@@ -723,7 +712,6 @@ if ($e_mode == 'perm' && $group)
 
 	$template->assign_vars(array(
 		'TPL_ATTACH_EXTENSION_GROUPS_PERMISSIONS' => true,
-
 		'L_GROUP_PERMISSIONS_TITLE' => sprintf($lang['GROUP_PERMISSIONS_TITLE_ADMIN'], trim($group_name)),
 		'A_PERM_ACTION' => append_sid("admin_extensions.php?mode=groups&e_mode=perm&e_group=$group"))
 	);

upload/admin/admin_forum_prune.php

@@ -60,10 +60,6 @@ if (isset($_REQUEST['submit']))
 }
 
 $template->assign_vars(array(
-	'L_PRUNE_RESULT'  => $lang['PRUNE_SUCCESS'],
-	'L_PRUNE_EXPLAIN' => $lang['FORUM_PRUNE_EXPLAIN'],
-	'L_PRUNE_TOPICS'  => $lang['PRUNE_TOPICS_NOT_POSTED'],
-
 	'PRUNED_TOTAL'   => $pruned_total,
 	'S_PRUNE_ACTION' => basename(__FILE__),
 	'SEL_FORUM'      => get_forum_select('admin', 'f[]', null, 65, 16, '', $all_forums),

upload/admin/admin_forumauth.php

@@ -24,7 +24,7 @@ $forum_auth_fields = array(
 	'auth_announce',
 );
 
-//                            View       Read       Reply      Edit      Delete      Vote       Poll    PostAttach  DownAttach  PostTopic  Sticky    Announce
+// View  Read  Reply  Edit  Delete  Vote  Poll  PostAttach  DownAttach  PostTopic  Sticky  Announce
 $simple_auth_ary = array(
 /* Public */     0 => array(AUTH_ALL,  AUTH_ALL,  AUTH_ALL,  AUTH_REG,  AUTH_REG,  AUTH_REG,  AUTH_REG,  AUTH_REG,  AUTH_ALL,  AUTH_ALL,  AUTH_MOD,  AUTH_MOD), // Public
 /* Reg */        1 => array(AUTH_ALL,  AUTH_ALL,  AUTH_REG,  AUTH_REG,  AUTH_REG,  AUTH_REG,  AUTH_REG,  AUTH_REG,  AUTH_REG,  AUTH_REG,  AUTH_MOD,  AUTH_MOD), // Registered
@@ -147,11 +147,6 @@ if (empty($forum_id))
 	// Output the selection table if no forum id was specified
 	$template->assign_vars(array(
 		'TPL_AUTH_SELECT_FORUM' => true,
-
-		'L_AUTH_TITLE'   => $lang['AUTH_CONTROL_FORUM'],
-		'L_AUTH_EXPLAIN' => $lang['FORUM_AUTH_EXPLAIN'],
-		'L_AUTH_SELECT'  => $lang['SELECT_A_FORUM'],
-
 		'S_AUTH_ACTION'  => "admin_forumauth.php",
 		'S_AUTH_SELECT'  => get_forum_select('admin', 'f', null, 80),
 	));
@@ -249,14 +244,8 @@ else
 
 	$template->assign_vars(array(
 		'TPL_EDIT_FORUM_AUTH' => true,
-
 		'FORUM_NAME' => htmlCHR($forum_name),
-
-		'L_AUTH_TITLE' => $lang['AUTH_CONTROL_FORUM'],
-		'L_AUTH_EXPLAIN' => $lang['FORUM_AUTH_EXPLAIN'],
-
 		'U_SWITCH_MODE' => $u_switch_mode,
-
 		'S_FORUMAUTH_ACTION' => "admin_forumauth.php",
 		'S_COLUMN_SPAN' => $s_column_span,
 		'S_HIDDEN_FIELDS' => $s_hidden_fields,

upload/admin/admin_forumauth_list.php

@@ -1,27 +1,5 @@
 <?php
 
-/***************************************************************************
- * Filename:          admin_forumauth_list.php
- * Description:       Summary listing of the advanced permissions of all forums
- *                    with integrated editing
- * Author:            Graham Eames (phpbb@grahameames.co.uk)
- * Last Modified:     26-Mar-2004
- * File Version:      1.2
- *
- * Acknowlegments:    This file uses some features adapted from those
- *                    provided in admin_forumauth.php from the base distribution.
- *
- ***************************************************************************/
-
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- ***************************************************************************/
-
 // ACP Header - START
 if (!empty($setmodules))
 {
@@ -32,7 +10,7 @@ require('./pagestart.php');
 // ACP Header - END
 
 
-//                            View       Read       Post       Reply      Edit      Delete     Sticky    Announce     Vote       Poll    PostAttach  Download
+//  View  Read  Post  Reply  Edit  Delete  Sticky  Announce  Vote  Poll  PostAttach  Download
 $simple_auth_ary = array(
 /* Public */     0 => array(AUTH_ALL,  AUTH_ALL,  AUTH_ALL,  AUTH_ALL,  AUTH_REG,  AUTH_REG,  AUTH_MOD,  AUTH_MOD,  AUTH_REG,  AUTH_REG,  AUTH_REG,  AUTH_ALL), // Public
 /* Reg */        1 => array(AUTH_ALL,  AUTH_ALL,  AUTH_REG,  AUTH_REG,  AUTH_REG,  AUTH_REG,  AUTH_MOD,  AUTH_MOD,  AUTH_REG,  AUTH_REG,  AUTH_REG,  AUTH_REG), // Registered
@@ -224,9 +202,6 @@ if( empty($forum_id) && empty($cat_id) )
 	//
 	$template->assign_vars(array(
 		'TPL_AUTH_FORUM_LIST' => true,
-
-		'L_AUTH_TITLE' => $lang['PERMISSIONS_LIST'],
-		'L_AUTH_EXPLAIN' => $lang['FORUM_AUTH_LIST_EXPLAIN'],
 		'S_COLUMN_SPAN' => count($forum_auth_fields)+1,
 	));
 
@@ -383,10 +358,6 @@ else
 	$template->assign_vars(array(
 		'TPL_AUTH_CAT' => true,
 		'CAT_NAME' => htmlCHR($cat_name),
-
-		'L_AUTH_TITLE' => $lang['AUTH_CONTROL_CATEGORY'],
-		'L_AUTH_EXPLAIN' => $lang['CAT_AUTH_LIST_EXPLAIN'],
-
 		'S_FORUMAUTH_ACTION' => append_sid("admin_forumauth_list.php"),
 		'S_COLUMN_SPAN' => count($forum_auth_fields)+1,
 		'S_HIDDEN_FIELDS' => $s_hidden_fields)

upload/admin/admin_forums.php

@@ -150,16 +150,11 @@ if ($mode)
 				'S_PRUNE_ENABLED' => $prune_enabled,
 
 				'SHOW_ON_INDEX' => $show_on_index,
-				'L_SHOW_ON_INDEX' => $lang['SF_SHOW_ON_INDEX'],
-				'L_PARENT_FORUM' => $lang['SF_PARENT_FORUM'],
 				'S_PARENT_FORUM' => $s_parent,
 				'CAT_LIST_CLASS' => ($forum_parent) ? 'hidden' : '',
 				'SHOW_ON_INDEX_CLASS' => (!$forum_parent) ? 'hidden' : '',
 
 				'L_FORUM_TITLE' => $l_title,
-				'L_FORUM_EXPLAIN' => $lang['FORUM_EDIT_DELETE_EXPLAIN'],
-				'L_FORUM_DESCRIPTION' => $lang['FORUM_DESC'],
-				'L_AUTO_PRUNE' => $lang['FORUM_PRUNING'],
 
 				'PRUNE_DAYS' => $prune_days,
 				'FORUM_NAME' => htmlCHR($forumname),
@@ -371,10 +366,7 @@ if ($mode)
 
 			$template->assign_vars(array(
 				'TPL_EDIT_CATEGORY' => true,
-
 				'CAT_TITLE'       => htmlCHR($cat_info['cat_title']),
-				'L_EDIT_CAT'      => $lang['EDIT_CATEGORY'],
-				'L_EDIT_CAT_EXPL' => $lang['EDIT_CATEGORY_EXPLAIN'],
 				'S_HIDDEN_FIELDS' => build_hidden_fields($hidden_fields),
 				'S_SUBMIT_VALUE'  => $lang['UPDATE'],
 				'S_FORUM_ACTION'  => "admin_forums.php",
@@ -439,8 +431,6 @@ if ($mode)
 
 				'WHAT_TO_DELETE'   => htmlCHR($foruminfo['forum_name']),
 				'DELETE_TITLE'     => $lang['FORUM_DELETE'],
-				'L_DELETE_EXPL'    => $lang['FORUM_DELETE_EXPLAIN'],
-				'L_MOVE_CONTENTS'  => $lang['MOVE_CONTENTS'],
 				'CAT_FORUM_NAME'   => $lang['FORUM_NAME'],
 
 				'S_HIDDEN_FIELDS'  => build_hidden_fields($hidden_fields),
@@ -546,7 +536,6 @@ if ($mode)
 
 				'WHAT_TO_DELETE'   => htmlCHR($catinfo['cat_title']),
 				'DELETE_TITLE'     => $lang['CATEGORY_DELETE'],
-				'L_DELETE_EXPL'    => $lang['FORUM_DELETE_EXPLAIN'],
 				'CAT_FORUM_NAME'   => $lang['CATEGORY'],
 
 				'S_HIDDEN_FIELDS'  => build_hidden_fields($hidden_fields),
@@ -724,10 +713,7 @@ if (!$mode || $show_main_page)
 		'TPL_FORUMS_LIST' => true,
 
 		'S_FORUM_ACTION' => append_sid("admin_forums.php"),
-		'L_FORUM_TITLE' => $lang['FORUM_ADMIN_MAIN'],
+		'L_FORUM_TITLE' => $lang['FORUM_ADMIN_MAIN']
-		'L_FORUM_EXPLAIN' => $lang['FORUM_ADMIN_EXPLAIN'],
-		'L_EDIT' => 'edit', //$lang['EDIT'],
-		'L_RESYNC' => 'sync', //$lang['RESYNC']
 	));
 
 	$sql = "SELECT cat_id, cat_title, cat_order

upload/admin/admin_log.php

@@ -385,22 +385,6 @@ $order_options = '<option value="">&nbsp;Time&nbsp;</option>';
 $template->assign_vars(array(
 	'LOG_COLSPAN'       => 4,
 
-	'L_NO_MATCH'               => $lang['NO_MATCH'],
-    'L_ADM_LOG_ALL_ACTIONS'    => $lang['ACTS_LOG_ALL_ACTIONS'],
-    'L_ADM_LOG_SEARCH_OPTIONS' => $lang['ACTS_LOG_SEARCH_OPTIONS'],
-    'L_ADM_LOG_FORUM'          => $lang['ACTS_LOG_FORUM'],
-    'L_ADM_LOG_ACTION'         => $lang['ACTS_LOG_ACTION'],
-    'L_ADM_LOG_USER'           => $lang['ACTS_LOG_USER'],
-    'L_ADM_LOG_LOGS_FROM'      => $lang['ACTS_LOG_LOGS_FROM'],
-    'L_ADM_LOG_FIRST'          => $lang['ACTS_LOG_FIRST'],
-    'L_ADM_LOG_DAYS_BACK'      => $lang['ACTS_LOG_DAYS_BACK'],
-    'L_ADM_LOG_TOPIC_MATCH'    => $lang['ACTS_LOG_TOPIC_MATCH'],
-    'L_ADM_LOG_SORT_BY'        => $lang['ACTS_LOG_SORT_BY'],
-    'L_ADM_LOG_ACTION'         => $lang['ACTS_LOG_LOGS_ACTION'],
-    'L_ADM_LOG_USERNAME'       => $lang['ACTS_LOG_USERNAME'],
-    'L_ADM_LOG_TIME'           => $lang['ACTS_LOG_TIME'],
-    'L_ADM_LOG_INFO'           => $lang['ACTS_LOG_INFO'],
-
 	'DATETIME_NAME'     => $datetime_key,
 	'DATETIME_VAL'      => date('Y-m-d', $datetime_val),
 	'DAYSBACK_NAME'     => $daysback_key,

upload/admin/admin_mass_email.php

@@ -150,9 +150,7 @@ require(PAGE_HEADER);
 $template->assign_vars(array(
 	'MESSAGE' => $message,
 	'SUBJECT' => $subject,
-
+	
-	'L_EMAIL_EXPLAIN' => $lang['MASS_EMAIL_EXPLAIN'],
-	'L_EMAIL_SUBJECT' => $lang['SUBJECT'],
 	'L_NOTICE' => @$notice,
 
 	'S_USER_ACTION' => append_sid('admin_mass_email.php'),

upload/admin/admin_ranks.php

@@ -89,8 +89,6 @@ if( $mode != "" )
 			"IMAGE" => ( @$rank_info['rank_image'] ) ? $rank_info['rank_image'] : "images/ranks/rank_image.gif",
 			"IMAGE_DISPLAY" => ( @$rank_info['rank_image'] ) ? '<img src="../' . $rank_info['rank_image'] . '" />' : "",
 
-			"L_RANKS_TEXT" => $lang['RANKS_EXPLAIN'],
-
 			"S_RANK_ACTION" => append_sid("admin_ranks.php"),
 			"S_HIDDEN_FIELDS" => $s_hidden_fields)
 		);
@@ -233,11 +231,6 @@ else
 
 	$template->assign_vars(array(
 		'TPL_RANKS_LIST' => true,
-
-		"L_RANKS_TEXT" => $lang['RANKS_EXPLAIN'],
-		"L_RANK" => $lang['RANK_TITLE'],
-		"L_ADD_RANK" => $lang['ADD_NEW_RANK'],
-
 		"S_RANKS_ACTION" => append_sid("admin_ranks.php"))
 	);
 

upload/admin/admin_rebuild_search.php

@@ -335,11 +335,7 @@ if ($mode == 'submit' || $mode == 'refresh')
 
 	$template->assign_vars(array(
 		'L_NEXT'                    => $next_button,
-
+		'L_TIME_LAST_POSTS_ADMIN'   => sprintf($lang['TIME_LAST_POSTS'], $num_rows),
-		'L_TIME_LAST_POSTS_ADMIN'         => sprintf($lang['TIME_LAST_POSTS'], $num_rows),
-		'L_TIME_BEGINNING'          => $lang['TIME_FROM_THE_BEGINNING'],
-
-		'L_ESTIMATED_VALUES'        => $lang['INFO_ESTIMATED_VALUES'],
 
 		'PROCESSING_POSTS'          => sprintf($lang['PROCESSED_POST_IDS'], $start_post_id, $end_post_id),
 		'PROCESSING_MESSAGES'       => $processing_messages,

upload/admin/admin_reports.php

@@ -13,8 +13,8 @@ define('IN_PHPBB', true);
 define('BB_ROOT', './../');
 
 require("./pagestart.php");
-require(BB_ROOT . "includes/functions_report.php");
+require(INC_DIR . "functions_report.php");
-require(BB_ROOT . "includes/functions_report_admin.php");
+require(INC_DIR . "functions_report_admin.php");
 
 $return_links = array(
 	'index' => '<br /><br />' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="' . append_sid("index.php?pane=right") . '">', '</a>'),
@@ -80,8 +80,7 @@ if ($mode == 'config')
 			'REPORT_NEW_WINDOW_ON' => ($bb_cfg['report_new_window']) ? ' checked="checked"' : '',
 			'REPORT_NEW_WINDOW_OFF' => (!$bb_cfg['report_new_window']) ? ' checked="checked"' : '',
 
-			'L_CONFIGURATION_TITLE' => $lang['REPORTS'] . ': ' . $lang['CONFIGURATION'],
+			'L_CONFIGURATION_TITLE' => $lang['REPORTS'] . ': ' . $lang['CONFIGURATION'])
-			'L_CONFIGURATION_EXPLAIN' => $lang['REPORT_CONFIG_EXPLAIN'])
 		);
 
 		print_page('report_config_body.tpl');
@@ -127,20 +126,11 @@ else if (isset($_POST[POST_CAT_URL]) || isset($_GET[POST_CAT_URL]))
 
 			$template->assign_vars(array(
 				'S_HIDDEN_FIELDS' => $hidden_fields,
-
 				'MODULE_TITLE' => $module_info['title'],
 				'MODULE_EXPLAIN' => $module_info['explain'],
 				'MODULE_NOTIFY_ON' => ($report_module->data['report_module_notify']) ? ' checked="checked"' : '',
 				'MODULE_NOTIFY_OFF' => (!$report_module->data['report_module_notify']) ? ' checked="checked"' : '',
-				'MODULE_PRUNE' => $report_module->data['report_module_prune'],
+				'MODULE_PRUNE' => $report_module->data['report_module_prune'])
-
-				'L_EDIT_MODULE' => $lang['EDIT_REPORT_MODULE'],
-				'L_AUTH_WRITE' => $lang['WRITE'],
-				'L_AUTH_VIEW' => $lang['VIEW'],
-				'L_AUTH_NOTIFY' => $lang['REPORT_NOTIFY'],
-				'L_AUTH_NOTIFY_EXPLAIN' => $lang['REPORT_AUTH_NOTIFY_EXPLAIN'],
-				'L_AUTH_DELETE' => $lang['DELETE'],
-				'L_AUTH_DELETE_EXPLAIN' => $lang['REPORT_AUTH_DELETE_EXPLAIN'])
 			);
 
 			//
@@ -232,14 +222,7 @@ else if (isset($_POST[POST_CAT_URL]) || isset($_GET[POST_CAT_URL]))
 
 						$template->assign_vars(array(
 							'S_HIDDEN_FIELDS' => $hidden_fields,
-
+							'REASON_DESC' => $report_reason['report_reason_desc'])
-							'REASON_DESC' => $report_reason['report_reason_desc'],
-
-							'L_EDIT_REASON' => $lang['EDIT_REASON'],
-							'L_REASON_DESC' => $lang['FORUM_DESC'],
-							'L_REASON_DESC_EXPLAIN' => $lang['REASON_DESC_EXPLAIN'],
-							'L_SUBMIT' => $lang['SUBMIT'],
-							'L_CANCEL' => $lang['CANCEL'])
 						);
 
 						print_page('report_reason_edit_body.tpl');
@@ -341,11 +324,7 @@ else if (isset($_POST[POST_CAT_URL]) || isset($_GET[POST_CAT_URL]))
 
 						$template->assign_vars(array(
 							'S_HIDDEN_FIELDS' => $hidden_fields,
-
+							'REASON_DESC' => (isset($reason_desc)) ? stripslashes($reason_desc) : '')
-							'REASON_DESC' => (isset($reason_desc)) ? stripslashes($reason_desc) : '',
-
-							'L_EDIT_REASON' => $lang['ADD_REASON'],
-							'L_REASON_DESC' => $lang['FORUM_DESC'])
 						);
 
 						print_page('report_reason_edit_body.tpl');
@@ -486,15 +465,7 @@ else if (isset($_POST['module']) || isset($_GET['module']))
 				'MODULE_EXPLAIN' => $module_info['explain'],
 				'MODULE_NOTIFY_ON' => ($bb_cfg['report_notify']) ? ' checked="checked"' : '',
 				'MODULE_NOTIFY_OFF' => (!$bb_cfg['report_notify']) ? ' checked="checked"' : '',
-				'MODULE_PRUNE' => 0,
+				'MODULE_PRUNE' => 0)
-
-				'L_EDIT_MODULE' => $lang['INSTALL_REPORT_MODULE'],
-				'L_AUTH_WRITE' => $lang['WRITE'],
-				'L_AUTH_VIEW' => $lang['VIEW'],
-				'L_AUTH_NOTIFY' => $lang['REPORT_NOTIFY'],
-				'L_AUTH_NOTIFY_EXPLAIN' => $lang['REPORT_AUTH_NOTIFY_EXPLAIN'],
-				'L_AUTH_DELETE' => $lang['DELETE'],
-				'L_AUTH_DELETE_EXPLAIN' => $lang['REPORT_AUTH_DELETE_EXPLAIN'])
 			);
 
 			//
@@ -521,11 +492,7 @@ else
 			$report_modules = report_modules();
 
 			$template->assign_vars(array(
-				'L_REPORTS_TITLE' => $lang['REPORTS'] . ': ' . $lang['MODULES_REASONS'],
+				'L_REPORTS_TITLE' => $lang['REPORTS'] . ': ' . $lang['MODULES_REASONS'])
-				'L_REPORTS_EXPLAIN' => $lang['REPORT_ADMIN_EXPLAIN'],
-
-				'L_REPORT_COUNT' => $lang['REPORTS'],
-				'L_INSTALL' => $lang['INSTALL2'])
 			);
 
 			$report_counts = report_counts_obtain();

upload/admin/admin_smilies.php

@@ -171,11 +171,6 @@ if( isset($_GET['import_pack']) || isset($_POST['import_pack']) )
 		$template->assign_vars(array(
 			'TPL_SMILE_IMPORT' => true,
 
-			"L_SMILEY_EXPLAIN" => $lang['SMILEY_IMPORT_INST'],
-			"L_SELECT_LBL" => $lang['CHOOSE_SMILE_PAK'],
-			"L_CONFLICTS" => $lang['SMILE_CONFLICTS'],
-			"L_DEL_EXISTING" => $lang['DEL_EXISTING_SMILEYS'],
-
 			"S_SMILEY_ACTION" => append_sid("admin_smilies.php"),
 			"S_SMILE_SELECT" => $smile_paks_select,
 			"S_HIDDEN_FIELDS" => $hidden_vars)
@@ -234,12 +229,7 @@ else if( isset($_POST['add']) || isset($_GET['add']) )
 
 	$template->assign_vars(array(
 		'TPL_SMILE_EDIT' => true,
-
-		"L_SMILEY_EXPLAIN" => $lang['SMILE_DESC'],
-		"L_SMILEY_EMOTION" => $lang['SMILEY_EMOT'],
-
 		"SMILEY_IMG" => BB_ROOT . $bb_cfg['smilies_path'] . '/' . $smiley_images[0],
-
 		"S_SMILEY_ACTION" => append_sid("admin_smilies.php"),
 		"S_HIDDEN_FIELDS" => $s_hidden_fields,
 		"S_FILENAME_OPTIONS" => $filename_list,
@@ -309,15 +299,9 @@ else if ( $mode != "" )
 
 			$template->assign_vars(array(
 				'TPL_SMILE_EDIT' => true,
-
 				"SMILEY_CODE" => $smile_data['code'],
 				"SMILEY_EMOTICON" => $smile_data['emoticon'],
-
-				"L_SMILEY_EXPLAIN" => $lang['SMILE_DESC'],
-				"L_SMILEY_EMOTION" => $lang['SMILEY_EMOT'],
-
 				"SMILEY_IMG" => BB_ROOT . $bb_cfg['smilies_path'] . '/' . $smiley_edit_img,
-
 				"S_SMILEY_ACTION" => append_sid("admin_smilies.php"),
 				"S_HIDDEN_FIELDS" => $s_hidden_fields,
 				"S_FILENAME_OPTIONS" => $filename_list,
@@ -434,13 +418,6 @@ else
 
 	$template->assign_vars(array(
 		'TPL_SMILE_MAIN' => true,
-
-		"L_SMILEY_TEXT" => $lang['SMILE_DESC'],
-		"L_SMILEY_ADD" => $lang['SMILE_ADD'],
-		"L_EMOT" => $lang['EMOTION'],
-		"L_IMPORT_PACK" => $lang['IMPORT_SMILE_PACK'],
-		"L_EXPORT_PACK" => $lang['EXPORT_SMILE_PACK'],
-
 		"S_HIDDEN_FIELDS" => @$s_hidden_fields,
 		"S_SMILEY_ACTION" => append_sid("admin_smilies.php"))
 	);

upload/admin/admin_topic_templates.php

@@ -81,8 +81,6 @@ foreach ($forums as $i => $forum)
 }
 
 $template->assign_vars(array(
-	'L_ADMIN_TITLE' => $lang['RELEASE_TEMPLATES'],
-	'L_ADMIN_TEXT'  => $lang['RELEASE_EXP'],
 	'S_ACTION'      => append_sid("admin_topic_templates.php"),
 ));
 

upload/admin/admin_user_ban.php

@@ -298,17 +298,9 @@ if ( isset($_POST['submit']) )
 else
 {
 	$template->assign_vars(array(
-		'L_BAN_TITLE' => $lang['BAN_CONTROL'],
-		'L_IP_OR_HOSTNAME' => $lang['IP_HOSTNAME'],
-
 		'S_BANLIST_ACTION' => append_sid("admin_user_ban.php"))
 	);
 
-	$template->assign_vars(array(
-		'L_BAN_USER' => $lang['BAN_USERNAME'],
-		'L_BAN_USER_EXPLAIN' => $lang['BAN_USERNAME_EXPLAIN'])
-	);
-
 	$userban_count = 0;
 	$ipban_count = 0;
 	$emailban_count = 0;
@@ -389,9 +381,6 @@ else
 	$select_emaillist = '<select name="unban_email[]" multiple="multiple" size="10">' . $select_emaillist . '</select>';
 
 	$template->assign_vars(array(
-		'L_UNBAN_USER' => $lang['UNBAN_USERNAME'],
-		'L_UNBAN_USER_EXPLAIN' => $lang['UNBAN_USERNAME_EXPLAIN'],
-
 		'U_SEARCH_USER' => append_sid("./../search.php?mode=searchuser"),
 		'S_UNBAN_USERLIST_SELECT' => $select_userlist,
 		'S_UNBAN_IPLIST_SELECT' => $select_iplist,

upload/admin/admin_user_search.php

@@ -106,33 +106,7 @@ if(!isset($_POST['dosearch'])&&!isset($_GET['dosearch']))
 
 	$template->assign_vars(array(
 		'TPL_ADMIN_USER_SEARCH_MAIN' => true,
-
+		
-		'L_USER_SEARCH' => $lang['SEARCH_USERS_ADVANCED'],
-		'L_SEARCH_EXPLAIN' => $lang['SEARCH_USERS_EXPLAIN'],
-		'L_USERNAME_EXPLAIN' => $lang['SEARCH_USERNAME_EXPLAIN'],
-		'L_EMAIL' => $lang['EMAIL_ADDRESS'],
-		'L_EMAIL_EXPLAIN' => $lang['SEARCH_EMAIL_EXPLAIN'],
-		'L_IP' => $lang['IP_ADDRESS'],
-		'L_IP_EXPLAIN' => $lang['SEARCH_IP_EXPLAIN'],
-		'L_USERS_JOINED' => $lang['SEARCH_USERS_JOINED'],
-		'L_REGEX' => $lang['REGULAR_EXPRESSION'],
-		'L_JOIN_DATE_EXPLAIN' => $lang['SEARCH_USERS_JOINED_EXPLAIN'],
-		'L_SEARCH_USERS_GROUPS_EXPLAIN' => $lang['SEARCH_USERS_GROUPS_EXPLAIN'],
-		'L_ADMINS' => $lang['ADMINISTRATORS'],
-		'L_POSTCOUNT_EXPLAIN' => $lang['SEARCH_USERS_POSTCOUNT_EXPLAIN'],
-		'L_GREATERTHAN' => $lang['GREATER_THAN'],
-		'L_LESSERTHAN' => $lang['LESS_THAN'],
-		'L_USERFIELD_EXPLAIN' => $lang['SEARCH_USERS_USERFIELD_EXPLAIN'],
-		'L_LASTVISITED' => $lang['SEARCH_USERS_LASTVISITED'],
-		'L_LASTVISITED_EXPLAIN' => $lang['SEARCH_USERS_LASTVISITED_EXPLAIN'],
-		'L_LANGUAGE' => $lang['BOARD_LANG'],
-		'L_LANGUAGE_EXPLAIN' => $lang['SEARCH_USERS_LANGUAGE_EXPLAIN'],
-		'L_TIMEZONE_EXPLAIN' => $lang['SEARCH_USERS_TIMEZONE_EXPLAIN'],
-		'L_STYLE' => $lang['BOARD_STYLE'],
-		'L_STYLE_EXPLAIN' => $lang['SEARCH_USERS_STYLE_EXPLAIN'],
-		'L_MODERATORS_OF_EXPLAIN' => $lang['SEARCH_USERS_MODERATORS_EXPLAIN'],
-		'L_MISC_EXPLAIN' => $lang['SEARCH_USERS_MISC_EXPLAIN'],
-
 		'YEAR' => date("Y"),
 		'MONTH' => date("m"),
 		'DAY' => date("d"),
@@ -1269,11 +1243,6 @@ else
 	$template->assign_vars(array(
 		'TPL_ADMIN_USER_SEARCH_RESULTS' => true,
 
-		'L_USER_SEARCH' => $lang['SEARCH_USERS_ADVANCED'],
-		'L_EMAIL' => $lang['EMAIL_ADDRESS'],
-		'L_JOINDATE' => $lang['JOINED'],
-		'L_LASTVISIT' => $lang['LAST_VISIT'],
-
 		'PAGE_NUMBER' => sprintf($lang['PAGE_OF'], $page, $num_pages),
 		'PAGINATION' => $pagination,
 		'NEW_SEARCH' => sprintf($lang['SEARCH_USERS_NEW'],$text, $total_pages['total'],append_sid("admin_user_search.php")),

upload/admin/admin_words.php

@@ -65,9 +65,6 @@ if( $mode != "" )
 			"WORD"        => $word,
 			"REPLACEMENT" => $replacement,
 
-			"L_WORDS_TEXT"  => $lang['WORDS_EXPLAIN'],
-			"L_WORD_CENSOR" => $lang['EDIT_WORD_CENSOR'],
-
 			"S_WORDS_ACTION"  => append_sid("admin_words.php"),
 			"S_HIDDEN_FIELDS" => $s_hidden_fields)
 		);
@@ -146,9 +143,6 @@ else
 	$template->assign_vars(array(
 		'TPL_ADMIN_WORDS_LIST' => true,
 
-		"L_WORDS_TEXT" => $lang['WORDS_EXPLAIN'],
-		"L_ADD_WORD" => $lang['ADD_NEW_WORD'],
-
 		"S_WORDS_ACTION" => append_sid("admin_words.php"),
 		"S_HIDDEN_FIELDS" => '')
 	);

upload/admin/index.php

@@ -24,9 +24,6 @@ if( isset($_GET['pane']) && $_GET['pane'] == 'left' )
 
 	$template->assign_vars(array(
 		'TPL_ADMIN_NAVIGATE' => true,
-
-        "L_FRAME_NO_SUPPORT" => $lang['IDX_BROWSER_NSP_FRAME'],
-
 		"U_FORUM_INDEX" => append_sid("../index.php"),
 		"U_ADMIN_INDEX" => append_sid("index.php?pane=right"))
 	);
@@ -52,7 +49,6 @@ if( isset($_GET['pane']) && $_GET['pane'] == 'left' )
 
 			$template->assign_block_vars("catrow.modulerow", array(
 				"ROW_CLASS" => $row_class,
-
 				"ADMIN_MODULE" => $action,
 				"U_ADMIN_MODULE" => append_sid($file))
 			);
@@ -64,10 +60,7 @@ else if( isset($_GET['pane']) && $_GET['pane'] == 'right' )
 {
 	$template->assign_vars(array(
 		'TPL_ADMIN_MAIN' => true,
-
+	));
-		"L_LAST_UPDATE" => $lang['LAST_UPDATED'],
-		"L_DB_SIZE" => $lang['DATABASE_SIZE'])
-	);
 
 	//
 	// Get forum statistics
@@ -97,11 +90,7 @@ else if( isset($_GET['pane']) && $_GET['pane'] == 'right' )
 		}
 		@closedir($avatar_dir);
 
-		//
+		
-		// This bit of code translates the avatar directory size into human readable format
-		// Borrowed the code from the PHP.net annoted manual, origanally written by:
-		// Jesse (jesse@jess.on.ca)
-		//
 		if($avatar_dir_size >= 1048576)
 		{
 			$avatar_dir_size = round($avatar_dir_size / 1048576 * 100) / 100 . " MB";
@@ -350,17 +339,10 @@ else if( isset($_GET['pane']) && $_GET['pane'] == 'right' )
 					"STARTED" => bb_date($onlinerow_guest[$i]['session_start'], 'H:i'),
 					"LASTUPDATE" => bb_date($onlinerow_guest[$i]['session_time'], 'H:i'),
 					"IP_ADDRESS" => $guest_ip,
-
 					"U_WHOIS_IP" => "http://ip-whois.net/ip_geo.php?ip=$guest_ip",
 				));
 			}
 		}
-		else
-		{
-			$template->assign_vars(array(
-				"L_NO_GUESTS_BROWSING" => $lang['NO_USERS_BROWSING'])
-			);
-		}
 	}
 	else
 	{

upload/admin/xs_cache.php

@@ -1,28 +1,5 @@
 <?php
 
-/***************************************************************************
- *                                xs_cache.php
- *                                ------------
- *   copyright            : (C) 2003 - 2005 CyberAlien
- *   support              : http://www.phpbbstyles.com
- *
- *   version              : 2.3.1
- *
- *   file revision        : 72
- *   project revision     : 78
- *   last modified        : 05 Dec 2005  13:54:54
- *
- ***************************************************************************/
-
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- ***************************************************************************/
-
 require('./pagestart.php');
 
 // check if mod is installed

upload/admin/xs_config.php

@@ -1,28 +1,5 @@
 <?php
 
-/***************************************************************************
- *                               xs_config.php
- *                               -------------
- *   copyright            : (C) 2003 - 2005 CyberAlien
- *   support              : http://www.phpbbstyles.com
- *
- *   version              : 2.3.1
- *
- *   file revision        : 72
- *   project revision     : 78
- *   last modified        : 05 Dec 2005  13:54:54
- *
- ***************************************************************************/
-
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- ***************************************************************************/
-
 require('./pagestart.php');
 
 // check if mod is installed

upload/admin/xs_frameset.php

@@ -1,28 +1,5 @@
 <?php
 
-/***************************************************************************
- *                              xs_frameset.php
- *                              ---------------
- *   copyright            : (C) 2003 - 2005 CyberAlien
- *   support              : http://www.phpbbstyles.com
- *
- *   version              : 2.3.1
- *
- *   file revision        : 72
- *   project revision     : 78
- *   last modified        : 05 Dec 2005  13:54:54
- *
- ***************************************************************************/
-
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- ***************************************************************************/
-
 require('./pagestart.php');
 
 // check if mod is installed

upload/admin/xs_include.php

@@ -1,37 +1,8 @@
 <?php
 
-/***************************************************************************
+if (!defined('IN_PHPBB') || !defined('IN_XS')) die(basename(__FILE__));
- *                               xs_include.php
+if(defined('XS_INCLUDED')) return;
- *                               --------------
- *   copyright            : (C) 2003 - 2005 CyberAlien
- *   support              : http://www.phpbbstyles.com
- *
- *   version              : 2.3.1
- *
- *   file revision        : 77
- *   project revision     : 78
- *   last modified        : 05 Dec 2005  13:54:54
- *
- ***************************************************************************/
 
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- ***************************************************************************/
-
-if (!defined('IN_PHPBB') || !defined('IN_XS'))
-{
-	die(basename(__FILE__));
-}
-
-if(defined('XS_INCLUDED'))
-{
-	return;
-}
 define('XS_INCLUDED', true);
 
 
@@ -51,7 +22,6 @@ if(!defined('XS_LANG_INCLUDED'))
 	define('XS_LANG_INCLUDED', true);
 }
 
-
 define('XS_SHOWNAV_CONFIG', 0);
 define('XS_SHOWNAV_INSTALL', 1);
 define('XS_SHOWNAV_UNINSTALL', 2);

upload/admin/xs_index.php

@@ -1,28 +1,5 @@
 <?php
 
-/***************************************************************************
- *                               xs_index.php
- *                               ------------
- *   copyright            : (C) 2003 - 2005 CyberAlien
- *   support              : http://www.phpbbstyles.com
- *
- *   version              : 2.3.1
- *
- *   file revision        : 72
- *   project revision     : 78
- *   last modified        : 05 Dec 2005  13:54:54
- *
- ***************************************************************************/
-
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- ***************************************************************************/
-
 require('./pagestart.php');
 
 // check if mod is installed

upload/common.php

@@ -429,7 +429,7 @@ class sqlite_common extends cache_dbg_common
 	             'shard_type'   => 'none',     #  none, string, int (тип перевичного ключа для шардинга)
 	             'shard_val'    => 0,          #  для string - кол. начальных символов, для int - делитель (будет использован остаток от деления)
 	           );
-	var $engine    = 'SQLite DB';
+	var $engine    = 'SQLite';
 	var $dbh       = null;
 	var $connected = false;
 	var $shard_val = false;
@@ -1439,19 +1439,20 @@ function sql_dbg_enabled ()
 
 function short_query ($sql, $esc_html = false)
 {
-	$max_len = 2500;
+    $max_len = 100;
-	$sql = str_compact($sql);
+    $sql = str_compact($sql);
 
-	if (empty($_COOKIE['sql_log_full']))
+    if (empty($_COOKIE['sql_log_full']))
-	{
+    {
-		if (strlen($sql) > $max_len)
+        if (mb_strlen($sql, 'UTF-8') > $max_len)
-		{
+        {
-			$sql = substr($sql, 0, $max_len-500) .' [...cut...] '. substr($sql, -480);
+            $sql = mb_substr($sql, 0, 50) .' [...cut...] '. mb_substr($sql, -50);
-		}
+        }
-	}
+    }
 
-	return ($esc_html) ? htmlCHR($sql, true) : $sql;
+    return ($esc_html) ? htmlCHR($sql, true) : $sql;
 }
+
 // Functions
 function utime ()
 {

upload/config.php

@@ -57,7 +57,7 @@ $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 r170';
+$bb_cfg['tp_release_state'] = 'TP II r171';
 $bb_cfg['tp_release_date'] = '28-07-2011';
 
 $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger

upload/language/lang_english/lang_admin.php

@@ -1,33 +1,5 @@
 <?php
-/***************************************************************************
+
- *                            lang_admin.php [English]
- *                              -------------------
- *     begin                : Sat Dec 16 2000
- *     copyright            : (C) 2001 The phpBB Group
- *     email                : support@phpbb.com
- *
- *     $Id: lang_admin.php,v 1.35.2.13 2005/12/29 11:51:12 acydburn Exp $
- *
- ****************************************************************************/
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- ***************************************************************************/
-/* CONTRIBUTORS
-	2002-12-15	Philip M. White (pwhite@mailhaven.com)
-		Fixed many minor grammatical mistakes
-*/
-//
-// Format is same as lang_main
-//
-//
-// Modules, this replaces the keys used
-// in the modules[][] arrays in each module file
-//
 $lang['GENERAL'] = 'General Admin';
 $lang['USERS'] = 'User Admin';
 $lang['GROUPS'] = 'Group Admin';
@@ -508,7 +480,7 @@ $lang['RANK_TITLE'] = 'Rank Title';
 $lang['RANK_SPECIAL'] = 'Set as Special Rank';
 $lang['RANK_MINIMUM'] = 'Minimum Posts';
 $lang['RANK_MAXIMUM'] = 'Maximum Posts';
-$lang['RANK_IMAGE'] = 'Rank Image (Relative to phpBB2 root path)';
+$lang['RANK_IMAGE'] = 'Rank Image';
 $lang['RANK_IMAGE_EXPLAIN'] = 'Use this to define a small image associated with the rank';
 
 $lang['MUST_SELECT_RANK'] = 'You must select a rank';

upload/language/lang_russian/lang_admin.php

@@ -1,29 +1,4 @@
 <?php
-/***************************************************************************
- *                            lang_admin.php [Russian]
- *                              -------------------
- *     begin                : Sat Dec 16 2000
- *     copyright            : (C) 2001 The phpBB Group
- *     email                : support@phpbb.com
- *
- *     $Id$
- *
- ****************************************************************************/
-
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- ***************************************************************************/
-
-//
-// Translation performed by Alexey V. Borzov (borz_off)
-// borz_off@cs.msu.su
-//
-
 
 $lang['GENERAL'] = 'Общие настройки';
 $lang['USERS'] = 'Пользователи';
@@ -508,7 +483,7 @@ $lang['RANK_TITLE'] = 'Звание';
 $lang['RANK_SPECIAL'] = 'Специальное звание';
 $lang['RANK_MINIMUM'] = 'Минимум сообщений';
 $lang['RANK_MAXIMUM'] = 'Максимум сообщений';
-$lang['RANK_IMAGE'] = 'Картинка к званию (относительно корня phpBB2)';
+$lang['RANK_IMAGE'] = 'Картинка к званию';
 $lang['RANK_IMAGE_EXPLAIN'] = 'Здесь вы можете присвоить всем имеющим такое звание специальное изображение. Вы можете указать либо относительный, либо абсолютный путь к изображению';
 
 $lang['MUST_SELECT_RANK'] = 'Извините, вы не выбрали звание. Вернитесь и попробуйте ещё раз.';

upload/templates/admin/admin_attach_cp.tpl

@@ -72,7 +72,7 @@
 		<th colspan="4">{L_ATTACH_SEARCH_QUERY}</th>
 	</tr>
 	<tr>
-		<td class="row1" colspan="2"><span class="gen">{L_FILE_NAME}:</span><br /><span class="small">{L_SEARCH_WILDCARD_EXPLAIN}</span></td>
+		<td class="row1" colspan="2"><span class="gen">{L_FILENAME}:</span><br /><span class="small">{L_SEARCH_WILDCARD_EXPLAIN}</span></td>
 		<td class="row2" colspan="2"><span class="med"><input type="text" style="width: 200px" class="post" name="search_keyword_fname" size="20" /></span></td>
 	</tr>
 	<tr>
@@ -198,10 +198,10 @@
   <table class="forumline">
   <tr>
 	  <th>#</th>
-	  <th>{L_FILE_NAME}</th>
+	  <th>{L_FILENAME}</th>
-	  <th>{L_FILE_COMMENT_CP}</th>
+	  <th>{L_FILE_COMMENT}</th>
 	  <th>{L_EXTENSION}</th>
-	  <th>{L_SIZE_IN_KB}</th>
+	  <th>{L_SIZE}</th>
 	  <th>{L_DOWNLOADS}</th>
 	  <th>{L_POST_TIME}</th>
 	  <th>{L_POSTED_IN_TOPIC}</th>

upload/templates/admin/admin_attachments.tpl

@@ -2,9 +2,9 @@
 <!-- IF TPL_ATTACH_SPECIAL_CATEGORIES -->
 <!--========================================================================-->
 
-<h1>{L_MANAGE_CAT_TITLE}</h1>
+<h1>{L_MANAGE_CATEGORIES}</h1>
 
-<p>{L_MANAGE_CAT_EXPLAIN}</p>
+<p>{L_MANAGE_CATEGORIES_EXPLAIN}</p>
 <br />
 
 <form action="{S_ATTACH_ACTION}" method="post">
@@ -18,11 +18,11 @@
 	</tr>
 <!-- BEGIN switch_thumbnail_support -->
 	<tr>
-		<td class="row1" width="80%">{L_CREATE_THUMBNAIL}<br /><span class="small">{L_CREATE_THUMBNAIL_EXPLAIN}</span></td>
+		<td class="row1" width="80%">{L_IMAGE_CREATE_THUMBNAIL}<br /><span class="small">{L_IMAGE_CREATE_THUMBNAIL_EXPLAIN}</span></td>
 		<td class="row2"><input type="radio" name="img_create_thumbnail" value="1" {CREATE_THUMBNAIL_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="img_create_thumbnail" value="0" {CREATE_THUMBNAIL_NO} /> {L_NO}</td>
 	</tr>
 	<tr>
-		<td class="row1" width="80%">{L_MIN_THUMB_FILESIZE}<br /><span class="small">{L_MIN_THUMB_FILESIZE_EXPLAIN}</span></td>
+		<td class="row1" width="80%">{L_IMAGE_MIN_THUMB_FILESIZE}<br /><span class="small">{L_IMAGE_MIN_THUMB_FILESIZE_EXPLAIN}</span></td>
 		<td class="row2"><input type="text" size="7" maxlength="15" name="img_min_thumb_filesize" value="{IMAGE_MIN_THUMB_FILESIZE}" class="post" /> {L_BYTES}</td>
 	</tr>
 	<tr>
@@ -31,7 +31,7 @@
 	</tr>
 <!-- END switch_thumbnail_support -->
 	<tr>
-		<td class="row1" width="80%">{L_IMAGICK_PATH}<br /><span class="small">{L_IMAGICK_PATH_EXPLAIN}</span></td>
+		<td class="row1" width="80%">{L_IMAGE_IMAGICK_PATH}<br /><span class="small">{L_IMAGE_IMAGICK_PATH_EXPLAIN}</span></td>
 		<td class="row2"><input type="text" size="20" maxlength="200" name="img_imagick" value="{IMAGE_IMAGICK_PATH}" class="post" /></td>
 	</tr>
 	<tr>
@@ -43,7 +43,7 @@
 		<td class="row2"><input type="text" size="3" maxlength="4" name="img_link_width" value="{IMAGE_LINK_WIDTH}" class="post" /> x <input type="text" size="3" maxlength="4" name="img_link_height" value="{IMAGE_LINK_HEIGHT}" class="post" /></td>
 	</tr>
 	<tr>
-		<td class="catBottom" colspan="2">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" class="liteoption" />&nbsp;&nbsp;<input type="submit" name="search_imagick" value="{L_SEARCH_IMAGICK}" class="liteoption" />&nbsp;&nbsp;<input type="submit" name="cat_settings" value="{L_TEST_SETTINGS}" class="liteoption" /></td>
+		<td class="catBottom" colspan="2">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" class="liteoption" />&nbsp;&nbsp;<input type="submit" name="search_imagick" value="{L_IMAGE_SEARCH_IMAGICK}" class="liteoption" />&nbsp;&nbsp;<input type="submit" name="cat_settings" value="{L_TEST_SETTINGS}" class="liteoption" /></td>
 	</tr>
 </table>
 </form>
@@ -54,30 +54,30 @@
 <!-- IF TPL_ATTACH_MANAGE -->
 <!--========================================================================-->
 
-<h1>{L_MANAGE_TITLE}</h1>
+<h1>{L_ATTACH_SETTINGS}</h1>
 
-<p>{L_MANAGE_EXPLAIN}</p>
+<p>{L_MANAGE_ATTACHMENTS_EXPLAIN}</p>
 <br />
 
 <form action="{S_ATTACH_ACTION}" method="post">
 <table class="forumline">
 	<tr>
-	  <th colspan="2">{L_ATTACHMENT_SETTINGS}</th>
+	  <th colspan="2">{L_ATTACH_SETTINGS}</th>
 	</tr>
 	<tr>
-		<td class="row1" width="80%">{L_UPLOAD_DIR}<br /><span class="small">{L_UPLOAD_DIR_EXPLAIN}</span></td>
+		<td class="row1" width="80%">{L_UPLOAD_DIRECTORY}<br /><span class="small">{L_UPLOAD_DIRECTORY_EXPLAIN}</span></td>
 		<td class="row2"><input type="text" size="25" maxlength="100" name="upload_dir" class="post" value="{UPLOAD_DIR}" /></td>
 	</tr>
 	<tr>
-		<td class="row1" width="80%">{L_ATTACHMENT_IMG_PATH}<br /><span class="small">{L_IMG_PATH_EXPLAIN}</span></td>
+		<td class="row1" width="80%">{L_ATTACH_IMG_PATH}<br /><span class="small">{L_ATTACH_IMG_PATH_EXPLAIN}</span></td>
 		<td class="row2"><input type="text" size="25" maxlength="100" name="upload_img" class="post" value="{ATTACHMENT_IMG_PATH}" /></td>
 	</tr>
 	<tr>
-		<td class="row1" width="80%">{L_ATTACHMENT_TOPIC_ICON}<br /><span class="small">{L_TOPIC_ICON_EXPLAIN}</span></td>
+		<td class="row1" width="80%">{L_ATTACH_TOPIC_ICON}<br /><span class="small">{L_ATTACH_TOPIC_ICON_EXPLAIN}</span></td>
 		<td class="row2"><input type="text" size="25" maxlength="100" name="topic_icon" class="post" value="{TOPIC_ICON}" readonly="readonly" /></td>
 	</tr>
 	<tr>
-		<td class="row1" width="80%">{L_DISPLAY_ORDER}<br /><span class="small">{L_DISPLAY_ORDER_EXPLAIN}</span></td>
+		<td class="row1" width="80%">{L_ATTACH_DISPLAY_ORDER}<br /><span class="small">{L_ATTACH_DISPLAY_ORDER_EXPLAIN}</span></td>
 		<td class="row2">
 		<table class="borderless">
 			<tr>
@@ -89,10 +89,10 @@
 		</table></td>
 	</tr>
 	<tr>
-	  <th colspan="2">{L_ATTACHMENT_FILESIZE_SETTINGS}</th>
+	  <th colspan="2">{L_ATTACH_FILESIZE_SETTINGS}</th>
 	</tr>
 	<tr>
-		<td class="row1" width="80%">{L_MAX_FILESIZE}<br /><span class="small">{L_MAX_FILESIZE_EXPLAIN}</span></td>
+		<td class="row1" width="80%">{L_MAX_FILESIZE_ATTACH}<br /><span class="small">{L_MAX_FILESIZE_ATTACH_EXPLAIN}</span></td>
 		<td class="row2"><input type="text" size="8" maxlength="15" name="max_filesize" class="post" value="{MAX_FILESIZE}" /> {S_FILESIZE}</td>
 	</tr>
 	<tr>
@@ -119,7 +119,7 @@
 		</td>
 	</tr>
 	<tr>
-	  <th colspan="2">{L_ATTACHMENT_NUMBER_SETTINGS}</th>
+	  <th colspan="2">{L_ATTACH_NUMBER_SETTINGS}</th>
 	</tr>
 	<tr>
 		<td class="row1" width="80%">{L_MAX_ATTACHMENTS}<br /><span class="small">{L_MAX_ATTACHMENTS_EXPLAIN}</span></td>
@@ -130,14 +130,14 @@
 		<td class="row2"><input type="text" size="3" maxlength="3" name="max_attachments_pm" class="post" value="{MAX_ATTACHMENTS_PM}" /></td>
 	</tr>
 	<tr>
-	  <th colspan="2">{L_ATTACHMENT_OPTIONS_SETTINGS}</th>
+	  <th colspan="2">{L_ATTACH_OPTIONS_SETTINGS}</th>
 	</tr>
 	<tr>
 		<td class="row1" width="80%">{L_DISABLE_MOD}<br /><span class="small">{L_DISABLE_MOD_EXPLAIN}</span></td>
 		<td class="row2"><input type="radio" name="disable_mod" value="1" {DISABLE_MOD_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="disable_mod" value="0" {DISABLE_MOD_NO} /> {L_NO}</td>
 	</tr>
 	<tr>
-		<td class="row1" width="80%">{L_PM_ATTACH}<br /><span class="small">{L_PM_ATTACH_EXPLAIN}</span></td>
+		<td class="row1" width="80%">{L_PM_ATTACHMENTS}<br /><span class="small">{L_PM_ATTACHMENTS_EXPLAIN}</span></td>
 		<td class="row2"><input type="radio" name="allow_pm_attach" value="1" {PM_ATTACH_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_pm_attach" value="0" {PM_ATTACH_NO} /> {L_NO}</td>
 	</tr>
 <!-- BEGIN switch_ftp -->
@@ -146,18 +146,18 @@
 		<td class="row2"><input type="radio" name="allow_ftp_upload" value="1" {FTP_UPLOAD_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_ftp_upload" value="0" {FTP_UPLOAD_NO} /> {L_NO}</td>
 	</tr>
 	<tr>
-	  <th colspan="2">{L_ATTACHMENT_FTP_SETTINGS}</th>
+	  <th colspan="2">{L_FTP_INFO}</th>
 	</tr>
 	<tr>
-		<td class="row1" width="80%">{L_ATTACHMENT_FTP_SERVER}<br /><span class="small">{L_ATTACHMENT_FTP_SERVER_EXPLAIN}</span></td>
+		<td class="row1" width="80%">{L_FTP_SERVER}<br /><span class="small">{L_FTP_SERVER_EXPLAIN}</span></td>
 		<td class="row2"><input type="text" size="20" maxlength="100" name="ftp_server" class="post" value="{FTP_SERVER}" /></td>
 	</tr>
 	<tr>
-		<td class="row1" width="80%">{L_ATTACHMENT_FTP_PATH}<br /><span class="small">{L_ATTACHMENT_FTP_PATH_EXPLAIN}</span></td>
+		<td class="row1" width="80%">{L_ATTACH_FTP_PATH}<br /><span class="small">{L_ATTACH_FTP_PATH_EXPLAIN}</span></td>
 		<td class="row2"><input type="text" size="20" maxlength="100" name="ftp_path" class="post" value="{FTP_PATH}" /></td>
 	</tr>
 	<tr>
-		<td class="row1" width="80%">{L_DOWNLOAD_PATH}<br /><span class="small">{L_DOWNLOAD_PATH_EXPLAIN}</span></td>
+		<td class="row1" width="80%">{L_FTP_DOWNLOAD_PATH}<br /><span class="small">{L_FTP_DOWNLOAD_PATH_EXPLAIN}</span></td>
 		<td class="row2"><input type="text" size="20" maxlength="100" name="download_path" class="post" value="{DOWNLOAD_PATH}" /></td>
 	</tr>
 	<tr>
@@ -165,21 +165,21 @@
 		<td class="row2"><input type="radio" name="ftp_pasv_mode" value="1" {FTP_PASV_MODE_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="ftp_pasv_mode" value="0" {FTP_PASV_MODE_NO} /> {L_NO}</td>
 	</tr>
 	<tr>
-		<td class="row1" width="80%">{L_ATTACHMENT_FTP_USER}</td>
+		<td class="row1" width="80%">{L_FTP_USERNAME}</td>
 		<td class="row2"><input type="text" size="20" maxlength="100" name="ftp_user" class="post" value="{FTP_USER}" /></td>
 	</tr>
 	<tr>
-		<td class="row1" width="80%">{L_ATTACHMENT_FTP_PASS}</td>
+		<td class="row1" width="80%">{L_FTP_PASSWORD}</td>
 		<td class="row2"><input type="password" size="10" maxlength="20" name="ftp_pass" class="post" value="{FTP_PASS}" /></td>
 	</tr>
 <!-- END switch_ftp -->
 <!-- BEGIN switch_no_ftp -->
 	<input type="hidden" name="allow_ftp_upload" value="0" />
 	<tr>
-	  <th colspan="2">{L_ATTACHMENT_FTP_SETTINGS}</th>
+	  <th colspan="2">{L_FTP_INFO}</th>
 	</tr>
 	<tr>
-	  <td class="row1" colspan="2" align="center"><span class="gen">{L_NO_FTP_EXTENSIONS}</span></td>
+	  <td class="row1" colspan="2" align="center"><span class="gen">{L_NO_FTP_EXTENSIONS_INSTALLED}</span></td>
 	</tr>
 <!-- END switch_no_ftp -->
 	<tr>
@@ -194,7 +194,7 @@
 <!-- IF TPL_ATTACH_QUOTA -->
 <!--========================================================================-->
 
-<h1>{L_MANAGE_QUOTAS_TITLE}</h1>
+<h1>{L_MANAGE_QUOTAS}</h1>
 
 <p>{L_MANAGE_QUOTAS_EXPLAIN}</p>
 <br />
@@ -202,7 +202,7 @@
 <form method="post" action="{S_ATTACH_ACTION}">
 <table class="forumline">
 	<tr>
-	  <td class="catTitle" colspan="3">{L_MANAGE_QUOTAS_TITLE}
+	  <td class="catTitle" colspan="3">{L_MANAGE_QUOTAS}
 	  </td>
 	</tr>
 	<tr>

upload/templates/admin/admin_bt_tracker_cfg.tpl

@@ -1,4 +1,4 @@
-<h1>{L_CONFIGURATION_TITLE}</h1>
+<h1>{L_TRACKER_CFG_TITLE}</h1>
 
 <form action="{S_CONFIG_ACTION}" method="post">
 

upload/templates/admin/admin_disallow.tpl

@@ -1,5 +1,5 @@
 
-<h1>{L_DISALLOW_TITLE}</h1>
+<h1>{L_DISALLOW_CONTROL}</h1>
 
 <p>{L_DISALLOW_EXPLAIN}</p>
 <br />
@@ -10,17 +10,17 @@
 <col class="row1">
 <col class="row2">
 <tr>
-	<th colspan="2">{L_ADD_DISALLOW}</th>
+	<th colspan="2">{L_ADD_DISALLOW_TITLE}</th>
 </tr>
 <tr>
-	<td><h4>{L_USERNAME}</h4><h6>{L_ADD_EXPLAIN}</h6></td>
+	<td><h4>{L_USERNAME}</h4><h6>{L_ADD_DISALLOW_EXPLAIN}</h6></td>
-	<td><input class="post" type="text" name="disallowed_user" size="30" />&nbsp;<input type="submit" name="add_name" value="{L_ADD}" class="mainoption" /></td>
+	<td><input class="post" type="text" name="disallowed_user" size="30" />&nbsp;<input type="submit" name="add_name" value="{L_ADD_DISALLOW}" class="mainoption" /></td>
 </tr>
 <tr>
-	<th colspan="2">{L_DELETE_DISALLOW}</th>
+	<th colspan="2">{L_DELETE_DISALLOW_TITLE}</th>
 </tr>
 <tr>
-	<td><h4>{L_USERNAME}</h4><h6>{L_DELETE_EXPLAIN}</h6></td>
+	<td><h4>{L_USERNAME}</h4><h6>{L_DELETE_DISALLOW_EXPLAIN}</h6></td>
 	<td>{S_DISALLOW_SELECT}&nbsp;<input type="submit" name="delete_name" value="{L_DELETE}" class="liteoption" /></td>
 </tr>
 <tr>

upload/templates/admin/admin_extensions.tpl

@@ -2,15 +2,15 @@
 <!-- IF TPL_ATTACH_EXTENSIONS -->
 <!--========================================================================-->
 
-<h1>{L_EXTENSIONS_TITLE}</h1>
+<h1>{L_MANAGE_EXTENSIONS}</h1>
 
-<p>{L_EXTENSIONS_EXPLAIN}</p>
+<p>{L_MANAGE_EXTENSIONS_EXPLAIN}</p>
 <br />
 
 <form method="post" action="{S_ATTACH_ACTION}">
 <table class="forumline">
 	<tr>
-	  <td class="catTitle" colspan="4">{L_EXTENSIONS_TITLE}
+	  <td class="catTitle" colspan="4">{L_MANAGE_EXTENSIONS}
 	  </td>
 	</tr>
 	<tr>
@@ -60,15 +60,15 @@
 
 {GROUP_PERMISSIONS_BOX}
 
-<h1>{L_EXTENSION_GROUPS_TITLE}</h1>
+<h1>{L_MANAGE_EXTENSION_GROUPS}</h1>
 
-<p>{L_EXTENSION_GROUPS_EXPLAIN}</p>
+<p>{L_MANAGE_EXTENSION_GROUPS_EXPLAIN}</p>
 <br />
 
 <form method="post" action="{S_ATTACH_ACTION}">
 <table class="forumline">
 	<tr>
-	  <td class="catTitle" colspan="8">{L_EXTENSION_GROUPS_TITLE}
+	  <td class="catTitle" colspan="8">{L_MANAGE_EXTENSION_GROUPS}
 	  </td>
 	</tr>
 	<tr>
@@ -107,7 +107,7 @@
 	  <th>&nbsp;{L_ALLOWED}&nbsp;</th>
 	  <th>&nbsp;{L_DOWNLOAD_MODE}&nbsp;</th>
 	  <th>&nbsp;{L_UPLOAD_ICON}&nbsp;</th>
-	  <th>&nbsp;{L_MAX_FILESIZE}&nbsp;</th>
+	  <th>&nbsp;{L_MAX_GROUPS_FILESIZE}&nbsp;</th>
 	  <th>&nbsp;{L_ALLOWED_FORUMS}&nbsp;</th>
 	  <th>&nbsp;{L_DELETE}&nbsp;</th>
 	</tr>
@@ -127,7 +127,7 @@
 	  <td class="row2" align="center">{grouprow.S_DOWNLOAD_MODE}</td>
 	  <td class="row1" align="center"><input type="text" size="15" maxlength="100" name="upload_icon_list[]" class="post" value="{grouprow.UPLOAD_ICON}" /></td>
 	  <td class="row2" align="center"><input type="text" size="3" maxlength="15" name="max_filesize_list[]" class="post" value="{grouprow.MAX_FILESIZE}" /> {grouprow.S_FILESIZE}</td>
-	  <td class="row1" align="center"><span class="small"><a href="{grouprow.U_FORUM_PERMISSIONS}" class="small">{L_FORUM_PERMISSIONS}</a></span></td>
+	  <td class="row1" align="center"><span class="small"><a href="{grouprow.U_FORUM_PERMISSIONS}" class="small">{L_EXT_GROUP_PERMISSIONS}</a></span></td>
 	  <td class="row2" align="center"><input type="checkbox" name="group_id_list[]" value="{grouprow.GROUP_ID}" /></td>
 	</tr>
   <!-- BEGIN extensionrow -->

upload/templates/admin/admin_forum_prune.tpl

@@ -2,7 +2,7 @@
 <h1>{L_FORUM_PRUNE}</h1>
 
 <!-- IF L_PRUNE_EXPLAIN -->
-<p>{L_PRUNE_EXPLAIN}</p>
+<p>{L_FORUM_PRUNE_EXPLAIN}</p>
 <!-- ENDIF -->
 
 <!-- IF FORUM_NAME -->
@@ -26,7 +26,7 @@
 </tr>
 <!-- END pruned -->
 <tr>
-	<td colspan="2" class="row2 tCenter"><b>{L_PRUNE_RESULT}</b></td>
+	<td colspan="2" class="row2 tCenter"><b>{L_PRUNE_SUCCESSf}</b></td>
 </tr>
 <!-- ENDIF -->
 <tr>
@@ -37,7 +37,7 @@
 </tr>
 <tr>
 	<td colspan="2" class="row1 tCenter">
-		<p>{L_PRUNE_TOPICS}	<input class="post" type="text" name="prunedays" size="4" /> {L_DAYS}</p>
+		<p>{L_PRUNE_TOPICS_NOT_POSTED}	<input class="post" type="text" name="prunedays" size="4" /> {L_DAYS}</p>
 		<p class="med"><label><input class="post" type="checkbox" name="prune_all_topic_types" value="1" />Удалить все темы, включая объявления и прилепленные</label></p>
 	</td>
 </tr>

upload/templates/admin/admin_forumauth.tpl

@@ -1,6 +1,6 @@
-<h1>{L_AUTH_TITLE}</h1>
+<h1>{L_AUTH_CONTROL_FORUM}</h1>
 
-<p>{L_AUTH_EXPLAIN}</p>
+<p>{L_FORUM_AUTH_EXPLAIN}</p>
 <br />
 
 <!-- IF TPL_AUTH_SELECT_FORUM -->
@@ -13,7 +13,7 @@
 
 <table class="forumline wAuto">
 	<tr>
-		<th>{L_AUTH_SELECT}</th>
+		<th>{L_SELECT_A_FORUM}</th>
 	</tr>
 	<tr>
 		<td class="row1 tCenter">
@@ -41,7 +41,7 @@
 <col class="row1">
 <col class="row2">
 <tr>
-	<th colspan="2">{L_AUTH_TITLE}</th>
+	<th colspan="2">{L_AUTH_CONTROL_FORUM}</th>
 </tr>
 <!-- BEGIN forum_auth -->
 <tr class="tCenter">

upload/templates/admin/admin_forumauth_list.tpl

@@ -2,9 +2,9 @@
 <!-- IF TPL_AUTH_FORUM_LIST -->
 <!--========================================================================-->
 
-<h1>{L_AUTH_TITLE}</h1>
+<h1>{L_AUTH_CONTROL_CATEGORY}</h1>
 
-<p>{L_AUTH_EXPLAIN}</p>
+<p>{L_FORUM_AUTH_LIST_EXPLAIN}</p>
 <br />
 
 <table class="forumline med">
@@ -36,9 +36,9 @@
 <!-- IF TPL_AUTH_CAT -->
 <!--========================================================================-->
 
-<h1>{L_AUTH_TITLE}</h1>
+<h1>{L_PERMISSIONS_LIST}</h1>
 
-<p>{L_AUTH_EXPLAIN}</p>
+<p>{L_CAT_AUTH_LIST_EXPLAIN}</p>
 
 <h2>{L_CATEGORY} : {CAT_NAME}</h2>
 

upload/templates/admin/admin_forums.tpl

@@ -19,7 +19,7 @@ function toggle_cat_list (val)
 
 <h1>{L_FORUM_TITLE}</h1>
 
-<p>{L_FORUM_EXPLAIN}</p>
+<p>{L_FORUM_EDIT_DELETE_EXPLAIN}</p>
 <br />
 
 <form name="frm" action="{S_FORUM_ACTION}" method="post">
@@ -35,11 +35,11 @@ function toggle_cat_list (val)
 		<td class="row2"><input style="width: 96%;" type="text" name="forumname" value="{FORUM_NAME}" class="post" /></td>
 	</tr>
 	<tr>
-		<td class="row1">{L_FORUM_DESCRIPTION}</td>
+		<td class="row1">{L_FORUM_DESC}</td>
 		<td class="row2"><textarea style="width: 96%;" rows="5" wrap="virtual" name="forumdesc" class="post">{DESCRIPTION}</textarea></td>
 	</tr>
 	<tr>
-		<td class="row1">{L_PARENT_FORUM}</td>
+		<td class="row1">{L_SF_PARENT_FORUM}</td>
 		<td class="row2"><select onchange="toggle_cat_list(this.value)" name="forum_parent">{S_PARENT_FORUM}</select></td>
 	</tr>
 	<tr id="cat_list" class="{CAT_LIST_CLASS}">
@@ -47,7 +47,7 @@ function toggle_cat_list (val)
 		<td class="row2"><select name="c">{S_CAT_LIST}</select></td>
 	</tr>
 	<tr id="show_on_index" class="{SHOW_ON_INDEX_CLASS}">
-		<td class="row1">{L_SHOW_ON_INDEX}</td>
+		<td class="row1">{L_SF_SHOW_ON_INDEX}</td>
 		<td class="row2"><label for="show_on_index1"><input type="radio" name="show_on_index" id="show_on_index1" value="1" <!-- IF SHOW_ON_INDEX == 1 -->checked="checked"<!-- ENDIF -->  /> Yes&nbsp;</label><label for="show_on_index2">&nbsp;<input type="radio" name="show_on_index" id="show_on_index2" value="0" <!-- IF SHOW_ON_INDEX == 0 -->checked="checked"<!-- ENDIF --> /> No &nbsp;</label></td>
 	</tr>
 	<tr>
@@ -55,7 +55,7 @@ function toggle_cat_list (val)
 		<td class="row2"><select name="forumstatus">{S_STATUS_LIST}</select></td>
 	</tr>
 	<tr>
-		<td class="row1">{L_AUTO_PRUNE}</td>
+		<td class="row1">{L_FORUM_PRUNING}</td>
 		<td class="row2">
 		<table class="borderless">
 		<tr>
@@ -87,9 +87,9 @@ function toggle_cat_list (val)
 <!-- IF TPL_EDIT_CATEGORY -->
 <!--========================================================================-->
 
-<h1>{L_EDIT_CAT}</h1>
+<h1>{L_EDIT_CATEGORY}</h1>
 
-<p>{L_EDIT_CAT_EXPL}</p>
+<p>{L_EDIT_CATEGORY_EXPLAIN}</p>
 <br />
 
 <form action="{S_FORUM_ACTION}" method="post">
@@ -99,7 +99,7 @@ function toggle_cat_list (val)
 <table class="forumline">
 <col class="row1">
 <tr>
-	<th>{L_EDIT_CAT}</th>
+	<th>{L_EDIT_CATEGORY}</th>
 </tr>
 <tr>
 	<td class="pad_12 tCenter">
@@ -120,7 +120,7 @@ function toggle_cat_list (val)
 
 <h1>{DELETE_TITLE}</h1>
 
-<p>{L_DELETE_EXPL}</p>
+<p>{L_FORUM_DELETE_EXPLAIN}</p>
 <br />
 
 <form action="{S_FORUM_ACTION}" method="post">
@@ -177,7 +177,7 @@ function hl (id, on)
 
 <h1>{L_FORUM_TITLE}</h1>
 
-<p>{L_FORUM_EXPLAIN}</p>
+<p>{L_FORUM_EDIT_DELETE_EXPLAIN}</p>
 <br />
 
 <form method="post" action="{S_FORUM_ACTION}">

upload/templates/admin/admin_mass_email.tpl

@@ -1,7 +1,7 @@
 
 <h1>{L_EMAIL}</h1>
 
-<p>{L_EMAIL_EXPLAIN}</p>
+<p>{L_MASS_EMAIL_EXPLAIN}</p>
 <br />
 
 <form method="post" action="{S_USER_ACTION}">
@@ -15,7 +15,7 @@
 	  <td class="row2">{S_GROUP_SELECT}</td>
 	</tr>
 	<tr>
-	  <td class="row1" align="right"><b>{L_EMAIL_SUBJECT}</b></td>
+	  <td class="row1" align="right"><b>{L_SUBJECT}</b></td>
 	  <td class="row2"><span class="gen"><input class="post" type="text" name="subject" size="45" maxlength="100" tabindex="2" class="post" value="{SUBJECT}" /></span></td>
 	</tr>
 	<tr>

upload/templates/admin/admin_ranks.tpl

@@ -4,7 +4,7 @@
 
 <h1>{L_RANKS_TITLE}</h1>
 
-<p>{L_RANKS_TEXT}</p>
+<p>{L_RANKS_EXPLAIN}</p>
 <br />
 
 <form action="{S_RANK_ACTION}" method="post">
@@ -50,15 +50,15 @@
 
 <h1>{L_RANKS_TITLE}</h1>
 
-<p>{L_RANKS_TEXT}</p>
+<p>{L_RANKS_EXPLAIN}</p>
 <br />
 
 <form method="post" action="{S_RANKS_ACTION}">
 
 <table class="forumline w80">
 <tr>
-	<th>{L_RANK}</th>
+	<th>{L_RANK_TITLE}</th>
-	<th>Image</th>
+	<th>{L_RANK_IMAGE}</th>
 	<th>{L_EDIT}</th>
 	<th>{L_DELETE}</th>
 </tr>
@@ -72,7 +72,7 @@
 <!-- END ranks -->
 <tr>
 	<td class="catBottom" colspan="4">
-		<input type="submit" class="mainoption" name="add" value="{L_ADD_RANK}" />
+		<input type="submit" class="mainoption" name="add" value="{L_ADD_NEW_RANK}" />
 	</td>
 </tr>
 </table>

upload/templates/admin/admin_rebuild_search.tpl

@@ -204,7 +204,7 @@ function updateButton()
 				<tr>
 					<td>{L_TIME_LAST_POSTS_ADMIN}&nbsp;</td>
 					<td>{LAST_CYCLE_TIME}</td>
-					<td>{L_TIME_BEGINNING}&nbsp;</td>
+					<td>{L_TIME_FROM_THE_BEGINNING}&nbsp;</td>
 					<td>{SESSION_TIME}</td>
 				</tr>
 				<tr>
@@ -237,7 +237,7 @@ function updateButton()
 		</td>
 	</tr>
 	<tr>
-		<td class="row2 small tCenter">{L_ESTIMATED_VALUES}</td>
+		<td class="row2 small tCenter">{L_INFO_ESTIMATED_VALUES}</td>
 	</tr>
 
 	<tr>

upload/templates/admin/admin_smilies.tpl

@@ -4,7 +4,7 @@
 
 <h1>{L_SMILEY_TITLE}</h1>
 
-<P>{L_SMILEY_TEXT}</p>
+<P>{L_SMILE_DESC}</p>
 <br />
 
 <form method="post" action="{S_SMILEY_ACTION}">
@@ -14,7 +14,7 @@
 	<tr>
 		<th>{L_CODE}</th>
 		<th>{L_SMILE}</th>
-		<th>{L_EMOT}</th>
+		<th>{L_EMOTION}</th>
 		<th colspan="2">{L_ACTION}</th>
 	</tr>
 	<!-- BEGIN smiles -->
@@ -27,7 +27,7 @@
 	</tr>
 	<!-- END smiles -->
 	<tr>
-		<td class="catBottom" colspan="5"><input type="submit" name="add" value="{L_SMILEY_ADD}" class="mainoption" />&nbsp;&nbsp;<input class="liteoption" type="submit" name="import_pack" value="{L_IMPORT_PACK}">&nbsp;&nbsp;<input class="liteoption" type="submit" name="export_pack" value="{L_EXPORT_PACK}"></td>
+		<td class="catBottom" colspan="5"><input type="submit" name="add" value="{L_SMILE_ADD}" class="mainoption" />&nbsp;&nbsp;<input class="liteoption" type="submit" name="import_pack" value="{L_IMPORT_SMILE_PACK}">&nbsp;&nbsp;<input class="liteoption" type="submit" name="export_pack" value="{L_EXPORT_SMILE_PACK}"></td>
 	</tr>
 </table>
 
@@ -41,7 +41,7 @@
 
 <h1>{L_SMILEY_TITLE}</h1>
 
-<p>{L_SMILEY_EXPLAIN}</p>
+<p>{L_SMILEY_IMPORT_INST}</p>
 <br />
 
 <script type="text/javascript">
@@ -67,7 +67,7 @@ function update_smiley(newimage)
 		<td class="row1"><select name="smile_url" onchange="update_smiley(this.options[selectedIndex].value);">{S_FILENAME_OPTIONS}</select> &nbsp; <img name="smiley_image" src="{SMILEY_IMG}" border="0" alt="" /> &nbsp;</td>
 	</tr>
 	<tr>
-		<td class="row2">{L_SMILEY_EMOTION}</td>
+		<td class="row2">{L_SMILEY_EMOT}</td>
 		<td class="row2"><input class="post" type="text" name="smile_emotion" value="{SMILEY_EMOTICON}" /></td>
 	</tr>
 	<tr>
@@ -85,7 +85,7 @@ function update_smiley(newimage)
 
 <h1>{L_SMILEY_TITLE}</h1>
 
-<p>{L_SMILEY_EXPLAIN}</p>
+<p>{L_SMILEY_IMPORT_INST}</p>
 <br />
 
 <form method="post" action="{S_SMILEY_ACTION}">
@@ -96,15 +96,15 @@ function update_smiley(newimage)
 		<th colspan="2">{L_SMILEY_IMPORT}</th>
 	</tr>
 	<tr>
-		<td class="row2">{L_SELECT_LBL}</td>
+		<td class="row2">{L_CHOOSE_SMILE_PAK}</td>
 		<td class="row2">{S_SMILE_SELECT}</td>
 	</tr>
 	<tr>
-		<td class="row1">{L_DEL_EXISTING}</td>
+		<td class="row1">{L_DEL_EXISTING_SMILEYS}</td>
 		<td class="row1"><input type="checkbox" name="clear_current" value="1" /></td>
 	</tr>
 	<tr>
-		<td class="row2" colspan="2" align="center">{L_CONFLICTS}<br /><input type="radio" name="replace" value="1" checked="checked"/> {L_REPLACE_EXISTING} &nbsp; <input type="radio" name="replace" value="0" /> {L_KEEP_EXISTING}</td>
+		<td class="row2" colspan="2" align="center">{L_SMILE_CONFLICTS}<br /><input type="radio" name="replace" value="1" checked="checked"/> {L_REPLACE_EXISTING} &nbsp; <input type="radio" name="replace" value="0" /> {L_KEEP_EXISTING}</td>
 	</tr>
 	<tr>
 		<td class="catBottom" colspan="2"><input class="mainoption" name="import_pack" type="submit" value="{L_IMPORT}" /></td>

upload/templates/admin/admin_topic_templates.tpl

@@ -1,6 +1,6 @@
-<h1>{L_ADMIN_TITLE}</h1>
+<h1>{L_RELEASE_TEMPLATES}</h1>
 
-<P>{L_ADMIN_TEXT}</p>
+<P>{L_RELEASE_EXP}</p>
 <br />
 
 <form method="post" action="{S_ACTION}">

upload/templates/admin/admin_user_ban.tpl

@@ -1,5 +1,5 @@
 
-<h1>{L_BAN_TITLE}</h1>
+<h1>{L_BAN_CONTROL}</h1>
 
 <p>{L_BAN_EXPLAIN}</p>
 <br />
@@ -8,31 +8,31 @@
 
 <table width="80%" class="forumline">
 	<tr>
-	  <th colspan="2">{L_BAN_USER}</th>
+	  <th colspan="2">{L_BAN_USERNAME}</th>
 	</tr>
 	<tr>
 	  <td class="row1">{L_USERNAME}:</td>
 	  <td class="row2"><input class="post" type="text" class="post" name="username" maxlength="50" size="20" /> <input type="hidden" name="mode" value="edit" />{S_HIDDEN_FIELDS} <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" /></td>
 	</tr>
 	<tr>
-	  <th colspan="2">{L_UNBAN_USER}</th>
+	  <th colspan="2">{L_UNBAN_USERNAME}</th>
 	</tr>
 	<tr>
-	  <td class="row1">{L_USERNAME}: <br /><span class="small">{L_UNBAN_USER_EXPLAIN}</span></td>
+	  <td class="row1">{L_USERNAME}: <br /><span class="small">{L_UNBAN_USERNAME_EXPLAIN}</span></td>
 	  <td class="row2">{S_UNBAN_USERLIST_SELECT}</td>
 	</tr>
 	<tr>
 	  <th colspan="2">{L_BAN_IP}</th>
 	</tr>
 	<tr>
-	  <td class="row1">{L_IP_OR_HOSTNAME}: <br /><span class="small">{L_BAN_IP_EXPLAIN}</span></td>
+	  <td class="row1">{L_IP_HOSTNAME}: <br /><span class="small">{L_BAN_IP_EXPLAIN}</span></td>
 	  <td class="row2"><input class="post" type="text" name="ban_ip" size="35" /></td>
 	</tr>
 	<tr>
 	  <th colspan="2">{L_UNBAN_IP}</th>
 	</tr>
 	<tr>
-	  <td class="row1">{L_IP_OR_HOSTNAME}: <br /><span class="small">{L_UNBAN_IP_EXPLAIN}</span></td>
+	  <td class="row1">{L_IP_HOSTNAME}: <br /><span class="small">{L_UNBAN_IP_EXPLAIN}</span></td>
 	  <td class="row2">{S_UNBAN_IPLIST_SELECT}</td>
 	</tr>
 	<tr>

upload/templates/admin/admin_user_search.tpl

@@ -2,9 +2,9 @@
 <!-- IF TPL_ADMIN_USER_SEARCH_MAIN -->
 <!--========================================================================-->
 
-<h1>{L_USER_SEARCH}</h1>
+<h1>{L_SEARCH_USERS_ADVANCED}</h1>
 
-<p>{L_SEARCH_EXPLAIN}</p>
+<p>{L_SEARCH_USERS_EXPLAIN}</p>
 <br />
 
 <form method="post" name="post" action="{S_SEARCH_ACTION}"><input type="hidden" name="dosearch" value="true" />
@@ -14,37 +14,37 @@
 		<th>&nbsp;</th>
 	</tr>
 	<tr>
-		<td class="row1" nowrap="nowrap"><span class="gen"><b>{L_USERNAME}:</b>&nbsp;<input class="post" type="text" name="username" maxlength="255" size="25" />&nbsp;<input type="submit" class="post2" name="search_username" value="{L_SEARCH}" /> {L_REGEX} <input type="checkbox" name="search_username_regex" value="true" /></span></td>
+		<td class="row1" nowrap="nowrap"><span class="gen"><b>{L_USERNAME}:</b>&nbsp;<input class="post" type="text" name="username" maxlength="255" size="25" />&nbsp;<input type="submit" class="post2" name="search_username" value="{L_SEARCH}" /> {L_REGULAR_EXPRESSION} <input type="checkbox" name="search_username_regex" value="true" /></span></td>
 	</tr>
 	<tr>
-		<td class="row2"><span class="small">{L_USERNAME_EXPLAIN}</span></td>
+		<td class="row2"><span class="small">{L_SEARCH_USERNAME_EXPLAIN}</span></td>
 	</tr>
 	<tr>
 	  <td class="row3"><img src="{SPACER}" width="1" height="1" alt="."></td>
 	</tr>
 	<tr>
-		<td class="row1" nowrap="nowrap"><span class="gen"><b>{L_EMAIL}:</b>&nbsp;<input class="post" type="text" name="email" maxlength="255" size="25" />&nbsp;<input type="submit" class="post2" name="search_email" value="{L_SEARCH}" /> {L_REGEX} <input type="checkbox" name="search_email_regex" value="true" /></span></td>
+		<td class="row1" nowrap="nowrap"><span class="gen"><b>{L_EMAIL_ADDRESS}:</b>&nbsp;<input class="post" type="text" name="email" maxlength="255" size="25" />&nbsp;<input type="submit" class="post2" name="search_email" value="{L_SEARCH}" /> {L_REGULAR_EXPRESSION} <input type="checkbox" name="search_email_regex" value="true" /></span></td>
 	</tr>
 	<tr>
-		<td class="row2"><span class="small">{L_EMAIL_EXPLAIN}</span></td>
+		<td class="row2"><span class="small">{L_SEARCH_EMAIL_EXPLAIN}</span></td>
 	</tr>
 	<tr>
 	  <td class="row3"><img src="{SPACER}" width="1" height="1" alt="."></td>
 	</tr>
 	<tr>
-		<td class="row1" nowrap="nowrap"><span class="gen"><b>{L_IP}:</b>&nbsp;<input class="post" type="text" name="ip_address" maxlength="255" size="25" />&nbsp;<input type="submit" class="post2" name="search_ip" value="{L_SEARCH}" /></span></td>
+		<td class="row1" nowrap="nowrap"><span class="gen"><b>{L_IP_ADDRESS}:</b>&nbsp;<input class="post" type="text" name="ip_address" maxlength="255" size="25" />&nbsp;<input type="submit" class="post2" name="search_ip" value="{L_SEARCH}" /></span></td>
 	</tr>
 	<tr>
-		<td class="row2"><span class="small">{L_IP_EXPLAIN}</span></td>
+		<td class="row2"><span class="small">{L_SEARCH_IP_EXPLAIN}</span></td>
 	</tr>
 	<tr>
 	  <td class="row3"><img src="{SPACER}" width="1" height="1" alt="."></td>
 	</tr>
 	<tr>
-		<td class="row1" nowrap="nowrap"><span class="gen"><b>{L_USERS_JOINED}</b>&nbsp;<select name="date_type" class="post"><option value="before" selected="selected">{L_BEFORE}</option><option value="after">{L_AFTER}</option></select>&nbsp;<input class="post" type="text" name="date_year" value="{YEAR}" size="4" maxlength="4" />/<input class="post" type="text" name="date_month" value="{MONTH}" size="2" maxlength="2" />/<input class="post" type="text" name="date_day" value="{DAY}" maxlength="2" size="2" />&nbsp;<input type="submit" class="post2" name="search_joindate" value="{L_SEARCH}" /></span></td>
+		<td class="row1" nowrap="nowrap"><span class="gen"><b>{L_SEARCH_USERS_JOINED}</b>&nbsp;<select name="date_type" class="post"><option value="before" selected="selected">{L_BEFORE}</option><option value="after">{L_AFTER}</option></select>&nbsp;<input class="post" type="text" name="date_year" value="{YEAR}" size="4" maxlength="4" />/<input class="post" type="text" name="date_month" value="{MONTH}" size="2" maxlength="2" />/<input class="post" type="text" name="date_day" value="{DAY}" maxlength="2" size="2" />&nbsp;<input type="submit" class="post2" name="search_joindate" value="{L_SEARCH}" /></span></td>
 	</tr>
 	<tr>
-		<td class="row2"><span class="small">{L_JOIN_DATE_EXPLAIN}</span></td>
+		<td class="row2"><span class="small">{L_SEARCH_USERS_JOINED_EXPLAIN}</span></td>
 	</tr>
 	<tr>
 	  <td class="row3"><img src="{SPACER}" width="1" height="1" alt="."></td>
@@ -72,37 +72,37 @@
 	</tr>
 	<!-- END ranks_exist -->
 	<tr>
-		<td class="row1" nowrap="nowrap"><span class="gen"><b>{L_POSTCOUNT}</b>&nbsp;<select name="postcount_type"><option value="equals" selected="selected">{L_EQUALS}</option><option value="lesser">{L_LESSERTHAN}</option><option value="greater">{L_GREATERTHAN}</option></select>&nbsp;<input class="post" type="text" name="postcount_value" maxlength="25" size="5" />&nbsp;<input type="submit" class="post2" name="search_postcount" value="{L_SEARCH}" /></span></td>
+		<td class="row1" nowrap="nowrap"><span class="gen"><b>{L_POSTCOUNT}</b>&nbsp;<select name="postcount_type"><option value="equals" selected="selected">{L_EQUALS}</option><option value="lesser">{L_LESS_THAN}</option><option value="greater">{L_GREATER_THAN}</option></select>&nbsp;<input class="post" type="text" name="postcount_value" maxlength="25" size="5" />&nbsp;<input type="submit" class="post2" name="search_postcount" value="{L_SEARCH}" /></span></td>
 	</tr>
 	<tr>
-		<td class="row2"><span class="small">{L_POSTCOUNT_EXPLAIN}</span></td>
+		<td class="row2"><span class="small">{L_SEARCH_USERS_POSTCOUNT_EXPLAIN}</span></td>
 	</tr>
 	<tr>
 	  <td class="row3"><img src="{SPACER}" width="1" height="1" alt="."></td>
 	</tr>
 	<tr>
-		<td class="row1" nowrap="nowrap"><span class="gen"><b>{L_USERFIELD}:</b>&nbsp;<select name="userfield_type"><option value="icq" selected="selected">{L_ICQ}</option><option value="website">{L_WEBSITE}</option><option value="location">{L_LOCATION}</option><option value="interests">{L_INTERESTS}</option></select>&nbsp;<input class="post" type="text" name="userfield_value" maxlength="25" size="25" />&nbsp;<input type="submit" class="post2" name="search_userfield" value="{L_SEARCH}" /> {L_REGEX} <input type="checkbox" name="search_userfield_regex" value="true" /></span></td>
+		<td class="row1" nowrap="nowrap"><span class="gen"><b>{L_USERFIELD}:</b>&nbsp;<select name="userfield_type"><option value="icq" selected="selected">{L_ICQ}</option><option value="website">{L_WEBSITE}</option><option value="location">{L_LOCATION}</option><option value="interests">{L_INTERESTS}</option></select>&nbsp;<input class="post" type="text" name="userfield_value" maxlength="25" size="25" />&nbsp;<input type="submit" class="post2" name="search_userfield" value="{L_SEARCH}" /> {L_REGULAR_EXPRESSION} <input type="checkbox" name="search_userfield_regex" value="true" /></span></td>
 	</tr>
 	<tr>
-		<td class="row2"><span class="small">{L_USERFIELD_EXPLAIN}</span></td>
+		<td class="row2"><span class="small">{L_SEARCH_USERS_USERFIELD_EXPLAIN}</span></td>
 	</tr>
 	<tr>
 	  <td class="row3"><img src="{SPACER}" width="1" height="1" alt="."></td>
 	</tr>
 	<tr>
-		<td class="row1" nowrap="nowrap"><span class="gen"><b>{L_LASTVISITED}</b>&nbsp;<select name="lastvisited_type"><option value="in">{L_IN_THE_LAST}</option><option value="after">{L_AFTER_THE_LAST}</option></select>&nbsp;<select name="lastvisited_days">{LASTVISITED_LIST}</select>&nbsp;<input type="submit" class="post2" name="search_lastvisited" value="{L_SEARCH}" /></span></td>
+		<td class="row1" nowrap="nowrap"><span class="gen"><b>{L_SEARCH_USERS_LASTVISITED}</b>&nbsp;<select name="lastvisited_type"><option value="in">{L_IN_THE_LAST}</option><option value="after">{L_AFTER_THE_LAST}</option></select>&nbsp;<select name="lastvisited_days">{LASTVISITED_LIST}</select>&nbsp;<input type="submit" class="post2" name="search_lastvisited" value="{L_SEARCH}" /></span></td>
 	</tr>
 	<tr>
-		<td class="row2"><span class="small">{L_LASTVISITED_EXPLAIN}</span></td>
+		<td class="row2"><span class="small">{L_SEARCH_USERS_LASTVISITED_EXPLAIN}</span></td>
 	</tr>
 	<tr>
 	  <td class="row3"><img src="{SPACER}" width="1" height="1" alt="."></td>
 	</tr>
 	<tr>
-		<td class="row1" nowrap="nowrap"><span class="gen"><b>{L_LANGUAGE}:</b>&nbsp;{LANGUAGE_LIST}&nbsp;<input type="submit" class="post2" name="search_language" value="{L_SEARCH}" /></span></td>
+		<td class="row1" nowrap="nowrap"><span class="gen"><b>{L_BOARD_LANG}:</b>&nbsp;{LANGUAGE_LIST}&nbsp;<input type="submit" class="post2" name="search_language" value="{L_SEARCH}" /></span></td>
 	</tr>
 	<tr>
-		<td class="row2"><span class="small">{L_LANGUAGE_EXPLAIN}</span></td>
+		<td class="row2"><span class="small">{L_SEARCH_USERS_LANGUAGE_EXPLAIN}</span></td>
 	</tr>
 	<tr>
 	  <td class="row3"><img src="{SPACER}" width="1" height="1" alt="."></td>
@@ -111,7 +111,7 @@
 		<td class="row1" nowrap="nowrap"><span class="gen"><b>{L_TIMEZONE}:</b>&nbsp;{TIMEZONE_LIST}&nbsp;<input type="submit" class="post2" name="search_timezone" value="{L_SEARCH}" /></span></td>
 	</tr>
 	<tr>
-		<td class="row2"><span class="small">{L_TIMEZONE_EXPLAIN}</span></td>
+		<td class="row2"><span class="small">{L_SEARCH_USERS_TIMEZONE_EXPLAIN}</span></td>
 	</tr>
 	<tr>
 	  <td class="row3"><img src="{SPACER}" width="1" height="1" alt="."></td>
@@ -121,17 +121,17 @@
 		<td class="row1" nowrap="nowrap"><span class="gen"><b>{L_MODERATORS_OF}:</b>&nbsp;<select name="moderators_forum">{FORUMS_LIST}</select>&nbsp;<input type="submit" class="post2" name="search_moderators" value="{L_SEARCH}" /></span></td>
 	</tr>
 	<tr>
-		<td class="row2"><span class="small">{L_MODERATORS_OF_EXPLAIN}</span></td>
+		<td class="row2"><span class="small">{L_SEARCH_USERS_MODERATORS_EXPLAIN}</span></td>
 	</tr>
 	<tr>
 	  <td class="row3"><img src="{SPACER}" width="1" height="1" alt="."></td>
 	</tr>
 	<!-- END forums_exist -->
 	<tr>
-		<td class="row1" nowrap="nowrap"><span class="gen"><select name="misc" class="post"><option value="admins" selected="selected">{L_ADMINS}</option><option value="mods">{L_MODERATORS}</option><option value="banned">{L_BANNED_USERS}</option><option value="disabled">{L_DISABLED_USERS}</option><option value="disabled_pms">{L_USERS_DISABLED_PMS}</option></select>&nbsp;<input type="submit" class="post2" class="post2" name="search_misc" value="{L_SEARCH}" /></span></td>
+		<td class="row1" nowrap="nowrap"><span class="gen"><select name="misc" class="post"><option value="admins" selected="selected">{L_ADMINISTRATORS}</option><option value="mods">{L_MODERATORS}</option><option value="banned">{L_BANNED_USERS}</option><option value="disabled">{L_DISABLED_USERS}</option><option value="disabled_pms">{L_USERS_DISABLED_PMS}</option></select>&nbsp;<input type="submit" class="post2" class="post2" name="search_misc" value="{L_SEARCH}" /></span></td>
 	</tr>
 	<tr>
-		<td class="row2"><span class="small">{L_MISC_EXPLAIN}</span></td>
+		<td class="row2"><span class="small">{L_SEARCH_USERS_MISC_EXPLAIN}</span></td>
 	</tr>
 	<tr>
 		<td class="row3"><img src="{SPACER}" width="1" height="1" alt="."></td>
@@ -145,7 +145,7 @@
 <!-- IF TPL_ADMIN_USER_SEARCH_RESULTS -->
 <!--========================================================================-->
 
-<h1>{L_USER_SEARCH}</h1>
+<h1>{L_SEARCH_USERS_ADVANCED}</h1>
 
 <p>{NEW_SEARCH}</p>
 <br />
@@ -153,7 +153,7 @@
 <form action="{S_POST_ACTION}" method="post" name="post">
 <table width="98%" align="center">
 	<tr>
-		<td align="center" class="nav"><span class="gen">{L_SORT_OPTIONS}</span> <a href="{U_USERNAME}">{L_USERNAME}</a> | <a href="{U_EMAIL}">{L_EMAIL}</a> | <a href="{U_POSTS}">{L_POSTS}</a> | <a href="{U_JOINDATE}">{L_JOINDATE}</a> | <a href="{U_LASTVISIT}">{L_LASTVISIT}</a></td>
+		<td align="center" class="nav"><span class="gen">{L_SORT_OPTIONS}</span> <a href="{U_USERNAME}">{L_USERNAME}</a> | <a href="{U_EMAIL}">{L_EMAIL_ADDRESS}</a> | <a href="{U_POSTS}">{L_POSTS}</a> | <a href="{U_JOINDATE}">{L_JOINED}</a> | <a href="{U_LASTVISIT}">{L_LAST_VISIT}</a></td>
 	</tr>
 </table>
 <p>&nbsp;</p>
@@ -166,10 +166,10 @@
 <table class="forumline">
 	<tr>
 		<th>{L_USERNAME}</th>
-		<th>{L_EMAIL}</th>
+		<th>{L_EMAIL_ADDRESS}</th>
-		<th>{L_JOINDATE}</th>
+		<th>{L_JOINED}</th>
 		<th>{L_POSTS}</th>
-		<th>{L_LASTVISIT}</th>
+		<th>{L_LAST_VISIT}</th>
 		<th>&nbsp;</th>
 		<th>&nbsp;</th>
 		<th>&nbsp;</th>

upload/templates/admin/admin_words.tpl

@@ -4,7 +4,7 @@
 
 <h1>{L_WORDS_TITLE}</h1>
 
-<P>{L_WORDS_TEXT}</p>
+<P>{L_WORDS_EXPLAIN}</p>
 <br />
 
 <form method="post" action="{S_WORDS_ACTION}">
@@ -24,7 +24,7 @@
 	</tr>
 	<!-- END words -->
 	<tr>
-		<td colspan="5" class="catBottom">{S_HIDDEN_FIELDS}<input type="submit" name="add" value="{L_ADD_WORD}" class="mainoption" /></td>
+		<td colspan="5" class="catBottom">{S_HIDDEN_FIELDS}<input type="submit" name="add" value="{L_ADD_NEW_WORD}" class="mainoption" /></td>
 	</tr>
 </table></form>
 
@@ -36,14 +36,14 @@
 
 <h1>{L_WORDS_TITLE}</h1>
 
-<p>{L_WORDS_TEXT}</p>
+<p>{L_WORDS_EXPLAIN}</p>
 <br />
 
 <form method="post" action="{S_WORDS_ACTION}">
 
 <table class="forumline">
 	<tr>
-		<th colspan="2">{L_WORD_CENSOR}</th>
+		<th colspan="2">{L_EDIT_WORD_CENSOR}</th>
 	</tr>
 	<tr>
 		<td class="row1">{L_WORD}</td>

upload/templates/admin/index.tpl

@@ -134,7 +134,7 @@ table.forumline { margin: 0 auto; }
 		<td class="row2"><b>{AVATAR_DIR_SIZE}</b></td>
 	</tr>
 	<tr>
-		<td class="row1" nowrap="nowrap">{L_DB_SIZE}:</td>
+		<td class="row1" nowrap="nowrap">{L_DATABASE_SIZE}:</td>
 		<td class="row2"><b>{DB_SIZE}</b></td>
 		<td class="row1" nowrap="nowrap">{L_GZIP_COMPRESSION}:</td>
 		<td class="row2"><b>{GZIP_COMPRESSION}</b></td>
@@ -148,7 +148,7 @@ table.forumline { margin: 0 auto; }
 <table class="forumline">
 	<tr>
 		<th>{L_USERNAME}</th>
-		<th>{L_LOGIN} / {L_LAST_UPDATE}</th>
+		<th>{L_LOGIN} / {L_LAST_UPDATED}</th>
 		<th>{L_IP_ADDRESS}</th>
 	</tr>
 	<!-- BEGIN reg_user_row -->

upload/templates/default/report_config_body.tpl

@@ -1,6 +1,6 @@
 <h1>{L_CONFIGURATION_TITLE}</h1>
 
-<p>{L_CONFIGURATION_EXPLAIN}</p>
+<p>{L_REPORT_CONFIG_EXPLAIN}</p>
 <br />
 
 <form action="{S_REPORT_ACTION}" method="post">

upload/templates/default/report_module_edit_body.tpl

@@ -1,7 +1,7 @@
 <form action="{S_REPORT_ACTION}" method="post">
 	<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center">
 		<tr>
-			<th class="thHead" colspan="2">{L_EDIT_MODULE}</th>
+			<th class="thHead" colspan="2">{L_EDIT_REPORT_MODULE}</th>
 		</tr>
 		<tr> 
 			<td class="row1" width="40%" valign="top"><span class="gen">{L_REPORT_MODULE}:</span></td>
@@ -37,7 +37,7 @@
 		</tr>
 		<tr>
 			<td class="row1">
-				<label for="auth_write" class="gen">{L_AUTH_WRITE}</label>:
+				<label for="auth_write" class="gen">{L_WRITE}</label>:
 			</td>
 			<td class="row2">
 				<select name="auth_write" id="auth_write">
@@ -49,7 +49,7 @@
 		</tr>
 		<tr>
 			<td class="row1">
-				<label for="auth_view" class="gen">{L_AUTH_VIEW}</label>:
+				<label for="auth_view" class="gen">{L_VIEW}</label>:
 			</td>
 			<td class="row2">
 				<select name="auth_view" id="auth_view">
@@ -61,8 +61,8 @@
 		</tr>
 		<tr>
 			<td class="row1">
-				<label for="auth_notify" class="gen">{L_AUTH_NOTIFY}</label>:<br />
+				<label for="auth_notify" class="gen">{L_REPORT_NOTIFY}</label>:<br />
-				<span class="gensmall">{L_AUTH_NOTIFY_EXPLAIN}</span>
+				<span class="gensmall">{L_REPORT_AUTH_NOTIFY_EXPLAIN}</span>
 			</td>
 			<td class="row2">
 				<select name="auth_notify" id="auth_notify">
@@ -74,8 +74,8 @@
 		</tr>
 		<tr>
 			<td class="row1">
-				<label for="auth_delete" class="gen">{L_AUTH_DELETE}</label>:<br />
+				<label for="auth_delete" class="gen">{L_DELETE}</label>:<br />
-				<span class="gensmall">{L_AUTH_DELETE_EXPLAIN}</span>
+				<span class="gensmall">{L_REPORT_AUTH_DELETE_EXPLAIN}</span>
 			</td>
 			<td class="row2">
 				<select name="auth_delete" id="auth_delete">

upload/templates/default/report_modules_body.tpl

@@ -1,11 +1,11 @@
 <h1>{L_REPORTS_TITLE}</h1>
 
-<p>{L_REPORTS_EXPLAIN}</p>
+<p>{L_REPORT_ADMIN_EXPLAIN}</p>
 
 <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
 	<tr>
 		<th class="thCornerL" width="50%">{L_REPORT_MODULE}</th>
-		<th class="thTop">{L_REPORT_COUNT}</th>
+		<th class="thTop">{L_REPORTS}</th>
 		<th class="thCornerR" width="50%">{L_ACTION}</th>
 	</tr>
 	<!-- BEGIN installed_modules -->
@@ -50,7 +50,7 @@
 		</td>
 		<td class="row1" align="center"><span class="genmed">{inactive_modules.modules.REPORT_COUNT}</span></td>
 		<td class="row1" align="center"><span class="genmed">
-			<a href="{inactive_modules.modules.U_INSTALL}" class="genmed">{L_INSTALL}</a>
+			<a href="{inactive_modules.modules.U_INSTALL}" class="genmed">{L_INSTALL2}</a>
 		</span></td>
 	</tr>
 	<!-- END modules -->

upload/templates/default/report_reason_edit_body.tpl

@@ -14,11 +14,11 @@
 	
 	<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center">
 		<tr>
-			<th class="thHead" colspan="2">{L_EDIT_REASON}</th>
+			<th class="thHead" colspan="2">{L_ADD_REASON}</th>
 		</tr>
 		<tr>
 			<td class="row1" width="40%">
-				<label for="report_reason_desc" class="gen">{L_REASON_DESC}</label>:<br />
+				<label for="report_reason_desc" class="gen">{L_FORUM_DESC}</label>:<br />
 				<span class="gensmall">{L_REASON_DESC_EXPLAIN}</span>
 			</td>
 			<td class="row2">