Update en.yml

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e05dfd8d03ede1c7f48cd01be575e7f34627ccd0..7643c33bd8a50fb1077defabeafc8427850b9eeb 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -10,7 +10,7 @@ en:
       prompt: Choose file
     submit:
       diary_comment:
       prompt: Choose file
     submit:
       diary_comment:

-        create: Save
+        create: Comment

       diary_entry:
         create: "Publish"
         update: "Update"
       diary_entry:
         create: "Publish"
         update: "Update"


@@ -21,7 +21,7 @@ en:
       client_application:
         create: Register
         update: Update
       client_application:
         create: Register
         update: Update

-      doorkeeper_application:
+      oauth2_application:

         create: Register
         update: Update
       redaction:
         create: Register
         update: Update
       redaction:


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

-      notifier: "Notifier"

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


@@ -95,9 +94,10 @@ en:
       diary_entry:
         user: "User"
         title: "Subject"
       diary_entry:
         user: "User"
         title: "Subject"

+        body: "Body"

         latitude: "Latitude"
         longitude: "Longitude"
         latitude: "Latitude"
         longitude: "Longitude"

-        language: "Language"
+        language_code: "Language"

       doorkeeper/application:
         name: Name
         redirect_uri: Redirect URIs
       doorkeeper/application:
         name: Name
         redirect_uri: Redirect URIs


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

-      windowslive: Windows Live
+      windowslive: Microsoft

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


@@ -272,9 +272,6 @@ en:
         enabled link text: "what is this?"
         disabled: "Disabled and cannot edit data, all previous edits are anonymous."
         disabled link text: "why can't I edit?"
         enabled link text: "what is this?"
         disabled: "Disabled and cannot edit data, all previous edits are anonymous."
         disabled link text: "why can't I edit?"

-      public editing note:
-        heading: "Public editing"
-        html: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"https://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"

       contributor terms:
         heading: "Contributor Terms"
         agreed: "You have agreed to the new Contributor Terms."
       contributor terms:
         heading: "Contributor Terms"
         agreed: "You have agreed to the new Contributor Terms."


@@ -284,8 +281,17 @@ en:
         link: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
         link text: "what is this?"
       save changes button: Save Changes
         link: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
         link text: "what is this?"
       save changes button: Save Changes

-      make edits public button: Make all my edits public

       delete_account: Delete Account...
       delete_account: Delete Account...

+    go_public:
+      heading: "Public editing"
+      currently_not_public: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below."
+      only_public_can_edit: Since the 0.6 API changeover, only public users can edit map data.
+      find_out_why_html: (%{link}).
+      find_out_why: "find out why"
+      find_out_why_url: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+      email_not_revealed: Your email address will not be revealed by becoming public.
+      not_reversible: This action cannot be reversed and all new users are now public by default.
+      make_edits_public_button: Make all my edits public

     update:
       success_confirm_needed: "User information updated successfully. Check your email for a note to confirm your new email address."
       success: "User information updated successfully."
     update:
       success_confirm_needed: "User information updated successfully. Check your email for a note to confirm your new email address."
       success: "User information updated successfully."


@@ -406,24 +412,6 @@ en:
       telephone_link: "Call %{phone_number}"
       colour_preview: "Colour %{colour_value} preview"
       email_link: "Email %{email}"
       telephone_link: "Call %{phone_number}"
       colour_preview: "Colour %{colour_value} preview"
       email_link: "Email %{email}"

-    note:
-      title: "Note: %{id}"
-      new_note: "New Note"
-      description: "Description"
-      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>"
-      report: report this note
-      coordinates_html: "%{latitude}, %{longitude}"

     query:
       title: "Query Features"
       introduction: "Click on the map to find nearby features."
     query:
       title: "Query Features"
       introduction: "Click on the map to find nearby features."


@@ -572,6 +560,21 @@ en:
       applications:
         create:
           notice: Application Registered.
       applications:
         create:
           notice: Application Registered.

+  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.
+    forbidden:
+      title: Forbidden
+      description: The operation you requested on the OpenStreetMap server is only available to administrators (HTTP 403)
+    internal_server_error:
+      title: Application error
+      description: The OpenStreetMap server encountered an unexpected condition that prevented it from fulfilling the request (HTTP 500)
+    not_found:
+      title: File not found
+      description: Couldn't find a file/directory/API operation by that name on the OpenStreetMap server (HTTP 404)

   friendships:
     make_friend:
       heading: "Add %{user} as a friend?"
   friendships:
     make_friend:
       heading: "Add %{user} as a friend?"


