Merge pull request #4988 from nenad-vujicic/issue_4912_pr_labeling

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0a9ca998010d2423b3a9fc6f8cec044f4776e787..425983318cbd28c7609d935dafe02af475dce851 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -5,6 +5,8 @@ en:
     formats:
       friendly: "%e %B %Y at %H:%M"
       blog: "%e %B %Y"
     formats:
       friendly: "%e %B %Y at %H:%M"
       blog: "%e %B %Y"

+  count:
+    at_least_pattern: "%{count}+"

   helpers:
     file:
       prompt: Choose file
   helpers:
     file:
       prompt: Choose file


@@ -36,8 +38,13 @@ 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:
+          attributes:
+            subject:
+              format: "%{message}"
+          is_already_muted: "is already muted"

     # Translates all the model names, which is used in error handling on the website
     models:
       acl: "Access Control List"
     # Translates all the model names, which is used in error handling on the website
     models:
       acl: "Access Control List"


@@ -115,7 +122,7 @@ en:
         longitude: "Longitude"
         public: "Public"
         description: "Description"
         longitude: "Longitude"
         public: "Public"
         description: "Description"

-        gpx_file: Upload GPX File
+        gpx_file: Choose GPS Trace File

         visibility: Visibility
         tagstring: Tags
       message:
         visibility: Visibility
         tagstring: Tags
       message:


@@ -133,7 +140,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"


@@ -154,7 +160,6 @@ en:
         reason: The reason why the user is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use layman's terms.
         needs_view: Does the user need to log in before this block will be cleared?
       user:
         reason: The reason why the user is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use layman's terms.
         needs_view: Does the user need to log in before this block will be cleared?
       user:

-        email_confirmation: 'Your address is not displayed publicly, see our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information.'

         new_email: "(never displayed publicly)"
   datetime:
     distance_in_words_ago:
         new_email: "(never displayed publicly)"
   datetime:
     distance_in_words_ago:


@@ -196,9 +201,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:


@@ -213,7 +218,7 @@ en:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live
+      microsoft: Microsoft

       github: GitHub
       wikipedia: Wikipedia
   api:
       github: GitHub
       wikipedia: Wikipedia
   api:


@@ -229,6 +234,7 @@ en:
         reopened_at_by_html: "Reactivated %{when} by %{user}"
       rss:
         title: "OpenStreetMap Notes"
         reopened_at_by_html: "Reactivated %{when} by %{user}"
       rss:
         title: "OpenStreetMap Notes"

+        description_all: "A list of reported, commented on or closed notes"

         description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]"
         description_item: "An rss feed for note %{id}"
         opened: "new note (near %{place})"
         description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]"
         description_item: "An rss feed for note %{id}"
         opened: "new note (near %{place})"


@@ -254,6 +260,7 @@ en:
         retain_notes: Your map notes and note comments, if any, will be retained but hidden from view.
         retain_changeset_discussions: Your changeset discussions, if any, will be retained.
         retain_email: Your email address will be retained.
         retain_notes: Your map notes and note comments, if any, will be retained but hidden from view.
         retain_changeset_discussions: Your changeset discussions, if any, will be retained.
         retain_email: Your email address will be retained.

+        recent_editing_html: "As you have edited recently your account cannot currently be deleted. Deletion will be possible in %{time}."

         confirm_delete: Are you sure?
         cancel: Cancel
   accounts:
         confirm_delete: Are you sure?
         cancel: Cancel
   accounts:


@@ -298,15 +305,10 @@ en:
     destroy:
       success: "Account Deleted."
   browse:
     destroy:
       success: "Account Deleted."
   browse:

-    created: "Created"
-    closed: "Closed"
-    created_html: "Created <abbr title='%{title}'>%{time}</abbr>"
-    closed_html: "Closed <abbr title='%{title}'>%{time}</abbr>"
-    created_by_html: "Created <abbr title='%{title}'>%{time}</abbr> by %{user}"
-    deleted_by_html: "Deleted <abbr title='%{title}'>%{time}</abbr> by %{user}"
-    edited_by_html: "Edited <abbr title='%{title}'>%{time}</abbr> by %{user}"
-    closed_by_html: "Closed <abbr title='%{title}'>%{time}</abbr> by %{user}"
+    deleted_ago_by_html: "Deleted %{time_ago} by %{user}"
+    edited_ago_by_html: "Edited %{time_ago} by %{user}"

     version: "Version"
     version: "Version"

+    redacted_version: "Redacted Version"

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


@@ -319,30 +321,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})"
-      comment: "Comments (%{count})"
-      hidden_commented_by_html: "Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      commented_by_html: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      changesetxml: "Changeset XML"
-      osmchangexml: "osmChange XML"
-      feed:
-        title: "Changeset %{id}"
-        title_comment: "Changeset %{id} - %{comment}"
-      join_discussion: "Log in to join the discussion"
-      discussion: Discussion
-      still_open: "Changeset still open - discussion will open once the changeset is closed."

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


@@ -351,6 +336,7 @@ en:
       history_title_html: "Way History: %{name}"
       nodes: "Nodes"
       nodes_count:
       history_title_html: "Way History: %{name}"
       nodes: "Nodes"
       nodes_count:

+        one: "%{count} node"

         other: "%{count} nodes"
       also_part_of_html:
         one: "part of way %{related_ways}"
         other: "%{count} nodes"
       also_part_of_html:
         one: "part of way %{related_ways}"


@@ -383,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


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


@@ -417,21 +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."
+    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."
+    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."
+    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}"


@@ -445,23 +454,58 @@ en:
       no_more_area: "No more changesets in this area."
       no_more_user: "No more changesets by this user."
       load_more: "Load more"
       no_more_area: "No more changesets in this area."
       no_more_user: "No more changesets by this user."
       load_more: "Load more"

+      feed:
+        title: "Changeset %{id}"
+        title_comment: "Changeset %{id} - %{comment}"
+        created: "Created"
+        closed: "Closed"
+        belongs_to: "Author"
+    subscribe:
+      heading: Subscribe to the following changeset discussion?
+      button: Subscribe to discussion
+    unsubscribe:
+      heading: Unsubscribe from the following changeset discussion?
+      button: Unsubscribe from discussion
+    heading:
+      title: "Changeset %{id}"
+      created_by_html: "Created by %{link_user} on %{created}."
+    no_such_entry:
+      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"
       m away: "%{count}m away"
   dashboards:
     contact:
       km away: "%{count}km away"
       m away: "%{count}m away"

+      latest_edit_html: "Latest edit (%{ago}):"

     popup:
       your location: "Your location"
       nearby mapper: "Nearby mapper"
     popup:
       your location: "Your location"
       nearby mapper: "Nearby mapper"


@@ -494,18 +538,20 @@ 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
     show:
       title: "%{user}'s Diary | %{title}"
       user_title: "%{user}'s Diary"
     edit:
       title: Edit Diary Entry
       marker_text: Diary entry location
     show:
       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}"


@@ -516,9 +562,9 @@ en:
       comment_link: Comment on this entry
       reply_link: Send a message to the author
       comment_count:
       comment_link: Comment on this entry
       reply_link: Send a message to the author
       comment_count:

-        zero: No comments

         one: "%{count} comment"
         other: "%{count} comments"
         one: "%{count} comment"
         other: "%{count} comments"

+      no_comments: No comments

       edit_link: Edit this entry
       hide_link: Hide this entry
       unhide_link: Unhide this entry
       edit_link: Edit this entry
       hide_link: Hide this entry
       unhide_link: Unhide this entry


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


@@ -545,27 +589,59 @@ 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:
   doorkeeper:

+    errors:
+      messages:
+        account_selection_required: "The authorization server requires end-user account selection"
+        consent_required: "The authorization server requires end-user consent"
+        interaction_required: "The authorization server requires end-user interaction"
+        login_required: "The authorization server requires end-user authentication"

     flash:
       applications:
         create:
           notice: Application Registered.
     flash:
       applications:
         create:
           notice: Application Registered.

+    openid_connect:
+      errors:
+        messages:
+          # Configuration error messages
+          auth_time_from_resource_owner_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.auth_time_from_resource_owner missing configuration."
+          reauthenticate_resource_owner_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.reauthenticate_resource_owner missing configuration."
+          resource_owner_from_access_token_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.resource_owner_from_access_token missing configuration."
+          select_account_for_resource_owner_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.select_account_for_resource_owner missing configuration."
+          subject_not_configured: "ID Token generation failed due to Doorkeeper::OpenidConnect.configure.subject missing configuration."
+    scopes:
+      address: "View your physical address"
+      email: "View your email address"
+      openid: "Authenticate your account"
+      phone: "View your phone number"
+      profile: "View your profile information"

   errors:
     contact:
       contact_url: https://wiki.openstreetmap.org/wiki/Contact
       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.
   errors:
     contact:
       contact_url: https://wiki.openstreetmap.org/wiki/Contact
       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)


@@ -591,9 +667,9 @@ en:
   geocoder:
     search:
       title:
   geocoder:
     search:
       title:

-        latlon_html: 'Results from <a href="https://openstreetmap.org/">Internal</a>'
-        osm_nominatim_html: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
-        osm_nominatim_reverse_html: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
+        latlon: Internal
+        osm_nominatim: OpenStreetMap Nominatim
+        osm_nominatim_reverse: OpenStreetMap Nominatim

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


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


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


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


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


@@ -1400,12 +1479,12 @@ en:
     show:
       title: "%{status} Issue #%{issue_id}"
       reports:
     show:
       title: "%{status} Issue #%{issue_id}"
       reports:

-        zero: No reports

         one: "%{count} report"
         other: "%{count} reports"
         one: "%{count} report"
         other: "%{count} reports"

-      report_created_at: "First reported at %{datetime}"
-      last_resolved_at: "Last resolved at %{datetime}"
-      last_updated_at: "Last updated at %{datetime} by %{displayname}"
+      no_reports: No reports
+      report_created_at_html: "First reported at %{datetime}"
+      last_resolved_at_html: "Last resolved at %{datetime}"
+      last_updated_at_html: "Last updated at %{datetime} by %{displayname}"

       resolve: Resolve
       ignore: Ignore
       reopen: Reopen
       resolve: Resolve
       ignore: Ignore
       reopen: Reopen


@@ -1485,46 +1564,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},"


@@ -1541,11 +1610,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"


@@ -1554,6 +1626,9 @@ 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:
       subject: "[OpenStreetMap] Welcome to OpenStreetMap"
       subject: "[OpenStreetMap] GPX Import success"
     signup_confirm:
       subject: "[OpenStreetMap] Welcome to OpenStreetMap"


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

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

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


@@ -1595,11 +1671,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"


@@ -1610,10 +1686,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!


@@ -1643,8 +1719,6 @@ en:
   messages:
     inbox:
       title: "Inbox"
   messages:
     inbox:
       title: "Inbox"

-      my_inbox: "My Inbox"
-      my_outbox: "My Outbox"

       messages: "You have %{new_messages} and %{old_messages}"
       new_messages:
         one: "%{count} new message"
       messages: "You have %{new_messages} and %{old_messages}"
       new_messages:
         one: "%{count} new message"


