X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3f27dc3abb853c71b7fae1cf39cf0865ac364838..7d4cc85a312cb79fd1c4b0f22626722bea1d736d:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index cde42427b..d24987aef 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -59,6 +59,7 @@ en:
       message: "Message"
       node: "Node"
       node_tag: "Node Tag"
+      note: "Note"
       old_node: "Old Node"
       old_node_tag: "Old Node Tag"
       old_relation: "Old Relation"
@@ -285,7 +286,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."
-        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...
@@ -356,8 +357,7 @@ en:
         way: "Way"
         relation: "Relation"
     containing_relation:
-      entry_html: "Relation %{relation_name}"
-      entry_role_html: "Relation %{relation_name} (as %{relation_role})"
+      entry_role_html: "%{relation_name} (as %{relation_role})"
     not_found:
       title: Not Found
       sorry: "Sorry, %{type} #%{id} could not be found."
@@ -432,8 +432,6 @@ en:
       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"
@@ -580,8 +578,6 @@ en:
       report: Report this comment
     location:
       location: "Location:"
-      view: "View"
-      edit: "Edit"
       coordinates: "%{latitude}; %{longitude}"
     feed:
       user:
@@ -1005,6 +1001,14 @@ en:
           wayside_shrine: "Wayside Shrine"
           wreck: "Wreck"
           "yes": "Historic Site"
+        information:
+          guidepost: "Guidepost"
+          board: "Information Board"
+          map: "Map"
+          office: "Tourist Office"
+          terminal: "Information Terminal"
+          sign: "Information Sign"
+          stele: "Information Stele"
         junction:
           "yes": "Junction"
         landuse:
@@ -1077,10 +1081,12 @@ en:
           track: "Running Track"
           water_park: "Water Park"
           "yes": "Leisure"
+        lock:
+          "yes": "Lock"
         man_made:
           adit: "Adit"
           advertising: "Advertising"
-          antenna:  "Antenna"
+          antenna: "Antenna"
           avalanche_protection: "Avalanche Protection"
           beacon: "Beacon"
           beam: "Beam"
@@ -1417,6 +1423,17 @@ en:
           building_passage: "Building Passage"
           culvert: "Culvert"
           "yes": "Tunnel"
+        water:
+          lake: "Lake"
+          pond: "Pond"
+          reservoir: "Reservoir"
+          basin: "Water basin"
+          fishpond: "Fish Pond"
+          lagoon: "Lagoon"
+          wastewater: "Waste Water"
+          oxbow: "Oxbow"
+          stream_pool: "Stream Pool"
+          lock: "Lock"
         waterway:
           artificial: "Artificial Waterway"
           boatyard: "Boatyard"
@@ -1460,7 +1477,6 @@ en:
       not_updated: Not Updated
       search: Search
       search_guidance: "Search Issues:"
-      link_to_reports: View Reports
       states:
         ignored: Ignored
         open: Open
@@ -1482,7 +1498,10 @@ en:
         open: Open
         resolved: Resolved
     show:
-      title: "%{status} Issue #%{issue_id}"
+      title:
+        open: "Open Issue #%{issue_id}"
+        ignored: "Ignored Issue #%{issue_id}"
+        resolved: "Resolved Issue #%{issue_id}"
       reports:
         one: "%{count} report"
         other: "%{count} reports"
@@ -1768,14 +1787,14 @@ en:
         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"
-      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:
@@ -1812,6 +1831,16 @@ en:
       title: My Preferences
       preferred_editor: Preferred Editor
       preferred_languages: Preferred Languages
+      preferred_site_color_scheme: Preferred Website Color Scheme
+      site_color_schemes:
+        auto: Auto
+        light: Light
+        dark: Dark
+      preferred_map_color_scheme: Preferred Map Color Scheme
+      map_color_schemes:
+        auto: Auto
+        light: Light
+        dark: Dark
       edit_preferences: Edit Preferences
     edit:
       title: Edit Preferences