@@ -589,11 +592,8 @@ en:
     search:
       title:
         latlon_html: 'Results from <a href="https://openstreetmap.org/">Internal</a>'
     search:
       title:
         latlon_html: 'Results from <a href="https://openstreetmap.org/">Internal</a>'

-        ca_postcode_html: 'Results from <a href="https://geocoder.ca/">Geocoder.CA</a>'

         osm_nominatim_html: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
         osm_nominatim_html: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'

-        geonames_html: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'

         osm_nominatim_reverse_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>'

-        geonames_reverse_html: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'

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


@@ -975,7 +975,7 @@ en:
           fitness_station: "Fitness Station"
           garden: "Garden"
           golf_course: "Golf Course"
           fitness_station: "Fitness Station"
           garden: "Garden"
           golf_course: "Golf Course"

-          horse_riding: "Horse Riding"
+          horse_riding: "Horse Riding Centre"

           ice_rink: "Ice Rink"
           marina: "Marina"
           miniature_golf: "Miniature Golf"
           ice_rink: "Ice Rink"
           marina: "Marina"
           miniature_golf: "Miniature Golf"


@@ -1398,10 +1398,6 @@ en:
         ignored: Ignored
         open: Open
         resolved: Resolved
         ignored: Ignored
         open: Open
         resolved: Resolved

-    update:
-      new_report: Your report has been registered successfully
-      successful_update: Your report has been updated successfully
-      provide_details: Please provide the required details

     show:
       title: "%{status} Issue #%{issue_id}"
       reports:
     show:
       title: "%{status} Issue #%{issue_id}"
       reports:


@@ -1484,10 +1480,8 @@ en:
     home: Go to Home Location
     logout: Log Out
     log_in: Log In
     home: Go to Home Location
     logout: Log Out
     log_in: Log In

-    log_in_tooltip: Log in with an existing account

     sign_up: Sign Up
     start_mapping: Start Mapping
     sign_up: Sign Up
     start_mapping: Start Mapping

-    sign_up_tooltip: Create an account for editing

     edit: Edit
     history: History
     export: Export
     edit: Edit
     history: History
     export: Export


@@ -1519,8 +1513,6 @@ en:
     community: Community
     community_blogs: "Community Blogs"
     community_blogs_title: "Blogs from members of the OpenStreetMap community"
     community: Community
     community_blogs: "Community Blogs"
     community_blogs_title: "Blogs from members of the OpenStreetMap community"

-    foundation: Foundation
-    foundation_title: The OpenStreetMap Foundation

     make_a_donation:
       title: Support OpenStreetMap with a monetary donation
       text: Make a Donation
     make_a_donation:
       title: Support OpenStreetMap with a monetary donation
       text: Make a Donation


@@ -1635,7 +1627,8 @@ en:
       success: "Confirmed your account, thanks for signing up!"
       already active: "This account has already been confirmed."
       unknown token: "That confirmation code has expired or does not exist."
       success: "Confirmed your account, thanks for signing up!"
       already active: "This account has already been confirmed."
       unknown token: "That confirmation code has expired or does not exist."

-      reconfirm_html: "If you need us to resend the confirmation email, <a href=\"%{reconfirm}\">click here</a>."
+      resend_html: "If you need us to resend the confirmation email, %{reconfirm_link}."
+      click_here: click here

     confirm_resend:
       failure: "User %{name} not found."
     confirm_email:
     confirm_resend:
       failure: "User %{name} not found."
     confirm_email:


@@ -1673,8 +1666,6 @@ en:
     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}"

-      subject: "Subject"
-      body: "Body"

       back_to_inbox: "Back to inbox"
     create:
       message_sent: "Message sent"
       back_to_inbox: "Back to inbox"
     create:
       message_sent: "Message sent"


@@ -1699,14 +1690,10 @@ en:
       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."
     show:
       title: "Read message"
       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."
     show:
       title: "Read message"

