Merge mozilla-central to autoland
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 14 Jun 2017 14:51:37 +0200
changeset 6502 8bb3e14eb97e2804ec5c2af978c7f4ed4e1b0740
parent 6501 543c35aa2b6c74f52cac95c17584432aa67d3dc8 (current diff)
parent 6499 d7eec2b9c1939120b3ec0a0c4592fbd33ee42e9e (diff)
child 6503 7083d278182546dc224024da51c3e2f0a8dca996
push id1
push useraxel@mozilla.com
push dateTue, 10 Oct 2017 22:14:06 +0000
Merge mozilla-central to autoland X-Channel-Repo: mozilla-central X-Channel-Converted-Revision: 55f3362367576b4ae84c7b8c5213bcda251dc3b5
--- a/devtools/client/inspector.properties
+++ b/devtools/client/inspector.properties
@@ -346,16 +346,21 @@ inspector.sidebar.ruleViewTitle=Rules
 # used in the page.
 inspector.sidebar.computedViewTitle=Computed
 
 # LOCALIZATION NOTE (inspector.sidebar.layoutViewTitle2):
 # This is the title shown in a tab in the side panel of the Inspector panel
 # that corresponds to the tool displaying layout information defined in the page.
 inspector.sidebar.layoutViewTitle2=Layout
 
+# LOCALIZATION NOTE (inspector.sidebar.newBadge):
+# This is the text of a promotion badge showed in the inspector sidebar, next to a panel
+# name. Used to promote new/recent panels such as the layout panel.
+inspector.sidebar.newBadge=new!
+
 # LOCALIZATION NOTE (inspector.sidebar.animationInspectorTitle):
 # This is the title shown in a tab in the side panel of the Inspector panel
 # that corresponds to the tool displaying animations defined in the page.
 inspector.sidebar.animationInspectorTitle=Animations
 
 # LOCALIZATION NOTE (inspector.eyedropper.label): A string displayed as the tooltip of
 # a button in the inspector which toggles the Eyedropper tool
 inspector.eyedropper.label=Grab a color from the page
--- a/devtools/client/layout.properties
+++ b/devtools/client/layout.properties
@@ -41,8 +41,16 @@ layout.overlayMultipleGrids=Overlay Mult
 
 # LOCALIZATION NOTE (layout.overlayGrid): Alternate header for the list of grid container
 # elements if only one item can be selected.
 layout.overlayGrid=Overlay Grid
 
 # LOCALIZATION NOTE (layout.rowColumnPositions): The row and column position of a grid
 # cell shown in the grid cell infobar when hovering over the CSS grid outline.
 layout.rowColumnPositions=Row %S / Column %S
+
+# LOCALIZATION NOTE (layout.promoteMessage): Text displayed in the promote bar for the
+# layout panel.
+layout.promoteMessage=Explore CSS Grids with the latest CSS Grid Inspector.
+
+# LOCALIZATION NOTE (layout.learnMore): Text for the link displayed in the promote bar
+# for the layout panel.
+layout.learnMore=Learn moreā€¦