]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/en.yml
Create a more accurate permissions check message
[rails.git] / config / locales / en.yml
index 4d1ef3b49f28495a1bb86bef5ba905eb63251f2e..d57bc65aafe3078227f59af41110376f273fee9a 100644 (file)
@@ -131,7 +131,6 @@ en:
         title_comment: "Changeset %{id} - %{comment}"
       join_discussion: "Log in to join the discussion"
       discussion: Discussion
-      report: Report this changeset?
       still_open: "Changeset still open - discussion will open once the changeset is closed."
     node:
       title: "Node: %{name}"
@@ -372,7 +371,6 @@ en:
     search:
       title:
         latlon: 'Results from <a href="https://openstreetmap.org/">Internal</a>'
-        uk_postcode: 'Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
         ca_postcode: 'Results from <a href="https://geocoder.ca/">Geocoder.CA</a>'
         osm_nominatim: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
         geonames: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
@@ -386,12 +384,19 @@ en:
           chair_lift: "Chair Lift"
           drag_lift: "Drag Lift"
           gondola: "Gondola Lift"
+          platter: "Platter Lift"
+          pylon: "Pylon"
           station: "Aerialway Station"
+          t-bar: "T-Bar Lift"
         aeroway:
           aerodrome: "Aerodrome"
+          airstrip: "Airstrip"
           apron: "Apron"
           gate: "Gate"
+          hangar: "Hangar"
           helipad: "Helipad"
+          holding_position: "Holding Position"
+          parking_position: "Parking Position"
           runway: "Runway"
           taxiway: "Taxiway"
           terminal: "Terminal"
@@ -426,37 +431,32 @@ en:
           crematorium: "Crematorium"
           dentist: "Dentist"
           doctors: "Doctors"
-          dormitory: "Dormitory"
           drinking_water: "Drinking Water"
           driving_school: "Driving School"
           embassy: "Embassy"
-          emergency_phone: "Emergency Phone"
           fast_food: "Fast Food"
           ferry_terminal: "Ferry Terminal"
-          fire_hydrant: "Fire Hydrant"
           fire_station: "Fire Station"
           food_court: "Food Court"
           fountain: "Fountain"
           fuel: "Fuel"
           gambling: "Gambling"
           grave_yard: "Grave Yard"
-          gym: "Fitness Centre / Gym"
-          health_centre: "Health Centre"
+          grit_bin: "Grit Bin"
           hospital: "Hospital"
           hunting_stand: "Hunting Stand"
           ice_cream: "Ice Cream"
           kindergarten: "Kindergarten"
           library: "Library"
-          market: "Market"
           marketplace: "Marketplace"
           monastery: "Monastery"
           motorcycle_parking: "Motorcycle Parking"
           nightclub: "Night Club"
-          nursery: "Nursery"
           nursing_home: "Nursing Home"
           office: "Office"
           parking: "Parking"
           parking_entrance: "Parking Entrance"
+          parking_space: "Parking Space"
           pharmacy: "Pharmacy"
           place_of_worship: "Place of Worship"
           police: "Police"
@@ -466,7 +466,6 @@ en:
           prison: "Prison"
           pub: "Pub"
           public_building: "Public Building"
-          reception_area: "Reception Area"
           recycling: "Recycling Point"
           restaurant: "Restaurant"
           retirement_home: "Retirement Home"
@@ -491,6 +490,7 @@ en:
           village_hall: "Village Hall"
           waste_basket: "Waste Basket"
           waste_disposal: "Waste Disposal"
+          water_point: "Water Point"
           youth_centre: "Youth Centre"
         boundary:
           administrative: "Administrative Boundary"
@@ -499,6 +499,7 @@ en:
           protected_area : "Protected Area"
         bridge:
           aqueduct: "Aqueduct"
+          boardwalk: "Boardwalk"
           suspension: "Suspension Bridge"
           swing: "Swing Bridge"
           viaduct: "Viaduct"
@@ -518,25 +519,31 @@ en:
           "yes": "Craft Shop"
         emergency:
           ambulance_station: "Ambulance Station"
+          assembly_point: "Assembly Point"
           defibrillator: "Defibrillator"
           landing_site: "Emergency Landing Site"
           phone: "Emergency Phone"