@@ -1652,16 +1726,19 @@ en:
       old_messages:
         one: "%{count} old message"
         other: "%{count} old messages"
       old_messages:
         one: "%{count} old message"
         other: "%{count} old messages"

+      no_messages_yet_html: "You have no messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?"
+      people_mapping_nearby: "people mapping nearby"
+    messages_table:

       from: "From"
       from: "From"

+      to: "To"

       subject: "Subject"
       date: "Date"
       subject: "Subject"
       date: "Date"

-      no_messages_yet_html: "You have no messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?"
-      people_mapping_nearby: "people mapping nearby"
+      actions: "Actions"

     message_summary:
       unread_button: "Mark as unread"
       read_button: "Mark as read"
     message_summary:
       unread_button: "Mark as unread"
       read_button: "Mark as read"

-      reply_button: "Reply"

       destroy_button: "Delete"
       destroy_button: "Delete"

+      unmute_button: "Move to Inbox"

     new:
       title: "Send message"
       send_message_to_html: "Send a new message to %{name}"
     new:
       title: "Send message"
       send_message_to_html: "Send a new message to %{name}"


@@ -1675,45 +1752,54 @@ en:
       body: "Sorry there is no message with that id."
     outbox:
       title: "Outbox"
       body: "Sorry there is no message with that id."
     outbox:
       title: "Outbox"

-      my_inbox: "My Inbox"
-      my_outbox: "My Outbox"

       messages:
         one: "You have %{count} sent message"
         other: "You have %{count} sent messages"
       messages:
         one: "You have %{count} sent message"
         other: "You have %{count} sent messages"

-      to: "To"
-      subject: "Subject"
-      date: "Date"

       no_sent_messages_html: "You have no sent messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?"
       people_mapping_nearby: "people mapping nearby"
       no_sent_messages_html: "You have no sent messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?"
       people_mapping_nearby: "people mapping nearby"

+    muted:
+      title: "Muted Messages"
+      messages:
+        one: "%{count} muted message"
+        other: "You have %{count} muted messages"

     reply:
     reply:

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

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

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

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

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

     mark:
       as_read: "Message marked as read"
       as_unread: "Message marked as unread"
     mark:
       as_read: "Message marked as read"
       as_unread: "Message marked as unread"

+    unmute:
+      notice: "Message has been moved to Inbox"
+      error: "The message could not be moved to the Inbox."

     destroy:
       destroyed: "Message deleted"
   passwords:
     destroy:
       destroyed: "Message deleted"
   passwords:

-    lost_password:
+    new:

       title: "Lost password"
       heading: "Forgotten Password?"
       title: "Lost password"
       heading: "Forgotten Password?"

-      email address: "Email Address:"
+      email address: "Email Address"

       new password button: "Reset password"
       help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."
       new password button: "Reset password"
       help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."

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

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

+      flash token bad: "Did not find that token, check the URL maybe?"
+    update:

       flash changed: "Your password has been changed."
       flash token bad: "Did not find that token, check the URL maybe?"
   preferences:
       flash changed: "Your password has been changed."
       flash token bad: "Did not find that token, check the URL maybe?"
   preferences:


@@ -1750,49 +1836,24 @@ en:
       home location: "Home Location"
       no home location: "You have not entered your home location."
       update home location on click: "Update home location when I click on the map?"
       home location: "Home Location"
       no home location: "You have not entered your home location."
       update home location on click: "Update home location when I click on the map?"

+      show: "Show"
+      delete: "Delete"
+      undelete: "Undo delete"

     update:
       success: Profile updated.
       failure: Couldn't update profile.
   sessions:
     new:
     update:
       success: Profile updated.
       failure: Couldn't update profile.
   sessions:
     new:

-      title: "Login"
-      heading: "Login"
-      email or username: "Email Address or Username:"
-      password: "Password:"
-      openid_html: "%{logo} OpenID:"
+      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"

       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
-        windowslive:
-          title: Login with Windows Live
-          alt: Login with a Windows Live 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"


@@ -1818,12 +1879,32 @@ en:
       image: Image
       alt: Alt text
       url: URL
       image: Image
       alt: Alt text
       url: URL

+      codeblock: Code block

     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: "&copy;"
       used_by_html: "%{name} provides map data for thousands of websites, mobile apps, and hardware devices"
       heading_html: "%{copyright}OpenStreetMap %{br} contributors"
       copyright_symbol_html: "&copy;"
       used_by_html: "%{name} provides map data for thousands of websites, mobile apps, and hardware devices"


@@ -1884,6 +1965,7 @@ en:
       legal_2_2_registered_trademarks_url: https://wiki.osmfoundation.org/wiki/Trademark_Policy
       partners_title: Partners
     copyright:
       legal_2_2_registered_trademarks_url: https://wiki.osmfoundation.org/wiki/Trademark_Policy
       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


@@ -1894,7 +1976,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).


@@ -1972,7 +2053,7 @@ en:
         contributors_at_land_vorarlberg: Land Vorarlberg
         contributors_at_land_vorarlberg_url: https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm
         contributors_at_cc_by_at_with_amendments: CC BY AT with amendments
         contributors_at_land_vorarlberg: Land Vorarlberg
         contributors_at_land_vorarlberg_url: https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm
         contributors_at_cc_by_at_with_amendments: CC BY AT with amendments

-        contributors_at_cc_by_at_with_amendments_url: https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/
+        contributors_at_cc_by_at_with_amendments_url: https://www.tirol.gv.at/data/nutzungsbedingungen/

         contributors_au_credit_html: |
           %{australia}: Incorporates or developed using Administrative Boundaries &copy; %{geoscape_australia_link}
           licensed by the Commonwealth of Australia under %{cc_licence_link}.
         contributors_au_credit_html: |
           %{australia}: Incorporates or developed using Administrative Boundaries &copy; %{geoscape_australia_link}
           licensed by the Commonwealth of Australia under %{cc_licence_link}.