-      from: "From"
-      subject: "Subject"
-      date: "Date"

       reply_button: "Reply"
       unread_button: "Mark as unread"
       destroy_button: "Delete"
       back: "Back"
       reply_button: "Reply"
       unread_button: "Mark as unread"
       destroy_button: "Delete"
       back: "Back"

-      to: "To"

       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."
     sent_message_summary:
       destroy_button: "Delete"
       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."
     sent_message_summary:
       destroy_button: "Delete"


@@ -1778,13 +1765,8 @@ en:
       lost password link: "Lost your password?"
       login_button: "Login"
       register now: Register now
       lost password link: "Lost your password?"
       login_button: "Login"
       register now: Register now

-      with username: "Already have an OpenStreetMap account? Please login with your username and password:"

       with external: "Alternatively, use a third party to login:"
       with external: "Alternatively, use a third party to login:"

-      new to osm: New to OpenStreetMap?
-      to make changes: To make changes to the OpenStreetMap data, you must have an account.
-      create account minute: Create an account. It only takes a minute.

       no account: Don't have an account?
       no account: Don't have an account?

-      account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"%{reconfirm}\">request a new confirmation email</a>."

       auth failure: "Sorry, could not log in with those details."
       openid_logo_alt: "Log in with an OpenID"
       auth_providers:
       auth failure: "Sorry, could not log in with those details."
       openid_logo_alt: "Log in with an OpenID"
       auth_providers:


@@ -1798,8 +1780,8 @@ en:
           title: Login with Facebook
           alt: Login with a Facebook Account
         windowslive:
           title: Login with Facebook
           alt: Login with a Facebook Account
         windowslive:

-          title: Login with Windows Live
-          alt: Login with a Windows Live Account
+          title: Login with Microsoft
+          alt: Login with a Microsoft Account

         github:
           title: Login with GitHub
           alt: Login with a GitHub Account
         github:
           title: Login with GitHub
           alt: Login with a GitHub Account


@@ -1822,7 +1804,9 @@ en:
       support: support
   shared:
     markdown_help:
       support: support
   shared:
     markdown_help:

-      title_html: Parsed with <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>
+      heading_html: Parsed with %{kramdown_link}
+      kramdown_url: https://kramdown.gettalong.org/quickref.html
+      kramdown: kramdown

       headings: Headings
       heading: Heading
       subheading: Subheading
       headings: Headings
       heading: Heading
       subheading: Subheading


@@ -2004,7 +1988,7 @@ en:
         contributors_gb_html: |
           <strong>United Kingdom</strong>: Contains Ordnance
           Survey data &copy; Crown copyright and database right
         contributors_gb_html: |
           <strong>United Kingdom</strong>: Contains Ordnance
           Survey data &copy; Crown copyright and database right

-          2010-19.
+          2010-2023.

         contributors_footer_1_html: |
           For further details of these, and other sources that have been used
           to help improve OpenStreetMap, please see the <a
         contributors_footer_1_html: |
           For further details of these, and other sources that have been used
           to help improve OpenStreetMap, please see the <a


@@ -2057,7 +2041,9 @@ en:
       map_image: "Map Image (shows standard layer)"
       embeddable_html: "Embeddable HTML"
       licence: "Licence"
       map_image: "Map Image (shows standard layer)"
       embeddable_html: "Embeddable HTML"
       licence: "Licence"

-      export_details_html: 'OpenStreetMap data is licensed under the <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).'
+      licence_details_html: OpenStreetMap data is licensed under the %{odbl_link} (ODbL).
+      odbl: Open Data Commons Open Database License
+      odbl_url: https://opendatacommons.org/licenses/odbl/1.0/

       too_large:
         advice: "If the above export fails, please consider using one of the sources listed below:"
         body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the sources listed below for bulk data downloads."
       too_large:
         advice: "If the above export fails, please consider using one of the sources listed below:"
         body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the sources listed below for bulk data downloads."


@@ -2070,9 +2056,6 @@ en:
         geofabrik:
           title: "Geofabrik Downloads"
           description: "Regularly-updated extracts of continents, countries, and selected cities"
         geofabrik:
           title: "Geofabrik Downloads"
           description: "Regularly-updated extracts of continents, countries, and selected cities"

-        metro:
-          title: "Metro Extracts"
-          description: "Extracts for major world cities and their surrounding areas"

         other:
           title: "Other Sources"
           description: "Additional sources listed on the OpenStreetMap Wiki"
         other:
           title: "Other Sources"
           description: "Additional sources listed on the OpenStreetMap Wiki"


