commit 9233838b9b584fdfdb4b90d18482683d211e5b65 Author: Alex Catarineu acat@torproject.org Date: Thu Jun 18 16:05:39 2020 +0200

fixup! Bug 2176: Rebrand Firefox to TorBrowser

Fix for bug 33954. --- browser/actors/WebRTCParent.jsm | 2 +- browser/base/content/aboutDialog.xhtml | 2 +- browser/base/content/aboutNetError.xhtml | 2 +- browser/base/content/aboutRestartRequired.xhtml | 2 +- browser/base/content/aboutTabCrashed.xhtml | 2 +- browser/base/content/blockedSite.xhtml | 2 +- browser/base/content/browser.js | 2 +- browser/base/content/browser.xhtml | 2 +- browser/base/content/macWindow.inc.xhtml | 2 +- browser/base/content/newInstallPage.html | 2 +- browser/base/content/safeMode.xhtml | 2 +- browser/base/content/webrtcIndicator.xhtml | 2 +- browser/components/aboutconfig/content/aboutconfig.html | 2 +- browser/components/aboutlogins/AboutLoginsParent.jsm | 4 ++-- browser/components/aboutlogins/content/aboutLogins.html | 2 +- browser/components/customizableui/content/panelUI.js | 2 +- .../components/enterprisepolicies/content/aboutPolicies.html | 2 +- browser/components/migration/content/aboutWelcomeBack.xhtml | 2 +- .../components/newtab/aboutwelcome/content/aboutwelcome.html | 2 +- browser/components/newtab/bin/render-activity-stream-html.js | 2 +- .../content-src/asrouter/templates/FirstRun/FirstRun.jsx | 2 +- .../newtab/data/content/abouthomecache/page.html.template | 2 +- .../components/newtab/data/content/activity-stream.bundle.js | 2 +- browser/components/newtab/lib/OnboardingMessageProvider.jsm | 2 +- browser/components/newtab/lib/RemoteL10n.jsm | 2 +- .../components/newtab/prerendered/activity-stream-debug.html | 2 +- .../newtab/prerendered/activity-stream-noscripts.html | 2 +- browser/components/newtab/prerendered/activity-stream.html | 2 +- .../components/newtab/test/unit/asrouter/RemoteL10n.test.js | 4 ++-- browser/components/pioneer/content/pioneer.html | 2 +- browser/components/preferences/dialogs/blocklists.xhtml | 2 +- .../components/preferences/dialogs/browserLanguages.xhtml | 2 +- browser/components/preferences/dialogs/clearSiteData.xhtml | 2 +- browser/components/preferences/dialogs/connection.xhtml | 2 +- browser/components/preferences/dialogs/sanitize.xhtml | 2 +- .../components/preferences/dialogs/siteDataSettings.xhtml | 2 +- browser/components/preferences/main.js | 2 +- browser/components/preferences/preferences.xhtml | 2 +- browser/components/preferences/privacy.js | 2 +- .../privatebrowsing/content/aboutPrivateBrowsing.html | 2 +- browser/components/protections/content/protections.html | 2 +- .../sessionstore/content/aboutSessionRestore.xhtml | 2 +- devtools/client/aboutdebugging/aboutdebugging.js | 2 +- intl/l10n/L10nRegistry.jsm | 12 ++++++++++++ security/manager/pki/resources/content/exceptionDialog.xhtml | 2 +- toolkit/components/certviewer/content/certviewer.html | 2 +- toolkit/content/aboutProfiles.xhtml | 2 +- toolkit/content/aboutRights-unbranded.xhtml | 2 +- toolkit/content/aboutRights.xhtml | 2 +- toolkit/content/aboutServiceWorkers.xhtml | 2 +- toolkit/content/aboutSupport.xhtml | 2 +- toolkit/content/aboutTelemetry.xhtml | 2 +- toolkit/content/resetProfile.xhtml | 2 +- toolkit/mozapps/downloads/content/unknownContentType.xhtml | 2 +- toolkit/mozapps/extensions/content/aboutaddons.html | 2 +- toolkit/mozapps/extensions/content/abuse-report-frame.html | 2 +- toolkit/mozapps/extensions/content/blocklist.xhtml | 2 +- toolkit/mozapps/extensions/content/extensions.xhtml | 2 +- toolkit/mozapps/preferences/changemp.xhtml | 2 +- toolkit/mozapps/update/content/updateElevation.xhtml | 2 +- toolkit/profile/content/createProfileWizard.xhtml | 2 +- toolkit/profile/content/profileDowngrade.xhtml | 2 +- toolkit/profile/content/profileSelection.xhtml | 2 +- 63 files changed, 76 insertions(+), 64 deletions(-)

