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

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

index 324a806da1090c22f3e60f3bb6825e28385fd825..986a30db9464c8ec0f88d73538f0460dbd73e79d 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -38,8 +38,6 @@ en:
    activerecord:
      errors:
        messages:
    activerecord:
      errors:
        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:
          display_name_is_user_n: can't be user_n unless n is your user id
        models:
          user_mute:
@@ -124,7 +122,7 @@ en:
          longitude: "Longitude"
          public: "Public"
          description: "Description"
          longitude: "Longitude"
          public: "Public"
          description: "Description"
-        gpx_file: Upload GPX File
+        gpx_file: Choose GPS Trace File
          visibility: Visibility
          tagstring: Tags
        message:
          visibility: Visibility
          tagstring: Tags
        message:
@@ -287,7 +285,7 @@ en:
          not yet agreed: "You have not yet agreed to the new Contributor Terms."
          review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms."
          agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
          not yet agreed: "You have not yet agreed to the new Contributor Terms."
          review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms."
          agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
-        link: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
+        link: "https://osmfoundation.org/wiki/Licence/Contributor_Terms"
          link text: "what is this?"
        save changes button: Save Changes
        delete_account: Delete Account...
          link text: "what is this?"
        save changes button: Save Changes
        delete_account: Delete Account...
@@ -371,7 +369,7 @@ en:
          note: note
      timeout:
        title: Timeout Error
          note: note
      timeout:
        title: Timeout Error
-      sorry: "Sorry, the data for the %{type} with the id %{id}, took too long to retrieve."
+      sorry: "Sorry, the data for the %{type} with the id %{id} took too long to retrieve."
        type:
          node: node
          way: way
        type:
          node: node
          way: way
@@ -405,42 +403,44 @@ 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"
+  nodes:
+    timeout:
+      sorry: "Sorry, the data for the node with the id %{id} took too long to retrieve."
    old_nodes:
      not_found:
        sorry: "Sorry, node #%{id} version %{version} could not be found."
    old_nodes:
      not_found:
        sorry: "Sorry, node #%{id} version %{version} could not be found."
+    timeout:
+      sorry: "Sorry, the history of the node with the id %{id} took too long to retrieve."
+  ways:
+    timeout:
+      sorry: "Sorry, the data for the way with the id %{id} took too long to retrieve."
    old_ways:
      not_found:
        sorry: "Sorry, way #%{id} version %{version} could not be found."
    old_ways:
      not_found:
        sorry: "Sorry, way #%{id} version %{version} could not be found."
+    timeout:
+      sorry: "Sorry, the history of the way with the id %{id} took too long to retrieve."
+  relations:
+    timeout:
+      sorry: "Sorry, the data for the relation with the id %{id} took too long to retrieve."
    old_relations:
      not_found:
        sorry: "Sorry, relation #%{id} version %{version} could not be found."
    old_relations:
      not_found:
        sorry: "Sorry, relation #%{id} version %{version} could not be found."
+    timeout:
+      sorry: "Sorry, the history of the relation with the id %{id} took too long to retrieve."
    changeset_comments:
      feeds:
        comment:
          comment: "New comment on changeset #%{changeset_id} by %{author}"
          commented_at_by_html: "Updated %{when} by %{user}"
    changeset_comments:
      feeds:
        comment:
          comment: "New comment on changeset #%{changeset_id} by %{author}"
          commented_at_by_html: "Updated %{when} by %{user}"
-      comments:
-        comment: "New comment on changeset #%{changeset_id} by %{author}"
        show:
          title_all: OpenStreetMap changeset discussion
          title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
        timeout:
          sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
    changesets:
        show:
          title_all: OpenStreetMap changeset discussion
          title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
        timeout:
          sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
    changesets:
-    changeset_paging_nav:
-      showing_page: "Page %{page}"
-      next: "Next »"
-      previous: "« Previous"
      changeset:
      changeset:
-      anonymous: "Anonymous"
        no_edits: "(no edits)"
        view_changeset_details: "View changeset details"
        no_edits: "(no edits)"
        view_changeset_details: "View changeset details"
-    changesets:
-      id: "ID"
-      saved_at: "Saved at"
-      user: "User"
-      comment: "Comment"
-      area: "Area"
      index:
        title: "Changesets"
        title_user: "Changesets by %{user}"
      index:
        title: "Changesets"
        title_user: "Changesets by %{user}"
@@ -470,7 +470,6 @@ en:
        title: "Changeset %{id}"
        created_by_html: "Created by %{link_user} on %{created}."
      no_such_entry:
        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:
        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:
@@ -541,8 +540,6 @@ en:
        no_entries: No diary entries
      page:
        recent_entries: "Recent diary entries"
        no_entries: No diary entries
      page:
        recent_entries: "Recent diary entries"
-      older_entries: Older Entries
-      newer_entries: Newer Entries
      edit:
        title: Edit Diary Entry
        marker_text: Diary entry location
      edit:
        title: Edit Diary Entry
        marker_text: Diary entry location
@@ -581,8 +578,6 @@ en:
        report: Report this comment
      location:
        location: "Location:"
        report: Report this comment
      location:
        location: "Location:"
-      view: "View"
-      edit: "Edit"
        coordinates: "%{latitude}; %{longitude}"
      feed:
        user:
        coordinates: "%{latitude}; %{longitude}"
      feed:
        user:
@@ -610,8 +605,6 @@ en:
        post: Post
        when: When
        comment: Comment
        post: Post
        when: When
        comment: Comment
-      newer_comments: "Newer Comments"
-      older_comments: "Older Comments"
      new:
        heading: Add a comment to the following diary entry discussion?
    doorkeeper:
      new:
        heading: Add a comment to the following diary entry discussion?
    doorkeeper:
@@ -674,7 +667,6 @@ en:
    geocoder:
      search:
        title:
    geocoder:
      search:
        title:
-        results_from_html: 'Results from %{results_link}'
          latlon: Internal
          osm_nominatim: OpenStreetMap Nominatim
          osm_nominatim_reverse: OpenStreetMap Nominatim
          latlon: Internal
          osm_nominatim: OpenStreetMap Nominatim
          osm_nominatim_reverse: OpenStreetMap Nominatim
@@ -1084,7 +1076,7 @@ en:
          man_made:
            adit: "Adit"
            advertising: "Advertising"
          man_made:
            adit: "Adit"
            advertising: "Advertising"
-          antenna:  "Antenna"
+          antenna: "Antenna"
            avalanche_protection: "Avalanche Protection"
            beacon: "Beacon"
            beam: "Beam"
            avalanche_protection: "Avalanche Protection"
            beacon: "Beacon"
            beam: "Beam"
@@ -1451,10 +1443,6 @@ en:
          level9: "Village Boundary"
          level10: "Suburb Boundary"
          level11: "Neighbourhood Boundary"
          level9: "Village Boundary"
          level10: "Suburb Boundary"
          level11: "Neighbourhood Boundary"
-      types:
-        cities: Cities
-        towns: Towns
-        places: Places
      results:
        no_results: "No results found"
        more_results: "More results"
      results:
        no_results: "No results found"
        more_results: "More results"
@@ -1468,7 +1456,6 @@ en:
        not_updated: Not Updated
        search: Search
        search_guidance: "Search Issues:"
        not_updated: Not Updated
        search: Search
        search_guidance: "Search Issues:"
-      link_to_reports: View Reports
        states:
          ignored: Ignored
          open: Open
        states:
          ignored: Ignored
          open: Open
@@ -1489,8 +1476,6 @@ en:
          ignored: Ignored
          open: Open
          resolved: Resolved
          ignored: Ignored
          open: Open
          resolved: Resolved
-      older_issues: Older Issues
-      newer_issues: Newer Issues
      show:
        title: "%{status} Issue #%{issue_id}"
        reports:
      show:
        title: "%{status} Issue #%{issue_id}"
        reports:
@@ -1579,17 +1564,11 @@ en:
      history: History
      export: Export
      issues: Issues
      history: History
      export: Export
      issues: Issues
