diff options
Diffstat (limited to 'src/patches/icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch')
| -rw-r--r-- | src/patches/icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/src/patches/icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch b/src/patches/icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch index 9fa8507..d9062b7 100644 --- a/src/patches/icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch +++ b/src/patches/icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch @@ -16,7 +16,7 @@ diff --git a/comm/mail/app/profile/all-thunderbird.js b/comm/mail/app/profile/al 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 +@@ -73,7 +73,7 @@ pref("app.update.url", "https://aus.thun 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. @@ -25,7 +25,7 @@ index db3b25d..ac240c6 100644 // app.update.promptWaitTime is in branding section -@@ -111,14 +111,14 @@ pref("app.update.service.enabled", true) +@@ -93,17 +93,17 @@ pref("app.update.BITS.inTrialGroup", fal #endif // Release notes URL @@ -40,9 +40,13 @@ index db3b25d..ac240c6 100644 -pref("app.support.baseURL", "https://support.thunderbird.net/%LOCALE%/%APP%/%APPBUILDID%/"); +pref("app.support.baseURL", "https://support.thunderbird.net/%LOCALE%/thunderbird/%APPBUILDID%/"); + // Base url for web-based feedback pages. +-pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/%APP%/%VERSION%/"); ++pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/thunderbird/%VERSION%/"); + // Show error messages in error console. pref("javascript.options.showInConsole", true); -@@ -165,11 +165,11 @@ pref("extensions.getAddons.cache.enabled +@@ -152,11 +152,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%"); @@ -56,10 +60,10 @@ index db3b25d..ac240c6 100644 +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"); + pref("extensions.getAddons.langpacks.url", "https://services.addons.thunderbird.net/api/v3/addons/language-tools/?app=thunderbird&type=language&appversion=%VERSION%"); -@@ -426,7 +426,7 @@ pref("browser.helperApps.deleteTempFileO +@@ -403,7 +403,7 @@ pref("browser.helperApps.deleteTempFileO pref("spellchecker.dictionary", ""); // Dictionary download preference @@ -68,20 +72,11 @@ index db3b25d..ac240c6 100644 // 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 @@ +@@ -91,7 +91,7 @@ <!ENTITY changeSettings.label "Change Settings"> <!ENTITY changeSettings.accesskey "S"> |