@@ -1849,7 +1878,6 @@ en:
       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"
@@ -1857,7 +1885,6 @@ en:
       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."
@@ -1956,11 +1983,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_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_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.
@@ -1969,7 +1996,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_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
@@ -2016,7 +2043,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
-        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}.
@@ -2060,7 +2087,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_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 © %{geoscape_australia_link}
           licensed by the Commonwealth of Australia under %{cc_licence_link}.
@@ -2172,7 +2199,7 @@ en:
           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
@@ -2181,7 +2208,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
-        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."
@@ -2242,7 +2269,7 @@ en:
           %{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: |
@@ -2298,7 +2325,6 @@ en:
       welcome_mat_url: https://welcome.openstreetmap.org/
     sidebar:
       search_results: Search Results
-      close: Close
     search:
       search: Search
       get_directions_title: "Find directions between two points"
@@ -2552,7 +2578,7 @@ en:
       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"
     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"
@@ -2602,6 +2628,25 @@ en:
       wikipedia:
         title: Log in with Wikipedia
         alt: Wikipedia logo
+    share:
+      email:
+        title: Share via Email
+        alt: Email icon
+      facebook:
+        title: Share via Facebook
+        alt: Facebook Icon
+      linkedin:
+        title: Share via LinkedIn
+        alt: LinkedIn Icon
+      mastodon:
+        title: Share on Mastodon
+        alt: Mastodon Icon
+      telegram:
+        title: Share on Telegram
+        alt: Telegram Icon
+      x:
+        title: Share on X
+        alt: X Icon
   oauth:
     permissions:
       missing: "You have not permitted the application access to this facility"
@@ -2687,21 +2732,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
-        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
-        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"
-      tou: "terms of use"
       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"
-      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:
@@ -2715,13 +2759,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?"
-      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
-      continue: Continue
+      continue: "Continue"
       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:
@@ -2835,14 +2879,14 @@ en:
         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:
-      are_you_sure: "Are you sure you want to grant the role `%{role}' to the user `%{name}'?"
+      are_you_sure: "Are you sure you want to grant the role '%{role}' to the user '%{name}'?"
     revoke:
-      are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?"
+      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."
@@ -2904,6 +2948,15 @@ en:
         years:
           one: "%{count} year"
           other: "%{count} years"
+      short:
+        ended: "ended"
+        revoked_html: "revoked by %{name}"
+        active: "active"
+        active_unread: "active unread"
+        expired_unread: "expired unread"
+        read_html: "read at %{time}"
+        time_in_future_title: "%{time_absolute}; in %{time_relative}"
+        time_in_past_title: "%{time_absolute}; %{time_relative}"
     blocks_on:
       title: "Blocks on %{name}"
       heading_html: "List of Blocks on %{name}"
@@ -2918,28 +2971,25 @@ en:
       created: "Created:"
       duration: "Duration:"
       status: "Status:"
-      show: "Show"
       edit: "Edit"
-      confirm: "Are you sure?"
       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"
     page:
       display_name: "Blocked User"
       creator_name: "Creator"
       reason: "Reason for block"
+      start: "Start"
+      end: "End"
       status: "Status"
-      revoker_name: "Revoked by"
     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_user: "Blocks by %{user}"
+      blocks_by_user_html: "Blocks by %{user}"
       block: "Block #%{id}"
       new_block: "New Block"
   user_mutes:
@@ -2978,6 +3028,11 @@ en:
       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"
@@ -2996,6 +3051,9 @@ en:
       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
@@ -3014,6 +3072,9 @@ 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
+    new_readonly:
+      title: "New Note"
+      warning: "New notes cannot be created because the OpenStreetMap API is currently in read-only mode."
     notes_paging_nav:
       showing_page: "Page %{page}"
       next: "Next"
@@ -3159,16 +3220,16 @@ en:
         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}
-        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: