Index: trunk/xoops_version.php
===================================================================
--- trunk/xoops_version.php	(revision 181)
+++ 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') ,
 		) ,
 	) ,