X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/27e0084e8f18744e065a75e60b9b7a684470ffca..76d365ce71b942466d07480ded13098860d4f1b3:/config/locales/en-GB.yml?ds=sidebyside

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 9e46ca07c..ebbc14dd7 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -3,8 +3,12 @@
 # Export driver: phpyaml
 # Author: Bpfhjquevaps
 # Author: Bruce89
+# Author: Caliburn
 # Author: Captaindogfish
 # Author: Chase me ladies, I'm the Cavalry
+# Author: Jagwar
+# Author: Kosovastar
+# Author: Meno25
 # Author: Shirayuki
 ---
 en-GB:
@@ -429,6 +433,7 @@ en-GB:
           charging_station: Charging Station
           cinema: Cinema
           clinic: Clinic
+          clock: Clock
           college: College
           community_centre: Community Centre
           courthouse: Courthouse
@@ -554,7 +559,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 +870,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 +939,10 @@ en-GB:
     legal_babble:
       title_html: Copyright and Licence
       intro_1_html: |-
-        OpenStreetMap is <i>open data</i>, licenced under the <a
+        OpenStreetMap is <i>open data</i>, licensed under the <a
         href="http://opendatacommons.org/licenses/odbl/">Open Data
-        Commons Open Database Licence</a> (ODbL).
+        Commons Open Database Licence</a> (ODbL) by the  <a
+        href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (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 +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 <a
+        href="http://osmfoundation.org/Licence">OSMF Licence page</a> and the community <a
         href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
         FAQ</a>.
       more_2_html: Although OpenStreetMap is open data, we cannot provide a free-of-charge
@@ -1369,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
@@ -1395,7 +1387,6 @@ en-GB:
           golf: Golf course
           park: Park
           resident: Residential area
-          tourist: Tourist attraction
           common:
           - Common
           - meadow
@@ -1425,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:
@@ -1674,7 +1664,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 +1676,7 @@ en-GB:
         activity.<br />Please contact the <a href="%{webmaster}">webmaster</a> 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 +1721,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: |-
-        <p>Your OpenID is not associated with a OpenStreetMap account yet.</p>
-        <ul>
-          <li>If you are new to OpenStreetMap, please create a new account using the form below.</li>
-          <li>
-            If you already have an account, you can login to your account using your username and password and then associate the account with your OpenID in your user settings.
-          </li>
-        </ul>
       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 +1831,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 +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
@@ -2223,6 +2181,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