Bug 1475799 - Change add-ons location in SeaMonkey to addons.thunderbird.net and clean up default bookmarks and other references. r=IanN

This commit is contained in:
Frank-Rainer Grahl 2018-07-18 14:10:00 +02:00
Родитель 7f3b3d3e90
Коммит 21b5f2de5d
10 изменённых файлов: 91 добавлений и 94 удалений

Просмотреть файл

@ -7,6 +7,6 @@
# See nsPermissionManager.cpp for more...
# XPInstall
origin install 1 https://addons.mozilla.org
origin install 1 https://addons.thunderbird.net
origin install 1 http://downloads.mozdev.org
origin install 1 https://downloads.mozdev.org

Просмотреть файл

@ -21,7 +21,7 @@
<script type="application/javascript"><![CDATA[
function goToAddOn() {
document.location = "https://addons.mozilla.org/addon/7685";
document.location = "https://addons.thunderbird.net/addon/7685";
}
]]></script>

Просмотреть файл

@ -7,8 +7,8 @@ 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/

Просмотреть файл

@ -85,7 +85,7 @@ pref("browser.findbar.enabled", true);
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");
@ -568,12 +568,46 @@ 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);
// 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);
// Enable add-ons installed and owned by the application, like the default theme.
pref("extensions.startupScanScopes", 4);
// Allow "legacy" XUL/XPCOM extensions.
pref("extensions.legacy.enabled", true);
// Extensions that should not be flagged as legacy in about:addons
// {972ce4c6-7e08-4474-a285-3208198ce6fd} default theme
// {59c81df5-4b7a-477b-912d-4e0fdf64e5f2} chatZilla
// {e2fda1a4-762b-4020-b5ad-a41df1933103} calendar
pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},debugQA@mozilla.org,modern@themes.mozilla.org,inspector@mozilla.org,{59c81df5-4b7a-477b-912d-4e0fdf64e5f2},{e2fda1a4-762b-4020-b5ad-a41df1933103}");
// 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.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),
@ -583,43 +617,20 @@ pref("extensions.strictCompatibility", false);
// extensions.{GUID}.update.interval
// extensions.{GUID}.update.autoUpdateDefault
// .. etc ..
//
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.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.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);
// Enable add-ons installed and owned by the application, like the default theme.
pref("extensions.startupScanScopes", 4);
pref("extensions.legacy.enabled", true);
// Extensions that should not be flagged as legacy in about:addons
// {972ce4c6-7e08-4474-a285-3208198ce6fd} default theme
// {59c81df5-4b7a-477b-912d-4e0fdf64e5f2} chatZilla
// {e2fda1a4-762b-4020-b5ad-a41df1933103} calendar
pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},debugQA@mozilla.org,modern@themes.mozilla.org,inspector@mozilla.org,{59c81df5-4b7a-477b-912d-4e0fdf64e5f2},{e2fda1a4-762b-4020-b5ad-a41df1933103}");
// 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.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.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");
@ -627,13 +638,16 @@ pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description", "chrome://
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("lightweightThemes.selectedThemeID", "");
pref("lightweightThemes.update.enabled", true);
pref("xpinstall.whitelist.add", "addons.thunderbird.net");
pref("xpinstall.enabled", true);
pref("xpinstall.signatures.required", false);
// Built-in default permissions.
pref("permissions.manager.defaultsUrl", "resource:///defaults/permissions");
pref("lightweightThemes.update.enabled", true);
// Customizable toolbar stuff
pref("custtoolbar.personal_toolbar_folder", "");
// Use a popup window for the customize toolbar UI
@ -747,7 +761,7 @@ pref("plugin.disable", false);
// Digital Rights Management, Encrypted Media Extensions
pref("media.eme.enabled", false);
// Turn off WebRTC by default (bug 1419507)
pref("media.navigator.enabled", false);
pref("media.peerconnection.enabled", false);

Просмотреть файл

@ -20,7 +20,7 @@ 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,

Просмотреть файл

@ -1201,9 +1201,10 @@
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
@ -1212,10 +1213,10 @@
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>

Просмотреть файл

@ -25,7 +25,7 @@ client, supporting advanced junk mail detection and other useful features.">
<!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

Просмотреть файл

@ -10,9 +10,9 @@
<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

Просмотреть файл

@ -11,45 +11,33 @@
#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):
@ -63,7 +51,7 @@
#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):
@ -76,12 +64,12 @@
# 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

Просмотреть файл

@ -15,34 +15,28 @@ Do Not Edit! -->
<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>