Mark copyright example image as fluid

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

index 9535207d5de1feaf2d3d61fc84553c7ec9c08b69..77002268b0e6b3c2f04c9995d5c70b39af6ac75c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -5,6 +5,8 @@ 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
    helpers:
      file:
        prompt: Choose file
@@ -38,6 +40,13 @@ 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
+        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"
      # Translates all the model names, which is used in error handling on the website
      models:
        acl: "Access Control List"
@@ -154,51 +163,50 @@ en:
          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:
          reason: The reason why the user is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use layman's terms.
          needs_view: Does the user need to log in before this block will be cleared?
        user:
-        email_confirmation: 'Your address is not displayed publicly, see our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information.'
          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:
          other: "%{count} years ago"
    printable_name:
-    with_id: "%{id}"
-    with_version: "%{id}, v%{version}"
+    version: "v%{version}"
      with_name_html: "%{name} (%{id})"
      with_name_html: "%{name} (%{id})"
+    current_and_old_links_html: "%{current_link}, %{old_link}"
    editor:
      default: "Default (currently %{name})"
      id:
    editor:
      default: "Default (currently %{name})"
      id:
@@ -213,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:
@@ -229,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})"
@@ -254,6 +263,7 @@ en:
          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.
          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:
          confirm_delete: Are you sure?
          cancel: Cancel
    accounts:
@@ -298,51 +308,29 @@ en:
      destroy:
        success: "Account Deleted."
    browse:
      destroy:
        success: "Account Deleted."
    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}"
+    deleted_ago_by_html: "Deleted %{time_ago} by %{user}"
+    edited_ago_by_html: "Edited %{time_ago} by %{user}"
      version: "Version"
      version: "Version"
+    redacted_version: "Redacted Version"
      in_changeset: "Changeset"
      anonymous: "anonymous"
      no_comment: "(no comment)"
      part_of: "Part of"
      part_of_relations:
      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"
+    view_unredacted_history: "View Unredacted History"
      view_details: "View Details"
      view_details: "View Details"
+    view_redacted_data: "View Redacted Data"
+    view_redaction_message: "View Redaction Message"
      location: "Location:"
      common_details:
        coordinates_html: "%{latitude}, %{longitude}"
      location: "Location:"
      common_details:
        coordinates_html: "%{latitude}, %{longitude}"
-    changeset:
-      title: "Changeset: %{id}"
-      belongs_to: "Author"
-      node: "Nodes (%{count})"
-      node_paginated: "Nodes (%{x}-%{y} of %{count})"
-      way: "Ways (%{count})"
-      way_paginated: "Ways (%{x}-%{y} of %{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>"
-      changesetxml: "Changeset XML"
-      osmchangexml: "osmChange XML"
-      feed:
-        title: "Changeset %{id}"
-        title_comment: "Changeset %{id} - %{comment}"
-      join_discussion: "Log in to join the discussion"
-      discussion: Discussion
-      still_open: "Changeset still open - discussion will open once the changeset is closed."
      node:
        title_html: "Node: %{name}"
        history_title_html: "Node History: %{name}"
      node:
        title_html: "Node: %{name}"
        history_title_html: "Node History: %{name}"
@@ -351,6 +339,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}"
@@ -360,7 +349,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}"
@@ -417,6 +406,15 @@ en:
        introduction: "Click on the map to find nearby features."
        nearby: "Nearby features"
        enclosing: "Enclosing 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}"
@@ -445,6 +443,47 @@ en:
        no_more_area: "No more changesets in this area."
        no_more_user: "No more changesets by this user."
        load_more: "Load more"
        no_more_area: "No more changesets in this area."
        no_more_user: "No more changesets by this user."
        load_more: "Load more"
