diff --git a/upload/config.php b/upload/config.php
index d444a6a1f..a13d3c5f2 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 r188';
-$bb_cfg['tp_release_date'] = '2-08-2011';
+$bb_cfg['tp_release_state'] = 'TP II r189';
+$bb_cfg['tp_release_date'] = '3-08-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/images/folder.gif b/upload/images/folder.gif
new file mode 100644
index 000000000..eb129763d
Binary files /dev/null and b/upload/images/folder.gif differ
diff --git a/upload/images/page.gif b/upload/images/page.gif
new file mode 100644
index 000000000..42d7318c5
Binary files /dev/null and b/upload/images/page.gif differ
diff --git a/upload/includes/cron/jobs/avatars_cleanup.php b/upload/includes/cron/jobs/avatars_cleanup.php
index 36d0d00a7..3b7cfbed1 100644
--- a/upload/includes/cron/jobs/avatars_cleanup.php
+++ b/upload/includes/cron/jobs/avatars_cleanup.php
@@ -16,7 +16,7 @@ DB()->query("
CREATE TEMPORARY TABLE $tmp_tbl (
user_avatar VARCHAR(255) NOT NULL default '',
KEY user_avatar (user_avatar(20))
- ) ENGINE = MyISAM
+ ) ENGINE = MyISAM DEFAULT CHARSET = utf8
");
DB()->query("ALTER TABLE ". BB_USERS ." ADD INDEX user_avatar(user_avatar(10))");
diff --git a/upload/includes/cron/jobs/bb_maintenance.php b/upload/includes/cron/jobs/bb_maintenance.php
index ddef11ba5..cee9fa4f6 100644
--- a/upload/includes/cron/jobs/bb_maintenance.php
+++ b/upload/includes/cron/jobs/bb_maintenance.php
@@ -32,7 +32,7 @@ DB()->query("
CREATE TEMPORARY TABLE $tmp_attach_tbl (
physical_filename VARCHAR(255) NOT NULL default '',
KEY physical_filename (physical_filename(20))
- ) ENGINE = MyISAM
+ ) ENGINE = MyISAM DEFAULT CHARSET = utf8
");
// Get attach_mod config
diff --git a/upload/includes/page_footer.php b/upload/includes/page_footer.php
index eb874db34..8c3db5e41 100644
--- a/upload/includes/page_footer.php
+++ b/upload/includes/page_footer.php
@@ -30,24 +30,24 @@ if ($show_dbg_info)
{
$gen_time = utime() - TIMESTART;
$gen_time_txt = sprintf('%.3f', $gen_time);
- $gzip_text = (UA_GZIP_SUPPORTED) ? 'GZIP' : 'GZIP';
- $gzip_text .= ($bb_cfg['gzip_compress']) ? ' ON' : ' OFF';
+ $gzip_text = (UA_GZIP_SUPPORTED) ? 'GZIP ' : 'GZIP ';
+ $gzip_text .= ($bb_cfg['gzip_compress']) ? $lang['ON'] : $lang['OFF'];
$debug_text = (DEBUG) ? 'Debug ON' : 'Debug OFF';
$stat = '[ ';
- $stat .= "Execution time: $gen_time_txt sec ";
+ $stat .= "".$lang['EXECUTION_TIME'] ." $gen_time_txt ".$lang['SEC'];
if (!empty($DBS))
{
$sql_t = $DBS->sql_timetotal;
- $sql_time_txt = ($sql_t) ? sprintf('%.3f sec (%d%%) in ', $sql_t, round($sql_t*100/$gen_time)) : '';
+ $sql_time_txt = ($sql_t) ? sprintf('%.3f '.$lang['SEC'].' (%d%%) · ', $sql_t, round($sql_t*100/$gen_time)) : '';
$num_q = $DBS->num_queries;
- $stat .= " | MySQL: {$sql_time_txt}{$num_q} queries";
+ $stat .= " | MySQL: {$sql_time_txt}{$num_q} " . $lang['QUERIES'];
}
$stat .= " | $gzip_text";
- $stat .= ' | Mem: ';
+ $stat .= ' | '.$lang['MEMORY'];
$stat .= humn_size($bb_cfg['mem_on_start'], 2) .' / ';
$stat .= humn_size(sys('mem_peak'), 2) .' / ';
$stat .= humn_size(sys('mem'), 2);
diff --git a/upload/includes/page_footer_dev.php b/upload/includes/page_footer_dev.php
index d23d54fd2..945b3660e 100644
--- a/upload/includes/page_footer_dev.php
+++ b/upload/includes/page_footer_dev.php
@@ -115,7 +115,7 @@ echo '