Added some key-value pairs under `railway=`

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 74d68263c529155c3582b7d595ef1ff7173dc648..12cb1ebd2af4efea04d68121dfe41e981e022481 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -152,7 +152,7 @@ en:
       trace:
         tagstring: comma delimited
       user_block:
       trace:
         tagstring: comma delimited
       user_block:

-        reason: The reason why the user is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use laymans terms.
+        reason: The reason why the user is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use layman's terms.

         needs_view: Does the user need to log in before this block will be cleared?
       user:
         email_confirmation: 'Your address is not displayed publicly, see our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information.'
         needs_view: Does the user need to log in before this block will be cleared?
       user:
         email_confirmation: 'Your address is not displayed publicly, see our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information.'


@@ -239,6 +239,38 @@ en:
       entry:
         comment: Comment
         full: Full note
       entry:
         comment: Comment
         full: Full note

+  accounts:
+    edit:
+      title: "Edit account"
+      my settings: My Settings
+      current email address: "Current Email Address"
+      external auth: "External Authentication"
+      openid:
+        link: "https://wiki.openstreetmap.org/wiki/OpenID"
+        link text: "what is this?"
+      public editing:
+        heading: "Public editing"
+        enabled: "Enabled. Not anonymous and can edit data."
+        enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits"
+        enabled link text: "what is this?"
+        disabled: "Disabled and cannot edit data, all previous edits are anonymous."
+        disabled link text: "why can't I edit?"
+      public editing note:
+        heading: "Public editing"
+        html: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"https://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"
+      contributor terms:
+        heading: "Contributor Terms"
+        agreed: "You have agreed to the new Contributor Terms."
+        not yet agreed: "You have not yet agreed to the new Contributor Terms."
+        review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms."
+        agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
+        link: "https://www.osmfoundation.org/wiki/License/Contributor_Terms"
+        link text: "what is this?"
+      save changes button: Save Changes
+      make edits public button: Make all my edits public
+    update:
+      success_confirm_needed: "User information updated successfully. Check your email for a note to confirm your new email address."
+      success: "User information updated successfully."

   browse:
     created: "Created"
     closed: "Closed"
   browse:
     created: "Created"
     closed: "Closed"


@@ -416,6 +448,26 @@ en:
       title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
     timeout:
       sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
       title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
     timeout:
       sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."

+  dashboards:
+    contact:
+      km away: "%{count}km away"
+      m away: "%{count}m away"
+    popup:
+      your location: "Your location"
+      nearby mapper: "Nearby mapper"
+      friend: "Friend"
+    show:
+      title: My Dashboard
+      no_home_location_html: "%{edit_profile_link} and set your home location to see nearby users."
+      edit_your_profile: Edit your profile
+      my friends: My friends
+      no friends: You have not added any friends yet.
+      nearby users: "Other nearby users"
+      no nearby users: "There are no other users who admit to mapping nearby yet."
+      friends_changesets: "friends' changesets"
+      friends_diaries: "friends' diary entries"
+      nearby_changesets: "nearby user changesets"
+      nearby_diaries: "nearby user diary entries"

   diary_entries:
     new:
       title: New Diary Entry
   diary_entries:
     new:
       title: New Diary Entry


@@ -423,10 +475,10 @@ en:
       location: Location
       use_map_link: Use Map
     index:
       location: Location
       use_map_link: Use Map
     index:

-      title: "Users' diaries"
-      title_friends: "Friends' diaries"
-      title_nearby: "Nearby Users' diaries"
-      user_title: "%{user}'s diary"
+      title: "Users' Diaries"
+      title_friends: "Friends' Diaries"
+      title_nearby: "Nearby Users' Diaries"
+      user_title: "%{user}'s Diary"

       in_language_title: "Diary Entries in %{language}"
       new: New Diary Entry
       new_title: Compose a new entry in my user diary
       in_language_title: "Diary Entries in %{language}"
       new: New Diary Entry
       new_title: Compose a new entry in my user diary