+      feed:
+        title: "Changeset %{id}"
+        title_comment: "Changeset %{id} - %{comment}"
+        created: "Created"
+        closed: "Closed"
+        belongs_to: "Author"
+    subscribe:
+      heading: Subscribe to the following changeset discussion?
+      button: Subscribe to discussion
+    unsubscribe:
+      heading: Unsubscribe from the following changeset discussion?
+      button: Unsubscribe from discussion
+    heading:
+      title: "Changeset %{id}"
+      created_by_html: "Created by %{link_user} on %{created}."
+    no_such_entry:
+      title: "No such changeset"
+      heading: "No entry with the id: %{id}"
+      body: "Sorry, there is no changeset with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong."
+    show:
+      title: "Changeset: %{id}"
+      created: "Created: %{when}"
+      closed: "Closed: %{when}"
+      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}"
+      discussion: Discussion
+      join_discussion: "Log in to join the discussion"
+      still_open: "Changeset still open - discussion will open once the changeset is closed."
+      comment_by_html: "Comment from %{user} %{time_ago}"
+      hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}"
+      changesetxml: "Changeset XML"
+      osmchangexml: "osmChange XML"
+    paging_nav:
+      nodes: "Nodes (%{count})"
+      nodes_paginated: "Nodes (%{x}-%{y} of %{count})"
+      ways: "Ways (%{count})"
+      ways_paginated: "Ways (%{x}-%{y} of %{count})"
+      relations: "Relations (%{count})"
+      relations_paginated: "Relations (%{x}-%{y} of %{count})"
      timeout:
        sorry: "Sorry, the list of changesets you requested took too long to retrieve."
    changeset_comments:
      timeout:
        sorry: "Sorry, the list of changesets you requested took too long to retrieve."
    changeset_comments:
@@ -462,6 +501,7 @@ en:
      contact:
        km away: "%{count}km away"
        m away: "%{count}m away"
      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"
      popup:
        your location: "Your location"
        nearby mapper: "Nearby mapper"
@@ -503,9 +543,10 @@ en:
      show:
        title: "%{user}'s Diary | %{title}"
        user_title: "%{user}'s Diary"
      show:
        title: "%{user}'s Diary | %{title}"
        user_title: "%{user}'s Diary"
+      discussion: "Discussion"
        leave_a_comment: "Leave a comment"
        login_to_leave_a_comment_html: "%{login_link} to leave a comment"
        leave_a_comment: "Leave a comment"
        login_to_leave_a_comment_html: "%{login_link} to leave a comment"
-      login: "Login"
+      login: "Log in"
      no_such_entry:
        title: "No such diary entry"
        heading: "No entry with the id: %{id}"
      no_such_entry:
        title: "No such diary entry"
        heading: "No entry with the id: %{id}"
@@ -516,9 +557,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
@@ -555,11 +596,38 @@ en:
        comment: Comment
        newer_comments: "Newer Comments"
        older_comments: "Older Comments"
        comment: Comment
        newer_comments: "Newer Comments"
        older_comments: "Older Comments"
+    subscribe:
+      heading: Subscribe to the following diary entry discussion?
+      button: Subscribe to discussion
+    unsubscribe:
+      heading: Unsubscribe from the following diary entry discussion?
+      button: Unsubscribe from discussion
    doorkeeper:
    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.
      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
    errors:
      contact:
        contact_url: https://wiki.openstreetmap.org/wiki/Contact
@@ -591,9 +659,13 @@ en:
    geocoder:
      search:
        title:
    geocoder:
      search:
        title:
-        latlon_html: 'Results from <a href="https://openstreetmap.org/">Internal</a>'
-        osm_nominatim_html: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
-        osm_nominatim_reverse_html: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</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:
@@ -1387,30 +1459,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
        reports_count:
        link_to_reports: View Reports
        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
@@ -1501,10 +1568,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}, %{fastly}, %{bytemark}, and other %{partners}."
-    partners_ucl: "UCL"
+    hosting_partners_2024_html: "Hosting is supported by %{fastly}, %{corpmembers}, and other %{partners}."
      partners_fastly: "Fastly"
      partners_fastly: "Fastly"
-    partners_bytemark: "Bytemark Hosting"
+    partners_corpmembers: "OSMF corporate members"
      partners_partners: "partners"
      tou: "Terms of Use"
      osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
      partners_partners: "partners"
      tou: "Terms of Use"
      osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
@@ -1524,12 +1590,15 @@ en:
      more: More
    user_mailer:
      diary_comment_notification:
      more: More
    user_mailer:
      diary_comment_notification:
+      description: "OpenStreetMap Diary Entry #%{id}"
        subject: "[OpenStreetMap] %{user} commented on a diary entry"
        hi: "Hi %{to_user},"
        header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
        header_html: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
        footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
        footer_html: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
        subject: "[OpenStreetMap] %{user} commented on a diary entry"
        hi: "Hi %{to_user},"
        header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
        header_html: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
        footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
        footer_html: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
+      footer_unsubscribe: "You can unsubscribe from the discussion at %{unsubscribeurl}"
+      footer_unsubscribe_html: "You can unsubscribe from the discussion at %{unsubscribeurl}"
      message_notification:
        subject: "[OpenStreetMap] %{message_title}"
        hi: "Hi %{to_user},"
      message_notification:
        subject: "[OpenStreetMap] %{message_title}"
        hi: "Hi %{to_user},"