diff --git a/browser/actors/WebRTCParent.jsm b/browser/actors/WebRTCParent.jsm index d50845f9001a..fea1897d63d4 100644 --- a/browser/actors/WebRTCParent.jsm +++ b/browser/actors/WebRTCParent.jsm @@ -482,7 +482,7 @@ function prompt(aActor, aBrowser, aRequest) { let chromeDoc = aBrowser.ownerDocument; let stringBundle = chromeDoc.defaultView.gNavigatorBundle; let localization = new Localization( - ["branding/tor-browser-brand.ftl", "browser/browser.ftl"], + ["branding/brand.ftl", "browser/browser.ftl"], true );

diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml index 02096fbfa3c0..5274cbc02831 100644 --- a/browser/base/content/aboutDialog.xhtml +++ b/browser/base/content/aboutDialog.xhtml @@ -35,7 +35,7 @@ #endif

<linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/aboutDialog.ftl"/> </linkset>

diff --git a/browser/base/content/aboutNetError.xhtml b/browser/base/content/aboutNetError.xhtml index 120d4637f533..957b6f15a0be 100644 --- a/browser/base/content/aboutNetError.xhtml +++ b/browser/base/content/aboutNetError.xhtml @@ -27,7 +27,7 @@ <link rel="icon" id="favicon" href="chrome://global/skin/icons/warning.svg"/> <link rel="localization" href="browser/aboutCertError.ftl" /> <link rel="localization" href="browser/nsserrors.ftl" /> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> </head>

<body dir="&locale.dir;"> diff --git a/browser/base/content/aboutRestartRequired.xhtml b/browser/base/content/aboutRestartRequired.xhtml index 6b5ce7c201c8..c7e7b9dcbb91 100644 --- a/browser/base/content/aboutRestartRequired.xhtml +++ b/browser/base/content/aboutRestartRequired.xhtml @@ -15,7 +15,7 @@ toolkit/components/places/src/nsFaviconService.h should be updated. --> <link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/warning.svg"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/aboutRestartRequired.ftl"/> </head> <body> diff --git a/browser/base/content/aboutTabCrashed.xhtml b/browser/base/content/aboutTabCrashed.xhtml index fd7d8f71ae9f..6ac50822f334 100644 --- a/browser/base/content/aboutTabCrashed.xhtml +++ b/browser/base/content/aboutTabCrashed.xhtml @@ -15,7 +15,7 @@ href="chrome://browser/content/aboutTabCrashed.css"/> <link rel="stylesheet" type="text/css" media="all" href="chrome://browser/skin/aboutTabCrashed.css"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/aboutTabCrashed.ftl"/> <title data-l10n-id="crashed-title"></title> diff --git a/browser/base/content/blockedSite.xhtml b/browser/base/content/blockedSite.xhtml index af64566af1ac..4601b0db82d7 100644 --- a/browser/base/content/blockedSite.xhtml +++ b/browser/base/content/blockedSite.xhtml @@ -9,7 +9,7 @@ <meta http-equiv="Content-Security-Policy" content="default-src chrome:; object-src 'none'" /> <link rel="stylesheet" href="chrome://browser/skin/blockedSite.css" type="text/css" media="all" /> <link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/blocklist_favicon.png"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/safebrowsing/blockedSite.ftl"/> </head> <body> diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 3f019c5f24c1..230484af503f 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -942,7 +942,7 @@ const gStoragePressureObserver = { } this._lastNotificationTime = Date.now();

- MozXULElement.insertFTLIfNeeded("branding/tor-browser-brand.ftl"); + MozXULElement.insertFTLIfNeeded("branding/brand.ftl"); MozXULElement.insertFTLIfNeeded("browser/preferences/preferences.ftl");

const BYTES_IN_GIGABYTE = 1073741824; diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml index d51fb0f914f3..fd9a5d14aeb2 100644 --- a/browser/base/content/browser.xhtml +++ b/browser/base/content/browser.xhtml @@ -68,7 +68,7 @@ persist="screenX screenY width height sizemode" data-l10n-sync="true"> <head> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/branding/sync-brand.ftl"/> <link rel="localization" href="browser/branding/brandings.ftl"/> <link rel="localization" href="toolkit/global/textActions.ftl"/> diff --git a/browser/base/content/macWindow.inc.xhtml b/browser/base/content/macWindow.inc.xhtml index a4ba07c94d7a..d6327086ff32 100644 --- a/browser/base/content/macWindow.inc.xhtml +++ b/browser/base/content/macWindow.inc.xhtml @@ -11,7 +11,7 @@ # browser-doctype.inc must also be included.

<linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/branding/sync-brand.ftl"/> <html:link rel="localization" href="toolkit/global/textActions.ftl"/> <html:link rel="localization" href="browser/browserSets.ftl"/> diff --git a/browser/base/content/newInstallPage.html b/browser/base/content/newInstallPage.html index 4c0c4bc69d27..3b7604030f05 100644 --- a/browser/base/content/newInstallPage.html +++ b/browser/base/content/newInstallPage.html @@ -10,7 +10,7 @@ <meta name="referrer" content="no-referrer"> <link rel="stylesheet" type="text/css" href="chrome://global/skin/in-content/common.css"> <link rel="stylesheet" type="text/css" href="chrome://browser/skin/newInstallPage.css"> - <link rel="localization" href="branding/tor-browser-brand.ftl"> + <link rel="localization" href="branding/brand.ftl"> <link rel="localization" href="browser/branding/sync-brand.ftl"> <link rel="localization" href="browser/newInstallPage.ftl"> <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"> diff --git a/browser/base/content/safeMode.xhtml b/browser/base/content/safeMode.xhtml index 7f10b95b9874..5c95e191372b 100644 --- a/browser/base/content/safeMode.xhtml +++ b/browser/base/content/safeMode.xhtml @@ -18,7 +18,7 @@ buttonidextra1="refresh-profile">

<linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/safeMode.ftl"/> </linkset>

diff --git a/browser/base/content/webrtcIndicator.xhtml b/browser/base/content/webrtcIndicator.xhtml index 80b0a12c0329..e56d175a9121 100644 --- a/browser/base/content/webrtcIndicator.xhtml +++ b/browser/base/content/webrtcIndicator.xhtml @@ -20,7 +20,7 @@ chromemargin="0,0,0,0">

<head> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/webrtcIndicator.ftl"/> #ifndef XP_MACOSX <title data-l10n-id="webrtc-indicator-title"></title> diff --git a/browser/components/aboutconfig/content/aboutconfig.html b/browser/components/aboutconfig/content/aboutconfig.html index 5c9dfd830a02..ce7f258f8db6 100644 --- a/browser/components/aboutconfig/content/aboutconfig.html +++ b/browser/components/aboutconfig/content/aboutconfig.html @@ -13,7 +13,7 @@ href="chrome://global/skin/in-content/info-pages.css" title="infop"> <link rel="stylesheet" type="text/css" href="chrome://browser/content/aboutconfig/aboutconfig.css"> - <link rel="localization" href="branding/tor-browser-brand.ftl"> + <link rel="localization" href="branding/brand.ftl"> <link rel="localization" href="browser/aboutConfig.ftl"> <script src="chrome://browser/content/aboutconfig/aboutconfig.js"></script> <title data-l10n-id="about-config-page-title"></title> diff --git a/browser/components/aboutlogins/AboutLoginsParent.jsm b/browser/components/aboutlogins/AboutLoginsParent.jsm index 5d0a0e4e83b9..d06d6d0ec6c7 100644 --- a/browser/components/aboutlogins/AboutLoginsParent.jsm +++ b/browser/components/aboutlogins/AboutLoginsParent.jsm @@ -52,7 +52,7 @@ XPCOMUtils.defineLazyPreferenceGetter( false ); XPCOMUtils.defineLazyGetter(this, "AboutLoginsL10n", () => { - return new Localization(["branding/tor-browser-brand.ftl", "browser/aboutLogins.ftl"]); + return new Localization(["branding/brand.ftl", "browser/aboutLogins.ftl"]); });

const ABOUT_LOGINS_ORIGIN = "about:logins"; @@ -716,7 +716,7 @@ var AboutLogins = { ); }, ], - extraFtl: ["branding/tor-browser-brand.ftl", "browser/branding/sync-brand.ftl"], + extraFtl: ["branding/brand.ftl", "browser/branding/sync-brand.ftl"], }); },