@@ -439,8 +491,8 @@ en:
       title: Edit Diary Entry
       marker_text: Diary entry location
     show:
       title: Edit Diary Entry
       marker_text: Diary entry location
     show:

-      title: "%{user}'s diary | %{title}"
-      user_title: "%{user}'s diary"
+      title: "%{user}'s Diary | %{title}"
+      user_title: "%{user}'s Diary"

       leave_a_comment: "Leave a comment"
       login_to_leave_a_comment_html: "%{login_link} to leave a comment"
       login: "Login"
       leave_a_comment: "Leave a comment"
       login_to_leave_a_comment_html: "%{login_link} to leave a comment"
       login: "Login"


@@ -484,7 +536,9 @@ en:
         title: "OpenStreetMap diary entries"
         description: "Recent diary entries from users of OpenStreetMap"
     comments:
         title: "OpenStreetMap diary entries"
         description: "Recent diary entries from users of OpenStreetMap"
     comments:

-      has_commented_on: "%{display_name} has commented on the following diary entries"
+      title: "Diary Comments added by %{user}"
+      heading: "%{user}'s Diary Comments"
+      subheading_html: "Diary Comments added by %{user}"

       no_comments: "No diary comments"
       post: Post
       when: When
       no_comments: "No diary comments"
       post: Post
       when: When


@@ -697,7 +751,7 @@ en:
           houseboat: "Houseboat"
           hut: "Hut"
           industrial: "Industrial Building"
           houseboat: "Houseboat"
           hut: "Hut"
           industrial: "Industrial Building"

-          kindergarten: "Kindergarden Building"
+          kindergarten: "Kindergarten Building"

           manufacture: "Manufacturing Building"
           office: "Office Building"
           public: "Public Building"
           manufacture: "Manufacturing Building"
           office: "Office Building"
           public: "Public Building"


@@ -722,7 +776,7 @@ en:
           sport: "Sportsclub"
           "yes": "Club"
         craft:
           sport: "Sportsclub"
           "yes": "Club"
         craft:

-          beekeper: "Beekeeper"
+          beekeeper: "Beekeeper"

           blacksmith: "Blacksmith"
           brewery: "Brewery"
           carpenter: "Carpenter"
           blacksmith: "Blacksmith"
           brewery: "Brewery"
           carpenter: "Carpenter"


@@ -747,12 +801,13 @@ en:
           window_construction: "Window Construction"
           winery: "Winery"
           "yes": "Craft Shop"
           window_construction: "Window Construction"
           winery: "Winery"
           "yes": "Craft Shop"

+        crossing: "Crossing"

         emergency:
           access_point: "Access Point"
           ambulance_station: "Ambulance Station"
           assembly_point: "Assembly Point"
           defibrillator: "Defibrillator"
         emergency:
           access_point: "Access Point"
           ambulance_station: "Ambulance Station"
           assembly_point: "Assembly Point"
           defibrillator: "Defibrillator"

-          fire_xtinguisher: "Fire Extinguisher"
+          fire_extinguisher: "Fire Extinguisher"

           fire_water_pond: "Fire Water Pond"
           landing_site: "Emergency Landing Site"
           life_ring: "Emergency Life Ring"
           fire_water_pond: "Fire Water Pond"
           landing_site: "Emergency Landing Site"
           life_ring: "Emergency Life Ring"


@@ -760,7 +815,6 @@ en:
           siren: "Emergency Siren"
           suction_point: "Emergency Suction Point"
           water_tank: "Emergency Water Tank"
           siren: "Emergency Siren"
           suction_point: "Emergency Suction Point"
           water_tank: "Emergency Water Tank"

-          "yes": "Emergency"

         highway:
           abandoned: "Abandoned Highway"
           bridleway: "Bridleway"
         highway:
           abandoned: "Abandoned Highway"
           bridleway: "Bridleway"