@@ -1556,9 +1625,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"
@@ -1577,6 +1647,7 @@ en:
        hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
        click_the_link: "If this is you, please click the link below to reset your password."
      note_comment_notification:
        hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
        click_the_link: "If this is you, please click the link below to reset your password."
      note_comment_notification:
+      description: "OpenStreetMap Note #%{id}"
        anonymous: An anonymous user
        greeting: "Hi,"
        commented:
        anonymous: An anonymous user
        greeting: "Hi,"
        commented:
@@ -1603,6 +1674,7 @@ en:
        details: "More details about the note can be found at %{url}."
        details_html: "More details about the note can be found at %{url}."
      changeset_comment_notification:
        details: "More details about the note can be found at %{url}."
        details_html: "More details about the note can be found at %{url}."
      changeset_comment_notification:
+      description: "OpenStreetMap Changeset #%{id}"
        hi: "Hi %{to_user},"
        greeting: "Hi,"
        commented:
        hi: "Hi %{to_user},"
        greeting: "Hi,"
        commented:
@@ -1617,8 +1689,8 @@ en:
          partial_changeset_without_comment: "without comment"
        details: "More details about the changeset can be found at %{url}."
        details_html: "More details about the changeset can be found at %{url}."
          partial_changeset_without_comment: "without comment"
        details: "More details about the changeset can be found at %{url}."
        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".'
+      unsubscribe: "You can unsubscribe from updates to this changeset at %{url}."
+      unsubscribe_html: "You can unsubscribe from updates to this changeset at %{url}."
    confirmations:
      confirm:
        heading: Check your email!
    confirmations:
      confirm:
        heading: Check your email!
@@ -1631,7 +1703,8 @@ en:
        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."
        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>."
+      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:
      confirm_resend:
        failure: "User %{name} not found."
      confirm_email:
@@ -1647,8 +1720,6 @@ en:
    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"
@@ -1656,16 +1727,20 @@ 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}"
@@ -1679,45 +1754,55 @@ 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:
      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."
+      wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply."
      show:
        title: "Read message"
        reply_button: "Reply"
        unread_button: "Mark as unread"
        destroy_button: "Delete"
        back: "Back"
      show:
        title: "Read message"
        reply_button: "Reply"
        unread_button: "Mark as unread"
        destroy_button: "Delete"
        back: "Back"
-      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."
+      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 log in as the correct user in order to read it."
      sent_message_summary:
        destroy_button: "Delete"
      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"
    passwords:
      destroy:
        destroyed: "Message deleted"
    passwords:
-    lost_password:
+    new:
        title: "Lost password"
        heading: "Forgotten Password?"
        title: "Lost password"
        heading: "Forgotten Password?"
-      email address: "Email Address:"
+      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."
        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:
+    create:
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+    edit:
        title: "Reset password"
        heading: "Reset Password for %{user}"
        reset: "Reset Password"
        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:
        flash changed: "Your password has been changed."
        flash token bad: "Did not find that token, check the URL maybe?"
    preferences:
@@ -1754,49 +1839,52 @@ en:
        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?"
        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:
      update:
        success: Profile updated.
        failure: Couldn't update profile.
    sessions:
      new:
-      title: "Login"
-      heading: "Login"
-      email or username: "Email Address or Username:"
-      password: "Password:"
-      openid_html: "%{logo} OpenID:"
+      title: "Log in"
+      heading: "Log in"
+      email or username: "Email Address or Username"
+      password: "Password"
+      openid_html: "%{logo} OpenID"
        remember: "Remember me"
        lost password link: "Lost your password?"
        remember: "Remember me"
        lost password link: "Lost your password?"
-      login_button: "Login"
+      login_button: "Log in"
        register now: Register now
        register now: Register now
-      with external: "Alternatively, use a third party to login:"
+      with external: "Alternatively, use a third party to log in:"
        no account: Don't have an account?
        auth failure: "Sorry, could not log in with those details."
        openid_logo_alt: "Log in with an OpenID"
        auth_providers:
          openid:
        no account: Don't have an account?
        auth failure: "Sorry, could not log in with those details."
        openid_logo_alt: "Log in with an OpenID"
        auth_providers:
          openid:
-          title: Login with OpenID
-          alt: Login with an OpenID URL
+          title: Log in with OpenID
+          alt: Log in with an OpenID URL
          google:
          google:
