4 files changed, 15 insertions, 26 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 5863ff1f53..823e62febd 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -201,9 +201,9 @@ function get_forum_rules($mode, &$rules, &$forum_id)
 
 function make_jumpbox($action, $forum_id = false, $extra_form_fields = array())
 {
-	global $auth, $template, $user, $db, $nav_links, $phpEx;
+	global $auth, $template, $user, $db, $nav_links, $phpEx, $SID;
 
-	$boxstring = '<select name="f" onChange="if(this.options[this.selectedIndex].value != -1){ forms[\'jumpbox\'].submit() }"><option value="-1">' . $user->lang['Select_forum'] . '</option><option value="-1">-----------------</option>';
+	$boxstring = '<select name="f" onChange="if(this.options[this.selectedIndex].value != -1){ forms[\'jumpbox\'].submit() }"><option value="-1">' . $user->lang['SELECT_FORUM'] . '</option><option value="-1">-----------------</option>';
 
 	$sql = 'SELECT forum_id, forum_name, forum_postable, left_id, right_id
 		FROM ' . FORUMS_TABLE . '
@@ -277,9 +277,6 @@ function make_jumpbox($action, $forum_id = false, $extra_form_fields = array())
 	}
 
 	$template->assign_vars(array(
-		'L_GO' => $user->lang['Go'],
-		'L_JUMP_TO' => $user->lang['Jump_to'],
-
 		'S_JUMPBOX_SELECT' => $boxstring,
 		'S_JUMPBOX_ACTION' => $action)
 	);
@@ -922,10 +919,10 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 			break;
 
 		case E_NOTICE:
-//			if (defined('DEBUG_EXTRA'))
-//			{
-//				echo "PHP Notice on line <b>$errline</b> in <b>$errfile</b> :: <b>$msg_text</b>";
-//			}
+			if (defined('DEBUG_EXTRA'))
+			{
+				echo "PHP Notice on line <b>$errline</b> in <b>$errfile</b> :: <b>$msg_text</b><br />";
+			}
 			break;
 
 		case E_USER_ERROR:
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index a9a97af31c..cb021f0137 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -156,22 +156,22 @@ function display_forums($root_data = '', $display_moderators = TRUE)
 		$unread_topics = ($user->data['user_id'] && $row['lastread_time'] < $row['forum_last_post_time'] ) ? TRUE : FALSE;
 
 		$folder_image = ($unread_topics) ? 'forum_new' : 'forum';
-		$folder_alt = ($unread_topics) ? 'New_posts' : 'No_new_posts';
+		$folder_alt = ($unread_topics) ? 'NEW_POSTS' : 'NO_NEW_POSTS';
 
 		if ($row['left_id'] + 1 < $row['right_id'])
 		{
 			$folder_image = ($unread_topics) ? 'sub_forum_new' : 'sub_forum';
-			$folder_alt = ($unread_topics) ? 'New_posts' : 'No_new_posts';
+			$folder_alt = ($unread_topics) ? 'NEW_POSTS' : 'NO_NEW_POSTS';
 		}
 		elseif ($row['forum_status'] == ITEM_LOCKED)
 		{
 			$folder_image = 'forum_locked';
-			$folder_alt = 'Forum_locked';
+			$folder_alt = 'FORUM_LOCKED';
 		}
 		else
 		{
 			$folder_image = ($unread_topics) ? 'forum_new' : 'forum';
-			$folder_alt = ($unread_topics) ? 'New_posts' : 'No_new_posts';
+			$folder_alt = ($unread_topics) ? 'NEW_POSTS' : 'NO_NEW_POSTS';
 		}
 
 		if ($row['forum_last_post_id'])
@@ -180,7 +180,7 @@ function display_forums($root_data = '', $display_moderators = TRUE)
 
 			$last_post .= ($row['forum_last_poster_id'] == ANONYMOUS) ? (($row['forum_last_poster_name'] != '') ? $row['forum_last_poster_name'] . ' ' : $user->lang['GUEST'] . ' ') : '<a href="ucp.' . $phpEx . $SID . '&amp;mode=viewprofile&amp;u='  . $row['forum_last_poster_id'] . '">' . $row['forum_last_poster_name'] . '</a> ';
 
