]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/en.yml
Update to rails 4.0.0
[rails.git] / config / locales / en.yml
index 9709b87781ccd27c05ff775237d5db3bc3dffc0f..555eab34498c5b0c75fbd84925b6818d66637221 100644 (file)
@@ -471,6 +471,10 @@ en:
     search_osm_nominatim:
       prefix_format: "%{name}"
       prefix:
+        aerialway:
+          chair_lift: "Chair Lift"
+          drag_lift: "Drag Lift"
+          station: "Aerialway Station"
         aeroway:
           aerodrome: "Aerodrome"
           apron: "Apron"
@@ -563,6 +567,7 @@ en:
           shower: "Shower"
           social_centre: "Social Centre"
           social_club: "Social Club"
+          social_facility: "Social Facility"
           studio: "Studio"
           supermarket: "Supermarket"
           swimming_pool: "Swimming Pool"
@@ -592,6 +597,9 @@ en:
           "yes": "Bridge"
         building:
           "yes": "Building"
+        emergency:
+          fire_hydrant: "Fire Hydrant"
+          phone: "Emergency Phone"
         highway:
           bridleway: "Bridleway"
           bus_guideway: "Guided Bus Lane"
@@ -613,6 +621,7 @@ en:
           platform: "Platform"
           primary: "Primary Road"
           primary_link: "Primary Road"
+          proposed: "Proposed Road"
           raceway: "Raceway"
           residential: "Residential"
           rest_area: "Rest Area"
@@ -623,6 +632,7 @@ en:
           services: "Motorway Services"
           speed_camera: "Speed Camera"
           steps: "Steps"
+          street_lamp: "Street Lamp"
           stile: "Stile"
           tertiary: "Tertiary Road"
           tertiary_link: "Tertiary Road"
@@ -639,6 +649,7 @@ en:
           building: "Building"
           castle: "Castle"
           church: "Church"
+          citywalls: "City Walls"
           fort: "Fort"
           house: "House"
           icon: "Icon"
@@ -648,6 +659,7 @@ en:
           monument: "Monument"
           museum: "Museum"
           ruins: "Ruins"
+          tomb: "Tomb"
           tower: "Tower"
           wayside_cross: "Wayside Cross"
           wayside_shrine: "Wayside Shrine"
@@ -786,6 +798,7 @@ en:
           locality: "Locality"
           moor: "Moor"
           municipality: "Municipality"
+          neighbourhood: "Neighbourhood"
           postcode: "Postcode"
           region: "Region"
           sea: "Sea"
@@ -811,8 +824,10 @@ en:
           narrow_gauge: "Narrow Gauge Railway"
           platform: "Railway Platform"
           preserved: "Preserved Railway"
+          proposed: "Proposed Railway"
           spur: "Railway Spur"
           station: "Railway Station"
+          stop: "Railway Stop"
           subway: "Subway Station"
           subway_entrance: "Subway Entrance"
           switch: "Railway Points"
@@ -828,9 +843,11 @@ en:
           beverages: "Beverages Shop"
           bicycle: "Bicycle Shop"
           books: "Book Shop"
+          boutique: "Boutique"
           butcher: "Butcher"
           car: "Car Shop"
           car_parts: "Car Parts"
+          car_repair: "Car Repair"
           carpet: "Carpet Shop"
           car_repair: "Car Repair"
           charity: "Charity Shop"
@@ -841,6 +858,7 @@ en:
           convenience: "Convenience Store"
           copyshop: "Copy Shop"
           cosmetics: "Cosmetics Shop"
+          deli: "Deli"
           department_store: "Department Store"
           discount: "Discount Items Shop"
           doityourself: "Do-It-Yourself"
@@ -877,17 +895,21 @@ en:
           organic: "Organic Food Shop"
           outdoor: "Outdoor Shop"
           pet: "Pet Shop"
+          pharmacy: "Pharmacy"
           photo: "Photo Shop"
           salon: "Salon"
+          second_hand: "Second-hand Shop"
           shoes: "Shoe Shop"
           shopping_centre: "Shopping Centre"
           sports: "Sports Shop"
           stationery: "Stationery Shop"
           supermarket: "Supermarket"
