diff --git a/upload/config.php b/upload/config.php
index 21239cb89..736dbf866 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -56,8 +56,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.5 Beta';
-$bb_cfg['tp_release_state'] = 'R441';
-$bb_cfg['tp_release_date'] = '06-07-2012';
+$bb_cfg['tp_release_state'] = 'R442';
+$bb_cfg['tp_release_date'] = '10-07-2012';
 
 // Database
 $charset  = 'utf8';
diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php
index 236a5221f..f628630e2 100644
--- a/upload/language/lang_english/lang_main.php
+++ b/upload/language/lang_english/lang_main.php
@@ -887,18 +887,10 @@ $lang['YOU_BEEN_BANNED'] = 'You have been banned from this forum.<br />Please co
 //
 // Viewonline
 //
-$lang['REG_USERS_ZERO_ONLINE'] = 'There are 0 Registered users and '; // There are 5 Registered and
-$lang['REG_USERS_ONLINE'] = 'There are %d Registered users and '; // There are 5 Registered and
-$lang['REG_USER_ONLINE'] = 'There is %d Registered user and '; // There is 1 Registered and
-$lang['HIDDEN_USERS_ZERO_ONLINE'] = '0 Hidden users online'; // 6 Hidden users online
-$lang['HIDDEN_USERS_ONLINE'] = '%d Hidden users online'; // 6 Hidden users online
-$lang['HIDDEN_USER_ONLINE'] = '%d Hidden user online'; // 6 Hidden users online
-$lang['GUEST_USERS_ONLINE'] = 'There are %d Guest users online'; // There are 10 Guest users online
-$lang['GUEST_USERS_ZERO_ONLINE'] = 'There are 0 Guest users online'; // There are 10 Guest users online
-$lang['GUEST_USER_ONLINE'] = 'There is %d Guest user online'; // There is 1 Guest user online
-$lang['NO_USERS_BROWSING'] = 'There are no users currently browsing this forum';
+$lang['REG_USERS_ONLINE'] = 'Who is online registered users: %d and ';
+$lang['HIDDEN_USERS_ONLINE'] = 'hidden users: %d';
+$lang['GUEST_USERS_ONLINE'] = 'Online Guests: %d';
 $lang['ALL_USERS'] = 'All users:';
-
 $lang['ONLINE_EXPLAIN'] = 'users active over the past five minutes';
 $lang['LAST_UPDATED'] = 'Last Updated';
 
diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php
index 03301f301..e789b36bd 100644
--- a/upload/language/lang_russian/lang_main.php
+++ b/upload/language/lang_russian/lang_main.php
@@ -894,19 +894,10 @@ $lang['YOU_BEEN_BANNED'] = 'Вам был закрыт доступ к фору
 //
 // Viewonline
 //
-$lang['REG_USERS_ZERO_ONLINE'] = 'Сейчас на сайте зарегистрированных пользователей: 0 и '; // There ae 5 Registered and
-$lang['REG_USERS_ONLINE'] = 'Сейчас на сайте зарегистрированных пользователей: %d и '; // There ae 5 Registered and
-$lang['REG_USER_ONLINE'] = 'Сейчас на сайте зарегистрированных пользователей: %d и ';
-$lang['HIDDEN_USERS_ZERO_ONLINE'] = 'скрытых пользователей: 0'; // 6 Hidden users online
+$lang['REG_USERS_ONLINE'] = 'Сейчас на сайте зарегистрированных пользователей: %d и ';
 $lang['HIDDEN_USERS_ONLINE'] = 'скрытых пользователей: %d';
-$lang['HIDDEN_USER_ONLINE'] = 'скрытых пользователей: %d'; // 6 Hidden users online
 $lang['GUEST_USERS_ONLINE'] = 'Сейчас на сайте гостей: %d';
-$lang['GUEST_USERS_ZERO_ONLINE'] = 'Сейчас на сайте гостей: 0'; // There are 10 Guest users online
-$lang['GUEST_USER_ONLINE'] = 'Сейчас на сайте гостей: %d';
-$lang['NO_USERS_BROWSING'] = 'Этот сайт сейчас никто не просматривает';
 $lang['ALL_USERS'] = 'Всех:';
-
-
 $lang['ONLINE_EXPLAIN'] = 'данные за последние пять минут';
 $lang['LAST_UPDATED'] = 'Последнее изменение';
 
diff --git a/upload/viewonline.php b/upload/viewonline.php
index e066a2bf5..b45884ce4 100644
--- a/upload/viewonline.php
+++ b/upload/viewonline.php
@@ -3,7 +3,7 @@
 define('IN_PHPBB', true);
 define('BB_SCRIPT', 'online');
 define('BB_ROOT', './');
-require(BB_ROOT ."common.php");
+require(BB_ROOT .'common.php');
 
 // Start session management
 $user->session_start(array('req_login' => true));
@@ -109,63 +109,10 @@ while ( $row = DB()->sql_fetchrow($result) )
 	}
 }
 
-if( $registered_users == 0 )
-{
-	$l_r_user_s = $lang['REG_USERS_ZERO_ONLINE'];
-}
-else if( $registered_users == 1 )
-{
-	$l_r_user_s = $lang['REG_USER_ONLINE'];
-}
-else
-{
-	$l_r_user_s = $lang['REG_USERS_ONLINE'];
-}
-
-if( $hidden_users == 0 )
-{
-	$l_h_user_s = $lang['HIDDEN_USERS_ZERO_ONLINE'];
-}
-else if( $hidden_users == 1 )
-{
-	$l_h_user_s = $lang['HIDDEN_USER_ONLINE'];
-}
-else
-{
-	$l_h_user_s = $lang['HIDDEN_USERS_ONLINE'];
-}
-
-if( $guest_users == 0 )
-{
-	$l_g_user_s = $lang['GUEST_USERS_ZERO_ONLINE'];
-}
-else if( $guest_users == 1 )
-{
-	$l_g_user_s = $lang['GUEST_USER_ONLINE'];
-}
-else
-{
-	$l_g_user_s = $lang['GUEST_USERS_ONLINE'];
-}
-
 $template->assign_vars(array(
-	'TOTAL_USERS_ONLINE' => $l_r_user_s + $registered_users + $l_h_user_s + $hidden_users + $l_g_user_s + $guest_users,
-	'TOTAL_REGISTERED_USERS_ONLINE' => sprintf($l_r_user_s, $registered_users) . sprintf($l_h_user_s, $hidden_users),
-	'TOTAL_GUEST_USERS_ONLINE' => sprintf($l_g_user_s, $guest_users))
+	'TOTAL_USERS_ONLINE' => $registered_users + $hidden_users + $guest_users,
+	'TOTAL_REGISTERED_USERS_ONLINE' => sprintf($lang['REG_USERS_ONLINE'], $registered_users) . sprintf($lang['HIDDEN_USERS_ONLINE'], $hidden_users),
+	'TOTAL_GUEST_USERS_ONLINE' => sprintf($lang['GUEST_USERS_ONLINE'], $guest_users))
 );
 
-if ( $registered_users + $hidden_users == 0 )
-{
-	$template->assign_vars(array(
-		'L_NO_REGISTERED_USERS_BROWSING' => $lang['NO_USERS_BROWSING'])
-	);
-}
-
-if ( $guest_users == 0 )
-{
-	$template->assign_vars(array(
-		'L_NO_GUESTS_BROWSING' => $lang['NO_USERS_BROWSING'])
-	);
-}
-
 print_page('viewonline.tpl');