Rework geocoder titles to avoid raw html in translations

[rails.git] / config / locales / en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml

index ca1d313c8df7ebc1dbe32f6de6817bb1520c8ea2..afc578b6940a3bc74fc20637cb4a586901f662db 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -154,46 +154,45 @@ 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:
        about_x_hours:
          new_email: "(never displayed publicly)"
    datetime:
      distance_in_words_ago:
        about_x_hours:
-        one: about 1 hour ago
+        one: about %{count} hour ago
          other: about %{count} hours ago
        about_x_months:
          other: about %{count} hours ago
        about_x_months:
-        one: about 1 month ago
+        one: about %{count} month ago
          other: about %{count} months ago
        about_x_years:
          other: about %{count} months ago
        about_x_years:
-        one: about 1 year ago
+        one: about %{count} year ago
          other: about %{count} years ago
        almost_x_years:
          other: about %{count} years ago
        almost_x_years:
-        one: almost 1 year ago
+        one: almost %{count} year ago
          other: almost %{count} years ago
        half_a_minute: half a minute ago
        less_than_x_seconds:
          other: almost %{count} years ago
        half_a_minute: half a minute ago
        less_than_x_seconds:
-        one: less than 1 second ago
+        one: less than %{count} second ago
          other: less than %{count} seconds ago
        less_than_x_minutes:
          other: less than %{count} seconds ago
        less_than_x_minutes:
-        one: less than a minute ago
+        one: less than %{count} minute ago
          other: less than %{count} minutes ago
        over_x_years:
          other: less than %{count} minutes ago
        over_x_years:
-        one: over 1 year ago
+        one: over %{count} year ago
          other: over %{count} years ago
        x_seconds:
          other: over %{count} years ago
        x_seconds:
-        one: 1 second ago
+        one: "%{count} second ago"
          other: "%{count} seconds ago"
        x_minutes:
          other: "%{count} seconds ago"
        x_minutes:
-        one: 1 minute ago
+        one: "%{count} minute ago"
          other: "%{count} minutes ago"
        x_days:
          other: "%{count} minutes ago"
        x_days:
-        one: 1 day ago
+        one: "%{count} day ago"
          other: "%{count} days ago"
        x_months:
          other: "%{count} days ago"
        x_months:
-        one: 1 month ago
+        one: "%{count} month ago"
          other: "%{count} months ago"
        x_years:
          other: "%{count} months ago"
        x_years:
-        one: 1 year ago
+        one: "%{count} year ago"
          other: "%{count} years ago"
    printable_name:
      with_id: "%{id}"
          other: "%{count} years ago"
    printable_name:
      with_id: "%{id}"
@@ -300,22 +299,22 @@ en:
    browse:
      created: "Created"
      closed: "Closed"
    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}"
+    created_ago_html: "Created %{time_ago}"
+    closed_ago_html: "Closed %{time_ago}"
+    created_ago_by_html: "Created %{time_ago} by %{user}"
+    closed_ago_by_html: "Closed %{time_ago} by %{user}"
+    deleted_ago_by_html: "Deleted %{time_ago} by %{user}"
+    edited_ago_by_html: "Edited %{time_ago} by %{user}"
      version: "Version"
      in_changeset: "Changeset"
      anonymous: "anonymous"
      no_comment: "(no comment)"
      part_of: "Part of"
      part_of_relations:
      version: "Version"
      in_changeset: "Changeset"
      anonymous: "anonymous"
      no_comment: "(no comment)"
      part_of: "Part of"
      part_of_relations:
-      one: 1 relation
+      one: "%{count} relation"
        other: "%{count} relations"
      part_of_ways:
        other: "%{count} relations"
      part_of_ways:
-      one: 1 way
+      one: "%{count} way"
        other: "%{count} ways"
      download_xml: "Download XML"
      view_history: "View History"
        other: "%{count} ways"
      download_xml: "Download XML"
      view_history: "View History"
@@ -333,8 +332,8 @@ en:
        relation: "Relations (%{count})"
        relation_paginated: "Relations (%{x}-%{y} of %{count})"
        comment: "Comments (%{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>"
+      hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}"
+      comment_by_html: "Comment from %{user} %{time_ago}"
        changesetxml: "Changeset XML"
        osmchangexml: "osmChange XML"
        feed:
        changesetxml: "Changeset XML"
        osmchangexml: "osmChange XML"
        feed:
@@ -360,7 +359,7 @@ en:
        history_title_html: "Relation History: %{name}"
        members: "Members"
        members_count:
        history_title_html: "Relation History: %{name}"
        members: "Members"
        members_count:
-        one: 1 member
+        one: "%{count} member"
          other: "%{count} members"
      relation_member:
        entry_html: "%{type} %{name}"
          other: "%{count} members"
      relation_member:
        entry_html: "%{type} %{name}"
@@ -591,9 +590,13 @@ 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>'
+        results_from_html: 'Results from %{results_link}'
+        latlon: Internal
+        latlon_url: https://openstreetmap.org/
+        osm_nominatim: OpenStreetMap Nominatim
+        osm_nominatim_url: https://nominatim.openstreetmap.org/
+        osm_nominatim_reverse: OpenStreetMap Nominatim
+        osm_nominatim_reverse_url: https://nominatim.openstreetmap.org/
      search_osm_nominatim:
        prefix_format: "%{name}"
        prefix:
      search_osm_nominatim:
        prefix_format: "%{name}"
        prefix:
@@ -1387,11 +1390,10 @@ en:
        status: Status
        reports: Reports
        last_updated: Last Updated
        status: Status
        reports: Reports
        last_updated: Last Updated
-      last_updated_time_html: "<abbr title='%{title}'>%{time}</abbr>"
-      last_updated_time_user_html: "<abbr title='%{title}'>%{time}</abbr> by %{user}"
+      last_updated_time_ago_user_html: "%{time_ago} by %{user}"
        link_to_reports: View Reports
        reports_count:
        link_to_reports: View Reports
        reports_count:
-        one: "1 Report"
+        one: "%{count} Report"
          other: "%{count} Reports"
        reported_item: Reported Item
        states:
          other: "%{count} Reports"
        reported_item: Reported Item
        states:
@@ -1402,7 +1404,7 @@ en:
        title: "%{status} Issue #%{issue_id}"
        reports:
          zero: No reports
        title: "%{status} Issue #%{issue_id}"
        reports:
          zero: No reports
-        one: 1 report
+        one: "%{count} report"
          other: "%{count} reports"
        report_created_at: "First reported at %{datetime}"
        last_resolved_at: "Last resolved at %{datetime}"
          other: "%{count} reports"
        report_created_at: "First reported at %{datetime}"
        last_resolved_at: "Last resolved at %{datetime}"
@@ -1552,9 +1554,9 @@ en:
        subject: "[OpenStreetMap] GPX Import failure"
      gpx_success:
        hi: "Hi %{to_user},"
        subject: "[OpenStreetMap] GPX Import failure"
      gpx_success:
        hi: "Hi %{to_user},"
-      loaded_successfully:
-        one: loaded successfully with %{trace_points} out of a possible 1 point.
-        other: loaded successfully with %{trace_points} out of a possible %{possible_points} 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."
        subject: "[OpenStreetMap] GPX Import success"
      signup_confirm:
        subject: "[OpenStreetMap] Welcome to OpenStreetMap"
        subject: "[OpenStreetMap] GPX Import success"
      signup_confirm:
        subject: "[OpenStreetMap] Welcome to OpenStreetMap"
@@ -1825,7 +1827,8 @@ en:
    site:
      about:
        next: Next
    site:
      about:
        next: Next
-      copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
+      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"
        lede_text: |
          OpenStreetMap is built by a community of mappers that contribute and maintain data
        used_by_html: "%{name} provides map data for thousands of websites, mobile apps, and hardware devices"
        lede_text: |
          OpenStreetMap is built by a community of mappers that contribute and maintain data
@@ -1836,35 +1839,52 @@ en:
          aerial imagery, GPS devices, and low-tech field maps to verify that OSM
          is accurate and up to date.
        community_driven_title: Community Driven
          aerial imagery, GPS devices, and low-tech field maps to verify that OSM
          is accurate and up to date.
        community_driven_title: Community Driven
-      community_driven_html: |
+      community_driven_1_html: |
          OpenStreetMap's community is diverse, passionate, and growing every day.
          Our contributors include enthusiast mappers, GIS professionals, engineers
          running the OSM servers, humanitarians mapping disaster-affected areas,
          and many more.
          OpenStreetMap's community is diverse, passionate, and growing every day.
          Our contributors include enthusiast mappers, GIS professionals, engineers
          running the OSM servers, humanitarians mapping disaster-affected areas,
          and many more.
