diff --git a/java/debugger/impl/src/com/intellij/debugger/memory/ui/InstancesView.java b/java/debugger/impl/src/com/intellij/debugger/memory/ui/InstancesView.java index 4d0ad4456963..38dd586cfc98 100644 --- a/java/debugger/impl/src/com/intellij/debugger/memory/ui/InstancesView.java +++ b/java/debugger/impl/src/com/intellij/debugger/memory/ui/InstancesView.java @@ -2,6 +2,7 @@ package com.intellij.debugger.memory.ui; import com.intellij.CommonBundle; +import com.intellij.debugger.DebuggerBundle; import com.intellij.debugger.DebuggerManager; import com.intellij.debugger.engine.DebugProcessImpl; import com.intellij.debugger.engine.DebuggerUtils; @@ -101,12 +102,12 @@ class InstancesView extends InstancesViewBase { getFilterButton().setPreferredSize(filteringButtonSize); final JBPanel filteringPane = new JBPanel(new BorderLayout(JBUIScale.scale(BORDER_LAYOUT_DEFAULT_GAP), 0)); - final JBLabel sideEffectsWarning = new JBLabel("Warning: filtering may have side effects", SwingConstants.RIGHT); + final JBLabel sideEffectsWarning = new JBLabel(DebuggerBundle.message("warning.filtering.may.have.side.effects"), SwingConstants.RIGHT); sideEffectsWarning.setBorder(JBUI.Borders.emptyTop(1)); sideEffectsWarning.setComponentStyle(UIUtil.ComponentStyle.SMALL); sideEffectsWarning.setFontColor(UIUtil.FontColor.BRIGHTER); - filteringPane.add(new JBLabel("Condition:"), BorderLayout.WEST); + filteringPane.add(new JBLabel(DebuggerBundle.message("condition")), BorderLayout.WEST); filteringPane.add(myFilterConditionEditor.getComponent(), BorderLayout.CENTER); filteringPane.add(getFilterButton(), BorderLayout.EAST); filteringPane.add(sideEffectsWarning, BorderLayout.SOUTH); diff --git a/java/debugger/impl/src/com/intellij/debugger/memory/ui/InstancesWithStackFrameView.java b/java/debugger/impl/src/com/intellij/debugger/memory/ui/InstancesWithStackFrameView.java index dc99ce3155ce..eafc64dc2a28 100644 --- a/java/debugger/impl/src/com/intellij/debugger/memory/ui/InstancesWithStackFrameView.java +++ b/java/debugger/impl/src/com/intellij/debugger/memory/ui/InstancesWithStackFrameView.java @@ -1,6 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.debugger.memory.ui; +import com.intellij.debugger.DebuggerBundle; import com.intellij.debugger.DebuggerManager; import com.intellij.debugger.memory.component.MemoryViewDebugProcessData; import com.intellij.xdebugger.memory.component.InstancesTracker; @@ -55,7 +56,7 @@ class InstancesWithStackFrameView { stackTraceLabel = new JBLabel(TEXT_FOR_ARRAYS, SwingConstants.CENTER); } else { - ActionLink actionLink = new ActionLink("Enable tracking for new instances", + ActionLink actionLink = new ActionLink(DebuggerBundle.message("enable.tracking.for.new.instances"), AllIcons.Debugger.Watch, new AnAction() { @Override diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/CallTracingPropertiesPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/CallTracingPropertiesPanel.java index 6a2381950f26..c8b58001494f 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/CallTracingPropertiesPanel.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/CallTracingPropertiesPanel.java @@ -2,6 +2,7 @@ package com.intellij.debugger.ui.breakpoints; +import com.intellij.CommonBundle; import com.intellij.debugger.DebuggerBundle; import com.intellij.debugger.settings.TraceSettings; import com.intellij.openapi.project.Project; @@ -31,9 +32,9 @@ public class CallTracingPropertiesPanel extends XBreakpointCustomPropertiesPanel @NotNull @Override public JComponent getComponent() { - myStartTracing = new JBCheckBox("Start"); - myEndTracing = new JBCheckBox("Stop"); - JButton filters = new JButton(DebuggerBundle.message("filters")); + myStartTracing = new JBCheckBox(CommonBundle.message("checkbox.start")); + myEndTracing = new JBCheckBox(CommonBundle.message("checkbox.stop")); + JButton filters = new JButton(CommonBundle.message("checkbox.filters")); //DialogUtil.registerMnemonic(myStartTracing); //DialogUtil.registerMnemonic(myEndTracing); @@ -41,7 +42,7 @@ public class CallTracingPropertiesPanel extends XBreakpointCustomPropertiesPanel _panel.add(myStartTracing); _panel.add(myEndTracing); _panel.add(filters); - _panel.setBorder(IdeBorderFactory.createTitledBorder("Tracing")); + _panel.setBorder(IdeBorderFactory.createTitledBorder(DebuggerBundle.message("checkbox.tracing"))); ActionListener listener = new ActionListener() { @Override diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/overhead/OverheadView.java b/java/debugger/impl/src/com/intellij/debugger/ui/overhead/OverheadView.java index c040be03937a..1ee2133fd0f6 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/overhead/OverheadView.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/overhead/OverheadView.java @@ -164,7 +164,7 @@ public class OverheadView extends BorderLayoutPanel implements Disposable, DataP private static class NameColumnInfo extends ColumnInfo { NameColumnInfo() { - super("Name"); + super(CommonBundle.message("title.name")); } @Nullable diff --git a/platform/platform-resources-en/src/messages/CommonBundle.properties b/platform/platform-resources-en/src/messages/CommonBundle.properties index 7e4f62969aca..3d8af34d5eee 100644 --- a/platform/platform-resources-en/src/messages/CommonBundle.properties +++ b/platform/platform-resources-en/src/messages/CommonBundle.properties @@ -85,8 +85,13 @@ title.lenses=Lenses title.lambda=Lambda title.output=Output title.input=Input +title.name=Name dialog.title.remove=Remove dialog.title.merge=Merge -file.type.image=Image \ No newline at end of file +file.type.image=Image + +checkbox.start=start +checkbox.stop=stop +checkbox.filters=filters \ No newline at end of file diff --git a/resources-en/src/messages/DebuggerBundle.properties b/resources-en/src/messages/DebuggerBundle.properties index fb47c2aae621..c66e049bcf3b 100644 --- a/resources-en/src/messages/DebuggerBundle.properties +++ b/resources-en/src/messages/DebuggerBundle.properties @@ -563,4 +563,8 @@ action.failed=Action failed label.object.markup.dialog.mark.referenced=&Mark values referenced from constant fields debugger.data.views.configurable.show.title=Show overhead.toolwindow.title=Overhead -memory.toolwindow.title=Memory \ No newline at end of file +memory.toolwindow.title=Memory +checkbox.tracing=Tracing +enable.tracking.for.new.instances=Enable tracking for new instances +condition=Condition: +warning.filtering.may.have.side.effects=Warning: filtering may have side effects \ No newline at end of file