5 files changed, 17 insertions, 5 deletions
diff --git a/phpBB/admin/admin_board.php b/phpBB/admin/admin_board.php
index 3d5c471f27..bba31e9751 100644
--- a/phpBB/admin/admin_board.php
+++ b/phpBB/admin/admin_board.php
@@ -136,6 +136,9 @@ $template->assign_vars(array(
 	"L_DISABLE_BOARD" => $lang['Board_disable'], 
 	"L_DISABLE_BOARD_EXPLAIN" => $lang['Board_disable_explain'], 
 	"L_ACCT_ACTIVATION" => $lang['Acct_activation'], 
+	"L_NONE" => $lang['Acc_None'], 
+	"L_USER" => $lang['Acc_User'], 
+	"L_ADMIN" => $lang['Acc_Admin'], 
 	"L_COOKIE_SETTINGS" => $lang['Cookie_settings'], 
 	"L_COOKIE_SETTINGS_EXPLAIN" => $lang['Cookie_settings_explain'], 
 	"L_COOKIE_NAME" => $lang['Cookie_name'], 
diff --git a/phpBB/language/lang_english/lang_admin.php b/phpBB/language/lang_english/lang_admin.php
index b6404850e5..47bca32209 100644
--- a/phpBB/language/lang_english/lang_admin.php
+++ b/phpBB/language/lang_english/lang_admin.php
@@ -234,6 +234,9 @@ $lang['Site_desc'] = "Site description";
 $lang['Board_disable'] = "Disable board";
 $lang['Board_disable_explain'] = "This will make the board unavailable to users. Do not logout when you disable the board, you will not be able to log back in!";
 $lang['Acct_activation'] = "Enable account activation";
+$lang['Acc_None'] = "None"; // These three entries are the type of activation
+$lang['Acc_User'] = "User";
+$lang['Acc_Admin'] = "Admin";
 
 $lang['Abilities_settings'] = "User and Forum Basic Settings";
 $lang['Max_poll_options'] = "Max number of poll options";
diff --git a/phpBB/language/lang_english/lang_main.php b/phpBB/language/lang_english/lang_main.php
index b0e7dc7047..411f970886 100644
--- a/phpBB/language/lang_english/lang_main.php
+++ b/phpBB/language/lang_english/lang_main.php
@@ -142,6 +142,7 @@ $lang['Edit_profile'] = "Edit your profile";
 $lang['Search'] = "Search";
 $lang['Memberlist'] = "Memberlist";
 $lang['FAQ'] = "FAQ";
+$lang['BBCode_guide'] = "BBCode Guide";
 $lang['Usergroups'] = "Usergroups";
 $lang['Last_Post'] = "Last Post";
 $lang['Moderator'] = "Moderator";
@@ -765,7 +766,9 @@ $lang['You_been_banned'] = "You have been banned from this forum<br />Please con
 //
 // Viewonline
 //
-$lang['Reg_users_online'] = "There are %d Registered and "; // There ae 5 Registered and
+$lang['Reg_user_online'] = "There is %d Registered user and "; // There ae 5 Registered and
+$lang['Reg_users_online'] = "There are %d Registered users and "; // There ae 5 Registered and
+$lang['Hidden_user_online'] = "%d Hidden user online"; // 6 Hidden users online
 $lang['Hidden_users_online'] = "%d Hidden users online"; // 6 Hidden users online
 $lang['Guest_users_online'] = "There are %d 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
diff --git a/phpBB/templates/subSilver/admin/board_config_body.tpl b/phpBB/templates/subSilver/admin/board_config_body.tpl
index e76877cad2..35c7a87d6f 100644
--- a/phpBB/templates/subSilver/admin/board_config_body.tpl
+++ b/phpBB/templates/subSilver/admin/board_config_body.tpl
@@ -21,7 +21,7 @@
 	</tr>
 	<tr>
 		<td class="row1">{L_ACCT_ACTIVATION}</td>
-		<td class="row2"><input type="radio" name="require_activation" value="{ACTIVATION_NONE}" {ACTIVATION_NONE_CHECKED} />{L_NO}ne&nbsp; &nbsp;<input type="radio" name="require_activation" value="{ACTIVATION_USER}" {ACTIVATION_USER_CHECKED} />User&nbsp; &nbsp;<input type="radio" name="require_activation" value="{ACTIVATION_ADMIN}" {ACTIVATION_ADMIN_CHECKED} />Admin</td>
+		<td class="row2"><input type="radio" name="require_activation" value="{ACTIVATION_NONE}" {ACTIVATION_NONE_CHECKED} />{L_NONE}&nbsp; &nbsp;<input type="radio" name="require_activation" value="{ACTIVATION_USER}" {ACTIVATION_USER_CHECKED} />{L_USER}&nbsp; &nbsp;<input type="radio" name="require_activation" value="{ACTIVATION_ADMIN}" {ACTIVATION_ADMIN_CHECKED} />{L_ADMIN}</td>
 	</tr>
 	<tr>
 		<td class="row1">{L_BOARD_EMAIL_FORM}<br /><span class="gensmall">{L_BOARD_EMAIL_FORM_EXPLAIN}</span></td>
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php
index 9cf47d72bd..612821f350 100644
--- a/phpBB/viewonline.php
+++ b/phpBB/viewonline.php
@@ -83,7 +83,7 @@ $sql = "SELECT u.user_id, u.username, u.user_session_time, u.user_session_page,
 		AND u.user_id = s.session_user_id 
 		AND u.user_id <> " . ANONYMOUS . " 
 		AND u.user_session_time >= " . ( time() - 300 ) . " 
-	ORDER BY s.session_time DESC";
+	ORDER BY u.user_session_time DESC";
 if(!$result = $db->sql_query($sql))
 {
 	message_die(GENERAL_ERROR, "Couldn't obtain regd user/online information.", "", __LINE__, __FILE__, $sql);
@@ -231,15 +231,18 @@ if( count($onlinerow_reg) )
 		}
 	}
 
+	$l_r_user_s = ( $registered_users == 1 ) ? $lang['Reg_user_online'] : $lang['Reg_users_online'];
+	$l_h_user_s = ( $hidden_users == 1 ) ? $lang['Hidden_user_online'] : $lang['Hidden_users_online'];
+
 	$template->assign_vars(array(
-		"TOTAL_REGISTERED_USERS_ONLINE" => sprintf($lang['Reg_users_online'], $registered_users) . sprintf($lang['Hidden_users_online'], $hidden_users))
+		"TOTAL_REGISTERED_USERS_ONLINE" => sprintf($l_r_user_s, $registered_users) . sprintf($l_h_user_s, $hidden_users))
 	);
 
 }
 else
 {
 	$template->assign_vars(array(
-		"TOTAL_REGISTERED_USERS_ONLINE" => sprintf($lang['Reg_users_online'], 0, 0),
+		"TOTAL_REGISTERED_USERS_ONLINE" => sprintf($lang['Reg_users_online'], 0),
 		"L_NO_REGISTERED_USERS_BROWSING" => $lang['No_users_browsing'])
 	);
 }