aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Hartmann <hartmann.eric@gmail.com>2012-10-16 14:04:36 +0200
committerEric Hartmann <hartmann.eric@gmail.com>2012-10-16 14:04:36 +0200
commit6a8f177c830f8fd4cfb09c7c8c8b3bc082346b6e (patch)
treece7da7cef22ef893de8735af08ed9ca404046753
parent8d6417b9a76b88442a9f365d910338f405b84fa6 (diff)
parentdc21e3ec0228f3f522fee8e9f39e158f27e23a7c (diff)
downloadsonarqube-6a8f177c830f8fd4cfb09c7c8c8b3bc082346b6e.tar.gz
sonarqube-6a8f177c830f8fd4cfb09c7c8c8b3bc082346b6e.zip
Merge branch 'master' of github.com:SonarSource/sonar
-rw-r--r--plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties4
1 files changed, 2 insertions, 2 deletions
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 74a07c466f2..54a7079fdf4 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
@@ -586,9 +586,9 @@ property.sonar.exclusions.description=Changes will be applied during next code a
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 overriden at project level. Changes will be applied during next code analysis.
+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 overriden at project level. Changes will be applied during next code analysis.
+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.
category.exclusions.help=<h2>Wildcards</h2>\
<p>Following rules are applied:</p>\
<table class="data">\