X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c4cdcc1ee1e7617ef0010759c7b3130c735c4308..b90d27cdff7893b6e814cc0a93272d193114e81b:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5a1cd3a51..ee316f055 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -97,7 +97,7 @@ en:
browse:
changeset:
title: "Changeset"
- changeset: "Changeset: %{id}"
+ changeset: "Changeset %{id}"
changesetxml: "Changeset XML"
osmchangexml: "osmChange XML"
feed:
@@ -127,30 +127,25 @@ en:
prev_note_tooltip: "Previous note"
next_note_tooltip: "Next note"
changeset_details:
- created_at: "Created at:"
- closed_at: "Closed at:"
- belongs_to: "Belongs to:"
- bounding_box: "Bounding box:"
- no_bounding_box: "No bounding box has been stored for this changeset."
- show_area_box: "Show Area Box"
- box: "box"
- has_nodes:
- one: "Has the following %{count} node:"
- other: "Has the following %{count} nodes:"
- has_ways:
- one: "Has the following %{count} way:"
- other: "Has the following %{count} ways:"
- has_relations:
- one: "Has the following %{count} relation:"
- other: "Has the following %{count} relations:"
+ created_at: "Created"
+ closed_at: "Closed"
+ belongs_to: "Author"
+ node: "Nodes (%{count})"
+ node_paginated: "Nodes (%{x}-%{y} of %{count})"
+ way: "Ways (%{count})"
+ way_paginated: "Ways (%{x}-%{y} of %{count})"
+ relation: "Relations (%{count})"
+ relation_paginated: "Relations (%{x}-%{y} of %{count})"
+ no_comment: "(no comment)"
+ ago: "%{ago} ago"
+ by: "by"
common_details:
- edited_at: "Edited at:"
- edited_by: "Edited by:"
- deleted_at: "Deleted at:"
- deleted_by: "Deleted by:"
- version: "Version:"
- in_changeset: "In changeset:"
- changeset_comment: "Comment:"
+ edited: "Edited"
+ deleted: "Deleted"
+ by: "by"
+ version: "Version"
+ in_changeset: "Changeset"
+ changeset_comment: "Comment"
containing_relation:
entry: "Relation %{relation_name}"
entry_role: "Relation %{relation_name} (as %{relation_role})"
@@ -197,9 +192,6 @@ en:
way: way
relation: relation
changeset: changeset
- paging_nav:
- showing_page: "page"
- of: "of"
redacted:
redaction: "Redaction %{id}"
message_html: "Version %{version} of this %{type} cannot be shown as it has been redacted. Please see %{redaction_link} for details."
@@ -266,7 +258,7 @@ en:
way: "Way %{id}"
# There is no 'relation' type because it is not represented in OpenLayers
tag_details:
- tags: "Tags:"
+ tags: "Tags"
wiki_link:
key: "The wiki description page for the %{key} tag"
tag: "The wiki description page for the %{key}=%{value} tag"
@@ -292,13 +284,14 @@ en:
title: "Note"
open_title: "Unresolved note: %{note_name}"
closed_title: "Resolved note: %{note_name}"
- opened: "Opened:"
- last_modified: "Last modified:"
- closed: "Closed:"
+ opened: "Opened"
+ last_modified: "Last modified"
+ closed: "Closed"
at_html: "%{when} ago"
at_by_html: "%{when} ago by %{user}"
- description: "Description:"
- comments: "Comments:"
+ description: "Description"
+ comments: "Comments"
+ anonymous: "anonymous"
changeset:
changeset_paging_nav:
showing_page: "Page %{page}"
@@ -307,7 +300,7 @@ en:
changeset:
still_editing: "(still editing)"
anonymous: "Anonymous"
- no_comment: "(none)"
+ no_comment: "(no comment)"
no_edits: "(no edits)"
show_area_box: "show area box"
big_area: "(big)"
@@ -321,24 +314,11 @@ en:
list:
title: "Changesets"
title_user: "Changesets by %{user}"
- title_bbox: "Changesets within %{bbox}"
- title_user_bbox: "Changesets by %{user} within %{bbox}"
title_friend: "Changesets by your friends"
title_nearby: "Changesets by nearby users"
- heading: "Changesets"
- heading_user: "Changesets"
- heading_bbox: "Changesets"
- heading_user_bbox: "Changesets"
- heading_friend: "Changesets"
- heading_nearby: "Changesets"
- description: "Browse recent contributions to the map"
- description_user: "Changesets by %{user}"
- description_bbox: "Changesets within %{bbox}"
- description_user_bbox: "Changesets by %{user} within %{bbox}"
- description_friend: "Changesets by your friends"
- description_nearby: "Changesets by nearby users"
- empty_user_html: "It looks you haven't made any edits yet. To get started, check out the Beginners Guide."
- empty_anon_html: "No edits made yet."
+ empty: "No changesets in this area."
+ no_more: "No more changesets in this area."
+ load_more: "Load more"
timeout:
sorry: "Sorry, the list of changesets you requested took too long to retrieve."
diary_entry:
@@ -462,15 +442,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 +548,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 +578,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 +602,7 @@ en:
platform: "Platform"
primary: "Primary Road"
primary_link: "Primary Road"
+ proposed: "Proposed Road"
raceway: "Raceway"
residential: "Residential"
rest_area: "Rest Area"
@@ -623,6 +613,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 +630,7 @@ en:
building: "Building"
castle: "Castle"
church: "Church"
+ citywalls: "City Walls"
fort: "Fort"
house: "House"
icon: "Icon"
@@ -648,6 +640,7 @@ en:
monument: "Monument"
museum: "Museum"
ruins: "Ruins"
+ tomb: "Tomb"
tower: "Tower"
wayside_cross: "Wayside Cross"
wayside_shrine: "Wayside Shrine"
@@ -786,6 +779,7 @@ en:
locality: "Locality"
moor: "Moor"
municipality: "Municipality"
+ neighbourhood: "Neighbourhood"
postcode: "Postcode"
region: "Region"
sea: "Sea"
@@ -811,8 +805,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 +824,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 +839,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 +876,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 +913,7 @@ en:
viewpoint: "Viewpoint"
zoo: "Zoo"
tunnel:
+ culvert: "Culvert"
"yes": "Tunnel"
waterway:
artificial: "Artificial Waterway"
@@ -973,24 +977,15 @@ 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"
- log_in: log in
+ home: Go to Home Location
+ logout: Logout
+ log_in: Log In
log_in_tooltip: Log in with an existing account
- sign_up: sign up
+ sign_up: Sign Up
sign_up_tooltip: Create an account for editing
- view: View
- view_tooltip: View the map
edit: Edit
history: History
+ export: Export
data: Data
export_data: Export Data
gps_traces: GPS Traces
@@ -999,13 +994,9 @@ en:
user_diaries_tooltip: View user diaries
edit_with: Edit with %{editor}
tag_line: The Free Wiki World Map
- intro_1: "OpenStreetMap is a free worldwide map, created by people like you."
- intro_2_html: "The data is free to %{download} and %{use} under its %{license}. %{create_account} to improve the map."
+ intro_header: Welcome to OpenStreetMap!
+ intro_text: OpenStreetMap is a free and editable map of the world maintained by an active community of contributors.
intro_2_create_account: "Create a user account"
- intro_2_license: "open license"
- intro_2_use: "use"
- intro_2_download: "download"
- intro_2_use_url: "http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap"
partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}."
partners_ucl: "the UCL VR Centre"
partners_ic: "Imperial College London"
@@ -1015,16 +1006,8 @@ en:
osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
- donate_link_text: donating
help: Help
- help_centre: Help Centre
- help_url: http://help.openstreetmap.org/
- help_title: Help site for the project
- wiki: Wiki
- wiki_url: http://wiki.openstreetmap.org/
- wiki_title: Wiki site for the project
- documentation: Documentation
- documentation_title: Documentation for the project
+ about: About
copyright: "Copyright & License"
community: Community
community_blogs: "Community Blogs"
@@ -1034,7 +1017,7 @@ en:
make_a_donation:
title: Support OpenStreetMap with a monetary donation
text: Make a Donation
-
+ learn_more: "Learn More"
license_page:
foreign:
title: About this translation
@@ -1061,7 +1044,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 +1052,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 +1087,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
@@ -1180,8 +1163,9 @@ en:
questions:
title: Any questions?
paragraph_1_html: |
- Need help mapping, or not clear on how to use OpenStreetMap? Get your questions answered
- on the help website.
+ OpenStreetMap has several resources for learning about the project, asking and answering
+ questions, and collaboratively discussing and documenting mapping topics.
+ Get help here.
start_mapping: Start Mapping
add_a_note:
title: No Time To Edit? Add a Note!
@@ -1192,6 +1176,51 @@ en:
Just go to the map and click the note icon:
. This will add a marker to the map, which you can move
by dragging. Add your message, then click save, and other mappers will investigate.
+ help_page:
+ title: Getting Help
+ introduction: |
+ OpenStreetMap has several resources for learning about the project, asking and answering questions,
+ and collaboratively discussing and documenting mapping topics.
+ welcome:
+ url: http://www.openstreetmap.org/welcome
+ title: Welcome to OSM
+ description: Start with this quick guide covering the OpenStreetMap basics.
+ help:
+ url: https://help.openstreetmap.org/
+ title: help.openstreetmap.org
+ description: Ask a question or look up answers on OSM's question-and-answer site.
+ wiki:
+ url: http://wiki.openstreetmap.org/
+ title: wiki.openstreetmap.org
+ description: Browse the wiki for in-depth OSM documentation.
+ about_page:
+ next: Next
+ copyright_html: ©OpenStreetMap
contributors
+ used_by: "%{name} powers map data on hundreds of web sites, mobile apps, and hardware devices"
+ lede_text: |
+ OSM is built by a community of local mappers that keeps data about
+ roads, cafés, subway stations, and much more up to date every day.
+ local_knowledge_title: Local Knowledge
+ local_knowledge_html: |
+ OpenStreetMap emphasizes local knowledge. Contributors use
+ aerial imagery, GPS devices, and low-tech field maps to verify that OSM
+ is up to date and accurate.
+ community_driven_title: Community Driven
+ community_driven_html: |
+ From the engineers that tune OSM's servers to the Humanitarian OSM Team
+ that maps disaster-affected areas, OSM's community is diverse,
+ passionate, and growing every day. To learn more about the community,
+ see the user diaries,
+ community blogs, and
+ the OSM Foundation website.
+ open_data_title: Open Data
+ open_data_html: |
+ OpenStreetMap is open data: you are free to use it for any purpose
+ as long as you credit OpenStreetMap and its contributors. If you alter or
+ build upon the data in certain ways, you may distribute the result only
+ under the same licence. See the Copyright and
+ License page for details.
+ partners_title: Partners
notifier:
diary_comment_notification:
subject: "[OpenStreetMap] %{user} commented on your diary entry"
@@ -1271,7 +1300,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:
@@ -1368,7 +1397,6 @@ en:
where_am_i: "Where am I?"
where_am_i_title: Describe the current location using the search engine
submit_text: "Go"
- search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' more examples..."
key:
table:
entry:
@@ -1555,6 +1583,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 +1789,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 +1839,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 +1916,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 +2144,20 @@ 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"
+ donate_link_text: "Make a Donation"
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 +2178,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"