-        To learn more about the community, see the
-        <a href='https://blog.openstreetmap.org'>OpenStreetMap Blog</a>,
-        <a href='%{diary_path}'>user diaries</a>,
-        <a href='https://blogs.openstreetmap.org/'>community blogs</a>, and
-        the <a href='https://www.osmfoundation.org/'>OSM Foundation</a> website.
+        To learn more about the community, see the %{osm_blog_link},
+        %{user_diaries_link}, %{community_blogs_link}, and the
+        %{osm_foundation_link} website.
+      community_driven_osm_blog: OpenStreetMap Blog
+      community_driven_osm_blog_url: https://blog.openstreetmap.org
+      community_driven_user_diaries: user diaries
+      community_driven_community_blogs: community blogs
+      community_driven_community_blogs_url: https://blogs.openstreetmap.org/
+      community_driven_osm_foundation: OSM Foundation
+      community_driven_osm_foundation_url: https://www.osmfoundation.org/
        open_data_title: Open Data
        open_data_title: Open Data
-      open_data_html: |
-        OpenStreetMap is <i>open data</i>: you are free to use it for any purpose
+      open_data_1_html: |
+        OpenStreetMap is %{open_data}: you are free to use it for any purpose
          as long as you credit OpenStreetMap and its contributors. If you alter or
          build upon the data in certain ways, you may distribute the result only
          as long as you credit OpenStreetMap and its contributors. If you alter or
          build upon the data in certain ways, you may distribute the result only
-        under the same licence. See the <a href='%{copyright_path}'>Copyright and
-        License page</a> for details.
+        under the same licence. See the %{copyright_license_link} for details.
+      open_data_open_data: open data
+      open_data_copyright_license: Copyright and License page
        legal_title: Legal
        legal_title: Legal
-      legal_1_html: |
+      legal_1_1_html: |
          This site and many other related services are formally operated by the
          This site and many other related services are formally operated by the
-        <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
+        %{openstreetmap_foundation_link} (OSMF)
          on behalf of the community. Use of all OSMF operated services is subject
          on behalf of the community. Use of all OSMF operated services is subject
-        to our <a href="https://wiki.osmfoundation.org/wiki/Terms_of_Use">Terms of Use</a>, <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
-        Acceptable Use Policies</a> and our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>.
-      legal_2_html: |
-        Please <a href='https://osmfoundation.org/Contact'>contact the OSMF</a>
+        to our %{terms_of_use_link}, %{aup_link} and our %{privacy_policy_link}.
+      legal_1_1_openstreetmap_foundation: OpenStreetMap Foundation
+      legal_1_1_openstreetmap_foundation_url: https://osmfoundation.org/
+      legal_1_1_terms_of_use: Terms of Use
+      legal_1_1_terms_of_use_url: https://wiki.osmfoundation.org/wiki/Terms_of_Use
+      legal_1_1_aup: Acceptable Use Policies
+      legal_1_1_aup_url: https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy
+      legal_1_1_privacy_policy: Privacy Policy
+      legal_1_1_privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy
+      legal_2_1_html: |
+        Please %{contact_the_osmf_link}
          if you have licensing, copyright or other legal questions.
          if you have licensing, copyright or other legal questions.
-        <br>
-        OpenStreetMap, the magnifying glass logo and State of the Map are <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">registered trademarks of the OSMF</a>.
+      legal_2_1_contact_the_osmf: contact the OSMF
+      legal_2_1_contact_the_osmf_url: https://osmfoundation.org/Contact
+      legal_2_2_html: |
+        OpenStreetMap, the magnifying glass logo and State of the Map are %{registered_trademarks_link}.
+      legal_2_2_registered_trademarks: registered trademarks of the OSMF
+      legal_2_2_registered_trademarks_url: https://wiki.osmfoundation.org/wiki/Trademark_Policy
        partners_title: Partners
      copyright:
        foreign:
        partners_title: Partners
      copyright:
        foreign:
@@ -1878,122 +1898,158 @@ en:
          mapping_link: start mapping
        legal_babble:
          title_html: Copyright and License
          mapping_link: start mapping
        legal_babble:
          title_html: Copyright and License
