diff options
author | Tor Norbye <tnorbye@google.com> | 2013-08-15 15:44:44 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2013-08-15 16:41:52 -0700 |
commit | 08600181b2f24618135923b6159eac5e45d963b5 (patch) | |
tree | 0702eb3cac4e88f147ed472f6039d16a0dfbac9c /resources-en | |
parent | d679193f6abc72710352d6f1678b572236651caf (diff) | |
parent | a3c36999a717e0d9923378ca5e0ae1160118c1e6 (diff) | |
download | idea-08600181b2f24618135923b6159eac5e45d963b5.tar.gz |
Merge remote-tracking branch 'aosp/snapshot-master' into merge
Change-Id: Ida4276d7d9013fd01d1c74ae5f206d3af7e98e95
Diffstat (limited to 'resources-en')
-rw-r--r-- | resources-en/src/messages/DebuggerBundle.properties | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/resources-en/src/messages/DebuggerBundle.properties b/resources-en/src/messages/DebuggerBundle.properties index 0d8d27641362..11189d328587 100644 --- a/resources-en/src/messages/DebuggerBundle.properties +++ b/resources-en/src/messages/DebuggerBundle.properties @@ -424,7 +424,7 @@ label.breakpoint.properties.panel.group.actions=Actions label.breakpoint.properties.panel.group.suspend.policy=Suspend policy active.tooltip.title=Evaluation of {0} active.tooltip.suggestion=Click here to view object tree -error.text.invalid.port.0=Invalid port: ''{0,number,#}'' +error.text.invalid.port=Port is not specified error.cannot.invoke.method.in.collected.thread=Cannot invoke method: the invocation thread has been collected title.smart.step.popup=Method to Step Into action.show.watches.description=Shows or hides 'watches' pane |