diff --git a/browser/components/aboutlogins/content/aboutLogins.html b/browser/components/aboutlogins/content/aboutLogins.html index 209681adcd39..3b4f100d4b27 100644 --- a/browser/components/aboutlogins/content/aboutLogins.html +++ b/browser/components/aboutlogins/content/aboutLogins.html @@ -8,7 +8,7 @@ <meta charset="utf-8"> <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; img-src data: blob: https://firefoxusercontent.com;"/> <title data-l10n-id="about-logins-page-title"></title> - <link rel="localization" href="branding/tor-browser-brand.ftl"> + <link rel="localization" href="branding/brand.ftl"> <link rel="localization" href="browser/branding/sync-brand.ftl"> <link rel="localization" href="browser/branding/brandings.ftl"> <link rel="localization" href="browser/aboutLogins.ftl"> diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js index 97b6af51b22b..1f1d39aa23ec 100644 --- a/browser/components/customizableui/content/panelUI.js +++ b/browser/components/customizableui/content/panelUI.js @@ -898,7 +898,7 @@ const PanelUI = { let anchor = this._getPanelAnchor(this.menuButton);

// Insert Fluent files when needed before notification is opened - MozXULElement.insertFTLIfNeeded("branding/tor-browser-brand.ftl"); + MozXULElement.insertFTLIfNeeded("branding/brand.ftl"); MozXULElement.insertFTLIfNeeded("browser/appMenuNotifications.ftl");

// After Fluent files are loaded into document replace data-lazy-l10n-ids with actual ones diff --git a/browser/components/enterprisepolicies/content/aboutPolicies.html b/browser/components/enterprisepolicies/content/aboutPolicies.html index 3deb79c0f989..e1da06927128 100644 --- a/browser/components/enterprisepolicies/content/aboutPolicies.html +++ b/browser/components/enterprisepolicies/content/aboutPolicies.html @@ -10,7 +10,7 @@ <meta http-equiv="Content-Security-Policy" content="default-src chrome:; object-src 'none'"> <title data-l10n-id="about-policies-title"></title> <link rel="stylesheet" href="chrome://browser/content/policies/aboutPolicies.css"> - <link rel="localization" href="branding/tor-browser-brand.ftl"> + <link rel="localization" href="branding/brand.ftl"> <link rel="localization" href="browser/branding/sync-brand.ftl"> <link rel="localization" href="browser/aboutPolicies.ftl"> <link rel="localization" href="browser/policies/policies-descriptions.ftl"> diff --git a/browser/components/migration/content/aboutWelcomeBack.xhtml b/browser/components/migration/content/aboutWelcomeBack.xhtml index 3958822f560f..e4c02d23d3c1 100644 --- a/browser/components/migration/content/aboutWelcomeBack.xhtml +++ b/browser/components/migration/content/aboutWelcomeBack.xhtml @@ -17,7 +17,7 @@ <link rel="stylesheet" href="chrome://browser/skin/aboutWelcomeBack.css" type="text/css" media="all"/> <link rel="icon" type="image/png" href="chrome://browser/skin/info.svg"/> <link rel="localization" href="browser/aboutSessionRestore.ftl"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <script src="chrome://browser/content/aboutSessionRestore.js"/> </head>

diff --git a/browser/components/newtab/aboutwelcome/content/aboutwelcome.html b/browser/components/newtab/aboutwelcome/content/aboutwelcome.html index a2e7dbdc3342..76d9d6be499e 100644 --- a/browser/components/newtab/aboutwelcome/content/aboutwelcome.html +++ b/browser/components/newtab/aboutwelcome/content/aboutwelcome.html @@ -10,7 +10,7 @@ <title data-l10n-id="onboarding-welcome-header"></title> <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"> <link rel="stylesheet" href="resource://activity-stream/aboutwelcome/aboutwelcome.css"> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/branding/sync-brand.ftl"/> <link rel="localization" href="browser/branding/brandings.ftl"/> <link rel="localization" href="browser/newtab/onboarding.ftl"/> diff --git a/browser/components/newtab/bin/render-activity-stream-html.js b/browser/components/newtab/bin/render-activity-stream-html.js index 22745cf4ea60..4c2bb95cb16b 100644 --- a/browser/components/newtab/bin/render-activity-stream-html.js +++ b/browser/components/newtab/bin/render-activity-stream-html.js @@ -58,7 +58,7 @@ function templateHTML(options) { <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';"> <title data-l10n-id="newtab-page-title"></title> <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/> - <link rel="localization" href="branding/tor-browser-brand.ftl" /> + <link rel="localization" href="branding/brand.ftl" /> <link rel="localization" href="browser/branding/brandings.ftl" /> <link rel="localization" href="browser/newtab/newtab.ftl" /> <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" /> diff --git a/browser/components/newtab/content-src/asrouter/templates/FirstRun/FirstRun.jsx b/browser/components/newtab/content-src/asrouter/templates/FirstRun/FirstRun.jsx index 428c388038dc..209ffff0c1f7 100644 --- a/browser/components/newtab/content-src/asrouter/templates/FirstRun/FirstRun.jsx +++ b/browser/components/newtab/content-src/asrouter/templates/FirstRun/FirstRun.jsx @@ -11,7 +11,7 @@ import { BASE_PARAMS } from "./addUtmParams"; const TRANSITION_LENGTH = 500;

