Index: /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/class-xpress-upgrader.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/class-xpress-upgrader.php	(revision 703)
+++ /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/class-xpress-upgrader.php	(revision 704)
@@ -5,11 +5,11 @@
 
 	function upgrade_strings() {
-		$this->strings['up_to_date'] = __('XPressME Integration Kit is at the latest version.');
-		$this->strings['no_package'] = __('Upgrade package not available.');
-		$this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>&#8230;');
-		$this->strings['unpack_package'] = __('Unpacking the update&#8230;');
-		$this->strings['copy_failed'] = __('Could not copy files.');
-		$this->strings['make_config'] = __('Delete source wp-config.php.');
-		$this->strings['delete_failed'] = __('Could not delete files.');
+		$this->strings['up_to_date'] = __('XPressME Integration Kit is at the latest version.', 'xpressme');
+		$this->strings['no_package'] = __('Upgrade package not available.', 'xpressme');
+		$this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>&#8230;', 'xpressme');
+		$this->strings['unpack_package'] = __('Unpacking the update&#8230;', 'xpressme');
+		$this->strings['copy_failed'] = __('Could not copy files.', 'xpressme');
+		$this->strings['make_config'] = __('Delete source wp-config.php.', 'xpressme');
+		$this->strings['delete_failed'] = __('Could not delete files.', 'xpressme');
 	}
 
