Index: trunk/blocks/recent_comments_block.php
===================================================================
--- trunk/blocks/recent_comments_block.php	(revision 142)
+++ trunk/blocks/recent_comments_block.php	(revision 183)
@@ -32,30 +32,30 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />\n";
 		$form .= "<br />";
-		$form .= _MB_XPRESS_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
-		$form .= _MB_XPRESS_LENGTH .": <input type='text' name='options[3]' value='" . $disp_length . "' /><br />\n";
-		$form .= _MB_XPRESS_DATE_FORMAT .": <input type='text' name='options[4]' value='" . $date_format . "' /><br />\n";
-		$form .= _MB_XPRESS_TIME_FORMAT .": <input type='text' name='options[5]' value='" . $time_format . "' /><br />\n";
+		$form .= _MB_XP2_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
+		$form .= _MB_XP2_LENGTH .": <input type='text' name='options[3]' value='" . $disp_length . "' /><br />\n";
+		$form .= _MB_XP2_DATE_FORMAT .": <input type='text' name='options[4]' value='" . $date_format . "' /><br />\n";
+		$form .= _MB_XP2_TIME_FORMAT .": <input type='text' name='options[5]' value='" . $time_format . "' /><br />\n";
 	    $form .= "<br />\n";
-	    $form .= _MB_XPRESS_COM_TYPE . "<br />\n";
+	    $form .= _MB_XP2_COM_TYPE . "<br />\n";
 	    $isAll = (count($selected)==0||empty($selected[0]))?true:false;
 	    $form .= "&nbsp;&nbsp;<select name=\"options[]\" multiple=\"multiple\">";
 		    $form .= "<option value=\"0\" ";
 		    if ($isAll) $form .= " selected=\"selected\"";
-		    $form .= ">"._MB_XPRESS_ALL ."</option>";
+		    $form .= ">"._MB_XP2_ALL ."</option>";
 
 		    $form .= "<option value=\"1\" ";
 		    if (in_array(1, $selected))
 				$form .= " selected=\"selected\"";
-		    $form .= ">"._MB_XPRESS_COMMENT ."</option>";
+		    $form .= ">"._MB_XP2_COMMENT ."</option>";
 
 		    $form .= "<option value=\"2\" ";
 		    if (in_array(2, $selected))
 				$form .= " selected=\"selected\"";
-		    $form .= ">"._MB_XPRESS_TRUCKBACK ."</option>";
+		    $form .= ">"._MB_XP2_TRUCKBACK ."</option>";
 
 		    $form .= "<option value=\"3\" ";
 		    if (in_array(3, $selected))
 				$form .= " selected=\"selected\"";
-		    $form .= ">"._MB_XPRESS_PINGBACK ."</option>";
+		    $form .= ">"._MB_XP2_PINGBACK ."</option>";
 		$form .= "</select><br />";
 		//	    $form .="<br /><input type='text' size='60' name='options[5]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' />";