Fine tune login form

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 507d226bbbee7957ceeb17edd44ba3b1140b685c..2bb83a4935ff2e59e0d63afa0b4fc39419dbb76c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -922,6 +922,14 @@ en:
           waterfall: "Waterfall"
           water_point: "Water Point"
           weir: "Weir"
+      admin_levels:
+        level2: "Country Boundary"
+        level4: "State Boundary"
+        level5: "Region Boundary"
+        level6: "County Boundary"
+        level8: "City Boundary"
+        level9: "Village Boundary"
+        level10: "Suburb Boundary"
     description:
       title:
         osm_nominatim: 'Location from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
@@ -1222,6 +1230,11 @@ en:
         subject_other: "[OpenStreetMap] %{commenter} has resolved a note you are interested in"
         your_note: "%{commenter} has resolved one of your map notes near %{place}."
         commented_note: "%{commenter} has resolved a map note you have commented on. The note is near %{place}."
+      reopened:
+        subject_own: "[OpenStreetMap] %{commenter} has reactivated one of your notes"
+        subject_other: "[OpenStreetMap] %{commenter} has reactivated a note you are interested in"
+        your_note: "%{commenter} has reactivated one of your map notes near %{place}."
+        commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
       details: "More details about the note can be found at %{url}."
   message:
     inbox:
@@ -1605,7 +1618,7 @@ en:
       login_button: "Login"
       register now: Register now
       with username: "Already have an OpenStreetMap account? Please login with your username and password:"
-      with openid: "Alternatively please use your OpenID to login:"
+      with openid: "Alternatively, use OpenID to login:"
       new to osm: New to OpenStreetMap?
       to make changes: To make changes to the OpenStreetMap data, you must have an account.
       create account minute: Create an account. It only takes a minute.
@@ -2009,9 +2022,10 @@ en:
       title: "OpenStreetMap Notes"
       description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]"
       description_item: "An rss feed for note %{id}"
+      opened: "new note (near %{place})"
+      commented: "new comment (near %{place})"
       closed: "closed note (near %{place})"
-      new: "new note (near %{place})"
-      comment: "new comment (near %{place})"
+      reopened: "reactivated note (near %{place})"
     entry:
       comment: Comment
       full: Full note
@@ -2061,6 +2075,7 @@ en:
         reopened_by_anonymous: "reactivated by anonymous at %{time}"
         hide: Hide
         resolve: Resolve
+        reactivate: Reactivate
         comment_and_resolve: Comment & Resolve
         comment: Comment
   redaction: