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

This commit is contained in:
Tom Hughes 2020-10-21 15:12:05 +01:00
commit 843635e1b3

View file

@ -1248,10 +1248,6 @@ en:
level8: "City Boundary" level8: "City Boundary"
level9: "Village Boundary" level9: "Village Boundary"
level10: "Suburb 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: types:
cities: Cities cities: Cities
towns: Towns towns: Towns
@ -2282,7 +2278,6 @@ en:
<p>Unlike other maps, OpenStreetMap is completely created by people like you, <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> 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> <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:" email address: "Email Address:"
confirm email address: "Confirm 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' 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'