Bug 811770 Use a different wordmark and possibly other branding changes for Thunderbird 17 ESR. r=mconley,a=Standard8
authorMark Banner <bugzilla@standard8.plus.com>
Fri, 16 Nov 2012 16:21:14 +0000
changeset 13566 1fb7584b40643a2f31a8b8bbf0300266b8a0bddf
parent 13565 4637e35f46285cfb48b32f5f3af149a2edfb3994
child 13567 eb0c58775b654fe2fe60d6e839300aefb09181ab
child 13569 9a900ad13ac9700cce0b86464149f985d5c0a62e
child 13570 06f49c3a208a02efeb310c28ba90752f7f1aec18
push id5
push userbugzilla@standard8.plus.com
push dateFri, 16 Nov 2012 16:21:30 +0000
reviewersmconley, Standard8
bugs811770
Bug 811770 Use a different wordmark and possibly other branding changes for Thunderbird 17 ESR. r=mconley,a=Standard8
mail/app/profile/all-thunderbird.js
mail/branding/aurora/thunderbird-branding.js
mail/branding/nightly/thunderbird-branding.js
other-licenses/branding/thunderbird/content/about-wordmark.png
other-licenses/branding/thunderbird/thunderbird-branding.js
--- a/mail/app/profile/all-thunderbird.js
+++ b/mail/app/profile/all-thunderbird.js
@@ -133,19 +133,16 @@ pref("app.update.idletime", 60);
 // which tells users what's new in this new update.
 pref("app.update.showInstalledUI", false);
 
 // Whether or not to attempt using the service for updates.
 #ifdef MOZ_MAINTENANCE_SERVICE
 pref("app.update.service.enabled", true);
 #endif
 
-// Release notes URL
-pref("app.releaseNotesURL", "http://live.mozillamessaging.com/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
-
 // Base URL for web-based support pages.
 pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/%APP%/%APPBUILDID%/");
 
 // Controls enabling of the extension system logging (can reduce performance)
 pref("extensions.logging.enabled", false);
 
 // Disables strict compatibility, making addons compatible-by-default.
 pref("extensions.strictCompatibility", false);
--- a/mail/branding/aurora/thunderbird-branding.js
+++ b/mail/branding/aurora/thunderbird-branding.js
@@ -3,16 +3,19 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Default start page
 pref("mailnews.start_page.url","https://live.mozillamessaging.com/%APP%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
 
 // start page override to load after an update
 pref("mailnews.start_page.override_url","https://live.mozillamessaging.com/%APP%/whatsnew?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
 
+// Release notes URL
+pref("app.releaseNotesURL", "http://live.mozillamessaging.com/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
+
 // Interval: Time between checks for a new version (in seconds)
 // nightly=8 hours, official=24 hours
 pref("app.update.interval", 28800);
 
 // The time interval between the downloading of mar file chunks in the
 // background (in seconds)
 pref("app.update.download.backgroundInterval", 60);
 
--- a/mail/branding/nightly/thunderbird-branding.js
+++ b/mail/branding/nightly/thunderbird-branding.js
@@ -3,16 +3,19 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Default start page
 pref("mailnews.start_page.url","https://live.mozillamessaging.com/%APP%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
 
 // start page override to load after an update
 pref("mailnews.start_page.override_url","https://live.mozillamessaging.com/%APP%/whatsnew?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
 
+// Release notes URL
+pref("app.releaseNotesURL", "http://live.mozillamessaging.com/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
+
 // Interval: Time between checks for a new version (in seconds)
 // nightly=1 hour, official=24 hours
 pref("app.update.interval", 3600);
 
 // The time interval between the downloading of mar file chunks in the
 // background (in seconds)
 pref("app.update.download.backgroundInterval", 60);
 
index fa449f5b3605c312249c2182cfb8b6f7c433b71b..e60df179937b7b9ac18c62887c86de0c01ebc40f
GIT binary patch
literal 2929
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
b{{<KTX5;&EFFvFb00000NkvXXu0mjfpV^MB
--- a/other-licenses/branding/thunderbird/thunderbird-branding.js
+++ b/other-licenses/branding/thunderbird/thunderbird-branding.js
@@ -1,13 +1,16 @@
 // Default start page
 pref("mailnews.start_page.url","https://live.mozillamessaging.com/%APP%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
 
 // start page override to load after an update
-pref("mailnews.start_page.override_url","https://live.mozillamessaging.com/%APP%/whatsnew?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
+pref("mailnews.start_page.override_url","https://live.mozillamessaging.com/%APP%/whatsnew?locale=%LOCALE%&version=%VERSION%esr&os=%OS%&buildid=%APPBUILDID%");
+
+// Release notes URL
+pref("app.releaseNotesURL", "http://live.mozillamessaging.com/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%esr&os=%OS%&buildid=%APPBUILDID%");
 
 // Interval: Time between checks for a new version (in seconds)
 // nightly=8 hours, official=24 hours
 pref("app.update.interval", 86400);
 
 // The time interval between the downloading of mar file chunks in the
 // background (in seconds)
 pref("app.update.download.backgroundInterval", 600);