Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1694511 - update references inside the prefs/about:addons to Preferences/Options to use 'Settings' instead, r=preferences-reviewers,fluent-reviewers,jaws,robwu

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D106199
This commit is contained in:
Gijs Kruitbosch 2021-03-24 11:27:27 +00:00
parent 8b97179d90
commit 65f48ef9b0
15 changed files with 47 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/base/content/browser.js
View File

@ -1036,10 +1036,10 @@ const gStoragePressureObserver = {
// The firefox-used space >= 5GB, then guide users to about:preferences
// to clear some data stored on firefox by websites.
[msg] = await document.l10n.formatValues([
{ id: "space-alert-over-5gb-message" },
{ id: "space-alert-over-5gb-message2" },
]);
buttons.push({
"l10n-id": "space-alert-over-5gb-pref-button",
"l10n-id": "space-alert-over-5gb-settings-button",
callback(notificationBar, button) {
// The advanced subpanes are only supported in the old organization, which will
// be removed by bug 1349689.

2
browser/components/preferences/containers.inc.xhtml
View File

@ -9,7 +9,7 @@
<hbox hidden="true"
class="container-header-links"
data-category="paneContainers">
<button id="backContainersButton" class="back-button" data-l10n-id="containers-back-button"/>
<button id="backContainersButton" class="back-button" data-l10n-id="containers-back-button2"/>
</hbox>
<hbox id="header-containers"

2
browser/components/preferences/containers.js
View File

@ -71,7 +71,7 @@ let gContainersPane = {
gContainersPane.onPreferenceCommand(event.originalTarget);
});
prefsButton.setAttribute("value", container.userContextId);
document.l10n.setAttributes(prefsButton, "containers-preferences-button");
document.l10n.setAttributes(prefsButton, "containers-settings-button");
containerButtons.appendChild(prefsButton);
let removeButton = document.createXULElement("button");

2
browser/components/preferences/dialogs/containers.js
View File

@ -14,7 +14,7 @@ function setTitle() {
let winElem = document.documentElement;
if (params.userContextId) {
document.l10n.setAttributes(winElem, "containers-window-update", {
document.l10n.setAttributes(winElem, "containers-window-update-settings", {
name: params.identity.name,
});
} else {

2
browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml
View File

@ -55,7 +55,7 @@
preference="services.sync.engine.addons"/>
</html:div>
<html:div class="sync-engine-prefs">
<checkbox data-l10n-id="sync-engine-prefs"
<checkbox data-l10n-id="sync-engine-settings"
preference="services.sync.engine.prefs"/>
</html:div>
</html:div>

2
browser/components/preferences/experimental.inc.xhtml
View File

@ -25,7 +25,7 @@
<label class="search-header" hidden="true">
<html:h2 id="pane-experimental-search-results-header" data-l10n-id="pane-experimental-search-results-header"/>
</label>
<html:p data-l10n-id="pane-experimental-description"/>
<html:p data-l10n-id="pane-experimental-description2"/>
</groupbox>
</html:template>

4
browser/components/preferences/main.js
View File

@ -1917,9 +1917,9 @@ var gMainPane = {
async reportUpdatePrefWriteError(error) {
let [title, message] = await document.l10n.formatValues([
{ id: "update-setting-write-failure-title" },
{ id: "update-setting-write-failure-title2" },
{
id: "update-setting-write-failure-message",
id: "update-setting-write-failure-message2",
args: { path: error.path },
},
]);

4
browser/components/preferences/preferences.xhtml
View File

@ -27,7 +27,7 @@
Additionally we should remove 'unsafe-inline' from style-src, see Bug 1579160 -->
<meta http-equiv="Content-Security-Policy" content="default-src chrome:; script-src chrome: 'sha512-X8+p/CqXeMdssOoFOf5RV+RpkvnN9pukQ20acGc7LqMgfYLW+lR0WAYT66OtSTpFHE/Qgx/ZCBs2RMc4QrA8FQ=='; img-src chrome: moz-icon: https: data:; style-src chrome: data: 'unsafe-inline'; object-src 'none'" />
<title data-l10n-id="pref-page-title"></title>
<title data-l10n-id="settings-page-title"></title>
<link rel="localization" href="branding/brand.ftl"/>
<link rel="localization" href="browser/branding/brandings.ftl"/>
@ -191,7 +191,7 @@
</hbox>
<search-textbox
id="searchInput"
data-l10n-id="search-input-box"
data-l10n-id="search-input-box2"
data-l10n-attrs="placeholder, style"
hidden="true"/>
</hbox>

2
browser/components/preferences/search.inc.xhtml
View File

@ -82,7 +82,7 @@
</hbox>
</vbox>
<label id="openLocationBarPrivacyPreferences" is="text-link"
data-l10n-id="suggestions-addressbar-settings-generic"/>
data-l10n-id="suggestions-addressbar-settings-generic2"/>
</groupbox>
<groupbox id="oneClickSearchProvidersGroup" data-category="paneSearch" hidden="true">

2
browser/components/preferences/searchResults.inc.xhtml
View File

@ -15,7 +15,7 @@
data-category="paneSearchResults"
hidden="true">
<vbox class="no-results-container">
<label id="sorry-message" data-l10n-id="search-results-empty-message">
<label id="sorry-message" data-l10n-id="search-results-empty-message2">
<html:span data-l10n-name="query" id="sorry-message-query"/>
</label>
<label id="need-help" data-l10n-id="search-results-help-link">

6
browser/components/preferences/sync.inc.xhtml
View File

@ -19,7 +19,7 @@
<hbox>
<vbox flex="1">
<label id="noFxaCaption"><html:h2 data-l10n-id="sync-signedout-caption"/></label>
<description id="noFxaDescription" flex="1" data-l10n-id="sync-signedout-description"/>
<description id="noFxaDescription" flex="1" data-l10n-id="sync-signedout-description2"/>
</vbox>
<vbox>
<image class="fxaSyncIllustration"/>
@ -165,7 +165,7 @@
</label>
<hbox class="sync-group sync-not-configured">
<vbox flex="1">
<label data-l10n-id="prefs-sync-offer-setup-label"/>
<label data-l10n-id="prefs-sync-offer-setup-label2"/>
</vbox>
<vbox>
<button id="syncSetup"
@ -218,7 +218,7 @@
</html:div>
<html:div engine_preference="services.sync.engine.prefs">
<image class="sync-engine-image sync-engine-prefs"/>
<label data-l10n-id="sync-currently-syncing-prefs"/>
<label data-l10n-id="sync-currently-syncing-settings"/>
</html:div>
</html:div>
<hbox>

4
browser/locales/en-US/browser/preferences/containers.ftl
View File

@ -7,8 +7,8 @@ containers-window-new =
.style = width: 45em
# Variables
# $name (String) - Name of the container
containers-window-update =
.title = { $name } Container Preferences
containers-window-update-settings =
.title = { $name } Container Settings
.style = width: 45em
containers-window-close =

82
browser/locales/en-US/browser/preferences/preferences.ftl
View File

@ -9,11 +9,7 @@ do-not-track-option-default-content-blocking-known =
do-not-track-option-always =
.label = Always
pref-page-title =
{ PLATFORM() ->
[windows] Options
*[other] Preferences
}
settings-page-title = Settings
# This is used to determine the width of the search field in about:preferences,
# in order to make the entire placeholder string visible
@ -23,13 +19,9 @@ pref-page-title =
# Notice: The value of the `.style` attribute is a CSS string, and the `width`
# is the name of the CSS property. It is intended only to adjust the element's width.
# Do not translate.
search-input-box =
search-input-box2 =
.style = width: 15.4em
.placeholder =
{ PLATFORM() ->
[windows] Find in Options
*[other] Find in Preferences
}
.placeholder = Find in Settings
managed-notice = Your browser is being managed by your organization.
@ -61,7 +53,7 @@ category-experimental =
.tooltiptext = { -brand-short-name } Experiments
pane-experimental-subtitle = Proceed with Caution
pane-experimental-search-results-header = { -brand-short-name } Experiments: Proceed with Caution
pane-experimental-description = Changing advanced configuration preferences can impact { -brand-short-name } performance or security.
pane-experimental-description2 = Changing advanced configuration settings can impact { -brand-short-name } performance or security.
pane-experimental-reset =
.label = Restore Defaults
@ -127,11 +119,8 @@ extension-controlled-enable = To enable the extension go to <img data-l10n-name=
search-results-header = Search Results
# `<span data-l10n-name="query"></span>` will be replaced by the search term.
search-results-empty-message =
{ PLATFORM() ->
[windows] Sorry! There are no results in Options for “<span data-l10n-name="query"></span>”.
*[other] Sorry! There are no results in Preferences for “<span data-l10n-name="query"></span>”.
}
search-results-empty-message2 =
Sorry! There are no results in Settings for “<span data-l10n-name="query"></span>”.
search-results-help-link = Need help? Visit <a data-l10n-name="url">{ -brand-short-name } Support</a>
@ -454,14 +443,14 @@ update-application-use-service =
.label = Use a background service to install updates
.accesskey = b
update-setting-write-failure-title = Error saving Update preferences
update-setting-write-failure-title2 = Error saving Update settings
# Variables:
# $path (String) - Path to the configuration file
# The newlines between the main text and the line containing the path is
# intentional so the path is easier to identify.
update-setting-write-failure-message =
{ -brand-short-name } encountered an error and didn’t save this change. Note that setting this update preference requires permission to write to the file below. You or a system administrator may be able resolve the error by granting the Users group full control to this file.
update-setting-write-failure-message2 =
{ -brand-short-name } encountered an error and didn’t save this change. Note that changing this update setting requires permission to write to the file below. You or a system administrator may be able resolve the error by granting the Users group full control to this file.
Could not write to file: { $path }
@ -706,7 +695,7 @@ search-show-suggestions-above-history-option =
search-show-suggestions-private-windows =
.label = Show search suggestions in Private Windows
suggestions-addressbar-settings-generic = Change preferences for other address bar suggestions
suggestions-addressbar-settings-generic2 = Change settings for other address bar suggestions
search-suggestions-cant-show = Search suggestions will not be shown in location bar results because you have configured { -brand-short-name } to never remember history.
@ -742,12 +731,8 @@ search-keyword-warning-bookmark = You have chosen a keyword that is currently in
## Containers Section
containers-back-button =
.aria-label =
{ PLATFORM() ->
[windows] Back to Options
*[other] Back to Preferences
}
containers-back-button2 =
.aria-label = Back to Settings
containers-header = Container Tabs
containers-add-button =
.label = Add New Container
@ -757,8 +742,8 @@ containers-new-tab-check =
.label = Select a container for each new tab
.accesskey = S
containers-preferences-button =
.label = Preferences
containers-settings-button =
.label = Settings
containers-remove-button =
.label = Remove
@ -766,7 +751,7 @@ containers-remove-button =
## more discrete ("signed in" no longer means "and sync is connected").
sync-signedout-caption = Take Your Web With You
sync-signedout-description = Synchronize your bookmarks, history, tabs, passwords, add-ons, and preferences across all your devices.
sync-signedout-description2 = Synchronize your bookmarks, history, tabs, passwords, add-ons, and settings across all your devices.
sync-signedout-account-signin2 =
.label = Sign in to { -sync-brand-short-name }…
@ -819,7 +804,7 @@ prefs-sync-setup =
.label = Set Up { -sync-brand-short-name }…
.accesskey = S
prefs-sync-offer-setup-label = Synchronize your bookmarks, history, tabs, passwords, add-ons, and preferences across all your devices.
prefs-sync-offer-setup-label2 = Synchronize your bookmarks, history, tabs, passwords, add-ons, and settings across all your devices.
prefs-sync-now =
.labelnotsyncing = Sync Now
@ -837,11 +822,7 @@ sync-currently-syncing-logins-passwords = Logins and passwords
sync-currently-syncing-addresses = Addresses
sync-currently-syncing-creditcards = Credit cards
sync-currently-syncing-addons = Add-ons
sync-currently-syncing-prefs =
{ PLATFORM() ->
[windows] Options
*[other] Preferences
}
sync-currently-syncing-settings = Settings
sync-change-options =
.label = Change…
@ -890,12 +871,8 @@ sync-engine-addons =
.tooltiptext = Extensions and themes for Firefox desktop
.accesskey = A
sync-engine-prefs =
.label =
{ PLATFORM() ->
[windows] Options
*[other] Preferences
}
sync-engine-settings =
.label = Settings
.tooltiptext = General, Privacy, and Security settings you’ve changed
.accesskey = s
@ -1334,23 +1311,12 @@ certs-devices =
.label = Security Devices…
.accesskey = D
space-alert-over-5gb-pref-button =
.label =
{ PLATFORM() ->
[windows] Open Options
*[other] Open Preferences
}
.accesskey =
{ PLATFORM() ->
[windows] O
*[other] O
}
space-alert-over-5gb-settings-button =
.label = Open Settings
.accesskey = O
space-alert-over-5gb-message =
{ PLATFORM() ->
[windows] { -brand-short-name } is running out of disk space. Website contents may not display properly. You can clear stored data in Options > Privacy & Security > Cookies and Site Data.
*[other] { -brand-short-name } is running out of disk space. Website contents may not display properly. You can clear stored data in Preferences > Privacy & Security > Cookies and Site Data.
}
space-alert-over-5gb-message2 =
{ -brand-short-name } is running out of disk space. Website contents may not display properly. You can clear stored data in Settings > Privacy & Security > Cookies and Site Data.
space-alert-under-5gb-message = { -brand-short-name } is running out of disk space. Website contents may not display properly. Visit “Learn More” to optimize your disk usage for better browsing experience.

51
toolkit/locales/en-US/toolkit/about/aboutAddons.ftl
View File

@ -30,17 +30,9 @@ help-button = Add-ons Support
sidebar-help-button-title =
.title = Add-ons Support
preferences =
{ PLATFORM() ->
[windows] { -brand-short-name } Options
*[other] { -brand-short-name } Preferences
}
sidebar-preferences-button-title =
.title =
{ PLATFORM() ->
[windows] { -brand-short-name } Options
*[other] { -brand-short-name } Preferences
}
addons-settings-button = { -brand-short-name } Settings
sidebar-settings-button-title =
.title = { -brand-short-name } Settings
show-unsigned-extensions-button =
.label = Some extensions could not be verified
@ -48,43 +40,6 @@ show-unsigned-extensions-button =
show-all-extensions-button =
.label = Show all extensions
cmd-show-details =
.label = Show More Information
.accesskey = S
cmd-find-updates =
.label = Find Updates
.accesskey = F
cmd-preferences =
.label =
{ PLATFORM() ->
[windows] Options
*[other] Preferences
}
.accesskey =
{ PLATFORM() ->
[windows] O
*[other] P
}
cmd-enable-theme =
.label = Wear Theme
.accesskey = W
cmd-disable-theme =
.label = Stop Wearing Theme
.accesskey = W
cmd-install-addon =
.label = Install
.accesskey = I
cmd-contribute =
.label = Contribute
.accesskey = C
.tooltiptext = Contribute to the development of this add-on
detail-version =
.label = Version

4
toolkit/mozapps/extensions/content/aboutaddons.js
View File

@ -1980,8 +1980,8 @@ class SidebarFooter extends HTMLElement {
link.id = "preferencesButton";
return link;
},
titleL10nId: "sidebar-preferences-button-title",
labelL10nId: "preferences",
titleL10nId: "sidebar-settings-button-title",
labelL10nId: "addons-settings-button",
onClick: e => {
e.preventDefault();
AMTelemetry.recordLinkEvent({