@@ -1988,6 +2069,12 @@ en:
           Resources Canada), and StatCan (Geography Division,
           Statistics Canada).
         contributors_ca_canada: Canada
           Resources Canada), and StatCan (Geography Division,
           Statistics Canada).
         contributors_ca_canada: Canada

+        contributors_cz_credit_html: |
+          %{czechia}: Contains data from the State Administration of Land Surveying
+          and Cadastre licensed under %{cc_licence_link}
+        contributors_cz_czechia: Czechia
+        contributors_cz_cc_licence: Creative Commons Attribution 4.0 International licence (CC BY 4.0)
+        contributors_cz_cc_licence_url: https://creativecommons.org/licenses/by/4.0/

         contributors_fi_credit_html: |
           %{finland}: Contains data from the
           National Land Survey of Finland's Topographic Database
         contributors_fi_credit_html: |
           %{finland}: Contains data from the
           National Land Survey of Finland's Topographic Database


@@ -1999,6 +2086,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 &copy; AND data, 2007 (%{and_link})
         contributors_nl_netherlands: Netherlands
         contributors_nl_credit_html: |
           %{netherlands}: Contains &copy; AND data, 2007 (%{and_link})
         contributors_nl_netherlands: Netherlands


@@ -2012,14 +2107,22 @@ en:
         contributors_nz_linz_data_service_url: https://data.linz.govt.nz/
         contributors_nz_cc_by: CC BY 4.0
         contributors_nz_cc_by_url: https://creativecommons.org/licenses/by/4.0/
         contributors_nz_linz_data_service_url: https://data.linz.govt.nz/
         contributors_nz_cc_by: CC BY 4.0
         contributors_nz_cc_by_url: https://creativecommons.org/licenses/by/4.0/

+        contributors_rs_credit_html: |
+          %{serbia}: Contains data from the %{rgz_link} and %{open_data_portal}
+          (public information of Serbia), 2018.
+        contributors_rs_serbia: Serbia
+        contributors_rs_rgz: Serbian Geodetic Authority
+        contributors_rs_rgz_url: https://geosrbija.rs/
+        contributors_rs_open_data_portal: National Open Data Portal
+        contributors_rs_open_data_portal_url: https://data.gov.rs/sr/

         contributors_si_credit_html: |
           %{slovenia}: Contains data from the %{gu_link} and %{mkgp_link}
           (public information of Slovenia).
         contributors_si_slovenia: Slovenia
         contributors_si_gu: Surveying and Mapping Authority
         contributors_si_credit_html: |
           %{slovenia}: Contains data from the %{gu_link} and %{mkgp_link}
           (public information of Slovenia).
         contributors_si_slovenia: Slovenia
         contributors_si_gu: Surveying and Mapping Authority

-        contributors_si_gu_url: http://www.gu.gov.si/en/
+        contributors_si_gu_url: https://www.gov.si/en/state-authorities/bodies-within-ministries/surveying-and-mapping-authority/

         contributors_si_mkgp: Ministry of Agriculture, Forestry and Food
         contributors_si_mkgp: Ministry of Agriculture, Forestry and Food

-        contributors_si_mkgp_url: http://www.mkgp.gov.si/en/
+        contributors_si_mkgp_url: https://www.gov.si/en/state-authorities/ministries/ministry-of-agriculture-forestry-and-food/

         contributors_es_credit_html: |
           %{spain}: Contains data sourced from the
           Spanish National Geographic Institute (%{ign_link}) and
         contributors_es_credit_html: |
           %{spain}: Contains data sourced from the
           Spanish National Geographic Institute (%{ign_link}) and


@@ -2027,16 +2130,16 @@ en:
           licensed for reuse under %{cc_by_link}.
         contributors_es_spain: Spain
         contributors_es_ign: IGN
           licensed for reuse under %{cc_by_link}.
         contributors_es_spain: Spain
         contributors_es_ign: IGN

-        contributors_es_ign_url: http://www.ign.es/
+        contributors_es_ign_url: https://www.ign.es/

         contributors_es_scne: SCNE
         contributors_es_scne: SCNE

-        contributors_es_scne_url: http://www.scne.es/
+        contributors_es_scne_url: https://www.scne.es/

         contributors_es_cc_by: CC BY 4.0
         contributors_es_cc_by_url: https://creativecommons.org/licenses/by/4.0/
         contributors_za_credit_html: |
           %{south_africa}: Contains data sourced from %{ngi_link}, State copyright reserved.
         contributors_za_south_africa: South Africa
         contributors_za_ngi: "Chief Directorate: National Geo-Spatial Information"
         contributors_es_cc_by: CC BY 4.0
         contributors_es_cc_by_url: https://creativecommons.org/licenses/by/4.0/
         contributors_za_credit_html: |
           %{south_africa}: Contains data sourced from %{ngi_link}, State copyright reserved.
         contributors_za_south_africa: South Africa
         contributors_za_ngi: "Chief Directorate: National Geo-Spatial Information"

-        contributors_za_ngi_url: http://www.ngi.gov.za/
+        contributors_za_ngi_url: https://ngi.dalrrd.gov.za/

         contributors_gb_credit_html: |
           %{united_kingdom}: Contains Ordnance
           Survey data &copy; Crown copyright and database right
         contributors_gb_credit_html: |
           %{united_kingdom}: Contains Ordnance
           Survey data &copy; Crown copyright and database right


