Commit 57013ee8 authored by Maurice Dauer's avatar Maurice Dauer Committed by Pier Angelo Vendrame
Browse files

Bug 1419501 - Part 2: Rename existing user-facing popup related strings,... 

Bug 1419501 - Part 2: Rename existing user-facing popup related strings, r=fluent-reviewers,bolsson,Gijs

Differential Revision: https://phabricator.services.mozilla.com/D254678
parent eba61c6a

browser/base/content/main-popupset.inc.xhtml

+2 −2
Original line number Diff line number Diff line
@@ -474,9 +474,9 @@ 
  <menupopup id="blockedPopupOptions">

    <menuitem id="blockedPopupAllowSite"/>

    <menuitem id="blockedPopupEdit"

              data-l10n-id="edit-popup-settings"/>

              data-l10n-id="edit-popup-settings2"/>

    <menuitem id="blockedPopupDontShowMessage"

              data-l10n-id="popups-infobar-dont-show-message"

              data-l10n-id="popups-infobar-dont-show-message2"

              type="checkbox"/>

    <menuseparator id="blockedPopupsSeparator"/>

  </menupopup>

browser/base/content/navigator-toolbox.inc.xhtml

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ 
                  <image data-permission-id="persistent-storage" class="blocked-permission-icon persistent-storage-icon" role="button"

                        data-l10n-id="urlbar-persistent-storage-blocked"/>

                  <image data-permission-id="popup" class="blocked-permission-icon popup-icon" role="button"

                        data-l10n-id="urlbar-popup-blocked"/>

                        data-l10n-id="urlbar-popup-blocked2"/>

                  <image data-permission-id="autoplay-media" class="blocked-permission-icon autoplay-media-icon" role="button"

                        data-l10n-id="urlbar-autoplay-media-blocked"/>

                  <image data-permission-id="canvas" class="blocked-permission-icon canvas-icon" role="button"

browser/components/enterprisepolicies/content/aboutPolicies.js

+1 −0
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ function generateDocumentation() { 
    DisableSetDesktopBackground: "DisableSetAsDesktopBackground",

    FirefoxHome: "FirefoxHome2",

    Permissions: "Permissions2",

    PopupBlocking: "PopupBlocking2",

    SanitizeOnShutdown: "SanitizeOnShutdown2",

    SecurityDevices: "SecurityDevices2",

    SkipTermsOfUse: "SkipTermsOfUse2",

browser/components/preferences/dialogs/permissions.js

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ const permissionExceptionsL10n = { 
    description: "permissions-exceptions-cookie-desc",

  },

  popup: {

    window: "permissions-exceptions-popup-window2",

    description: "permissions-exceptions-popup-desc",

    window: "permissions-exceptions-popup-window3",

    description: "permissions-exceptions-popup-desc2",

  },

  "login-saving": {

    window: "permissions-exceptions-saved-passwords-window",

browser/components/preferences/privacy.inc.xhtml

+3 −3
Original line number Diff line number Diff line
@@ -865,7 +865,7 @@ 


  <hbox data-subcategory="permissions-block-popups">

    <checkbox id="popupPolicy" preference="dom.disable_open_during_load"

              data-l10n-id="permissions-block-popups"

              data-l10n-id="permissions-block-popups2"

              flex="1" />

    <button id="popupPolicyButton"

            is="highlightable-button"
@@ -874,8 +874,8 @@ 
            data-l10n-attrs="searchkeywords"

            search-l10n-ids="

              permissions-address,

              permissions-exceptions-popup-window2.title,

              permissions-exceptions-popup-desc,

              permissions-exceptions-popup-window3.title,

              permissions-exceptions-popup-desc2,

            " />

  </hbox>