X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6b3ab915c8ee1627fb888f83be7264cb3599610e..76d365ce71b942466d07480ded13098860d4f1b3:/config/locales/en-GB.yml?ds=sidebyside diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 9f908a63c..ebbc14dd7 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -6,6 +6,9 @@ # Author: Caliburn # Author: Captaindogfish # Author: Chase me ladies, I'm the Cavalry +# Author: Jagwar +# Author: Kosovastar +# Author: Meno25 # Author: Shirayuki --- en-GB: @@ -936,9 +939,10 @@ en-GB: legal_babble: title_html: Copyright and Licence intro_1_html: |- - OpenStreetMap is open data, licenced under the open data, licensed under the Open Data - Commons Open Database Licence (ODbL). + Commons Open Database Licence (ODbL) by the OpenStreetMap Foundation (OSMF). intro_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. @@ -972,6 +976,7 @@ en-GB: more_title_html: Finding out more more_1_html: |- Read more about using our data, and how to credit us, at the OSMF Licence page and the community Legal FAQ. more_2_html: Although OpenStreetMap is open data, we cannot provide a free-of-charge @@ -1358,9 +1363,7 @@ en-GB: primary: Primary road secondary: Secondary road unclassified: Unclassified road - unsurfaced: Unsurfaced road track: Track - byway: Byway bridleway: Bridleway cycleway: Cycleway footway: Footway @@ -1384,7 +1387,6 @@ en-GB: golf: Golf course park: Park resident: Residential area - tourist: Tourist attraction common: - Common - meadow @@ -1414,7 +1416,6 @@ en-GB: tunnel: Dashed casing = tunnel bridge: Black casing = bridge private: Private access - permissive: Permissive access destination: Destination access construction: Roads under construction richtext_area: @@ -1905,7 +1906,7 @@ en-GB: press confirm button: Press the confirm button below to confirm your new e-mail address. button: Confirm - success: Confirmed your e-mail address, thanks for signing up! + success: Confirmed your change of email address! failure: An e-mail address has already been confirmed with this token. set_home: flash success: Home location saved successfully