@@ -2075,9 +2178,6 @@ en:
     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"


@@ -2091,15 +2191,9 @@ 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"
     export:
       title: "Export"

-      area_to_export: "Area to Export"

       manually_select: "Manually select a different area"
       manually_select: "Manually select a different area"

-      format_to_export: "Format to Export"
-      osm_xml_data: "OpenStreetMap XML Data"
-      map_image: "Map Image (shows standard layer)"
-      embeddable_html: "Embeddable HTML"

       licence: "Licence"
       licence_details_html: OpenStreetMap data is licensed under the %{odbl_link} (ODbL).
       odbl: Open Data Commons Open Database License
       licence: "Licence"
       licence_details_html: OpenStreetMap data is licensed under the %{odbl_link} (ODbL).
       odbl: Open Data Commons Open Database License


@@ -2119,17 +2213,6 @@ en:
         other:
           title: "Other Sources"
           description: "Additional sources listed on the OpenStreetMap Wiki"
         other:
           title: "Other Sources"
           description: "Additional sources listed on the OpenStreetMap Wiki"

-      options: "Options"
-      format: "Format"
-      scale: "Scale"
-      max: "max"
-      image_size: "Image Size"
-      zoom: "Zoom"
-      add_marker: "Add a marker to the map"
-      latitude: "Lat:"
-      longitude: "Lon:"
-      output: "Output"
-      paste_html: "Paste HTML to embed in website"

       export_button: "Export"
     fixthemap:
       title: Report a problem / Fix the map
       export_button: "Export"
     fixthemap:
       title: Report a problem / Fix the map


@@ -2141,8 +2224,8 @@ en:
             If you have noticed a problem with our map data, for example a road is missing or your address, the best way to
             proceed is to join the OpenStreetMap community and add or repair the data yourself.
         add_a_note:
             If you have noticed a problem with our map data, for example a road is missing or your address, the best way to
             proceed is to join the OpenStreetMap community and add or repair the data yourself.
         add_a_note:

-          instructions_html: |
-            Just click <a class='icon note'></a> or the same icon on the map display.
+          instructions_1_html: |
+            Just click %{note_icon} or the same icon on the map display.

             This will add a marker to the map, which you can move
             by dragging. Add your message, then click save, and other mappers will investigate.
       other_concerns:
             This will add a marker to the map, which you can move
             by dragging. Add your message, then click save, and other mappers will investigate.
       other_concerns:


@@ -2166,18 +2249,14 @@ en:
         url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
         title: Beginners' Guide
         description: Community maintained guide for beginners.
         url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
         title: Beginners' Guide
         description: Community maintained guide for beginners.

-      help:
-        url: https://help.openstreetmap.org/
-        title: Help Forum
-        description: Ask a question or look up answers on OpenStreetMap's question-and-answer site.
+      community:
+        url: https://community.openstreetmap.org/
+        title: Help & Community Forum
+        description: A shared place for to seek help and have conversations about OpenStreetMap.

       mailing_lists:
         url: https://lists.openstreetmap.org/
         title: Mailing Lists
         description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists.
       mailing_lists:
         url: https://lists.openstreetmap.org/
         title: Mailing Lists
         description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists.

-      community:
-        url: https://community.openstreetmap.org/
-        title: Community forum
-        description: A shared place for conversations about OpenStreetMap.

       irc:
         url: https://irc.openstreetmap.org/
         title: IRC
       irc:
         url: https://irc.openstreetmap.org/
         title: IRC


@@ -2212,10 +2291,8 @@ en:
       welcome_mat_url: https://welcome.openstreetmap.org/
     sidebar:
       search_results: Search Results
       welcome_mat_url: https://welcome.openstreetmap.org/
     sidebar:
       search_results: Search Results

-      close: Close

     search:
       search: Search
     search:
       search: Search

-      get_directions: "Get directions"

       get_directions_title: "Find directions between two points"
       from: "From"
       to: "To"
       get_directions_title: "Find directions between two points"
       from: "From"
       to: "To"


@@ -2232,67 +2309,85 @@ en:
           primary: "Primary road"
           secondary: "Secondary road"
           unclassified: "Unclassified road"
           primary: "Primary road"
           secondary: "Secondary road"
           unclassified: "Unclassified road"

+          pedestrian: "Pedestrian way"

           track: "Track"
           bridleway: "Bridleway"
           cycleway: "Cycleway"
           cycleway_national: "National cycleway"
           cycleway_regional: "Regional cycleway"
           cycleway_local: "Local cycleway"
           track: "Track"
           bridleway: "Bridleway"
           cycleway: "Cycleway"
           cycleway_national: "National cycleway"
           cycleway_regional: "Regional cycleway"
           cycleway_local: "Local cycleway"

+          cycleway_mtb: "Mountain bike route"

           footway: "Footway"
           rail: "Railway"
           footway: "Footway"
           rail: "Railway"

+          train: "Train"

           subway: "Subway"
           subway: "Subway"

-          tram:
-            - Light rail
-            - tram
-          cable:
-            - Cable car
-            - chair lift
-          runway:
-            - Airport Runway
-            - taxiway
-          apron:
-            - Airport apron
-            - terminal
+          ferry: "Ferry"
+          light_rail: "Light rail"
+          tram: "Tram"
+          trolleybus: "Trolleybus"
+          bus: "Bus"
+          cable_car: "Cable car"
+          chair_lift: "Chair lift"
+          runway: "Airport Runway"
+          taxiway: "Taxiway"
+          apron: "Airport apron"

           admin: "Administrative boundary"
           admin: "Administrative boundary"