+          tailor: "Tailor"
           toys: "Toy Shop"
           travel_agency: "Travel Agency"
           video: "Video Shop"
           wine: "Off License"
+          "yes": "Shop"
         tourism:
           alpine_hut: "Alpine Hut"
           artwork: "Artwork"
@@ -910,6 +932,7 @@ en:
           viewpoint: "Viewpoint"
           zoo: "Zoo"
         tunnel:
+          culvert: "Culvert"
           "yes": "Tunnel"
         waterway:
           artificial: "Artificial Waterway"
@@ -973,16 +996,8 @@ en:
       h1: OpenStreetMap
     logo:
       alt_text: OpenStreetMap logo
-    welcome_user_link_tooltip: Your user page
-    home: home
-    home_tooltip: Go to home location
-    inbox_html: "inbox %{count}"
-    inbox_tooltip:
-      zero: Your inbox contains no unread messages
-      one: Your inbox contains 1 unread message
-      other: Your inbox contains %{count} unread messages
-    logout: logout
-    logout_tooltip: "Log out"
+    home: Go to Home Location
+    logout: Logout
     log_in: log in
     log_in_tooltip: Log in with an existing account
     sign_up: sign up
@@ -1271,7 +1286,7 @@ en:
   message:
     inbox:
       title: "Inbox"
-      my_inbox: "My inbox"
+      my_inbox: "My Inbox"
       outbox: "outbox"
       messages: "You have %{new_messages} and %{old_messages}"
       new_messages:
@@ -1555,6 +1570,13 @@ en:
     offline:
       heading: "GPX Storage Offline"
       message: "The GPX file storage and upload system is currently unavailable."
+    georss:
+      title: "OpenStreetMap GPS Traces"
+    description:
+      description_with_count:
+        one: "GPX file with %{count} point from %{user}"
+        other: "GPX file with %{count} points from %{user}"
+      description_without_count: "GPX file from %{user}"
   application:
     require_cookies:
       cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
@@ -1754,23 +1776,24 @@ en:
       heading: "The user %{user} does not exist"
       body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
     view:
-      my diary: my diary
+      my diary: My Diary
       new diary entry: new diary entry
-      my edits: my edits
-      my traces: my traces
-      my notes: my map notes
-      my settings: my settings
-      my comments: my comments
+      my edits: My Edits
+      my traces: My Traces
+      my notes: My Notes
+      my profile: My Profile
+      my settings: My Settings
+      my comments: My Comments
       oauth settings: oauth settings
-      blocks on me: blocks on me
-      blocks by me: blocks by me
-      send message: send message
-      diary: diary
-      edits: edits
-      traces: traces
-      notes: map notes
-      remove as friend: unfriend
-      add as friend: add friend
+      blocks on me: Blocks on Me
+      blocks by me: Blocks by Me
+      send message: Send Message
+      diary: Diary
+      edits: Edits
+      traces: Traces
+      notes: Map Notes
+      remove as friend: Unfriend
+      add as friend: Add Friend
       mapper since: "Mapper since:"
       ago: "(%{time_in_words_ago} ago)"
       ct status: "Contributor terms:"
@@ -1803,7 +1826,7 @@ en:
           moderator: "Revoke moderator access"
       block_history: "blocks received"
       moderator_history: "blocks given"
-      comments: "comments"
+      comments: "Comments"
       create_block: "block this user"
       activate_user: "activate this user"
       deactivate_user: "deactivate this user"
@@ -2117,13 +2140,10 @@ en:
     site:
       edit_tooltip: Edit the map
       edit_disabled_tooltip: Zoom in to edit the map
-      edit_zoom_alert: You must zoom in to edit the map
       history_tooltip: View edits for this area
       history_disabled_tooltip: Zoom in to view edits for this area
-      history_zoom_alert: You must zoom in to view edits for this area
       createnote_tooltip: Add a note to the map
       createnote_disabled_tooltip: Zoom in to add a note to the map
-      createnote_zoom_alert: You must zoom in to add a note to the map
     notes:
       new:
         intro: "In order to improve the map the information you enter is shown to other mappers, so please be as descriptive and precise as possible when moving the marker to the correct position and entering your note below."