Update to rails 7.2.2.1

[rails.git] / config / locales / en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7e65005ff6de7b6a4ff3abc661c882bc94e2a498..c3a0c5aed0802f2afe1c8acaf4eafee1f5c7e8e4 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:


@@ -61,6 +59,7 @@ en:
       message: "Message"
       node: "Node"
       node_tag: "Node Tag"
       message: "Message"
       node: "Node"
       node_tag: "Node Tag"

+      note: "Note"

       old_node: "Old Node"
       old_node_tag: "Old Node Tag"
       old_relation: "Old Relation"
       old_node: "Old Node"
       old_node_tag: "Old Node Tag"
       old_relation: "Old Relation"


@@ -124,7 +123,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:


@@ -142,7 +141,6 @@ en:
         auth_provider: Authentication Provider
         auth_uid: Authentication UID
         email: "Email"
         auth_provider: Authentication Provider
         auth_uid: Authentication UID
         email: "Email"

-        email_confirmation: "Email Confirmation"

         new_email: "New Email Address"
         active: "Active"
         display_name: "Display Name"
         new_email: "New Email Address"
         active: "Active"
         display_name: "Display Name"


@@ -204,9 +202,9 @@ en:
         one: "%{count} year ago"
         other: "%{count} years ago"
   printable_name:
         one: "%{count} year ago"
         other: "%{count} years ago"
   printable_name:

-    with_id: "%{id}"
-    with_version: "%{id}, v%{version}"
+    version: "v%{version}"

     with_name_html: "%{name} (%{id})"
     with_name_html: "%{name} (%{id})"

+    current_and_old_links_html: "%{current_link}, %{old_link}"

   editor:
     default: "Default (currently %{name})"
     id:
   editor:
     default: "Default (currently %{name})"
     id:


@@ -288,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."
         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...


@@ -308,15 +306,10 @@ en:
     destroy:
       success: "Account Deleted."
   browse:
     destroy:
       success: "Account Deleted."
   browse:

-    created: "Created"
-    closed: "Closed"
-    created_ago_html: "Created %{time_ago}"
-    closed_ago_html: "Closed %{time_ago}"
-    created_ago_by_html: "Created %{time_ago} by %{user}"
-    closed_ago_by_html: "Closed %{time_ago} by %{user}"

     deleted_ago_by_html: "Deleted %{time_ago} by %{user}"
     edited_ago_by_html: "Edited %{time_ago} by %{user}"
     version: "Version"
     deleted_ago_by_html: "Deleted %{time_ago} by %{user}"
     edited_ago_by_html: "Edited %{time_ago} by %{user}"
     version: "Version"

+    redacted_version: "Redacted Version"

     in_changeset: "Changeset"
     anonymous: "anonymous"
     no_comment: "(no comment)"
     in_changeset: "Changeset"
     anonymous: "anonymous"
     no_comment: "(no comment)"


@@ -329,26 +322,13 @@ en:
       other: "%{count} ways"
     download_xml: "Download XML"
     view_history: "View History"
       other: "%{count} ways"
     download_xml: "Download XML"
     view_history: "View History"

+    view_unredacted_history: "View Unredacted History"

     view_details: "View Details"
     view_details: "View Details"

+    view_redacted_data: "View Redacted Data"
+    view_redaction_message: "View Redaction Message"

     location: "Location:"
     common_details:
       coordinates_html: "%{latitude}, %{longitude}"
     location: "Location:"
     common_details:
       coordinates_html: "%{latitude}, %{longitude}"

-    changeset:
-      title: "Changeset: %{id}"
-      belongs_to: "Author"
-      node: "Nodes (%{count})"
-      node_paginated: "Nodes (%{x}-%{y} of %{count})"
-      way: "Ways (%{count})"
-      way_paginated: "Ways (%{x}-%{y} of %{count})"
-      relation: "Relations (%{count})"
-      relation_paginated: "Relations (%{x}-%{y} of %{count})"
-      hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}"
-      comment_by_html: "Comment from %{user} %{time_ago}"
-      changesetxml: "Changeset XML"
-      osmchangexml: "osmChange XML"
-      join_discussion: "Log in to join the discussion"
-      discussion: Discussion
-      still_open: "Changeset still open - discussion will open once the changeset is closed."

     node:
       title_html: "Node: %{name}"
       history_title_html: "Node History: %{name}"
     node:
       title_html: "Node: %{name}"
       history_title_html: "Node History: %{name}"


@@ -377,8 +357,7 @@ en:
         way: "Way"
         relation: "Relation"
     containing_relation:
         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."
     not_found:
       title: Not Found
       sorry: "Sorry, %{type} #%{id} could not be found."


@@ -390,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,7 +384,7 @@ en:
         way: "way"
         relation: "relation"
     start_rjs:
         way: "way"
         relation: "relation"
     start_rjs:

-      feature_warning: "Loading %{num_features} features, which may make your browser slow or unresponsive. Are sure you want to display this data?"
+      feature_warning: "Loading %{num_features} features, which may make your browser slow or unresponsive. Are you sure you want to display this data?"

       load_data: "Load Data"
       loading: "Loading..."
     tag_details:
       load_data: "Load Data"
       loading: "Loading..."
     tag_details:


@@ -424,30 +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}"
+      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:
   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}"


@@ -464,19 +457,50 @@ en:
       feed:
         title: "Changeset %{id}"
         title_comment: "Changeset %{id} - %{comment}"
       feed:
         title: "Changeset %{id}"
         title_comment: "Changeset %{id} - %{comment}"

+        created: "Created"
+        closed: "Closed"
+        belongs_to: "Author"
+    subscribe:
+      heading: Subscribe to the following changeset discussion?
+      button: Subscribe to discussion
+    unsubscribe:
+      heading: Unsubscribe from the following changeset discussion?
+      button: Unsubscribe from discussion
+    heading:
+      title: "Changeset %{id}"
+      created_by_html: "Created by %{link_user} on %{created}."
+    no_such_entry:
+      heading: "No entry with the id: %{id}"
+      body: "Sorry, there is no changeset with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong."
+    show:
+      title: "Changeset: %{id}"
+      created: "Created: %{when}"
+      closed: "Closed: %{when}"
+      created_ago_html: "Created %{time_ago}"
+      closed_ago_html: "Closed %{time_ago}"
+      created_ago_by_html: "Created %{time_ago} by %{user}"
+      closed_ago_by_html: "Closed %{time_ago} by %{user}"
+      discussion: Discussion
+      join_discussion: "Log in to join the discussion"
+      still_open: "Changeset still open - discussion will open once the changeset is closed."
+      subscribe: "Subscribe"
+      unsubscribe: "Unsubscribe"
+      comment_by_html: "Comment from %{user} %{time_ago}"
+      hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}"
+      hide_comment: "hide"
+      unhide_comment: "unhide"
+      comment: "Comment"
+      changesetxml: "Changeset XML"
+      osmchangexml: "osmChange XML"
+    paging_nav:
+      nodes: "Nodes (%{count})"
+      nodes_paginated: "Nodes (%{x}-%{y} of %{count})"
+      ways: "Ways (%{count})"
+      ways_paginated: "Ways (%{x}-%{y} of %{count})"
+      relations: "Relations (%{count})"
+      relations_paginated: "Relations (%{x}-%{y} of %{count})"

     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."
     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."

-  changeset_comments:
-    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}"
-    index:
-      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."

   dashboards:
     contact:
       km away: "%{count}km away"
   dashboards:
     contact:
       km away: "%{count}km away"


@@ -514,9 +538,8 @@ en:
       new_title: Compose a new entry in my user diary
       my_diary: My Diary
       no_entries: No diary entries
       new_title: Compose a new entry in my user diary
       my_diary: My Diary
       no_entries: No diary entries

+    page:

       recent_entries: "Recent diary entries"
       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


@@ -524,9 +547,11 @@ en:
       title: "%{user}'s Diary | %{title}"
       user_title: "%{user}'s Diary"
       discussion: "Discussion"
       title: "%{user}'s Diary | %{title}"
       user_title: "%{user}'s Diary"
       discussion: "Discussion"

+      subscribe: "Subscribe"
+      unsubscribe: "Unsubscribe"

       leave_a_comment: "Leave a comment"
       login_to_leave_a_comment_html: "%{login_link} to leave a comment"
       leave_a_comment: "Leave a comment"
       login_to_leave_a_comment_html: "%{login_link} to leave a comment"

-      login: "Login"
+      login: "Log in"

     no_such_entry:
       title: "No such diary entry"
       heading: "No entry with the id: %{id}"
     no_such_entry:
       title: "No such diary entry"
       heading: "No entry with the id: %{id}"


@@ -553,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:


@@ -566,16 +589,24 @@ en:
       all:
         title: "OpenStreetMap diary entries"
         description: "Recent diary entries from users of OpenStreetMap"
       all:
         title: "OpenStreetMap diary entries"
         description: "Recent diary entries from users of OpenStreetMap"

-    comments:
+    subscribe:
+      heading: Subscribe to the following diary entry discussion?
+      button: Subscribe to discussion
+    unsubscribe:
+      heading: Unsubscribe from the following diary entry discussion?
+      button: Unsubscribe from discussion
+  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"
       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
       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:
     errors:
       messages:
   doorkeeper:
     errors:
       messages:


@@ -608,6 +639,9 @@ en:
       contact_url_title: Various contact channels explained
       contact: contact
       contact_the_community_html: Feel free to %{contact_link} the OpenStreetMap community if you have found a broken link / bug. Make a note of the exact URL of your request.
       contact_url_title: Various contact channels explained
       contact: contact
       contact_the_community_html: Feel free to %{contact_link} the OpenStreetMap community if you have found a broken link / bug. Make a note of the exact URL of your request.

+    bad_request:
+      title: Bad request
+      description: The operation you requested on the OpenStreetMap server is not valid (HTTP 400)

     forbidden:
       title: Forbidden
       description: The operation you requested on the OpenStreetMap server is only available to administrators (HTTP 403)
     forbidden:
       title: Forbidden
       description: The operation you requested on the OpenStreetMap server is only available to administrators (HTTP 403)


@@ -633,13 +667,9 @@ en:
   geocoder:
     search:
       title:
   geocoder:
     search:
       title:

-        results_from_html: 'Results from %{results_link}'

         latlon: Internal
         latlon: Internal

-        latlon_url: https://openstreetmap.org/

         osm_nominatim: OpenStreetMap Nominatim
         osm_nominatim: OpenStreetMap Nominatim

-        osm_nominatim_url: https://nominatim.openstreetmap.org/

         osm_nominatim_reverse: OpenStreetMap Nominatim
         osm_nominatim_reverse: OpenStreetMap Nominatim

-        osm_nominatim_reverse_url: https://nominatim.openstreetmap.org/

     search_osm_nominatim:
       prefix_format: "%{name}"
       prefix:
     search_osm_nominatim:
       prefix_format: "%{name}"
       prefix:


@@ -804,6 +834,7 @@ en:
           college: "College Building"
           commercial: "Commercial Building"
           construction: "Building under Construction"
           college: "College Building"
           commercial: "Commercial Building"
           construction: "Building under Construction"

+          cowshed: "Cowshed"

           detached: "Detached House"
           dormitory: "Dormitory"
           duplex: "Duplex House"
           detached: "Detached House"
           dormitory: "Dormitory"
           duplex: "Duplex House"


@@ -833,6 +864,7 @@ en:
           shed: "Shed"
           stable: "Stable"
           static_caravan: "Caravan"
           shed: "Shed"
           stable: "Stable"
           static_caravan: "Caravan"

+          sty: "Sty"

           temple: "Temple Building"
           terrace: "Terrace Building"
           train_station: "Train Station Building"
           temple: "Temple Building"
           terrace: "Terrace Building"
           train_station: "Train Station Building"


@@ -1044,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"


@@ -1411,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"


@@ -1428,13 +1456,18 @@ en:
       not_updated: Not Updated
       search: Search
       search_guidance: "Search Issues:"
       not_updated: Not Updated
       search: Search
       search_guidance: "Search Issues:"

+      states:
+        ignored: Ignored
+        open: Open
+        resolved: Resolved
+    page:

       user_not_found: User does not exist
       issues_not_found: No such issues found
       user_not_found: User does not exist
       issues_not_found: No such issues found

+      reported_user: Reported User

       status: Status
       reports: Reports
       last_updated: Last Updated
       last_updated_time_ago_user_html: "%{time_ago} by %{user}"
       status: Status
       reports: Reports
       last_updated: Last Updated
       last_updated_time_ago_user_html: "%{time_ago} by %{user}"

-      link_to_reports: View Reports

       reports_count:
         one: "%{count} Report"
         other: "%{count} Reports"
       reports_count:
         one: "%{count} Report"
         other: "%{count} Reports"


@@ -1444,7 +1477,10 @@ en:
         open: Open
         resolved: Resolved
     show:
         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"
       reports:
         one: "%{count} report"
         other: "%{count} reports"


@@ -1531,46 +1567,36 @@ 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_html: "Hosting is supported by %{ucl}, %{fastly}, %{bytemark}, and other %{partners}."
-    partners_ucl: "UCL"
+    hosting_partners_2024_html: "Hosting is supported by %{fastly}, %{corpmembers}, and other %{partners}."

     partners_fastly: "Fastly"
     partners_fastly: "Fastly"

-    partners_bytemark: "Bytemark Hosting"
+    partners_corpmembers: "OSMF corporate members"

     partners_partners: "partners"
     tou: "Terms of Use"
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
     partners_partners: "partners"
     tou: "Terms of Use"
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."

-    donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
+    nothing_to_preview: "Nothing to preview."

     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:
     diary_comment_notification:
     learn_more: "Learn More"
     more: More
   user_mailer:
     diary_comment_notification:

+      description: "OpenStreetMap Diary Entry #%{id}"

       subject: "[OpenStreetMap] %{user} commented on a diary entry"
       hi: "Hi %{to_user},"
       header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
       header_html: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
       footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
       footer_html: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
       subject: "[OpenStreetMap] %{user} commented on a diary entry"
       hi: "Hi %{to_user},"
       header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
       header_html: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
       footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
       footer_html: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"

+      footer_unsubscribe: "You can unsubscribe from the discussion at %{unsubscribeurl}"
+      footer_unsubscribe_html: "You can unsubscribe from the discussion at %{unsubscribeurl}"

     message_notification:
       subject: "[OpenStreetMap] %{message_title}"
       hi: "Hi %{to_user},"
     message_notification:
       subject: "[OpenStreetMap] %{message_title}"
       hi: "Hi %{to_user},"


@@ -1587,11 +1613,14 @@ 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_html: "It looks like your GPX file %{trace_name} with the description %{trace_description} and the following tags: %{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"
       subject: "[OpenStreetMap] GPX Import failure"
       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"
       subject: "[OpenStreetMap] GPX Import failure"


@@ -1600,6 +1629,8 @@ en:
       loaded:
         one: "loaded successfully with %{trace_points} out of a possible %{count} point."
         other: "loaded successfully with %{trace_points} out of a possible %{count} points."
       loaded:
         one: "loaded successfully with %{trace_points} out of a possible %{count} point."
         other: "loaded successfully with %{trace_points} out of a possible %{count} points."

