Merge branch 'master' into branch-5.2

Conflicts:
	server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
	server/sonar-web/src/main/less/components.less

3 files changed, 8 insertions, 8 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java b/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java
index 3d635b3f207..3daafb4af1d 100644
--- a/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java
+++ b/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java
@@ -55,7 +55,7 @@ public class CorePropertyDefinitions {
       PropertyDefinition.builder("sonar.lf.logoWidthPx")
         .deprecatedKey("sonar.branding.image.width")
         .name("Width of image in pixels")
-        .description("Width in pixels, according that the height of image is constrained to 30px.")
+        .description("Width in pixels, given that the height of the the image is constrained to 30px")
         .category(CoreProperties.CATEGORY_GENERAL)
         .subCategory(CoreProperties.SUBCATEGORY_LOOKNFEEL)
         .build(),
diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index 13e651e836c..d979e3fc24e 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -105,7 +105,6 @@ open_verb=Open
 operations=Operations
 optional=Optional
 order=Order
-other=Other
 owner=Owner
 package=Package
 packages=Packages
@@ -164,6 +163,7 @@ type=Type
 unfollow=Unfollow
 unit_test=Unit test
 unit_tests=Unit tests
+unknown=Unknown
 unresolved=Unresolved
 unselect_all=Unselect all
 unselect_verb=Unselect
@@ -1073,8 +1073,8 @@ shortcuts.section.issue.comment=comment issue
 shortcuts.section.issue.change_tags=change tags of issue
 
 shortcuts.section.rules=Rules Page
-shortcuts.section.rules.navigate_between_rules=navigate between items in a list
-shortcuts.section.rules.open_details=go from the list of items to the rule details
+shortcuts.section.rules.navigate_between_rules=navigate between rules
+shortcuts.section.rules.open_details=go from the list of rules to the rule details
 shortcuts.section.rules.return_to_list=return back to the list
 
 
@@ -2038,7 +2038,7 @@ notification.dispatcher.information=Subscribe to following channels to be notifi
 notification.dispatcher.ChangesOnMyIssue=Changes in issues assigned to me or reported by me
 notification.dispatcher.NewIssues=New issues
 notification.dispatcher.NewAlerts=New quality gate status
-notification.dispatcher.NewFalsePositiveIssue=New false positives
+notification.dispatcher.NewFalsePositiveIssue=Issues resolved as false positive or won't fix
 
 
 #------------------------------------------------------------------------------
diff --git a/sonar-core/src/test/java/org/sonar/core/i18n/DefaultI18nTest.java b/sonar-core/src/test/java/org/sonar/core/i18n/DefaultI18nTest.java
index b859c92bc86..d787b0e6983 100644
--- a/sonar-core/src/test/java/org/sonar/core/i18n/DefaultI18nTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/i18n/DefaultI18nTest.java
@@ -72,7 +72,7 @@ public class DefaultI18nTest {
     // Only in english
     assertThat(manager.getPropertyKeys().contains("assignee")).isTrue();
     assertThat(manager.getPropertyKeys().contains("sqale.page")).isTrue();
-    assertThat(manager.getPropertyKeys().contains("unknown")).isFalse();
+    assertThat(manager.getPropertyKeys().contains("bla_bla_bla")).isFalse();
   }
 
   @Test
@@ -124,8 +124,8 @@ public class DefaultI18nTest {
 
   @Test
   public void return_default_value_if_missing_key() {
-    assertThat(manager.message(Locale.ENGLISH, "unknown", "default")).isEqualTo("default");
-    assertThat(manager.message(Locale.FRENCH, "unknown", "default")).isEqualTo("default");
+    assertThat(manager.message(Locale.ENGLISH, "bla_bla_bla", "default")).isEqualTo("default");
+    assertThat(manager.message(Locale.FRENCH, "bla_bla_bla", "default")).isEqualTo("default");
   }
 
   @Test