+          water_tank: "Emergency Water Tank"
+          "yes": "Emergency"
         highway:
           abandoned: "Abandoned Highway"
           bridleway: "Bridleway"
           bus_guideway: "Guided Bus Lane"
           bus_stop: "Bus Stop"
           construction: "Highway under Construction"
+          corridor: "Corridor"
           cycleway: "Cycle Path"
           elevator: "Elevator"
           emergency_access_point: "Emergency Access Point"
           footway: "Footpath"
           ford: "Ford"
+          give_way: "Give Way Sign"
           living_street: "Living Street"
           milestone: "Milestone"
           motorway: "Motorway"
           motorway_junction: "Motorway Junction"
           motorway_link: "Motorway Road"
+          passing_place: "Passing Place"
           path: "Path"
           pedestrian: "Pedestrian Way"
           platform: "Platform"
@@ -553,6 +560,7 @@ en:
           services: "Motorway Services"
           speed_camera: "Speed Camera"
           steps: "Steps"
+          stop: "Stop Sign"
           street_lamp: "Street Lamp"
           tertiary: "Tertiary Road"
           tertiary_link: "Tertiary Road"
@@ -561,8 +569,8 @@ en:
           trail: "Trail"
           trunk: "Trunk Road"
           trunk_link: "Trunk Road"
+          turning_loop: "Turning Loop"
           unclassified: "Unclassified Road"
-          unsurfaced: "Unsurfaced Road"
           "yes" : "Road"
         historic:
           archaeological_site: "Archaeological Site"
@@ -581,6 +589,7 @@ en:
           manor: "Manor"
           memorial: "Memorial"
           mine: "Mine"
+          mine_shaft: "Mine Shaft"
           monument: "Monument"
           roman_road: "Roman Road"
           ruins: "Ruins"
@@ -590,6 +599,7 @@ en:
           wayside_cross: "Wayside Cross"
           wayside_shrine: "Wayside Shrine"
           wreck: "Wreck"
+          "yes": "Historic Site"
         junction:
           "yes": "Junction"
         landuse:
@@ -627,9 +637,9 @@ en:
         leisure:
           beach_resort: "Beach Resort"
           bird_hide: "Bird Hide"
-          club: "Club"
           common: "Common Land"
           dog_park: "Dog Park"
+          firepit: "Fire Pit"
           fishing: "Fishing Area"
           fitness_centre: "Fitness Centre"
           fitness_station: "Fitness Station"
@@ -654,15 +664,46 @@ en:
           water_park: "Water Park"
           "yes": "Leisure"
         man_made:
+          adit: "Adit"
+          beacon: "Beacon"
+          beehive: "Bee Hive"
+          breakwater: "Breakwater"
+          bridge: "Bridge"
+          bunker_silo: "Bunker"
+          chimney: "Chimney"
+          crane: "Crane"
+          dolphin: "Mooring Post"
+          dyke: "Dyke"
+          embankment: "Embankment"
+          flagpole: "Flagpole"
+          gasometer: "Gasometer"
+          groyne: "Groyne"
+          kiln: "Kiln"
           lighthouse: "Lighthouse"
+          mast: "Mast"
+          mine: "Mine"
+          mineshaft: "Mine Shaft"
+          monitoring_station: "Monitoring Station"
+          petroleum_well: "Petroleum Well"
+          pier: "Pier"
           pipeline: "Pipeline"
+          silo: "Silo"
+          storage_tank: "Storage Tank"
+          surveillance: "Surveillance"
           tower: "Tower"
+          wastewater_plant: "Wastewater Plant"
+          watermill: "Water Mill"
+          water_tower: "Water Tower"
+          water_well: "Well"
+          water_works: "Water Works"
+          windmill: "Wind Mill"
           works: "Factory"
           "yes": "Man-made"
         military:
           airfield: "Military Airfield"
           barracks: "Barracks"
           bunker: "Bunker"
+          "yes": "Military"
         mountain_pass:
           "yes" : "Mountain Pass"
         natural:
@@ -708,11 +749,14 @@ en:
           accountant: "Accountant"
           administrative: "Administration"
           architect: "Architect"
+          association: "Association"
           company: "Company"
+          educational_institution: "Educational Institution"
           employment_agency: "Employment Agency"
           estate_agent: "Estate Agent"
           government: "Governmental Office"
           insurance: "Insurance Office"
+          it: "IT Office"
           lawyer: "Lawyer"
           ngo: "NGO Office"
           telecommunication: "Telecommunication Office"