+      trace_location: "Your trace is available at %{trace_url}"
+      all_your_traces: "All your successfully uploaded GPX traces can be found at %{url}"

       all_your_traces_html: "All your successfully uploaded GPX traces can be found at %{url}."
       subject: "[OpenStreetMap] GPX Import success"
     signup_confirm:
       all_your_traces_html: "All your successfully uploaded GPX traces can be found at %{url}."
       subject: "[OpenStreetMap] GPX Import success"
     signup_confirm:


@@ -1619,6 +1650,7 @@ en:
       hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
       click_the_link: "If this is you, please click the link below to reset your password."
     note_comment_notification:
       hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
       click_the_link: "If this is you, please click the link below to reset your password."
     note_comment_notification:

+      description: "OpenStreetMap Note #%{id}"

       anonymous: An anonymous user
       greeting: "Hi,"
       commented:
       anonymous: An anonymous user
       greeting: "Hi,"
       commented:


@@ -1642,11 +1674,11 @@ en:
         your_note_html: "%{commenter} has reactivated one of your map notes near %{place}."
         commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
         commented_note_html: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
         your_note_html: "%{commenter} has reactivated one of your map notes near %{place}."
         commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
         commented_note_html: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."

-      details: "More details about the note can be found at %{url}."
-      details_html: "More details about the note can be found at %{url}."
+      details: "Reply or learn more about the note at %{url}."
+      details_html: "Reply or learn more about the note at %{url}."

     changeset_comment_notification:
     changeset_comment_notification:

+      description: "OpenStreetMap Changeset #%{id}"

       hi: "Hi %{to_user},"
       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"


@@ -1657,10 +1689,10 @@ en:
         partial_changeset_with_comment: "with comment '%{changeset_comment}'"
         partial_changeset_with_comment_html: "with comment '%{changeset_comment}'"
         partial_changeset_without_comment: "without comment"
         partial_changeset_with_comment: "with comment '%{changeset_comment}'"
         partial_changeset_with_comment_html: "with comment '%{changeset_comment}'"
         partial_changeset_without_comment: "without comment"

-      details: "More details about the changeset can be found at %{url}."
-      details_html: "More details about the changeset can be found at %{url}."
-      unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
-      unsubscribe_html: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
+      details: "Reply or learn more about the changeset at %{url}."
+      details_html: "Reply or learn more about the changeset at %{url}."
+      unsubscribe: "You can unsubscribe from updates to this changeset at %{url}."
+      unsubscribe_html: "You can unsubscribe from updates to this changeset at %{url}."

   confirmations:
     confirm:
       heading: Check your email!
   confirmations:
     confirm:
       heading: Check your email!


@@ -1708,7 +1740,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:


@@ -1724,7 +1755,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"


@@ -1736,17 +1766,17 @@ 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 login as the correct user in order to reply."
+      wrong_user: "You are logged in as '%{user}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply."

     show:
       title: "Read message"
       reply_button: "Reply"
       unread_button: "Mark as unread"
       destroy_button: "Delete"
       back: "Back"
     show:
       title: "Read message"
       reply_button: "Reply"
       unread_button: "Mark as unread"
       destroy_button: "Delete"
       back: "Back"

-      wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
+      wrong_user: "You are logged in as '%{user}' but the message you have asked to read was not sent by or to that user. Please log in as the correct user in order to read it."

     sent_message_summary:
       destroy_button: "Delete"
     sent_message_summary:
       destroy_button: "Delete"

-    heading: 
+    heading:

       my_inbox: "My Inbox"
       my_outbox: "My Outbox"
       muted_messages: "Muted messages"
       my_inbox: "My Inbox"
       my_outbox: "My Outbox"
       muted_messages: "Muted messages"


@@ -1766,8 +1796,7 @@ en:
       new password button: "Reset password"
       help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."
     create:
       new password button: "Reset password"
       help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."
     create:

-      notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
-      notice email cannot find: "Could not find that email address, sorry."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."

     edit:
       title: "Reset password"
       heading: "Reset Password for %{user}"
     edit:
       title: "Reset password"
       heading: "Reset Password for %{user}"


@@ -1818,44 +1847,16 @@ en:
       failure: Couldn't update profile.
   sessions:
     new:
       failure: Couldn't update profile.
   sessions:
     new:

-      title: "Login"
-      heading: "Login"
+      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"
       email or username: "Email Address or Username"
       password: "Password"

-      openid_html: "%{logo} OpenID"

       remember: "Remember me"
       lost password link: "Lost your password?"
       remember: "Remember me"
       lost password link: "Lost your password?"

-      login_button: "Login"
-      register now: Register now
-      with external: "Alternatively, use a third party to login:"
-      no account: Don't have an account?
+      login_button: "Log in"
+      with external: "or log in with a third party"
+      or: "or"

       auth failure: "Sorry, could not log in with those details."
       auth failure: "Sorry, could not log in with those details."

