Skip to content

Commit 01af1e9

Browse files
flodoloflodolo
committed
Bug 1826755 - Move Firefox account Fluent term to toolkit, r=fluent-reviewers,settings-reviewers,credential-management-reviewers,fxview-reviewers,mconley,sclements,sgalich,eemeli
Differential Revision: https://phabricator.services.mozilla.com/D175097
1 parent e7f5160 commit 01af1e9

File tree

20 files changed

+62
-61
lines changed

20 files changed

+62
-61
lines changed

‎browser/base/content/browser-sync.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ var gSync = {
361361
"browser/accounts.ftl",
362362
"browser/appmenu.ftl",
363363
"browser/sync.ftl",
364-
"browser/branding/sync-brand.ftl",
364+
"toolkit/branding/accounts.ftl",
365365
],
366366
true
367367
));

‎browser/base/content/browser.xhtml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -61,33 +61,34 @@
6161
persist="screenX screenY width height sizemode"
6262
data-l10n-sync="true">
6363
<head>
64-
<link rel="localization" href="browser/search.ftl"/>
6564
<link rel="localization" href="branding/brand.ftl"/>
66-
<link rel="localization" href="browser/branding/sync-brand.ftl"/>
67-
<link rel="localization" href="toolkit/branding/brandings.ftl"/>
68-
<link rel="localization" href="toolkit/global/textActions.ftl"/>
65+
<link rel="localization" href="browser/allTabsMenu.ftl"/>
66+
<link rel="localization" href="browser/appmenu.ftl"/>
6967
<link rel="localization" href="browser/browser.ftl"/>
7068
<link rel="localization" href="browser/browserContext.ftl"/>
7169
<link rel="localization" href="browser/browserSets.ftl"/>
70+
<link rel="localization" href="browser/firefoxView.ftl"/>
7271
<link rel="localization" href="browser/menubar.ftl"/>
73-
<link rel="localization" href="browser/protectionsPanel.ftl"/>
74-
<link rel="localization" href="browser/appmenu.ftl"/>
72+
<link rel="localization" href="browser/originControls.ftl"/>
7573
<link rel="localization" href="browser/panelUI.ftl"/>
76-
<link rel="localization" href="preview/identityCredentialNotification.ftl"/>
77-
<link rel="localization" href="preview/interventions.ftl"/>
78-
<link rel="localization" href="browser/sidebarMenu.ftl"/>
79-
<link rel="localization" href="browser/allTabsMenu.ftl"/>
8074
<link rel="localization" href="browser/places.ftl"/>
81-
<link rel="localization" href="toolkit/printing/printUI.ftl"/>
75+
<link rel="localization" href="browser/protectionsPanel.ftl"/>
76+
<link rel="localization" href="browser/screenshots.ftl"/>
77+
<link rel="localization" href="browser/search.ftl"/>
78+
<link rel="localization" href="browser/sidebarMenu.ftl"/>
8279
<link rel="localization" href="browser/tabbrowser.ftl"/>
83-
<link rel="localization" href="preview/firefoxSuggest.ftl"/>
84-
<link rel="localization" href="locales-preview/translations.ftl"/>
8580
<link rel="localization" href="browser/toolbarContextMenu.ftl"/>
86-
<link rel="localization" href="browser/screenshots.ftl"/>
87-
<link rel="localization" href="browser/firefoxView.ftl"/>
88-
<link rel="localization" href="browser/webrtcIndicator.ftl"/>
89-
<link rel="localization" href="browser/originControls.ftl"/>
9081
<link rel="localization" href="browser/unifiedExtensions.ftl"/>
82+
<link rel="localization" href="browser/webrtcIndicator.ftl"/>
83+
<link rel="localization" href="toolkit/branding/accounts.ftl"/>
84+
<link rel="localization" href="toolkit/branding/brandings.ftl"/>
85+
<link rel="localization" href="toolkit/global/textActions.ftl"/>
86+
<link rel="localization" href="toolkit/printing/printUI.ftl"/>
87+
<!-- Untranslated FTL files -->
88+
<link rel="localization" href="locales-preview/translations.ftl" />
89+
<link rel="localization" href="preview/firefoxSuggest.ftl" />
90+
<link rel="localization" href="preview/identityCredentialNotification.ftl" />
91+
<link rel="localization" href="preview/interventions.ftl" />
9192