-          title: Login with Google
-          alt: Login with a Google OpenID
+          title: Log in with Google
+          alt: Log in with a Google OpenID
          facebook:
          facebook:
-          title: Login with Facebook
-          alt: Login with a Facebook Account
-        windowslive:
-          title: Login with Windows Live
-          alt: Login with a Windows Live Account
+          title: Log in with Facebook
+          alt: Log in with a Facebook Account
+        microsoft:
+          title: Log in with Microsoft
+          alt: Log in with a Microsoft Account
          github:
          github:
-          title: Login with GitHub
-          alt: Login with a GitHub Account
+          title: Log in with GitHub
+          alt: Log in with a GitHub Account
          wikipedia:
          wikipedia:
-          title: Login with Wikipedia
-          alt: Login with a Wikipedia Account
+          title: Log in with Wikipedia
+          alt: Log in with a Wikipedia Account
          wordpress:
          wordpress:
-          title: Login with Wordpress
-          alt: Login with a Wordpress OpenID
+          title: Log in with Wordpress
+          alt: Log in with a Wordpress OpenID
          aol:
          aol:
-          title: Login with AOL
-          alt: Login with an AOL OpenID
+          title: Log in with AOL
+          alt: Log in with an AOL OpenID
      destroy:
        title: "Logout"
        heading: "Logout from OpenStreetMap"
      destroy:
        title: "Logout"
        heading: "Logout from OpenStreetMap"
@@ -1807,7 +1895,9 @@ en:
        support: support
    shared:
      markdown_help:
        support: support
    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
@@ -1820,13 +1910,15 @@ 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
+      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
        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
@@ -1837,35 +1929,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:
@@ -1879,122 +1988,180 @@ 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: |
            Where you use OpenStreetMap data, you are required to do the following two things:
          credit_title_html: How to credit OpenStreetMap
          credit_1_html: |
            Where you use OpenStreetMap data, you are required to do the following two things:
-        credit_2_1_html: |
-          <ul>
-            <li>Provide credit to OpenStreetMap by displaying our copyright notice.</li>
-            <li>Make clear that the data is available under the Open Database License.</li>
-          </ul>
-        credit_3_1_html: |
+        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
           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
-         <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Attribution
-         Guidelines</a>.
-        credit_4_html: |
+         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
            To make clear that the data is available under the Open
-          Database License, you may link to
-          <a href="https://www.openstreetmap.org/copyright">this copyright page</a>.
+          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.
            In this example, the credit appears in the corner of the map.
            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.
            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>: Incorporates or developed using Administrative Boundaries &copy;
-          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australia</a>
-          licensed by the Commonwealth of Australia under
-          <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International licence (CC BY 4.0)</a>.
-        contributors_ca_html: |
-          <strong>Canada</strong>: Contains data from
+        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_hr_credit_html: |
+          %{croatia}: Contains data from the %{dgu_link} and %{open_data_portal}
+          (public information of Croatia).
+        contributors_hr_croatia: Croatia
+        contributors_hr_dgu: State Geodetic Administration of Croatia
+        contributors_hr_dgu_url: https://dgu.gov.hr/
+        contributors_hr_open_data_portal: National Open Data Portal
+        contributors_hr_open_data_portal_url: https://data.gov.hr/
+        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
@@ -2004,15 +2171,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://wiki.osmfoundation.org/wiki/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."
@@ -2035,12 +2209,7 @@ 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_details_html: OpenStreetMap data is licensed under the %{odbl_link} (ODbL).
        odbl: Open Data Commons Open Database License
        licence: "Licence"
        licence_details_html: OpenStreetMap data is licensed under the %{odbl_link} (ODbL).
        odbl: Open Data Commons Open Database License
@@ -2060,17 +2229,6 @@ en:
          other:
            title: "Other Sources"
            description: "Additional sources listed on the OpenStreetMap Wiki"
          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"
        export_button: "Export"
      fixthemap:
        title: Report a problem / Fix the map
        export_button: "Export"
      fixthemap:
        title: Report a problem / Fix the map
@@ -2082,16 +2240,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: |
@@ -2105,22 +2265,14 @@ en:
          url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
          title: Beginners' Guide
          description: Community maintained guide for beginners.
          url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
          title: Beginners' Guide
          description: Community maintained guide for beginners.
