diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-09-27 10:39:19 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2013-09-27 10:39:19 -0700 |
| commit | 394ca8e4a0fd5cee94dc31162cde8815dd482ddb (patch) | |
| tree | 5397b737ecf636b5c61934312d5d74269bcbae23 /resources-en/src | |
| parent | 26583db33dd99c1ca32c6cd73a60890e223822d6 (diff) | |
| parent | f7998d05c40c24ae66d1972abfcb070552b1d7b5 (diff) | |
| download | idea-394ca8e4a0fd5cee94dc31162cde8815dd482ddb.tar.gz | |
Merge remote-tracking branch 'aosp/snapshot-master' into merge
Conflicts:
build/scripts/utils.gant
Change-Id: Ifef4f52fcbc0506701d1b42cc2f076ca90332e06
Diffstat (limited to 'resources-en/src')
| -rw-r--r-- | resources-en/src/messages/CompilerBundle.properties | 2 | ||||
| -rw-r--r-- | resources-en/src/messages/DebuggerBundle.properties | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/resources-en/src/messages/CompilerBundle.properties b/resources-en/src/messages/CompilerBundle.properties index 902e3dfc3800..b9167ee2738b 100644 --- a/resources-en/src/messages/CompilerBundle.properties +++ b/resources-en/src/messages/CompilerBundle.properties @@ -155,7 +155,7 @@ label.text.main.class=&Main Class: label.text.class.path=Class &Path: element.type.name.artifact=Artifact dialog.title.choose.artifacts=Choose Artifacts -node.text.0.directory.content=''{0}'' directory content +node.text.0.directory.content=''{0}'' directory contents element.type.name.library.files=Library Files node.text.0.compile.output=''{0}'' compile output node.text.0.test.compile.output=''{0}'' test compile output diff --git a/resources-en/src/messages/DebuggerBundle.properties b/resources-en/src/messages/DebuggerBundle.properties index 11189d328587..01984ee7c140 100644 --- a/resources-en/src/messages/DebuggerBundle.properties +++ b/resources-en/src/messages/DebuggerBundle.properties @@ -445,3 +445,5 @@ error.corrupt.debug.info=Debug info might be corrupt: {0} action.kill.process.text=Kill Process action.kill.process.description=Forcibly terminate debugged application evaluation.error.unknown.method.return.type=Cannot resolve method return type: {0} + +java.breakpoint.title=Java Line Breakpoints |