9293
<title data-l10n-id="browser-main-window-title"></title>
9394

‎browser/base/content/macWindow.inc.xhtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111

1212
<linkset>
1313
<html:link rel="localization" href="branding/brand.ftl"/>
14-
<html:link rel="localization" href="toolkit/branding/brandings.ftl"/>
15-
<html:link rel="localization" href="browser/branding/sync-brand.ftl"/>
16-
<html:link rel="localization" href="toolkit/global/textActions.ftl"/>
1714
<html:link rel="localization" href="browser/browserSets.ftl"/>
15+
<html:link rel="localization" href="browser/firefoxView.ftl"/>
1816
<html:link rel="localization" href="browser/menubar.ftl"/>
1917
<html:link rel="localization" href="browser/screenshots.ftl"/>
20-
<html:link rel="localization" href="browser/firefoxView.ftl"/>
18+
<html:link rel="localization" href="toolkit/branding/accounts.ftl"/>
19+
<html:link rel="localization" href="toolkit/branding/brandings.ftl"/>
20+
<html:link rel="localization" href="toolkit/global/textActions.ftl"/>
2121
</linkset>
2222

2323
# All JS files which are needed by browser.xhtml and other top level windows to

‎browser/components/aboutlogins/content/aboutLogins.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<meta name="color-scheme" content="light dark">
1111
<title data-l10n-id="about-logins-page-title"></title>
1212
<link rel="localization" href="branding/brand.ftl">
13-
<link rel="localization" href="browser/branding/sync-brand.ftl">
14-
<link rel="localization" href="toolkit/branding/brandings.ftl">
1513
<link rel="localization" href="browser/aboutLogins.ftl">
14+
<link rel="localization" href="toolkit/branding/accounts.ftl">
15+
<link rel="localization" href="toolkit/branding/brandings.ftl">
1616
<script type="module" src="chrome://browser/content/aboutlogins/components/confirmation-dialog.mjs"></script>
1717
<script type="module" src="chrome://browser/content/aboutlogins/components/remove-logins-dialog.mjs"></script>
1818
<script type="module" src="chrome://browser/content/aboutlogins/components/import-summary-dialog.mjs"></script>

‎browser/components/aboutlogins/content/aboutLoginsImportReport.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<meta name="color-scheme" content="light dark">
1111
<title data-l10n-id="about-logins-import-report-page-title"></title>
1212
<link rel="localization" href="branding/brand.ftl">
13-
<link rel="localization" href="browser/branding/sync-brand.ftl">
14-
<link rel="localization" href="toolkit/branding/brandings.ftl">
1513
<link rel="localization" href="browser/aboutLogins.ftl">
14+
<link rel="localization" href="toolkit/branding/accounts.ftl">
15+
<link rel="localization" href="toolkit/branding/brandings.ftl">
1616
<script type="module" src="chrome://browser/content/aboutlogins/aboutLoginsImportReport.mjs"></script>
1717
<link rel="stylesheet" href="chrome://global/skin/in-content/common.css">
1818
<link rel="stylesheet" href="chrome://browser/content/aboutlogins/aboutLogins.css">

‎browser/components/enterprisepolicies/content/aboutPolicies.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
<title data-l10n-id="about-policies-title"></title>
1414
<link rel="stylesheet" href="chrome://browser/content/policies/aboutPolicies.css">
1515
<link rel="localization" href="branding/brand.ftl">
16-
<link rel="localization" href="toolkit/branding/brandings.ftl">
17-
<link rel="localization" href="browser/branding/sync-brand.ftl">
1816
<link rel="localization" href="browser/aboutPolicies.ftl">
1917
<link rel="localization" href="browser/policies/policies-descriptions.ftl">
18+
<link rel="localization" href="toolkit/branding/accounts.ftl">
19+
<link rel="localization" href="toolkit/branding/brandings.ftl">
2020
<script src="chrome://browser/content/policies/aboutPolicies.js"></script>
2121
</head>
2222
<body id="body">

