]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/4872'
authorTom Hughes <tom@compton.nu>
Tue, 25 Mar 2025 19:15:47 +0000 (19:15 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 25 Mar 2025 19:15:47 +0000 (19:15 +0000)
1  2 
config/locales/en.yml

diff --combined config/locales/en.yml
index 230d9242c5b1c28aa42a299e1ea73288c829f438,2fffdabddd62e0088cd23e3d23eefc9e7e425f9a..aba37e9344ea41d983f004d2fbdade2849d4a88f
@@@ -87,13 -87,12 +87,13 @@@ en
          url: Main Application URL (Required)
          callback_url: Callback URL
          support_url: Support URL
 -        allow_read_prefs:  read their user preferences
 +        allow_read_prefs: read their user preferences
          allow_write_prefs: modify their user preferences
 -        allow_write_diary: create diary entries, comments and make friends
 -        allow_write_api:   modify the map
 -        allow_read_gpx:    read their private GPS traces
 -        allow_write_gpx:   upload GPS traces
 +        allow_write_diary: create diary entries and comments
 +        allow_write_api: modify the map
 +        allow_write_changeset_comments: comment on changesets
 +        allow_read_gpx: read their private GPS traces
 +        allow_write_gpx: upload GPS traces
          allow_write_notes: modify notes
        diary_comment:
          body: "Body"
          comment: Comment
          full: Full note
    accounts:
 -    edit:
 +    show:
        title: "Edit account"
 -      my settings: My Settings
 +      my_account: My Account
        current email address: "Current Email Address"
        external auth: "External Authentication"
        openid:
          link: "https://wiki.openstreetmap.org/wiki/OpenID"
          link text: "what is this?"
 -      public editing:
 -        heading: "Public editing"
 -        enabled: "Enabled. Not anonymous and can edit data."
 -        enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits"
 -        enabled link text: "what is this?"
 -        disabled: "Disabled and cannot edit data, all previous edits are anonymous."
 -        disabled link text: "why can't I edit?"
        contributor terms:
          heading: "Contributor Terms"
          agreed: "You have agreed to the new Contributor Terms."
          agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
          link: "https://osmfoundation.org/wiki/Licence/Contributor_Terms"
          link text: "what is this?"
 +        not_agreed_with_pd: "You haven't declared that you consider your edits to be in the Public Domain."
 +        pd_link_text: "declare"
        save changes button: Save Changes
        delete_account: Delete Account...
      go_public:
          read_ct: "I have read and agree to the above contributor terms"
          tou_explain_html: "These %{tou_link} govern the use of the website and other infrastructure provided by the OSMF. Please click on the link, read and agree to the text."
          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://osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
          guidance_info_html: "Information to help understand these terms: a %{readable_summary_link} and some %{informal_translations_link}"
          readable_summary: human readable summary
          informal_translations: informal translations
          continue: "Continue"
 -        declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
          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:"
            france: "France"
            italy: "Italy"
            rest_of_world: "Rest of the world"
 +      update:
 +        terms accepted: "Thanks for accepting the new contributor terms!"
        terms_declined_flash:
          terms_declined_html: We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see %{terms_declined_link}.
          terms_declined_link: this wiki page
          terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
 +    pd_declarations:
 +      show:
 +        title: Consider my contributions to be in the Public Domain
 +        consider_pd: "I consider my contributions to be in the Public Domain"
 +        consider_pd_why: "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
 +        confirm: Confirm
 +      create:
 +        successfully_declared: "You have successfully declared that you consider your edits to be in the Public Domain."
 +        already_declared: "You have already declared that you consider your edits to be in the Public Domain."
 +        did_not_confirm: "You didn't confirm that you consider your edits to be in the Public Domain."
    browse:
      deleted_ago_by_html: "Deleted %{time_ago} by %{user}"
      edited_ago_by_html: "Edited %{time_ago} by %{user}"
          relation: "relation"
      start_rjs:
        feature_warning: "Loading %{num_features} features, which may make your browser slow or unresponsive. Are you sure you want to display this data?"
 +      feature_error: "Features could not be loaded: %{message}"
        load_data: "Load Data"
        loading: "Loading..."
      tag_details:
        telephone_link: "Call %{phone_number}"
        colour_preview: "Colour %{colour_value} preview"
        email_link: "Email %{email}"
 -    query:
 +  feature_queries:
 +    show:
        title: "Query Features"
        introduction: "Click on the map to find nearby features."
        nearby: "Nearby features"
          sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
    changesets:
      changeset:
 -      no_edits: "(no edits)"
 -      view_changeset_details: "View changeset details"
 +      comments:
 +        one: "%{count} comment"
 +        other: "%{count} comments"
 +      changes:
 +        one: "%{count} change"
 +        other: "%{count} changes"
      index:
        title: "Changesets"
        title_user: "Changesets by %{user}"
        title_user_link_html: "Changesets by %{user_link}"
 -      title_friend: "Changesets by my friends"
 +      title_followed: "Changesets by followings"
        title_nearby: "Changesets by nearby users"
        empty: "No changesets found."
        empty_area: "No changesets in this area."
          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:
 -      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}"
        changesetxml: "Changeset XML"
        osmchangexml: "osmChange XML"
      paging_nav:
-       nodes: "Nodes (%{count})"
+       nodes_title: "Nodes"
        nodes_paginated: "Nodes (%{x}-%{y} of %{count})"
-       ways: "Ways (%{count})"
+       ways_title: "Ways"
        ways_paginated: "Ways (%{x}-%{y} of %{count})"
-       relations: "Relations (%{count})"
+       relations_title: "Relations"
        relations_paginated: "Relations (%{x}-%{y} of %{count})"
+       range: "%{x}-%{y} of %{count}"
      not_found_message:
        sorry: "Sorry, changeset #%{id} could not be found."
      timeout:
        sorry: "Sorry, the list of changesets you requested took too long to retrieve."
 +  changeset_subscriptions:
 +    show:
 +      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:
 +      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."
    dashboards:
      contact:
        km away: "%{count}km away"
        m away: "%{count}m away"
        latest_edit_html: "Latest edit (%{ago}):"
 +      no_edits: "(no edits)"
 +      view_changeset_details: "View changeset details"
      popup:
        your location: "Your location"
        nearby mapper: "Nearby mapper"
 -      friend: "Friend"
 +      following: "Following"
      show:
        title: My Dashboard
        no_home_location_html: "%{edit_profile_link} and set your home location to see nearby users."
        edit_your_profile: Edit your profile
 -      my friends: My friends
 -      no friends: You have not added any friends yet.
 +      followings: Followings
 +      no followings: You have not followed any user yet.
        nearby users: "Other nearby users"
        no nearby users: "There are no other users who admit to mapping nearby yet."
 -      friends_changesets: "friends' changesets"
 -      friends_diaries: "friends' diary entries"
 +      followed_changesets: "changesets"
 +      followed_diaries: "diary entries"
        nearby_changesets: "nearby user changesets"
        nearby_diaries: "nearby user diary entries"
    diary_entries:
        use_map_link: Use Map
      index:
        title: "Users' Diaries"
 -      title_friends: "Friends' Diaries"
 +      title_followed: "Followings' Diaries"
        title_nearby: "Nearby Users' Diaries"
        user_title: "%{user}'s Diary"
        in_language_title: "Diary Entries in %{language}"
        heading: Unsubscribe from the following diary entry discussion?
        button: Unsubscribe from discussion
    diary_comments:
 -    index:
 -      title: "Diary Comments added by %{user}"
 -      heading: "%{user}'s Diary Comments"
 -      subheading_html: "Diary Comments added by %{user}"
 -      no_comments: "No diary comments"
 -    page:
 -      post: Post
 -      when: When
 -      comment: Comment
      new:
        heading: Add a comment to the following diary entry discussion?
    doorkeeper:
      not_found:
        title: File not found
        description: Couldn't find a file/directory/API operation by that name on the OpenStreetMap server (HTTP 404)
 -  friendships:
 -    make_friend:
 -      heading: "Add %{user} as a friend?"
 -      button: "Add as friend"
 -      success: "%{name} is now your friend!"
 -      failed: "Sorry, failed to add %{name} as a friend."
 -      already_a_friend: "You are already friends with %{name}."
 -      limit_exceeded: "You have friended a lot of users recently. Please wait a while before trying to friend any more."
 -    remove_friend:
 -      heading: "Unfriend %{user}?"
 -      button: "Unfriend"
 -      success: "%{name} was removed from your friends."
 -      not_a_friend: "%{name} is not one of your friends."
 +  follows:
 +    show:
 +      follow:
 +        heading: "Do you want to follow %{user}?"
 +        button: "Follow User"
 +      unfollow:
 +        heading: "Do you want to unfollow %{user}?"
 +        button: "Unfollow User"
 +    create:
 +      success: "You are now following %{name}!"
 +      failed: "Sorry, your request to follow %{name} has failed."
 +      already_followed: "You already follow %{name}."
 +      limit_exceeded: "You have followed a lot of users recently. Please wait a while before trying to follow any more."
 +    destroy:
 +      success: "You successfully unfollowed %{name}."
 +      not_followed: "You are not following %{name}."
    geocoder:
      search:
        title:
            census: "Census Boundary"
            national_park: "National Park"
            political: "Electoral Boundary"
 -          protected_area : "Protected Area"
 +          protected_area: "Protected Area"
            "yes": "Boundary"
          bridge:
            aqueduct: "Aqueduct"
            bridleway: "Bridleway"
            bus_guideway: "Guided Bus Lane"
            bus_stop: "Bus Stop"
 +          busway: "Busway"
            construction: "Highway under Construction"
            corridor: "Corridor"
            crossing: "Crossing"
            turning_circle: "Turning Circle"
            turning_loop: "Turning Loop"
            unclassified: "Unclassified Road"
 -          "yes" : "Road"
 +          "yes": "Road"
          historic:
            aircraft: "Historic Aircraft"
            archaeological_site: "Archaeological Site"
            trench: "Trench"
            "yes": "Military"
          mountain_pass:
 -          "yes" : "Mountain Pass"
 +          "yes": "Mountain Pass"
          natural:
            atoll: "Atoll"
            bare_rock: "Bare Rock"
            weir: "Weir"
            "yes": "Waterway"
        admin_levels:
 -        level2: "Country Boundary"
 -        level3: "Region Boundary"
 -        level4: "State Boundary"
 -        level5: "Region Boundary"
 -        level6: "County Boundary"
 -        level7: "Municipality Boundary"
 -        level8: "City Boundary"
 -        level9: "Village Boundary"
 -        level10: "Suburb Boundary"
 -        level11: "Neighbourhood Boundary"
 +        level2: "International Boundary"
 +        level3: "Administrative Boundary (Level 3)"
 +        level4: "Administrative Boundary (Level 4)"
 +        level5: "Administrative Boundary (Level 5)"
 +        level6: "Administrative Boundary (Level 6)"
 +        level7: "Administrative Boundary (Level 7)"
 +        level8: "Administrative Boundary (Level 8)"
 +        level9: "Administrative Boundary (Level 9)"
 +        level10: "Administrative Boundary (Level 10)"
 +        level11: "Administrative Boundary (Level 11)"
 +      border_types:
 +        arrondissement: "Arrondissement Boundary"
 +        borough: "Borough Boundary"
 +        cercle: "Cercle Boundary"
 +        city: "City Boundary"
 +        comarca: "Comarca Boundary"
 +        county: "County Boundary"
 +        departement: "Departmental Boundary"
 +        department: "Departmental Boundary"
 +        district: "District Boundary"
 +        distrito: "District Boundary"
 +        freguesia: "Freguesia Boundary"
 +        local_authority: "Local Authority Boundary"
 +        municipality: "Municipal Boundary"
 +        municipi: "Municipal Boundary"
 +        município: "Municipal Boundary"
 +        nation: "International Boundary"
 +        national: "International Boundary"
 +        neighbourhood: "Neighborhood Boundary"
 +        parish: "Parish Boundary"
 +        province: "Provincial Boundary"
 +        região: "Regional Boundary"
 +        region: "Regional Boundary"
 +        state: "State Boundary"
 +        town: "Town Boundary"
 +        township: "Township Boundary"
 +        village: "Village Boundary"
      results:
        no_results: "No results found"
        more_results: "More results"
 +  directions:
 +    search:
 +      title: Directions
    issues:
      index:
        title: Issues
        select_status: Select Status
        select_type: Select Type
 -      select_last_updated_by: Select Last Updated By
 +      select_last_managed_by: Select Last Managed By
        reported_user: Reported User
 -      not_updated: Not Updated
 +      not_managed: Not Managed
        search: Search
        search_guidance: "Search Issues:"
        states:
        status: Status
        reports: Reports
        last_updated: Last Updated
 -      last_updated_time_ago_user_html: "%{time_ago} by %{user}"
 +      last_managed: Last Managed
 +      reporting_users: Reporting Users
        reports_count:
          one: "%{count} Report"
          other: "%{count} Reports"
        reopened: Issue status has been set to 'Open'
      comments:
        comment_from_html: "Comment from %{user_link} on %{comment_created_at}"
 -      reassign_param: Reassign Issue?
 +      reassign_to_moderators: Reassign Issue to Moderators
 +      reassign_to_administrators: Reassign Issue to Administrators
      reports:
        reported_by_html: "Reported as %{category} by %{user} on %{updated_at}"
      helper:
        reportable_title:
          diary_comment: "%{entry_title}, comment #%{comment_id}"
          note: "Note #%{note_id}"
 +      reportable_heading:
 +        diary_comment_html: "Diary Comment %{title} created on %{datetime_created}, updated on %{datetime_updated}"
 +        diary_entry_html: "Diary Entry %{title} created on %{datetime_created}, updated on %{datetime_updated}"
 +        note_html: "%{title} created on %{datetime_created}, updated on %{datetime_updated}"
 +        user_html: "User %{title} created on %{datetime_created}"
 +    reporters:
 +      index:
 +        title: "Issue #%{issue_id} Reporters"
 +      reporters:
 +        more_reporters: "and %{count} more"
    issue_comments:
      create:
        comment_created: Your comment was successfully created
      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."
 -    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."
      help: Help
      about: About
      communities: Communities
      learn_more: "Learn More"
      more: More
 +    offline_flash:
 +      osm_offline: "The OpenStreetMap database is currently offline while essential maintenance work is carried out."
 +      osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential maintenance work is carried out."
 +      expected_restore_html: "Services are expected to be restored in %{time}."
 +      announcement: "You can read the announcement here."
    user_mailer:
      diary_comment_notification:
        description: "OpenStreetMap Diary Entry #%{id}"
        header_html: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
        footer: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"
        footer_html: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"
 -    friendship_notification:
 +    follow_notification:
        hi: "Hi %{to_user},"
 -      subject: "[OpenStreetMap] %{user} added you as a friend"
 -      had_added_you: "%{user} has added you as a friend on OpenStreetMap."
 +      subject: "[OpenStreetMap] %{user} followed you"
 +      followed_you: "%{user} is now following you on OpenStreetMap."
        see_their_profile: "You can see their profile at %{userurl}."
        see_their_profile_html: "You can see their profile at %{userurl}."
 -      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}."
 +      follow_them: "You can also follow them at %{followurl}."
 +      follow_them_html: "You can also follow them at %{followurl}."
      gpx_details:
        details: "Your file details:"
        filename: Filename
        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."
 -    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"
 +    read_marks:
 +      create:
 +        notice: "Message marked as read"
 +      destroy:
 +        notice: "Message marked as unread"
 +    mutes:
 +      destroy:
 +        notice: "Message has been moved to Inbox"
 +        error: "The message could not be moved to the Inbox."
      mailboxes:
        heading:
          my_inbox: "My Inbox"
    preferences:
      show:
        title: My Preferences
 -      preferred_editor: Preferred Editor
 -      preferred_languages: Preferred Languages
        preferred_site_color_scheme: Preferred Website Color Scheme
        site_color_schemes:
          auto: Auto
        failure: Couldn't update profile.
    sessions:
      new:
 -      tab_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"
        password: "Password"
        preview: Preview
        help: Help
      pagination:
 +      changeset_comments:
 +        older: Older Comments
 +        newer: Newer Comments
        diary_comments:
          older: Older Comments
          newer: Newer Comments
          license_url: "https://openstreetmap.org/copyright"
          project_url: "https://openstreetmap.org"
        remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"
 -    edit:
 +    not_public_flash:
        not_public: "You have not set your edits to be public."
        not_public_description_html: "You can no longer edit the map unless you do so. You can set your edits as public from your %{user_page}."
        user_page_link: user page
        anon_edits_html: "(%{link})"
 -      anon_edits_link: "https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
 +      anon_edits_link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits"
        anon_edits_link_text: "Find out why this is the case."
 +    edit:
        id_not_configured: "iD has not been configured"
      export:
        title: "Export"
        where_am_i_title: Describe the current location using the search engine
        submit_text: "Go"
        reverse_directions_text: "Reverse Directions"
 -    key:
 -      table:
 -        entry:
 -          motorway: "Motorway"
 -          main_road: "Main road"
 -          trunk: "Trunk 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"
 -          cycleway_mtb: "Mountain bike route"
 -          footway: "Footway"
 -          rail: "Railway"
 -          train: "Train"
 -          subway: "Subway"
 -          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"
 -          capital: "Capital"
 -          city: "City"
 -          orchard: "Orchard"
 -          vineyard: "Vineyard"
 -          forest: "Forest"
 -          wood: "Wood"
 -          farmland: "Farmland"
 -          grass: "Grass"
 -          meadow: "Meadow"
 -          bare_rock: "Bare rock"
 -          sand: "Sand"
 -          golf: "Golf course"
 -          park: "Park"
 -          common: "Common"
 -          built_up: "Built-up area"
 -          resident: "Residential area"
 -          retail: "Retail area"
 -          industrial: "Industrial area"
 -          commercial: "Commercial area"
 -          heathland: "Heathland"
 -          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"
 -          beach: "Beach"
 -          reserve: "Nature reserve"
 -          military: "Military area"
 -          school: "School"
 -          university: "University"
 -          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"
 -          bridge: "Black casing = bridge"
 -          private: "Private access"
 -          destination: "Destination access"
 -          construction: "Roads under construction"
 -          bus_stop: "Bus stop"
 -          bicycle_shop: "Bicycle shop"
 -          bicycle_rental: "Bicycle rental"
 -          bicycle_parking: "Bicycle parking"
 -          bicycle_parking_small: "Small bicycle parking"
 -          toilets: "Toilets"
 +      modes:
 +        bicycle: "Bicycle"
 +        car: "Car"
 +        foot: "Foot"
 +      providers:
 +        fossgis_osrm: "OSRM"
 +        graphhopper: "GraphHopper"
 +        fossgis_valhalla: "Valhalla"
      welcome:
        title: Welcome!
        introduction: |
            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
 +  map_keys:
 +    show:
 +      entries:
 +        motorway: "Motorway"
 +        main_road: "Main road"
 +        trunk: "Trunk 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"
 +        cycleway_mtb: "Mountain bike route"
 +        footway: "Footway"
 +        rail: "Railway"
 +        train: "Train"
 +        subway: "Subway"
 +        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"
 +        capital: "Capital"
 +        city: "City"
 +        orchard: "Orchard"
 +        vineyard: "Vineyard"
 +        forest: "Forest"
 +        wood: "Wood"
 +        farmland: "Farmland"
 +        grass: "Grass"
 +        meadow: "Meadow"
 +        bare_rock: "Bare rock"
 +        sand: "Sand"
 +        golf: "Golf course"
 +        park: "Park"
 +        common: "Common"
 +        built_up: "Built-up area"
 +        resident: "Residential area"
 +        retail: "Retail area"
 +        industrial: "Industrial area"
 +        commercial: "Commercial area"
 +        heathland: "Heathland"
 +        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"
 +        beach: "Beach"
 +        reserve: "Nature reserve"
 +        military: "Military area"
 +        school: "School"
 +        university: "University"
 +        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"
 +        bridge: "Black casing = bridge"
 +        private: "Private access"
 +        destination: "Destination access"
 +        construction: "Roads under construction"
 +        bus_stop: "Bus stop"
 +        bicycle_shop: "Bicycle shop"
 +        bicycle_rental: "Bicycle rental"
 +        bicycle_parking: "Bicycle parking"
 +        bicycle_parking_small: "Small bicycle parking"
 +        toilets: "Toilets"
    traces:
      visibility:
        private: "Private (only shared as anonymous, unordered points)"
      offline:
        heading: "GPX Storage Offline"
        message: "The GPX file storage and upload system is currently unavailable."
 -    georss:
 -      title: "OpenStreetMap GPS Traces"
 -    description:
 -      description_with_count:
 -        one: "GPX file with %{count} point from %{user}"
 -        other: "GPX file with %{count} points from %{user}"
 -      description_without_count: "GPX file from %{user}"
 +    feeds:
 +      show:
 +        title: "OpenStreetMap GPS Traces"
 +      description:
 +        description_with_count:
 +          one: "GPX file with %{count} point from %{user}"
 +          other: "GPX file with %{count} points from %{user}"
 +        description_without_count: "GPX file from %{user}"
    application:
      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."
      setup_user_auth:
        blocked_zero_hour: "You have an urgent message on the OpenStreetMap website. You need to read the message before you will be able to save your edits."
 -      blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
 -      need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
 +      blocked: "Your access to the API has been blocked. Please log in to the web interface to find out more."
 +      need_to_see_terms: "Your access to the API is temporarily suspended. Please log in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
      settings_menu:
        account_settings: Account Settings
 -      oauth2_applications: OAuth 2 applications
 -      oauth2_authorizations: OAuth 2 authorizations
 +      oauth2_applications: OAuth 2 Applications
 +      oauth2_authorizations: OAuth 2 Authorizations
        muted_users: Muted Users
      auth_providers:
        openid_url: "OpenID URL"
      permissions:
        missing: "You have not permitted the application access to this facility"
      scopes:
 -      openid: Sign-in using OpenStreetMap
 +      openid: Sign in using OpenStreetMap
        read_prefs: Read user preferences
        write_prefs: Modify user preferences
 -      write_diary: Create diary entries, comments and make friends
 +      write_diary: Create diary entries and comments
        write_api: Modify the map
 +      write_changeset_comments: Comment on changesets
        read_gpx: Read private GPS traces
        write_gpx: Upload GPS traces
        write_notes: Modify notes
        write_redactions: Redact map data
 +      write_blocks: Create and revoke user blocks
        read_email: Read user email address
        consume_messages: Read, update status and delete user messages
        send_messages: Send private messages to other users
    users:
      new:
        title: "Sign Up"
 -      tab_title: "Sign up"
 +      tab_title: "Sign Up"
        signup_to_authorize_html: "Sign up with OpenStreetMap to access %{client_app_name}."
        no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
        please_contact_support_html: 'Please contact %{support_link} to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
          contributor_terms_url: "https://osmfoundation.org/wiki/Licence/Contributor_Terms"
          contributor_terms: "contributor terms"
        continue: Sign Up
 -      terms accepted: "Thanks for accepting the new contributor terms!"
        email_help:
          privacy_policy: 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://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"
      no_such_user:
        my notes: My Notes
        my messages: My Messages
        my profile: My Profile
 -      my settings: My Settings
 +      my_account: My Account
        my comments: My Comments
        my_preferences: My Preferences
        my_dashboard: My Dashboard
        edits: Edits
        traces: Traces
        notes: Map Notes
 -      remove as friend: Unfriend
 -      add as friend: Add Friend
 +      unfollow: Unfollow
 +      follow: Follow
        mapper since: "Mapper since:"
        last map edit: "Last map edit:"
        no activity yet: "No activity yet"
        show:
          title: Users
          heading: Users
 -        empty: No matching users found
 +        select_status: Select Status
 +        states:
 +          pending: Pending
 +          active: Active
 +          confirmed: Confirmed
 +          suspended: Suspended
 +          deleted: Deleted
 +        name_or_email: Name or Email
 +        ip_address: IP Address
 +        edits: Edits?
 +        has_edits: Has Edits
 +        no_edits: No Edits
 +        search: Search
        page:
          found_users:
            one: "%{count} user found"
            other: "%{count} users found"
          confirm: Confirm Selected Users
          hide: Hide Selected Users
 +        empty: No matching users found
        user:
          summary_html: "%{name} created from %{ip_address} on %{date}"
          summary_no_ip_html: "%{name} created on %{date}"
 +    comments:
 +      index:
 +        heading_html: "%{user}'s Comments"
 +        changesets: "Changesets"
 +        diary_entries: "Diary Entries"
 +        no_comments: "No comments"
 +    changeset_comments:
 +      index:
 +        title: "Changeset Comments added by %{user}"
 +      page:
 +        changeset: Changeset
 +        when: When
 +        comment: Comment
 +    diary_comments:
 +      index:
 +        title: "Diary Comments added by %{user}"
 +      page:
 +        post: Post
 +        when: When
 +        comment: Comment
      suspended:
        title: Account Suspended
        heading: Account Suspended
        open_title: "Unresolved note #%{note_name}"
        closed_title: "Resolved note #%{note_name}"
        hidden_title: "Hidden note #%{note_name}"
 +      description_when_author_is_deleted: "deleted"
 +      description_when_there_is_no_opening_comment: "unknown"
        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}"
      edit_help: Move the map and zoom in on a location you want to edit, then click here.
      directions:
        ascend: "Ascend"
 -      engines:
 -        fossgis_osrm_bike: "Bicycle (OSRM)"
 -        fossgis_osrm_car: "Car (OSRM)"
 -        fossgis_osrm_foot: "Foot (OSRM)"
 -        graphhopper_bicycle: "Bicycle (GraphHopper)"
 -        graphhopper_car: "Car (GraphHopper)"
 -        graphhopper_foot: "Foot (GraphHopper)"
 -        fossgis_valhalla_bicycle: "Bicycle (Valhalla)"
 -        fossgis_valhalla_car: "Car (Valhalla)"
 -        fossgis_valhalla_foot: "Foot (Valhalla)"
        descend: "Descend"
 -      directions: "Directions"
        distance: "Distance"
        distance_m: "%{distance}m"
        distance_km: "%{distance}km"
            ninth: "9th"
            tenth: "10th"
        time: "Time"
 +      download: "Download route as GeoJSON"
 +      filename: "route"
      query:
        node: Node
        way: Way
        show_address: Show address
        query_features: Query features
        centre_map: Centre map here
 +    home:
 +      marker_title: My home location
 +      not_set: Home location is not set for your account
 +    heatmap:
 +      tooltip:
 +        no_contributions: "No contributions on %{date}"
 +        contributions:
 +          one: "%{count} contribution on %{date}"
 +          other: "%{count} contributions on %{date}"
    redactions:
      edit:
        heading: "Edit Redaction"