Merge mozilla-central to mozilla-inbound. a=merge
authorDaniel Varga <dvarga@mozilla.com>
Thu, 31 Jan 2019 06:30:06 +0200
changeset 11069 c8da07e3a562
parent 11068 03168906c617 (current diff)
parent 11063 d6bbe01a204f (diff)
child 11070 8c3fc581c072
push id115
push userfrancesco.lodolo@mozillaitalia.org
push dateThu, 31 Jan 2019 10:46:22 +0000
reviewersmerge
Merge mozilla-central to mozilla-inbound. a=merge X-Channel-Repo: mozilla-central X-Channel-Converted-Revision: bff6b288fe3ed9ce41dd8c0c8e3b87349ae7c0a3 X-Channel-Repo: releases/mozilla-beta X-Channel-Revision: 69a3d7c8d04bb6959e105b0c46d0aed4dda85ad9 X-Channel-Repo: releases/mozilla-release X-Channel-Revision: c2fca1944d8c54d01a5e2d7e13d965e4a6597307
--- a/browser/browser/policies/policies-descriptions.ftl
+++ b/browser/browser/policies/policies-descriptions.ftl
@@ -18,16 +18,18 @@ policy-BlockAboutAddons = Block access t
 policy-BlockAboutConfig = Block access to the about:config page.
 
 policy-BlockAboutProfiles = Block access to the about:profiles page.
 
 policy-BlockAboutSupport = Block access to the about:support page.
 
 policy-Bookmarks = Create bookmarks in the Bookmarks toolbar, Bookmarks menu, or a specified folder inside them.
 
+policy-CaptivePortal = Enable or disable captive portal support.
+
 policy-CertificatesDescription = Add certificates or use built-in certificates.
 
 policy-Cookies = Allow or deny websites to set cookies.
 
 policy-DisableAppUpdate = Prevent the browser from updating.
 
 policy-DisableBuiltinPDFViewer = Disable PDF.js, the built-in PDF viewer in { -brand-short-name }.
 
--- a/toolkit/toolkit/about/aboutAddons.ftl
+++ b/toolkit/toolkit/about/aboutAddons.ftl
@@ -310,10 +310,17 @@ shortcuts-pageAction = Activate page act
 shortcuts-sidebarAction = Toggle the sidebar
 
 shortcuts-modifier-mac = Include Ctrl, Alt, or ⌘
 shortcuts-modifier-other = Include Ctrl or Alt
 shortcuts-invalid = Invalid combination
 shortcuts-letter = Type a letter
 shortcuts-system = Can’t override a { -brand-short-name } shortcut
 
+shortcuts-card-expand-button =
+    { $numberToShow ->
+        *[other] Show { $numberToShow } More
+    }
+
+shortcuts-card-collapse-button = Show Less
+
 go-back-button =
     .tooltiptext = Go back