# HG changeset patch
# User t_mrc-ct@sourceforge.jp
# Date 1349094690 -32400
# Branch GECKO1708_2013080114_RELBRANCH
# Node ID 5a9f055eb7f80a6ca0a5f670925d4fd05efbb4a4
# Parent  218d238ce38cc701e7e4dc9086a0e0175dd9a5e5
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
@@ -302,7 +302,7 @@
     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);
@@ -514,6 +514,13 @@
       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);
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
@@ -38,4 +38,4 @@
 
 # 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
@@ -667,15 +667,15 @@
 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
diff --git a/mail/locales/jar.mn b/mail/locales/jar.mn
--- a/mail/locales/jar.mn
+++ b/mail/locales/jar.mn
@@ -187,6 +187,7 @@
   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/