+          capital: "Capital"
+          city: "City"
+          orchard: "Orchard"
+          vineyard: "Vineyard"

           forest: "Forest"
           wood: "Wood"
           forest: "Forest"
           wood: "Wood"

+          farmland: "Farmland"
+          grass: "Grass"
+          meadow: "Meadow"
+          bare_rock: "Bare rock"
+          sand: "Sand"

           golf: "Golf course"
           park: "Park"
           golf: "Golf course"
           park: "Park"

+          common: "Common"
+          built_up: "Built-up area"

           resident: "Residential area"
           resident: "Residential area"

-          common:
-            - Common
-            - meadow
-            - garden

           retail: "Retail area"
           industrial: "Industrial area"
           commercial: "Commercial area"
           heathland: "Heathland"
           retail: "Retail area"
           industrial: "Industrial area"
           commercial: "Commercial area"
           heathland: "Heathland"

-          lake:
-            - Lake
-            - reservoir
+          scrubland: "Scrubland"
+          lake: "Lake"
+          reservoir: "Reservoir"
+          intermittent_water: "Intermittent waterbody"
+          glacier: "Glacier"
+          reef: "Reef"
+          wetland: "Wetland"

           farm: "Farm"
           brownfield: "Brownfield site"
           cemetery: "Cemetery"
           allotments: "Allotments"
           pitch: "Sports pitch"
           centre: "Sports centre"
           farm: "Farm"
           brownfield: "Brownfield site"
           cemetery: "Cemetery"
           allotments: "Allotments"
           pitch: "Sports pitch"
           centre: "Sports centre"

+          beach: "Beach"

           reserve: "Nature reserve"
           military: "Military area"
           reserve: "Nature reserve"
           military: "Military area"

-          school:
-            - School
-            - university
+          school: "School"
+          university: "University"
+          hospital: "Hospital"

           building: "Significant building"
           station: "Railway station"
           building: "Significant building"
           station: "Railway station"

-          summit:
-            - Summit
-            - peak
+          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"
           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_shop: "Bicycle shop"

+          bicycle_rental: "Bicycle rental"

           bicycle_parking: "Bicycle parking"
           bicycle_parking: "Bicycle parking"

+          bicycle_parking_small: "Small bicycle parking"

           toilets: "Toilets"
     welcome:
       title: Welcome!
           toilets: "Toilets"
     welcome:
       title: Welcome!


@@ -2336,6 +2431,7 @@ en:
         automated_edits: Automated Edits
         automated_edits_url: https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct
       start_mapping: Start Mapping
         automated_edits: Automated Edits
         automated_edits_url: https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct
       start_mapping: Start Mapping

+      continue_authorization: Continue Authorization

       add_a_note:
         title: No Time To Edit? Add a Note!
         para_1: |
       add_a_note:
         title: No Time To Edit? Add a Note!
         para_1: |


@@ -2398,8 +2494,6 @@ en:
       visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
     update:
       updated: Trace updated
       visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
     update:
       updated: Trace updated

-    trace_optionals:
-      tags: "Tags"

     show:
       title: "Viewing Trace %{name}"
       heading: "Viewing Trace %{name}"
     show:
       title: "Viewing Trace %{name}"
       heading: "Viewing Trace %{name}"


@@ -2421,10 +2515,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:
-      showing_page: "Page %{page}"
-      older: "Older Traces"
-      newer: "Newer Traces"

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


@@ -2438,8 +2528,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"


@@ -2458,8 +2548,6 @@ en:
       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:


@@ -2476,43 +2564,41 @@ 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
       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:

+      openid: Sign-in using OpenStreetMap

       read_prefs: Read user preferences
       write_prefs: Modify user preferences
       write_diary: Create diary entries, comments and make friends
       read_prefs: Read user preferences
       write_prefs: Modify user preferences
       write_diary: Create diary entries, comments and make friends


@@ -2520,47 +2606,13 @@ en:
       read_gpx: Read private GPS traces
       write_gpx: Upload GPS traces
       write_notes: Modify notes
       read_gpx: Read private GPS traces
       write_gpx: Upload GPS traces
       write_notes: Modify notes

+      write_redactions: Redact map data

       read_email: Read user email address
       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"
-    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"


@@ -2603,26 +2655,46 @@ en:
       title: "My Authorized Applications"
       application: "Application"
       permissions: "Permissions"
       title: "My Authorized Applications"
       application: "Application"
       permissions: "Permissions"

+      last_authorized: "Last Authorized"

       no_applications_html: "You have not yet authorized any %{oauth2} applications."
       no_applications_html: "You have not yet authorized any %{oauth2} applications."

+      oauth_2: "OAuth 2"

     application:
       revoke: "Revoke Access"
       confirm_revoke: "Revoke access for this application?"
   users:
     new:
       title: "Sign Up"
     application:
       revoke: "Revoke Access"
       confirm_revoke: "Revoke access for this application?"
   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://wiki.osmfoundation.org/wiki/Privacy_Policy
+        privacy_policy_title: OSMF privacy policy including section on email addresses
+        contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
+        contributor_terms: "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_help:
+        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
+        html: 'Your address is not displayed publicly, see our %{privacy_policy_link} for more information.'
+      consider_pd_html: "I consider my contributions to be in the %{consider_pd_link}."
+      consider_pd: "public domain"
+      consider_pd_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
+      or: "or"
+      use external auth: "or sign up with a third party"

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


@@ -2638,9 +2710,9 @@ en:
       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:


@@ -2669,6 +2741,8 @@ en:
       my_dashboard: My Dashboard
       blocks on me: Blocks on Me
       blocks by me: Blocks by Me
       my_dashboard: My Dashboard
       blocks on me: Blocks on Me
       blocks by me: Blocks by Me

