Bug 1475799 - Change add-ons location in SeaMonkey to addons.thunderbird.net and clean up default bookmarks and other references. 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 28317 546ccdc72f035626d3e286b8b85edf98bb4b1152
parent 28316 2000e8c0a698caa7d2c52a4a5e11b562c2df18a4
child 28318 9f8d76a9368bf80d151971e7756fe72e58b3e432
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 - Change add-ons location in SeaMonkey to addons.thunderbird.net and clean up default bookmarks and other references. r=IanN a=IanN DONTBUILD SeaMonkey ESR52 release branch only.
suite/app/permissions
suite/browser/browser-prefs.js
suite/common/dataman/tests/browser_dataman_basics.js
suite/common/gopherAddon.xhtml
suite/locales/en-US/chrome/branding/brand.properties
suite/locales/en-US/chrome/common/help/customize_help.xhtml
suite/locales/en-US/chrome/mailnews/start.dtd
suite/locales/en-US/profile/bookmarks.extra
suite/locales/en-US/profile/bookmarks.inc
suite/locales/generic/profile/bookmarks.html.in
--- a/suite/app/permissions
+++ b/suite/app/permissions
@@ -2,10 +2,11 @@
 # The file-format is strict:
 # * matchtype \t type \t permission \t host
 # * Only "host" is supported for matchtype
 # * type is a string that identifies the type of permission (e.g. "cookie")
 # * permission is an integer between 1 and 15
 # See nsPermissionManager.cpp for more...
 
 # XPInstall