-      help:
-        url: https://help.openstreetmap.org/
-        title: Help Forum
-        description: Ask a question or look up answers on OpenStreetMap's question-and-answer site.
+      community:
+        url: https://community.openstreetmap.org/
+        title: Help & Community Forum
+        description: A shared place for to seek help and have conversations about OpenStreetMap.
        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.
        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 (Legacy)
-        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
@@ -2139,8 +2291,11 @@ 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 preferences 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: |
      any_questions:
        title: Any questions?
        paragraph_1_html: |
@@ -2172,67 +2327,83 @@ 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
-            - garden
            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!
@@ -2276,6 +2447,7 @@ en:
          automated_edits: Automated Edits
          automated_edits_url: https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct
        start_mapping: Start Mapping
          automated_edits: Automated Edits
          automated_edits_url: https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct
        start_mapping: Start Mapping
+      continue_authorization: Continue Authorization
        add_a_note:
          title: No Time To Edit? Add a Note!
          para_1: |
        add_a_note:
          title: No Time To Edit? Add a Note!
          para_1: |
@@ -2305,11 +2477,12 @@ en:
            The following communities are formally established as Local Chapters:
        other_groups:
          title: Other Groups
            The following communities are formally established as Local Chapters:
        other_groups:
          title: Other Groups
-        about_html: |
+        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
            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
-          <a href="https://wiki.openstreetmap.org/wiki/User_group">Communities wiki page</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)"
@@ -2361,13 +2534,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"
@@ -2377,8 +2549,8 @@ en:
        identifiable: "IDENTIFIABLE"
        private: "PRIVATE"
        trackable: "TRACKABLE"
        identifiable: "IDENTIFIABLE"
        private: "PRIVATE"
        trackable: "TRACKABLE"
-      by: "by"
-      in: "in"
+      details_with_tags_html: "%{time_ago} by %{user} in %{tags}"
+      details_without_tags_html: "%{time_ago} by %{user}"
      index:
        public_traces: "Public GPS Traces"
        my_gps_traces: "My GPS Traces"
      index:
        public_traces: "Public GPS Traces"
        my_gps_traces: "My GPS Traces"
@@ -2426,6 +2598,7 @@ en:
        oauth1_settings: OAuth 1 settings
        oauth2_applications: OAuth 2 applications
        oauth2_authorizations: OAuth 2 authorizations
        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"
@@ -2452,6 +2625,7 @@ en:
      permissions:
        missing: "You have not permitted the application access to this facility"
      scopes:
      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
        read_prefs: Read user preferences
        write_prefs: Modify user preferences
        write_diary: Create diary entries, comments and make friends
@@ -2459,11 +2633,13 @@ en:
        read_gpx: Read private GPS traces
        write_gpx: Upload GPS traces
        write_notes: Modify notes
        read_gpx: Read private GPS traces
        write_gpx: Upload GPS traces
        write_notes: Modify notes
+      write_redactions: Redact map data
        read_email: Read user email address
        skip_authorization: Auto approve application
    oauth_clients:
      new:
        title: "Register a new application"
        read_email: Read user email address
        skip_authorization: Auto approve application
    oauth_clients:
      new:
        title: "Register a new application"
+      disabled: "Registration of OAuth 1 applications has been disabled"
      edit:
        title: "Edit your application"
      show:
      edit:
        title: "Edit your application"
      show:
@@ -2542,7 +2718,9 @@ en:
        title: "My Authorized Applications"
        application: "Application"
        permissions: "Permissions"
        title: "My Authorized Applications"
        application: "Application"
        permissions: "Permissions"
+      last_authorized: "Last Authorized"
        no_applications_html: "You have not yet authorized any %{oauth2} applications."
        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?"
      application:
        revoke: "Revoke Access"
        confirm_revoke: "Revoke access for this application?"
@@ -2556,15 +2734,16 @@ en:
          header: Free and editable
          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.
          header: Free and editable
          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.
-      email address: "Email Address:"
-      confirm email address: "Confirm Email Address:"
-      display name: "Display Name:"
        display name description: "Your publicly displayed username. You can change this later in the preferences."
        external auth: "Third Party Authentication:"
        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"
+      use external auth: "Alternatively, use a third party to log in"
        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!"
        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!"
+      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"
@@ -2577,7 +2756,9 @@ en:
        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://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
        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://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/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>'
+      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"
@@ -2598,7 +2779,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
@@ -2610,6 +2790,8 @@ en:
        my_dashboard: My Dashboard
        blocks on me: Blocks on Me
        blocks by me: Blocks by Me
        my_dashboard: My Dashboard
        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
        edit_profile: Edit Profile
        send message: Send Message
        diary: Diary