-      openid_logo_alt: "Log in with an OpenID"
-      auth_providers:
-        openid:
-          title: Login with OpenID
-          alt: Login with an OpenID URL
-        google:
-          title: Login with Google
-          alt: Login with a Google OpenID
-        facebook:
-          title: Login with Facebook
-          alt: Login with a Facebook Account
-        microsoft:
-          title: Login with Microsoft
-          alt: Login with a Microsoft Account
-        github:
-          title: Login with GitHub
-          alt: Login with a GitHub Account
-        wikipedia:
-          title: Login with Wikipedia
-          alt: Login with a Wikipedia Account
-        wordpress:
-          title: Login with Wordpress
-          alt: Login with a Wordpress OpenID
-        aol:
-          title: Login with AOL
-          alt: Login with an AOL OpenID

     destroy:
       title: "Logout"
       heading: "Logout from OpenStreetMap"
     destroy:
       title: "Logout"
       heading: "Logout from OpenStreetMap"


@@ -1885,9 +1886,28 @@ en:
     richtext_field:
       edit: Edit
       preview: Preview
     richtext_field:
       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: "©"
       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: "©"
       used_by_html: "%{name} provides map data for thousands of websites, mobile apps, and hardware devices"


@@ -1932,11 +1952,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.


@@ -1945,9 +1965,10 @@ 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:
       partners_title: Partners
     copyright:

+      title: Copyright and License

       foreign:
         title: About this translation
         html: In the event of a conflict between this translated page and %{english_original_link}, the English page shall take precedence
       foreign:
         title: About this translation
         html: In the event of a conflict between this translated page and %{english_original_link}, the English page shall take precedence


@@ -1958,7 +1979,6 @@ en:
         native_link: THIS_LANGUAGE_NAME_HERE version
         mapping_link: start mapping
       legal_babble:
         native_link: THIS_LANGUAGE_NAME_HERE version
         mapping_link: start mapping
       legal_babble:

-        title_html: Copyright and License

         introduction_1_html: |
           OpenStreetMap%{registered_trademark_link} is %{open_data}, licensed under the
           %{odc_odbl_link} (ODbL) by the %{osm_foundation_link} (OSMF).
         introduction_1_html: |
           OpenStreetMap%{registered_trademark_link} is %{open_data}, licensed under the
           %{odc_odbl_link} (ODbL) by the %{osm_foundation_link} (OSMF).


@@ -1992,7 +2012,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}.


@@ -2036,7 +2056,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 © %{geoscape_australia_link}
           licensed by the Commonwealth of Australia under %{cc_licence_link}.
         contributors_au_credit_html: |
           %{australia}: Incorporates or developed using Administrative Boundaries © %{geoscape_australia_link}
           licensed by the Commonwealth of Australia under %{cc_licence_link}.


@@ -2069,6 +2089,14 @@ en:
           %{france}: Contains data sourced from
           Direction Générale des Impôts.
         contributors_fr_france: France
           %{france}: Contains data sourced from
           Direction Générale des Impôts.
         contributors_fr_france: France

+        contributors_hr_credit_html: |
+          %{croatia}: Contains data from the %{dgu_link} and %{open_data_portal}
+          (public information of Croatia).
+        contributors_hr_croatia: Croatia
+        contributors_hr_dgu: State Geodetic Administration of Croatia
+        contributors_hr_dgu_url: https://dgu.gov.hr/
+        contributors_hr_open_data_portal: National Open Data Portal
+        contributors_hr_open_data_portal_url: https://data.gov.hr/

         contributors_nl_credit_html: |
           %{netherlands}: Contains © AND data, 2007 (%{and_link})
         contributors_nl_netherlands: Netherlands
         contributors_nl_credit_html: |
           %{netherlands}: Contains © AND data, 2007 (%{and_link})
         contributors_nl_netherlands: Netherlands


@@ -2140,7 +2168,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


@@ -2149,13 +2177,10 @@ 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."

-      permalink: Permalink
-      shortlink: Shortlink
-      createnote: Add a note

       license:
         copyright: "Copyright OpenStreetMap and contributors, under an open license"
         license_url: "https://openstreetmap.org/copyright"
       license:
         copyright: "Copyright OpenStreetMap and contributors, under an open license"
         license_url: "https://openstreetmap.org/copyright"


@@ -2169,7 +2194,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"


@@ -2214,7 +2238,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: |


@@ -2270,10 +2294,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"


@@ -2354,6 +2376,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"


@@ -2362,7 +2387,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"


@@ -2473,8 +2497,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}"


@@ -2496,9 +2518,6 @@ en:
       trace_not_found: "Trace not found!"
       visibility: "Visibility:"
       confirm_delete: "Delete this trace?"
       trace_not_found: "Trace not found!"
       visibility: "Visibility:"
       confirm_delete: "Delete this trace?"

-    trace_paging_nav:
-      older: "Older Traces"
-      newer: "Newer Traces"

     trace:
       pending: "PENDING"
       count_points:
     trace:
       pending: "PENDING"
       count_points:


@@ -2512,8 +2531,8 @@ en:
       identifiable: "IDENTIFIABLE"
       private: "PRIVATE"
       trackable: "TRACKABLE"
       identifiable: "IDENTIFIABLE"
       private: "PRIVATE"
       trackable: "TRACKABLE"

