Merge remote-tracking branch 'upstream/pull/4126'

[rails.git] / config / locales / en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml

index e1907b9369a48c1b0697f625b71f3c91f84520a5..c7325e64f117652d13e92d51a37c51aff4fb940d 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -5,12 +5,14 @@ en:
      formats:
        friendly: "%e %B %Y at %H:%M"
        blog: "%e %B %Y"
      formats:
        friendly: "%e %B %Y at %H:%M"
        blog: "%e %B %Y"
+  count:
+    at_least_pattern: "%{count}+"
    helpers:
      file:
        prompt: Choose file
      submit:
        diary_comment:
    helpers:
      file:
        prompt: Choose file
      submit:
        diary_comment:
-        create: Save
+        create: Comment
        diary_entry:
          create: "Publish"
          update: "Update"
        diary_entry:
          create: "Publish"
          update: "Update"
@@ -21,6 +23,9 @@ en:
        client_application:
          create: Register
          update: Update
        client_application:
          create: Register
          update: Update
+      oauth2_application:
+        create: Register
+        update: Update
        redaction:
          create: Create redaction
          update: Save redaction
        redaction:
          create: Create redaction
          update: Save redaction
@@ -35,7 +40,14 @@ en:
        messages:
          invalid_email_address: does not appear to be a valid e-mail address
          email_address_not_routable: is not routable
        messages:
          invalid_email_address: does not appear to be a valid e-mail address
          email_address_not_routable: is not routable
-    # Translates all the model names, which is used in error handling on the web site
+        display_name_is_user_n: can't be user_n unless n is your user id
+      models:
+        user_mute:
+          attributes:
+            subject:
+              format: "%{message}"
+          is_already_muted: "is already muted"
+    # Translates all the model names, which is used in error handling on the website
      models:
        acl: "Access Control List"
        changeset: "Changeset"
      models:
        acl: "Access Control List"
        changeset: "Changeset"
@@ -49,7 +61,6 @@ en:
        message: "Message"
        node: "Node"
        node_tag: "Node Tag"
        message: "Message"
        node: "Node"
        node_tag: "Node Tag"
-      notifier: "Notifier"
        old_node: "Old Node"
        old_node_tag: "Old Node Tag"
        old_relation: "Old Relation"
        old_node: "Old Node"
        old_node_tag: "Old Node Tag"
        old_relation: "Old Relation"
@@ -72,8 +83,8 @@ en:
        way: "Way"
        way_node: "Way Node"
        way_tag: "Way Tag"
        way: "Way"
        way_node: "Way Node"
        way_tag: "Way Tag"
-    # Translates all the model attributes, which is used in error handling on the web site
-    # Only the ones that are used on the web site are translated at the moment
+    # Translates all the model attributes, which is used in error handling on the website
+    # Only the ones that are used on the website are translated at the moment
      attributes:
        client_application:
          name: Name (Required)
      attributes:
        client_application:
          name: Name (Required)
@@ -92,22 +103,27 @@ en:
        diary_entry:
          user: "User"
          title: "Subject"
        diary_entry:
          user: "User"
          title: "Subject"
+        body: "Body"
          latitude: "Latitude"
          longitude: "Longitude"
          latitude: "Latitude"
          longitude: "Longitude"
-        language: "Language"
+        language_code: "Language"
+      doorkeeper/application:
+        name: Name
+        redirect_uri: Redirect URIs
+        confidential: Confidential application?
+        scopes: Permissions
        friend:
          user: "User"
          friend: "Friend"
        trace:
          user: "User"
          visible: "Visible"
        friend:
          user: "User"
          friend: "Friend"
        trace:
          user: "User"
          visible: "Visible"
-        name: "Name"
+        name: Filename
          size: "Size"
          latitude: "Latitude"
          longitude: "Longitude"
          public: "Public"
          description: "Description"
          size: "Size"
          latitude: "Latitude"
          longitude: "Longitude"
          public: "Public"
          description: "Description"
-        name: Filename
          gpx_file: Upload GPX File
          visibility: Visibility
          tagstring: Tags
          gpx_file: Upload GPX File
          visibility: Visibility
          tagstring: Tags
@@ -138,52 +154,54 @@ en:
          pass_crypt: "Password"
          pass_crypt_confirmation: "Confirm Password"
      help:
          pass_crypt: "Password"
          pass_crypt_confirmation: "Confirm Password"
      help:
+      doorkeeper/application:
+        confidential: "Application will be used where the client secret can be kept confidential (native mobile apps and single page apps are not confidential)"
+        redirect_uri: "Use one line per URI"
        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:
          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.'
          new_email: "(never displayed publicly)"
    datetime:
      distance_in_words_ago:
        about_x_hours:
          new_email: "(never displayed publicly)"
    datetime:
      distance_in_words_ago:
        about_x_hours:
-        one: about 1 hour ago
+        one: about %{count} hour ago
          other: about %{count} hours ago
        about_x_months:
          other: about %{count} hours ago
        about_x_months:
-        one: about 1 month ago
+        one: about %{count} month ago
          other: about %{count} months ago
        about_x_years:
          other: about %{count} months ago
        about_x_years:
-        one: about 1 year ago
+        one: about %{count} year ago
          other: about %{count} years ago
        almost_x_years:
          other: about %{count} years ago
        almost_x_years:
-        one: almost 1 year ago
+        one: almost %{count} year ago
          other: almost %{count} years ago
        half_a_minute: half a minute ago
        less_than_x_seconds:
          other: almost %{count} years ago
        half_a_minute: half a minute ago
        less_than_x_seconds:
-        one: less than 1 second ago
+        one: less than %{count} second ago
          other: less than %{count} seconds ago
        less_than_x_minutes:
          other: less than %{count} seconds ago
        less_than_x_minutes:
-        one: less than a minute ago
+        one: less than %{count} minute ago
          other: less than %{count} minutes ago
        over_x_years:
          other: less than %{count} minutes ago
        over_x_years:
-        one: over 1 year ago
+        one: over %{count} year ago
          other: over %{count} years ago
        x_seconds:
          other: over %{count} years ago
        x_seconds:
-        one: 1 second ago
+        one: "%{count} second ago"
          other: "%{count} seconds ago"
        x_minutes:
          other: "%{count} seconds ago"
        x_minutes:
-        one: 1 minute ago
+        one: "%{count} minute ago"
          other: "%{count} minutes ago"
        x_days:
          other: "%{count} minutes ago"
        x_days:
-        one: 1 day ago
+        one: "%{count} day ago"
          other: "%{count} days ago"
        x_months:
          other: "%{count} days ago"
        x_months:
-        one: 1 month ago
+        one: "%{count} month ago"
          other: "%{count} months ago"
        x_years:
          other: "%{count} months ago"
        x_years:
-        one: 1 year ago
+        one: "%{count} year ago"
          other: "%{count} years ago"
    printable_name:
      with_id: "%{id}"
          other: "%{count} years ago"
    printable_name:
      with_id: "%{id}"
@@ -203,7 +221,7 @@ en:
        openid: OpenID
        google: Google
        facebook: Facebook
        openid: OpenID
        google: Google
        facebook: Facebook
-      windowslive: Windows Live
+      microsoft: Microsoft
        github: GitHub
        wikipedia: Wikipedia
    api:
        github: GitHub
        wikipedia: Wikipedia
    api:
@@ -219,6 +237,7 @@ en:
          reopened_at_by_html: "Reactivated %{when} by %{user}"
        rss:
          title: "OpenStreetMap Notes"
          reopened_at_by_html: "Reactivated %{when} by %{user}"
        rss:
          title: "OpenStreetMap Notes"
+        description_all: "A list of reported, commented on or closed 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})"
          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})"
@@ -228,25 +247,85 @@ en:
        entry:
          comment: Comment
          full: Full note
        entry:
          comment: Comment
          full: Full note
+  account:
+    deletions:
+      show:
+        title: Delete My Account
+        warning: Warning! The account deletion process is final, and cannot be reversed.
+        delete_account: Delete Account
+        delete_introduction: "You can delete your OpenStreetMap account using the button below. Please note the following details:"
+        delete_profile: Your profile information, including your avatar, description and home location will be removed.
+        delete_display_name: Your display name will be removed, and can be reused by other accounts.
+        retain_caveats: "However, some information about you will be retained on OpenStreetMap, even after your account is deleted:"
+        retain_edits: Your edits to the map database, if any, will be retained.
+        retain_traces: Your uploaded traces, if any, will be retained.
+        retain_diary_entries: Your diary entries and diary comments, if any, will be retained but hidden from view.
+        retain_notes: Your map notes and note comments, if any, will be retained but hidden from view.
+        retain_changeset_discussions: Your changeset discussions, if any, will be retained.
+        retain_email: Your email address will be retained.
+        recent_editing_html: "As you have edited recently your account cannot currently be deleted. Deletion will be possible in %{time}."
+        confirm_delete: Are you sure?
+        cancel: Cancel
+  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?"
+      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://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
+        link text: "what is this?"
+      save changes button: Save Changes
+      delete_account: Delete Account...
+    go_public:
+      heading: "Public editing"
+      currently_not_public: "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."
+      only_public_can_edit: Since the 0.6 API changeover, only public users can edit map data.
+      find_out_why_html: (%{link}).
+      find_out_why: "find out why"
+      find_out_why_url: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+      email_not_revealed: Your email address will not be revealed by becoming public.
+      not_reversible: This action cannot be reversed and all new users are now public by default.
+      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."
+    destroy:
+      success: "Account Deleted."
    browse:
      created: "Created"
      closed: "Closed"
    browse:
      created: "Created"
      closed: "Closed"
-    created_html: "Created <abbr title='%{title}'>%{time}</abbr>"
-    closed_html: "Closed <abbr title='%{title}'>%{time}</abbr>"
-    created_by_html: "Created <abbr title='%{title}'>%{time}</abbr> by %{user}"
-    deleted_by_html: "Deleted <abbr title='%{title}'>%{time}</abbr> by %{user}"
-    edited_by_html: "Edited <abbr title='%{title}'>%{time}</abbr> by %{user}"
-    closed_by_html: "Closed <abbr title='%{title}'>%{time}</abbr> by %{user}"
+    created_ago_html: "Created %{time_ago}"
+    closed_ago_html: "Closed %{time_ago}"
+    created_ago_by_html: "Created %{time_ago} by %{user}"
+    closed_ago_by_html: "Closed %{time_ago} by %{user}"
+    deleted_ago_by_html: "Deleted %{time_ago} by %{user}"
+    edited_ago_by_html: "Edited %{time_ago} by %{user}"
      version: "Version"
      in_changeset: "Changeset"
      anonymous: "anonymous"
      no_comment: "(no comment)"
      part_of: "Part of"
      part_of_relations:
      version: "Version"
      in_changeset: "Changeset"
      anonymous: "anonymous"
      no_comment: "(no comment)"
      part_of: "Part of"
      part_of_relations:
-      one: 1 relation
+      one: "%{count} relation"
        other: "%{count} relations"
      part_of_ways:
        other: "%{count} relations"
      part_of_ways:
-      one: 1 way
+      one: "%{count} way"
        other: "%{count} ways"
      download_xml: "Download XML"
      view_history: "View History"
        other: "%{count} ways"
      download_xml: "Download XML"
      view_history: "View History"
@@ -264,8 +343,8 @@ en:
        relation: "Relations (%{count})"
        relation_paginated: "Relations (%{x}-%{y} of %{count})"
        comment: "Comments (%{count})"
        relation: "Relations (%{count})"
        relation_paginated: "Relations (%{x}-%{y} of %{count})"
        comment: "Comments (%{count})"
-      hidden_commented_by_html: "Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      commented_by_html: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+      hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}"
+      comment_by_html: "Comment from %{user} %{time_ago}"
        changesetxml: "Changeset XML"
        osmchangexml: "osmChange XML"
        feed:
        changesetxml: "Changeset XML"
        osmchangexml: "osmChange XML"
        feed:
@@ -282,6 +361,7 @@ en:
        history_title_html: "Way History: %{name}"
        nodes: "Nodes"
        nodes_count:
        history_title_html: "Way History: %{name}"
        nodes: "Nodes"
        nodes_count:
+        one: "%{count} node"
          other: "%{count} nodes"
        also_part_of_html:
          one: "part of way %{related_ways}"
          other: "%{count} nodes"
        also_part_of_html:
          one: "part of way %{related_ways}"
@@ -291,7 +371,7 @@ en:
        history_title_html: "Relation History: %{name}"
        members: "Members"
        members_count:
        history_title_html: "Relation History: %{name}"
        members: "Members"
        members_count:
-        one: 1 member
+        one: "%{count} member"
          other: "%{count} members"
      relation_member:
        entry_html: "%{type} %{name}"
          other: "%{count} members"
      relation_member:
        entry_html: "%{type} %{name}"
@@ -342,29 +422,21 @@ en:
        wikimedia_commons_link: "The %{page} item on Wikimedia Commons"
        telephone_link: "Call %{phone_number}"
        colour_preview: "Colour %{colour_value} preview"
        wikimedia_commons_link: "The %{page} item on Wikimedia Commons"
        telephone_link: "Call %{phone_number}"
        colour_preview: "Colour %{colour_value} preview"
