Remove html from translations for terms page

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

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


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


@@ -2158,8 +2160,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 +2329,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,10 +2579,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>
+        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.

       email address: "Email Address:"
       confirm email address: "Confirm Email Address:"
       display name: "Display Name:"
       email address: "Email Address:"
       confirm email address: "Confirm Email Address:"
       display name: "Display Name:"


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