Update to iD v1.7.2

[rails.git] / config / locales / en-GB.yml

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 9e46ca07ce3f78844b2634b1d4af4ab6d94cbcb3..9f908a63c41ac19fd3a150af5be10c1744137f6d 100644 (file)
--- 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
@@ -1674,7 +1663,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 +1675,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 +1720,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 +1830,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:
@@ -2223,6 +2180,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