# HG changeset patch
# User t_mrc-ct@sourceforge.jp
# Date 1349094690 -32400
# Branch GECKO17011esr_2013111808_RELBRANCH
# Node ID 4a2bb2bdddc0eea9b55d84517883b24c75326ec1
# Parent  1d65c02ad70dbc578898ef48626151a12a11f485
update checker re-enabled (with v17 fix)

diff --git a/mail/base/content/aboutDialog.js b/mail/base/content/aboutDialog.js
--- a/mail/base/content/aboutDialog.js
+++ b/mail/base/content/aboutDialog.js
@@ -297,17 +297,17 @@
       quit(Components.interfaces.nsIAppStartup.eAttemptQuit |
            Components.interfaces.nsIAppStartup.eRestart);
       return;
     }
 
     const URI_UPDATE_PROMPT_DIALOG = "chrome://mozapps/content/update/updates.xul";
     // Thunderbird no longer displays a license for updates and the licenseURL check
     // is just in case a distibution does.
-    if (this.update && (this.update.billboardURL || this.update.licenseURL ||
+    if (this.update && (this.update.billboardURL || this.update.licenseURL || this.update.selectedPatch == null || 
         this.addons.length != 0)) {
       var ary = toXPCOMArray([this.update],
         Components.interfaces.nsIMutableArray);
       var openFeatures = "chrome,centerscreen,dialog=no,resizable=no,titlebar,toolbar=no";
       Services.ww.openWindow(null, URI_UPDATE_PROMPT_DIALOG, "", openFeatures, ary);
       window.close();
       return;
     }
@@ -509,16 +509,23 @@
 
     this.aus.pauseDownload();
     let state = this.aus.downloadUpdate(this.update, false);
     if (state == "failed") {
       this.selectPanel("downloadFailed");      
       return;
     }
 
+    if(this.update.selectedPatch == null)
+	{
+	this.selectPanel("updateButtonBox");
+	this.setupUpdateButton("update.openUpdateUI." +
+		(this.isMajor ? "upgradeButton" : "applyButton"));
+	}
+
     this.downloadStatus = document.getElementById("downloadStatus");
     this.downloadStatus.value =
       DownloadUtils.getTransferTotal(0, this.update.selectedPatch.size);
     this.selectPanel("downloading");
     this.aus.addDownloadListener(this);
   },
 
   removeDownloadListener: function() {
diff --git a/mail/branding/aurora/thunderbird-branding.js b/mail/branding/aurora/thunderbird-branding.js
--- a/mail/branding/aurora/thunderbird-branding.js
+++ b/mail/branding/aurora/thunderbird-branding.js
@@ -33,9 +33,9 @@
 #pref("app.releaseNotesURL", );
 #pref("app.support.baseURL", );
 #pref("app.update.url.details", );
 pref("app.update.url.manual", "http://en.sourceforge.jp/projects/tenfourbird/releases/");
 pref("app.update.url.override","http://tenfourbird.sourceforge.jp/update/1/check.php?name=%DISTRIBUTION%&version=%DISTRIBUTION_VERSION%");
 
 # pref("mail.instrumentation.postUrl", );
 
-pref("tenfourbird.update.url.download", "http://tenfourbird.sourceforge.jp/update/1/download.php?name=%DISTRIBUTION%&version=%DISTRIBUTION_VERSION%");
\ No newline at end of file
+pref("tenfourbird.update.url.download", "http://tenfourbird.sourceforge.jp/update/1/download.php?name=%DISTRIBUTION%&version=%UPDATE_VERSION%");
\ No newline at end of file
diff --git a/mail/locales/en-US/chrome/messenger/messenger.properties b/mail/locales/en-US/chrome/messenger/messenger.properties
--- a/mail/locales/en-US/chrome/messenger/messenger.properties
+++ b/mail/locales/en-US/chrome/messenger/messenger.properties
@@ -662,25 +662,25 @@
 # displayed one at a time. So, if a button is displayed nothing else will
 # be displayed alongside of the button. The button when displayed is located
 # directly under the Thunderbird version in the about dialog (see bug 596813 for
 # screenshots).
 update.checkInsideButton.label=Check for Updates
 update.checkInsideButton.accesskey=C
 update.resumeButton.label=Resume Downloading %S…
 update.resumeButton.accesskey=D
-update.openUpdateUI.applyButton.label=Apply Update…
+update.openUpdateUI.applyButton.label=Get Minor Update…
 update.openUpdateUI.applyButton.accesskey=A
-update.restart.updateButton.label=Restart to Update
+update.restart.updateButton.label=Get Minor Update
 update.restart.updateButton.accesskey=R
 update.restart.restartButton.label=Update & Restart
 update.restart.restartButton.accesskey=R
-update.openUpdateUI.upgradeButton.label=Upgrade Now…
+update.openUpdateUI.upgradeButton.label=Get Major Upgrade…
 update.openUpdateUI.upgradeButton.accesskey=U
-update.restart.upgradeButton.label=Upgrade Now
+update.restart.upgradeButton.label=Get Major Upgrade
 update.restart.upgradeButton.accesskey=U
 
 websearch.setDefault=Set this search engine as the default
 websearch.isDefault=This search engine is currently the default
 
 # missing plugin installer
 missingpluginsMessage.title=Additional plugins are required to display all the media on this page.
 missingpluginsMessage.button.label=Install Missing Plugins…
diff --git a/mail/locales/jar.mn b/mail/locales/jar.mn
--- a/mail/locales/jar.mn
+++ b/mail/locales/jar.mn
@@ -182,16 +182,17 @@
   locale/@AB_CD@/messenger/chat.dtd                                     (%chrome/messenger/chat.dtd)
   locale/@AB_CD@/messenger/chat.properties                              (%chrome/messenger/chat.properties)
   locale/@AB_CD@/messenger/addbuddy.dtd                                 (%chrome/messenger/addbuddy.dtd)
   locale/@AB_CD@/messenger/joinChat.dtd                                 (%chrome/messenger/joinChat.dtd)
   locale/@AB_CD@/messenger/imAccounts.dtd                               (%chrome/messenger/imAccounts.dtd)
   locale/@AB_CD@/messenger/imAccounts.properties                        (%chrome/messenger/imAccounts.properties)
   locale/@AB_CD@/messenger/imAccountWizard.dtd                          (%chrome/messenger/imAccountWizard.dtd)
   locale/@AB_CD@/messenger/sanitize.dtd									(%chrome/messenger/sanitize.dtd)
+  locale/@AB_CD@/messenger/updatesOverlay.dtd				(%chrome/messenger/updatesOverlay.dtd)
 % locale messenger-mapi @AB_CD@ %locale/@AB_CD@/messenger-mapi/
   locale/@AB_CD@/messenger-mapi/mapi.properties                         (%chrome/messenger-mapi/mapi.properties)
 % locale messenger-newsblog @AB_CD@ %locale/@AB_CD@/messenger-newsblog/
   locale/@AB_CD@/messenger-newsblog/newsblog.properties                 (%chrome/messenger-newsblog/newsblog.properties)
   locale/@AB_CD@/messenger-newsblog/feed-subscriptions.dtd              (%chrome/messenger-newsblog/feed-subscriptions.dtd)
   locale/@AB_CD@/messenger-newsblog/am-newsblog.dtd                     (%chrome/messenger-newsblog/am-newsblog.dtd)
 % locale messenger-smime @AB_CD@ %locale/@AB_CD@/messenger-smime/
   locale/@AB_CD@/messenger-smime/msgCompSMIMEOverlay.dtd                (%chrome/messenger-smime/msgCompSMIMEOverlay.dtd)
