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~2966
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/843635e1b3b5e200da5099e8a1ec3d805676bcb9?hp=e80571c22c91061c3fc5f3b6fc164522d05031cb

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index b41fb064a..71139e55c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1248,10 +1248,6 @@ en:
         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 @@ en:
           <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'