Index: trunk/blocks/page_block.php
===================================================================
--- trunk/blocks/page_block.php	(revision 127)
+++ trunk/blocks/page_block.php	(revision 183)
@@ -37,86 +37,86 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
 		$form .= "<br />";
-		$form .= _MB_XPRESS_PAGE_ORDERBY .": ";
+		$form .= _MB_XP2_PAGE_ORDERBY .": ";
 		$form .=  "<select name='options[2]'>";
 		
 		if ($sort_column =='post_title')
-			$form .=  "<option value='post_title' selected='selected'>". _MB_XPRESS_PAGE_TITLE;
+			$form .=  "<option value='post_title' selected='selected'>". _MB_XP2_PAGE_TITLE;
 		else
-			$form .=  "<option value='post_title'>". _MB_XPRESS_PAGE_TITLE;
+			$form .=  "<option value='post_title'>". _MB_XP2_PAGE_TITLE;
 		
 		if ($sort_column =='menu_order')
-			$form .=  "<option value='menu_order' selected='selected'>". _MB_XPRESS_PAGE_MENU_ORDER;
+			$form .=  "<option value='menu_order' selected='selected'>". _MB_XP2_PAGE_MENU_ORDER;
 		else
-			$form .=  "<option value='menu_order'>". _MB_XPRESS_PAGE_MENU_ORDER;
+			$form .=  "<option value='menu_order'>". _MB_XP2_PAGE_MENU_ORDER;
 		
 		if ($sort_column =='post_date')
-			$form .=  "<option value='post_date' selected='selected'>". _MB_XPRESS_PAGE_POST_DATE;
+			$form .=  "<option value='post_date' selected='selected'>". _MB_XP2_PAGE_POST_DATE;
 		else
-			$form .=  "<option value='post_date'>". _MB_XPRESS_PAGE_POST_DATE;
+			$form .=  "<option value='post_date'>". _MB_XP2_PAGE_POST_DATE;
 		
 		if ($sort_column =='post_modified')
-			$form .=  "<option value='post_modified' selected='selected'>". _MB_XPRESS_PAGE_POST_MODIFY;
+			$form .=  "<option value='post_modified' selected='selected'>". _MB_XP2_PAGE_POST_MODIFY;
 		else
-			$form .=  "<option value='post_modified'>". _MB_XPRESS_PAGE_POST_MODIFY;
+			$form .=  "<option value='post_modified'>". _MB_XP2_PAGE_POST_MODIFY;
 		
 		if ($sort_column =='ID')
-			$form .=  "<option value='ID' selected='selected'>". _MB_XPRESS_PAGE_ID;
+			$form .=  "<option value='ID' selected='selected'>". _MB_XP2_PAGE_ID;
 		else
-			$form .=  "<option value='ID'>". _MB_XPRESS_PAGE_ID;
+			$form .=  "<option value='ID'>". _MB_XP2_PAGE_ID;
 		
 		if ($sort_column =='post_author')
-			$form .=  "<option value='post_author' selected='selected'>". _MB_XPRESS_PAGE_AUTHOR;
+			$form .=  "<option value='post_author' selected='selected'>". _MB_XP2_PAGE_AUTHOR;
 		else
-			$form .=  "<option value='post_author'>". _MB_XPRESS_PAGE_AUTHOR;
+			$form .=  "<option value='post_author'>". _MB_XP2_PAGE_AUTHOR;
 		
 		if ($sort_column =='post_name')
-			$form .=  "<option value='post_name' selected='selected'>". _MB_XPRESS_PAGE_SLUG;
+			$form .=  "<option value='post_name' selected='selected'>". _MB_XP2_PAGE_SLUG;
 		else
-			$form .=  "<option value='post_name'>". _MB_XPRESS_PAGE_SLUG;
+			$form .=  "<option value='post_name'>". _MB_XP2_PAGE_SLUG;
 		
 		$form .=  "</select><br/>";
 		
 		
