From: "Edward J. Shornock" Date: Mon, 1 Feb 2010 19:16:08 +0100 Subject: fix branding in migration wizard and the addon manager Replace /Thunderbird/ with /Icedove/ Update %APP% with the respective Mozilla names so addon-checking/installing/updating will work Closes: #565559 --- mail/app/profile/all-thunderbird.js | 33 +++++++++++----------- .../en-US/chrome/messenger/accountCreation.dtd | 2 +- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/comm/mail/app/profile/all-thunderbird.js b/comm/mail/app/profile/all-thunderbird.js index db3b25d..ac240c6 100644 --- a/comm/mail/app/profile/all-thunderbird.js +++ b/comm/mail/app/profile/all-thunderbird.js @@ -98,7 +98,7 @@ pref("app.update.url", "https://aus5.moz pref("app.update.url.manual", "https://www.thunderbird.net"); // A default value for the "More information about this update" link // supplied in the "An update is available" page of the update wizard. -pref("app.update.url.details", "https://www.thunderbird.net/%LOCALE%/%APP%/releases/"); +pref("app.update.url.details", "https://www.thunderbird.net/%LOCALE%/thunderbird/releases/"); // app.update.promptWaitTime is in branding section @@ -111,14 +111,14 @@ pref("app.update.service.enabled", true) #endif // Release notes URL -pref("app.releaseNotesURL", "https://live.thunderbird.net/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&channel=%CHANNEL%&os=%OS%&buildid=%APPBUILDID%"); +pref("app.releaseNotesURL", "https://live.thunderbird.net/thunderbird/releasenotes?locale=%LOCALE%&version=%VERSION%&channel=%CHANNEL%&os=%OS%&buildid=%APPBUILDID%"); // URL for "Learn More" for Crash Reporter. pref("toolkit.crashreporter.infoURL", "https://www.mozilla.org/thunderbird/legal/privacy/#crash-reporter"); // Base URL for web-based support pages. -pref("app.support.baseURL", "https://support.thunderbird.net/%LOCALE%/%APP%/%APPBUILDID%/"); +pref("app.support.baseURL", "https://support.thunderbird.net/%LOCALE%/thunderbird/%APPBUILDID%/"); // Show error messages in error console. pref("javascript.options.showInConsole", true); @@ -165,11 +165,11 @@ pref("extensions.getAddons.cache.enabled pref("extensions.getAddons.maxResults", 15); pref("extensions.getAddons.get.url", "https://services.addons.thunderbird.net/api/v3/addons/search/?guid=%IDS%&lang=%LOCALE%"); pref("extensions.getAddons.compatOverides.url", "https://services.addons.thunderbird.net/api/v3/addons/compat-override/?guid=%IDS%&lang=%LOCALE%"); -pref("extensions.getAddons.link.url", "https://addons.thunderbird.net/%LOCALE%/%APP%/"); -pref("extensions.getAddons.recommended.url", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=thunderbird"); -pref("extensions.getAddons.search.browseURL", "https://addons.thunderbird.net/%LOCALE%/%APP%/search/?q=%TERMS%"); -pref("extensions.getAddons.search.url", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird"); -pref("extensions.webservice.discoverURL", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%"); +pref("extensions.getAddons.link.url", "https://addons.thunderbird.net/%LOCALE%/thunderbird/"); +pref("extensions.getAddons.recommended.url", "https://services.addons.thunderbird.net/%LOCALE%/thunderbird/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=thunderbird"); +pref("extensions.getAddons.search.browseURL", "https://addons.thunderbird.net/%LOCALE%/thunderbird/search/?q=%TERMS%"); +pref("extensions.getAddons.search.url", "https://services.addons.thunderbird.net/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird"); +pref("extensions.webservice.discoverURL", "https://services.addons.thunderbird.net/%LOCALE%/thunderbird/discovery/pane/%VERSION%/%OS%"); pref("extensions.getAddons.themes.browseURL", "https://addons.thunderbird.net/%LOCALE%/thunderbird/themes/?src=thunderbird"); pref("extensions.getAddons.siteRegExp", "^https://.*addons\\.thunderbird\\.net"); @@ -426,7 +426,7 @@ pref("browser.helperApps.deleteTempFileO pref("spellchecker.dictionary", ""); // Dictionary download preference -pref("spellchecker.dictionaries.download.url", "https://addons.thunderbird.net/%LOCALE%/%APP%/dictionaries/"); +pref("spellchecker.dictionaries.download.url", "https://addons.thunderbird.net/%LOCALE%/thunderbird/dictionaries/"); // profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular // mail application without any user intervention. Possible values are: @@ -747,7 +747,7 @@ pref("plugins.hide_infobar_for_carbon_fa pref("plugins.update.url", "https://www.mozilla.org/%LOCALE%/plugincheck/"); pref("plugins.update.notifyUser", false); -pref("plugins.crash.supportUrl", "https://live.thunderbird.net/%APP%/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); +pref("plugins.crash.supportUrl", "https://live.thunderbird.net/thunderbird/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); // Click-to-play has not been ported for TB yet, see bug 814168. // The default plugin state should be changed to "ask to activate" when this diff --git a/comm/mail/locales/en-US/chrome/messenger/accountCreation.dtd b/comm/mail/locales/en-US/chrome/messenger/accountCreation.dtd index 3a9c30c..65e6203 100644 --- a/comm/mail/locales/en-US/chrome/messenger/accountCreation.dtd +++ b/comm/mail/locales/en-US/chrome/messenger/accountCreation.dtd @@ -80,7 +80,7 @@ - +