more localized configurable display names

GitOrigin-RevId: 6cd673382a243910bd993a7802baf78e6a92f7ef
2025-12-13 15:52:01 +07:00 · 2020-01-10 11:30:16 +02:00
parent 1b45f20ced
commit 151f01503b
47 changed files with 111 additions and 55 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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<StdAr
  @Nls
  @Override
  public String getDisplayName() {
-    return "Custom Composite Tokens";
+    return ApplicationBundle.message("configurable.ArrangementRuleAliasesListEditor.display.name");
  }

  @Nullable
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplatesConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplatesConfigurable.java
@@ -153,7 +153,7 @@ public class PostfixTemplatesConfigurable implements SearchableConfigurable, Edi
  @Nls
  @Override
  public String getDisplayName() {
-    return "Postfix Completion";
+    return CodeInsightBundle.message("configurable.PostfixTemplatesConfigurable.display.name");
  }

  @Nullable
--- a/platform/lang-impl/src/com/intellij/framework/detection/impl/exclude/DetectionExcludesConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/framework/detection/impl/exclude/DetectionExcludesConfigurable.java
@@ -22,6 +22,7 @@ import com.intellij.openapi.fileChooser.FileChooserDescriptor;
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectBundle;
 import com.intellij.openapi.ui.LabeledComponent;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.ui.popup.ListPopup;
@@ -280,6 +281,6 @@ public class DetectionExcludesConfigurable implements Configurable {
  @Nls
  @Override
  public String getDisplayName() {
-    return "Framework Detection Excludes";
+    return ProjectBundle.message("configurable.DetectionExcludesConfigurable.display.name");
  }
 }
--- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/PlatformContentEntriesConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/PlatformContentEntriesConfigurable.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.impl.ModuleConfigurationStateImpl;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
+import com.intellij.openapi.project.ProjectBundle;
 import com.intellij.openapi.roots.ContentEntry;
 import com.intellij.openapi.roots.ModifiableRootModel;
 import com.intellij.openapi.roots.ModuleRootManager;
@@ -48,7 +49,7 @@ public class PlatformContentEntriesConfigurable implements Configurable {

  @Override
  public String getDisplayName() {
-    return "Project Structure";
+    return ProjectBundle.message("configurable.PlatformContentEntriesConfigurable.display.name");
  }

  @Override
--- a/platform/platform-api/src/com/intellij/ide/browsers/chrome/ChromeSettingsConfigurable.java
+++ b/platform/platform-api/src/com/intellij/ide/browsers/chrome/ChromeSettingsConfigurable.java
@@ -15,6 +15,7 @@
 */
 package com.intellij.ide.browsers.chrome;

+import com.intellij.ide.IdeBundle;
 import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
 import com.intellij.openapi.options.Configurable;
@@ -122,7 +123,7 @@ public class ChromeSettingsConfigurable implements Configurable {
  @Nls
  @Override
  public String getDisplayName() {
-    return "Chrome Settings";
+    return IdeBundle.message("configurable.ChromeSettingsConfigurable.display.name");
  }

  @Override
--- a/platform/platform-api/src/com/intellij/util/net/ssl/CertificateConfigurable.java
+++ b/platform/platform-api/src/com/intellij/util/net/ssl/CertificateConfigurable.java
@@ -22,10 +22,7 @@ import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.Disposer;
-import com.intellij.ui.AnActionButton;
-import com.intellij.ui.AnActionButtonRunnable;
-import com.intellij.ui.IdeBorderFactory;
-import com.intellij.ui.ToolbarDecorator;
+import com.intellij.ui.*;
 import com.intellij.ui.components.JBCheckBox;
 import com.intellij.ui.components.JBScrollPane;
 import com.intellij.ui.treeStructure.Tree;
@@ -161,7 +158,7 @@ public class CertificateConfigurable implements SearchableConfigurable, Configur
  @Nls
  @Override
  public String getDisplayName() {
-    return "Server Certificates";
+    return UIBundle.message("configurable.CertificateConfigurable.display.name");
  }

  @Nullable
--- a/platform/platform-impl/src/com/intellij/externalDependencies/impl/ExternalDependenciesConfigurable.java
+++ b/platform/platform-impl/src/com/intellij/externalDependencies/impl/ExternalDependenciesConfigurable.java
@@ -4,11 +4,11 @@ package com.intellij.externalDependencies.impl;
 import com.intellij.externalDependencies.DependencyOnPlugin;
 import com.intellij.externalDependencies.ExternalDependenciesManager;
 import com.intellij.externalDependencies.ProjectExternalDependency;
+import com.intellij.ide.IdeBundle;
 import com.intellij.ide.plugins.IdeaPluginDescriptor;
 import com.intellij.ide.plugins.PluginManagerCore;
 import com.intellij.openapi.application.ApplicationNamesInfo;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.project.Project;
@@ -39,7 +39,7 @@ import java.util.*;
 /**
 * @author nik
 */
-public class ExternalDependenciesConfigurable implements SearchableConfigurable, Configurable.NoScroll {
+public class ExternalDependenciesConfigurable implements SearchableConfigurable {
  private static final Logger LOG = Logger.getInstance(ExternalDependenciesConfigurable.class);
  private final ExternalDependenciesManager myDependenciesManager;
  private final CollectionListModel<ProjectExternalDependency> 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
--- 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
--- 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...
+custom.option=Custom...
+configurable.CodeStyleSchemesConfigurable.display.name=Code Style
+configurable.ArrangementRuleAliasesListEditor.display.name=Custom Composite Tokens
--- 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
+configurable.EqualsHashCodeTemplatesPanel.display.name=Templates
+configurable.PostfixTemplatesConfigurable.display.name=Postfix Completion
--- 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
--- 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
+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
--- 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
+configurable.TemplatesPanel.display.name=Templates
+configurable.CertificateConfigurable.display.name=Server Certificates
--- 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
+configurable.VcsGeneralConfigurationConfigurable.display.name=Confirmation
+configurable.IssueNavigationConfigurationPanel.display.name=Issue Navigation
+configurable.VcsContentAnnotationConfigurable.display.name=Show recently changed
+configurable.VcsLimitHistoryConfigurable.display.name=Limit History
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
+configurable.AdvancedSettingsUI.display.name=Advanced
+configurable.InjectionsSettingsUI.display.name=Language Injections
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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=<html>Use this variant to
 <br/>It's recommended to update working copy before branch creation therefore.</html>

 exportable.SvnDiffSettings.presentable.name=Svn Diff
+configurable.SvnConfigureProxiesComponent.display.name=HTTP Proxies Configuration
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
+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
--- 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:
+runcfg.dlg.select.script.path=Select path:
+configurable.RestConfigurable.display.name=ReStructured text
--- 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
--- 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
--- 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
--- 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
+configurable.CompilerUIConfigurable.display.name=General
+configurable.AnnotationProcessorsConfigurable.display.name=Annotation Processors
--- 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
--- 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