Index: trunk/blocks/archives_block.php
===================================================================
--- trunk/blocks/archives_block.php	(revision 125)
+++ trunk/blocks/archives_block.php	(revision 183)
@@ -30,39 +30,39 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
 		$form .= "<br />";
-		$a_month = _MB_XPRESS_ARC_MONTH ;
-		$a_week = _MB_XPRESS_ARC_WEEK ;		
+		$a_month = _MB_XP2_ARC_MONTH ;
+		$a_week = _MB_XP2_ARC_WEEK ;		
 
-		$form .= _MB_XPRESS_ARC_TYPE .": ";
+		$form .= _MB_XP2_ARC_TYPE .": ";
 		$form .=  "<select name='options[2]'>";
 		if ($type =='yearly')
-			$form .=  "<option value='yearly' selected='selected'>". _MB_XPRESS_ARC_YEAR;
+			$form .=  "<option value='yearly' selected='selected'>". _MB_XP2_ARC_YEAR;
 		else
-			$form .=  "<option value='yearly'>". _MB_XPRESS_ARC_YEAR;
+			$form .=  "<option value='yearly'>". _MB_XP2_ARC_YEAR;
 		
 		if ($type =='monthly')
-			$form .=  "<option value='monthly' selected='selected'>". _MB_XPRESS_ARC_MONTH;
+			$form .=  "<option value='monthly' selected='selected'>". _MB_XP2_ARC_MONTH;
 		else
-			$form .=  "<option value='monthly'>". _MB_XPRESS_ARC_MONTH;
+			$form .=  "<option value='monthly'>". _MB_XP2_ARC_MONTH;
 		
 		if ($type =='weekly')
-			$form .=  "<option value='weekly' selected='selected'>". _MB_XPRESS_ARC_WEEK;
+			$form .=  "<option value='weekly' selected='selected'>". _MB_XP2_ARC_WEEK;
 		else
-			$form .=  "<option value='weekly'>". _MB_XPRESS_ARC_WEEK;
+			$form .=  "<option value='weekly'>". _MB_XP2_ARC_WEEK;
 		
 		if ($type =='daily')
-			$form .=  "<option value='daily' selected='selected'>". _MB_XPRESS_ARC_DAY;
+			$form .=  "<option value='daily' selected='selected'>". _MB_XP2_ARC_DAY;
 		else
-			$form .=  "<option value='daily'>". _MB_XPRESS_ARC_DAY;
+			$form .=  "<option value='daily'>". _MB_XP2_ARC_DAY;
 
 		if ($type =='postbypost')
-			$form .=  "<option value='postbypost' selected='selected'>". _MB_XPRESS_ARC_POST;
+			$form .=  "<option value='postbypost' selected='selected'>". _MB_XP2_ARC_POST;
 		else
-			$form .=  "<option value='postbypost'>". _MB_XPRESS_ARC_POST;
+			$form .=  "<option value='postbypost'>". _MB_XP2_ARC_POST;
 
 		$form .=  "</select><br/>";
 		
-		$form .= "<br />" . _MB_XPRESS_COUNT_ZERO_ALL . "  <input type='text' name='options[3]' value='" . $limit . "' />";
-		$form .= "<br />" . yes_no_radio_option('options[4]', _MB_XPRESS_SHOW_NUM_OF_POST , $show_post_count);
-		$form .= "<br />" . yes_no_radio_option('options[5]', _MB_XPRESS_SHOW_DROP_DOWN , $drop_down);
+		$form .= "<br />" . _MB_XP2_COUNT_ZERO_ALL . "  <input type='text' name='options[3]' value='" . $limit . "' />";
+		$form .= "<br />" . yes_no_radio_option('options[4]', _MB_XP2_SHOW_NUM_OF_POST , $show_post_count);
+		$form .= "<br />" . yes_no_radio_option('options[5]', _MB_XP2_SHOW_DROP_DOWN , $drop_down);
 //	    $form .="<br /><input type='text' size='60' name='options[5]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' />";