@@ -720,9 +764,8 @@ en:
           "yes": "Office"
         place:
           allotments: "Allotments"
-          block: "Block"
-          airport: "Airport"
           city: "City"
+          city_block: "City Block"
           country: "Country"
           county: "County"
           farm: "Farm"
@@ -733,12 +776,13 @@ en:
           islet: "Islet"
           isolated_dwelling: "Isolated Dwelling"
           locality: "Locality"
-          moor: "Moor"
           municipality: "Municipality"
           neighbourhood: "Neighbourhood"
           postcode: "Postcode"
+          quarter: "Quarter"
           region: "Region"
           sea: "Sea"
+          square: "Square"
           state: "State"
           subdivision: "Subdivision"
           suburb: "Suburb"
@@ -750,10 +794,8 @@ en:
           abandoned: "Abandoned Railway"
           construction: "Railway under Construction"
           disused: "Disused Railway"
-          disused_station: "Disused Railway Station"
           funicular: "Funicular Railway"
           halt: "Train Stop"
-          historic_station: "Historic Railway Station"
           junction: "Railway Junction"
           level_crossing: "Level Crossing"
           light_rail: "Light Rail"
@@ -779,6 +821,7 @@ en:
           beauty: "Beauty Shop"
           beverages: "Beverages Shop"
           bicycle: "Bicycle Shop"
+          bookmaker: "Bookmaker"
           books: "Book Shop"
           boutique: "Boutique"
           butcher: "Butcher"
@@ -817,12 +860,16 @@ en:
           hairdresser: "Hairdresser"
           hardware: "Hardware Store"
           hifi: "Hi-Fi"
-          insurance: "Insurance"
+          houseware: "Houseware Shop"
+          interior_decoration: "Interior Decoration"
           jewelry: "Jewelry Shop"
           kiosk: "Kiosk Shop"
+          kitchen: "Kitchen Shop"
           laundry: "Laundry"
+          lottery: "Lottery"
           mall: "Mall"
           market: "Market"
+          massage: "Massage"
           mobile_phone: "Mobile Phone Shop"
           motorcycle: "Motorcycle Shop"
           music: "Music Shop"
@@ -830,21 +877,27 @@ en:
           optician: "Optician"
           organic: "Organic Food Shop"
           outdoor: "Outdoor Shop"
+          paint: "Paint Shop"
+          pawnbroker: "Pawnbroker"
           pet: "Pet Shop"
           pharmacy: "Pharmacy"
           photo: "Photo Shop"
-          salon: "Salon"
+          seafood: "Sea Food"
           second_hand: "Second-hand Shop"
           shoes: "Shoe Shop"
-          shopping_centre: "Shopping Centre"
           sports: "Sports Shop"
           stationery: "Stationery Shop"
           supermarket: "Supermarket"
           tailor: "Tailor"
+          ticket: "Ticket Shop"
+          tobacco: "Tobacco Shop"
           toys: "Toy Shop"
           travel_agency: "Travel Agency"
+          tyres: "Tyre Shop"
+          vacant: "Vacant Shop"
+          variety_store: "Variety Store"
           video: "Video Shop"
-          wine: "Off License"
+          wine: "Wine Store"
           "yes": "Shop"
         tourism:
           alpine_hut: "Alpine Hut"
@@ -868,6 +921,7 @@ en:
           viewpoint: "Viewpoint"
           zoo: "Zoo"
         tunnel:
+          building_passage: "Building Passage"
           culvert: "Culvert"
           "yes": "Tunnel"
         waterway:
@@ -925,31 +979,31 @@ en:
       user_not_found: User does not exist
       issues_not_found: No such issues found
       status: Status
-      number_of_reports: Number of Reports
-      last_updated_at: Last Updated At
-      last_updated_by: Last Updated By
-      link_to_reports: Link to Reports
+      reports: Reports
+      last_updated: Last Updated
+      last_updated_time_html: "<abbr title='%{title}'>%{time} ago</abbr>"
+      last_updated_time_user_html: "<abbr title='%{title}'>%{time} ago</abbr> by %{user}"
+      link_to_reports: View Reports
       reported_user: Reported User