-    data: Data
-    export_data: Export Data
      gps_traces: GPS Traces
      gps_traces: GPS Traces
-    gps_traces_tooltip: Manage GPS traces
      user_diaries: User Diaries
      user_diaries: User Diaries
-    user_diaries_tooltip: View user diaries
      edit_with: Edit with %{editor}
      edit_with: Edit with %{editor}
-    tag_line: The Free Wiki World Map
      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_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_2024_html: "Hosting is supported by %{fastly}, %{corpmembers}, and other %{partners}."
      partners_fastly: "Fastly"
      partners_corpmembers: "OSMF corporate members"
      hosting_partners_2024_html: "Hosting is supported by %{fastly}, %{corpmembers}, and other %{partners}."
      partners_fastly: "Fastly"
      partners_corpmembers: "OSMF corporate members"
@@ -1598,17 +1577,10 @@ en:
      osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
      osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
      nothing_to_preview: "Nothing to preview."
      osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
      osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
      nothing_to_preview: "Nothing to preview."
-    donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
      help: Help
      about: About
      copyright: Copyright
      communities: Communities
      help: Help
      about: About
      copyright: Copyright
      communities: Communities
-    community: Community
-    community_blogs: "Community Blogs"
-    community_blogs_title: "Blogs from members of the OpenStreetMap community"
-    make_a_donation:
-      title: Support OpenStreetMap with a monetary donation
-      text: Make a Donation
      learn_more: "Learn More"
      more: More
    user_mailer:
      learn_more: "Learn More"
      more: More
    user_mailer:
@@ -1638,13 +1610,13 @@ en:
        befriend_them: "You can also add them as a friend at %{befriendurl}."
        befriend_them_html: "You can also add them as a friend at %{befriendurl}."
      gpx_description:
        befriend_them: "You can also add them as a friend at %{befriendurl}."
        befriend_them_html: "You can also add them as a friend at %{befriendurl}."
      gpx_description:
-      description_with_tags: "It looks like your GPX file %{trace_name} with the description %{trace_description} and the following tags: %{tags}"
-      description_with_tags_html: "It looks like your GPX file %{trace_name} with the description %{trace_description} and the following tags: %{tags}"
-      description_with_no_tags: "It looks like your GPX file %{trace_name} with the description %{trace_description} and no tags"
-      description_with_no_tags_html: "It looks like your GPX file %{trace_name} with the description %{trace_description} and no tags"
+      description_with_tags: "It looks like your file %{trace_name} with the description %{trace_description} and the following tags: %{tags}"
+      description_with_tags_html: "It looks like your file %{trace_name} with the description %{trace_description} and the following tags: %{tags}"
+      description_with_no_tags: "It looks like your file %{trace_name} with the description %{trace_description} and no tags"
+      description_with_no_tags_html: "It looks like your file %{trace_name} with the description %{trace_description} and no tags"
      gpx_failure:
        hi: "Hi %{to_user},"
      gpx_failure:
        hi: "Hi %{to_user},"
-      failed_to_import: "failed to import. Here is the error:"
+      failed_to_import: "failed to be imported as a GPS trace file. Please verify that your file is a valid GPX file or an archive containing GPX file(s) in the supported format (.tar.gz, .tar.bz2, .tar, .zip, .gpx.gz, .gpx.bz2). Could there be a format or syntax issue with your file? Here is the importing error:"
        more_info: "More information about GPX import failures and how to avoid them can be found at %{url}."
        more_info_html: "More information about GPX import failures and how to avoid them can be found at %{url}."
        import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
        more_info: "More information about GPX import failures and how to avoid them can be found at %{url}."
        more_info_html: "More information about GPX import failures and how to avoid them can be found at %{url}."
        import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
@@ -1704,7 +1676,6 @@ en:
      changeset_comment_notification:
        description: "OpenStreetMap Changeset #%{id}"
        hi: "Hi %{to_user},"
      changeset_comment_notification:
        description: "OpenStreetMap Changeset #%{id}"
        hi: "Hi %{to_user},"
-      greeting: "Hi,"
        commented:
          subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"
          subject_other: "[OpenStreetMap] %{commenter} has commented on a changeset you are interested in"
        commented:
          subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"
          subject_other: "[OpenStreetMap] %{commenter} has commented on a changeset you are interested in"
@@ -1766,7 +1737,6 @@ en:
      message_summary:
        unread_button: "Mark as unread"
        read_button: "Mark as read"
      message_summary:
        unread_button: "Mark as unread"
        read_button: "Mark as read"
-      reply_button: "Reply"
        destroy_button: "Delete"
        unmute_button: "Move to Inbox"
      new:
        destroy_button: "Delete"
        unmute_button: "Move to Inbox"
      new:
@@ -1782,7 +1752,6 @@ 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"
-      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"
@@ -1794,14 +1763,14 @@ en:
          one: "%{count} muted message"
          other: "You have %{count} muted messages"
      reply:
          one: "%{count} muted message"
          other: "You have %{count} muted messages"
      reply:
-      wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please log in 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 log in 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"
      heading:
      sent_message_summary:
        destroy_button: "Delete"
      heading:
@@ -1875,7 +1844,6 @@ en:
        failure: Couldn't update profile.
    sessions:
      new:
        failure: Couldn't update profile.
    sessions:
      new:
-      title: "Log in"
        tab_title: "Log in"
        login_to_authorize_html: "Log in to OpenStreetMap to access %{client_app_name}."
        email or username: "Email Address or Username"
        tab_title: "Log in"
        login_to_authorize_html: "Log in to OpenStreetMap to access %{client_app_name}."
        email or username: "Email Address or Username"
@@ -1883,7 +1851,6 @@ en:
        remember: "Remember me"
        lost password link: "Lost your password?"
        login_button: "Log in"
        remember: "Remember me"
        lost password link: "Lost your password?"
        login_button: "Log in"
-      register now: Register now
        with external: "or log in with a third party"
        or: "or"
        auth failure: "Sorry, could not log in with those details."
        with external: "or log in with a third party"
        or: "or"
        auth failure: "Sorry, could not log in with those details."
@@ -1917,9 +1884,27 @@ en:
        edit: Edit
        preview: Preview
        help: Help
        edit: Edit
        preview: Preview
        help: Help
+    pagination:
+      diary_comments:
+        older: Older Comments
+        newer: Newer Comments
+      diary_entries:
+        older: Older Entries
+        newer: Newer Entries
+      issues:
+        older: Older Issues
+        newer: Newer Issues
+      traces:
+        older: Older Traces
+        newer: Newer Traces
+      user_blocks:
+        older: Older Blocks
+        newer: Newer Blocks
+      users:
+        older: Older Users
+        newer: Newer Users
    site:
      about:
    site:
      about:
-      next: Next
        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"
        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"
@@ -1964,11 +1949,11 @@ en:
        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_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_terms_of_use_url: https://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_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_1_1_privacy_policy_url: https://osmfoundation.org/wiki/Privacy_Policy
        legal_2_1_html: |
          Please %{contact_the_osmf_link}
          if you have licensing, copyright or other legal questions.
        legal_2_1_html: |
          Please %{contact_the_osmf_link}
          if you have licensing, copyright or other legal questions.
@@ -1977,7 +1962,7 @@ en:
        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_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
+      legal_2_2_registered_trademarks_url: https://osmfoundation.org/wiki/Trademark_Policy
        partners_title: Partners
      copyright:
        title: Copyright and License
        partners_title: Partners
      copyright:
        title: Copyright and License
@@ -2024,7 +2009,7 @@ en:
           created a browsable map, a printed map or a static image. Full details on the
           requirements can be found in the %{attribution_guidelines_link}.
          credit_3_attribution_guidelines: Attribution Guidelines
           created a browsable map, a printed map or a static image. Full details on the
           requirements can be found in the %{attribution_guidelines_link}.
          credit_3_attribution_guidelines: Attribution Guidelines
