diff -u -r /tmp/sitepress-multilingual-cms/inc/translation-management/translation-management.class.php sitepress-multilingual-cms/inc/translation-management/translation-management.class.php
--- /tmp/sitepress-multilingual-cms/inc/translation-management/translation-management.class.php	2011-03-02 17:22:40.000000000 +0700
+++ sitepress-multilingual-cms/inc/translation-management/translation-management.class.php	2011-05-03 16:55:55.000000000 +0700
@@ -2457,7 +2457,7 @@
     function load_plugins_wpml_config(){
         $plugins = get_option('active_plugins');
         foreach($plugins as $p){
-            $config_file = ABSPATH . '/' . PLUGINDIR . '/' . dirname($p) . '/wpml-config.xml';
+            $config_file = WP_PLUGIN_DIR . '/' . dirname($p) . '/wpml-config.xml';
             if(trim(dirname($p),'\/.') && file_exists($config_file)){
                 $this->_parse_wpml_config($config_file);
             }
diff -u -r /tmp/sitepress-multilingual-cms/inc/upgrade_plugins.php sitepress-multilingual-cms/inc/upgrade_plugins.php
--- /tmp/sitepress-multilingual-cms/inc/upgrade_plugins.php	2011-03-02 17:22:40.000000000 +0700
+++ sitepress-multilingual-cms/inc/upgrade_plugins.php	2011-05-03 18:23:15.000000000 +0700
@@ -27,6 +27,8 @@
 
     function check_for_WPML_plugin_updates($value) {
         // called when the update_plugins transient is saved.
+
+        return $value;
         
         global $wpml_plugins, $sitepress_settings;
         
@@ -109,4 +111,4 @@
         
         return $res;
     }
-?>
\ No newline at end of file
+?>
diff -u -r /tmp/sitepress-multilingual-cms/menu/dashboard-widget.php sitepress-multilingual-cms/menu/dashboard-widget.php
--- /tmp/sitepress-multilingual-cms/menu/dashboard-widget.php	2011-03-02 17:22:40.000000000 +0700
+++ sitepress-multilingual-cms/menu/dashboard-widget.php	2011-05-03 15:20:32.000000000 +0700
@@ -22,9 +22,9 @@
 //    }
 //}
 
-$message = '<h4>' . __('WPML has turned commercial','sitepress') . '</h4><br /><p>' . __('A new version of WPML is available. This version contains important security fixes, improved performance, new and powerful features and works perfectly with WordPress 3.1.','sitepress') . '</p><br /><p><a class="button secondary" href="http://wpml.org/purchase/">' . __('Upgrade now','sitepress') . '</a> &nbsp; <a href="http://wpml.org/purchase/why-upgrade/">' . __('What\'s new and why you should upgrade &raquo;','sitepress') . '</a></p>';
+# $message = '<h4>' . __('WPML has turned commercial','sitepress') . '</h4><br /><p>' . __('A new version of WPML is available. This version contains important security fixes, improved performance, new and powerful features and works perfectly with WordPress 3.1.','sitepress') . '</p><br /><p><a class="button secondary" href="http://wpml.org/purchase/">' . __('Upgrade now','sitepress') . '</a> &nbsp; <a href="http://wpml.org/purchase/why-upgrade/">' . __('What\'s new and why you should upgrade &raquo;','sitepress') . '</a></p>';
 
-echo '<div class="icl_yellow_box">' . $message . '</div>';
+# echo '<div class="icl_yellow_box">' . $message . '</div>';
 
 $docs_sent = 0;
 $docs_completed = 0;
diff -u -r /tmp/sitepress-multilingual-cms/sitepress.php sitepress-multilingual-cms/sitepress.php
--- /tmp/sitepress-multilingual-cms/sitepress.php	2011-03-02 17:22:40.000000000 +0700
+++ sitepress-multilingual-cms/sitepress.php	2011-05-03 18:25:51.000000000 +0700
@@ -5,7 +5,7 @@
 Description: WPML Multilingual CMS. <a href="http://wpml.org">Documentation</a>.
 Author: OnTheGoSystems
 Author URI: http://www.onthegosystems.com
-Version: 2.0.4.1
+Version: 2.0.4.2
 */
 
 /*
@@ -26,17 +26,17 @@
 */
 
 if(defined('ICL_SITEPRESS_VERSION')) return;
-define('ICL_SITEPRESS_VERSION', '2.0.4.1');
+define('ICL_SITEPRESS_VERSION', '2.0.4.2');
 define('ICL_PLUGIN_PATH', dirname(__FILE__));
 define('ICL_PLUGIN_FOLDER', basename(ICL_PLUGIN_PATH));
 
 if(defined('WP_ADMIN') && defined('FORCE_SSL_ADMIN') && FORCE_SSL_ADMIN){
-    define('ICL_PLUGIN_URL', rtrim(str_replace('http://','https://',get_option('siteurl')),'/') . '/'. PLUGINDIR . '/' . basename(dirname(__FILE__)) );
+    define('ICL_PLUGIN_URL', rtrim(str_replace('http://','https://',WP_PLUGIN_URL),'/') . '/' . basename(dirname(__FILE__)) );
 }else{
-    define('ICL_PLUGIN_URL', rtrim(get_option('siteurl'),'/') . '/'. PLUGINDIR . '/' . basename(dirname(__FILE__)) );
+    define('ICL_PLUGIN_URL', WP_PLUGIN_URL . '/' . basename(dirname(__FILE__)) );
 }
 if(defined('WP_ADMIN')){
-    add_action('admin_notices', 'wpml_new_promotion_notice');
+    # add_action('admin_notices', 'wpml_new_promotion_notice');
     if (isset($_GET['action'])) {
         if ($_GET['action'] == 'wpml_new_promotion_notice_hide') {
             update_option('wpml_new_promotion_notice_show', 0);