Index: /trunk/admin/block_check.php
===================================================================
--- /trunk/admin/block_check.php	(revision 182)
+++ /trunk/admin/block_check.php	(revision 183)
@@ -82,27 +82,27 @@
 			echo $xoops_block_check->get_message();
 			echo "<br /><br />";
-			echo _AM_XP_BLOCK_OK ;
+			echo _AM_XP2_BLOCK_OK ;
 	} else {
 
 			echo $xoops_block_check->get_message();
 			echo "<br /><br />\n";
-			echo _AM_XP_BLOCK_NG."<br />\n";
-			echo _AM_XP_BLOCK_REPAIR_HOWTO."<br />\n"; 
+			echo _AM_XP2_BLOCK_NG."<br />\n";
+			echo _AM_XP2_BLOCK_REPAIR_HOWTO."<br />\n"; 
 			echo '<form method="POST">'."\n";
-			echo _AM_XP_BLOCK_REPAIR_STEP1 .' : '."\n"; 
-			echo '<input type="submit" name="mid:'.$xoops_block_check->module_id.'" value="' . _AM_XP_BLOCK_REMOVE . ': '.$xoops_block_check->module_name.'" />'."<br />\n";
+			echo _AM_XP2_BLOCK_REPAIR_STEP1 .' : '."\n"; 
+			echo '<input type="submit" name="mid:'.$xoops_block_check->module_id.'" value="' . _AM_XP2_BLOCK_REMOVE . ': '.$xoops_block_check->module_name.'" />'."<br />\n";
 			echo '&emsp;&emsp;&emsp;&emsp;&nbsp;';
-			echo _AM_XP_BLOCK_REMOVE_NOTE;
+			echo _AM_XP2_BLOCK_REMOVE_NOTE;
 			echo "</form>\n";
 			echo "<br />\n";
-			echo _AM_XP_BLOCK_REPAIR_STEP2 . ' : ' . _AM_XP_BLOCK_UPDATE . "<br />\n";
+			echo _AM_XP2_BLOCK_REPAIR_STEP2 . ' : ' . _AM_XP2_BLOCK_UPDATE . "<br />\n";
 			echo '&emsp;&emsp;&emsp;&emsp;&nbsp;';
-			echo '<a href="'.$xoops_block_check->update_link.'">' .$xoops_block_check->module_name . ' ' . _AM_XP_TO_MODELE_UPDATE .'</a>';
+			echo '<a href="'.$xoops_block_check->update_link.'">' .$xoops_block_check->module_name . ' ' . _AM_XP2_TO_MODELE_UPDATE .'</a>';
 			echo "<br />\n";
 			echo "<br />\n";
 			
-			echo _AM_XP_BLOCK_REPAIR_STEP3 . ' : ' . _AM_XP_BLOCK_ADMIN_SETTING . "<br />\n";
+			echo _AM_XP2_BLOCK_REPAIR_STEP3 . ' : ' . _AM_XP2_BLOCK_ADMIN_SETTING . "<br />\n";
 			echo '&emsp;&emsp;&emsp;&emsp;&nbsp;';
-			echo '<a href="admin_blocks.php">' .$xoops_block_check->module_name . ' ' . _AM_XP_BLOCK_TO_SETTING .'</a>';
+			echo '<a href="admin_blocks.php">' .$xoops_block_check->module_name . ' ' . _AM_XP2_BLOCK_TO_SETTING .'</a>';
 			echo "<br />\n";
 	}
Index: /trunk/admin/index.php
===================================================================
--- /trunk/admin/index.php	(revision 182)
+++ /trunk/admin/index.php	(revision 183)
@@ -103,8 +103,8 @@
 {
 	if ($is_report) {
-		echo "******** "  . _AM_XPRESS_PLUGIN . "********" . "<br />\n";
+		echo "******** "  . _AM_XP2_PLUGIN . "********" . "<br />\n";
 		echo get_xpress_active_plugin_list('&emsp;') . "<br />\n";
 	} else {
-		echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_XPRESS_PLUGIN . "</legend>";
+		echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_XP2_PLUGIN . "</legend>";
 		echo "<div style='padding: 8px;'>";
 		echo get_xpress_active_plugin_list();
@@ -120,5 +120,5 @@
 	
 	if ($is_report) {
-		echo "******** "  . _AM_SYSTEM_INFO . "********" . "<br />\n";
+		echo "******** "  . _AM_XP2_SYSTEM_INFO . "********" . "<br />\n";
 		echo '&emsp;' . "SERVER:  ". $_SERVER['SERVER_SOFTWARE']. "<br />\n";
 		echo '&emsp;' . "PHP Version:   " . phpversion() . "<br />\n";
@@ -182,5 +182,5 @@
 		echo "<br />\n";
 	} else {
-		echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_SYSTEM_INFO . "</legend>";
+		echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_XP2_SYSTEM_INFO . "</legend>";
 		echo "<div style='padding: 8px;'>";
 		echo "<label>" . "<strong>SERVER:</strong>" . ":</label><text>" . $_SERVER['SERVER_SOFTWARE'] . "</text><br />";
@@ -255,5 +255,5 @@
 	$xoops_config = new ConfigFromXoops;
 	if ($is_report) {
-		echo "******** "  . _AM_XOOPS_CONFIG_INFO . "********" . "<br />\n";
+		echo "******** "  . _AM_XP2_XOOPS_CONFIG_INFO . "********" . "<br />\n";
 		echo '&emsp;' . 'XOOPS_ROOT_PATH:  ' ; 
 		if(XOOPS_ROOT_PATH !== $xoops_config->xoops_root_path)
@@ -332,5 +332,5 @@
 
 	} else {
-		echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_XOOPS_CONFIG_INFO . "</legend>";
+		echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_XP2_XOOPS_CONFIG_INFO . "</legend>";
 		echo "<div style='padding: 8px;'>";
 		echo '<table width="400" cellspacing="1" cellpadding="1" border="1">';
@@ -472,17 +472,17 @@
 
 	if ($is_report){
-		echo "******** " . _AM_XPRESS_STATS . "********" . "<br />\n";
-		echo '&emsp;' . _AM_XPRESS_CATEGORIES .":  ".@$count_category. "<br />\n";
-		echo '&emsp;' . _AM_XPRESS_ARTICLES .":  ". $count_article. "<br />\n";
-		echo '&emsp;' . _AM_XPRESS_AUTHORS .":  ". $count_author. "<br />\n";
+		echo "******** " . _AM_XP2_STATS . "********" . "<br />\n";
+		echo '&emsp;' . _AM_XP2_CATEGORIES .":  ".@$count_category. "<br />\n";
+		echo '&emsp;' . _AM_XP2_ARTICLES .":  ". $count_article. "<br />\n";
+		echo '&emsp;' . _AM_XP2_AUTHORS .":  ". $count_author. "<br />\n";
 		
 	} else {
-		echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_XPRESS_STATS . "</legend>";
+		echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_XP2_STATS . "</legend>";
 		echo "<div style='padding: 8px;'>";
-		echo "<label>" . _AM_XPRESS_CATEGORIES .":</label><text>".@$count_category;
-		echo "</text><br />";
-		echo "<label>" . _AM_XPRESS_ARTICLES .":</label><text>". $count_article;
-		echo "</text><br />";
-		echo "<label>" . _AM_XPRESS_AUTHORS .":</label><text>". $count_author;
+		echo "<label>" . _AM_XP2_CATEGORIES .":</label><text>".@$count_category;
+		echo "</text><br />";
+		echo "<label>" . _AM_XP2_ARTICLES .":</label><text>". $count_article;
+		echo "</text><br />";
+		echo "<label>" . _AM_XP2_AUTHORS .":</label><text>". $count_author;
 		echo "</text>";
 		echo "</div>";
@@ -541,6 +541,6 @@
 xpress_state($report);
 echo '<form method="POST">'."\n";
-echo '<input type="submit" name="submit_report" value="' . _AM_XPRESS_SYS_REPORT .' " />'.'&emsp;';
-echo '<input type="submit" name="submit_normal" value="' . _AM_XPRESS_SYS_NORMAL .' " />'."<br />\n";
+echo '<input type="submit" name="submit_report" value="' . _AM_XP2_SYS_REPORT .' " />'.'&emsp;';
+echo '<input type="submit" name="submit_normal" value="' . _AM_XP2_SYS_NORMAL .' " />'."<br />\n";
 echo "</form>\n";
 
Index: /trunk/admin/menu.php
===================================================================
--- /trunk/admin/menu.php	(revision 182)
+++ /trunk/admin/menu.php	(revision 183)
@@ -43,11 +43,11 @@
 
 $i=0;
-$adminmenu[$i]['title'] = _MI_MENU_SYS_INFO ;
+$adminmenu[$i]['title'] = _MI_XP2_MENU_SYS_INFO ;
 $adminmenu[$i++]['link'] = "admin/index.php";
 
-//$adminmenu[$i]['title'] = _MI_MENU_BLOCK_ADMIN ;
+//$adminmenu[$i]['title'] = _MI_XP2_MENU_BLOCK_ADMIN ;
 //$adminmenu[$i++]['link'] = "admin/admin_blocks.php";
 
-$adminmenu[$i]['title'] = _MI_MENU_BLOCK_CHECK ;
+$adminmenu[$i]['title'] = _MI_XP2_MENU_BLOCK_CHECK ;
 $adminmenu[$i++]['link'] = "admin/block_check.php";
 
Index: /trunk/blocks/archives_block.php
===================================================================
--- /trunk/blocks/archives_block.php	(revision 182)
+++ /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)."' />";
 	    
Index: /trunk/blocks/authors_block.php
===================================================================
--- /trunk/blocks/authors_block.php	(revision 182)
+++ /trunk/blocks/authors_block.php	(revision 183)
@@ -30,8 +30,8 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
 		$form .= "<br />";
-		$form .= yes_no_radio_option('options[2]', _MB_XPRESS_SHOW_NUM_OF_POST , $optioncount);
-		$form .= "<br />" . yes_no_radio_option('options[3]', _MB_XPRESS_EXCLUEDEADMIN , $exclude_admin);
-		$form .= "<br />" . yes_no_radio_option('options[4]', _MB_XPRESS_SHOW_FULLNAME , $show_fullname);
-				$form .= "<br />" . yes_no_radio_option('options[5]', _MB_XPRESS_HIDE_EMPTY , $hide_empty);
+		$form .= yes_no_radio_option('options[2]', _MB_XP2_SHOW_NUM_OF_POST , $optioncount);
+		$form .= "<br />" . yes_no_radio_option('options[3]', _MB_XP2_EXCLUEDEADMIN , $exclude_admin);
+		$form .= "<br />" . yes_no_radio_option('options[4]', _MB_XP2_SHOW_FULLNAME , $show_fullname);
+				$form .= "<br />" . yes_no_radio_option('options[5]', _MB_XP2_HIDE_EMPTY , $hide_empty);
 //	    $form .="<br /><input type='text' size='60' name='options[4]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' />";
 	    
Index: /trunk/blocks/calender_block.php
===================================================================
--- /trunk/blocks/calender_block.php	(revision 182)
+++ /trunk/blocks/calender_block.php	(revision 183)
@@ -28,6 +28,6 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
 		$form .= "<br />";
-		$form .= _MB_XPRESS_SUN_COLOR .": <input type='text' name='options[2]' value='" . $sun_color . "' /><br />\n";
-		$form .= _MB_XPRESS_SAT_COLOR .": <input type='text' name='options[3]' value='" . $sat_color . "' /><br />\n";
+		$form .= _MB_XP2_SUN_COLOR .": <input type='text' name='options[2]' value='" . $sun_color . "' /><br />\n";
+		$form .= _MB_XP2_SAT_COLOR .": <input type='text' name='options[3]' value='" . $sat_color . "' /><br />\n";
 
 		return $form;
Index: /trunk/blocks/category_block.php
===================================================================
--- /trunk/blocks/category_block.php	(revision 182)
+++ /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;
 	}
Index: /trunk/blocks/enhanced_block.php
===================================================================
--- /trunk/blocks/enhanced_block.php	(revision 182)
+++ /trunk/blocks/enhanced_block.php	(revision 183)
@@ -25,7 +25,7 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
 		$form .= "<br />";
-		$form .= _MB_XPRESS_ENHACED_FILE .":<br />\n";
-		$form .= '&emsp;' . _MB_XPRESS_FILE_NAME . ": my_<input type='text' name='options[2]' value='" . $include_file . "' />_block.php<br>\n";
-		$form .= '&emsp;' . _MB_XPRESS_MAKE_ENHACED_FILE . "<br>\n";
+		$form .= _MB_XP2_ENHACED_FILE .":<br />\n";
+		$form .= '&emsp;' . _MB_XP2_FILE_NAME . ": my_<input type='text' name='options[2]' value='" . $include_file . "' />_block.php<br>\n";
+		$form .= '&emsp;' . _MB_XP2_MAKE_ENHACED_FILE . "<br>\n";
 		return $form;
 	}
Index: /trunk/blocks/meta_block.php
===================================================================
--- /trunk/blocks/meta_block.php	(revision 182)
+++ /trunk/blocks/meta_block.php	(revision 183)
@@ -33,12 +33,12 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
 		$form .= "<br />";
-		$form .= yes_no_radio_option('options[2]', _MB_XPRESS_META_WP_LINK , $wp_link) . "<br />\n";
-		$form .= yes_no_radio_option('options[3]', _MB_XPRESS_META_XOOPS_LINK , $xoops_link) . "<br />\n";
-		$form .= yes_no_radio_option('options[4]', _MB_XPRESS_META_POST_RSS , $post_rss) . "<br />\n";
-		$form .= yes_no_radio_option('options[5]', _MB_XPRESS_META_COMMENT_RSS , $comment_rss) . "<br />\n";
-		$form .= yes_no_radio_option('options[6]', _MB_XPRESS_META_POST_NEW , $post_new) . "<br />\n";
-		$form .= yes_no_radio_option('options[7]', _MB_XPRESS_META_ADMIN , $admin_edit) . "<br />\n";
-		$form .= yes_no_radio_option('options[8]', _MB_XPRESS_META_README , $readme) . "<br />\n";
-		$form .= yes_no_radio_option('options[9]', _MB_XPRESS_META_CH_STYLE , $ch_style) . "\n";
+		$form .= yes_no_radio_option('options[2]', _MB_XP2_META_WP_LINK , $wp_link) . "<br />\n";
+		$form .= yes_no_radio_option('options[3]', _MB_XP2_META_XOOPS_LINK , $xoops_link) . "<br />\n";
+		$form .= yes_no_radio_option('options[4]', _MB_XP2_META_POST_RSS , $post_rss) . "<br />\n";
+		$form .= yes_no_radio_option('options[5]', _MB_XP2_META_COMMENT_RSS , $comment_rss) . "<br />\n";
+		$form .= yes_no_radio_option('options[6]', _MB_XP2_META_POST_NEW , $post_new) . "<br />\n";
+		$form .= yes_no_radio_option('options[7]', _MB_XP2_META_ADMIN , $admin_edit) . "<br />\n";
+		$form .= yes_no_radio_option('options[8]', _MB_XP2_META_README , $readme) . "<br />\n";
+		$form .= yes_no_radio_option('options[9]', _MB_XP2_META_CH_STYLE , $ch_style) . "\n";
 	    
 		return $form;
Index: /trunk/blocks/page_block.php
===================================================================
--- /trunk/blocks/page_block.php	(revision 182)
+++ /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;
Index: /trunk/blocks/popular_posts_block.php
===================================================================
--- /trunk/blocks/popular_posts_block.php	(revision 182)
+++ /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);
Index: /trunk/blocks/recent_comments_block.php
===================================================================
--- /trunk/blocks/recent_comments_block.php	(revision 182)
+++ /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)."' />";
Index: /trunk/blocks/recent_posts_content_block.php
===================================================================
--- /trunk/blocks/recent_posts_content_block.php	(revision 182)
+++ /trunk/blocks/recent_posts_content_block.php	(revision 183)
@@ -34,18 +34,18 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
 		$form .= "<br />";