@@ -2104,10 +2087,12 @@ en:
             by dragging. Add your message, then click save, and other mappers will investigate.
       other_concerns:
         title: Other concerns
             by dragging. Add your message, then click save, and other mappers will investigate.
       other_concerns:
         title: Other concerns

-        explanation_html: |
+        concerns_html: |

           If you have concerns about how our data is being used or about the contents please consult our
           If you have concerns about how our data is being used or about the contents please consult our

-          <a href='/copyright'>copyright page</a> for more legal information, or contact the appropriate
-          <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF working group</a>.
+          %{copyright_link} for more legal information, or contact the appropriate %{working_group_link}.
+        copyright: copyright page
+        working_group: OSMF working group
+        working_group_url: https://wiki.osmfoundation.org/wiki/Working_Groups

     help:
       title: Getting Help
       introduction: |
     help:
       title: Getting Help
       introduction: |


@@ -2129,10 +2114,6 @@ en:
         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.
         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.

-      forums:
-        url: https://forum.openstreetmap.org/
-        title: Forums (Legacy)
-        description: Questions and discussions for those that prefer a bulletin board style interface.

       community:
         url: https://community.openstreetmap.org/
         title: Community forum
       community:
         url: https://community.openstreetmap.org/
         title: Community forum


@@ -2155,8 +2136,20 @@ en:
         description: Browse the wiki for in-depth OpenStreetMap documentation.
     potlatch:
       removed: Your default OpenStreetMap editor is set as Potlatch. Because Adobe Flash Player has been withdrawn, Potlatch is no longer available to use in a web browser.
         description: Browse the wiki for in-depth OpenStreetMap documentation.
     potlatch:
       removed: Your default OpenStreetMap editor is set as Potlatch. Because Adobe Flash Player has been withdrawn, Potlatch is no longer available to use in a web browser.

-      desktop_html: You can still use Potlatch by <a href="https://www.systemed.net/potlatch/">downloading the desktop application for Mac and Windows</a>.
-      id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. <a href="%{settings_url}">Change your preferences here</a>.
+      desktop_application_html: You can still use Potlatch by %{download_link}.
+      download: downloading the desktop application for Mac and Windows
+      download_url: https://www.systemed.net/potlatch/
+      id_editor_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. %{change_preferences_link}.
+      change_preferences: Change your preferences here
+    any_questions:
+      title: Any questions?
+      paragraph_1_html: |
+        OpenStreetMap has several resources for learning about the project, asking and answering
+        questions, and collaboratively discussing and documenting mapping topics.
+        %{help_link}. With an organization making plans for OpenStreetMap? %{welcome_mat_link}.
+      get_help_here: Get help here
+      welcome_mat: Check out the Welcome Mat
+      welcome_mat_url: https://welcome.openstreetmap.org/

     sidebar:
       search_results: Search Results
       close: Close
     sidebar:
       search_results: Search Results
       close: Close


@@ -2243,57 +2236,56 @@ en:
           toilets: "Toilets"
     welcome:
       title: Welcome!
           toilets: "Toilets"
     welcome:
       title: Welcome!

-      introduction_html: |
+      introduction: |

         Welcome to OpenStreetMap, the free and editable map of the world. Now that you're signed
         up, you're all set to get started mapping. Here's a quick guide with the most important
         things you need to know.
       whats_on_the_map:
         title: What's on the Map
         Welcome to OpenStreetMap, the free and editable map of the world. Now that you're signed
         up, you're all set to get started mapping. Here's a quick guide with the most important
         things you need to know.
       whats_on_the_map:
         title: What's on the Map

-        on_html: |
-          OpenStreetMap is a place for mapping things that are both <em>real and current</em> -
+        on_the_map_html: |
+          OpenStreetMap is a place for mapping things that are both %{real_and_current} -

           it includes millions of buildings, roads, and other details about places. You can map
           whatever real-world features are interesting to you.
           it includes millions of buildings, roads, and other details about places. You can map
           whatever real-world features are interesting to you.