-        intro_1_html: |
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> is <i>open data</i>, licensed under the <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) by the  <a
-          href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
-        intro_2_html: |
+        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_registered_trademark_html: "&reg;"
+        introduction_1_open_data: open data
+        introduction_1_odc_odbl: Open Data Commons Open Database License
+        introduction_1_odc_odbl_url: https://opendatacommons.org/licenses/odbl/
+        introduction_1_osm_foundation: OpenStreetMap Foundation
+        introduction_1_osm_foundation_url: https://osmfoundation.org/
+        introduction_2_html: |
            You are free to copy, distribute, transmit and adapt our data,
            as long as you credit OpenStreetMap and its
            contributors. If you alter or build upon our data, you
            may distribute the result only under the same licence. The
            You are free to copy, distribute, transmit and adapt our data,
            as long as you credit OpenStreetMap and its
            contributors. If you alter or build upon our data, you
            may distribute the result only under the same licence. The
-          full <a href="https://opendatacommons.org/licenses/odbl/1.0/">legal
-          code</a> explains your rights and responsibilities.
-        intro_3_1_html: |
-          Our documentation is licensed under the
-          <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA 2.0).
+          full %{legal_code_link} explains your rights and responsibilities.
+        introduction_2_legal_code: legal code
+        introduction_2_legal_code_url: https://opendatacommons.org/licenses/odbl/1.0/
+        introduction_3_html: |
+          Our documentation is licensed under the %{creative_commons_link} license (CC BY-SA 2.0).
+        introduction_3_creative_commons: Creative Commons Attribution-ShareAlike 2.0
+        introduction_3_creative_commons_url: https://creativecommons.org/licenses/by-sa/2.0/
          credit_title_html: How to credit OpenStreetMap
          credit_1_html: |
            Where you use OpenStreetMap data, you are required to do the following two things:
          credit_title_html: How to credit OpenStreetMap
          credit_1_html: |
            Where you use OpenStreetMap data, you are required to do the following two things:
-        credit_2_1_html: |
-          <ul>
-            <li>Provide credit to OpenStreetMap by displaying our copyright notice.</li>
-            <li>Make clear that the data is available under the Open Database License.</li>
-          </ul>
-        credit_3_1_html: |
+        credit_2_1: Provide credit to OpenStreetMap by displaying our copyright notice.
+        credit_2_2: Make clear that the data is available under the Open Database License.
+        credit_3_html: |
           For the copyright notice, we have different requirements on how this should be
           displayed, depending on how you are using our data. For example, different
           rules apply on how to show the copyright notice depending on whether you have
           created a browsable map, a printed map or a static image. Full details on the
           For the copyright notice, we have different requirements on how this should be
           displayed, depending on how you are using our data. For example, different
           rules apply on how to show the copyright notice depending on whether you have
           created a browsable map, a printed map or a static image. Full details on the
-         requirements can be found in the
-         <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Attribution
-         Guidelines</a>.
-        credit_4_html: |
+         requirements can be found in the %{attribution_guidelines_link}.
+        credit_3_attribution_guidelines: Attribution Guidelines
+        credit_3_attribution_guidelines_url: https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines
+        credit_4_1_html: |
            To make clear that the data is available under the Open
            To make clear that the data is available under the Open
-          Database License, you may link to
-          <a href="https://www.openstreetmap.org/copyright">this copyright page</a>.
+          Database License, you may link to %{this_copyright_page_link}.
            Alternatively, and as a requirement if you are distributing OSM in a
            data form, you can name and link directly to the license(s). In media
            where links are not possible (e.g. printed works), we suggest you
            direct your readers to openstreetmap.org (perhaps by expanding
            'OpenStreetMap' to this full address) and to opendatacommons.org.
            In this example, the credit appears in the corner of the map.
            Alternatively, and as a requirement if you are distributing OSM in a
            data form, you can name and link directly to the license(s). In media
            where links are not possible (e.g. printed works), we suggest you
            direct your readers to openstreetmap.org (perhaps by expanding
            'OpenStreetMap' to this full address) and to opendatacommons.org.
            In this example, the credit appears in the corner of the map.
