Merge mozilla-central to mozilla-inbound. on a CLOSED TREE draft
authorAndreea Pavel <apavel@mozilla.com>
Fri, 19 Apr 2019 00:50:26 +0300
changeset 11396 7de9060c85777d6fc1103847675e6456430d5b1e
parent 11395 835a8ec0324ec13ea11b6a62da656cd6a4975b07 (current diff)
parent 11394 e3e803884b5d934cdf4fae0ab04d7943748df61b (diff)
child 11397 d3b347b1edeaf270487b25ea571c6819d876bb3b
push id202
push userflodolo@mozilla.com
push dateFri, 19 Apr 2019 11:15:43 +0000
Merge mozilla-central to mozilla-inbound. on a CLOSED TREE X-Channel-Repo: mozilla-central X-Channel-Converted-Revision: e0a826fcd85be5a510e8b093aa56e53bc27e75ac X-Channel-Repo: releases/mozilla-beta X-Channel-Revision: 7b5b8c302a1ab509c7e995254f0e7a809db07327 X-Channel-Repo: releases/mozilla-release X-Channel-Revision: 15f10287a218572a7fd47acabb40208645b4462d
--- a/browser/browser/preferences/containers.ftl
+++ b/browser/browser/preferences/containers.ftl
@@ -56,16 +56,21 @@ containers-color-orange =
     .label = Orange
 containers-color-red =
     .label = Red
 containers-color-pink =
     .label = Pink
 containers-color-purple =
     .label = Purple
 
+containers-color-toolbar =
+    .label = Match toolbar
+
+containers-icon-fence =
+    .label = Fence
 containers-icon-fingerprint =
     .label = Fingerprint
 containers-icon-briefcase =
     .label = Briefcase
 # String represents a money sign but currently uses a dollar sign
 # so don't change to local currency. See Bug 1291672.
 containers-icon-dollar =
     .label = Dollar sign
--- a/devtools/client/aboutdebugging.ftl
+++ b/devtools/client/aboutdebugging.ftl
@@ -51,16 +51,19 @@ about-debugging-sidebar-item-connect-button-connecting = Connecting…
 
 # Text displayed in buttons found in sidebar items when the connection failed.
 about-debugging-sidebar-item-connect-button-connection-failed = Connection failed
 
 # Text displayed in connection warning on sidebar item of the runtime when connecting to
 # the runtime is taking too much time.
 about-debugging-sidebar-item-connect-button-connection-not-responding = Connection still pending, check for messages on the target browser
 
+# Text displayed as connection error in sidebar item when the connection has timed out.
+about-debugging-sidebar-item-connect-button-connection-timeout = Connection timed out
+
 # Temporary text displayed in sidebar items representing remote runtimes after
 # successfully connecting to them. Temporary UI, do not localize.
 about-debugging-sidebar-item-connected-label = Connected
 
 # Text displayed in sidebar items for remote devices where a compatible browser (eg
 # Firefox) has not been detected yet. Typically, Android phones connected via USB with
 # USB debugging enabled, but where Firefox is not started.
 about-debugging-sidebar-runtime-item-waiting-for-browser = Waiting for browser…
--- a/toolkit/chrome/global/videocontrols.dtd
+++ b/toolkit/chrome/global/videocontrols.dtd
@@ -9,16 +9,20 @@
 <!ENTITY fullscreenButton.enterfullscreenlabel "Full Screen">
 <!ENTITY fullscreenButton.exitfullscreenlabel "Exit Full Screen">
 <!ENTITY castingButton.castingLabel "Cast to Screen">
 <!ENTITY closedCaption.off "Off">
 <!-- LOCALIZATION NOTE (volumeScrubber.label): This label is exposed to
      accessibility software to clarify what the slider is for. -->
 <!ENTITY volumeScrubber.label "Volume slider">
 
+<!-- LOCALIZATION NOTE (pictureInPicture.label): This string is used as part of
+the Picture-in-Picture video toggle button when the mouse is hovering it. -->
+<!ENTITY pictureInPicture.label "Picture-in-Picture">
+
 <!ENTITY stats.media "Media">
 <!ENTITY stats.size "Size">
 <!ENTITY stats.activity "Activity">
 <!ENTITY stats.activityPaused "Paused">
 <!ENTITY stats.activityPlaying "Playing">
 <!ENTITY stats.activityEnded "Ended">
 <!ENTITY stats.activitySeeking "(seeking)">
 <!ENTITY stats.volume "Volume">