Index: trunk/blocks/popular_posts_block.php
===================================================================
--- trunk/blocks/popular_posts_block.php	(revision 142)
+++ trunk/blocks/popular_posts_block.php	(revision 183)
@@ -32,16 +32,16 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />\n";
 		$form .= "<br />\n";
-		$form .= _MB_XPRESS_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
-		$form .= _MB_MONTH_RANGE .": <input type='text' name='options[3]' value='" . $show_month_range . "' /><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_MONTH_RANGE .": <input type='text' name='options[3]' value='" . $show_month_range . "' /><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_TAGS_SELECT .": <input type='text' name='options[6]' value='" . $tag_select . "' /><br />\n";	
-	    $form .= _MB_XPRESS_CATS_SELECT ."<br />\n";
+		$form .= _MB_XP2_TAGS_SELECT .": <input type='text' name='options[6]' value='" . $tag_select . "' /><br />\n";	
+	    $form .= _MB_XP2_CATS_SELECT ."<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>";
 		ob_start();
 		dropdown_cats_options('ID','asc',$selected);