-        credit_3_attribution_guidelines_url: https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines
+        credit_3_attribution_guidelines_url: https://osmfoundation.org/wiki/Licence/Attribution_Guidelines
          credit_4_1_html: |
            To make clear that the data is available under the Open
            Database License, you may link to %{this_copyright_page_link}.
          credit_4_1_html: |
            To make clear that the data is available under the Open
            Database License, you may link to %{this_copyright_page_link}.
@@ -2068,7 +2053,7 @@ en:
          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_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_at_cc_by_at_with_amendments_url: https://www.tirol.gv.at/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_credit_html: |
            %{australia}: Incorporates or developed using Administrative Boundaries &copy; %{geoscape_australia_link}
            licensed by the Commonwealth of Australia under %{cc_licence_link}.
@@ -2180,7 +2165,7 @@ en:
            to our %{takedown_procedure_link} or file directly at our
            %{online_filing_page_link}.
          infringement_2_1_takedown_procedure: takedown procedure
            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_takedown_procedure_url: https://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
          infringement_2_1_online_filing_page: on-line filing page
          infringement_2_1_online_filing_page_url: https://dmca.openstreetmap.org/
          trademarks_title: Trademarks
@@ -2189,7 +2174,7 @@ en:
            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
            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
+        trademarks_1_1_trademark_policy_url: https://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."
@@ -2206,7 +2191,6 @@ en:
        anon_edits_link: "https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
        anon_edits_link_text: "Find out why this is the case."
        id_not_configured: "iD has not been configured"
        anon_edits_link: "https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
        anon_edits_link_text: "Find out why this is the case."
        id_not_configured: "iD has not been configured"
-      no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
      export:
        title: "Export"
        manually_select: "Manually select a different area"
      export:
        title: "Export"
        manually_select: "Manually select a different area"
