SONAR-4656 SONAR-3644 Fix remaining properties labels in exclusions settings

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/IgnoreIssuesConfiguration.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/IgnoreIssuesConfiguration.java
index d1ac261f3b98d492b4edf62274eceec753881aa5..d51360f98d5e3ae722eb4091a2bb6f66a04b4f7d 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/IgnoreIssuesConfiguration.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/IgnoreIssuesConfiguration.java
@@ -65,7 +65,7 @@ public final class IgnoreIssuesConfiguration {
       PropertyDefinition.builder(PATTERNS_MULTICRITERIA_KEY)
         .category(CoreProperties.CATEGORY_EXCLUSIONS)
         .subCategory(SUB_CATEGORY_IGNORE_ISSUES)
-        .name("Multi-criteria exclusion patterns")
+        .name("Multi-criteria Exclusion Patterns")
         .description("Patterns used to identify which issues are ignored.<br/>" +
           CONFIG_DOCUMENTATION_LINK)
         .onQualifiers(Qualifiers.PROJECT)
@@ -73,13 +73,13 @@ public final class IgnoreIssuesConfiguration {
         .fields(
           PropertyFieldDefinition.build(RESOURCE_KEY)
             .name("File Path Pattern")
-            .description("Pattern used to match files which should be ignored")
+            .description("Pattern used to match files which should be ignored.")
             .type(PropertyType.STRING)
             .indicativeSize(LARGE_SIZE)
             .build(),
           PropertyFieldDefinition.build(RULE_KEY)
             .name("Rule Key Pattern")
-            .description("Pattern used to match rules which should be ignored")
+            .description("Pattern used to match rules which should be ignored.")
             .type(PropertyType.STRING)
             .indicativeSize(LARGE_SIZE)
             .build(),
@@ -93,20 +93,20 @@ public final class IgnoreIssuesConfiguration {
         PropertyDefinition.builder(PATTERNS_BLOCK_KEY)
         .category(CoreProperties.CATEGORY_EXCLUSIONS)
         .subCategory(SUB_CATEGORY_IGNORE_ISSUES)
-        .name("Block exclusion patterns")
+        .name("Block Exclusion Patterns")
         .description("Patterns used to identify blocks in which issues are ignored.<br/>" +
           CONFIG_DOCUMENTATION_LINK)
         .onQualifiers(Qualifiers.PROJECT)
         .index(2)
         .fields(
           PropertyFieldDefinition.build(BEGIN_BLOCK_REGEXP)
-            .name("Regular expression for start of block")
+            .name("Regular Expression for Start of Block")
             .description("If this regular expression is found in a file, then following lines are ignored until end of block.")
             .type(PropertyType.STRING)
             .indicativeSize(LARGE_SIZE)
             .build(),
           PropertyFieldDefinition.build(END_BLOCK_REGEXP)
-            .name("Regular expression for end of block")
+            .name("Regular Expression for End of Block")
             .description("If specified, this regular expression is used to determine the end of code blocks to ignore. If not, then block ends at the end of file.")
             .type(PropertyType.STRING)
             .indicativeSize(LARGE_SIZE)
@@ -115,14 +115,14 @@ public final class IgnoreIssuesConfiguration {
         PropertyDefinition.builder(PATTERNS_ALLFILE_KEY)
         .category(CoreProperties.CATEGORY_EXCLUSIONS)
         .subCategory(SUB_CATEGORY_IGNORE_ISSUES)
-        .name("File exclusion patterns")
+        .name("File Exclusion Patterns")
         .description("Patterns used to identify files in which issues are ignored.<br/>" +
           CONFIG_DOCUMENTATION_LINK)
         .onQualifiers(Qualifiers.PROJECT)
         .index(1)
         .fields(
           PropertyFieldDefinition.build(FILE_REGEXP)
-            .name("Regular expression")
+            .name("Regular Expression")
             .description("If this regular expression is found in a file, then the whole file is ignored.")
             .type(PropertyType.STRING)
             .indicativeSize(LARGE_SIZE)

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 527753f0f0ec2d57b43f68a90a85590034c24939..616799b7a4b6e94f765f41de7b0f68be91c4fdc2 100644 (file)
--- 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
@@ -815,12 +815,12 @@ category.exclusions.help=<h2>Wildcards</h2>\
   </tbody>\
  </table>
 
-property.sonar.skippedModules.name=Exclude project modules from code analysis
+property.sonar.skippedModules.name=Project Modules Exclusions
 property.sonar.skippedModules.description=Comma-separated list of the modules to exclude from analysis.<br>\
- If a module's artifactId differs from its module name (the directory name): it is the artifactId that should be use instead of the module name. Changes will be applied during next code analysis.
-property.sonar.includedModules.name=Include project modules in code analysis
+ If a module's artifactId differs from its module name (the directory name): it is the artifactId that should be use instead of the module name.
+property.sonar.includedModules.name=Project Modules Inclusions
 property.sonar.includedModules.description=Comma-separated list of the modules to analyse, all other modules are automatically ignored. Be careful: the root project must be added to the list.<br>\
- If a module's artifactId differs from its module name (the directory name): it is the artifactId that should be use instead of the module name. Changes will be applied during next code analysis.
+ If a module's artifactId differs from its module name (the directory name): it is the artifactId that should be use instead of the module name.
 property.category.exclusions.issues=Issues
 property.category.exclusions.issues.description=Configure which issues should not be reported.
 property.category.exclusions.duplications=Duplications