‎browser/components/firefoxview/firefoxview.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<title data-l10n-id="firefoxview-page-title"></title>
1212
<link rel="icon" type="image/png" id="favicon" href="chrome://branding/content/icon32.png"/>
1313
<link rel="localization" href="branding/brand.ftl">
14-
<link rel="localization" href="toolkit/branding/brandings.ftl"/>
15-
<link rel="localization" href="browser/branding/sync-brand.ftl">
1614
<link rel="localization" href="browser/firefoxView.ftl"/>
15+
<link rel="localization" href="toolkit/branding/accounts.ftl"/>
16+
<link rel="localization" href="toolkit/branding/brandings.ftl"/>
1717
<link rel="stylesheet" href="chrome://global/skin/in-content/common.css">
1818
<link rel="stylesheet" href="chrome://browser/content/firefoxview.css">
1919
<script type="module" src="chrome://browser/content/tab-pickup-container.mjs"></script>

‎browser/components/newtab/aboutwelcome/content/aboutwelcome.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
<link rel="stylesheet" href="chrome://global/skin/in-content/common.css">
1414
<link rel="stylesheet" href="chrome://activity-stream/content/aboutwelcome/aboutwelcome.css">
1515
<link rel="localization" href="branding/brand.ftl"/>
16-
<link rel="localization" href="browser/branding/sync-brand.ftl"/>
17-
<link rel="localization" href="toolkit/branding/brandings.ftl"/>
1816
<link rel="localization" href="browser/newtab/onboarding.ftl"/>
1917
<link rel="localization" href="browser/spotlight.ftl"/>
18+
<link rel="localization" href="toolkit/branding/accounts.ftl"/>
19+
<link rel="localization" href="toolkit/branding/brandings.ftl"/>
2020
</head>
2121
<body>
2222
<div id="multi-stage-message-root" class="welcome-container" role="presentation">