@@ -2251,7 +2235,7 @@ en:
            %{copyright_link} for more legal information, or contact the appropriate %{working_group_link}.
          copyright: copyright page
          working_group: OSMF working group
            %{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
+        working_group_url: https://osmfoundation.org/wiki/Working_Groups
      help:
        title: Getting Help
        introduction: |
      help:
        title: Getting Help
        introduction: |
@@ -2307,10 +2291,8 @@ en:
        welcome_mat_url: https://welcome.openstreetmap.org/
      sidebar:
        search_results: Search Results
        welcome_mat_url: https://welcome.openstreetmap.org/
      sidebar:
        search_results: Search Results
-      close: Close
      search:
        search: Search
      search:
        search: Search
-      get_directions: "Get directions"
        get_directions_title: "Find directions between two points"
        from: "From"
        to: "To"
        get_directions_title: "Find directions between two points"
        from: "From"
        to: "To"
@@ -2391,6 +2373,9 @@ en:
            hospital: "Hospital"
            building: "Significant building"
            station: "Railway station"
            hospital: "Hospital"
            building: "Significant building"
            station: "Railway station"
+          railway_halt: "Railway halt"
+          subway_station: "Subway station"
+          tram_stop: "Tram stop"
            summit: "Summit"
            peak: "Peak"
            tunnel: "Dashed casing = tunnel"
            summit: "Summit"
            peak: "Peak"
            tunnel: "Dashed casing = tunnel"
@@ -2399,7 +2384,6 @@ en:
            destination: "Destination access"
            construction: "Roads under construction"
            bus_stop: "Bus stop"
            destination: "Destination access"
            construction: "Roads under construction"
            bus_stop: "Bus stop"
-          stop: "Stop"
            bicycle_shop: "Bicycle shop"
            bicycle_rental: "Bicycle rental"
            bicycle_parking: "Bicycle parking"
            bicycle_shop: "Bicycle shop"
            bicycle_rental: "Bicycle rental"
            bicycle_parking: "Bicycle parking"
@@ -2510,8 +2494,6 @@ en:
        visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
      update:
        updated: Trace updated
        visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
      update:
        updated: Trace updated
-    trace_optionals:
-      tags: "Tags"
      show:
        title: "Viewing Trace %{name}"
        heading: "Viewing Trace %{name}"
      show:
        title: "Viewing Trace %{name}"
        heading: "Viewing Trace %{name}"
@@ -2562,15 +2544,10 @@ en:
        upload_trace: "Upload a trace"
        all_traces: "All Traces"
        my_traces: "My Traces"
        upload_trace: "Upload a trace"
        all_traces: "All Traces"
        my_traces: "My Traces"
-      traces_from: "Public Traces from %{user}"
+      traces_from_html: "Public Traces from %{user}"
        remove_tag_filter: "Remove Tag Filter"
        remove_tag_filter: "Remove Tag Filter"
-    page:
-      older: "Older Traces"
-      newer: "Newer Traces"
      destroy:
        scheduled_for_deletion: "Trace scheduled for deletion"
      destroy:
        scheduled_for_deletion: "Trace scheduled for deletion"
-    make_public:
-      made_public: "Trace made public"
      offline_warning:
        message: "The GPX file upload system is currently unavailable"
      offline:
      offline_warning:
        message: "The GPX file upload system is currently unavailable"
      offline:
@@ -2584,9 +2561,6 @@ en:
          other: "GPX file with %{count} points from %{user}"
        description_without_count: "GPX file from %{user}"
    application:
          other: "GPX file with %{count} points from %{user}"
        description_without_count: "GPX file from %{user}"
    application:
-    basic_auth_disabled: "HTTP Basic Authentication is disabled: %{link}"
-    oauth_10a_disabled: "OAuth 1.0 and 1.0a are disabled: %{link}"
-    auth_disabled_link: "https://wiki.openstreetmap.org/wiki/2024_authentication_update"
      permission_denied: You do not have permission to access that action
      require_cookies:
        cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
      permission_denied: You do not have permission to access that action
      require_cookies:
        cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
@@ -2705,22 +2679,20 @@ en:
        by_signing_up:
          html: "By signing up, you agree to our %{tou_link}, %{privacy_policy_link} and %{contributor_terms_link}."
          privacy_policy: privacy policy
        by_signing_up:
          html: "By signing up, you agree to our %{tou_link}, %{privacy_policy_link} and %{contributor_terms_link}."
          privacy_policy: privacy policy
-        privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy
+        privacy_policy_url: https://osmfoundation.org/wiki/Privacy_Policy
          privacy_policy_title: OSMF privacy policy including section on email addresses
          privacy_policy_title: OSMF privacy policy including section on email addresses
-        contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
+        contributor_terms_url: "https://osmfoundation.org/wiki/Licence/Contributor_Terms"
          contributor_terms: "contributor terms"
          contributor_terms: "contributor terms"
-      tou: "terms of use"
-      external auth: "Third Party Authentication:"
        continue: Sign Up
        terms accepted: "Thanks for accepting the new contributor terms!"
        email_help:
          privacy_policy: privacy policy
        continue: Sign Up
        terms accepted: "Thanks for accepting the new contributor terms!"
        email_help:
          privacy_policy: privacy policy
-        privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy
+        privacy_policy_url: https://osmfoundation.org/wiki/Privacy_Policy
          privacy_policy_title: OSMF privacy policy including section on email addresses
          html: 'Your address is not displayed publicly, see our %{privacy_policy_link} for more information.'
        consider_pd_html: "I consider my contributions to be in the %{consider_pd_link}."
        consider_pd: "public domain"
          privacy_policy_title: OSMF privacy policy including section on email addresses
          html: 'Your address is not displayed publicly, see our %{privacy_policy_link} for more information.'
        consider_pd_html: "I consider my contributions to be in the %{consider_pd_link}."
        consider_pd: "public domain"
-      consider_pd_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
+      consider_pd_url: https://osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
        or: "or"
        use external auth: "or sign up with a third party"
      terms:
        or: "or"
        use external auth: "or sign up with a third party"
      terms:
@@ -2734,13 +2706,13 @@ en:
        read_tou: "I have read and agree to the Terms of Use"
        consider_pd: "In addition to the above, I consider my contributions to be in the Public Domain"
        consider_pd_why: "what's this?"
        read_tou: "I have read and agree to the Terms of Use"
        consider_pd: "In addition to the above, I consider my contributions to be in the Public Domain"
        consider_pd_why: "what's this?"
-      consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
+      consider_pd_why_url: https://osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
        guidance_info_html: "Information to help understand these terms: a %{readable_summary_link} and some %{informal_translations_link}"
        readable_summary: human readable summary
        informal_translations: informal translations
        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
+      continue: "Continue"
        declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
        declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
-      decline: "Decline"
+      cancel: "Cancel"
        you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue."
        legale_select: "Country of residence:"
        legale_names:
        you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue."
        legale_select: "Country of residence:"
        legale_names:
@@ -2825,8 +2797,6 @@ en:
        summary_no_ip_html: "%{name} created on %{date}"
        empty: No matching users found
      page:
        summary_no_ip_html: "%{name} created on %{date}"
        empty: No matching users found
      page:
-      older: "Older Users"
-      newer: "Newer Users"
        found_users:
          one: "%{count} user found"
          other: "%{count} users found"
        found_users:
          one: "%{count} user found"
          other: "%{count} users found"
@@ -2856,22 +2826,14 @@ en:
          with your ID in your user settings.
    user_role:
      filter:
          with your ID in your user settings.
    user_role:
      filter:
-      not_a_role: "The string `%{role}' is not a valid role."
+      not_a_role: "The string '%{role}' is not a valid role."
        already_has_role: "The user already has role %{role}."
        doesnt_have_role: "The user does not have role %{role}."
        not_revoke_admin_current_user: "Cannot revoke administrator role from current user."
      grant:
        already_has_role: "The user already has role %{role}."
        doesnt_have_role: "The user does not have role %{role}."
        not_revoke_admin_current_user: "Cannot revoke administrator role from current user."
      grant:
-      title: Confirm role granting
-      heading: Confirm role granting
-      are_you_sure: "Are you sure you want to grant the role `%{role}' to the user `%{name}'?"
-      confirm: "Confirm"
-      fail: "Could not grant role `%{role}' to user `%{name}'. Please check that the user and role are both valid."
+      are_you_sure: "Are you sure you want to grant the role '%{role}' to the user '%{name}'?"
      revoke:
      revoke:
-      title: Confirm role revoking
-      heading: Confirm role revoking
-      are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?"
-      confirm: "Confirm"
-      fail: "Could not revoke role `%{role}' from user `%{name}'. Please check that the user and role are both valid."
+      are_you_sure: "Are you sure you want to revoke the role '%{role}' from the user '%{name}'?"
    user_blocks:
      model:
        non_moderator_update: "Must be a moderator to create or update a block."
    user_blocks:
      model:
        non_moderator_update: "Must be a moderator to create or update a block."
@@ -2947,30 +2909,25 @@ en:
        created: "Created:"
        duration: "Duration:"
        status: "Status:"
        created: "Created:"
        duration: "Duration:"
        status: "Status:"
-      show: "Show"
        edit: "Edit"
        edit: "Edit"
-      confirm: "Are you sure?"
        reason: "Reason for block:"
        revoker: "Revoker:"
        reason: "Reason for block:"
        revoker: "Revoker:"
-      needs_view: "The user needs to log in before this block will be cleared."
      block:
        not_revoked: "(not revoked)"
        show: "Show"
        edit: "Edit"
      block:
        not_revoked: "(not revoked)"
        show: "Show"
        edit: "Edit"
-    blocks:
+    page:
        display_name: "Blocked User"
        creator_name: "Creator"
        reason: "Reason for block"
        status: "Status"
        revoker_name: "Revoked by"
        display_name: "Blocked User"
        creator_name: "Creator"
        reason: "Reason for block"
        status: "Status"
        revoker_name: "Revoked by"
-      older: "Older Blocks"
-      newer: "Newer Blocks"
      navigation:
        all_blocks: "All Blocks"
        blocks_on_me: "Blocks on Me"
      navigation:
        all_blocks: "All Blocks"
        blocks_on_me: "Blocks on Me"
-      blocks_on_user: "Blocks on %{user}"
+      blocks_on_user_html: "Blocks on %{user}"
        blocks_by_me: "Blocks by Me"
        blocks_by_me: "Blocks by Me"
-      blocks_by_user: "Blocks by %{user}"
+      blocks_by_user_html: "Blocks by %{user}"
        block: "Block #%{id}"
        new_block: "New Block"
    user_mutes:
        block: "Block #%{id}"
        new_block: "New Block"
    user_mutes:
@@ -3009,6 +2966,11 @@ en:
        description: "Description"
        created_at: "Created at"
        last_changed: "Last changed"
        description: "Description"
        created_at: "Created at"
        last_changed: "Last changed"
+      apply: "Apply"
+      all: "All"
+      open: "Open"
+      closed: "Closed"
+      status: "Status"
      show:
        title: "Note: %{id}"
        description: "Description"
      show:
        title: "Note: %{id}"
        description: "Description"
@@ -3027,6 +2989,9 @@ en:
        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.
+      discussion: Discussion
+      subscribe: Subscribe
+      unsubscribe: Unsubscribe
        hide: Hide
        resolve: Resolve
        reactivate: Reactivate
        hide: Hide
        resolve: Resolve
        reactivate: Reactivate
@@ -3045,6 +3010,10 @@ en:
        anonymous_warning_sign_up: "sign up"
        advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
        add: Add Note
        anonymous_warning_sign_up: "sign up"
        advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
        add: Add Note
+    notes_paging_nav:
+      showing_page: "Page %{page}"
+      next: "Next"
+      previous: "Previous"
    javascripts:
      close: Close
      share:
    javascripts:
      close: Close
      share:
@@ -3186,16 +3155,16 @@ en:
          slight_left_without_exit: Slight left onto %{name}
          via_point_without_exit: (via point)
          follow_without_exit: Follow %{name}
          slight_left_without_exit: Slight left onto %{name}
          via_point_without_exit: (via point)
          follow_without_exit: Follow %{name}
-        roundabout_without_exit: At roundabout take exit onto %{name}
-        leave_roundabout_without_exit: Leave roundabout - %{name}
-        stay_roundabout_without_exit: Stay on roundabout - %{name}
+        roundabout_without_exit: At the roundabout take the exit onto %{name}
+        leave_roundabout_without_exit: Leave the roundabout - %{name}
+        stay_roundabout_without_exit: Stay on the roundabout - %{name}
          start_without_exit: Start on %{name}
          destination_without_exit: Reach destination
          against_oneway_without_exit: Go against one-way on %{name}
          end_oneway_without_exit: End of one-way on %{name}
          start_without_exit: Start on %{name}
          destination_without_exit: Reach destination
          against_oneway_without_exit: Go against one-way on %{name}
          end_oneway_without_exit: End of one-way on %{name}
-        roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
-        roundabout_with_exit_ordinal: At roundabout take %{exit} exit onto %{name}
-        exit_roundabout: Exit roundabout onto %{name}
+        roundabout_with_exit: At the roundabout take the exit %{exit} onto %{name}
+        roundabout_with_exit_ordinal: At the roundabout take the %{exit} exit onto %{name}
+        exit_roundabout: Exit the roundabout onto %{name}
          unnamed: "unnamed road"
          courtesy: "Directions courtesy of %{link}"
          exit_counts:
          unnamed: "unnamed road"
          courtesy: "Directions courtesy of %{link}"
          exit_counts:
@@ -3232,6 +3201,7 @@ en:
        empty: "No redactions to show."
        heading: "List of Redactions"
        title: "List of Redactions"
        empty: "No redactions to show."
        heading: "List of Redactions"
        title: "List of Redactions"
+      new: "New Redaction"
      new:
        heading: "Enter Information for New Redaction"
        title: "Creating New Redaction"
      new:
        heading: "Enter Information for New Redaction"
        title: "Creating New Redaction"