xml mappings for configurables

2026-09-27 10:03:11 +07:00 · 2012-09-19 12:15:53 +04:00
parent 5f5fb62765
commit 94362f8765
15 changed files with 138 additions and 108 deletions
@@ -4,7 +4,7 @@

  <extensions defaultExtensionNs="com.intellij">
    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
-    <applicationConfigurable instance="org.intellij.images.options.impl.OptionsConfigurabe"/>
+    <applicationConfigurable instance="org.intellij.images.options.impl.OptionsConfigurabe" id="Images" displayName="Images"/>
    <fileEditorProvider implementation="org.intellij.images.editor.impl.ImageFileEditorProvider"/>
    <selectInTarget implementation="org.intellij.images.thumbnail.impl.ThumbnailSelectInTarget"/>
    <applicationService serviceInterface="org.intellij.images.options.OptionsManager"
@@ -56,13 +56,13 @@ public class InspectionEP extends LanguageExtensionPoint {
  @Nullable
  @Nls
  public String getDisplayName() {
-    return getLocalizedString(bundle, key, displayName);
+    return displayName == null ? displayName = getLocalizedString(bundle, key) : displayName;
  }

  @Nullable
  @Nls
  public String getGroupDisplayName() {
-    return getLocalizedString(groupBundle, groupKey, groupDisplayName);
+    return groupDisplayName == null ? groupDisplayName = getLocalizedString(groupBundle, groupKey) : groupDisplayName;
  }

  @Attribute("key")
@@ -121,15 +121,17 @@ public class InspectionEP extends LanguageExtensionPoint {
    return displayLevel;
  }

+  @Attribute("hasStaticDescription")
+  public boolean hasStaticDescription;
+
  @Nullable
-  private String getLocalizedString(String bundleName, String key, String displayName) {
-    if (displayName != null) return displayName;
+  private String getLocalizedString(String bundleName, String key) {
    final String baseName = bundleName != null ? bundleName : bundle == null ? ((IdeaPluginDescriptor)myPluginDescriptor).getResourceBundleBaseName() : bundle;
    if (baseName == null) {
      return null;
    }
-    final ResourceBundle bundle = AbstractBundle.getResourceBundle(baseName, myPluginDescriptor.getPluginClassLoader());
-    return CommonBundle.message(bundle, key);
+    final ResourceBundle resourceBundle = AbstractBundle.getResourceBundle(baseName, myPluginDescriptor.getPluginClassLoader());
+    return CommonBundle.message(resourceBundle, key);
  }

  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.InspectionEP");
@@ -159,7 +159,7 @@ public abstract class InspectionToolWrapper<T extends InspectionProfileEntry, E

  @Nullable
  public String getStaticDescription() {
-    return getTool().getStaticDescription();
+    return myEP.hasStaticDescription ? getTool().getStaticDescription() : null;
  }

  @Override
@@ -101,7 +101,7 @@ public abstract class InspectionToolsConfigurable extends BaseConfigurable imple


  public InspectionToolsConfigurable(InspectionProjectProfileManager projectProfileManager, InspectionProfileManager profileManager) {
-    InspectionToolRegistrar.getInstance().buildInspectionSearchIndexIfNecessary();
+//    InspectionToolRegistrar.getInstance().buildInspectionSearchIndexIfNecessary();
    myAddButton.addActionListener(new ActionListener() {
      public void actionPerformed(ActionEvent e) {
        final Set<String> existingProfileNames = myPanels.keySet();
@@ -15,6 +15,8 @@
 */
 package com.intellij.openapi.options;

+import com.intellij.AbstractBundle;
+import com.intellij.CommonBundle;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.extensions.AbstractExtensionPointBean;
@@ -30,6 +32,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.picocontainer.PicoContainer;

+import java.util.ResourceBundle;
+
 /**
 * @author nik
 * @see Configurable
@@ -47,6 +51,12 @@ public class ConfigurableEP extends AbstractExtensionPointBean {
  @Attribute("bundle")
  public String bundle;

+  public String getDisplayName() {
+    if (displayName != null) return displayName;
+    final ResourceBundle resourceBundle = AbstractBundle.getResourceBundle(bundle, myPluginDescriptor.getPluginClassLoader());
+    return displayName = CommonBundle.message(resourceBundle, key);
+  }
+
  @Property(surroundWithTag = false)
  @AbstractCollection(surroundWithTag = false)
  public ConfigurableEP[] children;
@@ -72,7 +72,7 @@ public class ConfigurableWrapper implements SearchableConfigurable, Configurable
  @Nls
  @Override
  public String getDisplayName() {
-    return myEp.displayName == null ? getConfigurable().getDisplayName() : myEp.displayName;
+    return myEp.getDisplayName();
  }

  @Nullable
@@ -354,22 +354,27 @@
  <projectConfigurable instance="com.intellij.application.options.CodeStyleSchemesConfigurable" order="after colors"/>

  <!-- File Types -->
-  <applicationConfigurable instance="com.intellij.openapi.fileTypes.impl.FileTypeConfigurable"/>
+  <applicationConfigurable instance="com.intellij.openapi.fileTypes.impl.FileTypeConfigurable" id="preferences.fileTypes"
+                           key="filetype.settings.title" bundle="messages.FileTypesBundle"/>

  <applicationConfigurable instance="com.intellij.codeInsight.intention.impl.config.IntentionSettingsConfigurable" id="intentions"/>

  <!-- Live Templates -->
-  <applicationConfigurable instance="com.intellij.codeInsight.template.impl.LiveTemplatesConfigurable"/>
+  <applicationConfigurable instance="com.intellij.codeInsight.template.impl.LiveTemplatesConfigurable" id="editing.templates"
+                           key="templates.settings.page.title" bundle="messages.CodeInsightBundle"/>
  <lookup.actionProvider implementation="com.intellij.codeInsight.template.impl.LiveTemplateLookupActionProvider"/>

  <!-- File Templates-->
-  <applicationConfigurable instance="com.intellij.ide.fileTemplates.impl.AllFileTemplatesConfigurable"/>
+  <applicationConfigurable instance="com.intellij.ide.fileTemplates.impl.AllFileTemplatesConfigurable" id="fileTemplates"
+                           key="title.file.templates" bundle="messages.IdeBundle"/>

  <!-- T.O.D.O -->
-  <applicationConfigurable instance="com.intellij.ide.todo.configurable.TodoConfigurable"/>
+  <applicationConfigurable instance="com.intellij.ide.todo.configurable.TodoConfigurable" id="preferences.toDoOptions" key="title.todo"
+                           bundle="messages.IdeBundle"/>

  <!-- External Tools -->
-  <applicationConfigurable instance="com.intellij.tools.ToolConfigurable"/>
+  <applicationConfigurable instance="com.intellij.tools.ToolConfigurable" id="preferences.externalTools" key="tools.settings.title"
+                           bundle="messages.ToolsBundle"/>
  <stepsBeforeRunProvider implementation="com.intellij.tools.ToolBeforeRunTaskProvider"/>
  <checkinHandlerFactory implementation="com.intellij.tools.ExternalToolsCheckinHandlerFactory"/>
  <projectService serviceInterface="com.intellij.tools.ToolsProjectConfig"
@@ -117,8 +117,8 @@
                      serviceImplementation="com.intellij.ide.passwordSafe.config.PasswordSafeSettings"/>
  <applicationService serviceInterface="com.intellij.ide.passwordSafe.PasswordSafe"
                      serviceImplementation="com.intellij.ide.passwordSafe.impl.PasswordSafeImpl"/>
-  <applicationConfigurable instance="com.intellij.ide.passwordSafe.config.PasswordSafeConfigurable"/>
-
+  <applicationConfigurable instance="com.intellij.ide.passwordSafe.config.PasswordSafeConfigurable" id="application.passwordSafe"
+                           displayName="Passwords"/>
  <applicationService serviceInterface="com.intellij.execution.process.ColoredOutputTypeRegistry"
                      serviceImplementation="com.intellij.execution.process.ColoredOutputTypeRegistry"/>
  <applicationService serviceInterface="com.intellij.execution.process.OSProcessManager"
@@ -183,31 +183,36 @@
  <applicationConfigurable instance="com.intellij.ide.GeneralSettingsConfigurable"/>

  <!-- Appearance -->
-  <applicationConfigurable instance="com.intellij.ide.ui.AppearanceConfigurable" id="appearance"/>
+  <applicationConfigurable instance="com.intellij.ide.ui.AppearanceConfigurable" id="appearance" key="title.appearance"
+                           bundle="messages.IdeBundle"/>

  <!-- Keymap -->
  <applicationConfigurable instance="com.intellij.openapi.keymap.impl.ui.KeymapConfigurable"/>

  <!-- Customizations -->
-  <applicationConfigurable instance="com.intellij.ide.ui.customization.CustomizationConfigurable"/>
+  <applicationConfigurable instance="com.intellij.ide.ui.customization.CustomizationConfigurable" id="preferences.customizations"
+                           key="title.customizations" bundle="messages.IdeBundle"/>

  <!-- Web Browser -->
-  <applicationConfigurable instance="com.intellij.ide.BrowserSettings"/>
+  <applicationConfigurable instance="com.intellij.ide.BrowserSettings" id="reference.settings.ide.settings.web.browsers"
+                           key="browsers.settings" bundle="messages.IdeBundle"/>

  <!-- Notifications -->
  <applicationConfigurable instance="com.intellij.notification.impl.NotificationsConfigurable"/>

  <!-- Plugins -->
-  <applicationConfigurable instance="com.intellij.ide.plugins.PluginManagerConfigurable"/>
-  <applicationConfigurable instance="com.intellij.util.net.HTTPProxySettingsPanel"/>
-  <applicationConfigurable instance="com.intellij.openapi.diff.impl.external.DiffOptionsForm"/>
+  <applicationConfigurable instance="com.intellij.ide.plugins.PluginManagerConfigurable" id="preferences.pluginManager"
+                           displayName="Plugins"/>
+  <applicationConfigurable instance="com.intellij.util.net.HTTPProxySettingsPanel" id="http.proxy" displayName="HTTP Proxy" />
+  <applicationConfigurable instance="com.intellij.openapi.diff.impl.external.DiffOptionsForm" id="diff" displayName="External Diff Tools" />
  <!--<applicationConfigurable instance="com.intellij.ui.switcher.QuickAccessConfigurable"/>-->

  <fileTypeFactory implementation="com.intellij.openapi.fileTypes.impl.PlatformFileTypeFactory"/>
  <applicationService serviceInterface="com.intellij.openapi.options.colors.ColorSettingsPages"
                        serviceImplementation="com.intellij.openapi.options.colors.pages.ColorSettingsPagesImpl"/>

-  <applicationConfigurable instance="com.intellij.openapi.updateSettings.impl.UpdateSettingsConfigurable"/>
+  <applicationConfigurable instance="com.intellij.openapi.updateSettings.impl.UpdateSettingsConfigurable" id="preferences.updates"
+                           key="updates.settings.title" bundle="messages.IdeBundle"/>

  <applicationService serviceInterface="com.intellij.psi.search.scope.packageSet.PackageSetFactory"
                      serviceImplementation="com.intellij.psi.search.scope.packageSet.PackageSetFactoryImpl"/>
@@ -240,7 +245,8 @@
  <statistics.usagesCollector implementation="com.intellij.internal.statistic.UsageTrigger$MyCollector"/>
  <statistics.usagesCollector implementation="com.intellij.internal.statistic.ideSettings.IdeSettingsUsagesCollector"/>

-  <applicationConfigurable instance="com.intellij.internal.statistic.configurable.StatisticsConfigurable"/>
+  <applicationConfigurable instance="com.intellij.internal.statistic.configurable.StatisticsConfigurable" id="usage.statistics"
+                           displayName="Usage Statistics"/>

  <virtualFileSystem key="dummy" implementationClass="com.intellij.openapi.vfs.ex.dummy.DummyFileSystem"/>
  <virtualFileSystem key="http" implementationClass="com.intellij.openapi.vfs.impl.http.HttpFileSystemImpl"/>
@@ -185,80 +185,80 @@
                     enabledByDefault="true" level="ERROR"
                     implementationClass="org.jetbrains.android.inspections.AndroidNonConstantResIdsInSwitchInspection"/>

-    <globalInspection shortName="AndroidLintContentDescription" displayName="Missing content description" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintContentDescriptionInspection"/>
-    <globalInspection shortName="AndroidLintAdapterViewChildren" displayName="AdapterView element cannot have children" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintAdapterViewChildrenInspection"/>
-    <globalInspection shortName="AndroidLintScrollViewCount" displayName="ScrollView element can have only one child" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintScrollViewCountInspection"/>
-    <globalInspection shortName="AndroidLintMissingPrefix" displayName="Missing Android XML namespace" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintMissingPrefixInspection"/>
-    <globalInspection shortName="AndroidLintDuplicateIds" displayName="Duplicate ids within a single layout" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintDuplicateIdsInspection"/>
-    <globalInspection shortName="AndroidLintGridLayout" displayName="GridLayout validation" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="ERROR" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintGridLayoutInspection"/>
-    <globalInspection shortName="AndroidLintHardcodedText" displayName="Hardcoded text" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintHardcodedTextInspection"/>
-    <globalInspection shortName="AndroidLintInefficientWeight" displayName="Inefficient layout weight" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintInefficientWeightInspection"/>
-    <globalInspection shortName="AndroidLintNestedWeights" displayName="Nested layout weights" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNestedWeightsInspection"/>
-    <globalInspection shortName="AndroidLintDisableBaselineAlignment" displayName="Missing baselineAligned attribute" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintDisableBaselineAlignmentInspection"/>
-    <globalInspection shortName="AndroidLintManifestOrder" displayName="Incorrect order of elements in manifest" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintManifestOrderInspection"/>
-    <globalInspection shortName="AndroidLintMergeRootFrame" displayName="FrameLayout can be replaced with &lt;merge&gt; tag" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintMergeRootFrameInspection"/>
-    <globalInspection shortName="AndroidLintNestedScrolling" displayName="Nested scrolling widgets" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNestedScrollingInspection"/>
-    <globalInspection shortName="AndroidLintObsoleteLayoutParam" displayName="Obsolete layout params" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintObsoleteLayoutParamInspection"/>
-    <globalInspection shortName="AndroidLintProguard" displayName="Proguard config file validation" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="ERROR" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintProguardInspection"/>
-    <globalInspection shortName="AndroidLintPxUsage" displayName="Using 'px' dimension" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintPxUsageInspection"/>
-    <globalInspection shortName="AndroidLintScrollViewSize" displayName="ScrollView size validation" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintScrollViewSizeInspection"/>
-    <globalInspection shortName="AndroidLintExportedService" displayName="Exported service does not require permission" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintExportedServiceInspection"/>
-    <globalInspection shortName="AndroidLintGrantAllUris" displayName="Content provider shares everything" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintGrantAllUrisInspection"/>
-    <globalInspection shortName="AndroidLintStateListReachable" displayName="Unreachable state in a &lt;selector&gt;" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintStateListReachableInspection"/>
-    <globalInspection shortName="AndroidLintTextFields" displayName="Text field missing inputType or hint settings" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintTextFieldsInspection"/>
-    <globalInspection shortName="AndroidLintTooManyViews" displayName="Layout has too many views" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintTooManyViewsInspection"/>
-    <globalInspection shortName="AndroidLintTooDeepLayout" displayName="Layout hierarchy is too deep" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintTooDeepLayoutInspection"/>
-    <globalInspection shortName="AndroidLintTypographyDashes" displayName="Hyphen can be replaced with dash" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintTypographyDashesInspection"/>
-    <globalInspection shortName="AndroidLintTypographyQuotes" displayName="Straight quotes can be replaced with curvy quotes" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="false"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintTypographyQuotesInspection"/>
-    <globalInspection shortName="AndroidLintTypographyFractions" displayName="Fraction string can be replaced with fraction character" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintTypographyFractionsInspection"/>
-    <globalInspection shortName="AndroidLintTypographyEllipsis" displayName="Ellipsis string can be replaced with ellipsis character" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintTypographyEllipsisInspection"/>
-    <globalInspection shortName="AndroidLintTypographyOther" displayName="Other typographical problems" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintTypographyOtherInspection"/>
-    <globalInspection shortName="AndroidLintUseCompoundDrawables" displayName="Node can be replaced by TextView with compound drawables" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintUseCompoundDrawablesInspection"/>
-    <globalInspection shortName="AndroidLintUselessParent" displayName="Useless parent layout" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintUselessParentInspection"/>
-    <globalInspection shortName="AndroidLintUselessLeaf" displayName="Useless leaf layout" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintUselessLeafInspection"/>
-    <globalInspection shortName="AndroidLintButtonOrder" displayName="Buttons order" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintButtonOrderInspection"/>
-    <globalInspection shortName="AndroidLintBackButton" displayName="Back button" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="false"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintBackButtonInspection"/>
-    <globalInspection shortName="AndroidLintButtonCase" displayName="Cancel/OK dialog buttons capitalization" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintButtonCaseInspection"/>
-    <globalInspection shortName="AndroidLintResourceAsColor" displayName="Should pass resolved color instead of resource id" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="ERROR" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintResourceAsColorInspection"/>
-    <globalInspection shortName="AndroidLintExtraText" displayName="Extraneous text in layout file" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintExtraTextInspection"/>
-    <globalInspection shortName="AndroidLintHardcodedDebugMode" displayName="Hardcoded value of android:debuggable in the manifest" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintHardcodedDebugModeInspection"/>
-    <globalInspection shortName="AndroidLintDrawAllocation" displayName="Memory allocations within drawing code" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintDrawAllocationInspection"/>
-    <globalInspection shortName="AndroidLintSparseArray" displayName="HashMap can be replaced with SparseArray" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintSparseArrayInspection"/>
-    <globalInspection shortName="AndroidLintUseValueOf" displayName="Should use 'valueOf' instead of 'new'" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintUseValueOfInspection"/>
-    <globalInspection shortName="AndroidLintLibraryCustomView" displayName="Using custom namespace attributes in a library module" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="ERROR" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintLibraryCustomViewInspection"/>
-    <globalInspection shortName="AndroidLintPrivateResource" displayName="Using custom namespace attributes in a library module" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="ERROR" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintPrivateResourceInspection"/>
-    <globalInspection shortName="AndroidLintSdCardPath" displayName="Hardcoded reference to /sdcard" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintSdCardPathInspection"/>
-    <globalInspection shortName="AndroidLintStyleCycle" displayName="Cycle in style definitions" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="ERROR" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintStyleCycleInspection"/>
-    <globalInspection shortName="AndroidLintTextViewEdits" displayName="TextView should probably be an EditText instead" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintTextViewEditsInspection"/>
-    <globalInspection shortName="AndroidLintEnforceUTF8" displayName="Encoding used in resource files is not UTF-8" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintEnforceUTF8Inspection"/>
-    <globalInspection shortName="AndroidLintUnknownIdInLayout" displayName="Reference to an id that is not in the current layout" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintUnknownIdInLayoutInspection"/>
-    <globalInspection shortName="AndroidLintSuspiciousImport" displayName="'import android.R' statement" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintSuspiciousImportInspection"/>
-    <globalInspection shortName="AndroidLintMultipleUsesSdk" displayName="Multiple &lt;uses-sdk&gt; elements in the manifest" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="ERROR" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintMultipleUsesSdkInspection"/>
-    <globalInspection shortName="AndroidLintUsesMinSdkAttributes" displayName="Minimum SDK and target SDK attributes not defined" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintUsesMinSdkAttributesInspection"/>
-    <globalInspection shortName="AndroidLintProguardSplitConfig" displayName="Proguard.cfg file contains generic Android rules" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintProguardSplitConfigInspection"/>
-    <globalInspection shortName="AndroidLintWorldWriteableFiles" displayName="openFileOutput() call passing MODE_WORLD_WRITEABLE" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintWorldWriteableFilesInspection"/>
-    <globalInspection shortName="AndroidLintInconsistentArrays" displayName="Inconsistent arrays" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintInconsistentArraysInspection"/>
-    <globalInspection shortName="AndroidLintDuplicateIncludedIds" displayName="Duplicate ids across layouts combined with include tags" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintDuplicateIncludedIdsInspection"/>
-    <globalInspection shortName="AndroidLintIconExpectedSize" displayName="Icon has incorrect size" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="false"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintIconExpectedSizeInspection"/>
-    <globalInspection shortName="AndroidLintIconDipSize" displayName="Icon density-independent size validation" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintIconDipSizeInspection"/>
-    <globalInspection shortName="AndroidLintIconLocation" displayName="Image defined in density-independent drawable folder" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintIconLocationInspection"/>
-    <globalInspection shortName="AndroidLintIconDensities" displayName="Icon densities validation" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintIconDensitiesInspection"/>
-    <globalInspection shortName="AndroidLintIconMissingDensityFolder" displayName="Missing density folder" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintIconMissingDensityFolderInspection"/>
-    <globalInspection shortName="AndroidLintGifUsage" displayName="Using .gif format for bitmaps is discouraged" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintGifUsageInspection"/>
-    <globalInspection shortName="AndroidLintIconDuplicates" displayName="Duplicated icons under different names" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintIconDuplicatesInspection"/>
-    <globalInspection shortName="AndroidLintIconDuplicatesConfig" displayName="Identical bitmaps across various configurations" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintIconDuplicatesConfigInspection"/>
-    <globalInspection shortName="AndroidLintIconNoDpi" displayName="Icon appears in both -nodpi and dpi folders" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintIconNoDpiInspection"/>
-    <globalInspection shortName="AndroidLintOverdraw" displayName="Overdraw issues" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintOverdrawInspection"/>
-    <globalInspection shortName="AndroidLintMissingTranslation" displayName="Incomplete translation" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="ERROR" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintMissingTranslationInspection"/>
-    <globalInspection shortName="AndroidLintExtraTranslation" displayName="Extra translation" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintExtraTranslationInspection"/>
-    <globalInspection shortName="AndroidLintUnusedResources" displayName="Unused resources" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintUnusedResourcesInspection"/>
-    <globalInspection shortName="AndroidLintUnusedIds" displayName="Unused id" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="false"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintUnusedIdsInspection"/>
-    <globalInspection shortName="AndroidLintAlwaysShowAction" displayName="Usage of showAsAction=always" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintAlwaysShowActionInspection"/>
-    <globalInspection shortName="AndroidLintStringFormatCount" displayName="Formatting argument types are inconsistent across translations" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintStringFormatCountInspection"/>
-    <globalInspection shortName="AndroidLintStringFormatMatches" displayName="Format supplied in a call to String.format doesn't match the format string" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="ERROR" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintStringFormatMatchesInspection"/>
-    <globalInspection shortName="AndroidLintStringFormatInvalid" displayName="Invalid format string" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="ERROR" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintStringFormatInvalidInspection"/>
-    <globalInspection shortName="AndroidLintWrongViewCast" displayName="Mismatched view type" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="ERROR" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintWrongViewCastInspection"/>
-    <globalInspection shortName="AndroidLintUnknownId" displayName="Reference to an unknown id" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="ERROR" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintUnknownIdInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintContentDescription" displayName="Missing content description" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintContentDescriptionInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintAdapterViewChildren" displayName="AdapterView element cannot have children" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintAdapterViewChildrenInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintScrollViewCount" displayName="ScrollView element can have only one child" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintScrollViewCountInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintMissingPrefix" displayName="Missing Android XML namespace" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintMissingPrefixInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintDuplicateIds" displayName="Duplicate ids within a single layout" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintDuplicateIdsInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintGridLayout" displayName="GridLayout validation" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="ERROR" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintGridLayoutInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintHardcodedText" displayName="Hardcoded text" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintHardcodedTextInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintInefficientWeight" displayName="Inefficient layout weight" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintInefficientWeightInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintNestedWeights" displayName="Nested layout weights" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNestedWeightsInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintDisableBaselineAlignment" displayName="Missing baselineAligned attribute" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintDisableBaselineAlignmentInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintManifestOrder" displayName="Incorrect order of elements in manifest" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintManifestOrderInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintMergeRootFrame" displayName="FrameLayout can be replaced with &lt;merge&gt; tag" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintMergeRootFrameInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintNestedScrolling" displayName="Nested scrolling widgets" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNestedScrollingInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintObsoleteLayoutParam" displayName="Obsolete layout params" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintObsoleteLayoutParamInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintProguard" displayName="Proguard config file validation" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="ERROR" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintProguardInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintPxUsage" displayName="Using 'px' dimension" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintPxUsageInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintScrollViewSize" displayName="ScrollView size validation" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintScrollViewSizeInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintExportedService" displayName="Exported service does not require permission" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintExportedServiceInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintGrantAllUris" displayName="Content provider shares everything" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintGrantAllUrisInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintStateListReachable" displayName="Unreachable state in a &lt;selector&gt;" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintStateListReachableInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintTextFields" displayName="Text field missing inputType or hint settings" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintTextFieldsInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintTooManyViews" displayName="Layout has too many views" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintTooManyViewsInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintTooDeepLayout" displayName="Layout hierarchy is too deep" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintTooDeepLayoutInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintTypographyDashes" displayName="Hyphen can be replaced with dash" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintTypographyDashesInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintTypographyQuotes" displayName="Straight quotes can be replaced with curvy quotes" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="false"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintTypographyQuotesInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintTypographyFractions" displayName="Fraction string can be replaced with fraction character" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintTypographyFractionsInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintTypographyEllipsis" displayName="Ellipsis string can be replaced with ellipsis character" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintTypographyEllipsisInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintTypographyOther" displayName="Other typographical problems" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintTypographyOtherInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintUseCompoundDrawables" displayName="Node can be replaced by TextView with compound drawables" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintUseCompoundDrawablesInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintUselessParent" displayName="Useless parent layout" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintUselessParentInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintUselessLeaf" displayName="Useless leaf layout" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintUselessLeafInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintButtonOrder" displayName="Buttons order" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintButtonOrderInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintBackButton" displayName="Back button" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="false"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintBackButtonInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintButtonCase" displayName="Cancel/OK dialog buttons capitalization" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintButtonCaseInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintResourceAsColor" displayName="Should pass resolved color instead of resource id" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="ERROR" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintResourceAsColorInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintExtraText" displayName="Extraneous text in layout file" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintExtraTextInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintHardcodedDebugMode" displayName="Hardcoded value of android:debuggable in the manifest" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintHardcodedDebugModeInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintDrawAllocation" displayName="Memory allocations within drawing code" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintDrawAllocationInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintSparseArray" displayName="HashMap can be replaced with SparseArray" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintSparseArrayInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintUseValueOf" displayName="Should use 'valueOf' instead of 'new'" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintUseValueOfInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintLibraryCustomView" displayName="Using custom namespace attributes in a library module" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="ERROR" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintLibraryCustomViewInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintPrivateResource" displayName="Using custom namespace attributes in a library module" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="ERROR" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintPrivateResourceInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintSdCardPath" displayName="Hardcoded reference to /sdcard" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintSdCardPathInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintStyleCycle" displayName="Cycle in style definitions" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="ERROR" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintStyleCycleInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintTextViewEdits" displayName="TextView should probably be an EditText instead" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintTextViewEditsInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintEnforceUTF8" displayName="Encoding used in resource files is not UTF-8" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintEnforceUTF8Inspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintUnknownIdInLayout" displayName="Reference to an id that is not in the current layout" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintUnknownIdInLayoutInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintSuspiciousImport" displayName="'import android.R' statement" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintSuspiciousImportInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintMultipleUsesSdk" displayName="Multiple &lt;uses-sdk&gt; elements in the manifest" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="ERROR" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintMultipleUsesSdkInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintUsesMinSdkAttributes" displayName="Minimum SDK and target SDK attributes not defined" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintUsesMinSdkAttributesInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintProguardSplitConfig" displayName="Proguard.cfg file contains generic Android rules" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintProguardSplitConfigInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintWorldWriteableFiles" displayName="openFileOutput() call passing MODE_WORLD_WRITEABLE" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintWorldWriteableFilesInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintInconsistentArrays" displayName="Inconsistent arrays" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintInconsistentArraysInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintDuplicateIncludedIds" displayName="Duplicate ids across layouts combined with include tags" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintDuplicateIncludedIdsInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintIconExpectedSize" displayName="Icon has incorrect size" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="false"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintIconExpectedSizeInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintIconDipSize" displayName="Icon density-independent size validation" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintIconDipSizeInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintIconLocation" displayName="Image defined in density-independent drawable folder" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintIconLocationInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintIconDensities" displayName="Icon densities validation" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintIconDensitiesInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintIconMissingDensityFolder" displayName="Missing density folder" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintIconMissingDensityFolderInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintGifUsage" displayName="Using .gif format for bitmaps is discouraged" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintGifUsageInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintIconDuplicates" displayName="Duplicated icons under different names" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintIconDuplicatesInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintIconDuplicatesConfig" displayName="Identical bitmaps across various configurations" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintIconDuplicatesConfigInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintIconNoDpi" displayName="Icon appears in both -nodpi and dpi folders" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintIconNoDpiInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintOverdraw" displayName="Overdraw issues" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintOverdrawInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintMissingTranslation" displayName="Incomplete translation" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="ERROR" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintMissingTranslationInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintExtraTranslation" displayName="Extra translation" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintExtraTranslationInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintUnusedResources" displayName="Unused resources" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintUnusedResourcesInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintUnusedIds" displayName="Unused id" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="false"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintUnusedIdsInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintAlwaysShowAction" displayName="Usage of showAsAction=always" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintAlwaysShowActionInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintStringFormatCount" displayName="Formatting argument types are inconsistent across translations" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="WARNING" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintStringFormatCountInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintStringFormatMatches" displayName="Format supplied in a call to String.format doesn't match the format string" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="ERROR" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintStringFormatMatchesInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintStringFormatInvalid" displayName="Invalid format string" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="ERROR" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintStringFormatInvalidInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintWrongViewCast" displayName="Mismatched view type" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="ERROR" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintWrongViewCastInspection"/>
+    <globalInspection hasStaticDescription="true" shortName="AndroidLintUnknownId" displayName="Reference to an unknown id" groupKey="android.lint.inspections.group.name" bundle="messages.AndroidBundle" enabledByDefault="true"  level="ERROR" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintUnknownIdInspection"/>
    
    <codeInspection.InspectionExtension implementation="org.jetbrains.android.inspections.lint.AndroidInspectionExtensionsFactory"/>

@@ -13,7 +13,8 @@
    <checkoutProvider implementation="org.jetbrains.plugins.github.GithubCheckoutProvider"/>
    <applicationService serviceInterface="org.jetbrains.plugins.github.GithubSettings"
                        serviceImplementation="org.jetbrains.plugins.github.GithubSettings"/>
-    <applicationConfigurable instance="org.jetbrains.plugins.github.ui.GitHubSettingsConfigurable"/>
+    <applicationConfigurable instance="org.jetbrains.plugins.github.ui.GitHubSettingsConfigurable" id="settings.github"
+                             displayName="GitHub"/>
    <vcsAnnotationGutterActionProvider implementation="org.jetbrains.plugins.github.ui.GithubAnnotationGutterActionProvider" />
    <checkoutCompletedListener implementation="org.jetbrains.plugins.github.GithubCheckoutListener" order="after PlatformProjectCheckoutListener"/>
  </extensions>
@@ -27,7 +27,8 @@
    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
    <projectImportProvider implementation="org.jetbrains.plugins.gradle.importing.GradleProjectImportProvider"/>
    <projectImportBuilder implementation="org.jetbrains.plugins.gradle.importing.GradleProjectImportBuilder"/>
-    <projectConfigurable instance="org.jetbrains.plugins.gradle.config.GradleConfigurable"/>
+    <projectConfigurable instance="org.jetbrains.plugins.gradle.config.GradleConfigurable" id="reference.settingsdialog.project.gradle"
+                         key="gradle.name" bundle="i18n.GradleBundle"/>
    <library.presentationProvider implementation="org.jetbrains.plugins.gradle.config.GradleLibraryPresentationProvider" order="last"/>
    <java.elementFinder implementation="org.jetbrains.plugins.gradle.config.GradleClassFinder"/>
    <projectOpenProcessor implementation="org.jetbrains.plugins.gradle.importing.GradleProjectOpenProcessor"/>
@@ -182,7 +182,8 @@
    <fileTypeFactory implementation="org.jetbrains.plugins.groovy.GroovyFileTypeLoader"/>
    <fileTypeFactory implementation="org.jetbrains.plugins.groovy.dgm.DGMFileTypeFactory"/>

-    <projectConfigurable instance="org.jetbrains.plugins.groovy.gant.GantConfigurable"/>
+    <projectConfigurable instance="org.jetbrains.plugins.groovy.gant.GantConfigurable" id="reference.settingsdialog.project.gant"
+                         displayName="Gant"/>

    <library.presentationProvider implementation="org.jetbrains.plugins.groovy.config.GroovyLibraryPresentationProvider"/>
    <library.presentationProvider implementation="org.jetbrains.plugins.groovy.gpp.GppLibraryPresentationProvider" order="first"/>
@@ -33,7 +33,8 @@
    <i18nInspectionTool implementation="com.intellij.uiDesigner.i18n.I18nFormInspection"/>
    <java15InspectionTool implementation="com.intellij.uiDesigner.inspections.Java15FormInspection"/>

-    <projectConfigurable instance="com.intellij.uiDesigner.GuiDesignerConfigurable"/>
+    <projectConfigurable instance="com.intellij.uiDesigner.GuiDesignerConfigurable" id="project.propGUI" key="title.gui.designer"
+                         bundle="messages.UIDesignerBundle"/>

    <favoriteNodeProvider implementation="com.intellij.uiDesigner.projectView.UIDesignerFavoriteNodeProvider"/>
    <renameHandler implementation="com.intellij.uiDesigner.projectView.FormRenameHandler"/>
@@ -59,7 +59,7 @@
        serviceInterface="org.intellij.lang.xpath.xslt.psi.XsltElementFactory"
        serviceImplementation="org.intellij.lang.xpath.xslt.psi.impl.XsltElementFactoryImpl" />

-    <projectConfigurable instance="org.intellij.lang.xpath.xslt.associations.impl.FileAssociationsConfigurable" />
+    <projectConfigurable instance="org.intellij.lang.xpath.xslt.associations.impl.FileAssociationsConfigurable" id="xslt.associations" displayName="XSLT File Associations" nonDefaultProject="true" />

    <projectService
        serviceInterface="org.intellij.lang.xpath.xslt.associations.impl.FileAssociationsConfigurable$UIState"
@@ -136,8 +136,9 @@
      <category>XSLT</category>
    </intentionAction>

-    <applicationConfigurable instance="org.intellij.plugins.xpathView.XPathConfigurable"/>
-    <applicationConfigurable instance="org.intellij.lang.xpath.xslt.impl.XsltConfigImpl$UIImpl" />
+    <applicationConfigurable instance="org.intellij.plugins.xpathView.XPathConfigurable" id="xpath.settings" displayName="XPath Viewer" />
+    <applicationConfigurable instance="org.intellij.lang.xpath.xslt.impl.XsltConfigImpl$UIImpl" id="settings.xslt"
+                             displayName="XSLT"/>

    <fileIconPatcher implementation="org.intellij.lang.xpath.xslt.impl.XsltIconProvider"/>
    <gotoSymbolContributor implementation="org.intellij.lang.xpath.xslt.impl.XsltChooseByNameContributor"/>
@@ -263,9 +263,11 @@
    <!-- Path Variables -->
    <!-- the implementation of this configurable is in platform-impl but it's not registered in platform because
         it's only required in full IDEA -->
-    <applicationConfigurable instance="com.intellij.application.options.pathMacros.PathMacroConfigurable"/>
+    <applicationConfigurable instance="com.intellij.application.options.pathMacros.PathMacroConfigurable" id="preferences.pathVariables"
+                             key="title.path.variables" bundle="messages.ApplicationBundle"/>

-    <applicationConfigurable instance="com.intellij.execution.console.ConsoleFoldingConfigurable"/>
+    <applicationConfigurable instance="com.intellij.execution.console.ConsoleFoldingConfigurable" id="Console Folding"
+                             displayName="Console Folding"/>

    <editorNotificationProvider implementation="com.intellij.codeInsight.daemon.impl.AttachSourcesNotificationProvider"/>
    <editorNotificationProvider implementation="com.intellij.codeInsight.daemon.impl.SetupSDKNotificationProvider"/>