-      link_to_reported_instance: Link to Reported Instance
-      states:
-        ignored: Ignored
-        open: Open
-        resolved: Resolved
+      reports_count:
+        one: "1 Report"
+        other: "%{count} Reports"
+      reported_item: Reported Item
     create:
       successful_report: Your report has been registered sucessfully
       provide_details: Please provide the required details
     update:
-      new_report: Your report been registered sucessfully
+      new_report: Your report has been registered sucessfully
       successful_update: Your report has been updated successfully
       provide_details: Please provide the required details
     new:
-      details: Please provide some more details into the problem. (This field cannot be left blank!)
-      select: Select a reason for your report
+      details: Please provide some more details about the problem (required).
+      select: "Select a reason for your report:"
       disclaimer:
-        intro: Before sending in a report for official action, be sure that
-        not_just_mistake: You are sure that the problem is not just a mistake
-        unable_to_fix: You are unable to fix the problem yourself
-        resolve_with_user: You have tried to resolve the problem with the user
+        intro: "Before sending your report to the site moderators, please ensure that:"
+        not_just_mistake: You are certain that the problem is not just a mistake
+        unable_to_fix: You are unable to fix the problem yourself or with the help of your fellow community members
+        resolve_with_user: You have already tried to resolve the problem with the user concerned
     show:
       title: "%{status} Issue #%{issue_id}"
       reports:
@@ -973,42 +1027,37 @@ en:
     comments:
       created_at: "On %{datetime}"
     reports:
-      category: "Category: %{category}"
       updated_at: "On %{datetime}"
-      reported_by_html: "Reported by <a href=\"%{user_url}\">%{user_name}</a>"
+      reported_by_html: "Reported as %{category} by %{user}"
     resolved: Issue status has been set to 'Resolved'
     ignored: Issue status has been set to 'Ignored'
     reopened: Issue status has been set to 'Open'
+    states:
+      ignored: Ignored
+      open: Open
+      resolved: Resolved
   reports:
     new:
       title_html: "Report %{link}"
     categories:
-      DiaryEntry:
-        spam: This Diary Entry is/contains spam
-        offensive: This Diary Entry is obscene/offensive
-        threat: This Diary Entry contains a threat
-        other: Other
-      DiaryComment:
-        spam: This Diary Comment is/contains spam
-        offensive: This Diary Comment is obscene/offensive
-        threat: This Diary Comment contains a threat
+      diary_entry:
+        spam: This diary entry is/contains spam
+        offensive: This diary entry is obscene/offensive
+        threat: This diary entry contains a threat
         other: Other
-      User:
-        spam: This User profile is/contains spam
-        offensive: This User profile is obscene/offensive
-        threat: This User profile contains a threat
-        vandal: This User is a vandal
+      diary_comment:
+        spam: This diary comment is/contains spam
+        offensive: This diary comment is obscene/offensive
+        threat: This diary comment contains a threat
         other: Other
-      Changeset:
-        undiscussed_import: This changeset is an undiscussed import
-        mechanical_edit: This changeset is a mechanical edit
-        edit_error: This changeset contains a newbie or an editor error
-        spam: This changeset is/contains spam
-        vandalism: This changeset is/contains vandalism
+      user:
+        spam: This user profile is/contains spam
+        offensive: This user profile is obscene/offensive
+        threat: This user profile contains a threat
+        vandal: This user is a vandal
         other: Other
-      Note:
+      note:
         spam: This note is spam
-        vandalism: This note is vandalism
         personal: This note contains personal data
         abusive: This note is abusive
         other: Other
@@ -1188,7 +1237,7 @@ en:
         <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
       trademarks_title_html: <span id="trademarks"></span>Trademarks
       trademarks_1_html: |
-        OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please send your questions to the <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence Working Group</a>.
+        OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please see our <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Trademark Policy</a>.
   welcome_page:
     title: Welcome!
     introduction_html: |
@@ -1339,6 +1388,8 @@ en:
       <br>
       Please <a href='https://osmfoundation.org/Contact'>contact the OSMF</a>
       if you have licensing, copyright or other legal questions and issues.
+      <br>
+      OpenStreetMap, the magnifying glass logo and State of the Map are <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">registered trademarks of the OSMF</a>.
     partners_title: Partners
   notifier:
     diary_comment_notification:
@@ -1534,6 +1585,7 @@ en:
       where_am_i: "Where is this?"
       where_am_i_title: Describe the current location using the search engine
       submit_text: "Go"