-		$form .= _MB_XPRESS_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
-		$form .= yes_no_radio_option('options[3]', _MB_XPRESS_P_EXCERPT , $excerpt) . "<br />\n";
-		$form .= _MB_XPRESS_P_EXCERPT_SIZE .": <input type='text' name='options[4]' value='" . $excerpt_size . "' /><br />\n";
-		$form .= _MB_XPRESS_DATE_FORMAT .": <input type='text' name='options[5]' value='" . $date_format . "' /><br />\n";
-		$form .= _MB_XPRESS_TIME_FORMAT .": <input type='text' name='options[6]' value='" . $time_format . "' /><br />\n";
+		$form .= _MB_XP2_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
+		$form .= yes_no_radio_option('options[3]', _MB_XP2_P_EXCERPT , $excerpt) . "<br />\n";
+		$form .= _MB_XP2_P_EXCERPT_SIZE .": <input type='text' name='options[4]' value='" . $excerpt_size . "' /><br />\n";
+		$form .= _MB_XP2_DATE_FORMAT .": <input type='text' name='options[5]' value='" . $date_format . "' /><br />\n";
+		$form .= _MB_XP2_TIME_FORMAT .": <input type='text' name='options[6]' value='" . $time_format . "' /><br />\n";
 		
 		$form .= "<br />\n";
-		$form .= _MB_XPRESS_TAGS_SELECT .": <input type='text' name='options[7]' value='" . $tag_select . "' /><br />\n";
-	    $form .= _MB_XPRESS_CATS_SELECT ."<br />\n";
+		$form .= _MB_XP2_TAGS_SELECT .": <input type='text' name='options[7]' 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\">\n";
 	    $form .= "\t<option value=\"0\" ";
 	    if ($isAll) $form .= " selected=\"selected\"";
-	    $form .= ">"._MB_XPRESS_ALL ."</option>\n";
+	    $form .= ">"._MB_XP2_ALL ."</option>\n";
 		ob_start();
 		dropdown_cats_options('ID','asc',$selected);
Index: /trunk/blocks/recent_posts_list_block.php
===================================================================
--- /trunk/blocks/recent_posts_list_block.php	(revision 182)
+++ /trunk/blocks/recent_posts_list_block.php	(revision 183)
@@ -33,18 +33,18 @@
 	    $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_XPRESS_REDNEW_DAYS .": <input type='text' name='options[3]' value='" . $disp_red . "' /><br />\n";
-		$form .= _MB_XPRESS_GREENNEW_DAYS .": <input type='text' name='options[4]' value='" . $disp_green . "' /><br />\n";
-		$form .= _MB_XPRESS_DATE_FORMAT .": <input type='text' name='options[5]' value='" . $date_format . "' /><br />\n";
-		$form .= _MB_XPRESS_TIME_FORMAT .": <input type='text' name='options[6]' value='" . $time_format . "' /><br />\n";
+		$form .= _MB_XP2_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
+		$form .= _MB_XP2_REDNEW_DAYS .": <input type='text' name='options[3]' value='" . $disp_red . "' /><br />\n";
+		$form .= _MB_XP2_GREENNEW_DAYS .": <input type='text' name='options[4]' value='" . $disp_green . "' /><br />\n";
+		$form .= _MB_XP2_DATE_FORMAT .": <input type='text' name='options[5]' value='" . $date_format . "' /><br />\n";
+		$form .= _MB_XP2_TIME_FORMAT .": <input type='text' name='options[6]' value='" . $time_format . "' /><br />\n";
 		
 	    $form .= "<br />\n";
-		$form .= _MB_XPRESS_TAGS_SELECT .": <input type='text' name='options[7]' value='" . $tag_select . "' /><br />\n";
-	    $form .= _MB_XPRESS_CATS_SELECT ."<br />\n";
+		$form .= _MB_XP2_TAGS_SELECT .": <input type='text' name='options[7]' 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\">\n";
 	    $form .= "\t<option value=\"0\" ";
 	    if ($isAll) $form .= " selected=\"selected\"";
-	    $form .= ">"._MB_XPRESS_ALL ."</option>\n";
+	    $form .= ">"._MB_XP2_ALL ."</option>\n";
 		ob_start();
 		dropdown_cats_options('ID','asc',$selected);
Index: /trunk/blocks/search_block.php
===================================================================
--- /trunk/blocks/search_block.php	(revision 182)
+++ /trunk/blocks/search_block.php	(revision 183)
@@ -27,5 +27,5 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
 		$form .= "<br />";		
-		$form .= _MB_XPRESS_SEARCH_LENGTH .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />";
+		$form .= _MB_XP2_SEARCH_LENGTH .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />";
 //	    $form .="<br /><input type='text' size='60' name='options[2]' value='".htmlspecialchars($this_template,ENT_QUOTES)."' />";
 
Index: /trunk/blocks/tag_cloud_block.php
===================================================================
--- /trunk/blocks/tag_cloud_block.php	(revision 182)
+++ /trunk/blocks/tag_cloud_block.php	(revision 183)
@@ -34,7 +34,7 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
 		$form .= "<br />";
-		$form .= _MB_XPRESS_CLOUD_SMALLEST .": <input type='text' size='4' name='options[2]' value='" . $smallest . "' /><br />";
-		$form .= _MB_XPRESS_CLOUD_LARGEST .": <input type='text' size='4' name='options[3]' value='" . $largest . "' /><br />";
-		$form .= _MB_XPRESS_CLOUD_UNIT .": ";
+		$form .= _MB_XP2_CLOUD_SMALLEST .": <input type='text' size='4' name='options[2]' value='" . $smallest . "' /><br />";
+		$form .= _MB_XP2_CLOUD_LARGEST .": <input type='text' size='4' name='options[3]' value='" . $largest . "' /><br />";
+		$form .= _MB_XP2_CLOUD_UNIT .": ";
 		$form .=  "<select name='options[4]'>";
 		if ($unit =='pt')
@@ -56,48 +56,48 @@
 		$form .=  "</select><br/>";
 		
-		$form .= _MB_XPRESS_CLOUD_NUMBER .": <input type='text' size='4' name='options[5]' value='" . $number . "' /><br />";
+		$form .= _MB_XP2_CLOUD_NUMBER .": <input type='text' size='4' name='options[5]' value='" . $number . "' /><br />";
 		
-		$form .= _MB_XPRESS_CLOUD_FORMAT .": ";
+		$form .= _MB_XP2_CLOUD_FORMAT .": ";
 		$form .=  "<select name='options[6]'>";
 		if ($format =='flat')
-			$form .=  "<option value='flat' selected='selected'>" . _MB_XPRESS_FLAT;
+			$form .=  "<option value='flat' selected='selected'>" . _MB_XP2_FLAT;
 		else
-			$form .=  "<option value='flat'>" . _MB_XPRESS_FLAT;
+			$form .=  "<option value='flat'>" . _MB_XP2_FLAT;
 		if ($format =='list')
-			$form .=  "<option value='list' selected='selected'>". _MB_XPRESS_LIST;
+			$form .=  "<option value='list' selected='selected'>". _MB_XP2_LIST;
 		else
-			$form .=  "<option value='list'>". _MB_XPRESS_LIST;
+			$form .=  "<option value='list'>". _MB_XP2_LIST;
 		$form .=  "</select><br/>";
 				
-		$form .= _MB_XPRESS_CLOUD_ORDERBY .": ";
+		$form .= _MB_XP2_CLOUD_ORDERBY .": ";
 		$form .=  "<select name='options[7]'>";
 		if ($orderby =='name')
-			$form .=  "<option value='name' selected='selected'>". _MB_XPRESS_TAG_NAME;
+			$form .=  "<option value='name' selected='selected'>". _MB_XP2_TAG_NAME;
 		else
-			$form .=  "<option value='name'>". _MB_XPRESS_TAG_NAME;
+			$form .=  "<option value='name'>". _MB_XP2_TAG_NAME;
 		if ($orderby =='count')
-			$form .=  "<option value='count' selected='selected'>". _MB_XPRESS_TAG_COUNT;
+			$form .=  "<option value='count' selected='selected'>". _MB_XP2_TAG_COUNT;
 		else
-			$form .=  "<option value='count'>". _MB_XPRESS_TAG_COUNT;
+			$form .=  "<option value='count'>". _MB_XP2_TAG_COUNT;
 		$form .=  "</select><br/>";
 
-		$form .= _MB_XPRESS_CLOUD_ORDER .": ";
+		$form .= _MB_XP2_CLOUD_ORDER .": ";
 		$form .=  "<select name='options[8]'>";
 		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;
 		if ($order =='RAND')
-			$form .=  "<option value='RAND' selected='selected'>" . _MB_XPRESS_RAND;
+			$form .=  "<option value='RAND' selected='selected'>" . _MB_XP2_RAND;
 		else
-			$form .=  "<option value='RAND'>" . _MB_XPRESS_RAND;
+			$form .=  "<option value='RAND'>" . _MB_XP2_RAND;
 		$form .=  "</select><br/>";
 
-		$form .= _MB_XPRESS_CLOUD_EXCLUDE .": <input type='text' size='25' name='options[9]' value='" . $exclude . "' /><br />";
-		$form .= _MB_XPRESS_CLOUD_INCLUDE .": <input type='text' size='25' name='options[10]' value='" . $wp_include . "' /><br />";
+		$form .= _MB_XP2_CLOUD_EXCLUDE .": <input type='text' size='25' name='options[9]' value='" . $exclude . "' /><br />";
+		$form .= _MB_XP2_CLOUD_INCLUDE .": <input type='text' size='25' name='options[10]' value='" . $wp_include . "' /><br />";
 
 
Index: /trunk/blocks/widget_block.php
===================================================================
--- /trunk/blocks/widget_block.php	(revision 182)
+++ /trunk/blocks/widget_block.php	(revision 183)
@@ -30,5 +30,5 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
 		$form .= "<br />";
-		$form .= _MB_XPRESS_SELECT_WIDGET .":<br />\n";
+		$form .= _MB_XP2_SELECT_WIDGET .":<br />\n";
 		$form .= "&nbsp;&nbsp;&nbsp;<select name='options[]' multiple=\"multiple\">\n";
 		$sidebars_widgets = wp_get_sidebars_widgets();
Index: /trunk/include/oninstall.php
===================================================================
--- /trunk/include/oninstall.php	(revision 182)
+++ /trunk/include/oninstall.php	(revision 183)
@@ -62,5 +62,5 @@
 // Rewrite Option for Xpress
 //	update_option("blog_charset", wp_blog_charset());
-	update_option('blogname', ucfirst($mydirname) . ' ' . _MI_XPRESS_NAME );	
+	update_option('blogname', ucfirst($mydirname) . ' ' . _MI_XP2_NAME );	
 	update_option('blogdescription', 'WordPress for XOOPS');
 	update_option("admin_email", $GLOBALS["xoopsConfig"]['adminmail']);
Index: /trunk/include/xpress_block_render.php
===================================================================
--- /trunk/include/xpress_block_render.php	(revision 182)
+++ /trunk/include/xpress_block_render.php	(revision 183)
@@ -181,5 +181,5 @@
 				$block = $xml['block'];
 			} else {
-				$block['err_message'] = sprintf(_MB_XPRESS_BLOCK_CACHE_ERR, '<a href="' . XOOPS_URL . '/modules/' . $mydirname . '">' . $mydirname .'</a>');
+				$block['err_message'] = sprintf(_MB_XP2_BLOCK_CACHE_ERR, '<a href="' . XOOPS_URL . '/modules/' . $mydirname . '">' . $mydirname .'</a>');
 			}
 		}
Index: /trunk/language/english/admin.php
===================================================================
--- /trunk/language/english/admin.php	(revision 182)
+++ /trunk/language/english/admin.php	(revision 183)
@@ -1,5 +1,5 @@
 <?php