-		$form .= _MB_XPRESS_SORT_ORDER .": ";
+		$form .= _MB_XP2_SORT_ORDER .": ";
 		$form .=  "<select name='options[3]'>";
 		if ($sort_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 ($sort_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/>\n";
 		
-		$form .= _MB_XPRESS_PAGE_EXCLUDE . "  <input type='text' name='options[4]' value='" . $exclude . "' size ='60' /><br />\n";
-		$form .= _MB_XPRESS_PAGE_EXCLUDE_TREE . "  <input type='text' name='options[5]' value='" . $exclude_tree . "' size ='8' /><br />\n";
-		$form .= _MB_XPRESS_PAGE_INCLUDE . "  <input type='text' name='options[6]' value='" . $includes . "' size ='60' /><br />\n";
-		$form .= _MB_XPRESS_PAGE_DEPTH . "  <input type='text' name='options[7]' value='" . $depth . "' size ='8' /><br />";
-		$form .= _MB_XPRESS_PAGE_CHILD_OF . "  <input type='text' name='options[8]' value='" . $child_of . "' size ='8' /><br />";
+		$form .= _MB_XP2_PAGE_EXCLUDE . "  <input type='text' name='options[4]' value='" . $exclude . "' size ='60' /><br />\n";
+		$form .= _MB_XP2_PAGE_EXCLUDE_TREE . "  <input type='text' name='options[5]' value='" . $exclude_tree . "' size ='8' /><br />\n";
+		$form .= _MB_XP2_PAGE_INCLUDE . "  <input type='text' name='options[6]' value='" . $includes . "' size ='60' /><br />\n";
+		$form .= _MB_XP2_PAGE_DEPTH . "  <input type='text' name='options[7]' value='" . $depth . "' size ='8' /><br />";
+		$form .= _MB_XP2_PAGE_CHILD_OF . "  <input type='text' name='options[8]' value='" . $child_of . "' size ='8' /><br />";
 
-		$form .= _MB_XPRESS_SHOW_DATE_SELECT .": ";
+		$form .= _MB_XP2_SHOW_DATE_SELECT .": ";
 		$form .=  "<select name='options[9]'>";
 		if ($show_date =='none')
-			$form .=  "<option value='none' selected='selected'>" . _MB_XPRESS_SHOW_DATE_NONE;
+			$form .=  "<option value='none' selected='selected'>" . _MB_XP2_SHOW_DATE_NONE;
 		else
-			$form .=  "<option value='none'>" . _MB_XPRESS_SHOW_DATE_NONE;
+			$form .=  "<option value='none'>" . _MB_XP2_SHOW_DATE_NONE;
 
 		if ($show_date =='post_date')
-			$form .=  "<option value='post_date' selected='selected'>" . _MB_XPRESS_SHOW_POST_DATE;
+			$form .=  "<option value='post_date' selected='selected'>" . _MB_XP2_SHOW_POST_DATE;
 		else
-			$form .=  "<option value='post_date'>" . _MB_XPRESS_SHOW_POST_DATE;
+			$form .=  "<option value='post_date'>" . _MB_XP2_SHOW_POST_DATE;
 
 		if ($show_date =='modified')
-			$form .=  "<option value='modified' selected='selected'>" . _MB_XPRESS_SHOW_MODIFY_DATE;
+			$form .=  "<option value='modified' selected='selected'>" . _MB_XP2_SHOW_MODIFY_DATE;
 		else
-			$form .=  "<option value='modified'>" . _MB_XPRESS_SHOW_MODIFY_DATE;
+			$form .=  "<option value='modified'>" . _MB_XP2_SHOW_MODIFY_DATE;
 		
 		$form .=  "</select><br/>\n";
 
-		$form .= _MB_XPRESS_DATE_FORMAT .": <input type='text' name='options[10]' value='" . $date_format . "' /><br />\n";
-		$form .= yes_no_radio_option('options[11]', _MB_XPRESS_PAGE_HIERARCHICAL , $hierarchical) . "<br />" ;
-		$form .= _MB_XPRESS_PAGE_META_KEY . "  <input type='text' name='options[12]' value='" . $meta_key . "' size ='40' /><br />\n";
-		$form .= _MB_XPRESS_PAGE_META_VALUE . "  <input type='text' name='options[12]' value='" . $meta_value . "' size ='40' /><br />\n";
+		$form .= _MB_XP2_DATE_FORMAT .": <input type='text' name='options[10]' value='" . $date_format . "' /><br />\n";
+		$form .= yes_no_radio_option('options[11]', _MB_XP2_PAGE_HIERARCHICAL , $hierarchical) . "<br />" ;
+		$form .= _MB_XP2_PAGE_META_KEY . "  <input type='text' name='options[12]' value='" . $meta_key . "' size ='40' /><br />\n";
+		$form .= _MB_XP2_PAGE_META_VALUE . "  <input type='text' name='options[12]' value='" . $meta_value . "' size ='40' /><br />\n";
     
 		return $form;