X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2f00256c4cd72c253207ed0c78d11aaa60d00562..6ca7ab3c7e1d0e8a15becbbad4adfc03efda4ff1:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4a93e0a0d..6479895d6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -162,6 +162,13 @@ en:
         way: way
         relation: relation
         changeset: changeset
+    timeout:
+      sorry: "Sorry, the data for the {{type}} with the id {{id}}, took too long to retrieve."
+      type:
+        node: node
+        way: way
+        relation: relation
+        changeset: changeset
     paging_nav:
       showing_page: "Showing page"
       of: "of"
@@ -400,10 +407,10 @@ en:
           bank: "Bank"
           bar: "Bar"
           bench: "Bench"
-          bicycle_parking: "Bicycle Parking"
-          bicycle_rental: "Bicycle Rental"
+          bicycle_parking: "Cycle Parking"
+          bicycle_rental: "Cycle Rental"
           brothel: "Brothel"
-          bureau_de_change: "Bureau De Change"
+          bureau_de_change: "Bureau de Change"
           bus_station: "Bus Station"
           cafe: "Cafe"
           car_rental: "Car Rental"
@@ -450,7 +457,7 @@ en:
           park: "Park"
           parking: "Parking"
           pharmacy: "Pharmacy"
-          place_of_worship: "Place Of Worship"
+          place_of_worship: "Place of Worship"
           police: "Police"
           post_box: "Post Box"
           post_office: "Post Office"
@@ -472,16 +479,16 @@ en:
           studio: "Studio"
           supermarket: "Supermarket"
           taxi: "Taxi"
-          telephone: "Telephone"
+          telephone: "Public Telephone"
           theatre: "Theatre"
           toilets: "Toilets"
           townhall: "Town Hall"
           university: "University"
           vending_machine: "Vending Machine"
-          veterinary: "Veterinary"
+          veterinary: "Veterinary Surgery"
           village_hall: "Village Hall"
           waste_basket: "Waste Basket"
-          wifi: "WiFi"
+          wifi: "WiFi Access"
           youth_centre: "Youth Centre"
         boundary:
           administrative: "Administrative Boundary"
@@ -514,14 +521,15 @@ en:
           store: "Store"
           terrace: "Terrace"
           tower: "Tower"
-          train_station: "Train Station"
+          train_station: "Railway Station"
           university: "University Building"
+          yes: "Building"
         highway:
           bridleway: "Bridleway"
-          bus_guideway: "Bus Guideway"
+          bus_guideway: "Guided Bus Lane"
           bus_stop: "Bus Stop"
           byway: "Byway"
-          construction: "Highway Construction"
+          construction: "Highway under Construction"
           cycleway: "Cycle Path"
           distance_marker: "Distance Marker"
           emergency_access_point: "Emergency Access Point"
@@ -532,17 +540,17 @@ en:
           minor: "Minor Road"
           motorway: "Motorway"
           motorway_junction: "Motorway Junction"
-          motorway_link: "Motorway Link"
+          motorway_link: "Motorway Road"
           path: "Path"
           pedestrian: "Pedestrian Way"
           platform: "Platform"
           primary: "Primary Road"
-          primary_link: "Primary Link Road"
+          primary_link: "Primary Road"
           raceway: "Raceway"
           residential: "Residential"
           road: "Road"
           secondary: "Secondary Road"
-          secondary_link: "Secondary Link Road"
+          secondary_link: "Secondary Road"
           service: "Service Road"
           services: "Motorway Services"
           steps: "Steps"
@@ -551,7 +559,7 @@ en:
           track: "Track"
           trail: "Trail"
           trunk: "Trunk Road"
-          trunk_link: "Trunk Link Road"
+          trunk_link: "Trunk Road"
           unclassified: "Unclassified Road"
           unsurfaced: "Unsurfaced Road"
         historic:
@@ -576,9 +584,9 @@ en:
         landuse:
           allotments: "Allotments"
           basin: "Basin"
-          brownfield: "Brownfield"
+          brownfield: "Brownfield Land"
           cemetery: "Cemetery"
-          commercial: "Commercial"
+          commercial: "Commercial Area"
           conservation: "Conservation"
           construction: "Construction"
           farm: "Farm"
@@ -586,11 +594,11 @@ en:
           farmyard: "Farmyard"
           forest: "Forest"
           grass: "Grass"
-          greenfield: "Greenfield"
-          industrial: "Industrial"
+          greenfield: "Greenfield Land"
+          industrial: "Industrial Area"
           landfill: "Landfill"
           meadow: "Meadow"
-          military: "Military"
+          military: "Military Area"
           mine: "Mine"
           mountain: "Mountain"
           nature_reserve: "Nature Reserve"
@@ -601,7 +609,7 @@ en:
           railway: "Railway"
           recreation_ground: "Recreation Ground"
           reservoir: "Reservoir"
