From 151f01503b4763e2bf3f72c072e68b10813356e1 Mon Sep 17 00:00:00 2001 From: "Dmitry.Krasilschikov" Date: Fri, 10 Jan 2020 11:30:16 +0200 Subject: [PATCH] more localized configurable display names GitOrigin-RevId: 6cd673382a243910bd993a7802baf78e6a92f7ef --- .../AnnotationProcessorsConfigurable.java | 3 ++- .../RemoteRepositoriesConfigurable.java | 3 ++- .../GlobalLibrariesConfigurable.java | 2 +- .../diff/settings/DiffSettingsConfigurable.java | 3 ++- .../ExternalDiffSettingsConfigurable.java | 3 ++- .../options/CodeStyleSchemesConfigurable.java | 3 ++- .../ArrangementRuleAliasesListEditor.java | 3 ++- .../settings/PostfixTemplatesConfigurable.java | 2 +- .../exclude/DetectionExcludesConfigurable.java | 3 ++- .../PlatformContentEntriesConfigurable.java | 3 ++- .../chrome/ChromeSettingsConfigurable.java | 3 ++- .../util/net/ssl/CertificateConfigurable.java | 7 ++----- .../impl/ExternalDependenciesConfigurable.java | 6 +++--- .../ide/plugins/PluginHostsConfigurable.java | 2 +- .../src/messages/ApplicationBundle.properties | 4 +++- .../src/messages/CodeInsightBundle.properties | 3 ++- .../src/messages/DiffBundle.properties | 2 ++ .../src/messages/IdeBundle.properties | 17 ++++++++++++++++- .../src/messages/UIBundle.properties | 3 ++- .../src/messages/VcsBundle.properties | 5 ++++- .../src/messages/XmlBundle.properties | 2 ++ .../src/messages/ProjectBundle.properties | 3 +++ .../IssueNavigationConfigurationPanel.java | 6 ++---- .../VcsContentAnnotationConfigurable.java | 3 ++- .../VcsLimitHistoryConfigurable.java | 3 ++- .../src/messages/IntelliLangBundle.properties | 3 ++- .../intelliLang/InjectionsSettingsUI.java | 2 +- .../builtInHelp/settings/SettingsPage.java | 3 ++- .../ui/CopyrightFormattingConfigurable.java | 3 ++- .../cloud/AppEngineCloudConfigurable.java | 3 ++- .../appengine/facet/AppEngineFacetEditor.java | 3 ++- .../resources/messages/GroovyBundle.properties | 1 + .../compiler/GroovyCompilerConfigurable.java | 5 ++--- .../resources/messages/SvnBundle.properties | 1 + .../config/SvnConfigureProxiesComponent.java | 2 +- .../impl/FileAssociationsConfigurable.java | 3 ++- .../plugins/xpathView/XPathConfigurable.java | 7 ++++--- .../PyContentEntriesModuleConfigurable.java | 3 ++- .../python/facet/PythonSdkEditorTab.java | 3 ++- .../messages/PyBundle.properties | 7 ++++++- .../resources/messages/RestBundle.properties | 3 ++- .../jetbrains/rest/editor/RestConfigurable.java | 3 ++- .../PyIntegratedToolsConfigurable.java | 2 +- .../python/debugger/PyDebuggerConfigurable.java | 3 ++- .../src/messages/CompilerBundle.properties | 3 ++- .../javaee/DefaultSchemasConfigurable.java | 3 ++- .../intellij/javaee/XMLCatalogConfigurable.java | 3 ++- 47 files changed, 111 insertions(+), 55 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java index 7e57f059fc4c..277ce138646f 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java @@ -18,6 +18,7 @@ package com.intellij.compiler.options; import com.intellij.compiler.CompilerConfiguration; import com.intellij.compiler.CompilerConfigurationImpl; import com.intellij.compiler.server.BuildManager; +import com.intellij.openapi.compiler.CompilerBundle; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; @@ -43,7 +44,7 @@ public class AnnotationProcessorsConfigurable implements SearchableConfigurable, @Override public String getDisplayName() { - return "Annotation Processors"; + return CompilerBundle.message("configurable.AnnotationProcessorsConfigurable.display.name"); } @Override diff --git a/java/idea-ui/src/com/intellij/jarRepository/settings/RemoteRepositoriesConfigurable.java b/java/idea-ui/src/com/intellij/jarRepository/settings/RemoteRepositoriesConfigurable.java index 1ea1a4d99cac..d3b3650ab09d 100644 --- a/java/idea-ui/src/com/intellij/jarRepository/settings/RemoteRepositoriesConfigurable.java +++ b/java/idea-ui/src/com/intellij/jarRepository/settings/RemoteRepositoriesConfigurable.java @@ -1,6 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.jarRepository.settings; +import com.intellij.ide.IdeBundle; import com.intellij.jarRepository.JarRepositoryManager; import com.intellij.jarRepository.RemoteRepositoriesConfiguration; import com.intellij.jarRepository.RemoteRepositoryDescription; @@ -209,7 +210,7 @@ public class RemoteRepositoriesConfigurable implements SearchableConfigurable, C @Override public String getDisplayName() { - return "Remote Jar Repositories"; + return IdeBundle.message("configurable.RemoteRepositoriesConfigurable.display.name"); } @Override diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/GlobalLibrariesConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/GlobalLibrariesConfigurable.java index b80d5cd27be5..8a059c79043f 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/GlobalLibrariesConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/GlobalLibrariesConfigurable.java @@ -38,7 +38,7 @@ public class GlobalLibrariesConfigurable extends BaseLibrariesConfigurable { @Override @Nls public String getDisplayName() { - return "Global Libraries"; + return ProjectBundle.message("configurable.GlobalLibrariesConfigurable.display.name"); } @Override diff --git a/platform/diff-impl/src/com/intellij/diff/settings/DiffSettingsConfigurable.java b/platform/diff-impl/src/com/intellij/diff/settings/DiffSettingsConfigurable.java index ce1075282c8e..00aeefef3702 100644 --- a/platform/diff-impl/src/com/intellij/diff/settings/DiffSettingsConfigurable.java +++ b/platform/diff-impl/src/com/intellij/diff/settings/DiffSettingsConfigurable.java @@ -15,6 +15,7 @@ */ package com.intellij.diff.settings; +import com.intellij.openapi.diff.DiffBundle; import com.intellij.openapi.options.SearchableConfigurable; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; @@ -34,7 +35,7 @@ public class DiffSettingsConfigurable implements SearchableConfigurable { @Nls @Override public String getDisplayName() { - return "Diff & Merge"; + return DiffBundle.message("configurable.DiffSettingsConfigurable.display.name"); } @NotNull diff --git a/platform/diff-impl/src/com/intellij/diff/settings/ExternalDiffSettingsConfigurable.java b/platform/diff-impl/src/com/intellij/diff/settings/ExternalDiffSettingsConfigurable.java index 75a3b6122841..1b0a30eb48e5 100644 --- a/platform/diff-impl/src/com/intellij/diff/settings/ExternalDiffSettingsConfigurable.java +++ b/platform/diff-impl/src/com/intellij/diff/settings/ExternalDiffSettingsConfigurable.java @@ -15,6 +15,7 @@ */ package com.intellij.diff.settings; +import com.intellij.openapi.diff.DiffBundle; import com.intellij.openapi.options.SearchableConfigurable; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; @@ -34,7 +35,7 @@ public class ExternalDiffSettingsConfigurable implements SearchableConfigurable @Nls @Override public String getDisplayName() { - return "External Diff Tools"; + return DiffBundle.message("configurable.ExternalDiffSettingsConfigurable.display.name"); } @NotNull diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java index 5d77c1e90e95..c8a0acbc078b 100644 --- a/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java +++ b/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java @@ -8,6 +8,7 @@ import com.intellij.application.options.codeStyle.CodeStyleSchemesModelListener; import com.intellij.application.options.codeStyle.CodeStyleSchemesPanel; import com.intellij.application.options.codeStyle.group.CodeStyleGroupProvider; import com.intellij.application.options.codeStyle.group.CodeStyleGroupProviderFactory; +import com.intellij.openapi.application.ApplicationBundle; import com.intellij.openapi.extensions.BaseExtensionPointName; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.options.Configurable; @@ -243,7 +244,7 @@ public class CodeStyleSchemesConfigurable extends SearchableConfigurable.Parent. @Override public String getDisplayName() { - return "Code Style"; + return ApplicationBundle.message("configurable.CodeStyleSchemesConfigurable.display.name"); } @Override diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/match/tokens/ArrangementRuleAliasesListEditor.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/match/tokens/ArrangementRuleAliasesListEditor.java index 299ec2789cd2..fb3b15c440ce 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/match/tokens/ArrangementRuleAliasesListEditor.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/match/tokens/ArrangementRuleAliasesListEditor.java @@ -16,6 +16,7 @@ package com.intellij.application.options.codeStyle.arrangement.match.tokens; import com.intellij.application.options.codeStyle.arrangement.color.ArrangementColorsProvider; +import com.intellij.openapi.application.ApplicationBundle; import com.intellij.openapi.options.UnnamedConfigurable; import com.intellij.openapi.ui.InputValidator; import com.intellij.openapi.ui.Messages; @@ -99,7 +100,7 @@ public class ArrangementRuleAliasesListEditor extends NamedItemsListEditor myListModel = new CollectionListModel<>(); @@ -68,7 +68,7 @@ public class ExternalDependenciesConfigurable implements SearchableConfigurable, @Nls @Override public String getDisplayName() { - return "Required Plugins"; + return IdeBundle.message("configurable.ExternalDependenciesConfigurable.display.name"); } @Nullable diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginHostsConfigurable.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginHostsConfigurable.java index ce0c5ab55649..407048b8314a 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginHostsConfigurable.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginHostsConfigurable.java @@ -243,7 +243,7 @@ public class PluginHostsConfigurable implements Configurable.NoScroll, Configura @Override public String getDisplayName() { - return "Custom Plugin Repositories"; + return IdeBundle.message("configurable.PluginHostsConfigurable.display.name"); } @Override diff --git a/platform/platform-resources-en/src/messages/ApplicationBundle.properties b/platform/platform-resources-en/src/messages/ApplicationBundle.properties index 42081cdd5d9c..7409224968ec 100644 --- a/platform/platform-resources-en/src/messages/ApplicationBundle.properties +++ b/platform/platform-resources-en/src/messages/ApplicationBundle.properties @@ -899,4 +899,6 @@ light.edit.close.cancel=Cancel light.edit.exit.title=Save Documents light.edit.exit.message=There are unsaved documents.\nDo you want to save the changes? -custom.option=Custom... \ No newline at end of file +custom.option=Custom... +configurable.CodeStyleSchemesConfigurable.display.name=Code Style +configurable.ArrangementRuleAliasesListEditor.display.name=Custom Composite Tokens \ No newline at end of file diff --git a/platform/platform-resources-en/src/messages/CodeInsightBundle.properties b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties index c9609234e4da..512c612c6733 100644 --- a/platform/platform-resources-en/src/messages/CodeInsightBundle.properties +++ b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties @@ -615,4 +615,5 @@ parameter.info.progress.title=Calculating parameter info... parameter.info.indexing.mode.not.supported=Parameter Info is unavailable during indexing auto.popup.progress.title=Calculating auto popup info... -configurable.EqualsHashCodeTemplatesPanel.display.name=Templates \ No newline at end of file +configurable.EqualsHashCodeTemplatesPanel.display.name=Templates +configurable.PostfixTemplatesConfigurable.display.name=Postfix Completion \ No newline at end of file diff --git a/platform/platform-resources-en/src/messages/DiffBundle.properties b/platform/platform-resources-en/src/messages/DiffBundle.properties index 004890eac32e..7ea12c162a59 100644 --- a/platform/platform-resources-en/src/messages/DiffBundle.properties +++ b/platform/platform-resources-en/src/messages/DiffBundle.properties @@ -108,3 +108,5 @@ merge.version.title.their.with.revision=Changes from server (revision {0}) merge.version.title.base=Base version merge.version.title.merged=Merged version merge.version.title.merged.result=Result +configurable.DiffSettingsConfigurable.display.name=Diff & Merge +configurable.ExternalDiffSettingsConfigurable.display.name=External Diff Tools diff --git a/platform/platform-resources-en/src/messages/IdeBundle.properties b/platform/platform-resources-en/src/messages/IdeBundle.properties index 4762e7cc1b70..0d880074c4f5 100644 --- a/platform/platform-resources-en/src/messages/IdeBundle.properties +++ b/platform/platform-resources-en/src/messages/IdeBundle.properties @@ -1423,4 +1423,19 @@ configurable.JavaFxSettingsConfigurable.display.name=JavaFX configurable.VagrantConfigurable.display.name=Vagrant configurable.UIImpl.display.name=XSLT configurable.TerminalOptionsConfigurable.display.name=Terminal -configurable.CopyrightProjectConfigurable.display.name=Copyright \ No newline at end of file +configurable.CopyrightProjectConfigurable.display.name=Copyright +configurable.AppEngineFacetEditor.display.name=Google App Engine +configurable.ChromeSettingsConfigurable.display.name=Chrome Settings +configurable.CopyrightFormattingConfigurable.display.name=Formatting +configurable.DockerExtraHostConfigurable.display.name=Extra hosts +configurable.EmbeddedSettingsConfigurable.display.name=Embedded Development +configurable.ExceptionAnalyzerConfigurable.display.name=Exception Analyzer +configurable.FileAssociationsConfigurable.display.name=XSLT File Associations +configurable.IDEtalkConfiguration.display.name=IDEtalk Options +configurable.PluginHostsConfigurable.display.name=Custom Plugin Repositories +configurable.RemoteRepositoriesConfigurable.display.name=Remote Jar Repositories +configurable.SettingsPage.display.name=Bundled Web Help +configurable.TimeTrackingConfigurable.display.name=Time Tracking +configurable.XPathConfigurable.display.name=XPath Viewer +configurable.AppEngineCloudConfigurable.display.name=Google App Engine Account +configurable.ExternalDependenciesConfigurable.display.name=Required Plugins \ No newline at end of file diff --git a/platform/platform-resources-en/src/messages/UIBundle.properties b/platform/platform-resources-en/src/messages/UIBundle.properties index 148c2959e585..a390970fb5a5 100644 --- a/platform/platform-resources-en/src/messages/UIBundle.properties +++ b/platform/platform-resources-en/src/messages/UIBundle.properties @@ -225,4 +225,5 @@ master.detail.err.empty.name=Name should contain non-space characters master.detail.err.duplicate={0} with the name ''{1}'' already exists configurable.CoverageOptionsConfigurable.display.name=Coverage configurable.GenerateToStringConfigurable.display.name=Settings -configurable.TemplatesPanel.display.name=Templates \ No newline at end of file +configurable.TemplatesPanel.display.name=Templates +configurable.CertificateConfigurable.display.name=Server Certificates \ No newline at end of file diff --git a/platform/platform-resources-en/src/messages/VcsBundle.properties b/platform/platform-resources-en/src/messages/VcsBundle.properties index a070045ace97..0883616a0118 100644 --- a/platform/platform-resources-en/src/messages/VcsBundle.properties +++ b/platform/platform-resources-en/src/messages/VcsBundle.properties @@ -669,4 +669,7 @@ prefer.commit.timestamp.action.description=Show the time when the change was com configurable.ChangelistConflictConfigurable.display.name=Changelists configurable.VcsBackgroundOperationsConfigurable.display.name=Background configurable.VcsDirectoryConfigurationPanel.display.name=Mappings -configurable.VcsGeneralConfigurationConfigurable.display.name=Confirmation \ No newline at end of file +configurable.VcsGeneralConfigurationConfigurable.display.name=Confirmation +configurable.IssueNavigationConfigurationPanel.display.name=Issue Navigation +configurable.VcsContentAnnotationConfigurable.display.name=Show recently changed +configurable.VcsLimitHistoryConfigurable.display.name=Limit History \ No newline at end of file diff --git a/platform/platform-resources-en/src/messages/XmlBundle.properties b/platform/platform-resources-en/src/messages/XmlBundle.properties index bd5973282e34..b0a72ece96b9 100644 --- a/platform/platform-resources-en/src/messages/XmlBundle.properties +++ b/platform/platform-resources-en/src/messages/XmlBundle.properties @@ -271,3 +271,5 @@ html.inspections.check.required.title=Missing required 'title' attribute html.inspections.check.required.title.element=Missing required 'title' element html.inspections.form.input.without.label=Missing associated label configurable.XmlEmmetConfigurable.display.name=HTML +configurable.XMLCatalogConfigurable.display.name=XML Catalog +configurable.DefaultSchemasConfigurable.display.name=Default XML Schemas diff --git a/platform/projectModel-impl/src/messages/ProjectBundle.properties b/platform/projectModel-impl/src/messages/ProjectBundle.properties index 6e56cd6bb7c3..c44aed129360 100644 --- a/platform/projectModel-impl/src/messages/ProjectBundle.properties +++ b/platform/projectModel-impl/src/messages/ProjectBundle.properties @@ -493,3 +493,6 @@ external.annotations.external.option=Add &externally library.docs.node=Documentation configurable.ErrorPaneConfigurable.display.name=Problems +configurable.DetectionExcludesConfigurable.display.name=Framework Detection Excludes +configurable.GlobalLibrariesConfigurable.display.name=Global Libraries +configurable.PlatformContentEntriesConfigurable.display.name=Project Structure diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueNavigationConfigurationPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueNavigationConfigurationPanel.java index f8fc2327c217..54b388a1f8de 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueNavigationConfigurationPanel.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueNavigationConfigurationPanel.java @@ -19,7 +19,6 @@ import com.intellij.util.IconUtil; import com.intellij.util.ui.ColumnInfo; import com.intellij.util.ui.ListTableModel; import com.intellij.xml.util.XmlStringUtil; -import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -158,10 +157,9 @@ public class IssueNavigationConfigurationPanel extends JPanel implements Searcha myLinkTable.setModel(myModel); } - @Override - @Nls + @Override public String getDisplayName() { - return "Issue Navigation"; + return VcsBundle.message("configurable.IssueNavigationConfigurationPanel.display.name"); } @Override diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsContentAnnotationConfigurable.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsContentAnnotationConfigurable.java index 99fa430004ab..bf0029b69970 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsContentAnnotationConfigurable.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsContentAnnotationConfigurable.java @@ -3,6 +3,7 @@ package com.intellij.openapi.vcs.configurable; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; +import com.intellij.openapi.vcs.VcsBundle; import com.intellij.openapi.vcs.contentAnnotation.VcsContentAnnotationSettings; import org.jetbrains.annotations.Nls; @@ -24,7 +25,7 @@ public class VcsContentAnnotationConfigurable extends VcsCheckBoxWithSpinnerConf @Nls @Override public String getDisplayName() { - return "Show recently changed"; + return VcsBundle.message("configurable.VcsContentAnnotationConfigurable.display.name"); } @Override diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsLimitHistoryConfigurable.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsLimitHistoryConfigurable.java index 8e948a49d1a0..52d3fb1d6fba 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsLimitHistoryConfigurable.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsLimitHistoryConfigurable.java @@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.configurable; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; +import com.intellij.openapi.vcs.VcsBundle; import com.intellij.openapi.vcs.VcsConfiguration; import org.jetbrains.annotations.Nls; @@ -39,7 +40,7 @@ public class VcsLimitHistoryConfigurable extends VcsCheckBoxWithSpinnerConfigura @Nls @Override public String getDisplayName() { - return "Limit History"; + return VcsBundle.message("configurable.VcsLimitHistoryConfigurable.display.name"); } @Override diff --git a/plugins/IntelliLang/src/messages/IntelliLangBundle.properties b/plugins/IntelliLang/src/messages/IntelliLangBundle.properties index 37e7643e1400..f019eb29377c 100644 --- a/plugins/IntelliLang/src/messages/IntelliLangBundle.properties +++ b/plugins/IntelliLang/src/messages/IntelliLangBundle.properties @@ -3,4 +3,5 @@ intelliLang.uninject.language.action.text=Uninject language or reference intelliLang.suggest.insert.annotation=Do you want to insert annotation? intelliLang.suggest.insert.comment=Do you want to insert comment? intelliLang.temporary.injected={0} was temporarily injected. -configurable.AdvancedSettingsUI.display.name=Advanced \ No newline at end of file +configurable.AdvancedSettingsUI.display.name=Advanced +configurable.InjectionsSettingsUI.display.name=Language Injections \ No newline at end of file diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java index 86fc6ed870fc..30d12ad2996d 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java @@ -431,7 +431,7 @@ public final class InjectionsSettingsUI extends SearchableConfigurable.Parent.Ab @Override @Nls public String getDisplayName() { - return "Language Injections"; + return IntelliLangBundle.message("configurable.InjectionsSettingsUI.display.name"); } @Override diff --git a/plugins/built-in-help/src/com/jetbrains/builtInHelp/settings/SettingsPage.java b/plugins/built-in-help/src/com/jetbrains/builtInHelp/settings/SettingsPage.java index 9df915e24f4c..3a613bd82feb 100644 --- a/plugins/built-in-help/src/com/jetbrains/builtInHelp/settings/SettingsPage.java +++ b/plugins/built-in-help/src/com/jetbrains/builtInHelp/settings/SettingsPage.java @@ -1,6 +1,7 @@ // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.jetbrains.builtInHelp.settings; +import com.intellij.ide.IdeBundle; import com.intellij.ide.browsers.WebBrowser; import com.intellij.ide.browsers.WebBrowserManager; import com.intellij.openapi.options.Configurable; @@ -27,7 +28,7 @@ public class SettingsPage implements Configurable { @Override public String getDisplayName() { - return "Bundled Web Help"; + return IdeBundle.message("configurable.SettingsPage.display.name"); } @Override diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java index e89ce32e3795..52a07fcad8e3 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java @@ -2,6 +2,7 @@ package com.maddyhome.idea.copyright.ui; +import com.intellij.ide.IdeBundle; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; @@ -31,7 +32,7 @@ public class CopyrightFormattingConfigurable extends SearchableConfigurable.Pare @Override @Nls public String getDisplayName() { - return "Formatting"; + return IdeBundle.message("configurable.CopyrightFormattingConfigurable.display.name"); } @Override diff --git a/plugins/google-app-engine/source/com/intellij/appengine/cloud/AppEngineCloudConfigurable.java b/plugins/google-app-engine/source/com/intellij/appengine/cloud/AppEngineCloudConfigurable.java index daac53289b6b..2631e609ac8b 100644 --- a/plugins/google-app-engine/source/com/intellij/appengine/cloud/AppEngineCloudConfigurable.java +++ b/plugins/google-app-engine/source/com/intellij/appengine/cloud/AppEngineCloudConfigurable.java @@ -2,6 +2,7 @@ package com.intellij.appengine.cloud; import com.intellij.appengine.facet.AppEngineAccountDialog; +import com.intellij.ide.IdeBundle; import com.intellij.ide.util.PropertiesComponent; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.project.Project; @@ -85,7 +86,7 @@ public class AppEngineCloudConfigurable extends RemoteServerConfigurable impleme @Nls @Override public String getDisplayName() { - return "Google App Engine Account"; + return IdeBundle.message("configurable.AppEngineCloudConfigurable.display.name"); } @Nullable diff --git a/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineFacetEditor.java b/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineFacetEditor.java index 3c34bd4e9fce..580ec726c04d 100644 --- a/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineFacetEditor.java +++ b/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineFacetEditor.java @@ -19,6 +19,7 @@ import com.intellij.appengine.sdk.impl.AppEngineSdkUtil; import com.intellij.appengine.util.AppEngineUtil; import com.intellij.facet.Facet; import com.intellij.facet.ui.*; +import com.intellij.ide.IdeBundle; import com.intellij.ide.presentation.VirtualFilePresentation; import com.intellij.openapi.fileChooser.FileChooser; import com.intellij.openapi.fileChooser.FileChooserDescriptor; @@ -104,7 +105,7 @@ public class AppEngineFacetEditor extends FacetEditorTab { @Override @Nls public String getDisplayName() { - return "Google App Engine"; + return IdeBundle.message("configurable.AppEngineFacetEditor.display.name"); } @Override diff --git a/plugins/groovy/groovy-psi/resources/messages/GroovyBundle.properties b/plugins/groovy/groovy-psi/resources/messages/GroovyBundle.properties index 879e20627a4a..805dfaf83b7b 100644 --- a/plugins/groovy/groovy-psi/resources/messages/GroovyBundle.properties +++ b/plugins/groovy/groovy-psi/resources/messages/GroovyBundle.properties @@ -440,3 +440,4 @@ intention.category.groovy.style=Groovy/Groovy-style intention.category.control.flow=Groovy/Control flow intention.category.groovy.declaration=Groovy/Declaration intention.category.groovy.other=Groovy/Other +configurable.GroovyCompilerConfigurable.display.name=Groovy Compiler diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfigurable.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfigurable.java index 91b95632344e..42f13314961a 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfigurable.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfigurable.java @@ -30,9 +30,9 @@ import com.intellij.util.ui.GridBag; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UI; import com.intellij.util.ui.UIUtil; -import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.jps.model.java.JavaModuleSourceRootTypes; +import org.jetbrains.plugins.groovy.GroovyBundle; import javax.swing.*; import javax.swing.event.HyperlinkEvent; @@ -92,9 +92,8 @@ public class GroovyCompilerConfigurable implements SearchableConfigurable, Confi } @Override - @Nls public String getDisplayName() { - return "Groovy Compiler"; + return GroovyBundle.message("configurable.GroovyCompilerConfigurable.display.name"); } @Override diff --git a/plugins/svn4idea/resources/messages/SvnBundle.properties b/plugins/svn4idea/resources/messages/SvnBundle.properties index 84178d40331c..aa44865e88d0 100644 --- a/plugins/svn4idea/resources/messages/SvnBundle.properties +++ b/plugins/svn4idea/resources/messages/SvnBundle.properties @@ -667,3 +667,4 @@ dialog.create.branch.or.tag.from.working.copy.warning=Use this variant to
It's recommended to update working copy before branch creation therefore. exportable.SvnDiffSettings.presentable.name=Svn Diff +configurable.SvnConfigureProxiesComponent.display.name=HTTP Proxies Configuration diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java index 60a9e215a8ca..ed62dded6b1e 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java @@ -53,7 +53,7 @@ public class SvnConfigureProxiesComponent extends MasterDetailsComponent { @Override public String getDisplayName() { - return "HTTP Proxies Configuration"; + return SvnBundle.message("configurable.SvnConfigureProxiesComponent.display.name"); } @Override diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/FileAssociationsConfigurable.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/FileAssociationsConfigurable.java index 97df45a16163..126e5b5746e8 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/FileAssociationsConfigurable.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/FileAssociationsConfigurable.java @@ -16,6 +16,7 @@ package org.intellij.lang.xpath.xslt.associations.impl; import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; +import com.intellij.ide.IdeBundle; import com.intellij.ide.util.treeView.TreeState; import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.components.*; @@ -40,7 +41,7 @@ public final class FileAssociationsConfigurable implements SearchableConfigurabl @Override public String getDisplayName() { - return "XSLT File Associations"; + return IdeBundle.message("configurable.FileAssociationsConfigurable.display.name"); } @Override diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathConfigurable.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathConfigurable.java index 6fff1c57d4dd..fd6bfc4eae98 100644 --- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathConfigurable.java +++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathConfigurable.java @@ -15,6 +15,7 @@ */ package org.intellij.plugins.xpathView; +import com.intellij.ide.IdeBundle; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import org.intellij.plugins.xpathView.ui.ConfigUI; @@ -27,9 +28,9 @@ public class XPathConfigurable implements SearchableConfigurable { private ConfigUI configUI; @Override - public String getDisplayName() { - return "XPath Viewer"; - } + public String getDisplayName() { + return IdeBundle.message("configurable.XPathConfigurable.display.name"); + } @Override @Nullable diff --git a/python/ide/impl/src/com/jetbrains/python/configuration/PyContentEntriesModuleConfigurable.java b/python/ide/impl/src/com/jetbrains/python/configuration/PyContentEntriesModuleConfigurable.java index c4d481feb560..9339952f7ad4 100644 --- a/python/ide/impl/src/com/jetbrains/python/configuration/PyContentEntriesModuleConfigurable.java +++ b/python/ide/impl/src/com/jetbrains/python/configuration/PyContentEntriesModuleConfigurable.java @@ -27,6 +27,7 @@ import com.intellij.openapi.roots.ModifiableRootModel; import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.roots.ui.configuration.DefaultModulesProvider; import com.intellij.openapi.roots.ui.configuration.FacetsProvider; +import com.jetbrains.python.PyBundle; import com.jetbrains.python.module.PyContentEntriesEditor; import org.jetbrains.annotations.NotNull; import org.jetbrains.jps.model.java.JavaSourceRootType; @@ -46,7 +47,7 @@ public class PyContentEntriesModuleConfigurable extends SearchableConfigurable.P @Override public String getDisplayName() { - return "Project Structure"; + return PyBundle.message("configurable.PyContentEntriesModuleConfigurable.display.name"); } @Override diff --git a/python/pluginJava/com/jetbrains/python/facet/PythonSdkEditorTab.java b/python/pluginJava/com/jetbrains/python/facet/PythonSdkEditorTab.java index 132c5628ad88..437c98b99aa4 100644 --- a/python/pluginJava/com/jetbrains/python/facet/PythonSdkEditorTab.java +++ b/python/pluginJava/com/jetbrains/python/facet/PythonSdkEditorTab.java @@ -8,6 +8,7 @@ import com.intellij.openapi.projectRoots.ProjectJdkTable; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.util.Disposer; import com.intellij.util.messages.MessageBusConnection; +import com.jetbrains.python.PyBundle; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; @@ -48,7 +49,7 @@ public class PythonSdkEditorTab extends FacetEditorTab { @Override @Nls public String getDisplayName() { - return "Python SDK"; + return PyBundle.message("configurable.PythonSdkEditorTab.display.name"); } @Override diff --git a/python/pluginResources/messages/PyBundle.properties b/python/pluginResources/messages/PyBundle.properties index 00e17944bdcd..f3854dd84f52 100644 --- a/python/pluginResources/messages/PyBundle.properties +++ b/python/pluginResources/messages/PyBundle.properties @@ -1026,4 +1026,9 @@ action.ForceStepInto.description=Step into, ignore stepping filters for librarie configurable.Tab.display.name=Buildout configurable.PyConsoleOptionsConfigurable.display.name=Console configurable.BuildoutConfigurable.display.name=Buildout -configurable.PySmartKeysOptions.display.name=Python \ No newline at end of file +configurable.PySmartKeysOptions.display.name=Python +configurable.PyContentEntriesModuleConfigurable.display.name=Project Structure +configurable.PyIntegratedToolsConfigurable.display.name=Python Integrated Tools +configurable.PyScientificConfigurable.display.name=Python Scientific +configurable.PythonSdkEditorTab.display.name=Python SDK +configurable.PyDebuggerConfigurable.display.name=Python Debugger \ No newline at end of file diff --git a/python/rest/resources/messages/RestBundle.properties b/python/rest/resources/messages/RestBundle.properties index 7238abc402e5..eb3f4a8d29cc 100644 --- a/python/rest/resources/messages/RestBundle.properties +++ b/python/rest/resources/messages/RestBundle.properties @@ -20,4 +20,5 @@ runcfg.docutils.input=Input: runcfg.docutils.output=Output: runcfg.docutils.command=Command: runcfg.docutils.options=Options: -runcfg.dlg.select.script.path=Select path: \ No newline at end of file +runcfg.dlg.select.script.path=Select path: +configurable.RestConfigurable.display.name=ReStructured text \ No newline at end of file diff --git a/python/rest/src/com/jetbrains/rest/editor/RestConfigurable.java b/python/rest/src/com/jetbrains/rest/editor/RestConfigurable.java index 452435557eb0..7ec58054dff5 100644 --- a/python/rest/src/com/jetbrains/rest/editor/RestConfigurable.java +++ b/python/rest/src/com/jetbrains/rest/editor/RestConfigurable.java @@ -5,6 +5,7 @@ import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.ui.ComboBox; import com.intellij.openapi.ui.LabeledComponent; +import com.jetbrains.rest.RestBundle; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; @@ -39,7 +40,7 @@ public class RestConfigurable implements SearchableConfigurable, Configurable.No @Nls @Override public String getDisplayName() { - return "ReStructured text"; + return RestBundle.message("configurable.RestConfigurable.display.name"); } @Override diff --git a/python/src/com/jetbrains/python/configuration/PyIntegratedToolsConfigurable.java b/python/src/com/jetbrains/python/configuration/PyIntegratedToolsConfigurable.java index 798877364065..78f6ccbb7cdc 100644 --- a/python/src/com/jetbrains/python/configuration/PyIntegratedToolsConfigurable.java +++ b/python/src/com/jetbrains/python/configuration/PyIntegratedToolsConfigurable.java @@ -191,7 +191,7 @@ public class PyIntegratedToolsConfigurable implements SearchableConfigurable { @Nls @Override public String getDisplayName() { - return "Python Integrated Tools"; + return PyBundle.message("configurable.PyIntegratedToolsConfigurable.display.name"); } @Override diff --git a/python/src/com/jetbrains/python/debugger/PyDebuggerConfigurable.java b/python/src/com/jetbrains/python/debugger/PyDebuggerConfigurable.java index 6a370501d0d4..60d360aa801c 100644 --- a/python/src/com/jetbrains/python/debugger/PyDebuggerConfigurable.java +++ b/python/src/com/jetbrains/python/debugger/PyDebuggerConfigurable.java @@ -16,6 +16,7 @@ import com.intellij.ui.components.JBCheckBox; import com.intellij.ui.components.JBLabel; import com.intellij.ui.components.JBTextField; import com.intellij.ui.components.labels.ActionLink; +import com.jetbrains.python.PyBundle; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -61,7 +62,7 @@ public class PyDebuggerConfigurable implements SearchableConfigurable, Configura @Override public String getDisplayName() { - return "Python Debugger"; + return PyBundle.message("configurable.PyDebuggerConfigurable.display.name"); } @Override diff --git a/resources-en/src/messages/CompilerBundle.properties b/resources-en/src/messages/CompilerBundle.properties index 02bfed171087..47c5a9e35f5f 100644 --- a/resources-en/src/messages/CompilerBundle.properties +++ b/resources-en/src/messages/CompilerBundle.properties @@ -149,4 +149,5 @@ label.option.display.notification.popup=Display notification on build completion compiler.ref.service.validation.task.name=Backward Reference Indices Validation compiler.ref.service.validation.progress.text=Validating backward reference indices java.compiler.option.prefer.target.jdk.compiler=Use compiler from module target JDK when possible -configurable.CompilerUIConfigurable.display.name=General \ No newline at end of file +configurable.CompilerUIConfigurable.display.name=General +configurable.AnnotationProcessorsConfigurable.display.name=Annotation Processors \ No newline at end of file diff --git a/xml/impl/src/com/intellij/javaee/DefaultSchemasConfigurable.java b/xml/impl/src/com/intellij/javaee/DefaultSchemasConfigurable.java index 40f4669cb7b4..a72829d44fc7 100644 --- a/xml/impl/src/com/intellij/javaee/DefaultSchemasConfigurable.java +++ b/xml/impl/src/com/intellij/javaee/DefaultSchemasConfigurable.java @@ -23,6 +23,7 @@ import com.intellij.ui.components.JBRadioButton; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; import com.intellij.xml.Html5SchemaProvider; +import com.intellij.xml.XmlBundle; import com.intellij.xml.util.XmlUtil; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; @@ -65,7 +66,7 @@ public class DefaultSchemasConfigurable implements Configurable { @Nls @Override public String getDisplayName() { - return "Default XML Schemas"; + return XmlBundle.message("configurable.DefaultSchemasConfigurable.display.name"); } @Nullable diff --git a/xml/impl/src/com/intellij/javaee/XMLCatalogConfigurable.java b/xml/impl/src/com/intellij/javaee/XMLCatalogConfigurable.java index b21fbe8b99d8..f3b382c7996e 100644 --- a/xml/impl/src/com/intellij/javaee/XMLCatalogConfigurable.java +++ b/xml/impl/src/com/intellij/javaee/XMLCatalogConfigurable.java @@ -6,6 +6,7 @@ import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.xml.XmlBundle; import org.jetbrains.annotations.Nls; import javax.swing.*; @@ -25,7 +26,7 @@ public class XMLCatalogConfigurable implements Configurable { @Nls @Override public String getDisplayName() { - return "XML Catalog"; + return XmlBundle.message("configurable.XMLCatalogConfigurable.display.name"); } @Override