diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
| commit | d76e3920c56d37c942092b7dca20fcaded81c0a5 (patch) | |
| tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /resources-en/src | |
| parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
| parent | 1aa2e09bdbd413eacb677e9fa4b50630530d0656 (diff) | |
| download | idea-d76e3920c56d37c942092b7dca20fcaded81c0a5.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java
Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f
Diffstat (limited to 'resources-en/src')
| -rw-r--r-- | resources-en/src/messages/AntBundle.properties | 2 | ||||
| -rw-r--r-- | resources-en/src/messages/DebuggerBundle.properties | 6 | ||||
| -rw-r--r-- | resources-en/src/search/searchableOptions.xml | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/resources-en/src/messages/AntBundle.properties b/resources-en/src/messages/AntBundle.properties index 8c98c67e4997..118b946b5441 100644 --- a/resources-en/src/messages/AntBundle.properties +++ b/resources-en/src/messages/AntBundle.properties @@ -188,3 +188,5 @@ intention.configure.highlighting.family.name=Configure highlighting intention.configure.highlighting.text=Configure highlighting build.file.properties.maximum.stack.size.label=Maximum &stack size (Mb): run.execution.tab.ant.command.line.hint=Use "-J" prefix to specify JVM arguments +file.type.not.supported=''{0}'' has unsupported format +file.type.xml.not.supported=''{0}'' has unsupported xml format. Probably missing doctype. diff --git a/resources-en/src/messages/DebuggerBundle.properties b/resources-en/src/messages/DebuggerBundle.properties index f245bb59ddaa..c9802d35cb44 100644 --- a/resources-en/src/messages/DebuggerBundle.properties +++ b/resources-en/src/messages/DebuggerBundle.properties @@ -193,9 +193,9 @@ label.compound.renderer.configurable.use.default.renderer=Use default renderer label.compound.renderer.configurable.use.expression=Use following expression: label.compound.renderer.configurable.use.expression.list=Use list of expressions: label.compound.renderer.configurable.apply.to=Apply renderer to objects of type (fully-qualified name): -label.compound.renderer.configurable.when.rendering=When rendering the node -label.compound.renderer.configurable.when.expanding=When expanding the node -label.compound.renderer.configurable.test.can.expand=Test if the node can be expanded (optional): +label.compound.renderer.configurable.when.rendering=When rendering a node +label.compound.renderer.configurable.when.expanding=When expanding a node +label.compound.renderer.configurable.test.can.expand=Test if a node can be expanded (optional): title.compound.renderer.configurable.choose.renderer.reference.type=Renderer Reference Type text.base.renderer.configurable.no.class.patterns=No class patterns configured button.add=Add diff --git a/resources-en/src/search/searchableOptions.xml b/resources-en/src/search/searchableOptions.xml index 86e76b805242..d95b6a1cce81 100644 --- a/resources-en/src/search/searchableOptions.xml +++ b/resources-en/src/search/searchableOptions.xml @@ -4906,10 +4906,6 @@ <option name="data" hit="Data View" /> <option name="view" hit="Data View" /> <option name="database" hit="Database" /> - <option name="explicit" hit="Explicit parameter patterns (RegExp):" /> - <option name="parameter" hit="Explicit parameter patterns (RegExp):" /> - <option name="patterns" hit="Explicit parameter patterns (RegExp):" /> - <option name="regexp" hit="Explicit parameter patterns (RegExp):" /> <option name="column" hit="Include column names" /> <option name="include" hit="Include column names" /> <option name="names" hit="Include column names" /> |