-    note:
-      title: "Note: %{id}"
-      new_note: "New Note"
-      description: "Description"
-      open_title: "Unresolved note #%{note_name}"
-      closed_title: "Resolved note #%{note_name}"
-      hidden_title: "Hidden note #%{note_name}"
-      opened_by_html: "Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      opened_by_anonymous_html: "Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
-      commented_by_html: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      commented_by_anonymous_html: "Comment from anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
-      closed_by_html: "Resolved by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      closed_by_anonymous_html: "Resolved by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
-      reopened_by_html: "Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      reopened_by_anonymous_html: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
-      hidden_by_html: "Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      report: Report this note
-      coordinates_html: "%{latitude}, %{longitude}"
+      email_link: "Email %{email}"
      query:
        title: "Query Features"
        introduction: "Click on the map to find nearby features."
        nearby: "Nearby features"
        enclosing: "Enclosing features"
      query:
        title: "Query Features"
        introduction: "Click on the map to find nearby features."
        nearby: "Nearby features"
        enclosing: "Enclosing features"
+  old_nodes:
+    not_found:
+      sorry: "Sorry, node #%{id} version %{version} could not be found."
+  old_ways:
+    not_found:
+      sorry: "Sorry, way #%{id} version %{version} could not be found."
+  old_relations:
+    not_found:
+      sorry: "Sorry, relation #%{id} version %{version} could not be found."
    changesets:
      changeset_paging_nav:
        showing_page: "Page %{page}"
    changesets:
      changeset_paging_nav:
        showing_page: "Page %{page}"
@@ -383,6 +455,7 @@ en:
      index:
        title: "Changesets"
        title_user: "Changesets by %{user}"
      index:
        title: "Changesets"
        title_user: "Changesets by %{user}"
+      title_user_link_html: "Changesets by %{user_link}"
        title_friend: "Changesets by my friends"
        title_nearby: "Changesets by nearby users"
        empty: "No changesets found."
        title_friend: "Changesets by my friends"
        title_nearby: "Changesets by nearby users"
        empty: "No changesets found."
@@ -405,6 +478,27 @@ 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"
+      latest_edit_html: "Latest edit (%{ago}):"
+    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
@@ -412,10 +506,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
@@ -428,8 +522,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"
@@ -443,9 +537,9 @@ en:
        comment_link: Comment on this entry
        reply_link: Send a message to the author
        comment_count:
        comment_link: Comment on this entry
        reply_link: Send a message to the author
        comment_count:
-        zero: No comments
          one: "%{count} comment"
          other: "%{count} comments"
          one: "%{count} comment"
          other: "%{count} comments"
+      no_comments: No comments
        edit_link: Edit this entry
        hide_link: Hide this entry
        unhide_link: Unhide this entry
        edit_link: Edit this entry
        hide_link: Hide this entry
        unhide_link: Unhide this entry
@@ -473,12 +567,56 @@ 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
        comment: Comment
        newer_comments: "Newer Comments"
        older_comments: "Older Comments"
        post: Post
        when: When
        comment: Comment
        newer_comments: "Newer Comments"
        older_comments: "Older Comments"
+  doorkeeper:
+    errors:
+      messages:
+        account_selection_required: "The authorization server requires end-user account selection"
+        consent_required: "The authorization server requires end-user consent"
+        interaction_required: "The authorization server requires end-user interaction"
+        login_required: "The authorization server requires end-user authentication"
+    flash:
+      applications:
+        create:
+          notice: Application Registered.
+    openid_connect:
+      errors:
+        messages:
+          # Configuration error messages
+          auth_time_from_resource_owner_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.auth_time_from_resource_owner missing configuration."
+          reauthenticate_resource_owner_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.reauthenticate_resource_owner missing configuration."
+          resource_owner_from_access_token_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.resource_owner_from_access_token missing configuration."
+          select_account_for_resource_owner_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.select_account_for_resource_owner missing configuration."
+          subject_not_configured: "ID Token generation failed due to Doorkeeper::OpenidConnect.configure.subject missing configuration."
+    scopes:
+      address: "View your physical address"
+      email: "View your email address"
+      openid: "Authenticate your account"
+      phone: "View your phone number"
+      profile: "View your profile information"
+  errors:
+    contact:
+      contact_url: https://wiki.openstreetmap.org/wiki/Contact
+      contact_url_title: Various contact channels explained
+      contact: contact
+      contact_the_community_html: Feel free to %{contact_link} the OpenStreetMap community if you have found a broken link / bug. Make a note of the exact URL of your request.
+    forbidden:
+      title: Forbidden
+      description: The operation you requested on the OpenStreetMap server is only available to administrators (HTTP 403)
+    internal_server_error:
+      title: Application error
+      description: The OpenStreetMap server encountered an unexpected condition that prevented it from fulfilling the request (HTTP 500)
+    not_found:
+      title: File not found
+      description: Couldn't find a file/directory/API operation by that name on the OpenStreetMap server (HTTP 404)
    friendships:
      make_friend:
        heading: "Add %{user} as a friend?"
    friendships:
      make_friend:
        heading: "Add %{user} as a friend?"
@@ -486,6 +624,7 @@ en:
        success: "%{name} is now your friend!"
        failed: "Sorry, failed to add %{name} as a friend."
        already_a_friend: "You are already friends with %{name}."
        success: "%{name} is now your friend!"
        failed: "Sorry, failed to add %{name} as a friend."
        already_a_friend: "You are already friends with %{name}."
+      limit_exceeded: "You have friended a lot of users recently. Please wait a while before trying to friend any more."
      remove_friend:
        heading: "Unfriend %{user}?"
        button: "Unfriend"
      remove_friend:
        heading: "Unfriend %{user}?"
        button: "Unfriend"
@@ -494,12 +633,13 @@ en:
    geocoder:
      search:
        title:
    geocoder:
      search:
        title:
-        latlon_html: 'Results from <a href="https://openstreetmap.org/">Internal</a>'
-        ca_postcode_html: 'Results from <a href="https://geocoder.ca/">Geocoder.CA</a>'
-        osm_nominatim_html: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
-        geonames_html: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
-        osm_nominatim_reverse_html: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
-        geonames_reverse_html: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
+        results_from_html: 'Results from %{results_link}'
+        latlon: Internal
+        latlon_url: https://openstreetmap.org/
+        osm_nominatim: OpenStreetMap Nominatim
+        osm_nominatim_url: https://nominatim.openstreetmap.org/
+        osm_nominatim_reverse: OpenStreetMap Nominatim
+        osm_nominatim_reverse_url: https://nominatim.openstreetmap.org/
      search_osm_nominatim:
        prefix_format: "%{name}"
        prefix:
      search_osm_nominatim:
        prefix_format: "%{name}"
        prefix:
@@ -517,17 +657,17 @@ en:
          aeroway:
            aerodrome: "Aerodrome"
            airstrip: "Airstrip"
          aeroway:
            aerodrome: "Aerodrome"
            airstrip: "Airstrip"
-          apron: "Apron"
-          gate: "Gate"
+          apron: "Airport Apron"
+          gate: "Airport Gate"
            hangar: "Hangar"
            helipad: "Helipad"
            holding_position: "Holding Position"
            hangar: "Hangar"
            helipad: "Helipad"
            holding_position: "Holding Position"
-          navigationaid: "Aviation Navigation aid"
+          navigationaid: "Aviation Navigation Aid"
            parking_position: "Parking Position"
            runway: "Runway"
            taxilane: "Taxilane"
            taxiway: "Taxiway"
            parking_position: "Parking Position"
            runway: "Runway"
            taxilane: "Taxilane"
            taxiway: "Taxiway"
-          terminal: "Terminal"
+          terminal: "Airport Terminal"
            windsock: "Windsock"
          amenity:
            animal_boarding: "Animal Boarding"
            windsock: "Windsock"
          amenity:
            animal_boarding: "Animal Boarding"
@@ -573,7 +713,7 @@ en:
            fire_station: "Fire Station"
            food_court: "Food Court"
            fountain: "Fountain"
            fire_station: "Fire Station"
            food_court: "Food Court"
            fountain: "Fountain"
-          fuel: "Fuel"
+          fuel: "Filling Station"
            gambling: "Gambling"
            grave_yard: "Grave Yard"
            grit_bin: "Grit Bin"
            gambling: "Gambling"
            grave_yard: "Grave Yard"
            grit_bin: "Grit Bin"
@@ -582,7 +722,7 @@ en:
            ice_cream: "Ice Cream"
            internet_cafe: "Internet Cafe"
            kindergarten: "Kindergarten"
            ice_cream: "Ice Cream"
            internet_cafe: "Internet Cafe"
            kindergarten: "Kindergarten"
-          language_school: "Language school"
+          language_school: "Language School"
            library: "Library"
            loading_dock: "Loading Dock"
            love_hotel: "Love Hotel"
            library: "Library"
            loading_dock: "Loading Dock"
            love_hotel: "Love Hotel"
@@ -679,7 +819,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"
@@ -701,10 +841,10 @@ en:
            "yes": "Building"
          club:
            scout: "Scout Group Base"
            "yes": "Building"
          club:
            scout: "Scout Group Base"
-          sport: "Sportsclub"
+          sport: "Sports Club"
            "yes": "Club"
          craft:
            "yes": "Club"
          craft:
-          beekeper: "Beekeeper"
+          beekeeper: "Beekeeper"
            blacksmith: "Blacksmith"
            brewery: "Brewery"
            carpenter: "Carpenter"
            blacksmith: "Blacksmith"
            brewery: "Brewery"
            carpenter: "Carpenter"
@@ -734,7 +874,7 @@ en:
            ambulance_station: "Ambulance Station"
            assembly_point: "Assembly Point"
            defibrillator: "Defibrillator"
            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"
@@ -742,7 +882,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"
@@ -750,6 +889,7 @@ en:
            bus_stop: "Bus Stop"
            construction: "Highway under Construction"
            corridor: "Corridor"
            bus_stop: "Bus Stop"
            construction: "Highway under Construction"
            corridor: "Corridor"
+          crossing: "Crossing"
            cycleway: "Cycle Path"
            elevator: "Elevator"
            emergency_access_point: "Emergency Access Point"
            cycleway: "Cycle Path"
            elevator: "Elevator"
            emergency_access_point: "Emergency Access Point"
@@ -789,6 +929,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"
@@ -819,6 +960,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"
@@ -836,9 +978,8 @@ en:
            brownfield: "Brownfield Land"
            cemetery: "Cemetery"
            commercial: "Commercial Area"
            brownfield: "Brownfield Land"
            cemetery: "Cemetery"
            commercial: "Commercial Area"
-          conservation: "Conservation"
-          construction: "Construction"
-          farm: "Farm"
+          conservation: "Conservation Area"
+          construction: "Construction Area"
            farmland: "Farmland"
            farmyard: "Farmyard"
            forest: "Forest"
            farmland: "Farmland"
            farmyard: "Farmyard"
            forest: "Forest"
@@ -859,7 +1000,7 @@ en:
            reservoir: "Reservoir"
            reservoir_watershed: "Reservoir Watershed"
            residential: "Residential Area"
            reservoir: "Reservoir"
            reservoir_watershed: "Reservoir Watershed"
            residential: "Residential Area"
-          retail: "Retail"
+          retail: "Retail Area"
            village_green: "Village Green"
            vineyard: "Vineyard"
            "yes": "Landuse"
            village_green: "Village Green"
            vineyard: "Vineyard"
            "yes": "Landuse"
@@ -880,7 +1021,7 @@ en:
            fitness_station: "Fitness Station"
            garden: "Garden"
            golf_course: "Golf Course"
            fitness_station: "Fitness Station"
            garden: "Garden"
            golf_course: "Golf Course"
-          horse_riding: "Horse Riding"
+          horse_riding: "Horse Riding Centre"
            ice_rink: "Ice Rink"
            marina: "Marina"
            miniature_golf: "Miniature Golf"
            ice_rink: "Ice Rink"
            marina: "Marina"
            miniature_golf: "Miniature Golf"
@@ -983,6 +1124,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"
@@ -997,10 +1139,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"
@@ -1065,6 +1210,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"
@@ -1078,6 +1224,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"
@@ -1086,6 +1233,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"
@@ -1126,7 +1274,7 @@ en:
            deli: "Deli"
            department_store: "Department Store"
            discount: "Discount Items Shop"
            deli: "Deli"
            department_store: "Department Store"
            discount: "Discount Items Shop"
-          doityourself: "Do-It-Yourself"
+          doityourself: "Do-It-Yourself Shop"
            dry_cleaning: "Dry Cleaning"
            e-cigarette: "E-Cigarette Shop"
            electronics: "Electronics Shop"
            dry_cleaning: "Dry Cleaning"
            e-cigarette: "E-Cigarette Shop"
            electronics: "Electronics Shop"
@@ -1152,7 +1300,7 @@ en:
            health_food: "Health Food Store"
            hearing_aids: "Hearing Aids"
            herbalist: "Herbalist"
            health_food: "Health Food Store"
            hearing_aids: "Hearing Aids"
            herbalist: "Herbalist"