-        off_html: |
-          What it <em>doesn't</em> include is opinionated data like ratings, historical or
+        real_and_current: real and current
+        off_the_map_html: |
+          What it %{doesnt} include is opinionated data like ratings, historical or

           hypothetical features, and data from copyrighted sources. Unless you have special
           permission, don't copy from online or paper maps.
           hypothetical features, and data from copyrighted sources. Unless you have special
           permission, don't copy from online or paper maps.

+        doesnt: doesn't

       basic_terms:
         title: Basic Terms For Mapping
       basic_terms:
         title: Basic Terms For Mapping

-        paragraph_1_html: |
+        paragraph_1: |

           OpenStreetMap has some of its own lingo. Here are a few key words that'll come in handy.
           OpenStreetMap has some of its own lingo. Here are a few key words that'll come in handy.

-        editor_html: |
-          An <strong>editor</strong> is a program or website you can use to edit the map.
-        node_html: |
-          A <strong>node</strong> is a point on the map, like a single restaurant or a tree.
-        way_html: |
-          A <strong>way</strong> is a line or area, like a road, stream, lake or building.
-        tag_html: |
-          A <strong>tag</strong> is a bit of data about a node or way, like a
-          restaurant's name or a road's speed limit.
+        an_editor_html: An %{editor} is a program or website you can use to edit the map.
+        a_node_html: A %{node} is a point on the map, like a single restaurant or a tree.
+        a_way_html: A %{way} is a line or area, like a road, stream, lake or building.
+        a_tag_html: A %{tag} is a bit of data about a node or way, like a restaurant's name or a road's speed limit.
+        editor: editor
+        node: node
+        way: way
+        tag: tag

       rules:
         title: Rules!
       rules:
         title: Rules!

-        paragraph_1_html: |
+        para_1_html: |

           OpenStreetMap has few formal rules but we expect all participants to collaborate
           with, and communicate with, the community. If you are considering
           any activities other than editing by hand, please read and follow the guidelines on
           OpenStreetMap has few formal rules but we expect all participants to collaborate
           with, and communicate with, the community. If you are considering
           any activities other than editing by hand, please read and follow the guidelines on

-          <a href='https://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a> and
-          <a href='https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Automated Edits</a>.
-      questions:
-        title: Any questions?
-        paragraph_1_html: |
-          OpenStreetMap has several resources for learning about the project, asking and answering
-          questions, and collaboratively discussing and documenting mapping topics.
-          <a href='%{help_url}'>Get help here</a>. With an organization making plans for OpenStreetMap? <a href='https://welcome.openstreetmap.org/'>Check out the Welcome Mat</a>.
+          %{imports_link} and %{automated_edits_link}.
+        imports: Imports
+        imports_url: https://wiki.openstreetmap.org/wiki/Import/Guidelines
+        automated_edits: Automated Edits
+        automated_edits_url: https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct

       start_mapping: Start Mapping
       add_a_note:
         title: No Time To Edit? Add a Note!
       start_mapping: Start Mapping
       add_a_note:
         title: No Time To Edit? Add a Note!

-        paragraph_1_html: |
+        para_1: |

           If you just want something small fixed and don't have the time to sign up and learn how to edit, it's
           easy to add a note.
           If you just want something small fixed and don't have the time to sign up and learn how to edit, it's
           easy to add a note.

-        paragraph_2_html: |
-          Just go to <a href='%{map_url}'>the map</a> and click the note icon:
-          <span class='icon note'></span>. 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.
+        para_2_html: |
+          Just go to %{map_link} and click the note icon: %{note_icon}.
+          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.
+        the_map: the map

     communities:
       title: Communities
       lede_text: |
     communities:
       title: Communities
       lede_text: |


@@ -2313,11 +2305,12 @@ en:
           The following communities are formally established as Local Chapters:
       other_groups:
         title: Other Groups
           The following communities are formally established as Local Chapters:
       other_groups:
         title: Other Groups

-        about_html: |
+        other_groups_html: |

           There is no need to formally establish a group to the same extent as the Local Chapters.
           Indeed many groups exist very sucessfully as an informal gathering of people or as a
           There is no need to formally establish a group to the same extent as the Local Chapters.
           Indeed many groups exist very sucessfully as an informal gathering of people or as a