-host	install	1	addons.mozilla.org
-host	install	1	downloads.mozdev.org
+origin	install	1	https://addons.thunderbird.net
+origin	install	1	http://downloads.mozdev.org
+origin	install	1	https://downloads.mozdev.org
--- a/suite/browser/browser-prefs.js
+++ b/suite/browser/browser-prefs.js
@@ -87,17 +87,17 @@ pref("browser.dom.window.console.enabled
 
 // Use the findbar instead of the dialog box
 pref("browser.findbar.enabled", true);
 
 // Use doorhanger notifications instead of the notification bar
 pref("browser.doorhanger.enabled", true);
 
 // search engines URL
-pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search/?atype=4");
+pref("browser.search.searchEnginesURL", "https://addons.thunderbird.net/%LOCALE%/%APP%/search/?atype=4");
 
 // pointer to the default engine name
 pref("browser.search.defaultenginename", "chrome://communicator-region/locale/region.properties");
 
 // Disable logging for the search service by default.
 pref("browser.search.log", false);
 
 // Ordering of Search Engines in the Engine list.
@@ -556,65 +556,75 @@ pref("app.update.timerMinimumDelay", 120
 pref("app.update.promptWaitTime", 691200);
 #else
 // For nightly and aurora builds, before showing the big UI, default=12 hrs
 pref("app.update.promptWaitTime", 43200);
 #endif
 // Show the Update Checking/Ready UI when the user was idle for x seconds
 pref("app.update.idletime", 60);
 
+
 // Extension preferences
 
-// Enables some extra Extension System Logging (can reduce performance)
+// Controls enabling of the extension system logging (can reduce performance)
 pref("extensions.logging.enabled", false);
 
-// Disables strict compatibility, making addons compatible-by-default.
+// Strict compatibility makes add-ons incompatible by default.
 pref("extensions.strictCompatibility", false);
 
 // Specifies a minimum maxVersion an addon needs to say it's compatible with
 // for it to be compatible by default.
 pref("extensions.minCompatibleAppVersion", "2.1");
 
+// Disable add-ons installed into the shared user and shared system areas by
+// default. This does not include the application directory. See the SCOPE
+// constants in AddonManager.jsm for values to use here.
+pref("extensions.autoDisableScopes", 15);
+
+// Preferences for AMO integration
+pref("extensions.getAddons.cache.enabled", true);  // This also toggles personalized recommendations
+pref("extensions.getAddons.maxResults", 15);
+pref("extensions.getAddons.get.url", "https://live.thunderbird.net/services.addons/api/v3/addons/search/?guid=%IDS%&lang=%LOCALE%");
+pref("extensions.getAddons.getWithPerformance.url", "https://live.thunderbird.net/services.addons/api/v3/addons/search/?guid=%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
+pref("extensions.getAddons.compatOverides.url", "https://live.thunderbird.net/services.addons/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=seamonkey");
+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=seamonkey");
+pref("extensions.getAddons.themes.browseURL", "https://addons.thunderbird.net/%LOCALE%/thunderbird/themes/?src=seamonkey");
+pref("extensions.getAddons.siteRegExp", "^https://.*addons\\.thunderbird\\.net");
+pref("extensions.webservice.discoverURL", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%");
+
+// Blocklist preferences
+pref("extensions.blocklist.url", "https://live.thunderbird.net/blocklists.settings/v1/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/");
+pref("extensions.blocklist.detailsURL", "https://live.thunderbird.net/blocked.cdn/");
+pref("extensions.blocklist.itemURL", "https://live.thunderbird.net/blocked.cdn/%blockID%.html");
 
 // Update preferences for installed Extensions and Themes.
 // Symmetric (can be overridden by individual extensions),
 // e.g.
 //  extensions.{GUID}.update.enabled
 //  extensions.{GUID}.update.url
 //  extensions.{GUID}.update.interval
 //  extensions.{GUID}.update.autoUpdateDefault
 //  .. etc ..
 //
+pref("extensions.update.autoUpdateDefault", true); // Download and install automatically
 pref("extensions.update.enabled", true);
-pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/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.interval", 86400);         // Check daily for updates to add-ons
-pref("extensions.update.autoUpdateDefault", true); // Download and install automatically
-
-// Disable add-ons installed into the shared user and shared system areas by
-// default. This does not include the application directory. See the SCOPE
-// constants in AddonManager.jsm for values to use here.
-pref("extensions.autoDisableScopes", 15);
-
-// Preferences for AMO integration
-pref("extensions.getAddons.cache.enabled", true);  // also toggles personalized recommendations
-pref("extensions.getAddons.maxResults", 15);
-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%");
-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
-pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/%APP%/");
-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=seamonkey");
-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%");
-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=seamonkey");
-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%");
+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.dss.enabled", false);          // Dynamic Skin Switching
-pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
-                                                // restart.
+// 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");
 pref("extensions.modern@themes.mozilla.org.description", "chrome://navigator/locale/navigator.properties");
 
 pref("xpinstall.enabled", true);
--- a/suite/common/dataman/tests/browser_dataman_basics.js
+++ b/suite/common/dataman/tests/browser_dataman_basics.js
@@ -15,17 +15,17 @@ var gLocSvc = {
 const DATAMAN_LOADED = "dataman-loaded";
 const TEST_DONE = "dataman-test-done";
 
 const kPreexistingDomains = 13;
 
 function test() {
   // Preload data.
   // Note that before this test starts, what is already set are permissions for
-  // addons.mozilla.org to install addons as well as
+  // addons.thunderbird.net to install addons as well as
   // permissions for a number of sites used in mochitest to load XUL/XBL.
   // For the latter, those 13 domains are used/listed: 127.0.0.1, bank1.com,
   // bank2.com, example.com, example.org, mochi.test, mozilla.com, test,
   // w3.org, w3c-test.org, xn--exaple-kqf.test, xn--exmple-cua.test,
   // xn--hxajbheg2az3al.xn--jxalpdlp
   // We should not touch those permissions so other tests can run, which means
   // we should avoid using those domains altogether as we can't remove them.
 
--- a/suite/common/gopherAddon.xhtml
+++ b/suite/common/gopherAddon.xhtml
@@ -16,17 +16,17 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>&loadError.label;</title>
     <link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css"/>
     <script type="application/javascript"><![CDATA[
 
        function goToAddOn() {
-         document.location = "https://addons.mozilla.org/addon/7685";
+         document.location = "https://addons.thunderbird.net/addon/7685";
        }
 
     ]]></script>
   </head>
 
   <body>
     <div id="errorPageContainer">
 
--- a/suite/locales/en-US/chrome/branding/brand.properties
+++ b/suite/locales/en-US/chrome/branding/brand.properties
@@ -2,13 +2,13 @@
 # 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.mozilla.org/%LOCALE%/%APP%/complete-themes/
-extensions.getPersonasURL=https://addons.mozilla.org/%LOCALE%/%APP%/themes/?sort=up-and-coming
-spellchecker.dictionaries.download.url=https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries
-app.releaseNotesURL=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/
-app.vendorURL=http://www.seamonkey-project.org/
+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/common/help/customize_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/customize_help.xhtml
@@ -1196,31 +1196,32 @@
 <p>[<a href="#using_the_add-ons_manager">Return to beginning of section</a>]</p>
 
 <h4 id="using_the_add-on_converter">Using the Add-on Converter</h4>
 
 <p>The <a href="http://addonconverter.fotokraina.com/">Add-on Converter</a>
   has been created to convert Firefox and Thunderbird extensions for use in
   &brandShortName;. You can try to convert any extension by uploading it from
   your computer or by pasting the download URL from
-  <a href="https://addons.mozilla.org">addons.mozilla.org</a> (AMO) into the
-  appropriate input line on the Add-on Converter start page. If you are an
-  expert user, you can make adjustments in the Advanced Options area.</p>
+  <a href="https://addons.thunderbird.net">addons.thunderbird.net</a> (AMO)
+  into the appropriate input line on the Add-on Converter start page. If you
+  are an expert user, you can make adjustments in the Advanced Options area.
+  </p>
 
 <p>Not all Firefox and Thunderbird extensions will work in &brandShortName;.
   Most extensions will install successfully, but some may not work properly once
   installed. The <a href="http://addonconverter.fotokraina.com/compatibility/">
   compatibility list</a> will help you to anticipate how well a converted
   extension will work.</p>
 
 <p>The easiest way to use the Add-on Converter is to install the
-  <a href="https://addons.mozilla.org/seamonkey/addon/amo-browsing-for-seamonkey/">
+  <a href="https://addons.thunderbird.net/seamonkey/addon/amo-browsing-for-seamonkey/">
   AMO Browsing for SeaMonkey</a> extension, which will overlay additional
-  information and links onto the Add-on pages at addons.mozilla.org. If the
-  Add-on is not already compatible with &brandShortName;, a link will be
+  information and links onto the Add-on pages at addons.thunderbird.net. If
+  the Add-on is not already compatible with &brandShortName;, a link will be
   added to the Add-on Converter, which will select appropriate conversion
   parameters automatically.</p>
 
 <p>[<a href="#using_the_add-on_converter">Return to beginning of section</a>]</p>
 
 <h4 id="the_get_add-ons_panel">The Get Add-ons panel</h4>
 
 <p>The Get Add-ons panel in the Add-ons Manager uses web services provided by
--- a/suite/locales/en-US/chrome/mailnews/start.dtd
+++ b/suite/locales/en-US/chrome/mailnews/start.dtd
@@ -20,15 +20,15 @@ client, supporting advanced junk mail de
 <!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.mozilla.org/seamonkey/">Mozilla Add-ons</a>.'>
+<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
 requests, but please read the <a id="releaseNotesURL" href="">release notes</a> and query
 <a href="https://bugzilla.mozilla.org/query.cgi">Bugzilla</a> first.'>
--- a/suite/locales/en-US/profile/bookmarks.extra
+++ b/suite/locales/en-US/profile/bookmarks.extra
@@ -5,14 +5,14 @@
 # Please do not add many entries here, only things that many users in your
 # country will actually need.
 # For most localizations, it's enough to localize the descriptions and domain
 # names of the Google bookmarks below.
 
     <DT><H3>Search the Web</H3>
     <DL><p>
         <DT><A HREF="https://duckduckgo.com/">DuckDuckGo</A>
-        <DT><A HREF="http://www.google.com/">Google</A>
-        <DT><A HREF="http://groups.google.com/">Google Groups</A>
-        <DT><A HREF="http://news.google.com/">Google News</A>
+        <DT><A HREF="https://www.google.com/">Google</A>
+        <DT><A HREF="https://groups.google.com/">Google Groups</A>
+        <DT><A HREF="https://news.google.com/">Google News</A>
     </DL><p>
 
 #unfilter emptyLines
--- a/suite/locales/en-US/profile/bookmarks.inc
+++ b/suite/locales/en-US/profile/bookmarks.inc
@@ -6,82 +6,70 @@
 #define bookmarks_title Bookmarks
 #define bookmarks_heading Bookmarks
 
 #define personal_toolbarfolder Personal Toolbar Folder
 
 #define seamonkey_and_mozilla SeaMonkey and Mozilla
 
 # LOCALIZATION NOTE (seamonkey):
-# link title for http://www.seamonkey-project.org/ (in the personal toolbar)
+# link title for https://www.seamonkey-project.org/ (in the personal toolbar)
 #define seamonkey SeaMonkey
 
 # LOCALIZATION NOTE (seamonkey_long):
-# link title for http://www.seamonkey-project.org/ (in normal bookmarks)
+# link title for https://www.seamonkey-project.org/ (in normal bookmarks)
 #define seamonkey_long The SeaMonkey Project
 
-# LOCALIZATION NOTE (mozilla_org):
-# link title for http://www.mozilla.org/ (in the personal toolbar)
-#define mozilla_org mozilla.org
-
 # LOCALIZATION NOTE (mozilla_org_long):
-# link title for http://www.mozilla.org/ (in normal bookmarks)
+# link title for https://www.mozilla.org/ (in normal bookmarks)
 #define mozilla_org_long The Mozilla Organization
 
-# LOCALIZATION NOTE (mozilla_projects):
-# link title for http://www.mozilla.org/projects/
-#define mozilla_projects Mozilla Projects
-
-# LOCALIZATION NOTE (mozilla_about):
-# link title for http://www.mozilla.org/about/
-#define mozilla_about About Mozilla
-
 #define extend_seamonkey Extending SeaMonkey
 
 # LOCALIZATION NOTE (seamonkey_addons):
-# link title for https://addons.mozilla.org/en-US/seamonkey/
+# link title for https://addons.thunderbird.net/en-US/seamonkey/
 #define seamonkey_addons SeaMonkey Add-ons
 
 # LOCALIZATION NOTE (seamonkey_themes):
-# link title for https://addons.mozilla.org/en-US/seamonkey/themes
+# link title for https://addons.thunderbird.net/en-US/seamonkey/themes
 #define seamonkey_themes SeaMonkey Themes
 
 # LOCALIZATION NOTE (seamonkey_dictionaries):
-# link title for https://addons.mozilla.org/en-US/seamonkey/dictionaries
+# link title for https://addons.thunderbird.net/en-US/seamonkey/dictionaries
 #define seamonkey_dictionaries Spell Checking Dictionaries
 
 # LOCALIZATION NOTE (seamonkey_plugins):
-# link title for https://addons.mozilla.org/en-US/seamonkey/plugins
+# link title for https://addons.thunderbird.net/en-US/seamonkey/plugins
 #define seamonkey_plugins Plugins for SeaMonkey
 
 # LOCALIZATION NOTE (mozdev):
 # link title for http://www.mozdev.org/
 #define mozdev mozdev.org
 
 # LOCALIZATION NOTE (mozdev_seamonkey):
 # link title for http://www.mozdev.org/projects/applications/SeaMonkey.html
 #define mozdev_seamonkey SeaMonkey Extensions from mozdev.org
 
 #define community_support Community &amp; Support
 
 # LOCALIZATION NOTE (seamonkey_community):
-# link title for http://www.seamonkey-project.org/community
+# link title for https://www.seamonkey-project.org/community
 #define seamonkey_community SeaMonkey Community
 
 # LOCALIZATION NOTE (mozillazine):
 # link title for http://www.mozillazine.org/
 #define mozillazine mozillaZine
 
 # LOCALIZATION NOTE (seamonkey_support):
 # link title for the mozillaZine SeaMonkey Support forum
 #define seamonkey_support SeaMonkey Support Forum (mozillaZine)
 
 # LOCALIZATION NOTE (seamonkey_l10n):
 # insert full bookmark line for localized SeaMonkey page (personal toolbar)
-# e.g. #define seamonkey_l10n <DT><A HREF="http://www.seamonkey.tlh/">SeaMonkey tlhIngan</a>
-#define seamonkey_l10n  
+# e.g. #define seamonkey_l10n <DT><A HREF="https://www.seamonkey.tlh/">SeaMonkey tlhIngan</a>
+#define seamonkey_l10n
 
 # LOCALIZATION NOTE (seamonkey_l10n_long):
 # insert full bookmark line for localized SeaMonkey page (normal bookmark)
-# e.g. #define seamonkey_l10n_long <DT><A HREF="http://www.seamonkey.tld/">tlhIngan Hol SeaMonkey</a>
-#define seamonkey_l10n_long  
+# e.g. #define seamonkey_l10n_long <DT><A HREF="https://www.seamonkey.tld/">tlhIngan Hol SeaMonkey</a>
+#define seamonkey_l10n_long
 
 #unfilter emptyLines
--- a/suite/locales/generic/profile/bookmarks.html.in
+++ b/suite/locales/generic/profile/bookmarks.html.in
@@ -10,43 +10,38 @@ It will be read and overwritten.
 Do Not Edit! -->
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
 <TITLE>@bookmarks_title@</TITLE>
 <H1>@bookmarks_heading@</H1>
 
 <DL><p>
     <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="NC:PersonalToolbarFolder">@personal_toolbarfolder@</H3>
     <DL><p>
-        <DT><A HREF="http://www.seamonkey-project.org/">@seamonkey@</a>
+        <DT><A HREF="https://www.seamonkey-project.org/">@seamonkey@</a>
         @seamonkey_l10n@
-        <DT><A HREF="http://www.mozilla.org/">@mozilla_org@</A>
+
         <DT><A HREF="http://www.mozillazine.org/">@mozillazine@</A>
         <DT><A HREF="http://www.mozdev.org/">@mozdev@</A>
     </DL><p>
     <DT><H3>@seamonkey_and_mozilla@</H3>
     <DL><p>
-        <DT><A HREF="http://www.seamonkey-project.org/">@seamonkey_long@</a>
+        <DT><A HREF="https://www.seamonkey-project.org/">@seamonkey_long@</a>
         @seamonkey_l10n_long@
-        <DT><H3>@mozilla_org@</H3>
-        <DL><p>
-            <DT><A HREF="http://www.mozilla.org/">@mozilla_org_long@</A>
-            <DT><A HREF="http://www.mozilla.org/projects/">@mozilla_projects@</A>
-            <DT><A HREF="http://www.mozilla.org/about/">@mozilla_about@</A>
-        </DL><p>
+        <DT><A HREF="https://www.mozilla.org/">@mozilla_org_long@</A>
         <DT><H3>@extend_seamonkey@</H3>
         <DL><p>
-            <DT><A HREF="https://addons.mozilla.org/@AB_CD@/seamonkey/">@seamonkey_addons@</a>
-            <DT><A HREF="https://addons.mozilla.org/@AB_CD@/seamonkey/themes">@seamonkey_themes@</a>
-            <DT><A HREF="https://addons.mozilla.org/@AB_CD@/seamonkey/dictionaries">@seamonkey_dictionaries@</a>
-            <DT><A HREF="https://addons.mozilla.org/@AB_CD@/seamonkey/plugins">@seamonkey_plugins@</a>
+            <DT><A HREF="https://addons.thunderbird.net/@AB_CD@/seamonkey/">@seamonkey_addons@</a>
+            <DT><A HREF="https://addons.thunderbird.net/@AB_CD@/seamonkey/themes">@seamonkey_themes@</a>
+            <DT><A HREF="https://addons.thunderbird.net/@AB_CD@/seamonkey/dictionaries">@seamonkey_dictionaries@</a>
+            <DT><A HREF="https://addons.thunderbird.net/@AB_CD@/seamonkey/plugins">@seamonkey_plugins@</a>
             <DT><A HREF="http://www.mozdev.org/">@mozdev@</A>
             <DT><A HREF="http://www.mozdev.org/projects/applications/SeaMonkey.html">@mozdev_seamonkey@</A>
         </DL><p>
         <DT><H3>@community_support@</H3>
         <DL><p>
-            <DT><A HREF="http://www.seamonkey-project.org/community">@seamonkey_community@</a>
+            <DT><A HREF="https://www.seamonkey-project.org/community">@seamonkey_community@</a>
             <DT><A HREF="http://www.mozillazine.org/">@mozillazine@</A>
             <DT><A HREF="http://forums.mozillazine.org/viewforum.php?f=40">@seamonkey_support@</A>
         </DL><p>
     </DL><p>
 #include bookmarks.extra
     <HR>
 </DL><p>