Bug 1475799 - Follow-up: Move preferences not used by localizers from branding to prefs and update l10n tags. r=IanN a=IanN DONTBUILD SEAMONKEY_2_49_ESR_RELBRANCH
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Mon, 15 Jul 2019 18:08:20 +0200
branchSEAMONKEY_2_49_ESR_RELBRANCH
changeset 28318 9f8d76a9368bf80d151971e7756fe72e58b3e432
parent 28317 546ccdc72f035626d3e286b8b85edf98bb4b1152
child 28319 3d893021229caef57831f03b40960a4b3bc2736d
push id2136
push userfrgrahl@gmx.net
push dateMon, 15 Jul 2019 16:13:42 +0000
treeherdercomm-esr52@6b30146aa411 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN, IanN
bugs1475799
Bug 1475799 - Follow-up: Move preferences not used by localizers from branding to prefs and update l10n tags. r=IanN a=IanN DONTBUILD eaMonkey ESR52 release branch only.
suite/browser/browser-prefs.js
suite/locales/en-US/chrome/branding/brand.properties
suite/locales/en-US/chrome/mailnews/start.dtd
--- a/suite/browser/browser-prefs.js
+++ b/suite/browser/browser-prefs.js
@@ -359,17 +359,17 @@ pref("mail.calendar-integration.opt-out"
 
 pref("mailnews.ui.deleteMarksRead", true);
 
 // The maximum amount of decoded image data we'll willingly keep around (we
 // might keep around more than this, but we'll try to get down to this value).
 // (This is intentionally on the high side; see bugs 746055 and 768015.)
 pref("image.mem.max_decoded_image_kb", 256000);
 
-pref("spellchecker.dictionaries.download.url", "chrome://branding/locale/brand.properties");
+pref("spellchecker.dictionaries.download.url", "https://addons.thunderbird.net/%LOCALE%/%APP%/dictionaries");
 
 // this will automatically enable inline spellchecking (if it is available) for
 // editable elements in HTML
 // 0 = spellcheck nothing
 // 1 = check multi-line controls [default]
 // 2 = check multi/single line controls
 pref("layout.spellcheckDefault", 1);
 
@@ -610,18 +610,18 @@ pref("extensions.blocklist.itemURL", "ht
 pref("extensions.update.autoUpdateDefault", true); // Download and install automatically
 pref("extensions.update.enabled", true);
 pref("extensions.update.url", "https://versioncheck.addons.thunderbird.net/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%&currentAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%");
 pref("extensions.update.background.url", "https://versioncheck-bg.addons.thunderbird.net/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%&currentAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%");
 // Check for updates to Extensions and Themes every day
 pref("extensions.update.interval", 86400);
 
 // getMoreThemes is used by our UI under our switch theme menu
-pref("extensions.getMoreThemesURL", "chrome://branding/locale/brand.properties");
-pref("extensions.getPersonasURL", "chrome://branding/locale/brand.properties");
+pref("extensions.getMoreThemesURL", "https://addons.thunderbird.net/%LOCALE%/%APP%/complete-themes/");
+pref("extensions.getPersonasURL", "https://addons.thunderbird.net/%LOCALE%/%APP%/themes/?sort=up-and-coming");
 pref("extensions.dss.enabled", false);          // Dynamic Skin Switching
 // Non-dynamic switch pending after next restart.
 pref("extensions.dss.switchPending", false);
 
 pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name", "chrome://navigator/locale/navigator.properties");
 pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description", "chrome://navigator/locale/navigator.properties");
 
 pref("extensions.modern@themes.mozilla.org.name", "chrome://navigator/locale/navigator.properties");
--- a/suite/locales/en-US/chrome/branding/brand.properties
+++ b/suite/locales/en-US/chrome/branding/brand.properties
@@ -2,13 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 brandFullName=SeaMonkey
 brandShortName=SeaMonkey
 brandShorterName=SeaMonkey
 vendorShortName=SeaMonkey
 sidebarName=Sidebar
-extensions.getMoreThemesURL=https://addons.thunderbird.net/%LOCALE%/%APP%/complete-themes/
-extensions.getPersonasURL=https://addons.thunderbird.net/%LOCALE%/%APP%/themes/?sort=up-and-coming
-spellchecker.dictionaries.download.url=https://addons.thunderbird.net/%LOCALE%/%APP%/dictionaries
 app.releaseNotesURL=https://www.seamonkey-project.org/releases/seamonkey%VERSION%/
 app.vendorURL=https://www.seamonkey-project.org/
--- a/suite/locales/en-US/chrome/mailnews/start.dtd
+++ b/suite/locales/en-US/chrome/mailnews/start.dtd
@@ -16,17 +16,16 @@ client, supporting advanced junk mail de
 <!ENTITY feat_filters.label "Message Filters">
 <!ENTITY feat_htmlmsg.label "HTML message support">
 <!ENTITY feat_abook.label "Address Book">
 <!ENTITY feat_tags.label "Customizable Tags and Mail Views">
 <!ENTITY feat_integration.label
 "Tight integration with the &brandShortName; application suite">
 <!ENTITY dict.title "Dictionaries">
 <!ENTITY dict_intro.label "Dictionaries are used to check the spelling of your messages.">
-<!--# LOCALIZATION NOTE (dict_info.label): the URL for <a id="dictURL"> is fetched from brand.properties -->
 <!ENTITY dict_info.label
 'Many additional languages can be installed from the
 <a id="dictURL" href="">dictionaries</a> section on
 <a href="https://addons.thunderbird.net/seamonkey/">SeaMonkey and Thunderbird Add-ons</a>.'>
 <!ENTITY info.title "More Information">
 <!--# LOCALIZATION NOTE (info_bugs.label): the URL for <a id="releaseNotesURL"> is fetched from brand.properties -->
 <!ENTITY info_bugs.label
 '<a href="https://developer.mozilla.org/docs/Mozilla/Projects/MailNews">We</a> welcome bug reports and feature