Index: trunk/admin/block_check.php
===================================================================
--- trunk/admin/block_check.php	(revision 170)
+++ 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 170)
+++ 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 170)
+++ 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";