Use the list form for school instead of the colon

[rails.git] / config / locales / en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index b606566f77efb413e19c026251c45316fe1d4676..e3c539ce945626157b9df77d124de65caf463fa1 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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"
@@ -923,7 +925,7 @@ en:
       traces: traces
       remove as friend: remove as friend
       add as friend: add as friend
-      mapper since: "Mapper since: "
+      mapper since: "Mapper since:"
       ago: "({{time_in_words_ago}} ago)"
       user image heading: User image
       delete image: Delete Image
@@ -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