+        credit_4_1_this_copyright_page: this copyright page
          attribution_example:
            alt: Example of how to attribute OpenStreetMap on a webpage
            title: Attribution example
          more_title_html: Finding out more
          attribution_example:
            alt: Example of how to attribute OpenStreetMap on a webpage
            title: Attribution example
          more_title_html: Finding out more
-        more_1_html: |
-          Read more about using our data, and how to credit us, at the <a
-          href="https://osmfoundation.org/Licence">OSMF Licence page</a>.
-        more_2_html: |
+        more_1_1_html: Read more about using our data, and how to credit us, at the %{osmf_licence_page_link}.
+        more_1_1_osmf_licence_page: OSMF Licence page
+        more_1_1_osmf_licence_page_url: https://osmfoundation.org/Licence
+        more_2_1_html: |
            Although OpenStreetMap is open data, we cannot provide a
            free-of-charge map API for third-parties.
            Although OpenStreetMap is open data, we cannot provide a
            free-of-charge map API for third-parties.
-          See our <a href="https://operations.osmfoundation.org/policies/api/">API Usage Policy</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">Tile Usage Policy</a>
-          and <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim Usage Policy</a>.
+          See our %{api_usage_policy_link}, %{tile_usage_policy_link} and %{nominatim_usage_policy_link}.
+        more_2_1_api_usage_policy: API Usage Policy
+        more_2_1_api_usage_policy_url: https://operations.osmfoundation.org/policies/api/
+        more_2_1_tile_usage_policy: Tile Usage Policy
+        more_2_1_tile_usage_policy_url: https://operations.osmfoundation.org/policies/tiles/
+        more_2_1_nominatim_usage_policy: Nominatim Usage Policy
+        more_2_1_nominatim_usage_policy_url: https://operations.osmfoundation.org/policies/nominatim/
          contributors_title_html: Our contributors
          contributors_intro_html: |
            Our contributors are thousands of individuals. We also include
            openly-licensed data from national mapping agencies
            and other sources, among them:
          contributors_title_html: Our contributors
          contributors_intro_html: |
            Our contributors are thousands of individuals. We also include
            openly-licensed data from national mapping agencies
            and other sources, among them:
-        contributors_at_html: |
-          <strong>Austria</strong>: Contains data from
-          <a href="https://data.wien.gv.at/">Stadt Wien</a> (under
-          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
-          Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
-        contributors_au_html: |
-          <strong>Australia</strong>: Incorporates or developed using Administrative Boundaries &copy;
-          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australia</a>
-          licensed by the Commonwealth of Australia under
-          <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International licence (CC BY 4.0)</a>.
-        contributors_ca_html: |
-          <strong>Canada</strong>: Contains data from
+        contributors_at_credit_html: |
+          %{austria}: Contains data from %{stadt_wien_link} (under %{cc_by_link}), %{land_vorarlberg_link}
+          and Land Tirol (under %{cc_by_at_with_amendments_link}).
+        contributors_at_austria: Austria
+        contributors_at_stadt_wien: Stadt Wien
+        contributors_at_stadt_wien_url: https://data.wien.gv.at/
+        contributors_at_cc_by: CC BY
+        contributors_at_cc_by_url: https://creativecommons.org/licenses/by/3.0/at/deed.de
+        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_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_australia: Australia
+        contributors_au_geoscape_australia: Geoscape Australia
+        contributors_au_geoscape_australia_url: https://geoscape.com.au/legal/data-copyright-and-disclaimer/
+        contributors_au_cc_licence: Creative Commons Attribution 4.0 International licence (CC BY 4.0)
+        contributors_au_cc_licence_url: https://creativecommons.org/licenses/by/4.0/
+        contributors_ca_credit_html: |
+          %{canada}: Contains data from
            GeoBase&reg;, GeoGratis (&copy; Department of Natural
            Resources Canada), CanVec (&copy; Department of Natural
            Resources Canada), and StatCan (Geography Division,
            Statistics Canada).
            GeoBase&reg;, GeoGratis (&copy; Department of Natural
            Resources Canada), CanVec (&copy; Department of Natural
            Resources Canada), and StatCan (Geography Division,
            Statistics Canada).
-        contributors_fi_html: |
-          <strong>Finland</strong>: Contains data from the
+        contributors_ca_canada: Canada
+        contributors_fi_credit_html: |
+          %{finland}: Contains data from the
            National Land Survey of Finland's Topographic Database
            National Land Survey of Finland's Topographic Database
-          and other datasets, under the
-          <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">NLSFI License</a>.
-        contributors_fr_html: |
-          <strong>France</strong>: Contains data sourced from
+          and other datasets, under the %{nlsfi_license_link}.
+        contributors_fi_finland: Finland
+        contributors_fi_nlsfi_license: NLSFI License
+        contributors_fi_nlsfi_license_url: https://www.maanmittauslaitos.fi/en/opendata-licence-version1
+        contributors_fr_credit_html: |
+          %{france}: Contains data sourced from
            Direction Générale des Impôts.
            Direction Générale des Impôts.
-        contributors_nl_html: |
-          <strong>Netherlands</strong>: Contains &copy; AND data, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: |
-          <strong>New Zealand</strong>: Contains data sourced from the
-          <a href="https://data.linz.govt.nz/">LINZ Data Service</a> and
-          licensed for reuse under
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_si_html: |
-          <strong>Slovenia</strong>: Contains data from the
-          <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> and
-          <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
+        contributors_fr_france: France
+        contributors_nl_credit_html: |
+          %{netherlands}: Contains &copy; AND data, 2007 (%{and_link})
+        contributors_nl_netherlands: Netherlands
+        contributors_nl_and: www.and.com
+        contributors_nl_and_url: https://www.and.com
+        contributors_nz_credit_html: |
+          %{new_zealand}: Contains data sourced from the %{linz_data_service_link}
+          and licensed for reuse under %{cc_by_link}.
+        contributors_nz_new_zealand: New Zealand
+        contributors_nz_linz_data_service: LINZ Data Service
+        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_si_credit_html: |
+          %{slovenia}: Contains data from the %{gu_link} and %{mkgp_link}
            (public information of Slovenia).
            (public information of Slovenia).
-        contributors_es_html: |
-          <strong>Spain</strong>: Contains data sourced from the
-          Spanish National Geographic Institute (<a href="http://www.ign.es/">IGN</a>) and
-          National Cartographic System (<a href="http://www.scne.es/">SCNE</a>)
-          licensed for reuse under <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_za_html: |
-          <strong>South Africa</strong>: Contains data sourced from
-          <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, State copyright reserved.
-        contributors_gb_html: |
-          <strong>United Kingdom</strong>: Contains Ordnance
+        contributors_si_slovenia: Slovenia
+        contributors_si_gu: Surveying and Mapping Authority
+        contributors_si_gu_url: http://www.gu.gov.si/en/
+        contributors_si_mkgp: Ministry of Agriculture, Forestry and Food
+        contributors_si_mkgp_url: http://www.mkgp.gov.si/en/
+        contributors_es_credit_html: |
+          %{spain}: Contains data sourced from the
+          Spanish National Geographic Institute (%{ign_link}) and
+          National Cartographic System (%{scne_link})
+          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_scne: SCNE
+        contributors_es_scne_url: http://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_za_ngi_url: http://www.ngi.gov.za/
+        contributors_gb_credit_html: |
+          %{united_kingdom}: Contains Ordnance
            Survey data &copy; Crown copyright and database right
            2010-2023.
            Survey data &copy; Crown copyright and database right
            2010-2023.
-        contributors_footer_1_html: |
+        contributors_gb_united_kingdom: United Kingdom
+        contributors_2_html: |
            For further details of these, and other sources that have been used
            For further details of these, and other sources that have been used
-          to help improve OpenStreetMap, please see the <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">Contributors
-          page</a> on the OpenStreetMap Wiki.
+          to help improve OpenStreetMap, please see the %{contributors_page_link} on the OpenStreetMap Wiki.
+        contributors_2_contributors_page: Contributors page
+        contributors_2_contributors_page_url: https://wiki.openstreetmap.org/wiki/Contributors
          contributors_footer_2_html: |
            Inclusion of data in OpenStreetMap does not imply that the original
            data provider endorses OpenStreetMap, provides any warranty, or
          contributors_footer_2_html: |
            Inclusion of data in OpenStreetMap does not imply that the original
            data provider endorses OpenStreetMap, provides any warranty, or
@@ -2003,15 +2059,22 @@ en:
            OSM contributors are reminded never to add data from any
            copyrighted sources (e.g. Google Maps or printed maps) without
            explicit permission from the copyright holders.
            OSM contributors are reminded never to add data from any
            copyrighted sources (e.g. Google Maps or printed maps) without
            explicit permission from the copyright holders.
-        infringement_2_html: |
+        infringement_2_1_html: |
            If you believe that copyrighted material has been inappropriately
            added to the OpenStreetMap database or this site, please refer
            If you believe that copyrighted material has been inappropriately
            added to the OpenStreetMap database or this site, please refer
-          to our <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">takedown
-          procedure</a> or file directly at our
-          <a href="https://dmca.openstreetmap.org/">on-line filing page</a>.
-        trademarks_title_html: <span id="trademarks"></span>Trademarks
-        trademarks_1_html: |
-          OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please see our <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Trademark Policy</a>.
+          to our %{takedown_procedure_link} or file directly at our
+          %{online_filing_page_link}.
+        infringement_2_1_takedown_procedure: takedown procedure
+        infringement_2_1_takedown_procedure_url: https://wiki.osmfoundation.org/wiki/Takedown_procedure
+        infringement_2_1_online_filing_page: on-line filing page
+        infringement_2_1_online_filing_page_url: https://dmca.openstreetmap.org/
+        trademarks_title: Trademarks
+        trademarks_1_1_html: |
+          OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the
+          OpenStreetMap Foundation. If you have questions about your use of the marks, please see our
+          %{trademark_policy_link}.
+        trademarks_1_1_trademark_policy: Trademark Policy
+        trademarks_1_1_trademark_policy_url: https://wiki.osmfoundation.org/wiki/Trademark_Policy
      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."
@@ -2081,8 +2144,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:
@@ -2114,10 +2177,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
@@ -2372,7 +2431,7 @@ en:
      trace:
        pending: "PENDING"
        count_points:
      trace:
        pending: "PENDING"
        count_points:
-        one: "1 point"
+        one: "%{count} point"
          other: "%{count} points"
        more: "more"
        trace_details: "View Trace Details"
          other: "%{count} points"
        more: "more"
        trace_details: "View Trace Details"
@@ -2567,6 +2626,10 @@ en:
        auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one."
        continue: Sign Up
        terms accepted: "Thanks for accepting the new contributor terms!"
        auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one."
        continue: Sign Up
        terms accepted: "Thanks for accepting the new contributor terms!"
+      email_confirmation_help_html: 'Your address is not displayed publicly, see our %{privacy_policy_link} for more information.'
+      privacy_policy: privacy policy
+      privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy
+      privacy_policy_title: OSMF privacy policy including section on email addresses
      terms:
        title: "Terms"
        heading: "Terms"
      terms:
        title: "Terms"
        heading: "Terms"
@@ -2750,19 +2813,19 @@ en:
        time_past_html: "Ended %{time}."
        block_duration:
          hours:
        time_past_html: "Ended %{time}."
        block_duration:
          hours:
-          one: "1 hour"
+          one: "%{count} hour"
            other: "%{count} hours"
          days:
            other: "%{count} hours"
          days:
-          one: "1 day"
+          one: "%{count} day"
            other: "%{count} days"
          weeks:
            other: "%{count} days"
          weeks:
-          one: "1 week"
+          one: "%{count} week"
            other: "%{count} weeks"
          months:
            other: "%{count} weeks"
          months:
-          one: "1 month"
+          one: "%{count} month"
            other: "%{count} months"
          years:
            other: "%{count} months"
          years:
-          one: "1 year"
+          one: "%{count} year"
            other: "%{count} years"
      blocks_on:
        title: "Blocks on %{name}"
            other: "%{count} years"
      blocks_on:
        title: "Blocks on %{name}"
@@ -2878,10 +2941,10 @@ en:
        locate:
          title: Show My Location
          metersPopup:
        locate:
          title: Show My Location
          metersPopup:
-          one: You are within one meter of this point
+          one: You are within %{count} meter of this point
            other: You are within %{count} meters of this point
          feetPopup:
            other: You are within %{count} meters of this point
          feetPopup:
-          one: You are within one foot of this point
+          one: You are within %{count} foot of this point
            other: You are within %{count} feet of this point
        base:
          standard: Standard
            other: You are within %{count} feet of this point
        base:
          standard: Standard
@@ -2897,13 +2960,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
+      opnvkarte_credit: "Tiles courtesy of %{memomaps_link}"
+      memomaps: MeMoMaps
+      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