-          hifi: "Hi-Fi"
+          hifi: "Hi-Fi Shop"
            houseware: "Houseware Shop"
            ice_cream: "Ice Cream Shop"
            interior_decoration: "Interior Decoration"
            houseware: "Houseware Shop"
            ice_cream: "Ice Cream Shop"
            interior_decoration: "Interior Decoration"
@@ -1212,7 +1360,7 @@ en:
            artwork: "Artwork"
            attraction: "Attraction"
            bed_and_breakfast: "Bed and Breakfast"
            artwork: "Artwork"
            attraction: "Attraction"
            bed_and_breakfast: "Bed and Breakfast"
-          cabin: "Cabin"
+          cabin: "Tourist Cabin"
            camp_pitch: "Camp Pitch"
            camp_site: "Camp Site"
            caravan_site: "Caravan Site"
            camp_pitch: "Camp Pitch"
            camp_site: "Camp Site"
            caravan_site: "Caravan Site"
@@ -1285,31 +1433,25 @@ en:
        status: Status
        reports: Reports
        last_updated: Last Updated
        status: Status
        reports: Reports
        last_updated: Last Updated
-      last_updated_time_html: "<abbr title='%{title}'>%{time}</abbr>"
-      last_updated_time_user_html: "<abbr title='%{title}'>%{time}</abbr> by %{user}"
+      last_updated_time_ago_user_html: "%{time_ago} by %{user}"
        link_to_reports: View Reports
        link_to_reports: View Reports
-      reported_user: Reported User
        reports_count:
        reports_count:
-        one: "1 Report"
+        one: "%{count} Report"
          other: "%{count} Reports"
        reported_item: Reported Item
        states:
          ignored: Ignored
          open: Open
          resolved: Resolved
          other: "%{count} Reports"
        reported_item: Reported Item
        states:
          ignored: Ignored
          open: Open
          resolved: Resolved
-    update:
-      new_report: Your report has been registered successfully
-      successful_update: Your report has been updated successfully
-      provide_details: Please provide the required details
      show:
        title: "%{status} Issue #%{issue_id}"
        reports:
      show:
        title: "%{status} Issue #%{issue_id}"
        reports:
-        zero: No reports
-        one: 1 report
+        one: "%{count} report"
          other: "%{count} reports"
          other: "%{count} reports"
-      report_created_at: "First reported at %{datetime}"
-      last_resolved_at: "Last resolved at %{datetime}"
-      last_updated_at: "Last updated at %{datetime} by %{displayname}"
+      no_reports: No reports
+      report_created_at_html: "First reported at %{datetime}"
+      last_resolved_at_html: "Last resolved at %{datetime}"
+      last_updated_at_html: "Last updated at %{datetime} by %{displayname}"
        resolve: Resolve
        ignore: Ignore
        reopen: Reopen
        resolve: Resolve
        ignore: Ignore
        reopen: Reopen
@@ -1337,6 +1479,7 @@ en:
    issue_comments:
      create:
        comment_created: Your comment was successfully created
    issue_comments:
      create:
        comment_created: Your comment was successfully created
+      issue_reassigned: Your comment was created and the issue was reassigned
    reports:
      new:
        title_html: "Report %{link}"
    reports:
      new:
        title_html: "Report %{link}"
@@ -1382,10 +1525,8 @@ en:
      home: Go to Home Location
      logout: Log Out
      log_in: Log In
      home: Go to Home Location
      logout: Log Out
      log_in: Log In
-    log_in_tooltip: Log in with an existing account
      sign_up: Sign Up
      start_mapping: Start Mapping
      sign_up: Sign Up
      start_mapping: Start Mapping
-    sign_up_tooltip: Create an account for editing
      edit: Edit
      history: History
      export: Export
      edit: Edit
      history: History
      export: Export
@@ -1401,8 +1542,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"
@@ -1412,11 +1554,10 @@ en:
      help: Help
      about: About
      copyright: Copyright
      help: Help
      about: About
      copyright: Copyright
+    communities: Communities
      community: Community
      community_blogs: "Community Blogs"
      community_blogs_title: "Blogs from members of the OpenStreetMap community"
      community: Community
      community_blogs: "Community Blogs"
      community_blogs_title: "Blogs from members of the OpenStreetMap community"
-    foundation: Foundation
-    foundation_title: The OpenStreetMap Foundation
      make_a_donation:
        title: Support OpenStreetMap with a monetary donation
        text: Make a Donation
      make_a_donation:
        title: Support OpenStreetMap with a monetary donation
        text: Make a Donation
@@ -1456,9 +1597,10 @@ en:
        subject: "[OpenStreetMap] GPX Import failure"
      gpx_success:
        hi: "Hi %{to_user},"
        subject: "[OpenStreetMap] GPX Import failure"
      gpx_success:
        hi: "Hi %{to_user},"
-      loaded_successfully:
-        one: loaded successfully with %{trace_points} out of a possible 1 point.
-        other: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
+      loaded:
+        one: "loaded successfully with %{trace_points} out of a possible %{count} point."
+        other: "loaded successfully with %{trace_points} out of a possible %{count} points."
+      all_your_traces_html: "All your successfully uploaded GPX traces can be found at %{url}."
        subject: "[OpenStreetMap] GPX Import success"
      signup_confirm:
        subject: "[OpenStreetMap] Welcome to OpenStreetMap"
        subject: "[OpenStreetMap] GPX Import success"
      signup_confirm:
        subject: "[OpenStreetMap] Welcome to OpenStreetMap"
@@ -1519,11 +1661,35 @@ en:
        details_html: "More details about the changeset can be found at %{url}."
        unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
        unsubscribe_html: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
        details_html: "More details about the changeset can be found at %{url}."
        unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
        unsubscribe_html: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
+  confirmations:
+    confirm:
+      heading: Check your email!
+      introduction_1: |
+        We sent you a confirmation email.
+      introduction_2: |
+        Confirm your account by clicking on the link in the email and you'll be able to start mapping.
+      press confirm button: "Press the confirm button below to activate your account."
+      button: Confirm
+      success: "Confirmed your account, thanks for signing up!"
+      already active: "This account has already been confirmed."
+      unknown token: "That confirmation code has expired or does not exist."
+      resend_html: "If you need us to resend the confirmation email, %{reconfirm_link}."
+      click_here: click here
+    confirm_resend:
+      failure: "User %{name} not found."
+    confirm_email:
+      heading: Confirm a change of email address
+      press confirm button: "Press the confirm button below to confirm your new email address."
+      button: Confirm
+      success: "Confirmed your change of email address!"
+      failure: "An email address has already been confirmed with this token."
+      unknown_token: "That confirmation code has expired or does not exist."
+    resend_success_flash:
+      confirmation_sent: We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.
+      whitelist: If you use an antispam system which sends confirmation requests then please make sure you whitelist %{sender} as we are unable to reply to any confirmation requests.
    messages:
      inbox:
        title: "Inbox"
    messages:
      inbox:
        title: "Inbox"
-      my_inbox: "My Inbox"
-      my_outbox: "My Outbox"
        messages: "You have %{new_messages} and %{old_messages}"
        new_messages:
          one: "%{count} new message"
        messages: "You have %{new_messages} and %{old_messages}"
        new_messages:
          one: "%{count} new message"
@@ -1531,21 +1697,23 @@ en:
        old_messages:
          one: "%{count} old message"
          other: "%{count} old messages"
        old_messages:
          one: "%{count} old message"
          other: "%{count} old messages"
+      no_messages_yet_html: "You have no messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?"
+      people_mapping_nearby: "people mapping nearby"
+    messages_table:
        from: "From"
        from: "From"
+      to: "To"
        subject: "Subject"
        date: "Date"
        subject: "Subject"
        date: "Date"
-      no_messages_yet_html: "You have no messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?"
-      people_mapping_nearby: "people mapping nearby"
+      actions: "Actions"
      message_summary:
        unread_button: "Mark as unread"
        read_button: "Mark as read"
        reply_button: "Reply"
        destroy_button: "Delete"
      message_summary:
        unread_button: "Mark as unread"
        read_button: "Mark as read"
        reply_button: "Reply"
        destroy_button: "Delete"
+      unmute_button: "Move to Inbox"
      new:
        title: "Send message"
        send_message_to_html: "Send a new message to %{name}"
      new:
        title: "Send message"
        send_message_to_html: "Send a new message to %{name}"
-      subject: "Subject"
-      body: "Body"
        back_to_inbox: "Back to inbox"
      create:
        message_sent: "Message sent"
        back_to_inbox: "Back to inbox"
      create:
        message_sent: "Message sent"
@@ -1556,55 +1724,111 @@ en:
        body: "Sorry there is no message with that id."
      outbox:
        title: "Outbox"
        body: "Sorry there is no message with that id."
      outbox:
        title: "Outbox"
-      my_inbox: "My Inbox"
-      my_outbox: "My Outbox"
+      actions: "Actions"
        messages:
          one: "You have %{count} sent message"
          other: "You have %{count} sent messages"
        messages:
          one: "You have %{count} sent message"
          other: "You have %{count} sent messages"
-      to: "To"
-      subject: "Subject"
-      date: "Date"
        no_sent_messages_html: "You have no sent messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?"
        people_mapping_nearby: "people mapping nearby"
        no_sent_messages_html: "You have no sent messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?"
        people_mapping_nearby: "people mapping nearby"
+    muted:
+      title: "Muted Messages"
+      messages:
+        one: "%{count} muted message"
+        other: "You have %{count} muted messages"
      reply:
        wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply."
      show:
        title: "Read message"
      reply:
        wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply."
      show:
        title: "Read message"
-      from: "From"
-      subject: "Subject"
-      date: "Date"
        reply_button: "Reply"
        unread_button: "Mark as unread"
        destroy_button: "Delete"
        back: "Back"
        reply_button: "Reply"
        unread_button: "Mark as unread"
        destroy_button: "Delete"
        back: "Back"
-      to: "To"
        wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
      sent_message_summary:
        destroy_button: "Delete"
        wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
      sent_message_summary:
        destroy_button: "Delete"
+    heading: 
+      my_inbox: "My Inbox"
+      my_outbox: "My Outbox"
+      muted_messages: "Muted messages"
      mark:
        as_read: "Message marked as read"
        as_unread: "Message marked as unread"
      mark:
        as_read: "Message marked as read"
        as_unread: "Message marked as unread"
+    unmute:
+      notice: "Message has been moved to Inbox"
+      error: "The message could not be moved to the Inbox."
      destroy:
        destroyed: "Message deleted"
      destroy:
        destroyed: "Message deleted"
+  passwords:
+    new:
+      title: "Lost password"
+      heading: "Forgotten Password?"
+      email address: "Email Address"
+      new password button: "Reset password"
+      help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."
+    create:
+      notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
+      notice email cannot find: "Could not find that email address, sorry."
+    edit:
+      title: "Reset password"
+      heading: "Reset Password for %{user}"
+      reset: "Reset Password"
+      flash token bad: "Did not find that token, check the URL maybe?"
+    update:
+      flash changed: "Your password has been changed."
+      flash token bad: "Did not find that token, check the URL maybe?"
+  preferences:
+    show:
+      title: My Preferences
+      preferred_editor: Preferred Editor
+      preferred_languages: Preferred Languages
+      edit_preferences: Edit Preferences
+    edit:
+      title: Edit Preferences
+      save: Update Preferences
+      cancel: Cancel
+    update:
+      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?"
+      show: "Show"
+      delete: "Delete"
+      undelete: "Undo delete"
+    update:
+      success: Profile updated.
+      failure: Couldn't update profile.
    sessions:
      new:
        title: "Login"
        heading: "Login"
    sessions:
      new:
        title: "Login"
        heading: "Login"
-      email or username: "Email Address or Username:"
-      password: "Password:"
-      openid_html: "%{logo} OpenID:"
+      email or username: "Email Address or Username"
+      password: "Password"
+      openid_html: "%{logo} OpenID"
        remember: "Remember me"
        lost password link: "Lost your password?"
        login_button: "Login"
        register now: Register now
        remember: "Remember me"
        lost password link: "Lost your password?"
        login_button: "Login"
        register now: Register now
-      with username: "Already have an OpenStreetMap account? Please login with your username and password:"
        with external: "Alternatively, use a third party to login:"
        with external: "Alternatively, use a third party 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.
        no account: Don't have an account?
        no account: Don't have an account?
-      account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"%{reconfirm}\">request a new confirmation email</a>."
-      account is suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the <a href="%{webmaster}">webmaster</a> if you wish to discuss this.
        auth failure: "Sorry, could not log in with those details."
        openid_logo_alt: "Log in with an OpenID"
        auth_providers:
        auth failure: "Sorry, could not log in with those details."
        openid_logo_alt: "Log in with an OpenID"
        auth_providers:
@@ -1617,18 +1841,15 @@ en:
          facebook:
            title: Login with Facebook
            alt: Login with a Facebook Account
          facebook:
            title: Login with Facebook
            alt: Login with a Facebook Account