‎browser/components/newtab/lib/OnboardingMessageProvider.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ XPCOMUtils.defineLazyPreferenceGetter(
4747

4848
const L10N = new Localization([
4949
"branding/brand.ftl",
50-
"toolkit/branding/brandings.ftl",
51-
"browser/branding/sync-brand.ftl",
5250
"browser/newtab/onboarding.ftl",
51+
"toolkit/branding/brandings.ftl",
52+
"toolkit/branding/accounts.ftl",
5353
]);
5454

5555
const HOMEPAGE_PREF = "browser.startup.homepage";

‎browser/components/newtab/lib/RemoteL10n.jsm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,11 +202,11 @@ class _RemoteL10n {
202202

203203
return new DOMLocalization(
204204
[
205-
"browser/newtab/asrouter.ftl",
206-
"toolkit/branding/brandings.ftl",
207-
"browser/branding/sync-brand.ftl",
208205
"branding/brand.ftl",
209206
"browser/defaultBrowserNotification.ftl",
207+
"browser/newtab/asrouter.ftl",
208+
"toolkit/branding/accounts.ftl",
209+
"toolkit/branding/brandings.ftl",
210210
],
211211
false
212212
);

‎browser/components/newtab/lib/ToolbarPanelHub.jsm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ class _ToolbarPanelHub {
120120
maybeInsertFTL(win) {
121121
win.MozXULElement.insertFTLIfNeeded("browser/newtab/asrouter.ftl");
122122
win.MozXULElement.insertFTLIfNeeded("toolkit/branding/brandings.ftl");
123-
win.MozXULElement.insertFTLIfNeeded("browser/branding/sync-brand.ftl");
123+
win.MozXULElement.insertFTLIfNeeded("toolkit/branding/accounts.ftl");
124124
}
125125

126126
maybeLoadCustomElement(win) {

‎browser/components/newtab/test/unit/asrouter/RemoteL10n.test.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ describe("RemoteL10n", () => {
7878
// and the third one is the bundle generator.
7979
assert.equal(args.length, 2);
8080
assert.deepEqual(args[0], [
81-
"browser/newtab/asrouter.ftl",
82-
"toolkit/branding/brandings.ftl",
83-
"browser/branding/sync-brand.ftl",
8481
"branding/brand.ftl",
8582
"browser/defaultBrowserNotification.ftl",
83+
"browser/newtab/asrouter.ftl",
84+
"toolkit/branding/accounts.ftl",
85+
"toolkit/branding/brandings.ftl",
8686
]);
8787
assert.isFalse(args[1]);
8888
assert.calledOnce(l10nRegInstance.hasSource);
@@ -100,11 +100,11 @@ describe("RemoteL10n", () => {
100100
// and the third one is null.
101101
assert.equal(args.length, 2);
102102
assert.deepEqual(args[0], [
103-
"browser/newtab/asrouter.ftl",
104-
"toolkit/branding/brandings.ftl",
105-
"browser/branding/sync-brand.ftl",
106103
"branding/brand.ftl",
107104
"browser/defaultBrowserNotification.ftl",
105+
"browser/newtab/asrouter.ftl",
106+
"toolkit/branding/accounts.ftl",
107+
"toolkit/branding/brandings.ftl",
108108
]);
109109
assert.isFalse(args[1]);
110110
assert.calledOnce(l10nRegInstance.hasSource);

‎browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
data-l10n-attrs="buttonlabelaccept, buttonlabelextra2">
2020

2121
<linkset>
22-
<html:link rel="localization" href="browser/branding/sync-brand.ftl"/>
2322
<html:link rel="localization" href="browser/preferences/preferences.ftl"/>
23+
<html:link rel="localization" href="toolkit/branding/accounts.ftl"/>
2424
</linkset>
2525
<script src="chrome://global/content/preferencesBindings.js"/>
2626
<script src="chrome://browser/content/preferences/dialogs/syncChooseWhatToSync.js"/>

‎browser/components/preferences/fxaPairDevice.xhtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<dialog id="fxaPairDeviceDialog1" buttons="accept">
2020
<linkset>
2121
<html:link rel="localization" href="branding/brand.ftl"/>
22-
<html:link rel="localization" href="browser/branding/sync-brand.ftl"/>
2322
<html:link rel="localization" href="browser/preferences/fxaPairDevice.ftl"/>
23+
<html:link rel="localization" href="toolkit/branding/accounts.ftl"/>
2424
</linkset>
2525
<script src="chrome://browser/content/preferences/fxaPairDevice.js"/>
2626

‎browser/components/preferences/preferences.xhtml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,17 @@
2828

2929
<meta name="color-scheme" content="light dark" />
3030
<link rel="localization" href="branding/brand.ftl"/>
31-
<link rel="localization" href="toolkit/branding/brandings.ftl"/>
32-
<link rel="localization" href="browser/branding/sync-brand.ftl"/>
3331
<link rel="localization" href="browser/browser.ftl"/>
34-
<link rel="localization" href="browser/preferences/preferences.ftl"/>
35-
<link rel="localization" href="browser/preferences/moreFromMozilla.ftl"/>
36-
<!-- Used by fontbuilder.js -->
32+
<!-- Used by fontbuilder.js -->
3733
<link rel="localization" href="browser/preferences/fonts.ftl"/>
34+
<link rel="localization" href="browser/preferences/moreFromMozilla.ftl"/>
35+
<link rel="localization" href="browser/preferences/preferences.ftl"/>
36+
<link rel="localization" href="toolkit/branding/accounts.ftl"/>
37+
<link rel="localization" href="toolkit/branding/brandings.ftl"/>
3838
<link rel="localization" href="toolkit/featuregates/features.ftl"/>
3939

4040
<!-- Links below are only used for search-l10n-ids into subdialogs -->
41+
<link rel="localization" href="browser/aboutDialog.ftl"/>
4142
<link rel="localization" href="browser/preferences/addEngine.ftl"/>
4243
<link rel="localization" href="browser/preferences/blocklists.ftl"/>
4344
<link rel="localization" href="browser/preferences/clearSiteData.ftl"/>
@@ -48,12 +49,11 @@
4849
<link rel="localization" href="browser/preferences/permissions.ftl"/>
4950
<link rel="localization" href="browser/preferences/selectBookmark.ftl"/>
5051
<link rel="localization" href="browser/preferences/siteDataSettings.ftl"/>
51-
<link rel="localization" href="browser/aboutDialog.ftl"/>
5252
<link rel="localization" href="browser/sanitize.ftl"/>
53-
<link rel="localization" href="toolkit/updates/history.ftl"/>
54-
<link rel="localization" href="security/certificates/deviceManager.ftl"/>
55-
<link rel="localization" href="security/certificates/certManager.ftl"/>
5653
<link rel="localization" href="preview/firefoxSuggest.ftl"/>
54+
<link rel="localization" href="security/certificates/certManager.ftl"/>
55+
<link rel="localization" href="security/certificates/deviceManager.ftl"/>
56+
<link rel="localization" href="toolkit/updates/history.ftl"/>
5757

5858
<link rel="shortcut icon" href="chrome://global/skin/icons/settings.svg"/>
5959

‎browser/components/protections/content/protections.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
<meta charset="utf-8">
99
<meta http-equiv="Content-Security-Policy" content="default-src chrome: blob:; object-src 'none'">
1010
<meta name="color-scheme" content="light dark">
11-
<link rel="localization" href="toolkit/branding/brandings.ftl"/>
1211
<link rel="localization" href="branding/brand.ftl"/>
13-
<link rel="localization" href="browser/branding/sync-brand.ftl">
1412
<link rel="localization" href="browser/protections.ftl">
13+
<link rel="localization" href="toolkit/branding/accounts.ftl"/>
14+
<link rel="localization" href="toolkit/branding/brandings.ftl"/>
1515
<!-- Temporary "en-US"-only l10n strings -->
1616
<link rel="localization" href="preview/protections.ftl">
1717
<link rel="stylesheet" href="chrome://global/skin/in-content/common.css">

‎browser/components/syncedtabs/sidebar.xhtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<script src="chrome://browser/content/contentTheme.js"/>
1313

1414
<link rel="stylesheet" media="all" href="chrome://browser/skin/syncedtabs/sidebar.css"/>
15-
<link rel="localization" href="browser/branding/sync-brand.ftl"/>
1615
<link rel="localization" href="browser/syncedTabs.ftl"/>
16+
<link rel="localization" href="toolkit/branding/accounts.ftl"/>
1717
<title data-l10n-id="synced-tabs-sidebar-title"/>
1818
</head>
1919

‎toolkit/components/passwordmgr/FirefoxRelay.sys.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ XPCOMUtils.defineLazyGetter(lazy, "fxAccounts", () =>
4444
XPCOMUtils.defineLazyGetter(lazy, "strings", function() {
4545
return new Localization([
4646
"branding/brand.ftl",
47-
"browser/branding/sync-brand.ftl",
48-
"toolkit/branding/brandings.ftl",
4947
"browser/firefoxRelay.ftl",
48+
"toolkit/branding/accounts.ftl",
49+
"toolkit/branding/brandings.ftl",
5050
]);
5151
});
5252

‎browser/locales/en-US/browser/branding/sync-brand.ftl renamed to ‎toolkit/locales/en-US/toolkit/branding/accounts.ftl

File renamed without changes.

‎toolkit/profile/content/profileDowngrade.xhtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
onload="init()">
1717
<linkset>
1818
<html:link rel="localization" href="branding/brand.ftl"/>
19-
<html:link rel="localization" href="browser/branding/sync-brand.ftl"/>
19+
<html:link rel="localization" href="toolkit/branding/accounts.ftl"/>
2020
<html:link rel="localization" href="toolkit/global/profileDowngrade.ftl"/>
2121
</linkset>
2222
<dialog buttons="accept,extra1" buttonpack="end"

0 commit comments

Comments
 (0)