X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/27e0084e8f18744e065a75e60b9b7a684470ffca..37e48911e0719dfc0af8e4d34b0c91861f23b1c4:/config/locales/en-GB.yml?ds=sidebyside diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 9e46ca07c..feb0c4f2f 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -3,6 +3,7 @@ # Export driver: phpyaml # Author: Bpfhjquevaps # Author: Bruce89 +# Author: Caliburn # Author: Captaindogfish # Author: Chase me ladies, I'm the Cavalry # Author: Shirayuki @@ -429,6 +430,7 @@ en-GB: charging_station: Charging Station cinema: Cinema clinic: Clinic + clock: Clock college: College community_centre: Community Centre courthouse: Courthouse @@ -554,7 +556,7 @@ en-GB: archaeological_site: Archaeological Site battlefield: Battlefield boundary_stone: Boundary Stone - building: Building + building: Historic Building castle: Castle church: Church citywalls: City Walls @@ -865,19 +867,6 @@ en-GB: results: no_results: No results found more_results: More results - distance: - zero: less than 1km - one: about 1km - other: about %{count}km - direction: - south_west: south-west - south: south - south_east: south-east - east: east - north_east: north-east - north: north - north_west: north-west - west: west layouts: project_name: title: OpenStreetMap @@ -947,9 +936,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. @@ -983,6 +973,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 @@ -1674,7 +1665,6 @@ en-GB: register now: Register now with username: 'Already have an OpenStreetMap account? Please login with your username and password:' - with openid: 'Alternatively, use OpenID to login:' new to osm: New to OpenStreetMap? to make changes: To make changes to the OpenStreetMap data, you must have an account. @@ -1687,25 +1677,7 @@ en-GB: activity.
Please contact the webmaster if you wish to discuss this. auth failure: Sorry, could not log in with those details. - openid missing provider: Sorry, could not contact your OpenID provider - openid invalid: Sorry, your OpenID seems to be malformed openid_logo_alt: Log in with an OpenID - openid_providers: - openid: - title: Login with OpenID - alt: Login with an OpenID URL - google: - title: Login with Google - alt: Login with a Google OpenID - yahoo: - title: Login with Yahoo - alt: Login with a Yahoo OpenID - wordpress: - title: Login with Wordpress - alt: Login with a Wordpress OpenID - aol: - title: Login with AOL - alt: Login with an AOL OpenID logout: title: Logout heading: Logout of OpenStreetMap @@ -1750,20 +1722,8 @@ en-GB: display name: 'Display Name:' display name description: Your publicly displayed username. You can change this later in the preferences. - openid: '%{logo} OpenID:' password: 'Password:' confirm password: 'Confirm Password:' - use openid: Alternatively, use %{logo} OpenID to login - openid no password: With OpenID a password is not required, but some extra tools - or server may still need one. - openid association: |- -

Your OpenID is not associated with a OpenStreetMap account yet.

- continue: Sign Up terms accepted: Thanks for accepting the new contributor terms! terms declined: We are sorry that you have decided to not accept the new Contributor @@ -1872,7 +1832,6 @@ en-GB: new email address: 'New Email Address:' email never displayed publicly: (never displayed publicly) openid: - openid: 'OpenID:' link: http://wiki.openstreetmap.org/wiki/OpenID link text: what is this? public editing: @@ -1948,7 +1907,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 @@ -2223,6 +2182,8 @@ en-GB: comment: Comment edit_help: Move the map and zoom in on a location you want to edit, then click here. + directions: + time: Time query: node: Node way: Way