+      create_mute: Mute this User
+      destroy_mute: Unmute this User

       edit_profile: Edit Profile
       send message: Send Message
       diary: Diary
       edit_profile: Edit Profile
       send message: Send Message
       diary: Diary


@@ -2678,10 +2752,12 @@ 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
       ct declined: Declined
       ct status: "Contributor terms:"
       ct undecided: Undecided
       ct declined: Declined

-      latest edit: "Latest edit (%{ago}):"

       email address: "Email address:"
       created from: "Created from:"
       status: "Status:"
       email address: "Email address:"
       created from: "Created from:"
       status: "Status:"


@@ -2689,14 +2765,18 @@ en:
       role:
         administrator: "This user is an administrator"
         moderator: "This user is a moderator"
       role:
         administrator: "This user is an administrator"
         moderator: "This user is a moderator"

+        importer: "This user is a importer"

         grant:
           administrator: "Grant administrator access"
           moderator: "Grant moderator access"
         grant:
           administrator: "Grant administrator access"
           moderator: "Grant moderator access"

+          importer: "Grant importer access"

         revoke:
           administrator: "Revoke administrator access"
           moderator: "Revoke moderator access"
         revoke:
           administrator: "Revoke administrator access"
           moderator: "Revoke moderator access"

+          importer: "Revoke importer access"

       block_history: "Active Blocks"
       moderator_history: "Blocks Given"
       block_history: "Active Blocks"
       moderator_history: "Blocks Given"

+      revoke_all_blocks: "Revoke all blocks"

       comments: "Comments"
       create_block: "Block this User"
       activate_user: "Activate this User"
       comments: "Comments"
       create_block: "Block this User"
       activate_user: "Activate this User"


@@ -2713,14 +2793,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


@@ -2740,7 +2821,7 @@ en:
         If you are new to OpenStreetMap, please create a new account
         using the form below.
       option_2: |
         If you are new to OpenStreetMap, please create a new account
         using the form below.
       option_2: |

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

         using your username and password and then associate the account
         with your ID in your user settings.
   user_role:
         using your username and password and then associate the account
         with your ID in your user settings.
   user_role:


@@ -2750,17 +2831,9 @@ en:
       doesnt_have_role: "The user does not have role %{role}."
       not_revoke_admin_current_user: "Cannot revoke administrator role from current user."
     grant:
       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}'?"
       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."

     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}'?"
       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."

   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."


@@ -2772,33 +2845,35 @@ 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: "This block will end in %{time}."
-      past: "This block ended %{time} and cannot be revoked now."
-      confirm: "Are you sure you wish to revoke this block?"
+    revoke_all:
+      title: "Revoking all blocks on %{block_on}"
+      heading_html: "Revoking all blocks on %{block_on}"
+      empty: "%{name} has no active blocks."
+      confirm: "Are you sure you wish to revoke %{active_blocks}?"
+      active_blocks:
+        one: "%{count} active block"
+        other: "%{count} active blocks"

       revoke: "Revoke!"
       revoke: "Revoke!"

-      flash: "This block has been revoked."
+      flash: "All active blocks have been revoked."

     helper:
       time_future_html: "Ends in %{time}."
       until_login: "Active until the user logs in."
     helper:
       time_future_html: "Ends in %{time}."
       until_login: "Active until the user logs in."


@@ -2834,33 +2909,57 @@ 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:
       not_revoked: "(not revoked)"
       show: "Show"
       edit: "Edit"
     block:
       not_revoked: "(not revoked)"
       show: "Show"
       edit: "Edit"

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

       display_name: "Blocked User"
       creator_name: "Creator"
       reason: "Reason for block"
       status: "Status"
       revoker_name: "Revoked by"
       display_name: "Blocked User"
       creator_name: "Creator"
       reason: "Reason for block"
       status: "Status"
       revoker_name: "Revoked by"

-      showing_page: "Page %{page}"
-      next: "Next »"
-      previous: "« Previous"
+    navigation:
+      all_blocks: "All Blocks"
+      blocks_on_me: "Blocks on Me"
+      blocks_on_user: "Blocks on %{user}"
+      blocks_by_me: "Blocks by Me"
+      blocks_by_user: "Blocks by %{user}"
+      block: "Block #%{id}"
+      new_block: "New Block"
+  user_mutes:
+    index:
+      title: "Muted Users"
+      my_muted_users: "My muted users"
+      you_have_muted_n_users:
+        one: "You have muted %{count} User"
+        other: "You have muted %{count} users"
+      user_mute_explainer: "Messages of muted users are moved into a separate Inbox and you won't receive email notifications."
+      user_mute_admins_and_moderators: "You can mute Admins and Moderators but their messages will not be muted."
+      table:
+        thead:
+          muted_user: "Muted User"
+          actions: "Actions"
+        tbody:
+          unmute: "Unmute"
+          send_message: "Send message"
+
+    create:
+      notice: "You muted %{name}."
+      error: "%{name} could not be muted. %{full_message}."
+    destroy:
+      notice: "You unmuted %{name}."
+      error: "User could not be unmuted. Please try again."

   notes:
     index:
       title: "Notes submitted or commented on by %{user}"
       heading: "%{user}'s Notes"
   notes:
     index:
       title: "Notes submitted or commented on by %{user}"
       heading: "%{user}'s Notes"

-      subheading_html: "Notes submitted or commented on by %{user}"
+      subheading_html: "Notes %{submitted} or %{commented} by %{user}"
+      subheading_submitted: "submitted"
+      subheading_commented: "commented on"

       no_notes: No notes
       id: "Id"
       creator: "Creator"
       no_notes: No notes
       id: "Id"
       creator: "Creator"