@@ -807,6 +861,7 @@ en:
           trailhead: "Trailhead"
           trunk: "Trunk Road"
           trunk_link: "Trunk Road"
           trailhead: "Trailhead"
           trunk: "Trunk Road"
           trunk_link: "Trunk Road"

+          turning_circle: "Turning Circle"

           turning_loop: "Turning Loop"
           unclassified: "Unclassified Road"
           "yes" : "Road"
           turning_loop: "Turning Loop"
           unclassified: "Unclassified Road"
           "yes" : "Road"


@@ -837,6 +892,7 @@ en:
           railway: "Historic Railway"
           roman_road: "Roman Road"
           ruins: "Ruins"
           railway: "Historic Railway"
           roman_road: "Roman Road"
           ruins: "Ruins"

+          rune_stone: "Rune Stone"

           stone: "Stone"
           tomb: "Tomb"
           tower: "Tower"
           stone: "Stone"
           tomb: "Tomb"
           tower: "Tower"


@@ -1001,6 +1057,7 @@ en:
           hill: "Hill"
           hot_spring: "Hot Spring"
           island: "Island"
           hill: "Hill"
           hot_spring: "Hot Spring"
           island: "Island"

+          isthmus: "Isthmus"

           land: "Land"
           marsh: "Marsh"
           moor: "Moor"
           land: "Land"
           marsh: "Marsh"
           moor: "Moor"


@@ -1015,10 +1072,13 @@ en:
           sand: "Sand"
           scree: "Scree"
           scrub: "Scrub"
           sand: "Sand"
           scree: "Scree"
           scrub: "Scrub"

+          shingle: "Shingle"

           spring: "Spring"
           stone: "Stone"
           strait: "Strait"
           tree: "Tree"
           spring: "Spring"
           stone: "Stone"
           strait: "Strait"
           tree: "Tree"

+          tree_row: "Tree Row"
+          tundra: "Tundra"

           valley: "Valley"
           volcano: "Volcano"
           water: "Water"
           valley: "Valley"
           volcano: "Volcano"
           water: "Water"


@@ -1083,6 +1143,7 @@ en:
           "yes": "Place"
         railway:
           abandoned: "Abandoned Railway"
           "yes": "Place"
         railway:
           abandoned: "Abandoned Railway"

+          buffer_stop: "Buffer Stop"

           construction: "Railway under Construction"
           disused: "Disused Railway"
           funicular: "Funicular Railway"
           construction: "Railway under Construction"
           disused: "Disused Railway"
           funicular: "Funicular Railway"


@@ -1096,6 +1157,7 @@ en:
           platform: "Railway Platform"
           preserved: "Preserved Railway"
           proposed: "Proposed Railway"
           platform: "Railway Platform"
           preserved: "Preserved Railway"
           proposed: "Proposed Railway"

+          rail: "Rail"

           spur: "Railway Spur"
           station: "Railway Station"
           stop: "Railway Stop"
           spur: "Railway Spur"
           station: "Railway Station"
           stop: "Railway Stop"


@@ -1104,6 +1166,7 @@ en:
           switch: "Railway Points"
           tram: "Tramway"
           tram_stop: "Tram Stop"
           switch: "Railway Points"
           tram: "Tramway"
           tram_stop: "Tram Stop"

+          turntable: "Turntable"

           yard: "Railway Yard"
         shop:
           agrarian: "Agrarian Shop"
           yard: "Railway Yard"
         shop:
           agrarian: "Agrarian Shop"


@@ -1419,8 +1482,9 @@ en:
     intro_header: Welcome to OpenStreetMap!
     intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
     intro_2_create_account: "Create a user account"
     intro_header: Welcome to OpenStreetMap!
     intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
     intro_2_create_account: "Create a user account"

-    hosting_partners_html: "Hosting is supported by %{ucl}, %{bytemark}, and other %{partners}."
+    hosting_partners_html: "Hosting is supported by %{ucl}, %{fastly}, %{bytemark}, and other %{partners}."

     partners_ucl: "UCL"
     partners_ucl: "UCL"