-        windowslive:
-          title: Login with Windows Live
-          alt: Login with a Windows Live Account
+        microsoft:
+          title: Login with Microsoft
+          alt: Login with a Microsoft Account
          github:
            title: Login with GitHub
            alt: Login with a GitHub Account
          wikipedia:
            title: Login with Wikipedia
            alt: Login with a Wikipedia Account
          github:
            title: Login with GitHub
            alt: Login with a GitHub Account
          wikipedia:
            title: Login with Wikipedia
            alt: Login with a Wikipedia Account
-        yahoo:
-          title: Login with Yahoo
-          alt: Login with a Yahoo OpenID
          wordpress:
            title: Login with Wordpress
            alt: Login with a Wordpress OpenID
          wordpress:
            title: Login with Wordpress
            alt: Login with a Wordpress OpenID
@@ -1639,9 +1860,15 @@ en:
        title: "Logout"
        heading: "Logout from OpenStreetMap"
        logout_button: "Logout"
        title: "Logout"
        heading: "Logout from OpenStreetMap"
        logout_button: "Logout"
+    suspended_flash:
+      suspended: Sorry, your account has been suspended due to suspicious activity.
+      contact_support_html: Please contact %{support_link} if you wish to discuss this.
+      support: support
    shared:
      markdown_help:
    shared:
      markdown_help:
-      title_html: Parsed with <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>
+      heading_html: Parsed with %{kramdown_link}
+      kramdown_url: https://kramdown.gettalong.org/quickref.html
+      kramdown: kramdown
        headings: Headings
        heading: Heading
        subheading: Subheading
        headings: Headings
        heading: Heading
        subheading: Subheading
@@ -1654,14 +1881,16 @@ en:
        image: Image
        alt: Alt text
        url: URL
        image: Image
        alt: Alt text
        url: URL
+      codeblock: Code block
      richtext_field:
        edit: Edit
        preview: Preview
    site:
      about:
        next: Next
      richtext_field:
        edit: Edit
        preview: Preview
    site:
      about:
        next: Next
-      copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
-      used_by_html: "%{name} provides map data for thousands of web sites, mobile apps, and hardware devices"
+      heading_html: "%{copyright}OpenStreetMap %{br} contributors"
+      copyright_symbol_html: "&copy;"
+      used_by_html: "%{name} provides map data for thousands of websites, mobile apps, and hardware devices"
        lede_text: |
          OpenStreetMap is built by a community of mappers that contribute and maintain data
          about roads, trails, cafés, railway stations, and much more, all over the world.
        lede_text: |
          OpenStreetMap is built by a community of mappers that contribute and maintain data
          about roads, trails, cafés, railway stations, and much more, all over the world.
@@ -1671,35 +1900,52 @@ en:
          aerial imagery, GPS devices, and low-tech field maps to verify that OSM
          is accurate and up to date.
        community_driven_title: Community Driven
          aerial imagery, GPS devices, and low-tech field maps to verify that OSM
          is accurate and up to date.
        community_driven_title: Community Driven
-      community_driven_html: |
+      community_driven_1_html: |
          OpenStreetMap's community is diverse, passionate, and growing every day.
          Our contributors include enthusiast mappers, GIS professionals, engineers
          running the OSM servers, humanitarians mapping disaster-affected areas,
          and many more.
          OpenStreetMap's community is diverse, passionate, and growing every day.
          Our contributors include enthusiast mappers, GIS professionals, engineers
          running the OSM servers, humanitarians mapping disaster-affected areas,
          and many more.
-        To learn more about the community, see the
-        <a href='https://blog.openstreetmap.org'>OpenStreetMap Blog</a>,
-        <a href='%{diary_path}'>user diaries</a>,
-        <a href='https://blogs.openstreetmap.org/'>community blogs</a>, and
-        the <a href='https://www.osmfoundation.org/'>OSM Foundation</a> website.
+        To learn more about the community, see the %{osm_blog_link},
+        %{user_diaries_link}, %{community_blogs_link}, and the
+        %{osm_foundation_link} website.
+      community_driven_osm_blog: OpenStreetMap Blog
+      community_driven_osm_blog_url: https://blog.openstreetmap.org
+      community_driven_user_diaries: user diaries
+      community_driven_community_blogs: community blogs
+      community_driven_community_blogs_url: https://blogs.openstreetmap.org/
+      community_driven_osm_foundation: OSM Foundation
+      community_driven_osm_foundation_url: https://www.osmfoundation.org/
        open_data_title: Open Data
        open_data_title: Open Data
-      open_data_html: |
-        OpenStreetMap is <i>open data</i>: you are free to use it for any purpose
+      open_data_1_html: |
+        OpenStreetMap is %{open_data}: you are free to use it for any purpose
          as long as you credit OpenStreetMap and its contributors. If you alter or
          build upon the data in certain ways, you may distribute the result only
          as long as you credit OpenStreetMap and its contributors. If you alter or
          build upon the data in certain ways, you may distribute the result only
-        under the same licence. See the <a href='%{copyright_path}'>Copyright and
-        License page</a> for details.
+        under the same licence. See the %{copyright_license_link} for details.
+      open_data_open_data: open data
+      open_data_copyright_license: Copyright and License page
        legal_title: Legal
        legal_title: Legal
-      legal_1_html: |
+      legal_1_1_html: |
          This site and many other related services are formally operated by the
          This site and many other related services are formally operated by the
-        <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
+        %{openstreetmap_foundation_link} (OSMF)
          on behalf of the community. Use of all OSMF operated services is subject
          on behalf of the community. Use of all OSMF operated services is subject
-        to our <a href="https://wiki.osmfoundation.org/wiki/Terms_of_Use">Terms of Use</a>, <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
-        Acceptable Use Policies</a> and our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>.
-      legal_2_html: |
-        Please <a href='https://osmfoundation.org/Contact'>contact the OSMF</a>
+        to our %{terms_of_use_link}, %{aup_link} and our %{privacy_policy_link}.
+      legal_1_1_openstreetmap_foundation: OpenStreetMap Foundation
+      legal_1_1_openstreetmap_foundation_url: https://osmfoundation.org/
+      legal_1_1_terms_of_use: Terms of Use
+      legal_1_1_terms_of_use_url: https://wiki.osmfoundation.org/wiki/Terms_of_Use
+      legal_1_1_aup: Acceptable Use Policies
+      legal_1_1_aup_url: https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy
+      legal_1_1_privacy_policy: Privacy Policy
+      legal_1_1_privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy
+      legal_2_1_html: |
+        Please %{contact_the_osmf_link}
          if you have licensing, copyright or other legal questions.
          if you have licensing, copyright or other legal questions.
-        <br>
-        OpenStreetMap, the magnifying glass logo and State of the Map are <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">registered trademarks of the OSMF</a>.
+      legal_2_1_contact_the_osmf: contact the OSMF
+      legal_2_1_contact_the_osmf_url: https://osmfoundation.org/Contact
+      legal_2_2_html: |
+        OpenStreetMap, the magnifying glass logo and State of the Map are %{registered_trademarks_link}.
+      legal_2_2_registered_trademarks: registered trademarks of the OSMF
+      legal_2_2_registered_trademarks_url: https://wiki.osmfoundation.org/wiki/Trademark_Policy
        partners_title: Partners
      copyright:
        foreign:
        partners_title: Partners
      copyright:
        foreign:
@@ -1713,118 +1959,172 @@ en:
          mapping_link: start mapping
        legal_babble:
          title_html: Copyright and License
          mapping_link: start mapping
        legal_babble:
          title_html: Copyright and License
-        intro_1_html: |
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> is <i>open data</i>, licensed under the <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) by the  <a
-          href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
-        intro_2_html: |
+        introduction_1_html: |
+          OpenStreetMap%{registered_trademark_link} is %{open_data}, licensed under the
+          %{odc_odbl_link} (ODbL) by the %{osm_foundation_link} (OSMF).
+        introduction_1_registered_trademark_html: "&reg;"
+        introduction_1_open_data: open data
+        introduction_1_odc_odbl: Open Data Commons Open Database License
+        introduction_1_odc_odbl_url: https://opendatacommons.org/licenses/odbl/
+        introduction_1_osm_foundation: OpenStreetMap Foundation
+        introduction_1_osm_foundation_url: https://osmfoundation.org/
+        introduction_2_html: |
            You are free to copy, distribute, transmit and adapt our data,
            as long as you credit OpenStreetMap and its
            contributors. If you alter or build upon our data, you
            may distribute the result only under the same licence. The
            You are free to copy, distribute, transmit and adapt our data,
            as long as you credit OpenStreetMap and its
            contributors. If you alter or build upon our data, you
            may distribute the result only under the same licence. The
-          full <a href="https://opendatacommons.org/licenses/odbl/1.0/">legal
-          code</a> explains your rights and responsibilities.
-        intro_3_1_html: |
-          Our documentation is licensed under the
-          <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA 2.0).
+          full %{legal_code_link} explains your rights and responsibilities.
+        introduction_2_legal_code: legal code
+        introduction_2_legal_code_url: https://opendatacommons.org/licenses/odbl/1.0/
+        introduction_3_html: |
+          Our documentation is licensed under the %{creative_commons_link} license (CC BY-SA 2.0).
+        introduction_3_creative_commons: Creative Commons Attribution-ShareAlike 2.0
+        introduction_3_creative_commons_url: https://creativecommons.org/licenses/by-sa/2.0/
          credit_title_html: How to credit OpenStreetMap
          credit_1_html: |
          credit_title_html: How to credit OpenStreetMap
          credit_1_html: |
-          We require that you use the credit &ldquo;&copy; OpenStreetMap
-          contributors&rdquo;.
-        credit_2_1_html: |
-          You must also make it clear that the data is available under the Open
-          Database License. You may do this by linking to
-          <a href="https://www.openstreetmap.org/copyright">this copyright page</a>.
+          Where you use OpenStreetMap data, you are required to do the following two things:
+        credit_2_1: Provide credit to OpenStreetMap by displaying our copyright notice.
+        credit_2_2: Make clear that the data is available under the Open Database License.
+        credit_3_html: |
+         For the copyright notice, we have different requirements on how this should be
+         displayed, depending on how you are using our data. For example, different
+         rules apply on how to show the copyright notice depending on whether you have
+         created a browsable map, a printed map or a static image. Full details on the
+         requirements can be found in the %{attribution_guidelines_link}.
+        credit_3_attribution_guidelines: Attribution Guidelines
+        credit_3_attribution_guidelines_url: https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines
+        credit_4_1_html: |
+          To make clear that the data is available under the Open
+          Database License, you may link to %{this_copyright_page_link}.
            Alternatively, and as a requirement if you are distributing OSM in a
            data form, you can name and link directly to the license(s). In media
            where links are not possible (e.g. printed works), we suggest you
            direct your readers to openstreetmap.org (perhaps by expanding
            'OpenStreetMap' to this full address) and to opendatacommons.org.
            Alternatively, and as a requirement if you are distributing OSM in a
            data form, you can name and link directly to the license(s). In media
            where links are not possible (e.g. printed works), we suggest you
            direct your readers to openstreetmap.org (perhaps by expanding
            'OpenStreetMap' to this full address) and to opendatacommons.org.
-        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;.
-        credit_4_html: |
-          For a browsable electronic map, the credit should appear in the corner of the map.
-          For example:
+          In this example, the credit appears in the corner of the map.
+        credit_4_1_this_copyright_page: this copyright page
          attribution_example:
            alt: Example of how to attribute OpenStreetMap on a webpage
            title: Attribution example
          more_title_html: Finding out more
          attribution_example:
            alt: Example of how to attribute OpenStreetMap on a webpage
            title: Attribution example
          more_title_html: Finding out more
-        more_1_html: |
-          Read more about using our data, and how to credit us, at the <a
-          href="https://osmfoundation.org/Licence">OSMF Licence page</a>.
-        more_2_html: |
+        more_1_1_html: Read more about using our data, and how to credit us, at the %{osmf_licence_page_link}.
+        more_1_1_osmf_licence_page: OSMF Licence page
+        more_1_1_osmf_licence_page_url: https://osmfoundation.org/Licence
+        more_2_1_html: |
            Although OpenStreetMap is open data, we cannot provide a
            free-of-charge map API for third-parties.
            Although OpenStreetMap is open data, we cannot provide a
            free-of-charge map API for third-parties.
-          See our <a href="https://operations.osmfoundation.org/policies/api/">API Usage Policy</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">Tile Usage Policy</a>
-          and <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim Usage Policy</a>.
+          See our %{api_usage_policy_link}, %{tile_usage_policy_link} and %{nominatim_usage_policy_link}.
+        more_2_1_api_usage_policy: API Usage Policy
+        more_2_1_api_usage_policy_url: https://operations.osmfoundation.org/policies/api/
+        more_2_1_tile_usage_policy: Tile Usage Policy
+        more_2_1_tile_usage_policy_url: https://operations.osmfoundation.org/policies/tiles/
+        more_2_1_nominatim_usage_policy: Nominatim Usage Policy
+        more_2_1_nominatim_usage_policy_url: https://operations.osmfoundation.org/policies/nominatim/
          contributors_title_html: Our contributors
          contributors_intro_html: |
            Our contributors are thousands of individuals. We also include
            openly-licensed data from national mapping agencies
            and other sources, among them:
          contributors_title_html: Our contributors
          contributors_intro_html: |
            Our contributors are thousands of individuals. We also include
            openly-licensed data from national mapping agencies
            and other sources, among them:
-        contributors_at_html: |
-          <strong>Austria</strong>: Contains data from
-          <a href="https://data.wien.gv.at/">Stadt Wien</a> (under
-          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <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>
-          licensed by the Commonwealth of Australia under
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_ca_html: |
-          <strong>Canada</strong>: Contains data from
+        contributors_at_credit_html: |
+          %{austria}: Contains data from %{stadt_wien_link} (under %{cc_by_link}), %{land_vorarlberg_link}
+          and Land Tirol (under %{cc_by_at_with_amendments_link}).
+        contributors_at_austria: Austria
+        contributors_at_stadt_wien: Stadt Wien
+        contributors_at_stadt_wien_url: https://data.wien.gv.at/
+        contributors_at_cc_by: CC BY
+        contributors_at_cc_by_url: https://creativecommons.org/licenses/by/3.0/at/deed.de
+        contributors_at_land_vorarlberg: Land Vorarlberg
+        contributors_at_land_vorarlberg_url: https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm
+        contributors_at_cc_by_at_with_amendments: CC BY AT with amendments
+        contributors_at_cc_by_at_with_amendments_url: https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/
+        contributors_au_credit_html: |
+          %{australia}: Incorporates or developed using Administrative Boundaries &copy; %{geoscape_australia_link}
+          licensed by the Commonwealth of Australia under %{cc_licence_link}.
+        contributors_au_australia: Australia
+        contributors_au_geoscape_australia: Geoscape Australia
+        contributors_au_geoscape_australia_url: https://geoscape.com.au/legal/data-copyright-and-disclaimer/
+        contributors_au_cc_licence: Creative Commons Attribution 4.0 International licence (CC BY 4.0)
+        contributors_au_cc_licence_url: https://creativecommons.org/licenses/by/4.0/
+        contributors_ca_credit_html: |
+          %{canada}: Contains data from
            GeoBase&reg;, GeoGratis (&copy; Department of Natural
            Resources Canada), CanVec (&copy; Department of Natural
            Resources Canada), and StatCan (Geography Division,
            Statistics Canada).
            GeoBase&reg;, GeoGratis (&copy; Department of Natural
            Resources Canada), CanVec (&copy; Department of Natural
            Resources Canada), and StatCan (Geography Division,
            Statistics Canada).
-        contributors_fi_html: |
-          <strong>Finland</strong>: Contains data from the
+        contributors_ca_canada: Canada
+        contributors_cz_credit_html: |
+          %{czechia}: Contains data from the State Administration of Land Surveying
+          and Cadastre licensed under %{cc_licence_link}
+        contributors_cz_czechia: Czechia
+        contributors_cz_cc_licence: Creative Commons Attribution 4.0 International licence (CC BY 4.0)
+        contributors_cz_cc_licence_url: https://creativecommons.org/licenses/by/4.0/
+        contributors_fi_credit_html: |
+          %{finland}: Contains data from the
            National Land Survey of Finland's Topographic Database
            National Land Survey of Finland's Topographic Database
-          and other datasets, under the
-          <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">NLSFI License</a>.
-        contributors_fr_html: |
-          <strong>France</strong>: Contains data sourced from
+          and other datasets, under the %{nlsfi_license_link}.
+        contributors_fi_finland: Finland
+        contributors_fi_nlsfi_license: NLSFI License
+        contributors_fi_nlsfi_license_url: https://www.maanmittauslaitos.fi/en/opendata-licence-version1
+        contributors_fr_credit_html: |
+          %{france}: Contains data sourced from
            Direction Générale des Impôts.
            Direction Générale des Impôts.
-        contributors_nl_html: |
-          <strong>Netherlands</strong>: Contains &copy; AND data, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: |
-          <strong>New Zealand</strong>: Contains data sourced from the
-          <a href="https://data.linz.govt.nz/">LINZ Data Service</a> and
-          licensed for reuse under
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_si_html: |
-          <strong>Slovenia</strong>: Contains data from the
-          <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> and
-          <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
+        contributors_fr_france: France
+        contributors_nl_credit_html: |
+          %{netherlands}: Contains &copy; AND data, 2007 (%{and_link})
+        contributors_nl_netherlands: Netherlands
+        contributors_nl_and: www.and.com
+        contributors_nl_and_url: https://www.and.com
+        contributors_nz_credit_html: |
+          %{new_zealand}: Contains data sourced from the %{linz_data_service_link}
+          and licensed for reuse under %{cc_by_link}.
+        contributors_nz_new_zealand: New Zealand
+        contributors_nz_linz_data_service: LINZ Data Service
+        contributors_nz_linz_data_service_url: https://data.linz.govt.nz/
+        contributors_nz_cc_by: CC BY 4.0
+        contributors_nz_cc_by_url: https://creativecommons.org/licenses/by/4.0/
+        contributors_rs_credit_html: |
+          %{serbia}: Contains data from the %{rgz_link} and %{open_data_portal}
+          (public information of Serbia), 2018.
+        contributors_rs_serbia: Serbia
+        contributors_rs_rgz: Serbian Geodetic Authority
+        contributors_rs_rgz_url: https://geosrbija.rs/
+        contributors_rs_open_data_portal: National Open Data Portal
+        contributors_rs_open_data_portal_url: https://data.gov.rs/sr/
+        contributors_si_credit_html: |
+          %{slovenia}: Contains data from the %{gu_link} and %{mkgp_link}
            (public information of Slovenia).
            (public information of Slovenia).
-        contributors_es_html: |
-          <strong>Spain</strong>: Contains data sourced from the
-          Spanish National Geographic Institute (<a href="http://www.ign.es/">IGN</a>) and
-          National Cartographic System (<a href="http://www.scne.es/">SCNE</a>)
-          licensed for reuse under <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_za_html: |
-          <strong>South Africa</strong>: Contains data sourced from
-          <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, State copyright reserved.
-        contributors_gb_html: |
-          <strong>United Kingdom</strong>: Contains Ordnance
+        contributors_si_slovenia: Slovenia
+        contributors_si_gu: Surveying and Mapping Authority
+        contributors_si_gu_url: https://www.gov.si/en/state-authorities/bodies-within-ministries/surveying-and-mapping-authority/
+        contributors_si_mkgp: Ministry of Agriculture, Forestry and Food
+        contributors_si_mkgp_url: https://www.gov.si/en/state-authorities/ministries/ministry-of-agriculture-forestry-and-food/
+        contributors_es_credit_html: |
+          %{spain}: Contains data sourced from the
+          Spanish National Geographic Institute (%{ign_link}) and
+          National Cartographic System (%{scne_link})
+          licensed for reuse under %{cc_by_link}.
+        contributors_es_spain: Spain
+        contributors_es_ign: IGN
+        contributors_es_ign_url: https://www.ign.es/
+        contributors_es_scne: SCNE
+        contributors_es_scne_url: https://www.scne.es/
+        contributors_es_cc_by: CC BY 4.0
+        contributors_es_cc_by_url: https://creativecommons.org/licenses/by/4.0/
+        contributors_za_credit_html: |
+          %{south_africa}: Contains data sourced from %{ngi_link}, State copyright reserved.
+        contributors_za_south_africa: South Africa
+        contributors_za_ngi: "Chief Directorate: National Geo-Spatial Information"
+        contributors_za_ngi_url: https://ngi.dalrrd.gov.za/
+        contributors_gb_credit_html: |
+          %{united_kingdom}: Contains Ordnance
            Survey data &copy; Crown copyright and database right
            Survey data &copy; Crown copyright and database right
-          2010-19.
-        contributors_footer_1_html: |
+          2010-2023.
+        contributors_gb_united_kingdom: United Kingdom
+        contributors_2_html: |
            For further details of these, and other sources that have been used
            For further details of these, and other sources that have been used
-          to help improve OpenStreetMap, please see the <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">Contributors
-          page</a> on the OpenStreetMap Wiki.
+          to help improve OpenStreetMap, please see the %{contributors_page_link} on the OpenStreetMap Wiki.
+        contributors_2_contributors_page: Contributors page
+        contributors_2_contributors_page_url: https://wiki.openstreetmap.org/wiki/Contributors
          contributors_footer_2_html: |
            Inclusion of data in OpenStreetMap does not imply that the original
            data provider endorses OpenStreetMap, provides any warranty, or
          contributors_footer_2_html: |
            Inclusion of data in OpenStreetMap does not imply that the original
            data provider endorses OpenStreetMap, provides any warranty, or
@@ -1834,15 +2134,22 @@ en:
            OSM contributors are reminded never to add data from any
            copyrighted sources (e.g. Google Maps or printed maps) without
            explicit permission from the copyright holders.
            OSM contributors are reminded never to add data from any
            copyrighted sources (e.g. Google Maps or printed maps) without
            explicit permission from the copyright holders.
-        infringement_2_html: |
+        infringement_2_1_html: |
            If you believe that copyrighted material has been inappropriately
            added to the OpenStreetMap database or this site, please refer
            If you believe that copyrighted material has been inappropriately
            added to the OpenStreetMap database or this site, please refer
-          to our <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
-          procedure</a> or file directly at our
-          <a href="https://dmca.openstreetmap.org/">on-line filing page</a>.
-        trademarks_title_html: <span id="trademarks"></span>Trademarks
-        trademarks_1_html: |
-          OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please see our <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Trademark Policy</a>.
+          to our %{takedown_procedure_link} or file directly at our
+          %{online_filing_page_link}.
+        infringement_2_1_takedown_procedure: takedown procedure
+        infringement_2_1_takedown_procedure_url: https://wiki.osmfoundation.org/wiki/Takedown_procedure
+        infringement_2_1_online_filing_page: on-line filing page
+        infringement_2_1_online_filing_page_url: https://dmca.openstreetmap.org/
+        trademarks_title: Trademarks
+        trademarks_1_1_html: |
+          OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the
+          OpenStreetMap Foundation. If you have questions about your use of the marks, please see our
+          %{trademark_policy_link}.
+        trademarks_1_1_trademark_policy: Trademark Policy
+        trademarks_1_1_trademark_policy_url: https://wiki.osmfoundation.org/wiki/Trademark_Policy
      index:
        js_1: "You are either using a browser that does not support JavaScript, or you have disabled JavaScript."
        js_2: "OpenStreetMap uses JavaScript for its slippy map."
      index:
        js_1: "You are either using a browser that does not support JavaScript, or you have disabled JavaScript."
        js_2: "OpenStreetMap uses JavaScript for its slippy map."
@@ -1865,14 +2172,11 @@ en:
        no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
      export:
        title: "Export"
        no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
      export:
        title: "Export"
-      area_to_export: "Area to Export"
        manually_select: "Manually select a different area"
        manually_select: "Manually select a different area"
-      format_to_export: "Format to Export"
-      osm_xml_data: "OpenStreetMap XML Data"
-      map_image: "Map Image (shows standard layer)"
-      embeddable_html: "Embeddable HTML"
        licence: "Licence"
        licence: "Licence"
-      export_details_html: 'OpenStreetMap data is licensed under the <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).'
+      licence_details_html: OpenStreetMap data is licensed under the %{odbl_link} (ODbL).
+      odbl: Open Data Commons Open Database License
+      odbl_url: https://opendatacommons.org/licenses/odbl/1.0/
        too_large:
          advice: "If the above export fails, please consider using one of the sources listed below:"
          body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the sources listed below for bulk data downloads."
        too_large:
          advice: "If the above export fails, please consider using one of the sources listed below:"
          body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the sources listed below for bulk data downloads."
@@ -1885,23 +2189,9 @@ en:
          geofabrik:
            title: "Geofabrik Downloads"
            description: "Regularly-updated extracts of continents, countries, and selected cities"
          geofabrik:
            title: "Geofabrik Downloads"
            description: "Regularly-updated extracts of continents, countries, and selected cities"
-        metro:
-          title: "Metro Extracts"
-          description: "Extracts for major world cities and their surrounding areas"
          other:
            title: "Other Sources"
          other:
            title: "Other Sources"
-          description: "Additional sources listed on the OpenStreetMap wiki"
-      options: "Options"
-      format: "Format"
-      scale: "Scale"
-      max: "max"
-      image_size: "Image Size"
-      zoom: "Zoom"
-      add_marker: "Add a marker to the map"
-      latitude: "Lat:"
-      longitude: "Lon:"
-      output: "Output"
-      paste_html: "Paste HTML to embed in website"
+          description: "Additional sources listed on the OpenStreetMap Wiki"
        export_button: "Export"
      fixthemap:
        title: Report a problem / Fix the map
        export_button: "Export"
      fixthemap:
        title: Report a problem / Fix the map
@@ -1913,16 +2203,18 @@ en:
              If you have noticed a problem with our map data, for example a road is missing or your address, the best way to
              proceed is to join the OpenStreetMap community and add or repair the data yourself.
          add_a_note:
              If you have noticed a problem with our map data, for example a road is missing or your address, the best way to
              proceed is to join the OpenStreetMap community and add or repair the data yourself.
          add_a_note:
-          instructions_html: |
-            Just click <a class='icon note'></a> or the same icon on the map display.
+          instructions_1_html: |
+            Just click %{note_icon} or the same icon on the map display.
              This will add a marker to the map, which you can move
              by dragging. Add your message, then click save, and other mappers will investigate.
        other_concerns:
          title: Other concerns
              This will add a marker to the map, which you can move
              by dragging. Add your message, then click save, and other mappers will investigate.
        other_concerns:
          title: Other concerns
-        explanation_html: |
+        concerns_html: |
            If you have concerns about how our data is being used or about the contents please consult our
            If you have concerns about how our data is being used or about the contents please consult our
-          <a href='/copyright'>copyright page</a> for more legal information, or contact the appropriate
-          <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF working group</a>.
+          %{copyright_link} for more legal information, or contact the appropriate %{working_group_link}.
+        copyright: copyright page
+        working_group: OSMF working group
+        working_group_url: https://wiki.osmfoundation.org/wiki/Working_Groups
      help:
        title: Getting Help
        introduction: |
      help:
        title: Getting Help
        introduction: |
@@ -1944,10 +2236,10 @@ en:
          url: https://lists.openstreetmap.org/
          title: Mailing Lists
          description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists.
          url: https://lists.openstreetmap.org/
          title: Mailing Lists
          description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists.
-      forums:
-        url: https://forum.openstreetmap.org/
-        title: Forums
-        description: Questions and discussions for those that prefer a bulletin board style interface.
+      community:
+        url: https://community.openstreetmap.org/
+        title: Community forum
+        description: A shared place for conversations about OpenStreetMap.
        irc:
          url: https://irc.openstreetmap.org/
          title: IRC
        irc:
          url: https://irc.openstreetmap.org/
          title: IRC
@@ -1966,8 +2258,20 @@ en:
          description: Browse the wiki for in-depth OpenStreetMap documentation.
      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.
          description: Browse the wiki for in-depth OpenStreetMap documentation.
      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>.
+      desktop_application_html: You can still use Potlatch by %{download_link}.
+      download: downloading the desktop application for Mac and Windows
+      download_url: https://www.systemed.net/potlatch/
+      id_editor_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. %{change_preferences_link}.
+      change_preferences: Change your preferences here
+    any_questions:
+      title: Any questions?
+      paragraph_1_html: |
+        OpenStreetMap has several resources for learning about the project, asking and answering
+        questions, and collaboratively discussing and documenting mapping topics.
+        %{help_link}. With an organization making plans for OpenStreetMap? %{welcome_mat_link}.
+      get_help_here: Get help here
+      welcome_mat: Check out the Welcome Mat
+      welcome_mat_url: https://welcome.openstreetmap.org/
      sidebar:
        search_results: Search Results
        close: Close
      sidebar:
        search_results: Search Results
        close: Close
@@ -1990,120 +2294,162 @@ en:
            primary: "Primary road"
            secondary: "Secondary road"
            unclassified: "Unclassified road"
            primary: "Primary road"
            secondary: "Secondary road"
            unclassified: "Unclassified road"
+          pedestrian: "Pedestrian way"
            track: "Track"
            bridleway: "Bridleway"
            cycleway: "Cycleway"
            cycleway_national: "National cycleway"
            cycleway_regional: "Regional cycleway"
            cycleway_local: "Local cycleway"
            track: "Track"
            bridleway: "Bridleway"
            cycleway: "Cycleway"
            cycleway_national: "National cycleway"
            cycleway_regional: "Regional cycleway"
            cycleway_local: "Local cycleway"
+          cycleway_mtb: "Mountain bike route"
            footway: "Footway"
            rail: "Railway"
            footway: "Footway"
            rail: "Railway"
+          train: "Train"
            subway: "Subway"
            subway: "Subway"
-          tram:
-            - Light rail
-            - tram
-          cable:
-            - Cable car
-            - chair lift
-          runway:
-            - Airport Runway
-            - taxiway
-          apron:
-            - Airport apron
-            - terminal
+          ferry: "Ferry"
+          light_rail: "Light rail"
+          tram: "Tram"
+          trolleybus: "Trolleybus"
+          bus: "Bus"
+          cable_car: "Cable car"
+          chair_lift: "Chair lift"
+          runway: "Airport Runway"
+          taxiway: "Taxiway"
+          apron: "Airport apron"
            admin: "Administrative boundary"
            admin: "Administrative boundary"
+          capital: "Capital"
+          city: "City"
+          orchard: "Orchard"
+          vineyard: "Vineyard"
            forest: "Forest"
            wood: "Wood"
            forest: "Forest"
            wood: "Wood"
+          farmland: "Farmland"
+          grass: "Grass"
+          meadow: "Meadow"
+          bare_rock: "Bare rock"
+          sand: "Sand"
            golf: "Golf course"
            park: "Park"
            golf: "Golf course"
            park: "Park"
+          common: "Common"
+          built_up: "Built-up area"
            resident: "Residential area"
            resident: "Residential area"
-          common:
-            - Common
-            - meadow
            retail: "Retail area"
            industrial: "Industrial area"
            commercial: "Commercial area"
            heathland: "Heathland"
            retail: "Retail area"
            industrial: "Industrial area"
            commercial: "Commercial area"
            heathland: "Heathland"
-          lake:
-            - Lake
-            - reservoir
+          scrubland: "Scrubland"
+          lake: "Lake"
+          reservoir: "Reservoir"
+          intermittent_water: "Intermittent waterbody"
+          glacier: "Glacier"
+          reef: "Reef"
+          wetland: "Wetland"
            farm: "Farm"
            brownfield: "Brownfield site"
            cemetery: "Cemetery"
            allotments: "Allotments"
            pitch: "Sports pitch"
            centre: "Sports centre"
            farm: "Farm"
            brownfield: "Brownfield site"
            cemetery: "Cemetery"
            allotments: "Allotments"
            pitch: "Sports pitch"
            centre: "Sports centre"
+          beach: "Beach"
            reserve: "Nature reserve"
            military: "Military area"
            reserve: "Nature reserve"
            military: "Military area"
-          school:
-            - School
-            - university
+          school: "School"
+          university: "University"
+          hospital: "Hospital"
            building: "Significant building"
            station: "Railway station"
            building: "Significant building"
            station: "Railway station"
-          summit:
-            - Summit
-            - peak
+          summit: "Summit"
+          peak: "Peak"
            tunnel: "Dashed casing = tunnel"
            bridge: "Black casing = bridge"
            private: "Private access"
            destination: "Destination access"
            construction: "Roads under construction"
            tunnel: "Dashed casing = tunnel"
            bridge: "Black casing = bridge"
            private: "Private access"
            destination: "Destination access"
            construction: "Roads under construction"
+          bus_stop: "Bus stop"
+          stop: "Stop"
            bicycle_shop: "Bicycle shop"
            bicycle_shop: "Bicycle shop"
+          bicycle_rental: "Bicycle rental"
            bicycle_parking: "Bicycle parking"
            bicycle_parking: "Bicycle parking"
+          bicycle_parking_small: "Small bicycle parking"
            toilets: "Toilets"
      welcome:
        title: Welcome!
            toilets: "Toilets"
      welcome:
        title: Welcome!
-      introduction_html: |
+      introduction: |
          Welcome to OpenStreetMap, the free and editable map of the world. Now that you're signed
          up, you're all set to get started mapping. Here's a quick guide with the most important
          things you need to know.
        whats_on_the_map:
          title: What's on the Map
          Welcome to OpenStreetMap, the free and editable map of the world. Now that you're signed
          up, you're all set to get started mapping. Here's a quick guide with the most important
          things you need to know.
        whats_on_the_map:
          title: What's on the Map
-        on_html: |
-          OpenStreetMap is a place for mapping things that are both <em>real and current</em> -
+        on_the_map_html: |
+          OpenStreetMap is a place for mapping things that are both %{real_and_current} -
            it includes millions of buildings, roads, and other details about places. You can map
            whatever real-world features are interesting to you.
            it includes millions of buildings, roads, and other details about places. You can map
            whatever real-world features are interesting to you.
-        off_html: |
-          What it <em>doesn't</em> include is opinionated data like ratings, historical or
+        real_and_current: real and current
+        off_the_map_html: |
+          What it %{doesnt} include is opinionated data like ratings, historical or
            hypothetical features, and data from copyrighted sources. Unless you have special
            permission, don't copy from online or paper maps.
            hypothetical features, and data from copyrighted sources. Unless you have special
            permission, don't copy from online or paper maps.
+        doesnt: doesn't
        basic_terms:
          title: Basic Terms For Mapping
        basic_terms:
          title: Basic Terms For Mapping
-        paragraph_1_html: |
+        paragraph_1: |
            OpenStreetMap has some of its own lingo. Here are a few key words that'll come in handy.
            OpenStreetMap has some of its own lingo. Here are a few key words that'll come in handy.
-        editor_html: |
-          An <strong>editor</strong> is a program or website you can use to edit the map.
-        node_html: |
-          A <strong>node</strong> is a point on the map, like a single restaurant or a tree.
-        way_html: |
-          A <strong>way</strong> is a line or area, like a road, stream, lake or building.
-        tag_html: |
-          A <strong>tag</strong> is a bit of data about a node or way, like a
-          restaurant's name or a road's speed limit.
+        an_editor_html: An %{editor} is a program or website you can use to edit the map.
+        a_node_html: A %{node} is a point on the map, like a single restaurant or a tree.
+        a_way_html: A %{way} is a line or area, like a road, stream, lake or building.
+        a_tag_html: A %{tag} is a bit of data about a node or way, like a restaurant's name or a road's speed limit.
+        editor: editor
+        node: node
+        way: way
+        tag: tag
        rules:
          title: Rules!
        rules:
          title: Rules!
-        paragraph_1_html: |
+        para_1_html: |
            OpenStreetMap has few formal rules but we expect all participants to collaborate
            with, and communicate with, the community. If you are considering
            any activities other than editing by hand, please read and follow the guidelines on
            OpenStreetMap has few formal rules but we expect all participants to collaborate
            with, and communicate with, the community. If you are considering
            any activities other than editing by hand, please read and follow the guidelines on
-          <a href='https://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a> and
-          <a href='https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Automated Edits</a>.
-      questions:
-        title: Any questions?
-        paragraph_1_html: |
-          OpenStreetMap has several resources for learning about the project, asking and answering
-          questions, and collaboratively discussing and documenting mapping topics.
-          <a href='%{help_url}'>Get help here</a>. With an organization making plans for OpenStreetMap? <a href='https://welcome.openstreetmap.org/'>Check out the Welcome Mat</a>.
+          %{imports_link} and %{automated_edits_link}.
+        imports: Imports
+        imports_url: https://wiki.openstreetmap.org/wiki/Import/Guidelines
+        automated_edits: Automated Edits
+        automated_edits_url: https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct
        start_mapping: Start Mapping
        start_mapping: Start Mapping
+      continue_authorization: Continue Authorization
        add_a_note:
          title: No Time To Edit? Add a Note!
        add_a_note:
          title: No Time To Edit? Add a Note!
-        paragraph_1_html: |
+        para_1: |
            If you just want something small fixed and don't have the time to sign up and learn how to edit, it's
            easy to add a note.
            If you just want something small fixed and don't have the time to sign up and learn how to edit, it's
            easy to add a note.
-        paragraph_2_html: |
-          Just go to <a href='%{map_url}'>the map</a> and click the note icon:
-          <span class='icon note'></span>. This will add a marker to the map, which you can move
-          by dragging. Add your message, then click save, and other mappers will investigate.
+        para_2_html: |
+          Just go to %{map_link} and click the note icon: %{note_icon}.
+          This will add a marker to the map, which you can move by dragging.
+          Add your message, then click save, and other mappers will investigate.
+        the_map: the map
+    communities:
+      title: Communities
+      lede_text: |
+        People from all over the world contribute to or use OpenStreetMap.
+        While many participate as individuals, others have formed communities.
+        These groups come in a range of sizes and represent geographies from small towns to large multi-country regions.
+        They can also be formal or informal.
+      local_chapters:
+        title: Local Chapters
+        about_text: |
+          Local Chapters are country-level or region-level groups that have taken the formal step of
+          establishing not-for-profit legal entities. They represent the area's map and mappers when
+          dealing with local government, business, and media. They have also formed an affiliation
+          with the OpenStreetMap Foundation (OSMF), giving them a link to the legal and copyright
+          governing body.
+        list_text: |
+          The following communities are formally established as Local Chapters:
+      other_groups:
+        title: Other Groups
+        other_groups_html: |
+          There is no need to formally establish a group to the same extent as the Local Chapters.
+          Indeed many groups exist very sucessfully as an informal gathering of people or as a
+          community group. Anyone can set up or join these. Read more on the %{communities_wiki_link}.
+        communities_wiki: Communities wiki page
+        communities_wiki_url: https://wiki.openstreetmap.org/wiki/User_group
    traces:
      visibility:
        private: "Private (only shared as anonymous, unordered points)"
    traces:
      visibility:
        private: "Private (only shared as anonymous, unordered points)"
@@ -2125,8 +2471,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:
@@ -2134,8 +2480,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"
@@ -2155,13 +2501,12 @@ en:
        visibility: "Visibility:"
        confirm_delete: "Delete this trace?"
      trace_paging_nav:
        visibility: "Visibility:"
        confirm_delete: "Delete this trace?"
      trace_paging_nav:
-      showing_page: "Page %{page}"
        older: "Older Traces"
        newer: "Newer Traces"
      trace:
        pending: "PENDING"
        count_points:
        older: "Older Traces"
        newer: "Newer Traces"
      trace:
        pending: "PENDING"
        count_points:
-        one: "1 point"
+        one: "%{count} point"
          other: "%{count} points"
        more: "more"
        trace_details: "View Trace Details"
          other: "%{count} points"
        more: "more"
        trace_details: "View Trace Details"
@@ -2174,15 +2519,21 @@ 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_gps_traces: "My GPS Traces"
+      public_traces_from: "Public GPS Traces from %{user}"
        description: "Browse recent GPS trace uploads"
        tagged_with: " tagged with %{tags}"
        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>."
+      empty_title: Nothing here yet
+      empty_upload_html: "%{upload_link} or learn more about GPS tracing on the %{wiki_link}."
+      upload_new: Upload a new trace
+      wiki_page: wiki page
+      wiki_page_url: https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2
        upload_trace: "Upload a trace"
        upload_trace: "Upload a trace"
-      see_all_traces: "See all traces"
-      see_my_traces: "See my traces"
+      all_traces: "All Traces"
+      my_traces: "My Traces"
+      traces_from: "Public Traces from %{user}"
+      remove_tag_filter: "Remove Tag Filter"
      destroy:
        scheduled_for_deletion: "Trace scheduled for deletion"
      make_public:
      destroy:
        scheduled_for_deletion: "Trace scheduled for deletion"
      make_public:
@@ -2206,9 +2557,15 @@ en:
      require_admin:
        not_an_admin: You need to be an admin to perform that action.
      setup_user_auth:
      require_admin:
        not_an_admin: You need to be an admin to perform that action.
      setup_user_auth:
-      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_zero_hour: "You have an urgent message on the OpenStreetMap website. 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: "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
+      muted_users: Muted Users
    oauth:
      authorize:
        title: "Authorize access to your account"
    oauth:
      authorize:
        title: "Authorize access to your account"
@@ -2234,6 +2591,18 @@ en:
        flash: "You've revoked the token for %{application}"
      permissions:
        missing: "You have not permitted the application access to this facility"
        flash: "You've revoked the token for %{application}"
      permissions:
        missing: "You have not permitted the application access to this facility"
+    scopes:
+      openid: Sign-in using OpenStreetMap
+      read_prefs: Read user preferences
+      write_prefs: Modify user preferences
+      write_diary: Create diary entries, comments and make friends
+      write_api: Modify the map
+      read_gpx: Read private GPS traces
+      write_gpx: Upload GPS traces
+      write_notes: Modify notes
+      write_redactions: Redact map data
+      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"
@@ -2273,42 +2642,73 @@ en:
        flash: "Updated the client information successfully"
      destroy:
        flash: "Destroyed the client application registration"
        flash: "Updated the client information successfully"
      destroy:
        flash: "Destroyed the client application registration"
+  oauth2_applications:
+    index:
+      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"
+      name: "Name"
+      permissions: "Permissions"
+    application:
+      edit: "Edit"
+      delete: "Delete"
+      confirm_delete: "Delete this application?"
+    new:
+      title: "Register a new application"
+    edit:
+      title: "Edit your application"
+    show:
+      edit: "Edit"
+      delete: "Delete"
+      confirm_delete: "Delete this application?"
+      client_id: "Client ID"
+      client_secret: "Client Secret"
+      client_secret_warning: "Make sure to save this secret - it will not be accessible again"
+      permissions: "Permissions"
+      redirect_uris: "Redirect URIs"
+    not_found:
+      sorry: "Sorry, that application could not be found."
+  oauth2_authorizations:
+    new:
+      title: "Authorization Required"
+      introduction: "Authorize %{application} to access your account with the following permissions?"
+      authorize: "Authorize"
+      deny: "Deny"
+    error:
+      title: "An error has occurred"
+    show:
+      title: "Authorization code"
+  oauth2_authorized_applications:
+    index:
+      title: "My Authorized Applications"
+      application: "Application"
+      permissions: "Permissions"
+      no_applications_html: "You have not yet authorized any %{oauth2} applications."
+      oauth_2: "OAuth 2"
+    application:
+      revoke: "Revoke Access"
+      confirm_revoke: "Revoke access for this application?"
    users:
    users:
-    lost_password:
-      title: "Lost password"
-      heading: "Forgotten Password?"
-      email address: "Email Address:"
-      new password button: "Reset password"
-      help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."
-      notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
-      notice email cannot find: "Could not find that email address, sorry."
-    reset_password:
-      title: "Reset password"
-      heading: "Reset Password for %{user}"
-      reset: "Reset Password"
-      flash changed: "Your password has been changed."
-      flash token bad: "Did not find that token, check the URL maybe?"
      new:
        title: "Sign Up"
        no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
      new:
        title: "Sign Up"
        no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
-      contact_webmaster_html: 'Please contact the <a href="%{webmaster}">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
+      please_contact_support_html: 'Please contact %{support_link} to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
+      support: support
        about:
          header: Free and editable
        about:
          header: Free and editable
-        html: |
-          <p>Unlike other maps, OpenStreetMap is completely created by people like you,
-          and it's free for anyone to fix, update, download and use.</p>
-          <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
-      email address: "Email Address:"
-      confirm email address: "Confirm Email Address:"
-      display name: "Display Name:"
+        paragraph_1: Unlike other maps, OpenStreetMap is completely created by people like you, and it's free for anyone to fix, update, download and use.
+        paragraph_2: Sign up to get started contributing. We'll send an email to confirm your account.
        display name description: "Your publicly displayed username. You can change this later in the preferences."
        external auth: "Third Party Authentication:"
        use external auth: "Alternatively, use a third party to login"
        auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one."
        continue: Sign Up
        terms accepted: "Thanks for accepting the new contributor terms!"
        display name description: "Your publicly displayed username. You can change this later in the preferences."
        external auth: "Third Party Authentication:"
        use external auth: "Alternatively, use a third party to login"
        auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one."
        continue: Sign Up
        terms accepted: "Thanks for accepting the new contributor terms!"
-      terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see <a href=\"%{url}\">this wiki page</a>."
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
+      email_confirmation_help_html: 'Your address is not displayed publicly, see our %{privacy_policy_link} for more information.'
+      privacy_policy: privacy policy
+      privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy
+      privacy_policy_title: OSMF privacy policy including section on email addresses
      terms:
        title: "Terms"
        heading: "Terms"
      terms:
        title: "Terms"
        heading: "Terms"
@@ -2320,8 +2720,10 @@ en:
        read_tou: "I have read and agree to the Terms of Use"
        consider_pd: "In addition to the above, I consider my contributions to be in the Public Domain"
        consider_pd_why: "what's this?"
        read_tou: "I have read and agree to the Terms of Use"
        consider_pd: "In addition to the above, I consider my contributions to be in the Public Domain"
        consider_pd_why: "what's this?"
-      consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
-      guidance_html: 'Information to help understand these terms: a <a href="%{summary}">human readable summary</a> and some <a href="%{translations}">informal translations</a>'
+      consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
+      guidance_info_html: "Information to help understand these terms: a %{readable_summary_link} and some %{informal_translations_link}"
+      readable_summary: human readable summary
+      informal_translations: informal translations
        continue: Continue
        declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
        decline: "Decline"
        continue: Continue
        declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
        decline: "Decline"
@@ -2331,6 +2733,10 @@ en:
          france: "France"
          italy: "Italy"
          rest_of_world: "Rest of the world"
          france: "France"
          italy: "Italy"
          rest_of_world: "Rest of the world"
+    terms_declined_flash:
+      terms_declined_html: We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see %{terms_declined_link}.
+      terms_declined_link: this wiki page
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
      no_such_user:
        title: "No such user"
        heading: "The user %{user} does not exist"
      no_such_user:
        title: "No such user"
        heading: "The user %{user} does not exist"
@@ -2338,7 +2744,6 @@ en:
        deleted: "deleted"
      show:
        my diary: My Diary
        deleted: "deleted"
      show:
        my diary: My Diary
-      new diary entry: new diary entry
        my edits: My Edits
        my traces: My Traces
        my notes: My Notes
        my edits: My Edits
        my traces: My Traces
        my notes: My Notes
@@ -2346,9 +2751,13 @@ en:
        my profile: My Profile
        my settings: My Settings
        my comments: My Comments
        my profile: My Profile
        my settings: My Settings
        my comments: My Comments
-      oauth settings: oauth settings
+      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
+      create_mute: Mute this User
+      destroy_mute: Unmute this User
+      edit_profile: Edit Profile
        send message: Send Message
        diary: Diary
        edits: Edits
        send message: Send Message
        diary: Diary
        edits: Edits
@@ -2357,123 +2766,40 @@ en:
        remove as friend: Unfriend
        add as friend: Add Friend
        mapper since: "Mapper since:"
        remove as friend: Unfriend
        add as friend: Add Friend
        mapper since: "Mapper since:"
+      uid: "User id:"
        ct status: "Contributor terms:"
        ct undecided: Undecided
        ct declined: Declined
        ct status: "Contributor terms:"
        ct undecided: Undecided
        ct declined: Declined
-      latest edit: "Latest edit (%{ago}):"
        email address: "Email address:"
        created from: "Created from:"
        status: "Status:"
        spam score: "Spam Score:"
        email address: "Email address:"
        created from: "Created from:"
        status: "Status:"
        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"
+        importer: "This user is a importer"
          grant:
            administrator: "Grant administrator access"
            moderator: "Grant moderator access"
          grant:
            administrator: "Grant administrator access"
            moderator: "Grant moderator access"
+          importer: "Grant importer access"
          revoke:
            administrator: "Revoke administrator access"
            moderator: "Revoke moderator access"
          revoke:
            administrator: "Revoke administrator access"
            moderator: "Revoke moderator access"
+          importer: "Revoke importer access"
        block_history: "Active Blocks"
        moderator_history: "Blocks Given"
        block_history: "Active Blocks"
        moderator_history: "Blocks Given"
+      revoke_all_blocks: "Revoke all blocks"
        comments: "Comments"
        create_block: "Block this User"
        activate_user: "Activate this User"
        comments: "Comments"
        create_block: "Block this User"
        activate_user: "Activate this User"
-      deactivate_user: "Deactivate this User"
        confirm_user: "Confirm this User"
        confirm_user: "Confirm this User"
+      unconfirm_user: "Unconfirm this User"
+      unsuspend_user: "Unsuspend this User"
        hide_user: "Hide this User"
        unhide_user: "Unhide this User"
        delete_user: "Delete this User"
        confirm: "Confirm"
        hide_user: "Hide this User"
        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
-      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."
-    confirm:
-      heading: Check your email!
-      introduction_1: |
-        We sent you a confirmation email.
-      introduction_2: |
-        Confirm your account by clicking on the link in the email and you'll be able to start mapping.
-      press confirm button: "Press the confirm button below to activate your account."
-      button: Confirm
-      success: "Confirmed your account, thanks for signing up!"
-      already active: "This account has already been confirmed."
-      unknown token: "That confirmation code has expired or does not exist."
-      reconfirm_html: "If you need us to resend the confirmation email, <a href=\"%{reconfirm}\">click here</a>."
-    confirm_resend:
-      success_html: "We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist %{sender} as we are unable to reply to any confirmation requests."
-      failure: "User %{name} not found."
-    confirm_email:
-      heading: Confirm a change of email address
-      press confirm button: "Press the confirm button below to confirm your new email address."
-      button: Confirm
-      success: "Confirmed your change of email address!"
-      failure: "An email address has already been confirmed with this token."
-      unknown_token: "That confirmation code has expired or does not exist."
-    set_home:
-      flash success: "Home location saved successfully"
      go_public:
        flash success: "All your edits are now public, and you are now allowed to edit."
      index:
      go_public:
        flash success: "All your edits are now public, and you are now allowed to edit."
      index:
@@ -2490,22 +2816,16 @@ en:
      suspended:
        title: Account Suspended
        heading: Account Suspended
      suspended:
        title: Account Suspended
        heading: Account Suspended
-      webmaster: webmaster
-      body_html: |
-        <p>
-          Sorry, your account has been automatically suspended due to
-          suspicious activity.
-        </p>
-        <p>
-          This decision will be reviewed by an administrator shortly, or
-          you may contact the %{webmaster} if you wish to discuss this.
-        </p>
+      support: support
+      automatically_suspended: Sorry, your account has been automatically suspended due to suspicious activity.
+      contact_support_html: This decision will be reviewed by an administrator shortly, or you may contact %{support_link} if you wish to discuss this.
      auth_failure:
        connection_failed: Connection to authentication provider failed
        invalid_credentials: Invalid authentication credentials
        no_authorization_code: No authorization code
        unknown_signature_algorithm: Unknown signature algorithm
        invalid_scope: Invalid scope
      auth_failure:
        connection_failed: Connection to authentication provider failed
        invalid_credentials: Invalid authentication credentials
        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: |
@@ -2544,8 +2864,6 @@ en:
        title: "Creating block on %{name}"
        heading_html: "Creating block on %{name}"
        period: "How long, starting now, the user will be blocked from the API for."
        title: "Creating block on %{name}"
        heading_html: "Creating block on %{name}"
        period: "How long, starting now, the user will be blocked from the API for."
-      tried_contacting: "I have contacted the user and asked them to stop."
-      tried_waiting: "I have given a reasonable amount of time for the user to respond to those communications."
        back: "View all blocks"
      edit:
        title: "Editing block on %{name}"
        back: "View all blocks"
      edit:
        title: "Editing block on %{name}"
@@ -2557,8 +2875,6 @@ en:
        block_expired: "The block has already expired and cannot be edited."
        block_period: "The blocking period must be one of the values selectable in the drop-down list."
      create:
        block_expired: "The block has already expired and cannot be edited."
        block_period: "The blocking period must be one of the values selectable in the drop-down list."
      create:
-      try_contacting: "Please try contacting the user before blocking them and giving them a reasonable time to respond."
-      try_waiting: "Please try giving the user a reasonable time to respond before blocking them."
        flash: "Created a block on user %{name}."
      update:
        only_creator_can_edit: "Only the moderator who created this block can edit it."
        flash: "Created a block on user %{name}."
      update:
        only_creator_can_edit: "Only the moderator who created this block can edit it."
@@ -2570,11 +2886,21 @@ en:
      revoke:
        title: "Revoking block on %{block_on}"
        heading_html: "Revoking block on %{block_on} by %{block_by}"
      revoke:
        title: "Revoking block on %{block_on}"
        heading_html: "Revoking block on %{block_on} by %{block_by}"
-      time_future: "This block will end in %{time}."
-      past: "This block ended %{time} and cannot be revoked now."
+      time_future_html: "This block will end in %{time}."
+      past_html: "This block ended %{time} and cannot be revoked now."
        confirm: "Are you sure you wish to revoke this block?"
        revoke: "Revoke!"
        flash: "This block has been revoked."
        confirm: "Are you sure you wish to revoke this block?"
        revoke: "Revoke!"
        flash: "This block has been revoked."
+    revoke_all:
+      title: "Revoking all blocks on %{block_on}"
+      heading_html: "Revoking all blocks on %{block_on}"
+      empty: "%{name} has no active blocks."
+      confirm: "Are you sure you wish to revoke %{active_blocks}?"
+      active_blocks:
+        one: "%{count} active block"
+        other: "%{count} active blocks"
+      revoke: "Revoke!"
+      flash: "All active blocks have been revoked."
      helper:
        time_future_html: "Ends in %{time}."
        until_login: "Active until the user logs in."
      helper:
        time_future_html: "Ends in %{time}."
        until_login: "Active until the user logs in."
@@ -2582,33 +2908,34 @@ en:
        time_past_html: "Ended %{time}."
        block_duration:
          hours:
        time_past_html: "Ended %{time}."
        block_duration:
          hours:
-          one: "1 hour"
+          one: "%{count} hour"
            other: "%{count} hours"
          days:
            other: "%{count} hours"
          days:
-          one: "1 day"
+          one: "%{count} day"
            other: "%{count} days"
          weeks:
            other: "%{count} days"
          weeks:
-          one: "1 week"
+          one: "%{count} week"
            other: "%{count} weeks"
          months:
            other: "%{count} weeks"
          months:
-          one: "1 month"
+          one: "%{count} month"
            other: "%{count} months"
          years:
            other: "%{count} months"
          years:
-          one: "1 year"
+          one: "%{count} year"
            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}"
        heading_html: "%{block_on} blocked by %{block_by}"
        empty: "%{name} has not made any blocks yet."
      show:
        title: "%{block_on} blocked by %{block_by}"
        heading_html: "%{block_on} blocked by %{block_by}"
