X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/185c7c24aecd1cfb64cceb989ed13e1725c42384..fc5261ece50ec10db67fbc0a2a4f975a395c6714:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 55f452fa7..9331e91e7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -373,7 +373,7 @@ en:
         osm_namefinder: 'Results from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
         geonames: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
     search_osm_namefinder:
-      prefix: "{{type}} "
+      prefix: "{{type}}"
       suffix_place: ", {{distance}} {{direction}} of {{placename}}"
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})"
       suffix_suburb: "{{suffix}}, {{parentname}}"
@@ -386,7 +386,7 @@ en:
         towns: Towns
         places: Places
     description_osm_namefinder:
-      prefix: "{{distance}} {{direction}} of {{type}} "
+      prefix: "{{distance}} {{direction}} of {{type}}"
     results:
       no_results: "No results found"
     distance:
@@ -692,7 +692,9 @@ en:
           centre: "Sports centre"
           reserve: "Nature reserve"
           military: "Military area"
-          school: "School; university"
+          school:
+            - School
+            - university
           building: "Significant building"
           station: "Railway station"
           summit:
@@ -875,7 +877,7 @@ en:
       password: "Password:"
       lost password link: "Lost your password?"
       login_button: "Login"
-      account not active: "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."
+      account not active: "Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account."
       auth failure: "Sorry, couldn't log in with those details."
     lost_password:
       title: "Lost password"
@@ -944,7 +946,7 @@ en:
       my_oauth_details: "View my OAuth details"
     friend_map:
       your location: Your location
-      nearby mapper: "Nearby mapper: "
+      nearby mapper: "Nearby mapper: [[nearby_user]]"
     account:
       title: "Edit account"
       my settings: My settings