Bug 1381692 - Reorder and rename the Grid display settings checkboxes. r=micah

devtools/client/inspector/grids/components/GridDisplaySettings.js

@@ -65,23 +65,6 @@ module.exports = createClass({
       ),
       dom.ul(
         {},
-        dom.li(
-          {
-            className: "grid-settings-item",
-          },
-          dom.label(
-            {},
-            dom.input(
-              {
-                id: "grid-setting-extend-grid-lines",
-                type: "checkbox",
-                checked: highlighterSettings.showInfiniteLines,
-                onChange: this.onShowInfiniteLinesCheckboxClick,
-              }
-            ),
-            getStr("layout.extendGridLinesInfinitely")
-          )
-        ),
         dom.li(
           {
             className: "grid-settings-item",
@@ -96,7 +79,7 @@ module.exports = createClass({
                 onChange: this.onShowGridLineNumbersCheckboxClick,
               }
             ),
-            getStr("layout.displayNumbersOnLines2")
+            getStr("layout.displayLineNumbers")
           )
         ),
         dom.li(
@@ -113,7 +96,24 @@ module.exports = createClass({
                onChange: this.onShowGridAreasCheckboxClick,
              }
            ),
-           getStr("layout.displayGridAreas")
+           getStr("layout.displayAreaNames")
+          )
+        ),
+        dom.li(
+          {
+            className: "grid-settings-item",
+          },
+          dom.label(
+            {},
+            dom.input(
+              {
+                id: "grid-setting-extend-grid-lines",
+                type: "checkbox",
+                checked: highlighterSettings.showInfiniteLines,
+                onChange: this.onShowInfiniteLinesCheckboxClick,
+              }
+            ),
+            getStr("layout.extendLinesInfinitely")
           )
         )
       )

devtools/client/locales/en-US/layout.properties

@@ -10,17 +10,17 @@
 layout.cannotShowGridOutline=Cannot show outline for this grid
 layout.cannotShowGridOutline.title=The selected grid’s outline cannot effectively fit inside the layout panel for it to be usable.
 
-# LOCALIZATION NOTE (layout.displayGridAreas): Label of the display grid areas setting
+# LOCALIZATION NOTE (layout.displayAreaNames): Label of the display area names setting
 # option in the CSS Grid pane.
-layout.displayGridAreas=Display grid areas
+layout.displayAreaNames=Display area names
 
-# LOCALIZATION NOTE (layout.displayNumbersOnLines2): Label of the display numbers on lines
+# LOCALIZATION NOTE (layout.displayLineNumbers): Label of the display line numbers
 # setting option in the CSS Grid pane.
-layout.displayNumbersOnLines2=Display line numbers
+layout.displayLineNumbers=Display line numbers
 
-# LOCALIZATION NOTE (layout.extendGridLinesInfinitely): Label of the extend grid lines
+# LOCALIZATION NOTE (layout.extendLinesInfinitely): Label of the extend lines
 # infinitely setting option in the CSS Grid pane.
-layout.extendGridLinesInfinitely=Extend grid lines infinitely
+layout.extendLinesInfinitely=Extend lines infinitely
 
 # LOCALIZATION NOTE (layout.header): The accordion header for the CSS Grid pane.
 layout.header=Grid