SONAR-1896 improve proeprty descriptions

2 files changed, 14 insertions, 16 deletions

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java
index 0f5c04e004a..c9c65815691 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java
@@ -176,7 +176,6 @@ import java.util.List;
   @Property(
     key = CoreProperties.PROJECT_INCLUSIONS_PROPERTY,
     name = "Source File Inclusions",
-    description = "Patterns used to include some source files and only those ones during analysis",
     project = true,
     global = true,
     multiValues = true,
@@ -184,7 +183,6 @@ import java.util.List;
   @Property(
     key = CoreProperties.PROJECT_TEST_INCLUSIONS_PROPERTY,
     name = "Test File Inclusions",
-    description = "Patterns used to include some test files and only those ones during analysis",
     project = true,
     global = true,
     multiValues = true,
@@ -192,20 +190,17 @@ import java.util.List;
   @Property(
     key = CoreProperties.GLOBAL_EXCLUSIONS_PROPERTY,
     name = "Global Source File Exclusions",
-    description = "Patterns used to exclude some source files from analysis. They apply to every project and cannot be overriden.",
     multiValues = true,
     category = CoreProperties.CATEGORY_EXCLUSIONS),
   @Property(
     key = CoreProperties.GLOBAL_TEST_EXCLUSIONS_PROPERTY,
     name = "Global Test File Exclusions",
-    description = "Patterns used to exclude some test files from analysis. They apply to every project and cannot be overriden.",
     multiValues = true,
     category = CoreProperties.CATEGORY_EXCLUSIONS,
     defaultValue = CoreProperties.GLOBAL_TEST_EXCLUSIONS_DEFAULT),
   @Property(
     key = CoreProperties.PROJECT_EXCLUSIONS_PROPERTY,
     name = "Source File Exclusions",
-    description = "Patterns used to exclude some source files from analysis",
     project = true,
     global = true,
     multiValues = true,
@@ -213,7 +208,6 @@ import java.util.List;
   @Property(
     key = CoreProperties.PROJECT_TEST_EXCLUSIONS_PROPERTY,
     name = "Test File Exclusions",
-    description = "Patterns used to exclude some test files from analysis",
     project = true,
     global = true,
     multiValues = true,
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
index 6e793f01f05..6839007a064 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -646,16 +646,18 @@ property.category.duplications=Duplications
 property.category.localization=Localization
 property.category.server_id=Server ID
 property.category.exclusions=Exclusions
-property.sonar.exclusions.name=Exclude sources from code analysis
-property.sonar.exclusions.description=Changes will be applied during next code analysis.
-property.sonar.skippedModules.name=Exclude project modules from code analysis
-property.sonar.skippedModules.description=Comma separated list of module keys to be excluded from analysis. This property can be used for instance to exclude some Maven modules from a Sonar analysis. Changes will be applied during next code analysis.
-property.sonar.test.exclusions.name=Exclude tests from code analysis
-property.sonar.test.exclusions.description=Changes will be applied during next code analysis.
-property.sonar.global.exclusions.name=Global source exclusions
-property.sonar.global.exclusions.description=Exclude sources from code analysis. Applies to every project. Cannot be overridden at project level. Changes will be applied during next code analysis.
-property.sonar.global.test.exclusions.name=Global test exclusions
-property.sonar.global.test.exclusions.description=Exclude tests from code analysis. Applies to every project. Cannot be overridden at project level. Changes will be applied during next code analysis.
+property.sonar.inclusions.name=Source File Inclusions
+property.sonar.inclusions.description=Patterns used to include some source files and only those ones during analysis
+property.sonar.test.inclusions.name=Test File Inclusions
+property.sonar.test.inclusions.description=Patterns used to include some test files and only those ones during analysis
+property.sonar.exclusions.name=Source File Exclusions
+property.sonar.exclusions.description=Patterns used to exclude some source files from analysis
+property.sonar.test.exclusions.name=Test File Exclusions
+property.sonar.test.exclusions.description=Patterns used to exclude some test files from analysis
+property.sonar.global.exclusions.name=Global Source File Exclusions
+property.sonar.global.exclusions.description=Patterns used to exclude some source files from analysis. They apply to every project and cannot be overridden.
+property.sonar.global.test.exclusions.name=Global Test File Exclusions
+property.sonar.global.test.exclusions.description=Patterns used to exclude some test files from analysis. They apply to every project and cannot be overridden.
 category.exclusions.help=<h2>Wildcards</h2>\
  <p>Following rules are applied:</p>\
  <table class="data">\
@@ -731,6 +733,8 @@ category.exclusions.help=<h2>Wildcards</h2>\
    </tr>\
  </table>
 
+property.sonar.skippedModules.name=Exclude project modules from code analysis
+property.sonar.skippedModules.description=Comma separated list of module keys to be excluded from analysis. This property can be used for instance to exclude some Maven modules from a Sonar analysis. Changes will be applied during next code analysis.
 property.error.notBoolean=Valid options are "true" and "false"
 property.error.notInteger=Only digits are allowed
 property.error.notFloat=Not a floating point number