-      created: "Created"
-      status: "Status"
+      created: "Created:"
+      duration: "Duration:"
+      status: "Status:"
        show: "Show"
        edit: "Edit"
        revoke: "Revoke!"
        show: "Show"
        edit: "Edit"
        revoke: "Revoke!"
@@ -2631,16 +2958,75 @@ en:
        showing_page: "Page %{page}"
        next: "Next »"
        previous: "« Previous"
        showing_page: "Page %{page}"
        next: "Next »"
        previous: "« Previous"
+  user_mutes:
+    index:
+      title: "Muted Users"
+      my_muted_users: "My muted users"
+      you_have_muted_n_users:
+        one: "You have muted %{count} User"
+        other: "You have muted %{count} users"
+      user_mute_explainer: "Messages of muted users are moved into a separate Inbox and you won't receive email notifications."
+      user_mute_admins_and_moderators: "You can mute Admins and Moderators but their messages will not be muted."
+      table:
+        thead:
+          muted_user: "Muted User"
+          actions: "Actions"
+        tbody:
+          unmute: "Unmute"
+          send_message: "Send message"
+
+    create:
+      notice: "You muted %{name}."
+      error: "%{name} could not be muted. %{full_message}."
+    destroy:
+      notice: "You unmuted %{name}."
+      error: "User could not be unmuted. Please try again."
    notes:
      index:
        title: "Notes submitted or commented on by %{user}"
    notes:
      index:
        title: "Notes submitted or commented on by %{user}"