-if( ! defined( 'XPRESS_ADMIN_LANG_INCLUDED' ) ) {
-	define( 'XPRESS_ADMIN_LANG_INCLUDED' , 1 ) ;
+if( ! defined( 'XP2_ADMIN_LANG_INCLUDED' ) ) {
+	define( 'XP2_ADMIN_LANG_INCLUDED' , 1 ) ;
 	
 // altsys
@@ -9,27 +9,27 @@
 	define('_MD_A_MYMENU_MYPREFERENCES','general');
 
-	define("_AM_SYSTEM_INFO","System infomation");
-	define("_AM_XOOPS_CONFIG_INFO","Set value that XPressME acquired from XOOPS");
-	define("_AM_XPRESS_PLUGIN","Active plug-in list at wordpress");
-	define("_AM_XPRESS_STATS","WordPress Stats");
-	define("_AM_XPRESS_CATEGORIES","Category count");
-	define("_AM_XPRESS_ARTICLES","Blog article count");
-	define("_AM_XPRESS_AUTHORS","Author count");
-	define("_AM_XPRESS_SYS_REPORT","Show Report Mode");
-	define("_AM_XPRESS_SYS_NORMAL","Show Normal Mode");
+	define("_AM_XP2_SYSTEM_INFO","System infomation");
+	define("_AM_XP2_XOOPS_CONFIG_INFO","Set value that XPressME acquired from XOOPS");
+	define("_AM_XP2_PLUGIN","Active plug-in list at wordpress");
+	define("_AM_XP2_STATS","WordPress Stats");
+	define("_AM_XP2_CATEGORIES","Category count");
+	define("_AM_XP2_ARTICLES","Blog article count");
+	define("_AM_XP2_AUTHORS","Author count");
+	define("_AM_XP2_SYS_REPORT","Show Report Mode");
+	define("_AM_XP2_SYS_NORMAL","Show Normal Mode");
 
 // Block Check	
-	define("_AM_XP_BLOCK_OK","The block is normal. ");
-	define("_AM_XP_BLOCK_NG","There is an abnormal block. ");
-	define("_AM_XP_BLOCK_REPAIR_HOWTO","Please correct the block according to the following procedures. ");
-	define("_AM_XP_BLOCK_REPAIR_STEP1","Step 1");
-	define("_AM_XP_BLOCK_REMOVE","Remove xoops block table");
-	define("_AM_XP_BLOCK_REMOVE_NOTE","Please use carefully, because <b>Remove Block</b> deletes records in block table");
-	define("_AM_XP_BLOCK_REPAIR_STEP2","Step 2");
-	define("_AM_XP_BLOCK_UPDATE","The block is restructured with the update of the module.");
-	define("_AM_XP_TO_MODELE_UPDATE","To the module update");
-	define("_AM_XP_BLOCK_REPAIR_STEP3","Step3");
-	define("_AM_XP_BLOCK_ADMIN_SETTING","The arrangement setting of the block and the access authority of the block are set again. ");
-	define("_AM_XP_BLOCK_TO_SETTING","to blocks/permissions");
+	define("_AM_XP2_BLOCK_OK","The block is normal. ");
+	define("_AM_XP2_BLOCK_NG","There is an abnormal block. ");
+	define("_AM_XP2_BLOCK_REPAIR_HOWTO","Please correct the block according to the following procedures. ");
+	define("_AM_XP2_BLOCK_REPAIR_STEP1","Step 1");
+	define("_AM_XP2_BLOCK_REMOVE","Remove xoops block table");
+	define("_AM_XP2_BLOCK_REMOVE_NOTE","Please use carefully, because <b>Remove Block</b> deletes records in block table");
+	define("_AM_XP2_BLOCK_REPAIR_STEP2","Step 2");
+	define("_AM_XP2_BLOCK_UPDATE","The block is restructured with the update of the module.");
+	define("_AM_XP2_TO_MODELE_UPDATE","To the module update");
+	define("_AM_XP2_BLOCK_REPAIR_STEP3","Step3");
+	define("_AM_XP2_BLOCK_ADMIN_SETTING","The arrangement setting of the block and the access authority of the block are set again. ");
+	define("_AM_XP2_BLOCK_TO_SETTING","to blocks/permissions");
 	
 	
Index: /trunk/language/english/blocks.php
===================================================================
--- /trunk/language/english/blocks.php	(revision 182)
+++ /trunk/language/english/blocks.php	(revision 183)
@@ -1,132 +1,132 @@
 <?php
-if( ! defined( 'XPRESS_BLOCK_LANG_INCLUDED' ) ) {
-	define( 'XPRESS_BLOCK_LANG_INCLUDED' , 1 ) ;
+if( ! defined( 'XP2_BLOCK_LANG_INCLUDED' ) ) {
+	define( 'XP2_BLOCK_LANG_INCLUDED' , 1 ) ;
 // general	
-	define("_MB_XPRESS_COUNT",'Number of displays');
-	define("_MB_XPRESS_COUNT_ZERO_ALL",'Number of displays (Everything is displayed in case of 0)');
-	define("_MB_XPRESS_LENGTH","length");
-	define("_MB_XPRESS_ALL","all");
-	define("_MB_XPRESS_BLOCK_CACHE_ERR","Cash doesn't exist. <br />Please access the %s module first.");
-	define("_MB_XPRESS_SHOW_NUM_OF_POST","The number of entries is displayed.");
-	define("_MB_XPRESS_SHOW_DROP_DOWN","It displays it by the drop down list.");
-	define("_MB_XPRESS_HIDE_EMPTY","hide empty");
-	define("_MB_XPRESS_TITLE","title");
-	define("_MB_XPRESS_PUBLISH_DATE","publish date");
-	define("_MB_XPRESS_SORT_ORDER","sort order");
-	define("_MB_XPRESS_SORT_ASC","ASC");
-	define("_MB_XPRESS_SORT_DESC","DESC");
-	define("_MB_XPRESS_SHOW_DATE_SELECT","Date Display");
-	define("_MB_XPRESS_SHOW_DATE_NONE","Not display");
-	define("_MB_XPRESS_SHOW_POST_DATE","Post Date");
-	define("_MB_XPRESS_SHOW_MODIFY_DATE","Modify Date");
-	define("_MB_XPRESS_SHOW_DATE","The date is displayed.");
-	define("_MB_XPRESS_DATE_FORMAT","Format at date (The setting with WordPress is applied for the blank).");
-	define("_MB_XPRESS_TIME_FORMAT","Format at time (The setting with WordPress is applied for the blank).");
-	define("_MB_XPRESS_FLAT","Flat");
-	define("_MB_XPRESS_LIST","List");
-	define("_MB_XPRESS_FILE_NAME","Files Name");
+	define("_MB_XP2_COUNT",'Number of displays');
+	define("_MB_XP2_COUNT_ZERO_ALL",'Number of displays (Everything is displayed in case of 0)');
+	define("_MB_XP2_LENGTH","length");
+	define("_MB_XP2_ALL","all");
+	define("_MB_XP2_BLOCK_CACHE_ERR","Cash doesn't exist. <br />Please access the %s module first.");
+	define("_MB_XP2_SHOW_NUM_OF_POST","The number of entries is displayed.");
+	define("_MB_XP2_SHOW_DROP_DOWN","It displays it by the drop down list.");
+	define("_MB_XP2_HIDE_EMPTY","hide empty");
+	define("_MB_XP2_TITLE","title");
+	define("_MB_XP2_PUBLISH_DATE","publish date");
+	define("_MB_XP2_SORT_ORDER","sort order");
+	define("_MB_XP2_SORT_ASC","ASC");
+	define("_MB_XP2_SORT_DESC","DESC");
+	define("_MB_XP2_SHOW_DATE_SELECT","Date Display");
+	define("_MB_XP2_SHOW_DATE_NONE","Not display");
+	define("_MB_XP2_SHOW_POST_DATE","Post Date");
+	define("_MB_XP2_SHOW_MODIFY_DATE","Modify Date");
+	define("_MB_XP2_SHOW_DATE","The date is displayed.");
+	define("_MB_XP2_DATE_FORMAT","Format at date (The setting with WordPress is applied for the blank).");
+	define("_MB_XP2_TIME_FORMAT","Format at time (The setting with WordPress is applied for the blank).");
+	define("_MB_XP2_FLAT","Flat");
+	define("_MB_XP2_LIST","List");
+	define("_MB_XP2_FILE_NAME","Files Name");
 	
 // recent comment block	
-	define("_MB_XPRESS_COMM_DISP_AUTH","The comment author name is displayed.");
-	define("_MB_XPRESS_COMM_DISP_TYPE","The comment type is displayed.");
-	define("_MB_XPRESS_COM_TYPE","select the type of the displayed comment.");
-	define("_MB_XPRESS_COMMENT","Comment");
-	define("_MB_XPRESS_TRUCKBACK","Trackback");
-	define("_MB_XPRESS_PINGBACK","Pingback");
+	define("_MB_XP2_COMM_DISP_AUTH","The comment author name is displayed.");
+	define("_MB_XP2_COMM_DISP_TYPE","The comment type is displayed.");
+	define("_MB_XP2_COM_TYPE","select the type of the displayed comment.");
+	define("_MB_XP2_COMMENT","Comment");
+	define("_MB_XP2_TRUCKBACK","Trackback");
+	define("_MB_XP2_PINGBACK","Pingback");
 	
 // recent posts content
-	define("_MB_XPRESS_P_EXCERPT","The post is displayed by the except.");
-	define("_MB_XPRESS_P_EXCERPT_SIZE","Number of except characters");
-	define("_MB_XPRESS_CATS_SELECT","Select categorie");
-	define("_MB_XPRESS_TAGS_SELECT","Tags Select(Comma separated list of tags)");
+	define("_MB_XP2_P_EXCERPT","The post is displayed by the except.");
+	define("_MB_XP2_P_EXCERPT_SIZE","Number of except characters");
+	define("_MB_XP2_CATS_SELECT","Select categorie");
+	define("_MB_XP2_TAGS_SELECT","Tags Select(Comma separated list of tags)");
 	
 // recent posts list	
-	define("_MB_XPRESS_REDNEW_DAYS","Passed days displayed by marking red 'New'");
-	define("_MB_XPRESS_GREENNEW_DAYS","Passed days displayed by marking green 'New'");	
+	define("_MB_XP2_REDNEW_DAYS","Passed days displayed by marking red 'New'");
+	define("_MB_XP2_GREENNEW_DAYS","Passed days displayed by marking green 'New'");	
 
 // calender		
-	define("_MB_XPRESS_SUN_COLOR","Color on Sunday");
-	define("_MB_XPRESS_SAT_COLOR","Color on Saturday");
+	define("_MB_XP2_SUN_COLOR","Color on Sunday");
+	define("_MB_XP2_SAT_COLOR","Color on Saturday");
 	
 // popular		
-	define("_MB_MONTH_RANGE","The one in the number a specified month is displayed (0; all).");
+	define("_MB_XP2_MONTH_RANGE","The one in the number a specified month is displayed (0; all).");
 	
 // archives
-	define("_MB_XPRESS_ARC_TYPE","The type of archive");
-	define("_MB_XPRESS_ARC_YEAR","yearly");
-	define("_MB_XPRESS_ARC_MONTH","monthly");
-	define("_MB_XPRESS_ARC_WEEK","weekly");
-	define("_MB_XPRESS_ARC_DAY","daily");
-	define("_MB_XPRESS_ARC_POST","post by post");
+	define("_MB_XP2_ARC_TYPE","The type of archive");
+	define("_MB_XP2_ARC_YEAR","yearly");
+	define("_MB_XP2_ARC_MONTH","monthly");
+	define("_MB_XP2_ARC_WEEK","weekly");
+	define("_MB_XP2_ARC_DAY","daily");
+	define("_MB_XP2_ARC_POST","post by post");
 
 // authors	
-	define("_MB_XPRESS_EXCLUEDEADMIN","The manager is excluded from the list.");
-	define("_MB_XPRESS_SHOW_FULLNAME","The author name is displayed by the full name.");
+	define("_MB_XP2_EXCLUEDEADMIN","The manager is excluded from the list.");
+	define("_MB_XP2_SHOW_FULLNAME","The author name is displayed by the full name.");
 
 // page 	
-	define("_MB_XPRESS_PAGE_ORDERBY","List Pages by Page Order ");
-	define("_MB_XPRESS_PAGE_TITLE","post_title");
-	define("_MB_XPRESS_PAGE_MENU_ORDER","menu_order");
-	define("_MB_XPRESS_PAGE_POST_DATE","post_date");
-	define("_MB_XPRESS_PAGE_POST_MODIFY","post_modified");
-	define("_MB_XPRESS_PAGE_ID","ID");
-	define("_MB_XPRESS_PAGE_AUTHOR","post_author ID");
-	define("_MB_XPRESS_PAGE_SLUG","post_name");
-	define("_MB_XPRESS_PAGE_EXCLUDE","Define a comma-separated list of Page IDs to be excluded from the list ");
-	define("_MB_XPRESS_PAGE_EXCLUDE_TREE","Define a comma-separated list of parent Page IDs to be excluded. Use this parameter to exclude a parent and all of that parent's child Pages.");
-	define("_MB_XPRESS_PAGE_INCLUDE","Only include certain Pages in the list , this parameter takes a comma-separated list of Page IDs. ");
-	define("_MB_XPRESS_PAGE_DEPTH","how many levels in the hierarchy of pages are to be included in the list (0=all Pages and sub-pages displayedj");
-	define("_MB_XPRESS_PAGE_CHILD_OF","Displays the sub-pages of a single Page onlyB(uses the ID for a Page as the valuej");
-	define("_MB_XPRESS_PAGE_HIERARCHICAL","Display sub-Pages in an indented manner below their parent or list the Pages inline.");
-	define("_MB_XPRESS_PAGE_META_KEY","Only include the Pages that have this Custom Field Key (use in conjunction with the meta_value field).");
-	define("_MB_XPRESS_PAGE_META_VALUE","Only include the Pages that have this Custom Field Value (use in conjuntion with the meta_key field).");
+	define("_MB_XP2_PAGE_ORDERBY","List Pages by Page Order ");
+	define("_MB_XP2_PAGE_TITLE","post_title");
+	define("_MB_XP2_PAGE_MENU_ORDER","menu_order");
+	define("_MB_XP2_PAGE_POST_DATE","post_date");
+	define("_MB_XP2_PAGE_POST_MODIFY","post_modified");
+	define("_MB_XP2_PAGE_ID","ID");
+	define("_MB_XP2_PAGE_AUTHOR","post_author ID");
+	define("_MB_XP2_PAGE_SLUG","post_name");
+	define("_MB_XP2_PAGE_EXCLUDE","Define a comma-separated list of Page IDs to be excluded from the list ");
+	define("_MB_XP2_PAGE_EXCLUDE_TREE","Define a comma-separated list of parent Page IDs to be excluded. Use this parameter to exclude a parent and all of that parent's child Pages.");
+	define("_MB_XP2_PAGE_INCLUDE","Only include certain Pages in the list , this parameter takes a comma-separated list of Page IDs. ");
+	define("_MB_XP2_PAGE_DEPTH","how many levels in the hierarchy of pages are to be included in the list (0=all Pages and sub-pages displayedj");
+	define("_MB_XP2_PAGE_CHILD_OF","Displays the sub-pages of a single Page onlyB(uses the ID for a Page as the valuej");
+	define("_MB_XP2_PAGE_HIERARCHICAL","Display sub-Pages in an indented manner below their parent or list the Pages inline.");
+	define("_MB_XP2_PAGE_META_KEY","Only include the Pages that have this Custom Field Key (use in conjunction with the meta_value field).");
+	define("_MB_XP2_PAGE_META_VALUE","Only include the Pages that have this Custom Field Value (use in conjuntion with the meta_key field).");
 	
 // Search
-	define("_MB_XPRESS_SEARCH_LENGTH","Length of search textbox");
+	define("_MB_XP2_SEARCH_LENGTH","Length of search textbox");
 	
 // tag cloud
-	define("_MB_XPRESS_CLOUD_SMALLEST",'The text size of the tag with the smallest count value ');
-	define("_MB_XPRESS_CLOUD_LARGEST",'The text size of the tag with the highest count value');
-	define("_MB_XPRESS_CLOUD_UNIT","Unit of measure as pertains to the smallest and largest values. This can be any CSS length value, e.g. pt, px, em, %;");
-	define("_MB_XPRESS_CLOUD_NUMBER","The number of actual tags to display in the cloud. (Use '0' to display all tags.)");
-	define("_MB_XPRESS_CLOUD_FORMAT","Format of the cloud display");
-	define("_MB_XPRESS_CLOUD_ORDERBY","Order of the tags");
-	define("_MB_XPRESS_CLOUD_ORDER","Sort order. Valid values('RAND' tags are in a random order. Note: this parameter was introduced with Version 2.5.)");
-	define("_MB_XPRESS_CLOUD_EXCLUDE","Comma separated list of tags (term_id) to exclude.");
-	define("_MB_XPRESS_CLOUD_INCLUDE","Comma separated list of tags (term_id) to include.");
-	define("_MB_XPRESS_RAND","RAND");
-	define("_MB_XPRESS_TAG_NAME","tag name");
-	define("_MB_XPRESS_TAG_COUNT","count");
+	define("_MB_XP2_CLOUD_SMALLEST",'The text size of the tag with the smallest count value ');
+	define("_MB_XP2_CLOUD_LARGEST",'The text size of the tag with the highest count value');
+	define("_MB_XP2_CLOUD_UNIT","Unit of measure as pertains to the smallest and largest values. This can be any CSS length value, e.g. pt, px, em, %;");
+	define("_MB_XP2_CLOUD_NUMBER","The number of actual tags to display in the cloud. (Use '0' to display all tags.)");
+	define("_MB_XP2_CLOUD_FORMAT","Format of the cloud display");
+	define("_MB_XP2_CLOUD_ORDERBY","Order of the tags");
+	define("_MB_XP2_CLOUD_ORDER","Sort order. Valid values('RAND' tags are in a random order. Note: this parameter was introduced with Version 2.5.)");
+	define("_MB_XP2_CLOUD_EXCLUDE","Comma separated list of tags (term_id) to exclude.");
+	define("_MB_XP2_CLOUD_INCLUDE","Comma separated list of tags (term_id) to include.");
+	define("_MB_XP2_RAND","RAND");
+	define("_MB_XP2_TAG_NAME","tag name");
+	define("_MB_XP2_TAG_COUNT","count");
 	
 // Categorie
-	define("_MB_XPRESS_CAT_ALL_STR","All categories link Display Title. (blank is not displayj");
-	define("_MB_XPRESS_CAT_ORDERBY","Order of the categories");
-	define("_MB_XPRESS_CAT_NAME","name");
-	define("_MB_XPRESS_CAT_COUNT","count");
-	define("_MB_XPRESS_CAT_ID","ID");
-	define("_MB_XPRESS_SHOW_LAST_UPDATE","Should the last updated timestamp for posts be displayed.");
-	define("_MB_XPRESS_CAT_HIDE_EMPTY","hide display of categories with no posts.");
-	define("_MB_XPRESS_DESC_FOR_TITLE","Sets whether a category's description is inserted into the title attribute of the links created");
-	define("_MB_XPRESS_CAT_EXCLUDE","Exclude one or more categories from the results. This parameter takes a comma-separated list of categories by unique ID");
-	define("_MB_XPRESS_CAT_INCLUDE","Only include the categories detailed in a comma-separated list by unique ID, in ascending order.");
-	define("_MB_XPRESS_CAT_HIERARCHICAL","Display sub-categories as inner list items (below the parent list item) or inline.");
-	define("_MB_XPRESS_CAT_DEPTH","how many levels in the hierarchy of Categories are to be included in the list of Categories.(0=All Categories and child Categories)");
+	define("_MB_XP2_CAT_ALL_STR","All categories link Display Title. (blank is not displayj");
+	define("_MB_XP2_CAT_ORDERBY","Order of the categories");
+	define("_MB_XP2_CAT_NAME","name");
+	define("_MB_XP2_CAT_COUNT","count");
+	define("_MB_XP2_CAT_ID","ID");
+	define("_MB_XP2_SHOW_LAST_UPDATE","Should the last updated timestamp for posts be displayed.");
+	define("_MB_XP2_CAT_HIDE_EMPTY","hide display of categories with no posts.");
+	define("_MB_XP2_DESC_FOR_TITLE","Sets whether a category's description is inserted into the title attribute of the links created");
+	define("_MB_XP2_CAT_EXCLUDE","Exclude one or more categories from the results. This parameter takes a comma-separated list of categories by unique ID");
+	define("_MB_XP2_CAT_INCLUDE","Only include the categories detailed in a comma-separated list by unique ID, in ascending order.");
+	define("_MB_XP2_CAT_HIERARCHICAL","Display sub-categories as inner list items (below the parent list item) or inline.");
+	define("_MB_XP2_CAT_DEPTH","how many levels in the hierarchy of Categories are to be included in the list of Categories.(0=All Categories and child Categories)");
 	
 // meta 
-	define("_MB_XPRESS_META_WP_LINK","The link to the WordPress site is displayed.");
-	define("_MB_XPRESS_META_XOOPS_LINK","The link to the Xoops site is displayed.");
-	define("_MB_XPRESS_META_POST_RSS","RSS of the posts is displayed.");
-	define("_MB_XPRESS_META_COMMENT_RSS","RSS of the comments is displayed.");
-	define("_MB_XPRESS_META_POST_NEW","'new post' is displayed.");
-	define("_MB_XPRESS_META_ADMIN","'admin' is displayed.");
-	define("_MB_XPRESS_META_README","ReadMe is displayed.");
-	define("_MB_XPRESS_META_CH_STYLE","'display mode' is displayed.");
+	define("_MB_XP2_META_WP_LINK","The link to the WordPress site is displayed.");
+	define("_MB_XP2_META_XOOPS_LINK","The link to the Xoops site is displayed.");
+	define("_MB_XP2_META_POST_RSS","RSS of the posts is displayed.");
+	define("_MB_XP2_META_COMMENT_RSS","RSS of the comments is displayed.");
+	define("_MB_XP2_META_POST_NEW","'new post' is displayed.");
+	define("_MB_XP2_META_ADMIN","'admin' is displayed.");
+	define("_MB_XP2_META_README","ReadMe is displayed.");
+	define("_MB_XP2_META_CH_STYLE","'display mode' is displayed.");
 
 // meta 
-	define("_MB_XPRESS_SELECT_WIDGET","Displayed Widget is selected.");
+	define("_MB_XP2_SELECT_WIDGET","Displayed Widget is selected.");
 	
 // custom 
-	define("_MB_XPRESS_ENHACED_FILE","Input the file name used in the custom block.");
-	define("_MB_XPRESS_MAKE_ENHACED_FILE","Please make the file specified here in the block directory of the theme.");
+	define("_MB_XP2_ENHACED_FILE","Input the file name used in the custom block.");
+	define("_MB_XP2_MAKE_ENHACED_FILE","Please make the file specified here in the block directory of the theme.");
 }
 ?>
Index: /trunk/language/english/main.php
===================================================================
--- /trunk/language/english/main.php	(revision 182)
+++ /trunk/language/english/main.php	(revision 183)
@@ -1,5 +1,5 @@
 <?php
-if( ! defined( 'XPRESS_MAIN_LANG_INCLUDED' ) ) {
-	define( 'XPRESS_MAIN_LANG_INCLUDED' , 1 ) ;
+if( ! defined( 'XP2_MAIN_LANG_INCLUDED' ) ) {
+	define( 'XP2_MAIN_LANG_INCLUDED' , 1 ) ;
 	
 }
Index: /trunk/language/english/modinfo.php
===================================================================
--- /trunk/language/english/modinfo.php	(revision 182)
+++ /trunk/language/english/modinfo.php	(revision 183)
@@ -4,83 +4,83 @@
 
 	// The name of this module admin menu
-	define("_MI_MENU_SYS_INFO","System information");
-	define("_MI_MENU_BLOCK_ADMIN","blocks/permissions");
-	define("_MI_MENU_BLOCK_CHECK","blocks check");
+	define("_MI_XP2_MENU_SYS_INFO","System information");
+	define("_MI_XP2_MENU_BLOCK_ADMIN","blocks/permissions");
+	define("_MI_XP2_MENU_BLOCK_CHECK","blocks check");
 	
 	// The name of this module
-	define("_MI_XPRESS_NAME","blog");
+	define("_MI_XP2_NAME","blog");
 
 	// A brief description of this module
-	define("_MI_XPRESS_DESC","WordPress For XOOPS Community");
+	define("_MI_XP2_DESC","WordPress For XOOPS Community");
 
 	// Sub menu titles
-	define("_MI_XPRESS_MENU_POST_NEW","New Post");
-	define("_MI_XPRESS_MENU_EDIT","Edit Post");
-	define("_MI_XPRESS_MENU_ADMIN","WordPress Admin");
-	define("_MI_XPRESS_MENU_XPRESS","XPressME Setting");
+	define("_MI_XP2_MENU_POST_NEW","New Post");
+	define("_MI_XP2_MENU_EDIT","Edit Post");
+	define("_MI_XP2_MENU_ADMIN","WordPress Admin");
+	define("_MI_XP2_MENU_XPRESS","XPressME Setting");
 
 	// Block Name
-	define("_MI_XPRESS_BLOCK_COMMENTS","Recent Comments");
-	define("_MI_XPRESS_BLOCK_CONTENT","Recent Posts with content");
-	define("_MI_XPRESS_BLOCK_POSTS","Recent Post Title");
-	define("_MI_XPRESS_BLOCK_CALENDER","Calendar");
-	define("_MI_XPRESS_BLOCK_POPULAR","Popular post list");
-	define("_MI_XPRESS_BLOCK_ARCHIVE","Archive");
-	define("_MI_XPRESS_BLOCK_AUTHORS","Author List");
-	define("_MI_XPRESS_BLOCK_PAGE","Page");
-	define("_MI_XPRESS_BLOCK_SEARCH","Search");
-	define("_MI_XPRESS_BLOCK_TAG","Tag Cloud");
-	define("_MI_XPRESS_BLOCK_CATEGORY","Category");
-	define("_MI_XPRESS_BLOCK_META","Meta");
-	define("_MI_XPRESS_BLOCK_SIDEBAR","Sidebar Navigation");
-	define("_MI_XPRESS_BLOCK_WIDGET","Widget");
-	define("_MI_XPRESS_BLOCK_ENHANCED","Enhanced");
+	define("_MI_XP2_BLOCK_COMMENTS","Recent Comments");
+	define("_MI_XP2_BLOCK_CONTENT","Recent Posts with content");
+	define("_MI_XP2_BLOCK_POSTS","Recent Post Title");
+	define("_MI_XP2_BLOCK_CALENDER","Calendar");
+	define("_MI_XP2_BLOCK_POPULAR","Popular post list");
+	define("_MI_XP2_BLOCK_ARCHIVE","Archive");
+	define("_MI_XP2_BLOCK_AUTHORS","Author List");
+	define("_MI_XP2_BLOCK_PAGE","Page");
+	define("_MI_XP2_BLOCK_SEARCH","Search");
+	define("_MI_XP2_BLOCK_TAG","Tag Cloud");
+	define("_MI_XP2_BLOCK_CATEGORY","Category");
+	define("_MI_XP2_BLOCK_META","Meta");
+	define("_MI_XP2_BLOCK_SIDEBAR","Sidebar Navigation");
+	define("_MI_XP2_BLOCK_WIDGET","Widget");
+	define("_MI_XP2_BLOCK_ENHANCED","Enhanced");
 
 	// Notify Categories
-	define('_MI_XPRESS_NOTCAT_GLOBAL', 'ALL');
-	define('_MI_XPRESS_NOTCAT_GLOBALDSC', 'Notification option in the entire blog');
-	define('_MI_XPRESS_NOTCAT_CAT', 'Category under selection');
-	define('_MI_XPRESS_NOTCAT_CATDSC', 'Notification option to category under selection');
-	define('_MI_XPRESS_NOTCAT_AUTHOR', 'Author who is selecting it'); 
-	define('_MI_XPRESS_NOTCAT_AUTHORDSC', 'Notification option to author who is selecting it');
-	define('_MI_XPRESS_NOTCAT_POST', 'Article on display'); 
-	define('_MI_XPRESS_NOTCAT_POSTDSC', 'Notification option to article on display');
+	define('_MI_XP2_NOTCAT_GLOBAL', 'ALL');
+	define('_MI_XP2_NOTCAT_GLOBALDSC', 'Notification option in the entire blog');
+	define('_MI_XP2_NOTCAT_CAT', 'Category under selection');
+	define('_MI_XP2_NOTCAT_CATDSC', 'Notification option to category under selection');
+	define('_MI_XP2_NOTCAT_AUTHOR', 'Author who is selecting it'); 
+	define('_MI_XP2_NOTCAT_AUTHORDSC', 'Notification option to author who is selecting it');
+	define('_MI_XP2_NOTCAT_POST', 'Article on display'); 
+	define('_MI_XP2_NOTCAT_POSTDSC', 'Notification option to article on display');
 
 	// Each Notifications
-	define('_MI_XPRESS_NOTIFY_GLOBAL_WAITING', 'Approval waiting');
-	define('_MI_XPRESS_NOTIFY_GLOBAL_WAITINGCAP', 'It notifies when the contribution and the edit that requires approving are done. Manager exclusive use');
-	define('_MI_XPRESS_NOTIFY_GLOBAL_WAITINGSBJ', '[{X_SITENAME}] {X_MODULE}: Approval waiting');
+	define('_MI_XP2_NOTIFY_GLOBAL_WAITING', 'Approval waiting');
+	define('_MI_XP2_NOTIFY_GLOBAL_WAITINGCAP', 'It notifies when the contribution and the edit that requires approving are done. Manager exclusive use');
+	define('_MI_XP2_NOTIFY_GLOBAL_WAITINGSBJ', '[{X_SITENAME}] {X_MODULE}: Approval waiting');
 
-	define('_MI_XPRESS_NOTIFY_GLOBAL_NEWPOST', 'Contribution of article');
-	define('_MI_XPRESS_NOTIFY_GLOBAL_NEWPOSTCAP', 'It notifies when the article is contributed in either of the entire this blog. ');
-	define('_MI_XPRESS_NOTIFY_GLOBAL_NEWPOSTSBJ', '[{XPRESS_BLOG_NAME}]Article: "{XPRESS_POST_TITLE}"');
+	define('_MI_XP2_NOTIFY_GLOBAL_NEWPOST', 'Contribution of article');
+	define('_MI_XP2_NOTIFY_GLOBAL_NEWPOSTCAP', 'It notifies when the article is contributed in either of the entire this blog. ');
+	define('_MI_XP2_NOTIFY_GLOBAL_NEWPOSTSBJ', '[{XPRESS_BLOG_NAME}]Article: "{XPRESS_POST_TITLE}"');
 
-	define('_MI_XPRESS_NOTIFY_GLOBAL_NEWCOMMENT', 'Comment contribution');
-	define('_MI_XPRESS_NOTIFY_GLOBAL_NEWCOMMENTCAP', 'It notifies when the comment is contributed in either of the entire this blog. ');
-	define('_MI_XPRESS_NOTIFY_GLOBAL_NEWCOMMENTSBJ', '[{XPRESS_BLOG_NAME}]Comment: "{XPRESS_POST_TITLE}"');
+	define('_MI_XP2_NOTIFY_GLOBAL_NEWCOMMENT', 'Comment contribution');
+	define('_MI_XP2_NOTIFY_GLOBAL_NEWCOMMENTCAP', 'It notifies when the comment is contributed in either of the entire this blog. ');
+	define('_MI_XP2_NOTIFY_GLOBAL_NEWCOMMENTSBJ', '[{XPRESS_BLOG_NAME}]Comment: "{XPRESS_POST_TITLE}"');
 
-	define('_MI_XPRESS_NOTIFY_CAT_NEWPOST', 'Article contribution to selection category');
-	define('_MI_XPRESS_NOTIFY_CAT_NEWPOSTCAP', 'It notifies when there is an article contribution in this category.');
-	define('_MI_XPRESS_NOTIFY_CAT_NEWPOSTSBJ', '[{XPRESS_BLOG_NAME}]Article: "{XPRESS_POST_TITLE}" (Condition:Category="{XPRESS_CAT_TITLE}")');
+	define('_MI_XP2_NOTIFY_CAT_NEWPOST', 'Article contribution to selection category');
+	define('_MI_XP2_NOTIFY_CAT_NEWPOSTCAP', 'It notifies when there is an article contribution in this category.');
+	define('_MI_XP2_NOTIFY_CAT_NEWPOSTSBJ', '[{XPRESS_BLOG_NAME}]Article: "{XPRESS_POST_TITLE}" (Condition:Category="{XPRESS_CAT_TITLE}")');
 
-	define('_MI_XPRESS_NOTIFY_CAT_NEWCOMMENT', 'Comment contribution to selection category');
-	define('_MI_XPRESS_NOTIFY_CAT_NEWCOMMENTCAP', 'It notifies when there is a comment contribution in this category. ');
-	define('_MI_XPRESS_NOTIFY_CAT_NEWCOMMENTSBJ', '[{XPRESS_BLOG_NAME}]Comment: (Article"{XPRESS_POST_TITLE}") (Condition:Category="{XPRESS_CAT_TITLE}")');
+	define('_MI_XP2_NOTIFY_CAT_NEWCOMMENT', 'Comment contribution to selection category');
+	define('_MI_XP2_NOTIFY_CAT_NEWCOMMENTCAP', 'It notifies when there is a comment contribution in this category. ');
+	define('_MI_XP2_NOTIFY_CAT_NEWCOMMENTSBJ', '[{XPRESS_BLOG_NAME}]Comment: (Article"{XPRESS_POST_TITLE}") (Condition:Category="{XPRESS_CAT_TITLE}")');
 
-	define('_MI_XPRESS_NOTIFY_AUT_NEWPOST', 'Article contribution by selection contributor');
-	define('_MI_XPRESS_NOTIFY_AUT_NEWPOSTCAP', 'It notifies when there is an article contribution from this contributor. ');
-	define('_MI_XPRESS_NOTIFY_AUT_NEWPOSTSBJ', '[{XPRESS_BLOG_NAME}]Article: "{XPRESS_POST_TITLE}" (Condition:Author="{XPRESS_AUTH_NAME}")');
+	define('_MI_XP2_NOTIFY_AUT_NEWPOST', 'Article contribution by selection contributor');
+	define('_MI_XP2_NOTIFY_AUT_NEWPOSTCAP', 'It notifies when there is an article contribution from this contributor. ');
+	define('_MI_XP2_NOTIFY_AUT_NEWPOSTSBJ', '[{XPRESS_BLOG_NAME}]Article: "{XPRESS_POST_TITLE}" (Condition:Author="{XPRESS_AUTH_NAME}")');
 
-	define('_MI_XPRESS_NOTIFY_AUT_NEWCOMMENT', 'Comment contribution to selection contributor article');
-	define('_MI_XPRESS_NOTIFY_AUT_NEWCOMMENTCAP', 'It notifies when the comment contribution is in the article by this contributor. ');
-	define('_MI_XPRESS_NOTIFY_AUT_NEWCOMMENTSBJ', '[{XPRESS_BLOG_NAME}]Comment: (Article"{XPRESS_POST_TITLE}") (Condition:Author="{XPRESS_AUTH_NAME}")');
+	define('_MI_XP2_NOTIFY_AUT_NEWCOMMENT', 'Comment contribution to selection contributor article');
+	define('_MI_XP2_NOTIFY_AUT_NEWCOMMENTCAP', 'It notifies when the comment contribution is in the article by this contributor. ');
+	define('_MI_XP2_NOTIFY_AUT_NEWCOMMENTSBJ', '[{XPRESS_BLOG_NAME}]Comment: (Article"{XPRESS_POST_TITLE}") (Condition:Author="{XPRESS_AUTH_NAME}")');
 
-	define('_MI_XPRESS_NOTIFY_POST_EDITPOST', 'Article change');
-	define('_MI_XPRESS_NOTIFY_POST_EDITPOSTCAP', 'It notifies when there is a change in the article on the display. ');
-	define('_MI_XPRESS_NOTIFY_POST_EDITPOSTSBJ', '[{XPRESS_BLOG_NAME}]Article: "{XPRESS_POST_TITLE}"Change (Condition:Article specification)');
+	define('_MI_XP2_NOTIFY_POST_EDITPOST', 'Article change');
+	define('_MI_XP2_NOTIFY_POST_EDITPOSTCAP', 'It notifies when there is a change in the article on the display. ');
+	define('_MI_XP2_NOTIFY_POST_EDITPOSTSBJ', '[{XPRESS_BLOG_NAME}]Article: "{XPRESS_POST_TITLE}"Change (Condition:Article specification)');
 
-	define('_MI_XPRESS_NOTIFY_POST_NEWCOMMENT', 'Comment contribution to article');
-	define('_MI_XPRESS_NOTIFY_POST_NEWCOMMENTCAP', 'It notifies when the comment is contributed in the article on the display. ');
-	define('_MI_XPRESS_NOTIFY_POST_NEWCOMMENTSBJ', '[{XPRESS_BLOG_NAME}]Comment: (Article"{XPRESS_POST_TITLE}") (Condition:Article specification)');
+	define('_MI_XP2_NOTIFY_POST_NEWCOMMENT', 'Comment contribution to article');
+	define('_MI_XP2_NOTIFY_POST_NEWCOMMENTCAP', 'It notifies when the comment is contributed in the article on the display. ');
+	define('_MI_XP2_NOTIFY_POST_NEWCOMMENTSBJ', '[{XPRESS_BLOG_NAME}]Comment: (Article"{XPRESS_POST_TITLE}") (Condition:Article specification)');
 
 }
Index: /trunk/language/ja_utf8/admin.php
===================================================================
--- /trunk/language/ja_utf8/admin.php	(revision 182)
+++ /trunk/language/ja_utf8/admin.php	(revision 183)
@@ -1,5 +1,5 @@
 <?php
-if( ! defined( 'XPRESS_ADMIN_LANG_INCLUDED' ) ) {
-	define( 'XPRESS_ADMIN_LANG_INCLUDED' , 1 ) ;
+if( ! defined( 'XP2_ADMIN_LANG_INCLUDED' ) ) {
+	define( 'XP2_ADMIN_LANG_INCLUDED' , 1 ) ;
 	
 // altsys
@@ -9,27 +9,27 @@
 	define('_MD_A_MYMENU_MYPREFERENCES','一般設定');
 
-	define("_AM_SYSTEM_INFO","システム情報");
-	define("_AM_XOOPS_CONFIG_INFO","XPressMEがXOOPSより取得した設定値");
-	define("_AM_XPRESS_PLUGIN","WordPressで使用中のプラグイン");
-	define("_AM_XPRESS_STATS","統計");
-	define("_AM_XPRESS_CATEGORIES","カテゴリー数");
-	define("_AM_XPRESS_ARTICLES","記事数");
-	define("_AM_XPRESS_AUTHORS","投稿者数");
-	define("_AM_XPRESS_SYS_REPORT","レポート形式で表示");
-	define("_AM_XPRESS_SYS_NORMAL","ノーマル表示へ戻る");
+	define("_AM_XP2_SYSTEM_INFO","システム情報");
+	define("_AM_XP2_XOOPS_CONFIG_INFO","XPressMEがXOOPSより取得した設定値");
+	define("_AM_XP2_PLUGIN","WordPressで使用中のプラグイン");
+	define("_AM_XP2_STATS","統計");
+	define("_AM_XP2_CATEGORIES","カテゴリー数");
+	define("_AM_XP2_ARTICLES","記事数");
+	define("_AM_XP2_AUTHORS","投稿者数");
+	define("_AM_XP2_SYS_REPORT","レポート形式で表示");
+	define("_AM_XP2_SYS_NORMAL","ノーマル表示へ戻る");
 
 // Block Check	
-	define("_AM_XP_BLOCK_OK","ブロックは正常です。");
-	define("_AM_XP_BLOCK_NG","異常ブロックがあります。");
-	define("_AM_XP_BLOCK_REPAIR_HOWTO","以下の手順に従ってブロックを修正してください。");
-	define("_AM_XP_BLOCK_REPAIR_STEP1","ステップ 1");
-	define("_AM_XP_BLOCK_REMOVE","ブロックを削除");
-	define("_AM_XP_BLOCK_REMOVE_NOTE","注意: モジュールのブロックがデータベースから<b>削除</b>されます。");
-	define("_AM_XP_BLOCK_REPAIR_STEP2","ステップ 2");
-	define("_AM_XP_BLOCK_UPDATE","モジュールをアップデートして、ブロックを再構築します。");
-	define("_AM_XP_TO_MODELE_UPDATE","モジュールアップデートへ");
-	define("_AM_XP_BLOCK_REPAIR_STEP3","ステップ 3");
-	define("_AM_XP_BLOCK_ADMIN_SETTING","ブロックの配置とアクセス権限を再設定します。");
-	define("_AM_XP_BLOCK_TO_SETTING","ブロック権限の設定へ");
+	define("_AM_XP2_BLOCK_OK","ブロックは正常です。");
+	define("_AM_XP2_BLOCK_NG","異常ブロックがあります。");
+	define("_AM_XP2_BLOCK_REPAIR_HOWTO","以下の手順に従ってブロックを修正してください。");
+	define("_AM_XP2_BLOCK_REPAIR_STEP1","ステップ 1");
+	define("_AM_XP2_BLOCK_REMOVE","ブロックを削除");
+	define("_AM_XP2_BLOCK_REMOVE_NOTE","注意: モジュールのブロックがデータベースから<b>削除</b>されます。");
+	define("_AM_XP2_BLOCK_REPAIR_STEP2","ステップ 2");
+	define("_AM_XP2_BLOCK_UPDATE","モジュールをアップデートして、ブロックを再構築します。");
+	define("_AM_XP2_TO_MODELE_UPDATE","モジュールアップデートへ");
+	define("_AM_XP2_BLOCK_REPAIR_STEP3","ステップ 3");
+	define("_AM_XP2_BLOCK_ADMIN_SETTING","ブロックの配置とアクセス権限を再設定します。");
+	define("_AM_XP2_BLOCK_TO_SETTING","ブロック権限の設定へ");
 	
 	
Index: /trunk/language/ja_utf8/blocks.php
===================================================================
--- /trunk/language/ja_utf8/blocks.php	(revision 182)
+++ /trunk/language/ja_utf8/blocks.php	(revision 183)
@@ -1,132 +1,132 @@
 <?php
-if( ! defined( 'XPRESS_BLOCK_LANG_INCLUDED' ) ) {
-	define( 'XPRESS_BLOCK_LANG_INCLUDED' , 1 ) ;
+if( ! defined( 'XP2_BLOCK_LANG_INCLUDED' ) ) {
+	define( 'XP2_BLOCK_LANG_INCLUDED' , 1 ) ;
 // general	
-	define("_MB_XPRESS_COUNT",'表示数');
-	define("_MB_XPRESS_COUNT_ZERO_ALL",'表示数(0の場合全てを表示)');
-	define("_MB_XPRESS_LENGTH","長さ");
-	define("_MB_XPRESS_ALL","すべて");
-	define("_MB_XPRESS_BLOCK_CACHE_ERR","キャッシュが存在しません。<br />最初に%sモジュールにアクセスしてください。");
-	define("_MB_XPRESS_SHOW_NUM_OF_POST","エントリー数の表示");
-	define("_MB_XPRESS_SHOW_DROP_DOWN","ドロップダウンリストで表示");
-	define("_MB_XPRESS_HIDE_EMPTY","エントリーのない項目をリスト一覧から除く");
-	define("_MB_XPRESS_TITLE","タイトル");
-	define("_MB_XPRESS_PUBLISH_DATE","投稿日付");
-	define("_MB_XPRESS_SORT_ORDER","並び替え順序");
-	define("_MB_XPRESS_SORT_ASC","昇順");
-	define("_MB_XPRESS_SORT_DESC","降順");
-	define("_MB_XPRESS_SHOW_DATE_SELECT","日付の表示");
-	define("_MB_XPRESS_SHOW_DATE_NONE","表示しない");
-	define("_MB_XPRESS_SHOW_POST_DATE","作成日を表示");
-	define("_MB_XPRESS_SHOW_MODIFY_DATE","最終更新日を表示");
-	define("_MB_XPRESS_SHOW_DATE","日付を表示する");
-	define("_MB_XPRESS_DATE_FORMAT","日付のフォーマット(空白の場合WordPressでの設定が適用されます)");
-	define("_MB_XPRESS_TIME_FORMAT","時刻のフォーマット(空白の場合WordPressでの設定が適用されます)");
-	define("_MB_XPRESS_FLAT","フラット");
-	define("_MB_XPRESS_LIST","リスト");
-	define("_MB_XPRESS_FILE_NAME","ファイル名");
+	define("_MB_XP2_COUNT",'表示数');
+	define("_MB_XP2_COUNT_ZERO_ALL",'表示数(0の場合全てを表示)');
+	define("_MB_XP2_LENGTH","長さ");
+	define("_MB_XP2_ALL","すべて");
+	define("_MB_XP2_BLOCK_CACHE_ERR","キャッシュが存在しません。<br />最初に%sモジュールにアクセスしてください。");
+	define("_MB_XP2_SHOW_NUM_OF_POST","エントリー数の表示");
+	define("_MB_XP2_SHOW_DROP_DOWN","ドロップダウンリストで表示");
+	define("_MB_XP2_HIDE_EMPTY","エントリーのない項目をリスト一覧から除く");
+	define("_MB_XP2_TITLE","タイトル");
+	define("_MB_XP2_PUBLISH_DATE","投稿日付");
+	define("_MB_XP2_SORT_ORDER","並び替え順序");
+	define("_MB_XP2_SORT_ASC","昇順");
+	define("_MB_XP2_SORT_DESC","降順");
+	define("_MB_XP2_SHOW_DATE_SELECT","日付の表示");
+	define("_MB_XP2_SHOW_DATE_NONE","表示しない");
+	define("_MB_XP2_SHOW_POST_DATE","作成日を表示");
+	define("_MB_XP2_SHOW_MODIFY_DATE","最終更新日を表示");
+	define("_MB_XP2_SHOW_DATE","日付を表示する");
+	define("_MB_XP2_DATE_FORMAT","日付のフォーマット(空白の場合WordPressでの設定が適用されます)");
+	define("_MB_XP2_TIME_FORMAT","時刻のフォーマット(空白の場合WordPressでの設定が適用されます)");
+	define("_MB_XP2_FLAT","フラット");
+	define("_MB_XP2_LIST","リスト");
+	define("_MB_XP2_FILE_NAME","ファイル名");
 	
 // recent comment block	
-	define("_MB_XPRESS_COMM_DISP_AUTH","コメント投稿者を表示する");
-	define("_MB_XPRESS_COMM_DISP_TYPE","コメントタイプを表示する");
-	define("_MB_XPRESS_COM_TYPE","表示するコメントのタイプを選択");
-	define("_MB_XPRESS_COMMENT","コメント");
-	define("_MB_XPRESS_TRUCKBACK","トラックバック");
-	define("_MB_XPRESS_PINGBACK","ピンバック");
+	define("_MB_XP2_COMM_DISP_AUTH","コメント投稿者を表示する");
+	define("_MB_XP2_COMM_DISP_TYPE","コメントタイプを表示する");
+	define("_MB_XP2_COM_TYPE","表示するコメントのタイプを選択");
+	define("_MB_XP2_COMMENT","コメント");
+	define("_MB_XP2_TRUCKBACK","トラックバック");
+	define("_MB_XP2_PINGBACK","ピンバック");
 	
 // recent posts content
-	define("_MB_XPRESS_P_EXCERPT","記事を概要で表示する");
-	define("_MB_XPRESS_P_EXCERPT_SIZE","記事の概要文字数");
-	define("_MB_XPRESS_CATS_SELECT","対象のカテゴリー選択");
-	define("_MB_XPRESS_TAGS_SELECT","対象のタグ選択(複数ある場合はカンマ区切りで入力");
+	define("_MB_XP2_P_EXCERPT","記事を概要で表示する");
+	define("_MB_XP2_P_EXCERPT_SIZE","記事の概要文字数");
+	define("_MB_XP2_CATS_SELECT","対象のカテゴリー選択");
+	define("_MB_XP2_TAGS_SELECT","対象のタグ選択(複数ある場合はカンマ区切りで入力");
 	
 // recent posts list	
-	define("_MB_XPRESS_REDNEW_DAYS","赤のNewマークを表示する日数");
-	define("_MB_XPRESS_GREENNEW_DAYS","緑のNewマークを表示する日数");	
+	define("_MB_XP2_REDNEW_DAYS","赤のNewマークを表示する日数");
+	define("_MB_XP2_GREENNEW_DAYS","緑のNewマークを表示する日数");	
 
 // calender		
-	define("_MB_XPRESS_SUN_COLOR","日曜日の表示色");
-	define("_MB_XPRESS_SAT_COLOR","土曜日の表示色");
+	define("_MB_XP2_SUN_COLOR","日曜日の表示色");
+	define("_MB_XP2_SAT_COLOR","土曜日の表示色");
 	
 // popular		
-	define("_MB_MONTH_RANGE","指定月数内のものを表示(0;指定なし)");
+	define("_MB_XP2_MONTH_RANGE","指定月数内のものを表示(0;指定なし)");
 	
 // archives
-	define("_MB_XPRESS_ARC_TYPE","アーカイブタイプ");
-	define("_MB_XPRESS_ARC_YEAR","年別アーカイブ");
-	define("_MB_XPRESS_ARC_MONTH","月別アーカイブ");
-	define("_MB_XPRESS_ARC_WEEK","週別アーカイブ");
-	define("_MB_XPRESS_ARC_DAY","日別アーカイブ");
-	define("_MB_XPRESS_ARC_POST","個別記事アーカイブ");
+	define("_MB_XP2_ARC_TYPE","アーカイブタイプ");
+	define("_MB_XP2_ARC_YEAR","年別アーカイブ");
+	define("_MB_XP2_ARC_MONTH","月別アーカイブ");
+	define("_MB_XP2_ARC_WEEK","週別アーカイブ");
+	define("_MB_XP2_ARC_DAY","日別アーカイブ");
+	define("_MB_XP2_ARC_POST","個別記事アーカイブ");
 
 // authors	
-	define("_MB_XPRESS_EXCLUEDEADMIN","リスト一覧から管理人を除く");
-	define("_MB_XPRESS_SHOW_FULLNAME","著者名をフルネームで表示");
+	define("_MB_XP2_EXCLUEDEADMIN","リスト一覧から管理人を除く");
+	define("_MB_XP2_SHOW_FULLNAME","著者名をフルネームで表示");
 
 // page 	
-	define("_MB_XPRESS_PAGE_ORDERBY","ページリストのソート項目");
-	define("_MB_XPRESS_PAGE_TITLE","タイトル名順");
-	define("_MB_XPRESS_PAGE_MENU_ORDER","ページ順");
-	define("_MB_XPRESS_PAGE_POST_DATE","作成日順");
-	define("_MB_XPRESS_PAGE_POST_MODIFY","最終更新日順");
-	define("_MB_XPRESS_PAGE_ID","ページ ID順");
-	define("_MB_XPRESS_PAGE_AUTHOR","作成者ID 順");
-	define("_MB_XPRESS_PAGE_SLUG","ページスラッグ順");
-	define("_MB_XPRESS_PAGE_EXCLUDE","リストから除外するページID をカンマ区切りで昇順に指定。");
-	define("_MB_XPRESS_PAGE_EXCLUDE_TREE","リストから除外するページID を指定(子ページも除外されます)。");
-	define("_MB_XPRESS_PAGE_INCLUDE","指定したページID のみリストに表示。カンマ区切りで昇順に指定");
-	define("_MB_XPRESS_PAGE_DEPTH","ページ階層のどのレベルまでをリストに出力するかを指定。 (0=全親子ページを出力）");
-	define("_MB_XPRESS_PAGE_CHILD_OF","指定IDのページを親とする階層のページをリストに表示します。(0=全親子ページを出力）");
-	define("_MB_XPRESS_PAGE_HIERARCHICAL","子ページをリスト表示するとき、インデント（字下げ）する。");
-	define("_MB_XPRESS_PAGE_META_KEY","ここに記述したカスタムフィールドキーを持つページだけを表示します。");
-	define("_MB_XPRESS_PAGE_META_VALUE","ここに記述したカスタムフィールド値を持つページだけを表示します。");
+	define("_MB_XP2_PAGE_ORDERBY","ページリストのソート項目");
+	define("_MB_XP2_PAGE_TITLE","タイトル名順");
+	define("_MB_XP2_PAGE_MENU_ORDER","ページ順");
+	define("_MB_XP2_PAGE_POST_DATE","作成日順");
+	define("_MB_XP2_PAGE_POST_MODIFY","最終更新日順");
+	define("_MB_XP2_PAGE_ID","ページ ID順");
+	define("_MB_XP2_PAGE_AUTHOR","作成者ID 順");
+	define("_MB_XP2_PAGE_SLUG","ページスラッグ順");
+	define("_MB_XP2_PAGE_EXCLUDE","リストから除外するページID をカンマ区切りで昇順に指定。");
+	define("_MB_XP2_PAGE_EXCLUDE_TREE","リストから除外するページID を指定(子ページも除外されます)。");
+	define("_MB_XP2_PAGE_INCLUDE","指定したページID のみリストに表示。カンマ区切りで昇順に指定");
+	define("_MB_XP2_PAGE_DEPTH","ページ階層のどのレベルまでをリストに出力するかを指定。 (0=全親子ページを出力）");
+	define("_MB_XP2_PAGE_CHILD_OF","指定IDのページを親とする階層のページをリストに表示します。(0=全親子ページを出力）");
+	define("_MB_XP2_PAGE_HIERARCHICAL","子ページをリスト表示するとき、インデント（字下げ）する。");
+	define("_MB_XP2_PAGE_META_KEY","ここに記述したカスタムフィールドキーを持つページだけを表示します。");
+	define("_MB_XP2_PAGE_META_VALUE","ここに記述したカスタムフィールド値を持つページだけを表示します。");
 	
 // Search
-	define("_MB_XPRESS_SEARCH_LENGTH","検索BOXの長さ");
+	define("_MB_XP2_SEARCH_LENGTH","検索BOXの長さ");
 	
 // tag cloud
-	define("_MB_XPRESS_CLOUD_SMALLEST",'最少使用数のタグの表示に使うフォントサイズ');
-	define("_MB_XPRESS_CLOUD_LARGEST",'最多使用数のタグの表示に使うフォントサイズ');
-	define("_MB_XPRESS_CLOUD_UNIT","フォントサイズの単位。pt, px, em, % 等");
-	define("_MB_XPRESS_CLOUD_NUMBER","クラウドに表示するタグ数。[0] を指定すると全タグを表示");
-	define("_MB_XPRESS_CLOUD_FORMAT","クラウド表示のフォーマット");
-	define("_MB_XPRESS_CLOUD_ORDERBY","タグの表示順とする項目");
-	define("_MB_XPRESS_CLOUD_ORDER","ソート順（ランダムはWordPress2.5以上で指定可能）");
-	define("_MB_XPRESS_CLOUD_EXCLUDE","除外するタグの term_id をカンマ区切りで指定");
-	define("_MB_XPRESS_CLOUD_INCLUDE","表示対象とするタグの term_id をカンマ区切りで指定、空白時は全タグ対象");
-	define("_MB_XPRESS_RAND","ランダム");
-	define("_MB_XPRESS_TAG_NAME","タグ名");
-	define("_MB_XPRESS_TAG_COUNT","使用回数");
+	define("_MB_XP2_CLOUD_SMALLEST",'最少使用数のタグの表示に使うフォントサイズ');
+	define("_MB_XP2_CLOUD_LARGEST",'最多使用数のタグの表示に使うフォントサイズ');
+	define("_MB_XP2_CLOUD_UNIT","フォントサイズの単位。pt, px, em, % 等");
+	define("_MB_XP2_CLOUD_NUMBER","クラウドに表示するタグ数。[0] を指定すると全タグを表示");
+	define("_MB_XP2_CLOUD_FORMAT","クラウド表示のフォーマット");
+	define("_MB_XP2_CLOUD_ORDERBY","タグの表示順とする項目");
+	define("_MB_XP2_CLOUD_ORDER","ソート順（ランダムはWordPress2.5以上で指定可能）");
+	define("_MB_XP2_CLOUD_EXCLUDE","除外するタグの term_id をカンマ区切りで指定");
+	define("_MB_XP2_CLOUD_INCLUDE","表示対象とするタグの term_id をカンマ区切りで指定、空白時は全タグ対象");
+	define("_MB_XP2_RAND","ランダム");
+	define("_MB_XP2_TAG_NAME","タグ名");
+	define("_MB_XP2_TAG_COUNT","使用回数");
 	
 // Categorie
-	define("_MB_XPRESS_CAT_ALL_STR","全カテゴリへのリンクを示す文字を指定します。(空白時は表示なし）");
-	define("_MB_XPRESS_CAT_ORDERBY","カテゴリのソート項目");
-	define("_MB_XPRESS_CAT_NAME","カテゴリ名");
-	define("_MB_XPRESS_CAT_COUNT","カテゴリの投稿数");
-	define("_MB_XPRESS_CAT_ID","カテゴリID");
-	define("_MB_XPRESS_SHOW_LAST_UPDATE","各カテゴリに属する投稿の最終更新日を表示する。");
-	define("_MB_XPRESS_CAT_HIDE_EMPTY","投稿のないカテゴリを非表示にする。");
-	define("_MB_XPRESS_DESC_FOR_TITLE","カテゴリの概要をリンクの title 属性に挿入する。");
-	define("_MB_XPRESS_CAT_EXCLUDE","リストから除外するカテゴリID をカンマ区切りで昇順に指定。");
-	define("_MB_XPRESS_CAT_INCLUDE","指定したカテゴリID のみリストに表示。カンマ区切りで昇順に指定");
-	define("_MB_XPRESS_CAT_HIERARCHICAL","サブカテゴリーを表示するとき、インデント（字下げ）する。");
-	define("_MB_XPRESS_CAT_DEPTH","カテゴリ階層のどのレベルまでをリストに出力するかを指定。 (0=全親子カテゴリを出力）");
+	define("_MB_XP2_CAT_ALL_STR","全カテゴリへのリンクを示す文字を指定します。(空白時は表示なし）");
+	define("_MB_XP2_CAT_ORDERBY","カテゴリのソート項目");
+	define("_MB_XP2_CAT_NAME","カテゴリ名");
+	define("_MB_XP2_CAT_COUNT","カテゴリの投稿数");
+	define("_MB_XP2_CAT_ID","カテゴリID");
+	define("_MB_XP2_SHOW_LAST_UPDATE","各カテゴリに属する投稿の最終更新日を表示する。");
+	define("_MB_XP2_CAT_HIDE_EMPTY","投稿のないカテゴリを非表示にする。");
+	define("_MB_XP2_DESC_FOR_TITLE","カテゴリの概要をリンクの title 属性に挿入する。");
+	define("_MB_XP2_CAT_EXCLUDE","リストから除外するカテゴリID をカンマ区切りで昇順に指定。");
+	define("_MB_XP2_CAT_INCLUDE","指定したカテゴリID のみリストに表示。カンマ区切りで昇順に指定");
+	define("_MB_XP2_CAT_HIERARCHICAL","サブカテゴリーを表示するとき、インデント（字下げ）する。");
+	define("_MB_XP2_CAT_DEPTH","カテゴリ階層のどのレベルまでをリストに出力するかを指定。 (0=全親子カテゴリを出力）");
 	
 // meta 
-	define("_MB_XPRESS_META_WP_LINK","WordPressサイトへのリンクを表示");
-	define("_MB_XPRESS_META_XOOPS_LINK","Xoopsサイトへのリンクを表示");
-	define("_MB_XPRESS_META_POST_RSS","投稿のRSSを表示");
-	define("_MB_XPRESS_META_COMMENT_RSS","コメントのRSSを表示");
-	define("_MB_XPRESS_META_POST_NEW","新規投稿を表示");
-	define("_MB_XPRESS_META_ADMIN","サイトの管理を表示");
-	define("_MB_XPRESS_META_README","ReadMeを表示");
-	define("_MB_XPRESS_META_CH_STYLE","表示モード切替を表示");
+	define("_MB_XP2_META_WP_LINK","WordPressサイトへのリンクを表示");
+	define("_MB_XP2_META_XOOPS_LINK","Xoopsサイトへのリンクを表示");
+	define("_MB_XP2_META_POST_RSS","投稿のRSSを表示");
+	define("_MB_XP2_META_COMMENT_RSS","コメントのRSSを表示");
+	define("_MB_XP2_META_POST_NEW","新規投稿を表示");
+	define("_MB_XP2_META_ADMIN","サイトの管理を表示");
+	define("_MB_XP2_META_README","ReadMeを表示");
+	define("_MB_XP2_META_CH_STYLE","表示モード切替を表示");
 
 // meta 
-	define("_MB_XPRESS_SELECT_WIDGET","表示するウィジェットを選択 (複数選択可)");
+	define("_MB_XP2_SELECT_WIDGET","表示するウィジェットを選択 (複数選択可)");
 	
 // custom 
-	define("_MB_XPRESS_ENHACED_FILE","カスタムブロックを表示するファイル名を入力してください。");
-	define("_MB_XPRESS_MAKE_ENHACED_FILE","ここで指定したファイルをテーマ内のブロックディレクトリーに作成してください。");
+	define("_MB_XP2_ENHACED_FILE","カスタムブロックを表示するファイル名を入力してください。");
+	define("_MB_XP2_MAKE_ENHACED_FILE","ここで指定したファイルをテーマ内のブロックディレクトリーに作成してください。");
 }
 ?>
Index: /trunk/language/ja_utf8/main.php
===================================================================
--- /trunk/language/ja_utf8/main.php	(revision 182)
+++ /trunk/language/ja_utf8/main.php	(revision 183)
@@ -1,5 +1,5 @@
 <?php
-if( ! defined( 'XPRESS_MAIN_LANG_INCLUDED' ) ) {
-	define( 'XPRESS_MAIN_LANG_INCLUDED' , 1 ) ;
+if( ! defined( 'XP2_MAIN_LANG_INCLUDED' ) ) {
+	define( 'XP2_MAIN_LANG_INCLUDED' , 1 ) ;
 
 }
Index: /trunk/language/ja_utf8/modinfo.php
===================================================================
--- /trunk/language/ja_utf8/modinfo.php	(revision 182)
+++ /trunk/language/ja_utf8/modinfo.php	(revision 183)
@@ -4,83 +4,83 @@
 
 	// The name of this module admin menu
-	define("_MI_MENU_SYS_INFO","システム情報");
-	define("_MI_MENU_BLOCK_ADMIN","ブロック権限");
-	define("_MI_MENU_BLOCK_CHECK","ブロックチェック");
+	define("_MI_XP2_MENU_SYS_INFO","システム情報");
+	define("_MI_XP2_MENU_BLOCK_ADMIN","ブロック権限");
+	define("_MI_XP2_MENU_BLOCK_CHECK","ブロックチェック");
 	
 	// The name of this module
-	define("_MI_XPRESS_NAME","ブログ");
+	define("_MI_XP2_NAME","ブログ");
 
 	// A brief description of this module
-	define("_MI_XPRESS_DESC","WordPressMEをXOOPSモジュール化したものです。");
+	define("_MI_XP2_DESC","WordPressMEをXOOPSモジュール化したものです。");
 
 	// Sub menu titles
-	define("_MI_XPRESS_MENU_POST_NEW","新規投稿");
-	define("_MI_XPRESS_MENU_EDIT","編集");
-	define("_MI_XPRESS_MENU_ADMIN","WordPress管理");
-	define("_MI_XPRESS_MENU_XPRESS","XPressME設定");
+	define("_MI_XP2_MENU_POST_NEW","新規投稿");
+	define("_MI_XP2_MENU_EDIT","編集");
+	define("_MI_XP2_MENU_ADMIN","WordPress管理");
+	define("_MI_XP2_MENU_XPRESS","XPressME設定");
 
 	// Block Name
-	define("_MI_XPRESS_BLOCK_COMMENTS","最近のコメント");
-	define("_MI_XPRESS_BLOCK_CONTENT","最近の記事内容");
-	define("_MI_XPRESS_BLOCK_POSTS","最近の記事");
-	define("_MI_XPRESS_BLOCK_CALENDER","カレンダー");
-	define("_MI_XPRESS_BLOCK_POPULAR","人気記事リスト");
-	define("_MI_XPRESS_BLOCK_ARCHIVE","アーカイブ");
-	define("_MI_XPRESS_BLOCK_AUTHORS","投稿者");
-	define("_MI_XPRESS_BLOCK_PAGE","ページ");
-	define("_MI_XPRESS_BLOCK_SEARCH","検索");
-	define("_MI_XPRESS_BLOCK_TAG","タグクラウド");
-	define("_MI_XPRESS_BLOCK_CATEGORY","カテゴリー");
-	define("_MI_XPRESS_BLOCK_META","メタ情報");
-	define("_MI_XPRESS_BLOCK_SIDEBAR","サイドバー");
-	define("_MI_XPRESS_BLOCK_WIDGET","ウィジェット");
-	define("_MI_XPRESS_BLOCK_ENHANCED","拡張ブロック");
+	define("_MI_XP2_BLOCK_COMMENTS","最近のコメント");
+	define("_MI_XP2_BLOCK_CONTENT","最近の記事内容");
+	define("_MI_XP2_BLOCK_POSTS","最近の記事");
+	define("_MI_XP2_BLOCK_CALENDER","カレンダー");
+	define("_MI_XP2_BLOCK_POPULAR","人気記事リスト");
+	define("_MI_XP2_BLOCK_ARCHIVE","アーカイブ");
+	define("_MI_XP2_BLOCK_AUTHORS","投稿者");
+	define("_MI_XP2_BLOCK_PAGE","ページ");
+	define("_MI_XP2_BLOCK_SEARCH","検索");
+	define("_MI_XP2_BLOCK_TAG","タグクラウド");
+	define("_MI_XP2_BLOCK_CATEGORY","カテゴリー");
+	define("_MI_XP2_BLOCK_META","メタ情報");
+	define("_MI_XP2_BLOCK_SIDEBAR","サイドバー");
+	define("_MI_XP2_BLOCK_WIDGET","ウィジェット");
+	define("_MI_XP2_BLOCK_ENHANCED","拡張ブロック");
 	
 	// Notify Categories
-	define('_MI_XPRESS_NOTCAT_GLOBAL', 'ブログ全体');
-	define('_MI_XPRESS_NOTCAT_GLOBALDSC', 'ブログ全体における通知オプション');
-	define('_MI_XPRESS_NOTCAT_CAT', '選択中のカテゴリ');
-	define('_MI_XPRESS_NOTCAT_CATDSC', '選択中のカテゴリに対する通知オプション');
-	define('_MI_XPRESS_NOTCAT_AUTHOR', '選択中の投稿者'); 
-	define('_MI_XPRESS_NOTCAT_AUTHORDSC', '選択中の投稿者に対する通知オプション');
-	define('_MI_XPRESS_NOTCAT_POST', '表示中の記事'); 
-	define('_MI_XPRESS_NOTCAT_POSTDSC', '表示中の記事に対する通知オプション');
+	define('_MI_XP2_NOTCAT_GLOBAL', 'ブログ全体');
+	define('_MI_XP2_NOTCAT_GLOBALDSC', 'ブログ全体における通知オプション');
+	define('_MI_XP2_NOTCAT_CAT', '選択中のカテゴリ');
+	define('_MI_XP2_NOTCAT_CATDSC', '選択中のカテゴリに対する通知オプション');
+	define('_MI_XP2_NOTCAT_AUTHOR', '選択中の投稿者'); 
+	define('_MI_XP2_NOTCAT_AUTHORDSC', '選択中の投稿者に対する通知オプション');
+	define('_MI_XP2_NOTCAT_POST', '表示中の記事'); 
+	define('_MI_XP2_NOTCAT_POSTDSC', '表示中の記事に対する通知オプション');
 
 	// Each Notifications
-	define('_MI_XPRESS_NOTIFY_GLOBAL_WAITING', '承認待ち');
-	define('_MI_XPRESS_NOTIFY_GLOBAL_WAITINGCAP', '承認を要する投稿・編集が行われた場合に通知します。管理者専用');
-	define('_MI_XPRESS_NOTIFY_GLOBAL_WAITINGSBJ', '[{X_SITENAME}] {X_MODULE}: 承認待ち');
+	define('_MI_XP2_NOTIFY_GLOBAL_WAITING', '承認待ち');
+	define('_MI_XP2_NOTIFY_GLOBAL_WAITINGCAP', '承認を要する投稿・編集が行われた場合に通知します。管理者専用');
+	define('_MI_XP2_NOTIFY_GLOBAL_WAITINGSBJ', '[{X_SITENAME}] {X_MODULE}: 承認待ち');
 
-	define('_MI_XPRESS_NOTIFY_GLOBAL_NEWPOST', '記事投稿');
-	define('_MI_XPRESS_NOTIFY_GLOBAL_NEWPOSTCAP', 'このブログ全体のいずれかに記事の投稿があった場合に通知する');
-	define('_MI_XPRESS_NOTIFY_GLOBAL_NEWPOSTSBJ', '[{XPRESS_BLOG_NAME}]記事: "{XPRESS_POST_TITLE}"');
+	define('_MI_XP2_NOTIFY_GLOBAL_NEWPOST', '記事投稿');
+	define('_MI_XP2_NOTIFY_GLOBAL_NEWPOSTCAP', 'このブログ全体のいずれかに記事の投稿があった場合に通知する');
+	define('_MI_XP2_NOTIFY_GLOBAL_NEWPOSTSBJ', '[{XPRESS_BLOG_NAME}]記事: "{XPRESS_POST_TITLE}"');
 
-	define('_MI_XPRESS_NOTIFY_GLOBAL_NEWCOMMENT', 'コメント投稿');
-	define('_MI_XPRESS_NOTIFY_GLOBAL_NEWCOMMENTCAP', 'このブログ全体のいずれかにコメントの投稿があった場合に通知する');
-	define('_MI_XPRESS_NOTIFY_GLOBAL_NEWCOMMENTSBJ', '[{XPRESS_BLOG_NAME}]コメント: "{XPRESS_POST_TITLE}"');
+	define('_MI_XP2_NOTIFY_GLOBAL_NEWCOMMENT', 'コメント投稿');
+	define('_MI_XP2_NOTIFY_GLOBAL_NEWCOMMENTCAP', 'このブログ全体のいずれかにコメントの投稿があった場合に通知する');
+	define('_MI_XP2_NOTIFY_GLOBAL_NEWCOMMENTSBJ', '[{XPRESS_BLOG_NAME}]コメント: "{XPRESS_POST_TITLE}"');
 
-	define('_MI_XPRESS_NOTIFY_CAT_NEWPOST', '選択カテゴリへの記事投稿');
-	define('_MI_XPRESS_NOTIFY_CAT_NEWPOSTCAP', 'このカテゴリに記事投稿があった場合に通知する');
-	define('_MI_XPRESS_NOTIFY_CAT_NEWPOSTSBJ', '[{XPRESS_BLOG_NAME}]記事: "{XPRESS_POST_TITLE}" (条件:カテゴリ="{XPRESS_CAT_TITLE}")');
+	define('_MI_XP2_NOTIFY_CAT_NEWPOST', '選択カテゴリへの記事投稿');
+	define('_MI_XP2_NOTIFY_CAT_NEWPOSTCAP', 'このカテゴリに記事投稿があった場合に通知する');
+	define('_MI_XP2_NOTIFY_CAT_NEWPOSTSBJ', '[{XPRESS_BLOG_NAME}]記事: "{XPRESS_POST_TITLE}" (条件:カテゴリ="{XPRESS_CAT_TITLE}")');
 
-	define('_MI_XPRESS_NOTIFY_CAT_NEWCOMMENT', '選択カテゴリへのコメント投稿');
-	define('_MI_XPRESS_NOTIFY_CAT_NEWCOMMENTCAP', 'このカテゴリにコメント投稿があった場合に通知する');
-	define('_MI_XPRESS_NOTIFY_CAT_NEWCOMMENTSBJ', '[{XPRESS_BLOG_NAME}]コメント: (記事"{XPRESS_POST_TITLE}") (条件:カテゴリ="{XPRESS_CAT_TITLE}")');
+	define('_MI_XP2_NOTIFY_CAT_NEWCOMMENT', '選択カテゴリへのコメント投稿');
+	define('_MI_XP2_NOTIFY_CAT_NEWCOMMENTCAP', 'このカテゴリにコメント投稿があった場合に通知する');
+	define('_MI_XP2_NOTIFY_CAT_NEWCOMMENTSBJ', '[{XPRESS_BLOG_NAME}]コメント: (記事"{XPRESS_POST_TITLE}") (条件:カテゴリ="{XPRESS_CAT_TITLE}")');
 
-	define('_MI_XPRESS_NOTIFY_AUT_NEWPOST', '選択投稿者による記事投稿');
-	define('_MI_XPRESS_NOTIFY_AUT_NEWPOSTCAP', 'この投稿者から記事投稿があった場合に通知する');
-	define('_MI_XPRESS_NOTIFY_AUT_NEWPOSTSBJ', '[{XPRESS_BLOG_NAME}]記事: "{XPRESS_POST_TITLE}" (条件:投稿者="{XPRESS_AUTH_NAME}")');
+	define('_MI_XP2_NOTIFY_AUT_NEWPOST', '選択投稿者による記事投稿');
+	define('_MI_XP2_NOTIFY_AUT_NEWPOSTCAP', 'この投稿者から記事投稿があった場合に通知する');
+	define('_MI_XP2_NOTIFY_AUT_NEWPOSTSBJ', '[{XPRESS_BLOG_NAME}]記事: "{XPRESS_POST_TITLE}" (条件:投稿者="{XPRESS_AUTH_NAME}")');
 
-	define('_MI_XPRESS_NOTIFY_AUT_NEWCOMMENT', '選択投稿者記事へのコメント投稿');
-	define('_MI_XPRESS_NOTIFY_AUT_NEWCOMMENTCAP', 'この投稿者による記事へコメント投稿があった場合に通知する');
-	define('_MI_XPRESS_NOTIFY_AUT_NEWCOMMENTSBJ', '[{XPRESS_BLOG_NAME}]コメント: (記事"{XPRESS_POST_TITLE}") (条件:投稿者="{XPRESS_AUTH_NAME}")');
+	define('_MI_XP2_NOTIFY_AUT_NEWCOMMENT', '選択投稿者記事へのコメント投稿');
+	define('_MI_XP2_NOTIFY_AUT_NEWCOMMENTCAP', 'この投稿者による記事へコメント投稿があった場合に通知する');
+	define('_MI_XP2_NOTIFY_AUT_NEWCOMMENTSBJ', '[{XPRESS_BLOG_NAME}]コメント: (記事"{XPRESS_POST_TITLE}") (条件:投稿者="{XPRESS_AUTH_NAME}")');
 
-	define('_MI_XPRESS_NOTIFY_POST_EDITPOST', '記事変更');
-	define('_MI_XPRESS_NOTIFY_POST_EDITPOSTCAP', '表示中の記事に変更があった場合に通知する');
-	define('_MI_XPRESS_NOTIFY_POST_EDITPOSTSBJ', '[{XPRESS_BLOG_NAME}]記事: "{XPRESS_POST_TITLE}"変更 (条件:記事指定)');
+	define('_MI_XP2_NOTIFY_POST_EDITPOST', '記事変更');
+	define('_MI_XP2_NOTIFY_POST_EDITPOSTCAP', '表示中の記事に変更があった場合に通知する');
+	define('_MI_XP2_NOTIFY_POST_EDITPOSTSBJ', '[{XPRESS_BLOG_NAME}]記事: "{XPRESS_POST_TITLE}"変更 (条件:記事指定)');
 
-	define('_MI_XPRESS_NOTIFY_POST_NEWCOMMENT', '記事へのコメント投稿');
-	define('_MI_XPRESS_NOTIFY_POST_NEWCOMMENTCAP', '表示中の記事にコメントの投稿があった場合に通知する');
-	define('_MI_XPRESS_NOTIFY_POST_NEWCOMMENTSBJ', '[{XPRESS_BLOG_NAME}]コメント: (記事"{XPRESS_POST_TITLE}") (条件:記事指定)');
+	define('_MI_XP2_NOTIFY_POST_NEWCOMMENT', '記事へのコメント投稿');
+	define('_MI_XP2_NOTIFY_POST_NEWCOMMENTCAP', '表示中の記事にコメントの投稿があった場合に通知する');
+	define('_MI_XP2_NOTIFY_POST_NEWCOMMENTSBJ', '[{XPRESS_BLOG_NAME}]コメント: (記事"{XPRESS_POST_TITLE}") (条件:記事指定)');
 
 }
Index: /trunk/xoops_version.php
===================================================================
--- /trunk/xoops_version.php	(revision 182)
+++ /trunk/xoops_version.php	(revision 183)
@@ -29,6 +29,6 @@
 include $mydirpath .'/wp-includes/version.php' ;
 
-$modversion['name'] = ucfirst($mydirname) . ' ' . constant('_MI_XPRESS_NAME') ;
-$modversion['description'] = constant( '_MI_XPRESS_DESC');
+$modversion['name'] = ucfirst($mydirname) . ' ' . constant('_MI_XP2_NAME') ;
+$modversion['description'] = constant( '_MI_XP2_DESC');
 $modversion['version'] = "2.00";
 $modversion['credits'] = "Wordpress DEV (http://wordpress.org/) XPressME DEV Toemon) (http://www.toemon.com) ;";
@@ -40,5 +40,5 @@
 
 // status
-$modversion['codename'] = "Bata2(r181)";
+$modversion['codename'] = "Bata2(r183)";
 
 // onInstall, onUpdate, onUninstall
@@ -87,13 +87,13 @@
 	global $current_user;
 	if (@$current_user->user_level > 0) {
-	$modversion['sub'][1]['name'] = constant( '_MI_XPRESS_MENU_POST_NEW');
+	$modversion['sub'][1]['name'] = constant( '_MI_XP2_MENU_POST_NEW');
 	$modversion['sub'][1]['url'] = "wp-admin/post-new.php";
-	$modversion['sub'][2]['name'] = constant( '_MI_XPRESS_MENU_EDIT');
+	$modversion['sub'][2]['name'] = constant( '_MI_XP2_MENU_EDIT');
 	$modversion['sub'][2]['url'] = "wp-admin/edit.php";
-	$modversion['sub'][3]['name'] = constant( '_MI_XPRESS_MENU_ADMIN');
+	$modversion['sub'][3]['name'] = constant( '_MI_XP2_MENU_ADMIN');
 	$modversion['sub'][3]['url'] = "wp-admin/";
 	}
 	if (@$current_user->user_level > 9) {
-	$modversion['sub'][4]['name'] = constant( '_MI_XPRESS_MENU_XPRESS');
+	$modversion['sub'][4]['name'] = constant( '_MI_XP2_MENU_XPRESS');
 	$modversion['sub'][4]['url'] = "wp-admin/options-general.php?page=xpressme_config";
 	}
@@ -115,5 +115,5 @@
 $modversion['blocks'][$b_no] = array(
 	'file' 			=> 'recent_posts_content_block.php' ,
-	'name' 			=> constant('_MI_XPRESS_BLOCK_CONTENT') ,
+	'name' 			=> constant('_MI_XP2_BLOCK_CONTENT') ,
 	'description'	=> '' ,
 	'show_func' 	=> "b_". $mydirname . "_content_show" ,
@@ -127,5 +127,5 @@
 $modversion['blocks'][$b_no] = array(
 	'file' 			=> 'recent_posts_list_block.php' ,
-	'name' 			=> constant('_MI_XPRESS_BLOCK_POSTS') ,
+	'name' 			=> constant('_MI_XP2_BLOCK_POSTS') ,
 	'description'	=> '' ,
 	'show_func' 	=> "b_". $mydirname . "_posts_show" ,
@@ -138,5 +138,5 @@
 $modversion['blocks'][$b_no] = array(
 	'file' 			=> 'popular_posts_block.php' ,
-	'name' 			=> constant('_MI_XPRESS_BLOCK_POPULAR') ,
+	'name' 			=> constant('_MI_XP2_BLOCK_POPULAR') ,
 	'description'	=> '' ,
 	'show_func' 	=> "b_". $mydirname . "_popular_show" ,
@@ -149,5 +149,5 @@
 $modversion['blocks'][$b_no] = array(
 	'file' 			=> 'page_block.php' ,
-	'name' 			=> constant('_MI_XPRESS_BLOCK_PAGE') ,
+	'name' 			=> constant('_MI_XP2_BLOCK_PAGE') ,
 	'description'	=> '' ,
 	'show_func' 	=> "b_". $mydirname . "_page_show" ,
@@ -160,5 +160,5 @@
 $modversion['blocks'][$b_no] = array(
 	'file' 			=> 'recent_comments_block.php' ,
-	'name' 			=> constant('_MI_XPRESS_BLOCK_COMMENTS') ,
+	'name' 			=> constant('_MI_XP2_BLOCK_COMMENTS') ,
 	'description'	=> '' ,
 	'show_func' 	=> "b_". $mydirname . "_comments_show" ,
@@ -172,5 +172,5 @@
 $modversion['blocks'][$b_no] = array(
 	'file' 			=> 'sidebar_block.php' ,
-	'name' 			=> constant('_MI_XPRESS_BLOCK_SIDEBAR') ,
+	'name' 			=> constant('_MI_XP2_BLOCK_SIDEBAR') ,
 	'description'	=> '' ,
 	'show_func' 	=> "b_". $mydirname . "_sidebar_show" ,
@@ -183,5 +183,5 @@
 $modversion['blocks'][$b_no] = array(
 	'file' 			=> 'search_block.php' ,
-	'name' 			=> constant('_MI_XPRESS_BLOCK_SEARCH') ,
+	'name' 			=> constant('_MI_XP2_BLOCK_SEARCH') ,
 	'description'	=> '' ,
 	'show_func' 	=> "b_". $mydirname . "_search_show" ,
@@ -194,5 +194,5 @@
 $modversion['blocks'][$b_no] = array(
 	'file' 			=> 'calender_block.php' ,
-	'name' 			=> constant('_MI_XPRESS_BLOCK_CALENDER') ,
+	'name' 			=> constant('_MI_XP2_BLOCK_CALENDER') ,
 	'description'	=> '' ,
 	'show_func' 	=> "b_". $mydirname . "_calender_show" ,
@@ -205,5 +205,5 @@
 $modversion['blocks'][$b_no] = array(
 	'file' 			=> 'archives_block.php' ,
-	'name' 			=> constant('_MI_XPRESS_BLOCK_ARCHIVE') ,
+	'name' 			=> constant('_MI_XP2_BLOCK_ARCHIVE') ,
 	'description'	=> '' ,
 	'show_func' 	=> "b_". $mydirname . "_archives_show" ,
@@ -216,5 +216,5 @@
 $modversion['blocks'][$b_no] = array(
 	'file' 			=> 'authors_block.php' ,
-	'name' 			=> constant('_MI_XPRESS_BLOCK_AUTHORS') ,
+	'name' 			=> constant('_MI_XP2_BLOCK_AUTHORS') ,
 	'description'	=> '' ,
 	'show_func' 	=> "b_". $mydirname . "_authors_show" ,
@@ -227,5 +227,5 @@
 $modversion['blocks'][$b_no] = array(
 	'file' 			=> 'tag_cloud_block.php' ,
-	'name' 			=> constant('_MI_XPRESS_BLOCK_TAG') ,
+	'name' 			=> constant('_MI_XP2_BLOCK_TAG') ,
 	'description'	=> '' ,
 	'show_func' 	=> "b_". $mydirname . "_tag_cloud_show" ,
@@ -238,5 +238,5 @@
 $modversion['blocks'][$b_no] = array(
 	'file' 			=> 'category_block.php' ,
-	'name' 			=> constant('_MI_XPRESS_BLOCK_CATEGORY') ,
+	'name' 			=> constant('_MI_XP2_BLOCK_CATEGORY') ,
 	'description'	=> '' ,
 	'show_func' 	=> "b_". $mydirname . "_category_show" ,
@@ -249,5 +249,5 @@
 $modversion['blocks'][$b_no] = array(
 	'file' 			=> 'meta_block.php' ,
-	'name' 			=> constant('_MI_XPRESS_BLOCK_META') ,
+	'name' 			=> constant('_MI_XP2_BLOCK_META') ,
 	'description'	=> '' ,
 	'show_func' 	=> "b_". $mydirname . "_meta_show" ,
@@ -260,5 +260,5 @@
 $modversion['blocks'][$b_no] = array(
 	'file' 			=> 'widget_block.php' ,
-	'name' 			=> constant('_MI_XPRESS_BLOCK_WIDGET') ,
+	'name' 			=> constant('_MI_XP2_BLOCK_WIDGET') ,
 	'description'	=> '' ,
 	'show_func' 	=> "b_". $mydirname . "_widget_show" ,
@@ -271,5 +271,5 @@
 $modversion['blocks'][$b_no] = array(
 	'file' 			=> 'enhanced_block.php' ,
-	'name' 			=> constant('_MI_XPRESS_BLOCK_ENHANCED') ,
+	'name' 			=> constant('_MI_XP2_BLOCK_ENHANCED') ,
 	'description'	=> '' ,
 	'show_func' 	=> "b_". $mydirname . "_enhanced_show" ,
@@ -289,12 +289,12 @@
 		array(
 			'name' => 'global' ,
-			'title' => constant('_MI_XPRESS_NOTCAT_GLOBAL') ,
-			'description' => constant('_MI_XPRESS_NOTCAT_GLOBALDSC') ,
+			'title' => constant('_MI_XP2_NOTCAT_GLOBAL') ,
+			'description' => constant('_MI_XP2_NOTCAT_GLOBALDSC') ,
 			'subscribe_from' => 'index.php' ,
 		) ,
 		array(
 			'name' => 'category' ,
-			'title' => constant('_MI_XPRESS_NOTCAT_CAT') ,
-			'description' => constant('_MI_XPRESS_NOTCAT_CATDSC') ,
+			'title' => constant('_MI_XP2_NOTCAT_CAT') ,
+			'description' => constant('_MI_XP2_NOTCAT_CATDSC') ,
 			'subscribe_from' => 'index.php' ,
 			'item_name' => 'cat' ,
@@ -303,6 +303,6 @@
 		array(
 			'name' => 'author' ,
-			'title' => constant('_MI_XPRESS_NOTCAT_AUTHOR') ,
-			'description' => constant('_MI_XPRESS_NOTCAT_AUTHORDSC') ,
+			'title' => constant('_MI_XP2_NOTCAT_AUTHOR') ,
+			'description' => constant('_MI_XP2_NOTCAT_AUTHORDSC') ,
 			'subscribe_from' => 'index.php' ,
 			'item_name' => 'author' ,
@@ -311,6 +311,6 @@
 		array(
 			'name' => 'post' ,
-			'title' => constant('_MI_XPRESS_NOTCAT_POST') ,
-			'description' => constant('_MI_XPRESS_NOTCAT_POSTDSC') ,
+			'title' => constant('_MI_XP2_NOTCAT_POST') ,
+			'description' => constant('_MI_XP2_NOTCAT_POSTDSC') ,
 			'subscribe_from' => 'index.php' ,
 			'item_name' => 'p' ,
@@ -322,9 +322,9 @@
 			'name' => 'waiting' ,
 			'category' => 'global' ,
-			'title' => constant('_MI_XPRESS_NOTIFY_GLOBAL_WAITING') ,
-			'caption' => constant('_MI_XPRESS_NOTIFY_GLOBAL_WAITINGCAP') ,
-			'description' => constant('_MI_XPRESS_NOTIFY_GLOBAL_WAITINGCAP') ,
+			'title' => constant('_MI_XP2_NOTIFY_GLOBAL_WAITING') ,
+			'caption' => constant('_MI_XP2_NOTIFY_GLOBAL_WAITINGCAP') ,
+			'description' => constant('_MI_XP2_NOTIFY_GLOBAL_WAITINGCAP') ,
 			'mail_template' => 'global_waiting' ,
-			'mail_subject' => constant('_MI_XPRESS_NOTIFY_GLOBAL_WAITINGSBJ') ,
+			'mail_subject' => constant('_MI_XP2_NOTIFY_GLOBAL_WAITINGSBJ') ,
 			'admin_only' => 1 ,
 		) ,
@@ -332,18 +332,18 @@
 			'name' => 'newpost' ,
 			'category' => 'global' ,
-			'title' => constant('_MI_XPRESS_NOTIFY_GLOBAL_NEWPOST') ,
-			'caption' => constant('_MI_XPRESS_NOTIFY_GLOBAL_NEWPOSTCAP') ,
-			'description' => constant('_MI_XPRESS_NOTIFY_GLOBAL_NEWPOSTCAP') ,
+			'title' => constant('_MI_XP2_NOTIFY_GLOBAL_NEWPOST') ,
+			'caption' => constant('_MI_XP2_NOTIFY_GLOBAL_NEWPOSTCAP') ,
+			'description' => constant('_MI_XP2_NOTIFY_GLOBAL_NEWPOSTCAP') ,
 			'mail_template' => 'global_newpost' ,
-			'mail_subject' => constant('_MI_XPRESS_NOTIFY_GLOBAL_NEWPOSTSBJ') ,
+			'mail_subject' => constant('_MI_XP2_NOTIFY_GLOBAL_NEWPOSTSBJ') ,
 		) ,
 		array(
 			'name' => 'comment' ,
 			'category' => 'global' ,
-			'title' => constant('_MI_XPRESS_NOTIFY_GLOBAL_NEWCOMMENT') ,
-			'caption' => constant('_MI_XPRESS_NOTIFY_GLOBAL_NEWCOMMENTCAP') ,
-			'description' => constant('_MI_XPRESS_NOTIFY_GLOBAL_NEWCOMMENTCAP') ,
+			'title' => constant('_MI_XP2_NOTIFY_GLOBAL_NEWCOMMENT') ,
+			'caption' => constant('_MI_XP2_NOTIFY_GLOBAL_NEWCOMMENTCAP') ,
+			'description' => constant('_MI_XP2_NOTIFY_GLOBAL_NEWCOMMENTCAP') ,
 			'mail_template' => 'global_newcomment' ,
-			'mail_subject' => constant('_MI_XPRESS_NOTIFY_GLOBAL_NEWCOMMENTSBJ') ,
+			'mail_subject' => constant('_MI_XP2_NOTIFY_GLOBAL_NEWCOMMENTSBJ') ,
 		) ,
 		
@@ -351,18 +351,18 @@
 			'name' => 'newpost' ,
 			'category' => 'category' ,
-			'title' => constant('_MI_XPRESS_NOTIFY_CAT_NEWPOST') ,
-			'caption' => constant('_MI_XPRESS_NOTIFY_CAT_NEWPOSTCAP') ,
-			'description' => constant('_MI_XPRESS_NOTIFY_CAT_NEWPOSTCAP') ,
+			'title' => constant('_MI_XP2_NOTIFY_CAT_NEWPOST') ,
+			'caption' => constant('_MI_XP2_NOTIFY_CAT_NEWPOSTCAP') ,
+			'description' => constant('_MI_XP2_NOTIFY_CAT_NEWPOSTCAP') ,
 			'mail_template' => 'category_newpost' ,
-			'mail_subject' => constant('_MI_XPRESS_NOTIFY_CAT_NEWPOSTSBJ') ,
+			'mail_subject' => constant('_MI_XP2_NOTIFY_CAT_NEWPOSTSBJ') ,
 		) ,
 		array(
 			'name' => 'comment' ,
 			'category' => 'category' ,
-			'title' => constant('_MI_XPRESS_NOTIFY_CAT_NEWCOMMENT') ,
-			'caption' => constant('_MI_XPRESS_NOTIFY_CAT_NEWCOMMENTCAP') ,
-			'description' => constant('_MI_XPRESS_NOTIFY_CAT_NEWCOMMENTCAP') ,
+			'title' => constant('_MI_XP2_NOTIFY_CAT_NEWCOMMENT') ,
+			'caption' => constant('_MI_XP2_NOTIFY_CAT_NEWCOMMENTCAP') ,
+			'description' => constant('_MI_XP2_NOTIFY_CAT_NEWCOMMENTCAP') ,
 			'mail_template' => 'category_newcomment' ,
-			'mail_subject' => constant('_MI_XPRESS_NOTIFY_CAT_NEWCOMMENTSBJ') ,
+			'mail_subject' => constant('_MI_XP2_NOTIFY_CAT_NEWCOMMENTSBJ') ,
 		) ,
 
@@ -370,18 +370,18 @@
 			'name' => 'newpost' ,
 			'category' => 'author' ,
-			'title' => constant('_MI_XPRESS_NOTIFY_AUT_NEWPOST') ,
-			'caption' => constant('_MI_XPRESS_NOTIFY_AUT_NEWPOSTCAP') ,
-			'description' => constant('_MI_XPRESS_NOTIFY_AUT_NEWPOSTCAP') ,
+			'title' => constant('_MI_XP2_NOTIFY_AUT_NEWPOST') ,
+			'caption' => constant('_MI_XP2_NOTIFY_AUT_NEWPOSTCAP') ,
+			'description' => constant('_MI_XP2_NOTIFY_AUT_NEWPOSTCAP') ,
 			'mail_template' => 'author_newpost' ,
-			'mail_subject' => constant('_MI_XPRESS_NOTIFY_AUT_NEWPOSTSBJ') ,
+			'mail_subject' => constant('_MI_XP2_NOTIFY_AUT_NEWPOSTSBJ') ,
 		) ,
 		array(
 			'name' => 'comment' ,
 			'category' => 'author' ,
-			'title' => constant('_MI_XPRESS_NOTIFY_AUT_NEWCOMMENT') ,
-			'caption' => constant('_MI_XPRESS_NOTIFY_AUT_NEWCOMMENTCAP') ,
-			'description' => constant('_MI_XPRESS_NOTIFY_AUT_NEWCOMMENTCAP') ,
+			'title' => constant('_MI_XP2_NOTIFY_AUT_NEWCOMMENT') ,
+			'caption' => constant('_MI_XP2_NOTIFY_AUT_NEWCOMMENTCAP') ,
+			'description' => constant('_MI_XP2_NOTIFY_AUT_NEWCOMMENTCAP') ,
 			'mail_template' => 'author_newcomment' ,
-			'mail_subject' => constant('_MI_XPRESS_NOTIFY_AUT_NEWCOMMENTSBJ') ,
+			'mail_subject' => constant('_MI_XP2_NOTIFY_AUT_NEWCOMMENTSBJ') ,
 		) ,
 
@@ -389,9 +389,9 @@
 			'name' => 'comment' ,
 			'category' => 'post' ,
-			'title' => constant('_MI_XPRESS_NOTIFY_POST_NEWCOMMENT') ,
-			'caption' => constant('_MI_XPRESS_NOTIFY_POST_NEWCOMMENTCAP') ,
-			'description' => constant('_MI_XPRESS_NOTIFY_POST_NEWCOMMENTCAP') ,
+			'title' => constant('_MI_XP2_NOTIFY_POST_NEWCOMMENT') ,
+			'caption' => constant('_MI_XP2_NOTIFY_POST_NEWCOMMENTCAP') ,
+			'description' => constant('_MI_XP2_NOTIFY_POST_NEWCOMMENTCAP') ,
 			'mail_template' => 'post_newcomment' ,
-			'mail_subject' => constant('_MI_XPRESS_NOTIFY_POST_NEWCOMMENTSBJ') ,
+			'mail_subject' => constant('_MI_XP2_NOTIFY_POST_NEWCOMMENTSBJ') ,
 		) ,
 	) ,