-      by: "by"
-      in: "in"
+      details_with_tags_html: "%{time_ago} by %{user} in %{tags}"
+      details_without_tags_html: "%{time_ago} by %{user}"

     index:
       public_traces: "Public GPS Traces"
       my_gps_traces: "My GPS Traces"
     index:
       public_traces: "Public GPS Traces"
       my_gps_traces: "My GPS Traces"


@@ -2528,12 +2547,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"
     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"
       remove_tag_filter: "Remove Tag Filter"
     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:


@@ -2550,41 +2567,37 @@ en:
     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."

-    require_admin:
-      not_an_admin: You need to be an admin to perform that action.

     setup_user_auth:
       blocked_zero_hour: "You have an urgent message on the OpenStreetMap 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."
     settings_menu:
       account_settings: Account Settings
     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."
     settings_menu:
       account_settings: Account Settings

-      oauth1_settings: OAuth 1 settings

       oauth2_applications: OAuth 2 applications
       oauth2_authorizations: OAuth 2 authorizations
       muted_users: Muted Users
       oauth2_applications: OAuth 2 applications
       oauth2_authorizations: OAuth 2 authorizations
       muted_users: Muted Users

+    auth_providers:
+      openid_url: "OpenID URL"
+      openid_login_button: "Continue"
+      openid:
+        title: Log in with OpenID
+        alt: OpenID logo
+      google:
+        title: Log in with Google
+        alt: Google logo
+      facebook:
+        title: Log in with Facebook
+        alt: Facebook logo
+      microsoft:
+        title: Log in with Microsoft
+        alt: Microsoft logo
+      github:
+        title: Log in with GitHub
+        alt: GitHub logo
+      wikipedia:
+        title: Log in with Wikipedia
+        alt: Wikipedia logo

   oauth:
   oauth:

-    authorize:
-      title: "Authorize access to your account"
-      request_access_html: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
-      allow_to: "Allow the client application to:"
-      allow_read_prefs:  "read your user preferences."
-      allow_write_prefs: "modify your user preferences."
-      allow_write_diary: "create diary entries, comments and make friends."
-      allow_write_api:   "modify the map."
-      allow_read_gpx:    "read your private GPS traces."
-      allow_write_gpx:   "upload GPS traces."
-      allow_write_notes: "modify notes."
-      grant_access: "Grant Access"
-    authorize_success:
-      title: "Authorization request allowed"
-      allowed_html: "You have granted application %{app_name} access to your account."
-      verification: "The verification code is %{code}."
-    authorize_failure:
-      title: "Authorization request failed"
-      denied: "You have denied application %{app_name} access to your account."
-      invalid: "The authorization token is not valid."
-    revoke:
-      flash: "You've revoked the token for %{application}"

     permissions:
       missing: "You have not permitted the application access to this facility"
     scopes:
     permissions:
       missing: "You have not permitted the application access to this facility"
     scopes:


@@ -2598,47 +2611,11 @@ en:
       write_notes: Modify notes
       write_redactions: Redact map data
       read_email: Read user email address
       write_notes: Modify notes
       write_redactions: Redact map data
       read_email: Read user email address

+      consume_messages: Read, update status and delete user messages
+      send_messages: Send private messages to other users

       skip_authorization: Auto approve application
       skip_authorization: Auto approve application

-  oauth_clients:
-    new:
-      title: "Register a new application"
-      disabled: "Registration of OAuth 1 applications has been disabled"
-    edit:
-      title: "Edit your application"
-    show:
-      title: "OAuth details for %{app_name}"
-      key: "Consumer Key:"
-      secret: "Consumer Secret:"
-      url: "Request Token URL:"
-      access_url: "Access Token URL:"
-      authorize_url: "Authorise URL:"
-      support_notice: "We support HMAC-SHA1 (recommended) and RSA-SHA1 signatures."
-      edit: "Edit Details"
-      delete: "Delete Client"
-      confirm: "Are you sure?"
-      requests: "Requesting the following permissions from the user:"
-    index:
-      title: "My OAuth Details"
-      my_tokens: "My Authorised Applications"
-      list_tokens: "The following tokens have been issued to applications in your name:"
-      application: "Application Name"
-      issued_at: "Issued At"
-      revoke: "Revoke!"
-      my_apps: "My Client Applications"
-      no_apps_html: "Do you have an application you would like to register for use with us using the %{oauth} standard? You must register your web application before it can make OAuth requests to this service."
-      oauth: OAuth
-      registered_apps: "You have the following client applications registered:"
-      register_new: "Register your application"
-    form:
-      requests: "Request the following permissions from the user:"
-    not_found:
-      sorry: "Sorry, that %{type} could not be found."
-    create:
-      flash: "Registered the information successfully"
-    update:
-      flash: "Updated the client information successfully"
-    destroy:
-      flash: "Destroyed the client application registration"
+    for_roles:
+      moderator: This permission is for actions available only to moderators

   oauth2_applications:
     index:
       title: "My Client Applications"
   oauth2_applications:
     index:
       title: "My Client Applications"


@@ -2690,23 +2667,37 @@ en:
   users:
     new:
       title: "Sign Up"
   users:
     new:
       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.'
       support: support
       about:
       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.'
       support: support
       about:

-        header: Free and editable
+        header: Free and editable.

         paragraph_1: Unlike other maps, OpenStreetMap is completely created by people like you, and it's free for anyone to fix, update, download and use.
         paragraph_1: Unlike other maps, OpenStreetMap is completely created by people like you, and it's free for anyone to fix, update, download and use.

-        paragraph_2: Sign up to get started contributing. We'll send an email to confirm your account.
+        paragraph_2: Sign up to get started contributing.
+        welcome: "Welcome to OpenStreetMap"
+      duplicate_social_email: "If you already have an OpenStreetMap account and wish to use a 3rd party identity provider, please log in using your password and modify the settings of your account."

       display name description: "Your publicly displayed username. You can change this later in the preferences."
       display name description: "Your publicly displayed username. You can change this later in the preferences."

-      external auth: "Third Party Authentication:"
-      use external auth: "Alternatively, use a third party to login"
-      auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one."
+      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://osmfoundation.org/wiki/Privacy_Policy
+        privacy_policy_title: OSMF privacy policy including section on email addresses
+        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!"
       continue: Sign Up
       terms accepted: "Thanks for accepting the new contributor terms!"

-      email_confirmation_help_html: 'Your address is not displayed publicly, see our %{privacy_policy_link} for more information.'
-      privacy_policy: privacy policy
-      privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy
-      privacy_policy_title: OSMF privacy policy including section on email addresses
+      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"

     terms:
       title: "Terms"
       heading: "Terms"
     terms:
       title: "Terms"
       heading: "Terms"


@@ -2718,13 +2709,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:


@@ -2764,6 +2755,8 @@ en:
       remove as friend: Unfriend
       add as friend: Add Friend
       mapper since: "Mapper since:"
       remove as friend: Unfriend
       add as friend: Add Friend
       mapper since: "Mapper since:"

+      last map edit: "Last map edit:"
+      no activity yet: "No activity yet"

       uid: "User id:"
       ct status: "Contributor terms:"
       ct undecided: Undecided
       uid: "User id:"
       ct status: "Contributor terms:"
       ct undecided: Undecided


@@ -2803,14 +2796,15 @@ en:
     index:
       title: Users
       heading: Users
     index:
       title: Users
       heading: Users

-      showing:
-        one: Page %{page} (%{first_item} of %{items})
-        other: Page %{page} (%{first_item}-%{last_item} of %{items})

       summary_html: "%{name} created from %{ip_address} on %{date}"
       summary_no_ip_html: "%{name} created on %{date}"
       summary_html: "%{name} created from %{ip_address} on %{date}"
       summary_no_ip_html: "%{name} created on %{date}"

+      empty: No matching users found
+    page:
+      found_users:
+        one: "%{count} user found"
+        other: "%{count} users found"

       confirm: Confirm Selected Users
       hide: Hide Selected Users
       confirm: Confirm Selected Users
       hide: Hide Selected Users

-      empty: No matching users found

     suspended:
       title: Account Suspended
       heading: Account Suspended
     suspended:
       title: Account Suspended
       heading: Account Suspended


@@ -2830,27 +2824,19 @@ en:
         If you are new to OpenStreetMap, please create a new account
         using the form below.
       option_2: |
         If you are new to OpenStreetMap, please create a new account
         using the form below.
       option_2: |

-        If you already have an account, you can login to your account
+        If you already have an account, you can log in to your account

         using your username and password and then associate the account
         with your ID in your user settings.
   user_role:
     filter:
         using your username and password and then associate the account
         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."


@@ -2862,33 +2848,25 @@ en:
       title: "Creating block on %{name}"
       heading_html: "Creating block on %{name}"
       period: "How long, starting now, the user will be blocked from the API for."
       title: "Creating block on %{name}"
       heading_html: "Creating block on %{name}"
       period: "How long, starting now, the user will be blocked from the API for."

-      back: "View all blocks"

     edit:
       title: "Editing block on %{name}"
       heading_html: "Editing block on %{name}"
       period: "How long, starting now, the user will be blocked from the API for."
     edit:
       title: "Editing block on %{name}"
       heading_html: "Editing block on %{name}"
       period: "How long, starting now, the user will be blocked from the API for."

-      show: "View this block"
-      back: "View all blocks"
+      revoke: "Revoke block"

     filter:
     filter:

-      block_expired: "The block has already expired and cannot be edited."

       block_period: "The blocking period must be one of the values selectable in the drop-down list."
     create:
       flash: "Created a block on user %{name}."
     update:
       only_creator_can_edit: "Only the moderator who created this block can edit it."
       block_period: "The blocking period must be one of the values selectable in the drop-down list."
     create:
       flash: "Created a block on user %{name}."
     update:
       only_creator_can_edit: "Only the moderator who created this block can edit it."

+      only_creator_can_edit_without_revoking: "Only the moderator who created this block can edit it without revoking."
+      only_creator_or_revoker_can_edit: "Only the moderators who created or revoked this block can edit it."
+      inactive_block_cannot_be_reactivated: "This block is inactive and cannot be reactivated."

       success: "Block updated."
     index:
       title: "User blocks"
       heading: "List of user blocks"
       empty: "No blocks have been made yet."
       success: "Block updated."
     index:
       title: "User blocks"
       heading: "List of user blocks"
       empty: "No blocks have been made yet."

