From: Tom Hughes <tom@compton.nu>
Date: Wed, 21 Oct 2020 14:12:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2899'
X-Git-Tag: live~2855
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/843635e1b3b5e200da5099e8a1ec3d805676bcb9?hp=-c

Merge remote-tracking branch 'upstream/pull/2899'
---

843635e1b3b5e200da5099e8a1ec3d805676bcb9
diff --combined config/locales/en.yml
index b41fb064a,d2437ca16..71139e55c
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -254,8 -254,8 +254,8 @@@ en
        relation: "Relations (%{count})"
        relation_paginated: "Relations (%{x}-%{y} of %{count})"
        comment: "Comments (%{count})"
 -      hidden_commented_by: "Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
 -      commented_by: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
 +      hidden_commented_by_html: "Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
 +      commented_by_html: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
        changesetxml: "Changeset XML"
        osmchangexml: "osmChange XML"
        feed:
@@@ -337,15 -337,15 +337,15 @@@
        open_title: "Unresolved note #%{note_name}"
        closed_title: "Resolved note #%{note_name}"
        hidden_title: "Hidden note #%{note_name}"
 -      opened_by: "Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
 -      opened_by_anonymous: "Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
 -      commented_by: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
 -      commented_by_anonymous: "Comment from anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
 -      closed_by: "Resolved by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
 -      closed_by_anonymous: "Resolved by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
 -      reopened_by: "Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
 -      reopened_by_anonymous: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
 -      hidden_by: "Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
 +      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:
@@@ -1248,10 -1248,6 +1248,6 @@@
          level8: "City Boundary"
          level9: "Village Boundary"
          level10: "Suburb Boundary"
-     description:
-       title:
-         osm_nominatim: 'Location from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
-         geonames: 'Location from <a href="http://www.geonames.org/">GeoNames</a>'
        types:
          cities: Cities
          towns: Towns
@@@ -2282,7 -2278,6 +2278,6 @@@
            <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>
-       license_agreement: 'When you confirm your account you will need to agree to the <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a>.'
        email address: "Email Address:"
        confirm email address: "Confirm Email Address:"
        not_displayed_publicly_html: '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'
@@@ -2458,7 -2453,7 +2453,7 @@@
        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>."
      confirm_resend:
 -      success: "We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist %{sender} as we are unable to reply to any confirmation requests."
 +      success_html: "We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist %{sender} as we are unable to reply to any confirmation requests."
        failure: "User %{name} not found."
      confirm_email:
        heading: Confirm a change of email address