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

Backed out changeset 1ce5079e7de7 (bug 1877883) for causing bc failures at toolkit/mozapps/extensions/test/browser/browser_webapi_install.js CLOSED TREE

Browse Source
This commit is contained in:
Sandor Molnar 2024-02-05 21:39:56 +02:00
parent 8acefc1358
commit da3083b6e7
11 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/base/content/aboutDialog.xhtml
View File

@ -90,7 +90,7 @@
<description id="downloadFailed" data-l10n-id="update-failed">
<label id="failedLink" is="text-link" data-l10n-name="failed-link"/>
</description>
<description id="policyDisabled" data-l10n-id="update-policy-disabled"/>
<description id="policyDisabled" data-l10n-id="update-adminDisabled"/>
<description id="noUpdatesFound" data-l10n-id="update-noUpdatesFound"/>
<description id="checkingFailed" data-l10n-id="aboutdialog-update-checking-failed"/>
<description id="otherInstanceHandlingUpdates" data-l10n-id="update-otherInstanceHandlingUpdates"/>

6
browser/base/content/browser-addons.js
View File

@ -549,7 +549,7 @@ var gXPInstallObserver = {
case "addon-install-disabled": {
let msgId, action, secondaryActions;
if (Services.prefs.prefIsLocked("xpinstall.enabled")) {
msgId = "xpinstall-disabled-by-policy";
msgId = "xpinstall-disabled-locked";
action = null;
secondaryActions = null;
} else {
@ -585,7 +585,7 @@ var gXPInstallObserver = {
case "addon-install-origin-blocked": {
const msgId =
aTopic == "addon-install-policy-blocked"
? "addon-install-domain-blocked-by-policy"
? "addon-domain-blocked-by-policy"
: "xpinstall-prompt";
let messageString = await lazy.l10n.formatValue(msgId);
if (Services.policies) {
@ -856,7 +856,7 @@ var gXPInstallObserver = {
!Services.policies.mayInstallAddon(install.addon)
) {
messageString = lazy.l10n.formatValueSync(
"addon-installation-blocked-by-policy",
"addon-install-blocked-by-policy",
{ addonName: install.name, addonId: install.addon.id }
);
let extensionSettings = Services.policies.getExtensionSettings(

2
browser/components/firefoxview/firefox-view-synced-tabs-error-handler.sys.mjs
View File

@ -153,7 +153,7 @@ export const SyncedTabsErrorHandler = {
},
[ErrorType.FXA_ADMIN_DISABLED]: {
header: "firefoxview-tabpickup-fxa-admin-disabled-header",
description: "firefoxview-tabpickup-fxa-disabled-by-policy-description",
description: "firefoxview-tabpickup-fxa-admin-disabled-description",
// The button is hidden for this errorState, so we don't include the
// buttonLabel property.
},

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

@ -562,7 +562,7 @@
is="highlightable-button"/>
</hbox>
<hbox id="policyDisabled" align="start">
<label data-l10n-id="update-policy-disabled"/>
<label data-l10n-id="update-adminDisabled"/>
<button data-l10n-id="update-checkForUpdatesButton"
is="highlightable-button"
disabled="true"/>

2
browser/locales/en-US/browser/aboutDialog.ftl
View File

@ -31,7 +31,7 @@ update-failed = Update failed. <label data-l10n-name="failed-link">Download the
update-failed-main =
Update failed. <a data-l10n-name="failed-link-main">Download the latest version</a>
update-policy-disabled = Updates disabled by your organization
update-adminDisabled = Updates disabled by your system administrator
update-noUpdatesFound = { -brand-short-name } is up to date
aboutdialog-update-checking-failed = Failed to check for updates.
update-otherInstanceHandlingUpdates = { -brand-short-name } is being updated by another instance

6
browser/locales/en-US/browser/addonNotifications.ftl
View File

@ -40,7 +40,7 @@ site-permission-install-first-prompt-midi-message = This access is not guarantee
##
xpinstall-disabled-by-policy = Software installation has been disabled by your organization.
xpinstall-disabled-locked = Software installation has been disabled by your system administrator.
xpinstall-disabled = Software installation is currently disabled. Click Enable and try again.
xpinstall-disabled-button =
.label = Enable
@ -50,9 +50,9 @@ xpinstall-disabled-button =
# Variables:
# $addonName (String): the name of the add-on.
# $addonId (String): the ID of add-on.
addon-installation-blocked-by-policy = { $addonName } ({ $addonId }) is blocked by your organization.
addon-install-blocked-by-policy = { $addonName } ({ $addonId }) is blocked by your system administrator.
# This message is shown when the installation of add-ons from a domain is blocked by enterprise policy.
addon-install-domain-blocked-by-policy = Your organization prevented this site from asking you to install software on your computer.
addon-domain-blocked-by-policy = Your system administrator prevented this site from asking you to install software on your computer.
addon-install-full-screen-blocked = Add-on installation is not allowed while in or before entering fullscreen mode.
# Variables:

2
browser/locales/en-US/browser/firefoxView.ftl
View File

@ -63,7 +63,7 @@ firefoxview-syncedtabs-loading-header = Sync in progress
firefoxview-syncedtabs-loading-description = When it’s done, you’ll see any tabs you have open on other devices. Check back soon.
firefoxview-tabpickup-fxa-admin-disabled-header = Your organization has disabled sync
firefoxview-tabpickup-fxa-disabled-by-policy-description = { -brand-short-name } is not able to sync tabs between devices because your organization has disabled syncing.
firefoxview-tabpickup-fxa-admin-disabled-description = { -brand-short-name } is not able to sync tabs between devices because your administrator has disabled syncing.
firefoxview-tabpickup-network-offline-header = Check your internet connection
firefoxview-tabpickup-network-offline-description = If you’re using a firewall or proxy, check that { -brand-short-name } has permission to access the web.

2
browser/locales/en-US/browser/places.ftl
View File

@ -101,7 +101,7 @@ places-delete-page =
}
.accesskey = D
# Managed bookmarks are created by enterprise policy and cannot be changed by the user.
# Managed bookmarks are created by an administrator and cannot be changed by the user.
managed-bookmarks =
.label = Managed bookmarks
# This label is used when a managed bookmarks folder doesn't have a name.

2
toolkit/locales/en-US/toolkit/preferences/preferences.ftl
View File

@ -25,7 +25,7 @@ set-password-new-password = Enter new password:
set-password-reenter-password = Re-enter password:
set-password-meter = Password quality meter
set-password-meter-loading = Loading
primary-password-required-by-policy = Your organization requires that you have a Primary Password set in order to save logins and passwords.
primary-password-admin = Your administrator requires that you have a Primary Password set in order to save logins and passwords.
primary-password-description = A Primary Password is used to protect some sensitive information, like logins and passwords, on this device. If you create a Primary Password you will be asked to enter it once per session when { -brand-short-name } retrieves saved information protected by the password.
primary-password-warning = Please make sure you remember the Primary Password you have set. If you forget your Primary Password, you will be unable to access any of the information protected by it on this device.

2
toolkit/mozapps/preferences/changemp.xhtml
View File

@ -27,7 +27,7 @@
<description
id="admin"
class="header"
data-l10n-id="primary-password-required-by-policy"
data-l10n-id="primary-password-admin"
hidden="true"
></description>
<description

1
tools/lint/fluent-lint/exclusions.yml
View File

@ -39,6 +39,7 @@ ID01:
- update-checkForUpdatesButton
- update-updateButton
- update-checkingForUpdates
- update-adminDisabled
- update-noUpdatesFound
- update-otherInstanceHandlingUpdates
- warningDesc-version