@@ -2619,31 +2801,32 @@ 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
        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"
        unconfirm_user: "Unconfirm this User"
        unsuspend_user: "Unsuspend this User"
        confirm_user: "Confirm this User"
        unconfirm_user: "Unconfirm this User"
        unsuspend_user: "Unsuspend this User"
@@ -2652,16 +2835,16 @@ en:
        delete_user: "Delete this User"
        confirm: "Confirm"
        report: Report this User
        delete_user: "Delete this User"
        confirm: "Confirm"
        report: Report this User
-    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:
        title: Users
        heading: Users
      go_public:
        flash success: "All your edits are now public, and you are now allowed to edit."
      index:
        title: Users
        heading: Users
-      showing:
-        one: Page %{page} (%{first_item} of %{items})
-        other: Page %{page} (%{first_item}-%{last_item} of %{items})
+      older: "Older Users"
+      newer: "Newer Users"
+      found_users:
+        one: "%{count} user found"
+        other: "%{count} users found"
        summary_html: "%{name} created from %{ip_address} on %{date}"
        summary_no_ip_html: "%{name} created on %{date}"
        confirm: Confirm Selected Users
        summary_html: "%{name} created from %{ip_address} on %{date}"
        summary_no_ip_html: "%{name} created on %{date}"
        confirm: Confirm Selected Users
@@ -2686,7 +2869,7 @@ en:
          If you are new to OpenStreetMap, please create a new account
          using the form below.
        option_2: |
          If you are new to OpenStreetMap, please create a new account
          using the form below.
        option_2: |
-        If you already have an account, you can login to your account
+        If you already have an account, you can log in to your account
          using your username and password and then associate the account
          with your ID in your user settings.
    user_role:
          using your username and password and then associate the account
          with your ID in your user settings.
    user_role:
@@ -2718,8 +2901,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}"
@@ -2731,8 +2912,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."
@@ -2744,11 +2923,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."
@@ -2756,19 +2945,19 @@ 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}"
@@ -2789,7 +2978,6 @@ en:
        revoke: "Revoke!"
        confirm: "Are you sure?"
        reason: "Reason for block:"
        revoke: "Revoke!"
        confirm: "Are you sure?"
        reason: "Reason for block:"
-      back: "View all blocks"
        revoker: "Revoker:"
        needs_view: "The user needs to log in before this block will be cleared."
      block:
        revoker: "Revoker:"
        needs_view: "The user needs to log in before this block will be cleared."
      block:
@@ -2803,14 +2991,45 @@ en:
        reason: "Reason for block"
        status: "Status"
        revoker_name: "Revoked by"
        reason: "Reason for block"
        status: "Status"
        revoker_name: "Revoked by"
-      showing_page: "Page %{page}"
-      next: "Next »"
-      previous: "« Previous"
+      older: "Older Blocks"
+      newer: "Newer Blocks"
+    navigation:
+      all_blocks: "All Blocks"
+      blocks_on_me: "Blocks on Me"
+      blocks_on_user: "Blocks on %{user}"
+      blocks_by_me: "Blocks by Me"
+      blocks_by_user: "Blocks by %{user}"
+      block: "Block #%{id}"
+  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}"
        heading: "%{user}'s Notes"
    notes:
      index:
        title: "Notes submitted or commented on by %{user}"
        heading: "%{user}'s Notes"
-      subheading_html: "Notes submitted or commented on by %{user}"
+      subheading_html: "Notes %{submitted} or %{commented} by %{user}"
+      subheading_submitted: "submitted"
+      subheading_commented: "commented on"
        no_notes: No notes
        id: "Id"
        creator: "Creator"
        no_notes: No notes
        id: "Id"
        creator: "Creator"
@@ -2823,15 +3042,15 @@ en:
        open_title: "Unresolved note #%{note_name}"
        closed_title: "Resolved note #%{note_name}"
        hidden_title: "Hidden note #%{note_name}"
        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>"
+      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.
        report: report this note
        coordinates_html: "%{latitude}, %{longitude}"
        anonymous_warning: This note includes comments from anonymous users which should be independently verified.
@@ -2840,6 +3059,7 @@ en:
        reactivate: Reactivate
        comment_and_resolve: Comment & Resolve
        comment: Comment
        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."
        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."
@@ -2884,18 +3104,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
@@ -2903,13 +3123,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
@@ -2919,6 +3145,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"