X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c4cdcc1ee1e7617ef0010759c7b3130c735c4308..aaeca5b5346b01d7ef26a301492804d36049eff8:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5a1cd3a51..a1938079f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -462,15 +462,20 @@ en:
geocoder:
search:
title:
- latlon: 'Results from Internal'
us_postcode: 'Results from Geocoder.us'
uk_postcode: 'Results from NPEMap / FreeThe Postcode'
ca_postcode: 'Results from Geocoder.CA'
osm_nominatim: 'Results from OpenStreetMap Nominatim'
geonames: 'Results from GeoNames'
+ osm_nominatim_reverse: 'Results from OpenStreetMap Nominatim'
+ geonames_reverse: 'Results from GeoNames'
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 +568,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 +598,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 +622,7 @@ en:
platform: "Platform"
primary: "Primary Road"
primary_link: "Primary Road"
+ proposed: "Proposed Road"
raceway: "Raceway"
residential: "Residential"
rest_area: "Rest Area"
@@ -623,6 +633,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 +650,7 @@ en:
building: "Building"
castle: "Castle"
church: "Church"
+ citywalls: "City Walls"
fort: "Fort"
house: "House"
icon: "Icon"
@@ -648,6 +660,7 @@ en:
monument: "Monument"
museum: "Museum"
ruins: "Ruins"
+ tomb: "Tomb"
tower: "Tower"
wayside_cross: "Wayside Cross"
wayside_shrine: "Wayside Shrine"
@@ -786,6 +799,7 @@ en:
locality: "Locality"
moor: "Moor"
municipality: "Municipality"
+ neighbourhood: "Neighbourhood"
postcode: "Postcode"
region: "Region"
sea: "Sea"
@@ -811,8 +825,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 +844,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 +859,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 +896,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 +933,7 @@ en:
viewpoint: "Viewpoint"
zoo: "Zoo"
tunnel:
+ culvert: "Culvert"
"yes": "Tunnel"
waterway:
artificial: "Artificial Waterway"
@@ -973,16 +997,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
@@ -1061,7 +1077,7 @@ en:
intro_3_html: |
The cartography in our map tiles, and our documentation, are
licensed under the Creative
- Commons Attribution-ShareAlike 2.0 license (CC-BY-SA).
+ Commons Attribution-ShareAlike 2.0 license (CC BY-SA).
credit_title_html: How to credit OpenStreetMap
credit_1_html: |
We require that you use the credit “© OpenStreetMap
@@ -1069,7 +1085,7 @@ en:
credit_2_html: |
You must also make it clear that the data is available under the Open
Database License, and if using our map tiles, that the cartography is
- licensed as CC-BY-SA. You may do this by linking to
+ licensed as CC BY-SA. You may do this by linking to
this copyright page.
Alternatively, and as a requirement if you are distributing OSM in a
data form, you can name and link directly to the license(s). In media
@@ -1104,7 +1120,7 @@ en:
Stadt Wien (under
CC BY),
Land Vorarlberg and
- Land Tirol (under CC-BY AT with amendments).
+ Land Tirol (under CC BY AT with amendments).
contributors_ca_html: |
Canada: Contains data from
GeoBase®, GeoGratis (© Department of Natural
@@ -1271,7 +1287,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 +1571,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 +1777,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 +1827,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"
@@ -1880,7 +1904,7 @@ en:
press confirm button: "Press the confirm button below to activate your account."
button: Confirm
already active: "This account has already been confirmed."
- unknown token: "That token doesn't seem to exist."
+ unknown token: "That confirmation code has expired or does not exist."
reconfirm_html: "If you need us to resend the confirmation email, click here."
confirm_resend:
success: "We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.
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."
@@ -2108,22 +2132,21 @@ en:
cycle_map: Cycle Map
transport_map: Transport Map
mapquest: MapQuest Open
+ hot: Humanitarian
layers:
header: Map Layers
notes: Map Notes
data: Map Data
overlays: Enable overlays for troubleshooting the map
+ title: "Layers"
copyright: "© OpenStreetMap contributors"
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."
@@ -2144,6 +2167,7 @@ en:
reactivate: Reactivate
comment_and_resolve: Comment & Resolve
comment: Comment
+ edit_help: Move the map and zoom in on a location you want to edit, then click here.
redaction:
edit:
description: "Description"