diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-19 15:25:05 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-08-19 15:25:05 -0700 |
| commit | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (patch) | |
| tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /resources-en/src | |
| parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
| parent | 02cf98d65c798d368fcec43ed64a001d513bdd4f (diff) | |
| download | idea-060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
build/scripts/tests.gant
Change-Id: I9a1fe25b61f1004e0f62419a5f64e1452644b784
Diffstat (limited to 'resources-en/src')
| -rw-r--r-- | resources-en/src/messages/DebuggerBundle.properties | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/resources-en/src/messages/DebuggerBundle.properties b/resources-en/src/messages/DebuggerBundle.properties index fa51256eb277..f245bb59ddaa 100644 --- a/resources-en/src/messages/DebuggerBundle.properties +++ b/resources-en/src/messages/DebuggerBundle.properties @@ -204,9 +204,6 @@ button.move.up=Move &Up button.move.down=Move &Down label.compound.renderer.configurable.table.header.name=Name label.compound.renderer.configurable.table.header.expression=Expression -debugger.launching.configurable.display.name=Launching -debugger.hotswap.configurable.display.name=HotSwap -label.debugger.launching.configurable.hide.window=Hide debug &window on process termination label.debugger.hotswap.configurable.hotswap.background=Reload classes in &background label.debugger.hotswap.configurable.compile.before.hotswap=Make project before reloading classes label.debugger.hotswap.configurable.enable.vm.hang.warning=Enable 'JVM will hang' warning @@ -214,7 +211,6 @@ label.debugger.hotswap.configurable.reload.classes=Reload classes after compilat label.debugger.hotswap.configurable.always=&Always label.debugger.hotswap.configurable.never=&Never label.debugger.hotswap.configurable.ask=As&k -label.debugger.general.configurable.group.launching=Launching label.debugger.launching.configurable.force.classic.vm=Force Class&ic VM for JDK 1.3.x and earlier label.debugger.launching.configurable.disable.jit=Disable JIT label.debugger.launching.configurable.debugger.transport=Transport: @@ -232,7 +228,7 @@ label.threads.view.configurable.current.thread.on.top=Move current thread to the label.threads.view.configurable.show.stack.frames.for.synthetic.methods=Show stack &frames for synthetic methods label.threads.view.configurable.show.thread.groups=Show thread &groups threads.view.configurable.display.name=Customize Threads View -user.renderers.configurable.display.name=Data Type Renderers +user.renderers.configurable.display.name=Java Data Type Renderers label.user.renderers.configurable.renderer.name=Renderer name: text.user.renderers.configurable.no.renderers=No renderers button.copy=Copy |