Bug 1517572 - [release 116] [breakpoints] fix logpoint debugger.properties (#7646). r=dwalsh
authorJason Laster <jlaster@mozilla.com>
Thu, 03 Jan 2019 15:10:53 -0500
changeset 509595 8d53ab973baa4b2f633f0eac2f6fb2766c427ce7
parent 509594 d3c8bb635a33b79be8517549722dc37ac0eebb39
child 509596 d3524cb549ec299c3922177bd6b077ca3237ea8f
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdwalsh
bugs1517572
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1517572 - [release 116] [breakpoints] fix logpoint debugger.properties (#7646). r=dwalsh
devtools/client/debugger/new/src/components/Editor/GutterMenu.js
devtools/client/locales/en-US/debugger.properties
--- a/devtools/client/debugger/new/src/components/Editor/GutterMenu.js
+++ b/devtools/client/debugger/new/src/components/Editor/GutterMenu.js
@@ -46,29 +46,29 @@ export function gutterMenu({
       label: L10N.getStr("editor.addBreakpoint")
     },
     addLogPoint: {
       id: "node-menu-add-log-point",
       label: L10N.getStr("editor.addLogPoint")
     },
     addConditional: {
       id: "node-menu-add-conditional-breakpoint",
-      label: L10N.getStr("editor.addConditionalBreakpoint")
+      label: L10N.getStr("editor.addConditionBreakpoint")
     },
     removeBreakpoint: {
       id: "node-menu-remove-breakpoint",
       label: L10N.getStr("editor.removeBreakpoint")
     },
     editLogPoint: {
       id: "node-menu-edit-log-point",
       label: L10N.getStr("editor.editLogPoint")
     },
     editConditional: {
       id: "node-menu-edit-conditional-breakpoint",
-      label: L10N.getStr("editor.editConditionalBreakpoint")
+      label: L10N.getStr("editor.editConditionBreakpoint")
     },
     enableBreakpoint: {
       id: "node-menu-enable-breakpoint",
       label: L10N.getStr("editor.enableBreakpoint")
     },
     disableBreakpoint: {
       id: "node-menu-disable-breakpoint",
       label: L10N.getStr("editor.disableBreakpoint")
@@ -102,17 +102,17 @@ export function gutterMenu({
       ),
     accelerator: L10N.getStr("toggleCondPanel.key"),
     ...(breakpoint && breakpoint.condition
       ? gutterItems.editLogPoint
       : gutterItems.addLogPoint)
   };
 
   const conditionalBreakpoint = {
-    accesskey: L10N.getStr("editor.addConditionalBreakpoint.accesskey"),
+    accesskey: L10N.getStr("editor.addConditionBreakpoint.accesskey"),
     disabled: false,
     // Leaving column undefined so pause points can be detected
     click: () =>
       openConditionalPanel(
         breakpoint ? breakpoint.location : { line, column, sourceId }
       ),
     accelerator: L10N.getStr("toggleCondPanel.key"),
     ...(breakpoint && breakpoint.condition
--- a/devtools/client/locales/en-US/debugger.properties
+++ b/devtools/client/locales/en-US/debugger.properties
@@ -483,36 +483,32 @@ editor.disableBreakpoint.accesskey=D
 # LOCALIZATION NOTE (editor.enableBreakpoint): Editor gutter context menu item
 # for enabling a breakpoint on a line.
 editor.enableBreakpoint=Enable breakpoint
 
 # LOCALIZATION NOTE (editor.removeBreakpoint): Editor gutter context menu item
 # for removing a breakpoint on a line.
 editor.removeBreakpoint=Remove breakpoint
 
-# LOCALIZATION NOTE (editor.editBreakpoint): Editor gutter context menu item
-# for setting a breakpoint condition on a line.
-editor.editBreakpoint=Edit breakpoint
-
-# LOCALIZATION NOTE (editor.addConditionalBreakpoint): Editor gutter context
+# LOCALIZATION NOTE (editor.addConditionBreakpoint): Editor gutter context
 # menu item for adding a breakpoint condition on a line.
-editor.addConditionalBreakpoint=Add condition
-editor.addConditionalBreakpoint.accesskey=c
+editor.addConditionBreakpoint=Add condition
+editor.addConditionBreakpoint.accesskey=c
 
-# LOCALIZATION NOTE (editor.editBreakpoint): Editor gutter context menu item
+# LOCALIZATION NOTE (editor.editConditionBreakpoint): Editor gutter context menu item
 # for setting a breakpoint condition on a line.
-editor.editConditionalBreakpoint=Edit condition
+editor.editConditionBreakpoint=Edit condition
 
 # LOCALIZATION NOTE (editor.addLogPoint): Editor gutter context
 # menu item for adding a log point on a line.
 editor.addLogPoint=Add log
 editor.addLogPoint.accesskey=l
 
-# LOCALIZATION NOTE (editor.editLogpoint): Editor gutter context menu item
-# for setting a log point on a line.
+# LOCALIZATION NOTE (editor.editLogPoint): Editor gutter context menu item
+# for editing a log point already set on a line.
 editor.editLogPoint=Edit log
 
 # LOCALIZATION NOTE (editor.conditionalPanel.placeholder): Placeholder text for
 # input element inside ConditionalPanel component
 editor.conditionalPanel.placeholder=This breakpoint will pause when the expression is true
 
 # LOCALIZATION NOTE (editor.conditionalPanel.logPoint.placeholder): Placeholder text for
 # input element inside ConditionalPanel component when a log point is set