export const FLUENT_FILES = [ - "branding/tor-browser-brand.ftl", + "branding/brand.ftl", "browser/branding/brandings.ftl", "browser/branding/sync-brand.ftl", "browser/newtab/onboarding.ftl", diff --git a/browser/components/newtab/data/content/abouthomecache/page.html.template b/browser/components/newtab/data/content/abouthomecache/page.html.template index cf25f51146ff..f55893077c0e 100644 --- a/browser/components/newtab/data/content/abouthomecache/page.html.template +++ b/browser/components/newtab/data/content/abouthomecache/page.html.template @@ -25,7 +25,7 @@ <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';"> <title data-l10n-id="newtab-page-title"></title> <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/> - <link rel="localization" href="branding/tor-browser-brand.ftl" /> + <link rel="localization" href="branding/brand.ftl" /> <link rel="localization" href="browser/branding/brandings.ftl" /> <link rel="localization" href="browser/newtab/newtab.ftl" /> <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" /> diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js index 6d2b809735eb..a49d80f05cf7 100644 --- a/browser/components/newtab/data/content/activity-stream.bundle.js +++ b/browser/components/newtab/data/content/activity-stream.bundle.js @@ -15890,7 +15890,7 @@ var addUtmParams = __webpack_require__(18); // Note: should match the transition time on .trailheadCards in _Trailhead.scss

const TRANSITION_LENGTH = 500; -const FLUENT_FILES = ["branding/tor-browser-brand.ftl", "browser/branding/brandings.ftl", "browser/branding/sync-brand.ftl", "browser/newtab/onboarding.ftl"]; +const FLUENT_FILES = ["branding/brand.ftl", "browser/branding/brandings.ftl", "browser/branding/sync-brand.ftl", "browser/newtab/onboarding.ftl"]; const helpers = { addFluent(document) { FLUENT_FILES.forEach(file => { diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm index cc2dd91afa01..99c958eab29e 100644 --- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm +++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm @@ -19,7 +19,7 @@ const { FX_MONITOR_OAUTH_CLIENT_ID } = ChromeUtils.import( const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");

const L10N = new Localization([ - "branding/tor-browser-brand.ftl", + "branding/brand.ftl", "browser/branding/brandings.ftl", "browser/branding/sync-brand.ftl", "browser/newtab/onboarding.ftl", diff --git a/browser/components/newtab/lib/RemoteL10n.jsm b/browser/components/newtab/lib/RemoteL10n.jsm index 90c587cc560b..72dcf915d81f 100644 --- a/browser/components/newtab/lib/RemoteL10n.jsm +++ b/browser/components/newtab/lib/RemoteL10n.jsm @@ -67,7 +67,7 @@ class _RemoteL10n { "browser/newtab/asrouter.ftl", "browser/branding/brandings.ftl", "browser/branding/sync-brand.ftl", - "branding/tor-browser-brand.ftl", + "branding/brand.ftl", ], false, Services.prefs.getBoolPref(USE_REMOTE_L10N_PREF, true) diff --git a/browser/components/newtab/prerendered/activity-stream-debug.html b/browser/components/newtab/prerendered/activity-stream-debug.html index c410f5a474bf..72c2d8f6d3ac 100644 --- a/browser/components/newtab/prerendered/activity-stream-debug.html +++ b/browser/components/newtab/prerendered/activity-stream-debug.html @@ -9,7 +9,7 @@ <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';"> <title data-l10n-id="newtab-page-title"></title> <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/> - <link rel="localization" href="branding/tor-browser-brand.ftl" /> + <link rel="localization" href="branding/brand.ftl" /> <link rel="localization" href="browser/branding/brandings.ftl" /> <link rel="localization" href="browser/newtab/newtab.ftl" /> <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" /> diff --git a/browser/components/newtab/prerendered/activity-stream-noscripts.html b/browser/components/newtab/prerendered/activity-stream-noscripts.html index c9d0eb026294..c7ceabc82fd3 100644 --- a/browser/components/newtab/prerendered/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/activity-stream-noscripts.html @@ -9,7 +9,7 @@ <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';"> <title data-l10n-id="newtab-page-title"></title> <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/> - <link rel="localization" href="branding/tor-browser-brand.ftl" /> + <link rel="localization" href="branding/brand.ftl" /> <link rel="localization" href="browser/branding/brandings.ftl" /> <link rel="localization" href="browser/newtab/newtab.ftl" /> <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" /> diff --git a/browser/components/newtab/prerendered/activity-stream.html b/browser/components/newtab/prerendered/activity-stream.html index 809e29c65529..af52351782c1 100644 --- a/browser/components/newtab/prerendered/activity-stream.html +++ b/browser/components/newtab/prerendered/activity-stream.html @@ -9,7 +9,7 @@ <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';"> <title data-l10n-id="newtab-page-title"></title> <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/> - <link rel="localization" href="branding/tor-browser-brand.ftl" /> + <link rel="localization" href="branding/brand.ftl" /> <link rel="localization" href="browser/branding/brandings.ftl" /> <link rel="localization" href="browser/newtab/newtab.ftl" /> <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" /> diff --git a/browser/components/newtab/test/unit/asrouter/RemoteL10n.test.js b/browser/components/newtab/test/unit/asrouter/RemoteL10n.test.js index a57565e29a7d..7552b5236469 100644 --- a/browser/components/newtab/test/unit/asrouter/RemoteL10n.test.js +++ b/browser/components/newtab/test/unit/asrouter/RemoteL10n.test.js @@ -63,7 +63,7 @@ describe("RemoteL10n", () => { "browser/newtab/asrouter.ftl", "browser/branding/brandings.ftl", "browser/branding/sync-brand.ftl", - "branding/tor-browser-brand.ftl", + "branding/brand.ftl", ]); assert.isFalse(args[1]); assert.isFunction(args[2].generateBundles); @@ -81,7 +81,7 @@ describe("RemoteL10n", () => { "browser/newtab/asrouter.ftl", "browser/branding/brandings.ftl", "browser/branding/sync-brand.ftl", - "branding/tor-browser-brand.ftl", + "branding/brand.ftl", ]); assert.isFalse(args[1]); assert.isEmpty(args[2]); diff --git a/browser/components/pioneer/content/pioneer.html b/browser/components/pioneer/content/pioneer.html index 897e1c84444b..dc5dc6031e0b 100644 --- a/browser/components/pioneer/content/pioneer.html +++ b/browser/components/pioneer/content/pioneer.html @@ -8,7 +8,7 @@ <meta charset="utf-8"> <meta http-equiv="Content-Security-Policy" content="default-src chrome: blob:; img-src https:; object-src 'none'"> <link rel="localization" href="browser/branding/brandings.ftl"> - <link rel="localization" href="branding/tor-browser-brand.ftl"> + <link rel="localization" href="branding/brand.ftl"> <!-- Temporary "en-US"-only l10n strings --> <link rel="localization" href="preview/pioneer.ftl"> <link rel="stylesheet" href="chrome://global/skin/in-content/common.css"> diff --git a/browser/components/preferences/dialogs/blocklists.xhtml b/browser/components/preferences/dialogs/blocklists.xhtml index c7141bd86d31..3cccc1952c9a 100644 --- a/browser/components/preferences/dialogs/blocklists.xhtml +++ b/browser/components/preferences/dialogs/blocklists.xhtml @@ -19,7 +19,7 @@ onkeypress="gBlocklistManager.onWindowKeyPress(event);">

<linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/preferences/blocklists.ftl"/> </linkset>

diff --git a/browser/components/preferences/dialogs/browserLanguages.xhtml b/browser/components/preferences/dialogs/browserLanguages.xhtml index e691773b45b9..2e6065870481 100644 --- a/browser/components/preferences/dialogs/browserLanguages.xhtml +++ b/browser/components/preferences/dialogs/browserLanguages.xhtml @@ -19,7 +19,7 @@ helpTopic="change-language">

<linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/preferences/languages.ftl"/> </linkset>

diff --git a/browser/components/preferences/dialogs/clearSiteData.xhtml b/browser/components/preferences/dialogs/clearSiteData.xhtml index 5c3714fb391c..fb289f2d27be 100644 --- a/browser/components/preferences/dialogs/clearSiteData.xhtml +++ b/browser/components/preferences/dialogs/clearSiteData.xhtml @@ -17,7 +17,7 @@ persist="screenX screenY width height">

<linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/preferences/clearSiteData.ftl"/> </linkset> <script src="chrome://browser/content/preferences/dialogs/clearSiteData.js"/> diff --git a/browser/components/preferences/dialogs/connection.xhtml b/browser/components/preferences/dialogs/connection.xhtml index c7fffda08294..ab7c107992bc 100644 --- a/browser/components/preferences/dialogs/connection.xhtml +++ b/browser/components/preferences/dialogs/connection.xhtml @@ -22,7 +22,7 @@ <linkset> <html:link rel="localization" href="browser/preferences/connection.ftl"/> <html:link rel="localization" href="browser/preferences/preferences.ftl"/> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> </linkset>

<script src="chrome://browser/content/utilityOverlay.js"/> diff --git a/browser/components/preferences/dialogs/sanitize.xhtml b/browser/components/preferences/dialogs/sanitize.xhtml index ae97656a4f69..73e7d8acce07 100644 --- a/browser/components/preferences/dialogs/sanitize.xhtml +++ b/browser/components/preferences/dialogs/sanitize.xhtml @@ -23,7 +23,7 @@

<linkset> <html:link rel="localization" href="browser/sanitize.ftl"/> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> </linkset>

<script src="chrome://browser/content/utilityOverlay.js"/> diff --git a/browser/components/preferences/dialogs/siteDataSettings.xhtml b/browser/components/preferences/dialogs/siteDataSettings.xhtml index 834f0d9bb924..6e184c2bd83c 100644 --- a/browser/components/preferences/dialogs/siteDataSettings.xhtml +++ b/browser/components/preferences/dialogs/siteDataSettings.xhtml @@ -20,7 +20,7 @@ persist="screenX screenY width height">

<linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/preferences/siteDataSettings.ftl"/> </linkset>

diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js index 329cbeba163a..6b258429e773 100644 --- a/browser/components/preferences/main.js +++ b/browser/components/preferences/main.js @@ -249,7 +249,7 @@ function getBundleForLocales(newLocales) { return L10nRegistry.generateBundles(locales, resourceIds); } return new Localization( - ["browser/preferences/preferences.ftl", "branding/tor-browser-brand.ftl"], + ["browser/preferences/preferences.ftl", "branding/brand.ftl"], false, { generateBundles } ); diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml index 2d01c5c8b775..b09808e83c45 100644 --- a/browser/components/preferences/preferences.xhtml +++ b/browser/components/preferences/preferences.xhtml @@ -35,7 +35,7 @@

<title data-l10n-id="pref-page-title"></title>

- <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/branding/brandings.ftl"/> <link rel="localization" href="browser/branding/sync-brand.ftl"/> <link rel="localization" href="browser/preferences/preferences.ftl"/> diff --git a/browser/components/preferences/privacy.js b/browser/components/preferences/privacy.js index 7f24a0a659f5..92f35dc78d12 100644 --- a/browser/components/preferences/privacy.js +++ b/browser/components/preferences/privacy.js @@ -31,7 +31,7 @@ ChromeUtils.defineModuleGetter( ); XPCOMUtils.defineLazyGetter(this, "L10n", () => { return new Localization([ - "branding/tor-browser-brand.ftl", + "branding/brand.ftl", "browser/preferences/preferences.ftl", ]); }); diff --git a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html index 98e596a5b81c..8611936b0083 100644 --- a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html +++ b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html @@ -11,7 +11,7 @@ <link rel="icon" href="chrome://browser/skin/privatebrowsing/favicon.svg"/> <link rel="stylesheet" href="chrome://browser/content/aboutPrivateBrowsing.css" media="all"/> <link rel="stylesheet" href="chrome://browser/skin/privatebrowsing/aboutPrivateBrowsing.css" media="all"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/aboutPrivateBrowsing.ftl"/> <script src="chrome://browser/content/aboutPrivateBrowsing.js"></script> <script src="chrome://browser/content/contentSearchHandoffUI.js"></script> diff --git a/browser/components/protections/content/protections.html b/browser/components/protections/content/protections.html index bed9dbd4e145..e7aac37ed6ea 100644 --- a/browser/components/protections/content/protections.html +++ b/browser/components/protections/content/protections.html @@ -8,7 +8,7 @@ <meta charset="utf-8"> <meta http-equiv="Content-Security-Policy" content="default-src chrome: blob:; object-src 'none'"> <link rel="localization" href="browser/branding/brandings.ftl"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/branding/sync-brand.ftl"> <link rel="localization" href="browser/protections.ftl"> <!-- Temporary "en-US"-only l10n strings --> diff --git a/browser/components/sessionstore/content/aboutSessionRestore.xhtml b/browser/components/sessionstore/content/aboutSessionRestore.xhtml index 41dbe15f76bf..05c0e4f732ee 100644 --- a/browser/components/sessionstore/content/aboutSessionRestore.xhtml +++ b/browser/components/sessionstore/content/aboutSessionRestore.xhtml @@ -17,7 +17,7 @@ <link rel="stylesheet" href="chrome://browser/skin/aboutSessionRestore.css" type="text/css" media="all"/> <link rel="icon" href="chrome://global/skin/icons/warning.svg"/> <link rel="localization" href="browser/aboutSessionRestore.ftl"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <script src="chrome://browser/content/aboutSessionRestore.js"/> </head>

diff --git a/devtools/client/aboutdebugging/aboutdebugging.js b/devtools/client/aboutdebugging/aboutdebugging.js index 8a6795de2246..bbe97b7170d5 100644 --- a/devtools/client/aboutdebugging/aboutdebugging.js +++ b/devtools/client/aboutdebugging/aboutdebugging.js @@ -89,7 +89,7 @@ const AboutDebugging = { this.actions.recordTelemetryEvent("open_adbg", { width });

await l10n.init([ - "branding/tor-browser-brand.ftl", + "branding/brand.ftl", "devtools/client/aboutdebugging.ftl", ]);

diff --git a/intl/l10n/L10nRegistry.jsm b/intl/l10n/L10nRegistry.jsm index 69e09f5aa99e..684502ad9002 100644 --- a/intl/l10n/L10nRegistry.jsm +++ b/intl/l10n/L10nRegistry.jsm @@ -139,6 +139,12 @@ class L10nRegistryService { async* generateBundles(requestedLangs, resourceIds) { const resourceIdsDedup = Array.from(new Set(resourceIds)); const sourcesOrder = Array.from(this.sources.keys()).reverse(); + // Always prioritize torbutton sources (keep in sync with generateBundlesSync) + const idxTB = sourcesOrder.indexOf("torbutton"); + if (idxTB > 0) { + sourcesOrder.splice(idxTB, 1); + sourcesOrder.unshift("torbutton"); + } const pseudoStrategy = Services.prefs.getStringPref("intl.l10n.pseudo", ""); for (const locale of requestedLangs) { for await (const dataSets of generateResourceSetsForLocale(locale, sourcesOrder, resourceIdsDedup)) { @@ -172,6 +178,12 @@ class L10nRegistryService { * generateBundlesSync(requestedLangs, resourceIds) { const resourceIdsDedup = Array.from(new Set(resourceIds)); const sourcesOrder = Array.from(this.sources.keys()).reverse(); + // Always prioritize torbutton sources (keep in sync with generateBundles) + const idxTB = sourcesOrder.indexOf("torbutton"); + if (idxTB > 0) { + sourcesOrder.splice(idxTB, 1); + sourcesOrder.unshift("torbutton"); + } const pseudoStrategy = Services.prefs.getStringPref("intl.l10n.pseudo", ""); for (const locale of requestedLangs) { for (const dataSets of generateResourceSetsForLocaleSync(locale, sourcesOrder, resourceIdsDedup)) { diff --git a/security/manager/pki/resources/content/exceptionDialog.xhtml b/security/manager/pki/resources/content/exceptionDialog.xhtml index 5c0c256aa2bb..56be4bc5cbd4 100644 --- a/security/manager/pki/resources/content/exceptionDialog.xhtml +++ b/security/manager/pki/resources/content/exceptionDialog.xhtml @@ -19,7 +19,7 @@ defaultButton="extra2">

<linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="security/certificates/certManager.ftl"/> </linkset>

diff --git a/toolkit/components/certviewer/content/certviewer.html b/toolkit/components/certviewer/content/certviewer.html index bc78dd5fc18e..3f097e48ada5 100644 --- a/toolkit/components/certviewer/content/certviewer.html +++ b/toolkit/components/certviewer/content/certviewer.html @@ -9,7 +9,7 @@ <meta name="viewport" content="width=device-width" /> <meta http-equiv="Content-Security-Policy" content="default-src chrome:; object-src 'none'" /> <link rel="localization" href="toolkit/about/certviewer.ftl"> - <link rel="localization" href="branding/tor-browser-brand.ftl"> + <link rel="localization" href="branding/brand.ftl"> <script defer="defer" src="chrome://global/content/certviewer/pvutils_bundle.js"></script> <script defer="defer" src="chrome://global/content/certviewer/asn1js_bundle.js"></script> <script defer="defer" src="chrome://global/content/certviewer/pkijs_bundle.js"></script> diff --git a/toolkit/content/aboutProfiles.xhtml b/toolkit/content/aboutProfiles.xhtml index 0411a687525d..56a43b3dd155 100644 --- a/toolkit/content/aboutProfiles.xhtml +++ b/toolkit/content/aboutProfiles.xhtml @@ -13,7 +13,7 @@ <link rel="icon" type="image/png" id="favicon" href="chrome://branding/content/icon32.png" /> <link rel="stylesheet" href="chrome://mozapps/skin/aboutProfiles.css" type="text/css" /> <script src="chrome://global/content/aboutProfiles.js" /> - <link rel="localization" href="branding/tor-browser-brand.ftl" /> + <link rel="localization" href="branding/brand.ftl" /> <link rel="localization" href="toolkit/about/aboutProfiles.ftl" /> </head> <body id="body" class="wide-container"> diff --git a/toolkit/content/aboutRights-unbranded.xhtml b/toolkit/content/aboutRights-unbranded.xhtml index 89e212bc4c5d..44c4c350b2d0 100644 --- a/toolkit/content/aboutRights-unbranded.xhtml +++ b/toolkit/content/aboutRights-unbranded.xhtml @@ -14,7 +14,7 @@ <meta http-equiv="Content-Security-Policy" content="default-src chrome:; object-src 'none'" /> <title data-l10n-id="rights-title"></title> <link rel="stylesheet" href="chrome://global/skin/in-content/info-pages.css" type="text/css"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="toolkit/about/aboutRights.ftl"/> </head>

diff --git a/toolkit/content/aboutRights.xhtml b/toolkit/content/aboutRights.xhtml index ff7e2455f312..23dfe8512e1c 100644 --- a/toolkit/content/aboutRights.xhtml +++ b/toolkit/content/aboutRights.xhtml @@ -15,7 +15,7 @@ <title data-l10n-id="rights-title"></title> <link rel="stylesheet" href="chrome://global/skin/in-content/info-pages.css" type="text/css"/> <link rel="stylesheet" href="chrome://global/skin/aboutRights.css" type="text/css"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="toolkit/about/aboutRights.ftl"/> </head>

diff --git a/toolkit/content/aboutServiceWorkers.xhtml b/toolkit/content/aboutServiceWorkers.xhtml index 0d00241f851c..6bf38033e3e6 100644 --- a/toolkit/content/aboutServiceWorkers.xhtml +++ b/toolkit/content/aboutServiceWorkers.xhtml @@ -15,7 +15,7 @@ <link rel="stylesheet" href="chrome://global/skin/about.css" type="text/css" /> <link rel="stylesheet" href="chrome://mozapps/skin/aboutServiceWorkers.css" type="text/css" /> <link rel="localization" href="toolkit/about/aboutServiceWorkers.ftl"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <script src="chrome://global/content/aboutServiceWorkers.js" /> </head> <body id="body"> diff --git a/toolkit/content/aboutSupport.xhtml b/toolkit/content/aboutSupport.xhtml index c6c5be1470d6..ef35864d52b5 100644 --- a/toolkit/content/aboutSupport.xhtml +++ b/toolkit/content/aboutSupport.xhtml @@ -20,7 +20,7 @@ type="text/css"/>

<script src="chrome://global/content/aboutSupport.js"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="toolkit/about/aboutSupport.ftl"/> <link rel="localization" href="toolkit/global/resetProfile.ftl"/> <link rel="localization" href="toolkit/global/processTypes.ftl"/> diff --git a/toolkit/content/aboutTelemetry.xhtml b/toolkit/content/aboutTelemetry.xhtml index dada800b0bfe..1998b12b0655 100644 --- a/toolkit/content/aboutTelemetry.xhtml +++ b/toolkit/content/aboutTelemetry.xhtml @@ -14,7 +14,7 @@ type="text/css"/>

<script src="chrome://global/content/aboutTelemetry.js"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="toolkit/about/aboutTelemetry.ftl"/> </head>

diff --git a/toolkit/content/resetProfile.xhtml b/toolkit/content/resetProfile.xhtml index 6f2b7ab8c22d..7ddafefef0e8 100644 --- a/toolkit/content/resetProfile.xhtml +++ b/toolkit/content/resetProfile.xhtml @@ -17,7 +17,7 @@ <!-- The empty onload event handler is a hack to get the accept button text applied by Fluent. -->

<linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="toolkit/global/resetProfile.ftl"/> </linkset>

diff --git a/toolkit/mozapps/downloads/content/unknownContentType.xhtml b/toolkit/mozapps/downloads/content/unknownContentType.xhtml index a23d03be4a3b..9a9551d59a43 100644 --- a/toolkit/mozapps/downloads/content/unknownContentType.xhtml +++ b/toolkit/mozapps/downloads/content/unknownContentType.xhtml @@ -29,7 +29,7 @@ persist="screenX screenY" aria-describedby="intro location whichIs type from source unknownPrompt"> <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="toolkit/global/unknownContentType.ftl"/> </linkset> <dialog id="unknownContentType"> diff --git a/toolkit/mozapps/extensions/content/aboutaddons.html b/toolkit/mozapps/extensions/content/aboutaddons.html index dc30e8c79f52..afe6a9956501 100644 --- a/toolkit/mozapps/extensions/content/aboutaddons.html +++ b/toolkit/mozapps/extensions/content/aboutaddons.html @@ -17,7 +17,7 @@ <link rel="stylesheet" href="chrome://mozapps/content/extensions/aboutaddons.css"> <link rel="stylesheet" href="chrome://mozapps/content/extensions/shortcuts.css">

- <link rel="localization" href="branding/tor-browser-brand.ftl"> + <link rel="localization" href="branding/brand.ftl"> <link rel="localization" href="toolkit/about/aboutAddons.ftl"> <link rel="localization" href="toolkit/about/abuseReports.ftl">

diff --git a/toolkit/mozapps/extensions/content/abuse-report-frame.html b/toolkit/mozapps/extensions/content/abuse-report-frame.html index 5737db251688..16f84d456c0a 100644 --- a/toolkit/mozapps/extensions/content/abuse-report-frame.html +++ b/toolkit/mozapps/extensions/content/abuse-report-frame.html @@ -10,7 +10,7 @@ <link rel="stylesheet" href="chrome://mozapps/content/extensions/aboutaddons.css"> <link rel="stylesheet" href="chrome://mozapps/content/extensions/abuse-report-panel.css">

- <link rel="localization" href="branding/tor-browser-brand.ftl"> + <link rel="localization" href="branding/brand.ftl"> <link rel="localization" href="toolkit/about/aboutAddons.ftl"> <link rel="localization" href="toolkit/about/abuseReports.ftl">

diff --git a/toolkit/mozapps/extensions/content/blocklist.xhtml b/toolkit/mozapps/extensions/content/blocklist.xhtml index dd3e8ed00244..68d0004044d6 100644 --- a/toolkit/mozapps/extensions/content/blocklist.xhtml +++ b/toolkit/mozapps/extensions/content/blocklist.xhtml @@ -23,7 +23,7 @@ buttonidaccept="blocklist-accept">

<linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="toolkit/extensions/blocklist.ftl"/> </linkset>

diff --git a/toolkit/mozapps/extensions/content/extensions.xhtml b/toolkit/mozapps/extensions/content/extensions.xhtml index 62b1cea9f416..f5b05018f768 100644 --- a/toolkit/mozapps/extensions/content/extensions.xhtml +++ b/toolkit/mozapps/extensions/content/extensions.xhtml @@ -14,7 +14,7 @@ <xhtml:link rel="shortcut icon" href="chrome://mozapps/skin/extensions/extension.svg"/> <linkset> - <xhtml:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <xhtml:link rel="localization" href="branding/brand.ftl"/> <xhtml:link rel="localization" href="toolkit/about/aboutAddons.ftl"/> </linkset>

diff --git a/toolkit/mozapps/preferences/changemp.xhtml b/toolkit/mozapps/preferences/changemp.xhtml index 9329d8b03e49..3b6941b42abf 100644 --- a/toolkit/mozapps/preferences/changemp.xhtml +++ b/toolkit/mozapps/preferences/changemp.xhtml @@ -16,7 +16,7 @@ <script src="chrome://mozapps/content/preferences/changemp.js"/>

<linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="toolkit/preferences/preferences.ftl"/> </linkset>

diff --git a/toolkit/mozapps/update/content/updateElevation.xhtml b/toolkit/mozapps/update/content/updateElevation.xhtml index 34fe998e9ab6..46ddc5ef7d1b 100644 --- a/toolkit/mozapps/update/content/updateElevation.xhtml +++ b/toolkit/mozapps/update/content/updateElevation.xhtml @@ -32,7 +32,7 @@ <script src="chrome://global/content/editMenuOverlay.js"/>

<linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="toolkit/updates/elevation.ftl"/> </linkset>

diff --git a/toolkit/profile/content/createProfileWizard.xhtml b/toolkit/profile/content/createProfileWizard.xhtml index 5726b8ece29c..9b0dea9547ab 100644 --- a/toolkit/profile/content/createProfileWizard.xhtml +++ b/toolkit/profile/content/createProfileWizard.xhtml @@ -17,7 +17,7 @@ >

<linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="toolkit/global/createProfileWizard.ftl"/> </linkset>

diff --git a/toolkit/profile/content/profileDowngrade.xhtml b/toolkit/profile/content/profileDowngrade.xhtml index 9f8c51f4a92b..c2e4c359b79a 100644 --- a/toolkit/profile/content/profileDowngrade.xhtml +++ b/toolkit/profile/content/profileDowngrade.xhtml @@ -17,7 +17,7 @@

<linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/branding/sync-brand.ftl"/> <html:link rel="localization" href="toolkit/global/profileDowngrade.ftl"/> </linkset> diff --git a/toolkit/profile/content/profileSelection.xhtml b/toolkit/profile/content/profileSelection.xhtml index 9e071ad95e2a..182eceff7ee8 100644 --- a/toolkit/profile/content/profileSelection.xhtml +++ b/toolkit/profile/content/profileSelection.xhtml @@ -24,7 +24,7 @@ buttonidcancel="profile-selection-button-cancel">

<linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="toolkit/global/profileSelection.ftl"/> </linkset>