-          residential: "Residential"
+          residential: "Residential Area"
           retail: "Retail"
           village_green: "Village Green"
           vineyard: "Vineyard"
@@ -609,8 +617,8 @@ en:
           wood: "Wood"
         leisure:
           beach_resort: "Beach Resort"
-          common: "Common"
-          fishing: "Fishing"
+          common: "Common Land"
+          fishing: "Fishing Area"
           garden: "Garden"
           golf_course: "Golf Course"
           ice_rink: "Ice Rink"
@@ -691,24 +699,24 @@ en:
           village: "Village"
         railway:
           abandoned: "Abandoned Railway"
-          construction: "Railway Construction"
+          construction: "Railway under Construction"
           disused: "Disused Railway"
-          disused_station: "Disused Station"
-          funicular: "Funicular"
+          disused_station: "Disused Railway Station"
+          funicular: "Funicular Railway"
           halt: "Train Stop"
-          historic_station: "Historic Train Station"
-          junction: "Junction"
+          historic_station: "Historic Railway Station"
+          junction: "Railway Junction"
           level_crossing: "Level Crossing"
           light_rail: "Light Rail"
           monorail: "Monorail"
           narrow_gauge: "Narrow Gauge Railway"
-          platform: "Train Platform"
+          platform: "Railway Platform"
           preserved: "Preserved Railway"
           spur: "Railway Spur"
-          station: "Train Station"
-          subway: "Subway"
+          station: "Railway Station"
+          subway: "Subway Station"
           subway_entrance: "Subway Entrance"
-          switch: "Railway Switch"
+          switch: "Railway Points"
           tram: "Tramway"
           tram_stop: "Tram Stop"
           yard: "Railway Yard"
@@ -787,7 +795,7 @@ en:
           alpine_hut: "Alpine Hut"
           artwork: "Artwork"
           attraction: "Attraction"
-          bed_and_breakfast: "Bed And Breakfast"
+          bed_and_breakfast: "Bed and Breakfast"
           cabin: "Cabin"
           camp_site: "Camp Site"
           caravan_site: "Caravan Site"
@@ -838,6 +846,7 @@ en:
       prefix: "{{distance}} {{direction}} of {{type}}"
     results:
       no_results: "No results found"
+      more_results: "More results"
     distance:
       zero: "less than 1km"
       one: "about 1km"
@@ -1226,8 +1235,9 @@ en:
       trace_not_found: "Trace not found!"
       visibility: "Visibility:"
     trace_paging_nav:
-      showing: "Showing page"
-      of: "of"
+      showing_page: "Showing page {{page}}"
+      next: "Next »"
+      previous: "« Previous"
     trace:
       pending: "PENDING"
       count_points: "{{count}} points"
@@ -1238,7 +1248,9 @@ en:
       edit: "edit"
       edit_map: "Edit Map"
       public: "PUBLIC"
+      identifiable: "IDENTIFIABLE"
       private: "PRIVATE"
+      trackable: "TRACKABLE"
       by: "by"
       in: "in"
       map: "map"
@@ -1251,6 +1263,11 @@ en:
       scheduled_for_deletion: "Trace scheduled for deletion"
     make_public:
       made_public: "Trace made public"
+    offline_warning:
+      message: "The GPX file upload system is currently unavailable"
+    offline:
+      heading: "GPX Storage Offline"
+      message: "The GPX file storage and upload system is currently unavailable."
   application:
     require_cookies:
       cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
@@ -1331,10 +1348,15 @@ en:
       create_account: "create an account"
       email or username: "Email Address or Username:"
       password: "Password:"
+      openid: "OpenID:"
+      openid description: "Use your OpenID to login"
+      alternatively: "Alternatively"
       lost password link: "Lost your password?"
       login_button: "Login"
       account not active: "Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account."
       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 misformed"
     lost_password:
       title: "Lost password"
       heading: "Forgotten Password?"
@@ -1365,6 +1387,8 @@ en:
       display name description: "Your publicly displayed username. You can change this later in the preferences."
       password: "Password:"
       confirm password: "Confirm Password:"
+      openID: "OpenID:"
+      openID description: '(Optional) If you have an <a href="http://wiki.openstreetmap.org/wiki/openID">OpenID</a> you can associate it with this account to login'
       signup: Signup
       flash create success message: "User was successfully created. Check your email for a confirmation note, and you will be mapping in no time :-)<br /><br />Please note that you will not be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
     no_such_user:
@@ -1431,6 +1455,10 @@ en:
       title: "Edit account"
       my settings: My settings
       email never displayed publicly: "(never displayed publicly)"
+      openid:
+        openid: "OpenID:"
+        link: "http://wiki.openstreetmap.org/wiki/OpenID"
+        link text: "what is this?"
       public editing:
         heading: "Public editing:"
         enabled: "Enabled. Not anonymous and can edit data."