+    partners_fastly: "Fastly"

     partners_bytemark: "Bytemark Hosting"
     partners_partners: "partners"
     tou: "Terms of Use"
     partners_bytemark: "Bytemark Hosting"
     partners_partners: "partners"
     tou: "Terms of Use"


@@ -1655,8 +1719,32 @@ en:
       save: Update Preferences
       cancel: Cancel
     update:
       save: Update Preferences
       cancel: Cancel
     update:

-      success: Preferences updated.

       failure: Couldn't update preferences.
       failure: Couldn't update preferences.

+    update_success_flash:
+      message: Preferences updated.
+  profiles:
+    edit:
+      title: Edit Profile
+      save: Update Profile
+      cancel: Cancel
+      image: Image
+      gravatar:
+        gravatar: "Use Gravatar"
+        link: "https://wiki.openstreetmap.org/wiki/Gravatar"
+        what_is_gravatar: "What is Gravatar?"
+        disabled: "Gravatar has been disabled."
+        enabled: "Display of your Gravatar has been enabled."
+      new image: "Add an image"
+      keep image: "Keep the current image"
+      delete image: "Remove the current image"
+      replace image: "Replace the current image"
+      image size hint: "(square images at least 100x100 work best)"
+      home location: "Home Location"
+      no home location: "You have not entered your home location."
+      update home location on click: "Update home location when I click on the map?"
+    update:
+      success: Profile updated.
+      failure: Couldn't update profile.

   sessions:
     new:
       title: "Login"
   sessions:
     new:
       title: "Login"


@@ -1813,9 +1901,8 @@ en:
         credit_3_1_html: |
           The map tiles in the &ldquo;standard style&rdquo; at www.openstreetmap.org are a
           Produced Work by the OpenStreetMap Foundation using OpenStreetMap data
         credit_3_1_html: |
           The map tiles in the &ldquo;standard style&rdquo; at www.openstreetmap.org are a
           Produced Work by the OpenStreetMap Foundation using OpenStreetMap data

-          under the Open Database License. If you are using these tiles please use
-          the following attribution:
-          &ldquo;Base map and data from OpenStreetMap and OpenStreetMap Foundation&rdquo;.
+          under the Open Database License. When using this map style, the same attribution is
+          required as for the map data.

         credit_4_html: |
           For a browsable electronic map, the credit should appear in the corner of the map.
           For example:
         credit_4_html: |
           For a browsable electronic map, the credit should appear in the corner of the map.
           For example:


@@ -1844,10 +1931,10 @@ en:
           <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
           Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
         contributors_au_html: |
           <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
           Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
         contributors_au_html: |

-          <strong>Australia</strong>: Contains data sourced from
-          <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA Australia Limited</a>
+          <strong>Australia</strong>: Incorporates or developed using Administrative Boundaries &copy;
+          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australia</a>

           licensed by the Commonwealth of Australia under
           licensed by the Commonwealth of Australia under

-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
+          <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International licence (CC BY 4.0)</a>.

         contributors_ca_html: |
           <strong>Canada</strong>: Contains data from
           GeoBase&reg;, GeoGratis (&copy; Department of Natural
         contributors_ca_html: |
           <strong>Canada</strong>: Contains data from
           GeoBase&reg;, GeoGratis (&copy; Department of Natural


@@ -2035,7 +2122,7 @@ en:
     potlatch:
       removed: Your default OpenStreetMap editor is set as Potlatch. Because Adobe Flash Player has been withdrawn, Potlatch is no longer available to use in a web browser.
       desktop_html: You can still use Potlatch by <a href="https://www.systemed.net/potlatch/">downloading the desktop application for Mac and Windows</a>.
     potlatch:
       removed: Your default OpenStreetMap editor is set as Potlatch. Because Adobe Flash Player has been withdrawn, Potlatch is no longer available to use in a web browser.
       desktop_html: You can still use Potlatch by <a href="https://www.systemed.net/potlatch/">downloading the desktop application for Mac and Windows</a>.

-      id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. <a href="%{settings_url}">Change your user settings here</a>.
+      id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. <a href="%{settings_url}">Change your preferences here</a>.

     sidebar:
       search_results: Search Results
       close: Close
     sidebar:
       search_results: Search Results
       close: Close


@@ -2193,8 +2280,8 @@ en:
         other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
     edit:
       cancel: Cancel
         other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
     edit:
       cancel: Cancel

-      title: "Editing trace %{name}"
-      heading: "Editing trace %{name}"
+      title: "Editing Trace %{name}"
+      heading: "Editing Trace %{name}"

       visibility_help: "what does this mean?"
       visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
     update:
       visibility_help: "what does this mean?"
       visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
     update:


@@ -2202,8 +2289,8 @@ en:
     trace_optionals:
       tags: "Tags"
     show:
     trace_optionals:
       tags: "Tags"
     show:

-      title: "Viewing trace %{name}"
-      heading: "Viewing trace %{name}"
+      title: "Viewing Trace %{name}"
+      heading: "Viewing Trace %{name}"

       pending: "PENDING"
       filename: "Filename:"
       download: "download"
       pending: "PENDING"
       filename: "Filename:"
       download: "download"


@@ -2242,9 +2329,9 @@ en:
       by: "by"
       in: "in"
     index:
       by: "by"
       in: "in"
     index:

-      public_traces: "Public GPS traces"
-      my_traces: "My GPS traces"
-      public_traces_from: "Public GPS traces from %{user}"
+      public_traces: "Public GPS Traces"
+      my_traces: "My GPS Traces"
+      public_traces_from: "Public GPS Traces from %{user}"

       description: "Browse recent GPS trace uploads"
       tagged_with: " tagged with %{tags}"
       empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
       description: "Browse recent GPS trace uploads"
       tagged_with: " tagged with %{tags}"
       empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."


@@ -2279,6 +2366,11 @@ en:
       blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. You need to read the message before you will be able to save your edits."
       blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
       blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. You need to read the message before you will be able to save your edits."
       blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."

+    settings_menu:
+      account_settings: Account Settings
+      oauth1_settings: OAuth 1 settings
+      oauth2_applications: OAuth 2 applications
+      oauth2_authorizations: OAuth 2 authorizations

   oauth:
     authorize:
       title: "Authorize access to your account"
   oauth:
     authorize:
       title: "Authorize access to your account"


@@ -2312,6 +2404,8 @@ en:
       read_gpx: Read private GPS traces
       write_gpx: Upload GPS traces
       write_notes: Modify notes
       read_gpx: Read private GPS traces
       write_gpx: Upload GPS traces
       write_notes: Modify notes

+      read_email: Read user email address
+      skip_authorization: Auto approve application

   oauth_clients:
     new:
       title: "Register a new application"
   oauth_clients:
     new:
       title: "Register a new application"


@@ -2353,7 +2447,7 @@ en:
       flash: "Destroyed the client application registration"
   oauth2_applications:
     index:
       flash: "Destroyed the client application registration"
   oauth2_applications:
     index:

-      title: "My client applications"
+      title: "My Client Applications"

       no_applications_html: "Do you have an application you would like to register for use with us using the %{oauth2} standard? You must register your application before it can make OAuth requests to this service."
       oauth_2: "OAuth 2"
       new: "Register new application"
       no_applications_html: "Do you have an application you would like to register for use with us using the %{oauth2} standard? You must register your application before it can make OAuth requests to this service."
       oauth_2: "OAuth 2"
       new: "Register new application"


@@ -2380,7 +2474,7 @@ en:
       sorry: "Sorry, that application could not be found."
   oauth2_authorizations:
     new:
       sorry: "Sorry, that application could not be found."
   oauth2_authorizations:
     new:

-      title: "Authorization required"
+      title: "Authorization Required"

       introduction: "Authorize %{application} to access your account with the following permissions?"
       authorize: "Authorize"
       deny: "Deny"
       introduction: "Authorize %{application} to access your account with the following permissions?"
       authorize: "Authorize"
       deny: "Deny"


@@ -2390,7 +2484,7 @@ en:
       title: "Authorization code"
   oauth2_authorized_applications:
     index:
       title: "Authorization code"
   oauth2_authorized_applications:
     index:

-      title: "My authorized applications"
+      title: "My Authorized Applications"

       application: "Application"
       permissions: "Permissions"
       no_applications_html: "You have not yet authorized any %{oauth2} applications."
       application: "Application"
       permissions: "Permissions"
       no_applications_html: "You have not yet authorized any %{oauth2} applications."


@@ -2459,8 +2553,10 @@ en:
       my settings: My Settings
       my comments: My Comments
       my_preferences: My Preferences
       my settings: My Settings
       my comments: My Comments
       my_preferences: My Preferences

+      my_dashboard: My Dashboard

       blocks on me: Blocks on Me
       blocks by me: Blocks by Me
       blocks on me: Blocks on Me
       blocks by me: Blocks by Me

+      edit_profile: Edit Profile

       send message: Send Message
       diary: Diary
       edits: Edits
       send message: Send Message
       diary: Diary
       edits: Edits


@@ -2479,14 +2575,6 @@ en:
       spam score: "Spam Score:"
       description: Description
       user location: User location
       spam score: "Spam Score:"
       description: Description
       user location: User location

-      if_set_location_html: "Set your home location on the %{settings_link} page to see nearby users."
-      settings_link_text: settings
-      my friends: My friends
-      no friends: You have not added any friends yet.
-      km away: "%{count}km away"
-      m away: "%{count}m away"
-      nearby users: "Other nearby users"
-      no nearby users: "There are no other users who admit to mapping nearby yet."

       role:
         administrator: "This user is an administrator"
         moderator: "This user is a moderator"
       role:
         administrator: "This user is an administrator"
         moderator: "This user is a moderator"


@@ -2507,64 +2595,7 @@ en:
       unhide_user: "Unhide this User"
       delete_user: "Delete this User"
       confirm: "Confirm"
       unhide_user: "Unhide this User"
       delete_user: "Delete this User"
       confirm: "Confirm"

-      friends_changesets: "friends' changesets"
-      friends_diaries: "friends' diary entries"
-      nearby_changesets: "nearby user changesets"
-      nearby_diaries: "nearby user diary entries"

       report: Report this User
       report: Report this User

-    popup:
-      your location: "Your location"
-      nearby mapper: "Nearby mapper"
-      friend: "Friend"
-    account:
-      title: "Edit account"
-      my settings: My settings
-      current email address: "Current Email Address"
-      external auth: "External Authentication"
-      openid:
-        link: "https://wiki.openstreetmap.org/wiki/OpenID"
-        link text: "what is this?"
-      public editing:
-        heading: "Public editing"
-        enabled: "Enabled. Not anonymous and can edit data."
-        enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits"
-        enabled link text: "what is this?"
-        disabled: "Disabled and cannot edit data, all previous edits are anonymous."
-        disabled link text: "why can't I edit?"
-      public editing note:
-        heading: "Public editing"
-        html: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"https://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"
-      contributor terms:
-        heading: "Contributor Terms"
-        agreed: "You have agreed to the new Contributor Terms."
-        not yet agreed: "You have not yet agreed to the new Contributor Terms."
-        review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms."
-        agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
-        link: "https://www.osmfoundation.org/wiki/License/Contributor_Terms"
-        link text: "what is this?"
-      image: Image
-      gravatar:
-        gravatar: "Use Gravatar"
-        link: "https://wiki.openstreetmap.org/wiki/Gravatar"
-        what_is_gravatar: "What is Gravatar?"
-        disabled: "Gravatar has been disabled."
-        enabled: "Display of your Gravatar has been enabled."
-      new image: "Add an image"
-      keep image: "Keep the current image"
-      delete image: "Remove the current image"
-      replace image: "Replace the current image"
-      image size hint: "(square images at least 100x100 work best)"
-      home location: "Home Location"
-      no home location: "You have not entered your home location."
-      update home location on click: "Update home location when I click on the map?"
-      save changes button: Save Changes
-      make edits public button: Make all my edits public
-      return to profile: Return to profile
-      oauth1 settings: OAuth 1 settings
-      oauth2 applications: OAuth 2 applications
-      oauth2 authorizations: OAuth 2 authorizations
-      flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
-      flash update success: "User information updated successfully."

     set_home:
       flash success: "Home location saved successfully"
     go_public:
     set_home:
       flash success: "Home location saved successfully"
     go_public:


@@ -2599,6 +2630,7 @@ en:
       no_authorization_code: No authorization code
       unknown_signature_algorithm: Unknown signature algorithm
       invalid_scope: Invalid scope
       no_authorization_code: No authorization code
       unknown_signature_algorithm: Unknown signature algorithm
       invalid_scope: Invalid scope

+      unknown_error: Authentication failed

     auth_association:
       heading: Your ID is not associated with a OpenStreetMap account yet.
       option_1: |
     auth_association:
       heading: Your ID is not associated with a OpenStreetMap account yet.
       option_1: |


@@ -2691,11 +2723,11 @@ en:
           other: "%{count} years"
     blocks_on:
       title: "Blocks on %{name}"
           other: "%{count} years"
     blocks_on:
       title: "Blocks on %{name}"

-      heading_html: "List of blocks on %{name}"
+      heading_html: "List of Blocks on %{name}"

       empty: "%{name} has not been blocked yet."
     blocks_by:
       title: "Blocks by %{name}"
       empty: "%{name} has not been blocked yet."
     blocks_by:
       title: "Blocks by %{name}"

-      heading_html: "List of blocks by %{name}"
+      heading_html: "List of Blocks by %{name}"

       empty: "%{name} has not made any blocks yet."
     show:
       title: "%{block_on} blocked by %{block_by}"
       empty: "%{name} has not made any blocks yet."
     show:
       title: "%{block_on} blocked by %{block_by}"


@@ -2728,7 +2760,7 @@ en:
   notes:
     index:
       title: "Notes submitted or commented on by %{user}"
   notes:
     index:
       title: "Notes submitted or commented on by %{user}"

-      heading: "%{user}'s notes"
+      heading: "%{user}'s Notes"

       subheading_html: "Notes submitted or commented on by %{user}"
       no_notes: No notes
       id: "Id"
       subheading_html: "Notes submitted or commented on by %{user}"
       no_notes: No notes
       id: "Id"


@@ -2924,19 +2956,19 @@ en:
       centre_map: Centre map here
   redactions:
     edit:
       centre_map: Centre map here
   redactions:
     edit:

-      heading: "Edit redaction"
-      title: "Edit redaction"
+      heading: "Edit Redaction"
+      title: "Edit Redaction"

     index:
       empty: "No redactions to show."
     index:
       empty: "No redactions to show."

-      heading: "List of redactions"
-      title: "List of redactions"
+      heading: "List of Redactions"
+      title: "List of Redactions"

     new:
     new:

-      heading: "Enter information for new redaction"
-      title: "Creating new redaction"
+      heading: "Enter Information for New Redaction"
+      title: "Creating New Redaction"

     show:
       description: "Description:"
     show:
       description: "Description:"

-      heading: "Showing redaction \"%{title}\""
-      title: "Showing redaction"
+      heading: "Showing Redaction \"%{title}\""
+      title: "Showing Redaction"

       user: "Creator:"
       edit: "Edit this redaction"
       destroy: "Remove this redaction"
       user: "Creator:"
       edit: "Edit this redaction"
       destroy: "Remove this redaction"