Merge pull request #5876 from AntonKhorev/history-page-links

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index c3b958802bc83c1070f49634249a4c20c979e1cc..329027d5e7993851364d782000ecb0a13d638324 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -357,9 +357,6 @@ en-GB:
         sorry: Sorry, the list of changeset comments you requested took too long to
           retrieve.
   changesets:
-    changeset:
-      no_edits: (no edits)
-      view_changeset_details: View changeset details
     index:
       title: Changesets
       title_user: Changesets by %{user}
@@ -391,11 +388,8 @@ en-GB:
       changesetxml: Changeset XML
       osmchangexml: osmChange XML
     paging_nav:
-      nodes: Nodes (%{count})
       nodes_paginated: Nodes (%{x}-%{y} of %{count})
-      ways: Ways (%{count})
       ways_paginated: Ways (%{x}-%{y} of %{count})
-      relations: Relations (%{count})
       relations_paginated: Relations (%{x}-%{y} of %{count})
     timeout:
       sorry: Sorry, the list of changesets you requested took too long to retrieve.
@@ -404,6 +398,8 @@ en-GB:
       km away: '%{count}km away'
       m away: '%{count}m away'
       latest_edit_html: 'Latest edit (%{ago}):'
+      no_edits: (no edits)
+      view_changeset_details: View changeset details
     popup:
       your location: Your location
       nearby mapper: Nearby mapper
@@ -1055,6 +1051,9 @@ en-GB:
     results:
       no_results: No results found
       more_results: More results
+  directions:
+    search:
+      title: Directions
   issues:
     page:
       reports: Reports
@@ -1429,64 +1428,6 @@ en-GB:
       where_am_i_title: Describe the current location using the search engine
       submit_text: Go
       reverse_directions_text: Reverse Directions
-    key:
-      table:
-        entry:
-          motorway: Motorway
-          main_road: Main road
-          trunk: Trunk road
-          primary: Primary road
-          secondary: Secondary road
-          unclassified: Unclassified road
-          track: Track
-          bridleway: Bridleway
-          cycleway: Cycleway
-          cycleway_national: National cycleway
-          cycleway_regional: Regional cycleway
-          cycleway_local: Local cycleway
-          footway: Footway
-          rail: Railway
-          subway: Subway
-          cable_car: Cable car
-          chair_lift: Chairlift
-          runway: Airport Runway
-          taxiway: Taxiway
-          apron: Airport apron
-          admin: Administrative boundary
-          forest: Forest
-          wood: Wood
-          golf: Golf course
-          park: Park
-          common: Common
-          resident: Residential area
-          retail: Retail area
-          industrial: Industrial area
-          commercial: Commercial area
-          heathland: Heathland
-          lake: Lake
-          reservoir: Reservoir
-          farm: Farm
-          brownfield: Brownfield site
-          cemetery: Cemetery
-          allotments: Allotments
-          pitch: Sports pitch
-          centre: Sports centre
-          reserve: Nature reserve
-          military: Military area
-          school: School
-          university: University
-          building: Significant building
-          station: Railway station
-          summit: Summit
-          peak: Peak
-          tunnel: Dashed casing = tunnel
-          bridge: Black casing = bridge
-          private: Private access
-          destination: Destination access
-          construction: Roads under construction
-          bicycle_shop: Bicycle shop
-          bicycle_parking: Bicycle parking
-          toilets: Toilets
     welcome:
       title: Welcome!
       introduction: Welcome to OpenStreetMap, the free and editable map of the world.
@@ -1505,6 +1446,64 @@ en-GB:
         title: No Time To Edit? Add a Note!
         para_1: If you just want something small fixed and don't have the time to
           sign up and learn how to edit, it's easy to add a note.
+  map_keys:
+    show:
+      entries:
+        motorway: Motorway
+        main_road: Main road
+        trunk: Trunk road
+        primary: Primary road
+        secondary: Secondary road
+        unclassified: Unclassified road
+        track: Track
+        bridleway: Bridleway
+        cycleway: Cycleway
+        cycleway_national: National cycleway
+        cycleway_regional: Regional cycleway
+        cycleway_local: Local cycleway
+        footway: Footway
+        rail: Railway
+        subway: Subway
+        cable_car: Cable car
+        chair_lift: Chairlift
+        runway: Airport Runway
+        taxiway: Taxiway
+        apron: Airport apron
+        admin: Administrative boundary
+        forest: Forest
+        wood: Wood
+        golf: Golf course
+        park: Park
+        common: Common
+        resident: Residential area
+        retail: Retail area
+        industrial: Industrial area
+        commercial: Commercial area
+        heathland: Heathland
+        lake: Lake
+        reservoir: Reservoir
+        farm: Farm
+        brownfield: Brownfield site
+        cemetery: Cemetery
+        allotments: Allotments
+        pitch: Sports pitch
+        centre: Sports centre
+        reserve: Nature reserve
+        military: Military area
+        school: School
+        university: University
+        building: Significant building
+        station: Railway station
+        summit: Summit
+        peak: Peak
+        tunnel: Dashed casing = tunnel
+        bridge: Black casing = bridge
+        private: Private access
+        destination: Destination access
+        construction: Roads under construction
+        bicycle_shop: Bicycle shop
+        bicycle_parking: Bicycle parking
+        toilets: Toilets
   traces:
     visibility:
       private: Private (only shared as anonymous, unordered points)
@@ -1582,12 +1581,6 @@ en-GB:
     require_cookies:
       cookies_needed: You appear to have cookies disabled - please enable cookies
         in your browser before continuing.
-    setup_user_auth:
-      blocked: Your access to the API has been blocked. Please log-in to the web interface
-        to find out more.
-      need_to_see_terms: Your access to the API is temporarily suspended. Please log-in
-        to the web interface to view the Contributor Terms. You do not need to agree,
-        but you must view them.
   oauth:
     permissions:
       missing: You have not permitted the application access to this facility
@@ -1838,7 +1831,6 @@ en-GB:
     directions:
       ascend: Ascend
       descend: Descend
-      directions: Directions
       distance: Distance
       errors:
         no_route: Couldn't find a route between those two places.