@@ -2873,15 +2972,15 @@ en:
       open_title: "Unresolved note #%{note_name}"
       closed_title: "Resolved note #%{note_name}"
       hidden_title: "Hidden note #%{note_name}"
       open_title: "Unresolved note #%{note_name}"
       closed_title: "Resolved note #%{note_name}"
       hidden_title: "Hidden note #%{note_name}"

-      opened_by_html: "Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      opened_by_anonymous_html: "Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
-      commented_by_html: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      commented_by_anonymous_html: "Comment from anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
-      closed_by_html: "Resolved by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      closed_by_anonymous_html: "Resolved by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
-      reopened_by_html: "Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      reopened_by_anonymous_html: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
-      hidden_by_html: "Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+      event_opened_by_html: "Created by %{user} %{time_ago}"
+      event_opened_by_anonymous_html: "Created by anonymous %{time_ago}"
+      event_commented_by_html: "Comment from %{user} %{time_ago}"
+      event_commented_by_anonymous_html: "Comment from anonymous %{time_ago}"
+      event_closed_by_html: "Resolved by %{user} %{time_ago}"
+      event_closed_by_anonymous_html: "Resolved by anonymous %{time_ago}"
+      event_reopened_by_html: "Reactivated by %{user} %{time_ago}"
+      event_reopened_by_anonymous_html: "Reactivated by anonymous %{time_ago}"
+      event_hidden_by_html: "Hidden by %{user} %{time_ago}"

       report: report this note
       coordinates_html: "%{latitude}, %{longitude}"
       anonymous_warning: This note includes comments from anonymous users which should be independently verified.
       report: report this note
       coordinates_html: "%{latitude}, %{longitude}"
       anonymous_warning: This note includes comments from anonymous users which should be independently verified.


@@ -2890,6 +2989,7 @@ en:
       reactivate: Reactivate
       comment_and_resolve: Comment & Resolve
       comment: Comment
       reactivate: Reactivate
       comment_and_resolve: Comment & Resolve
       comment: Comment

+      log_in_to_comment: "Log in to comment on this note"

       report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}."
       other_problems_resolve: "For all other problems with the note, please resolve it yourself with a comment."
       other_problems_resolved: "For all other problems, resolving is sufficient."
       report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}."
       other_problems_resolve: "For all other problems with the note, please resolve it yourself with a comment."
       other_problems_resolved: "For all other problems, resolving is sufficient."


@@ -2897,8 +2997,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:


@@ -2913,14 +3020,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:


@@ -2944,8 +3051,8 @@ en:
         cyclosm: CyclOSM
         cycle_map: Cycle Map
         transport_map: Transport Map
         cyclosm: CyclOSM
         cycle_map: Cycle Map
         transport_map: Transport Map

+        tracestracktop_topo: Tracestrack Topo

         hot: Humanitarian
         hot: Humanitarian

-        opnvkarte: ÖPNVKarte

       layers:
         header: Map Layers
         notes: Map Notes
       layers:
         header: Map Layers
         notes: Map Notes


@@ -2953,13 +3060,19 @@ en:
         gps: Public GPS Traces
         overlays: Enable overlays for troubleshooting the map
         title: "Layers"
         gps: Public GPS Traces
         overlays: Enable overlays for troubleshooting the map
         title: "Layers"

-      copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
-      donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Make a Donation</a>"
-      terms: "<a href='%{terms_url}' target='_blank'>Website and API terms</a>"
-      cyclosm: "Tiles style by <a href='%{cyclosm_url}' target='_blank'>CyclOSM</a> hosted by <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>"
-      thunderforest: "Tiles courtesy of <a href='%{thunderforest_url}' target='_blank'>Andy Allan</a>"
-      opnvkarte: "Tiles courtesy of <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>"
-      hotosm: "Tiles style by <a href='%{hotosm_url}' target='_blank'>Humanitarian OpenStreetMap Team</a> hosted by <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>"
+      copyright_text: "© %{copyright_link}"
+      openstreetmap_contributors: "OpenStreetMap contributors"
+      make_a_donation: Make a Donation
+      website_and_api_terms: Website and API terms
+      cyclosm_credit: "Tiles style by %{cyclosm_link} hosted by %{osm_france_link}"
+      cyclosm_name: CyclOSM
+      osm_france: OpenStreetMap France
+      thunderforest_credit: "Tiles courtesy of %{thunderforest_link}"
+      andy_allan: Andy Allan
+      tracestrack_credit: "Tiles courtesy of %{tracestrack_link}"
+      tracestrack: Tracestrack
+      hotosm_credit: "Tiles style by %{hotosm_link} hosted by %{osm_france_link}"
+      hotosm_name: Humanitarian OpenStreetMap Team

     site:
       edit_tooltip: Edit the map
       edit_disabled_tooltip: Zoom in to edit the map
     site:
       edit_tooltip: Edit the map
       edit_disabled_tooltip: Zoom in to edit the map


@@ -2969,13 +3082,7 @@ en:
       map_data_zoom_in_tooltip: Zoom in to see map data
       queryfeature_tooltip: Query features
       queryfeature_disabled_tooltip: Zoom in to query features
       map_data_zoom_in_tooltip: Zoom in to see map data
       queryfeature_tooltip: Query features
       queryfeature_disabled_tooltip: Zoom in to query features

-    changesets:
-      show:
-        comment: "Comment"
-        subscribe: "Subscribe"
-        unsubscribe: "Unsubscribe"
-        hide_comment: "hide"
-        unhide_comment: "unhide"
+      embed_html_disabled: HTML embedding is not available for this map layer

     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"


@@ -3086,6 +3193,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"