Index: trunk/blocks/category_block.php
===================================================================
--- trunk/blocks/category_block.php	(revision 122)
+++ trunk/blocks/category_block.php	(revision 183)
@@ -37,41 +37,41 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
 		$form .= "<br />";
-		$form .= _MB_XPRESS_CAT_ALL_STR . "  <input type='text' name='options[2]' value='" . $show_option_all . "' /><br />";
-		$form .= _MB_XPRESS_CAT_ORDERBY .": ";
+		$form .= _MB_XP2_CAT_ALL_STR . "  <input type='text' name='options[2]' value='" . $show_option_all . "' /><br />";
+		$form .= _MB_XP2_CAT_ORDERBY .": ";
 		$form .=  "<select name='options[3]'>";
 		if ($orderby =='name')
-			$form .=  "<option value='name' selected='selected'>". _MB_XPRESS_CAT_NAME;
+			$form .=  "<option value='name' selected='selected'>". _MB_XP2_CAT_NAME;
 		else
-			$form .=  "<option value='name'>". _MB_XPRESS_CAT_NAME;
+			$form .=  "<option value='name'>". _MB_XP2_CAT_NAME;
 		if ($orderby =='count')
-			$form .=  "<option value='count' selected='selected'>". _MB_XPRESS_CAT_COUNT;
+			$form .=  "<option value='count' selected='selected'>". _MB_XP2_CAT_COUNT;
 		else
-			$form .=  "<option value='count'>". _MB_XPRESS_CAT_COUNT;
+			$form .=  "<option value='count'>". _MB_XP2_CAT_COUNT;
 		if ($orderby =='ID')
-			$form .=  "<option value='ID' selected='selected'>". _MB_XPRESS_CAT_ID;
+			$form .=  "<option value='ID' selected='selected'>". _MB_XP2_CAT_ID;
 		else
-			$form .=  "<option value='ID'>". _MB_XPRESS_CAT_ID;
+			$form .=  "<option value='ID'>". _MB_XP2_CAT_ID;
 		$form .=  "</select><br/>";
 		
-		$form .= _MB_XPRESS_SORT_ORDER .": ";
+		$form .= _MB_XP2_SORT_ORDER .": ";
 		$form .=  "<select name='options[4]'>";
 		if ($order =='ASC')
-			$form .=  "<option value='ASC' selected='selected'>" . _MB_XPRESS_SORT_ASC;
+			$form .=  "<option value='ASC' selected='selected'>" . _MB_XP2_SORT_ASC;
 		else
-			$form .=  "<option value='ASC'>" . _MB_XPRESS_SORT_ASC;
+			$form .=  "<option value='ASC'>" . _MB_XP2_SORT_ASC;
 		if ($order =='DESC')
-			$form .=  "<option value='DESC' selected='selected'>" . _MB_XPRESS_SORT_DESC;
+			$form .=  "<option value='DESC' selected='selected'>" . _MB_XP2_SORT_DESC;
 		else
-			$form .=  "<option value='DESC'>" . _MB_XPRESS_SORT_DESC;
+			$form .=  "<option value='DESC'>" . _MB_XP2_SORT_DESC;
 		$form .=  "</select><br/>";
 		
-		$form .= yes_no_radio_option('options[5]', _MB_XPRESS_SHOW_LAST_UPDATE , $show_last_updated) . "<br />" ;
-		$form .= yes_no_radio_option('options[6]', _MB_XPRESS_SHOW_NUM_OF_POST , $show_count) . "<br />" ;
-		$form .= yes_no_radio_option('options[7]', _MB_XPRESS_CAT_HIDE_EMPTY , $hide_empty) . "<br />" ;
-		$form .= yes_no_radio_option('options[8]', _MB_XPRESS_DESC_FOR_TITLE , $use_desc_for_title) . "<br />" ;
-		$form .= _MB_XPRESS_CAT_EXCLUDE . "  <input type='text' name='options[9]' value='" . $exclude . "' size ='60' /><br />";
-		$form .= _MB_XPRESS_CAT_INCLUDE . "  <input type='text' name='options[10]' value='" . $includes . "' size ='60' /><br />";
-		$form .= yes_no_radio_option('options[11]', _MB_XPRESS_CAT_HIERARCHICAL , $hierarchical) . "<br />" ;
-		$form .= _MB_XPRESS_CAT_DEPTH . "  <input type='text' name='options[12]' value='" . $depth . "' size ='8' /><br />";
+		$form .= yes_no_radio_option('options[5]', _MB_XP2_SHOW_LAST_UPDATE , $show_last_updated) . "<br />" ;
+		$form .= yes_no_radio_option('options[6]', _MB_XP2_SHOW_NUM_OF_POST , $show_count) . "<br />" ;
+		$form .= yes_no_radio_option('options[7]', _MB_XP2_CAT_HIDE_EMPTY , $hide_empty) . "<br />" ;
+		$form .= yes_no_radio_option('options[8]', _MB_XP2_DESC_FOR_TITLE , $use_desc_for_title) . "<br />" ;
+		$form .= _MB_XP2_CAT_EXCLUDE . "  <input type='text' name='options[9]' value='" . $exclude . "' size ='60' /><br />";
+		$form .= _MB_XP2_CAT_INCLUDE . "  <input type='text' name='options[10]' value='" . $includes . "' size ='60' /><br />";
+		$form .= yes_no_radio_option('options[11]', _MB_XP2_CAT_HIERARCHICAL , $hierarchical) . "<br />" ;
+		$form .= _MB_XP2_CAT_DEPTH . "  <input type='text' name='options[12]' value='" . $depth . "' size ='8' /><br />";
 		return $form;
 	}