-			$last_post .= '<a href="viewtopic.' . $phpEx . $SID . '&amp;f=' . $row['forum_id'] . '&amp;p=' . $row['forum_last_post_id'] . '#' . $row['forum_last_post_id'] . '">' . $user->img('goto_post_latest', 'View_latest_post') . '</a>';
+			$last_post .= '<a href="viewtopic.' . $phpEx . $SID . '&amp;f=' . $row['forum_id'] . '&amp;p=' . $row['forum_last_post_id'] . '#' . $row['forum_last_post_id'] . '">' . $user->img('goto_post_latest', 'VIEW_LATEST_POST') . '</a>';
 		}
 		else
 		{
@@ -231,8 +231,6 @@ function display_forums($root_data = '', $display_moderators = TRUE)
 			'MODERATORS'		=>	$moderators_list,
 			'SUBFORUMS'			=>	$subforums_list,
 
-			'FORUM_IMG'			=>	$forum_image,
-
 			'L_SUBFORUM_STR'	=>	$l_subforums,
 			'L_MODERATOR_STR'	=>	$l_moderator,
 			'L_FORUM_FOLDER_ALT'=>	$folder_alt,
@@ -243,7 +241,7 @@ function display_forums($root_data = '', $display_moderators = TRUE)
 
 	$template->assign_vars(array(
 		'S_HAS_SUBFORUM'	=>	($visible_forums) ? TRUE : FALSE,
-		'L_SUBFORUM'		=>	($visible_forums == 1) ? $user->lang['Subforum'] : $user->lang['Subforums']
+		'L_SUBFORUM'		=>	($visible_forums == 1) ? $user->lang['SUBFORUM'] : $user->lang['SUBFORUMS']
 	));
 }
 ?>
 \ No newline at end of file
diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php
index 24cda764e7..675794dcee 100644
--- a/phpBB/includes/page_header.php
+++ b/phpBB/includes/page_header.php
@@ -280,14 +280,6 @@ $template->assign_vars(array(
 
 	'L_LOGIN_LOGOUT' 	=> $l_login_logout,
 	'L_INDEX' 			=> $user->lang['Forum_Index'],
-	'L_FAQ' 			=> $user->lang['FAQ'],
-	'L_REGISTER' 		=> $user->lang['Register'],
-	'L_PROFILE' 		=> $user->lang['Profile'],
-	'L_SEARCH'			=> $user->lang['Search'],
-	'L_PRIVATEMSGS' 	=> $user->lang['Private_Messages'],
-	'L_MEMBERLIST' 		=> $user->lang['Memberlist'],
-	'L_USERGROUPS' 		=> $user->lang['Usergroups'],
-	'L_WHO_IS_ONLINE' 	=> $user->lang['Who_is_Online'],
 
 	'U_PRIVATEMSGS'	=> 'privmsg.'.$phpEx.$SID.'&amp;folder=inbox',
 	'U_MEMBERLIST' 	=> 'memberlist.'.$phpEx.$SID,
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index d467633abd..de1ef3aaa8 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -485,8 +485,10 @@ class user extends session
 
 		if (empty($imgs[$img]) || $no_cache)
 		{
+			$alt = (!empty($this->lang[$alt])) ? $this->lang[$alt] : '';
+
 			$width = ($width) ? 'width="' . $width . '" ' : '';
-			$imgs[$img] = '<img src=' . str_replace('{LANG}', $this->img_lang, $this->theme[$img]) . '" ' . $width . 'alt="' . $this->lang[$alt] . '" title="' . $this->lang[$alt] . '" />';
+			$imgs[$img] = '<img src=' . str_replace('{LANG}', $this->img_lang, $this->theme[$img]) . '" ' . $width . 'alt="' . $alt . '" title="' . $alt . '" />';
 		}
 		return $imgs[$img];
 	}