summaryrefslogtreecommitdiff
path: root/platform/platform-resources-en/src/messages/OptionsBundle.properties
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2014-09-04 20:44:00 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-09-04 20:44:01 +0000
commitfb5a02906f644d044eb0286bf27d413ba0e05216 (patch)
treebca7d49005d81d10c70bc3f547df041c636b4300 /platform/platform-resources-en/src/messages/OptionsBundle.properties
parent9cde0e3c015174898df8b8f3672185941fad4786 (diff)
parentd245f58efbfc26b13b9b9d5e52e6a83a0d76216c (diff)
downloadidea-fb5a02906f644d044eb0286bf27d413ba0e05216.tar.gz
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/platform-resources-en/src/messages/OptionsBundle.properties')
-rw-r--r--platform/platform-resources-en/src/messages/OptionsBundle.properties16
1 files changed, 16 insertions, 0 deletions
diff --git a/platform/platform-resources-en/src/messages/OptionsBundle.properties b/platform/platform-resources-en/src/messages/OptionsBundle.properties
index 2a78c19bdd82..2c06b31b53f7 100644
--- a/platform/platform-resources-en/src/messages/OptionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/OptionsBundle.properties
@@ -199,14 +199,30 @@ options.xml.display.name=XML
settings.panel.title=Settings
node.configurable.build.tools.display.name=Build Tools
+node.configurable.build.tools.settings.description=<html><body>\
+ Default view for Build Tools
configurable.group.appearance.settings.display.name=Appearance and Behavior
+configurable.group.appearance.settings.description=<html><body>\
+ Default view for Appearance and Behavior
configurable.group.editor.settings.display.name=Editor
+configurable.group.editor.settings.description=<html><body>\
+ Default view for Editor
configurable.group.project.settings.display.name=Current Project
+configurable.group.project.settings.description=<html><body>\
+ Default view for Current Project
configurable.group.build.settings.display.name=Build, Execution, Deployment
+configurable.group.build.settings.description=<html><body>\
+ Default view for Build, Execution, Deployment
configurable.group.language.settings.display.name=Languages and Frameworks
+configurable.group.language.settings.description=<html><body>\
+ Default view for Languages and Frameworks
configurable.group.tools.settings.display.name=Tools
+configurable.group.tools.settings.description=<html><body>\
+ Default view for Tools
configurable.group.null.settings.display.name=Other Settings
+configurable.group.null.settings.description=<html><body>\
+ Default view for Other Settings
configurable.default.project.tooltip=For default project
configurable.current.project.tooltip=For current project