-    revoke:
-      title: "Revoking block on %{block_on}"
-      heading_html: "Revoking block on %{block_on} by %{block_by}"
-      time_future_html: "This block will end in %{time}."
-      past_html: "This block ended %{time} and cannot be revoked now."
-      confirm: "Are you sure you wish to revoke this block?"
-      revoke: "Revoke!"
-      flash: "This block has been revoked."

     revoke_all:
       title: "Revoking all blocks on %{block_on}"
       heading_html: "Revoking all blocks on %{block_on}"
     revoke_all:
       title: "Revoking all blocks on %{block_on}"
       heading_html: "Revoking all blocks on %{block_on}"


@@ -2920,6 +2898,15 @@ en:
         years:
           one: "%{count} year"
           other: "%{count} years"
         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}"
     blocks_on:
       title: "Blocks on %{name}"
       heading_html: "List of Blocks on %{name}"


@@ -2934,28 +2921,27 @@ en:
       created: "Created:"
       duration: "Duration:"
       status: "Status:"
       created: "Created:"
       duration: "Duration:"
       status: "Status:"

-      show: "Show"

       edit: "Edit"
       edit: "Edit"

-      revoke: "Revoke!"
-      confirm: "Are you sure?"

       reason: "Reason for block:"
       reason: "Reason for block:"

-      back: "View all blocks"

       revoker: "Revoker:"
       revoker: "Revoker:"

-      needs_view: "The user needs to log in before this block will be cleared."

     block:
     block:

-      not_revoked: "(not revoked)"

       show: "Show"
       edit: "Edit"
       show: "Show"
       edit: "Edit"

-      revoke: "Revoke!"
-    blocks:
+    page:

       display_name: "Blocked User"
       creator_name: "Creator"
       reason: "Reason for block"
       display_name: "Blocked User"
       creator_name: "Creator"
       reason: "Reason for block"

+      start: "Start"
+      end: "End"

       status: "Status"
       status: "Status"

-      revoker_name: "Revoked by"
-      showing_page: "Page %{page}"
-      next: "Next »"
-      previous: "« Previous"
+    navigation:
+      all_blocks: "All Blocks"
+      blocks_on_me: "Blocks on Me"
+      blocks_on_user_html: "Blocks on %{user}"
+      blocks_by_me: "Blocks by Me"
+      blocks_by_user_html: "Blocks by %{user}"
+      block: "Block #%{id}"
+      new_block: "New Block"

   user_mutes:
     index:
       title: "Muted Users"
   user_mutes:
     index:
       title: "Muted Users"


@@ -2992,6 +2978,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"


@@ -3010,6 +3001,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


@@ -3023,8 +3017,15 @@ en:
     new:
       title: "New Note"
       intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem."
     new:
       title: "New Note"
       intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem."

+      anonymous_warning_html: "You are not logged in. Please %{log_in} or %{sign_up} if you want to receive updates for your note."
+      anonymous_warning_log_in: "log in"
+      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
       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:


@@ -3039,14 +3040,14 @@ en:
       custom_dimensions: "Set custom dimensions"
       format: "Format:"
       scale: "Scale:"
       custom_dimensions: "Set custom dimensions"
       format: "Format:"
       scale: "Scale:"

-      image_dimensions: "Image will show standard layer at %{width} x %{height}"
+      image_dimensions: "Image will show the %{layer} layer at %{width} x %{height}"

       download: "Download"
       short_url: "Short URL"
       include_marker: "Include marker"
       center_marker: "Center map on marker"
       paste_html: "Paste HTML to embed in website"
       view_larger_map: "View Larger Map"
       download: "Download"
       short_url: "Short URL"
       include_marker: "Include marker"
       center_marker: "Center map on marker"
       paste_html: "Paste HTML to embed in website"
       view_larger_map: "View Larger Map"

-      only_standard_layer: "Only the standard layer can be exported as an image"
+      only_standard_layer: "Only the Standard, Cycle Map and Transport layers can be exported as an image"

     embed:
       report_problem: "Report a problem"
     key:
     embed:
       report_problem: "Report a problem"
     key:


@@ -3102,13 +3103,6 @@ en:
       queryfeature_tooltip: Query features
       queryfeature_disabled_tooltip: Zoom in to query features
       embed_html_disabled: HTML embedding is not available for this map layer
       queryfeature_tooltip: Query features
       queryfeature_disabled_tooltip: Zoom in to query features
       embed_html_disabled: HTML embedding is not available for this map layer

-    changesets:
-      show:
-        comment: "Comment"
-        subscribe: "Subscribe"
-        unsubscribe: "Unsubscribe"
-        hide_comment: "hide"
-        unhide_comment: "unhide"

     edit_help: Move the map and zoom in on a location you want to edit, then click here.
     directions:
       ascend: "Ascend"
     edit_help: Move the map and zoom in on a location you want to edit, then click here.
     directions:
       ascend: "Ascend"


@@ -3173,16 +3167,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:


@@ -3219,6 +3213,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"