-      heading: "%{user}'s notes"
-      subheading_html: "Notes submitted or commented on by %{user}"
+      heading: "%{user}'s Notes"
+      subheading_html: "Notes %{submitted} or %{commented} by %{user}"
+      subheading_submitted: "submitted"
+      subheading_commented: "commented on"
+      no_notes: No notes
        id: "Id"
        creator: "Creator"
        description: "Description"
        created_at: "Created at"
        last_changed: "Last changed"
        id: "Id"
        creator: "Creator"
        description: "Description"
        created_at: "Created at"
        last_changed: "Last changed"
+    show:
+      title: "Note: %{id}"
+      description: "Description"
+      open_title: "Unresolved note #%{note_name}"
+      closed_title: "Resolved note #%{note_name}"
+      hidden_title: "Hidden note #%{note_name}"
+      event_opened_by_html: "Created by %{user} %{time_ago}"
+      event_opened_by_anonymous_html: "Created by anonymous %{time_ago}"
+      event_commented_by_html: "Comment from %{user} %{time_ago}"
+      event_commented_by_anonymous_html: "Comment from anonymous %{time_ago}"
+      event_closed_by_html: "Resolved by %{user} %{time_ago}"
+      event_closed_by_anonymous_html: "Resolved by anonymous %{time_ago}"
+      event_reopened_by_html: "Reactivated by %{user} %{time_ago}"
+      event_reopened_by_anonymous_html: "Reactivated by anonymous %{time_ago}"
+      event_hidden_by_html: "Hidden by %{user} %{time_ago}"
+      report: report this note
+      coordinates_html: "%{latitude}, %{longitude}"
+      anonymous_warning: This note includes comments from anonymous users which should be independently verified.
+      hide: Hide
+      resolve: Resolve
+      reactivate: Reactivate
+      comment_and_resolve: Comment & Resolve
+      comment: Comment
+      log_in_to_comment: "Log in to comment on this note"
+      report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}."
+      other_problems_resolve: "For all other problems with the note, please resolve it yourself with a comment."
+      other_problems_resolved: "For all other problems, resolving is sufficient."
+      disappear_date_html: "This resolved note will disappear from the map in %{disappear_in}."
+    new:
+      title: "New Note"
+      intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem."
+      advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
+      add: Add Note
    javascripts:
      close: Close
      share:
    javascripts:
      close: Close
      share:
@@ -2676,18 +3062,18 @@ en:
        locate:
          title: Show My Location
          metersPopup:
        locate:
          title: Show My Location
          metersPopup:
-          one: You are within one meter of this point
+          one: You are within %{count} meter of this point
            other: You are within %{count} meters of this point
          feetPopup:
            other: You are within %{count} meters of this point
          feetPopup:
-          one: You are within one foot of this point
+          one: You are within %{count} foot of this point
            other: You are within %{count} feet of this point
        base:
          standard: Standard
          cyclosm: CyclOSM
          cycle_map: Cycle Map
          transport_map: Transport Map
            other: You are within %{count} feet of this point
        base:
          standard: Standard
          cyclosm: CyclOSM
          cycle_map: Cycle Map
          transport_map: Transport Map
+        tracestracktop_topo: Tracestrack Topo
          hot: Humanitarian
          hot: Humanitarian
-        opnvkarte: ÖPNVKarte
        layers:
          header: Map Layers
          notes: Map Notes
        layers:
          header: Map Layers
          notes: Map Notes
@@ -2695,13 +3081,19 @@ en:
          gps: Public GPS Traces
          overlays: Enable overlays for troubleshooting the map
          title: "Layers"
          gps: Public GPS Traces
          overlays: Enable overlays for troubleshooting the map
          title: "Layers"
-      copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
-      donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Make a Donation</a>"
-      terms: "<a href='%{terms_url}' target='_blank'>Website and API terms</a>"
-      cyclosm: "Tiles style by <a href='%{cyclosm_url}' target='_blank'>CyclOSM</a> hosted by <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>"
-      thunderforest: "Tiles courtesy of <a href='%{thunderforest_url}' target='_blank'>Andy Allan</a>"
-      opnvkarte: "Tiles courtesy of <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>"
-      hotosm: "Tiles style by <a href='%{hotosm_url}' target='_blank'>Humanitarian OpenStreetMap Team</a> hosted by <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>"
+      copyright_text: "© %{copyright_link}"
+      openstreetmap_contributors: "OpenStreetMap contributors"
+      make_a_donation: Make a Donation
+      website_and_api_terms: Website and API terms
+      cyclosm_credit: "Tiles style by %{cyclosm_link} hosted by %{osm_france_link}"
+      cyclosm_name: CyclOSM
+      osm_france: OpenStreetMap France
+      thunderforest_credit: "Tiles courtesy of %{thunderforest_link}"
+      andy_allan: Andy Allan
+      tracestrack_credit: "Tiles courtesy of %{tracestrack_link}"
+      tracestrack: Tracestrack
+      hotosm_credit: "Tiles style by %{hotosm_link} hosted by %{osm_france_link}"
+      hotosm_name: Humanitarian OpenStreetMap Team
      site:
        edit_tooltip: Edit the map
        edit_disabled_tooltip: Zoom in to edit the map
      site:
        edit_tooltip: Edit the map
        edit_disabled_tooltip: Zoom in to edit the map
@@ -2711,6 +3103,7 @@ en:
        map_data_zoom_in_tooltip: Zoom in to see map data
        queryfeature_tooltip: Query features
        queryfeature_disabled_tooltip: Zoom in to query features
        map_data_zoom_in_tooltip: Zoom in to see map data
        queryfeature_tooltip: Query features
        queryfeature_disabled_tooltip: Zoom in to query features
+      embed_html_disabled: HTML embedding is not available for this map layer
      changesets:
        show:
          comment: "Comment"
      changesets:
        show:
          comment: "Comment"
@@ -2718,18 +3111,6 @@ en:
          unsubscribe: "Unsubscribe"
          hide_comment: "hide"
          unhide_comment: "unhide"
          unsubscribe: "Unsubscribe"
          hide_comment: "hide"
          unhide_comment: "unhide"
-    notes:
-      new:
-        intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem."
-        advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
-        add: Add Note
-      show:
-        anonymous_warning: This note includes comments from anonymous users which should be independently verified.
-        hide: Hide
-        resolve: Resolve
-        reactivate: Reactivate
-        comment_and_resolve: Comment & Resolve
-        comment: Comment
      edit_help: Move the map and zoom in on a location you want to edit, then click here.
      directions:
        ascend: "Ascend"
      edit_help: Move the map and zoom in on a location you want to edit, then click here.
      directions:
        ascend: "Ascend"
@@ -2740,9 +3121,14 @@ en:
          graphhopper_bicycle: "Bicycle (GraphHopper)"
          graphhopper_car: "Car (GraphHopper)"
          graphhopper_foot: "Foot (GraphHopper)"
          graphhopper_bicycle: "Bicycle (GraphHopper)"
          graphhopper_car: "Car (GraphHopper)"
          graphhopper_foot: "Foot (GraphHopper)"
+        fossgis_valhalla_bicycle: "Bicycle (Valhalla)"
+        fossgis_valhalla_car: "Car (Valhalla)"
+        fossgis_valhalla_foot: "Foot (Valhalla)"
        descend: "Descend"
        directions: "Directions"
        distance: "Distance"
        descend: "Descend"
        directions: "Directions"
        distance: "Distance"
+      distance_m: "%{distance}m"
+      distance_km: "%{distance}km"
        errors:
          no_route: "Couldn't find a route between those two places."
          no_place: "Sorry - couldn't locate '%{place}'."
        errors:
          no_route: "Couldn't find a route between those two places."
          no_place: "Sorry - couldn't locate '%{place}'."
@@ -2829,19 +3215,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"