Drop legacy forums from help page

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index f78d447cfc338b222b3cc0248702daaa60b7ed1d..1c70e73b482d44128ebe5c86f54fa6afc9f88f0b 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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"


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


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


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


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


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


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


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


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


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


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


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


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


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


@@ -2158,8 +2136,11 @@ 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: |
     any_questions:
       title: Any questions?
       paragraph_1_html: |


@@ -2324,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)"


@@ -2573,13 +2555,8 @@ en:
       support: support
       about:
         header: Free and editable
       support: support
       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"


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


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


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


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


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


@@ -2694,7 +2667,6 @@ en:
       support: support
       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.
       support: support
       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.

-      support: support

     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


@@ -2740,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}"


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