-          community group. Anyone can set up or join these. Read more on the
-          <a href="https://wiki.openstreetmap.org/wiki/User_group">Communities wiki page</a>.
+          community group. Anyone can set up or join these. Read more on the %{communities_wiki_link}.
+        communities_wiki: Communities wiki page
+        communities_wiki_url: https://wiki.openstreetmap.org/wiki/User_group

   traces:
     visibility:
       private: "Private (only shared as anonymous, unordered points)"
   traces:
     visibility:
       private: "Private (only shared as anonymous, unordered points)"


@@ -2393,7 +2386,11 @@ en:
       public_traces_from: "Public GPS Traces from %{user}"
       description: "Browse recent GPS trace uploads"
       tagged_with: " tagged with %{tags}"
       public_traces_from: "Public GPS Traces from %{user}"
       description: "Browse recent GPS trace uploads"
       tagged_with: " tagged with %{tags}"

-      empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
+      empty_title: Nothing here yet
+      empty_upload_html: "%{upload_link} or learn more about GPS tracing on the %{wiki_link}."
+      upload_new: Upload a new trace
+      wiki_page: wiki page
+      wiki_page_url: https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2

       upload_trace: "Upload a trace"
       all_traces: "All Traces"
       my_traces: "My Traces"
       upload_trace: "Upload a trace"
       all_traces: "All Traces"
       my_traces: "My Traces"


@@ -2554,16 +2551,12 @@ en:
     new:
       title: "Sign Up"
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
     new:
       title: "Sign Up"
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."

-      contact_support_html: 'Please contact <a href="%{support}">support</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
+      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
       about:
         header: Free and editable

-        html: |
-          <p>Unlike other maps, OpenStreetMap is completely created by people like you,
-          and it's free for anyone to fix, update, download and use.</p>
-          <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
-      email address: "Email Address:"
-      confirm email address: "Confirm Email Address:"
-      display name: "Display Name:"
+        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.

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


@@ -2582,7 +2575,9 @@ en:
       consider_pd: "In addition to the above, I consider my contributions to be in the Public Domain"
       consider_pd_why: "what's this?"
       consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
       consider_pd: "In addition to the above, I consider my contributions to be in the Public Domain"
       consider_pd_why: "what's this?"
       consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain

-      guidance_html: 'Information to help understand these terms: a <a href="%{summary}">human readable summary</a> and some <a href="%{translations}">informal translations</a>'
+      guidance_info_html: "Information to help understand these terms: a %{readable_summary_link} and some %{informal_translations_link}"
+      readable_summary: human readable summary
+      informal_translations: informal translations

       continue: Continue
       declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
       decline: "Decline"
       continue: Continue
       declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
       decline: "Decline"


@@ -2603,7 +2598,6 @@ en:
       deleted: "deleted"
     show:
       my diary: My Diary
       deleted: "deleted"
     show:
       my diary: My Diary

-      new diary entry: new diary entry

       my edits: My Edits
       my traces: My Traces
       my notes: My Notes
       my edits: My Edits
       my traces: My Traces
       my notes: My Notes


@@ -2632,8 +2626,6 @@ en:
       created from: "Created from:"
       status: "Status:"
       spam score: "Spam Score:"
       created from: "Created from:"
       status: "Status:"
       spam score: "Spam Score:"

-      description: Description
-      user location: User location

       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"


@@ -2648,7 +2640,6 @@ en:
       comments: "Comments"
       create_block: "Block this User"
       activate_user: "Activate this User"
       comments: "Comments"
       create_block: "Block this User"
       activate_user: "Activate this User"

-      deactivate_user: "Deactivate this User"

       confirm_user: "Confirm this User"
       unconfirm_user: "Unconfirm this User"
       unsuspend_user: "Unsuspend this User"
       confirm_user: "Confirm this User"
       unconfirm_user: "Unconfirm this User"
       unsuspend_user: "Unsuspend this User"


@@ -2657,8 +2648,6 @@ en:
       delete_user: "Delete this User"
       confirm: "Confirm"
       report: Report this User
       delete_user: "Delete this User"
       confirm: "Confirm"
       report: Report this User

-    set_home:
-      flash success: "Home location saved successfully"

     go_public:
       flash success: "All your edits are now public, and you are now allowed to edit."
     index:
     go_public:
       flash success: "All your edits are now public, and you are now allowed to edit."
     index:


@@ -2676,15 +2665,8 @@ en:
       title: Account Suspended
       heading: Account Suspended
       support: support
       title: Account Suspended
       heading: Account Suspended
       support: support