Index: /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/update_xpress.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/update_xpress.php	(revision 703)
+++ /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/update_xpress.php	(revision 704)
@@ -30,5 +30,5 @@
 function update_xpress($from, $to) {
 	global $wp_filesystem, $_old_xpress_files, $wpdb;
-	show_message( __('Disable overwrite of wp-config.php...') );
+	show_message( __('Disable overwrite of wp-config.php...', 'xpressme') );
 	// remove wp-config.php from the new version into place.
 	$wp_config = $from . 'wp-config.php';
@@ -38,5 +38,5 @@
 
 	// Copy new versions of XPressME Integration Kit files into place.
-	show_message( __('Copy new versions of XPressME Integration Kit files into place...') );
+	show_message( __('Copy new versions of XPressME Integration Kit files into place...', 'xpressme') );
 	$result = copy_dir($from . $distro, $to);
 	if ( is_wp_error($result) ) {
@@ -47,5 +47,5 @@
 
 	// Remove old files
-	show_message( __('Remove an unnecessary, old file...') );
+	show_message( __('Remove an unnecessary, old file...', 'xpressme') );
 	foreach ( $_old_xpress_files as $old_file ) {
 		$old_file = $to . $old_file;
@@ -54,10 +54,10 @@
 		$wp_filesystem->delete($old_file, true);
 	}
-	show_message( __('Set templates directory chmod 777') );
+	show_message( __('Set templates directory chmod 777', 'xpressme') );
 	$wp_filesystem->chmod($to . 'templates/', 0777);
 
 	// Remove working directory
 	$working_dir = dirname(dirname($from));
-	show_message( sprintf(__('Remove working directory(%s)...'),$working_dir) );
+	show_message( sprintf(__('Remove working directory(%s)...', 'xpressme'),$working_dir) );
 	$wp_filesystem->delete($working_dir, true);
 
Index: /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_upgrade.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_upgrade.php	(revision 703)
+++ /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_upgrade.php	(revision 704)
@@ -32,5 +32,5 @@
 		} else if (version_compare($xpress_version, $latest_version, '<')) {
 			echo '<h3 class="response">';
-			_e( 'An updated version of XPressME Integration Kit is available.' );
+			_e( 'An updated version of XPressME Integration Kit is available.', 'xpressme' );
 			echo '</h3>';
 
@@ -40,6 +40,6 @@
 				$download_diff .='</a>';
 			}
-			$message = 	sprintf(__('You can update to XPressME Integration Kit Ver %s</a> automatically or download the package and install it manually:'), $latest_version);
-			$submit = __('Update Automatically');
+			$message = 	sprintf(__('You can update to XPressME Integration Kit Ver %s</a> automatically or download the package and install it manually:', 'xpressme'), $latest_version);
+			$submit = __('Update Automatically', 'xpressme');
 			$form_action = 'admin.php?page=upgrade_page&action=do-xpress-upgrade';
 			$download = sprintf(__('Download %s', 'xpressme') , $latest_version);
@@ -48,9 +48,9 @@
 		} else {
 			echo '<h3>';
-			printf(__('You have the latest version of XPressME Integration Kit Ver.%s.'),$xpress_version);
+			printf(__('You have the latest version of XPressME Integration Kit Ver.%s.', 'xpressme'),$xpress_version);
 			echo '</h3>';
 
 			$message = __('You have the latest version of XPressME Integration Kit. You do not need to upgrade', 'xpressme');
-			$submit = __('Re-install Automatically');
+			$submit = __('Re-install Automatically', 'xpressme');
 			$form_action = 'update-core.php?action=do-core-reinstall';
 
@@ -70,5 +70,5 @@
 			$develop_show = true;
 			$develop_package=$latest['develop_package'];
-			$develop_submit = __('Update Automatically');
+			$develop_submit = __('Update Automatically', 'xpressme');
 			$develop_download = sprintf(__('Download %s', 'xpressme') , $develop_latest_version);
 			$develop_download_diff = '';
@@ -127,11 +127,15 @@
 
 function do_xpress_upgrade( $develop = false,$reinstall = false ) {
-	global $wp_filesystem;
+	global $wp_filesystem,$xoops_config;
 
 	if ( $reinstall )
-		$url = 'update-xpress.php?action=do-xpress-reinstall';
-	else
-		$url = 'update-xpress.php?action=do-xpress-upgrade';
-	$url = wp_nonce_url($url, 'upgrade-xpress');
+		$url = 'admin.php?page=upgrade_page&action=do-xpress-reinstall';
+	else {
+		if(!$develop)
+			$url = 'admin.php?page=upgrade_page&action=do-xpress-upgrade';
+		else
+			$url = 'admin.php?page=upgrade_page&action=do-xpress-develop_upgrade';
+		$url = wp_nonce_url($url, 'upgrade-xpress');
+	}
 	if ( false === ($credentials = request_filesystem_credentials($url, '', false, ABSPATH)) )
 		return;
@@ -153,5 +157,5 @@
 	<div class="wrap">
 	<?php screen_icon(); ?>
-	<h2><?php _e('Update XPressME Integration Kit'); ?></h2>
+	<h2><?php _e('Update XPressME Integration Kit', 'xpressme'); ?></h2>
 <?php
 	if ( $wp_filesystem->errors->get_error_code() ) {
@@ -170,8 +174,10 @@
 		show_message($result);
 		if ('up_to_date' != $result->get_error_code() )
-			show_message( __('Installation Failed') );
+			show_message( __('Installation Failed', 'xpressme') );
 	} else {
-		show_message( __('XPressME Integration Kit updated successfully') );
-		$update_url = 'http://localhost/cube/modules/xp_test/admin/update.php';
+		show_message( __('XPressME Integration Kit files updated successfully', 'xpressme') );
+		show_message( __('Please update the module. ', 'xpressme') );
+		
+		$update_url = $xoops_config->->module_url .'/admin/update.php';
 		show_message( '<strong>' . __('Actions:') . '</strong> <a href="' . esc_url( $update_url ) . '">' . __('Go to Module Update') . '</a>' );
 	}
@@ -185,5 +191,5 @@
 {
 	if ( ! current_user_can('update_plugins') )
-	wp_die(__('You do not have sufficient permissions to update XPressME Integration Kit for this site.'));
+	wp_die(__('You do not have sufficient permissions to update XPressME Integration Kit for this site.', 'xpressme'));
 	$action = isset($_GET['action']) ? $_GET['action'] : 'upgrade-xpress';
 	$upgrade_error = false;