+      reverse_directions_text: "Reverse Directions"
     key:
       table:
         entry:
@@ -1711,7 +1763,7 @@ en:
       public_traces: "Public GPS traces"
       your_traces: "Your GPS traces"
       public_traces_from: "Public GPS traces from %{user}"
-      description: "Browse recent GPS track uploads"
+      description: "Browse recent GPS trace uploads"
       tagged_with: " tagged with %{tags}"
       empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
     delete:
@@ -1737,6 +1789,8 @@ en:
       not_an_admin: You need to be an admin to perform that action.
     require_moderator:
       not_a_moderator: "You need to be a moderator to perform that action."
+    require_moderator_or_admin:
+      not_a_moderator_or_admin: You need to be a moderator or an admin to perform that action
     setup_user_auth:
       blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. You need to read the message before you will be able to save your edits."
       blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
@@ -2383,8 +2437,18 @@ en:
       instructions:
         continue_without_exit: Continue on %{name}
         slight_right_without_exit: Slight right onto %{name}
-        offramp_right_without_exit: Take the ramp on the right onto %{name}
+        offramp_right: Take the ramp on the right
+        offramp_right_with_exit: Take exit %{exit} on the right
+        offramp_right_with_exit_name: Take exit %{exit} on the right onto %{name}
+        offramp_right_with_exit_directions: Take exit %{exit} on the right towards %{directions}
+        offramp_right_with_exit_name_directions: Take exit %{exit} on the right onto %{name}, towards %{directions}
+        offramp_right_with_name: Take the ramp on the right onto %{name}
+        offramp_right_with_directions: Take the ramp on the right towards %{directions}
+        offramp_right_with_name_directions: Take the ramp on the right onto %{name}, towards %{directions}
         onramp_right_without_exit: Turn right on the ramp onto %{name}
+        onramp_right_with_directions: Turn right onto the ramp towards %{directions}
+        onramp_right_with_name_directions: Turn right on the ramp onto %{name}, towards %{directions}
+        onramp_right_without_directions: Turn right onto the ramp
         endofroad_right_without_exit: At the end of the road turn right onto %{name}
         merge_right_without_exit: Merge right onto %{name}
         fork_right_without_exit: At the fork turn right onto %{name}
@@ -2393,18 +2457,28 @@ en:
         uturn_without_exit: U-turn along %{name}
         sharp_left_without_exit: Sharp left onto %{name}
         turn_left_without_exit: Turn left onto %{name}
-        offramp_left_without_exit: Take the ramp on the left onto %{name}
+        offramp_left: Take the ramp on the left
+        offramp_left_with_exit: Take exit %{exit} on the left
+        offramp_left_with_exit_name: Take exit %{exit} on the left onto %{name}
+        offramp_left_with_exit_directions: Take exit %{exit} on the left towards %{directions}
+        offramp_left_with_exit_name_directions: Take exit %{exit} on the left onto %{name}, towards %{directions}
+        offramp_left_with_name: Take the ramp on the left onto %{name}
+        offramp_left_with_directions: Take the ramp on the left towards %{directions}
+        offramp_left_with_name_directions: Take the ramp on the left onto %{name}, towards %{directions}
         onramp_left_without_exit: Turn left on the ramp onto %{name}
+        onramp_left_with_directions: Turn left onto the ramp towards %{directions}
+        onramp_left_with_name_directions: Turn left on the ramp onto %{name}, towards %{directions}
+        onramp_left_without_directions: Turn left onto the ramp
         endofroad_left_without_exit: At the end of the road turn left onto %{name}
         merge_left_without_exit: Merge left onto %{name}
         fork_left_without_exit: At the fork turn left onto %{name}
         slight_left_without_exit: Slight left onto %{name}
         via_point_without_exit: (via point)
         follow_without_exit: Follow %{name}
-        roundabout_without_exit: At roundabout take %{name}
+        roundabout_without_exit: At roundabout take exit onto %{name}
         leave_roundabout_without_exit: Leave roundabout - %{name}
         stay_roundabout_without_exit: Stay on roundabout - %{name}
-        start_without_exit: Start at end of %{name}
+        start_without_exit: Start on %{name}
         destination_without_exit: Reach destination
         against_oneway_without_exit: Go against one-way on %{name}
         end_oneway_without_exit: End of one-way on %{name}