-      body_html: |
-        <p>
-          Sorry, your account has been automatically suspended due to
-          suspicious activity.
-        </p>
-        <p>
-          This decision will be reviewed by an administrator shortly, or
-          you may contact %{webmaster} if you wish to discuss this.
-        </p>
+      automatically_suspended: Sorry, your account has been automatically suspended due to suspicious activity.
+      contact_support_html: This decision will be reviewed by an administrator shortly, or you may contact %{support_link} if you wish to discuss this.

     auth_failure:
       connection_failed: Connection to authentication provider failed
       invalid_credentials: Invalid authentication credentials
     auth_failure:
       connection_failed: Connection to authentication provider failed
       invalid_credentials: Invalid authentication credentials


@@ -2730,8 +2712,6 @@ 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."

-      tried_contacting: "I have contacted the user and asked them to stop."
-      tried_waiting: "I have given a reasonable amount of time for the user to respond to those communications."

       back: "View all blocks"
     edit:
       title: "Editing block on %{name}"
       back: "View all blocks"
     edit:
       title: "Editing block on %{name}"


@@ -2743,8 +2723,6 @@ en:
       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:
       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:

-      try_contacting: "Please try contacting the user before blocking them and giving them a reasonable time to respond."
-      try_waiting: "Please try giving the user a reasonable time to respond before blocking them."

       flash: "Created a block on user %{name}."
     update:
       only_creator_can_edit: "Only the moderator who created this block can edit it."
       flash: "Created a block on user %{name}."
     update:
       only_creator_can_edit: "Only the moderator who created this block can edit it."


@@ -2829,6 +2807,38 @@ en:
       description: "Description"
       created_at: "Created at"
       last_changed: "Last changed"
       description: "Description"
       created_at: "Created at"
       last_changed: "Last changed"

+    show:
+      title: "Note: %{id}"
+      description: "Description"
+      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>"
+      report: report this note
+      coordinates_html: "%{latitude}, %{longitude}"
+      anonymous_warning: This note includes comments from anonymous users which should be independently verified.
+      hide: Hide
+      resolve: Resolve
+      reactivate: Reactivate
+      comment_and_resolve: Comment & Resolve
+      comment: Comment
+      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."
+      disappear_date_html: "This resolved note will disappear from the map in %{disappear_in}."
+    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."
+      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

   javascripts:
     close: Close
     share:
   javascripts:
     close: Close
     share:


@@ -2906,22 +2916,6 @@ en:
         unsubscribe: "Unsubscribe"
         hide_comment: "hide"
         unhide_comment: "unhide"
         unsubscribe: "Unsubscribe"
         hide_comment: "hide"
         unhide_comment: "unhide"

-    notes:
-      new:
-        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."
-        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
-      show:
-        anonymous_warning: This note includes comments from anonymous users which should be independently verified.
-        hide: Hide
-        resolve: Resolve
-        reactivate: Reactivate
-        comment_and_resolve: Comment & Resolve
-        comment: Comment
-        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."
-        disappear_date_html: "This resolved note will disappear from the map in %{disappear_in}."

     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"


@@ -2932,9 +2926,14 @@ en:
         graphhopper_bicycle: "Bicycle (GraphHopper)"
         graphhopper_car: "Car (GraphHopper)"
         graphhopper_foot: "Foot (GraphHopper)"
         graphhopper_bicycle: "Bicycle (GraphHopper)"
         graphhopper_car: "Car (GraphHopper)"
         graphhopper_foot: "Foot (GraphHopper)"

+        fossgis_valhalla_bicycle: "Bicycle (Valhalla)"
+        fossgis_valhalla_car: "Car (Valhalla)"
+        fossgis_valhalla_foot: "Foot (Valhalla)"

       descend: "Descend"
       directions: "Directions"
       distance: "Distance"
       descend: "Descend"
       directions: "Directions"
       distance: "Distance"

+      distance_m: "%{distance}m"
+      distance_km: "%{distance}km"

       errors:
         no_route: "Couldn't find a route between those two places."
         no_place: "Sorry - couldn't locate '%{place}'."
       errors:
         no_route: "Couldn't find a route between those two places."
         no_place: "Sorry - couldn't locate '%{place}'."