X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5bb55c23152a448b4128be32f46178a13926cb74..40d94818b2e9a9cd41e47389317cda8d01527028:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6207ca61f..56890371c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -4,6 +4,7 @@ en:
time:
formats:
friendly: "%e %B %Y at %H:%M"
+ blog: "%e %B %Y"
activerecord:
# Translates all the model names, which is used in error handling on the web site
models:
@@ -84,6 +85,9 @@ en:
potlatch:
name: "Potlatch 1"
description: "Potlatch 1 (in-browser editor)"
+ id:
+ name: "iD"
+ description: "iD (in-browser editor)"
potlatch2:
name: "Potlatch 2"
description: "Potlatch 2 (in-browser editor)"
@@ -93,7 +97,7 @@ en:
browse:
changeset:
title: "Changeset"
- changeset: "Changeset: %{id}"
+ changeset: "Changeset %{id}"
changesetxml: "Changeset XML"
osmchangexml: "osmChange XML"
feed:
@@ -123,30 +127,21 @@ 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"
+ has_nodes: "Nodes (%{count})"
+ has_ways: "Ways (%{count})"
+ has_relations: "Relations (%{count})"
+ no_comment: "(no comment)"
+ ago: "%{ago} ago"
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})"
@@ -262,7 +257,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"
@@ -285,15 +280,17 @@ en:
view_history: "View history"
edit: "Edit way"
note:
- open_title: "Unresolved issue: %{note_name}"
- closed_title: "Resolved issue: %{note_name}"
- opened: "Opened:"
- last_modified: "Last modified:"
- closed: "Closed:"
+ title: "Note"
+ open_title: "Unresolved note: %{note_name}"
+ closed_title: "Resolved note: %{note_name}"
+ 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}"
@@ -302,7 +299,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)"
@@ -316,24 +313,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:
@@ -422,7 +406,19 @@ en:
export_details: 'OpenStreetMap data is licensed under the Open Data Commons Open Database License (ODbL).'
too_large:
heading: "Area Too Large"
- body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area."
+ body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the following sources for bulk data downloads:"
+ planet:
+ title: "Planet OSM"
+ description: "Regularly-updated copies of the complete OpenStreetMap database"
+ geofabrik:
+ title: "Geofabrik Downloads"
+ description: "Regularly-updated extracts of continents, countries, and selected cities"
+ metro:
+ title: "Metro Extracts"
+ description: "Extracts for major world cities and their surrounding areas"
+ other:
+ title: "Other Sources"
+ description: "Additional sources listed on the OpenStreetMap wiki"
options: "Options"
format: "Format"
scale: "Scale"
@@ -442,19 +438,23 @@ en:
click_add_marker: "Click on the map to add a marker"
change_marker: "Change marker position"
add_marker: "Add a marker to the map"
- view_larger_map: "View Larger Map"
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"
@@ -547,6 +547,7 @@ en:
shower: "Shower"
social_centre: "Social Centre"
social_club: "Social Club"
+ social_facility: "Social Facility"
studio: "Studio"
supermarket: "Supermarket"
swimming_pool: "Swimming Pool"
@@ -576,6 +577,9 @@ en:
"yes": "Bridge"
building:
"yes": "Building"
+ emergency:
+ fire_hydrant: "Fire Hydrant"
+ phone: "Emergency Phone"
highway:
bridleway: "Bridleway"
bus_guideway: "Guided Bus Lane"
@@ -597,6 +601,7 @@ en:
platform: "Platform"
primary: "Primary Road"
primary_link: "Primary Road"
+ proposed: "Proposed Road"
raceway: "Raceway"
residential: "Residential"
rest_area: "Rest Area"
@@ -607,6 +612,7 @@ en:
services: "Motorway Services"
speed_camera: "Speed Camera"
steps: "Steps"
+ street_lamp: "Street Lamp"
stile: "Stile"
tertiary: "Tertiary Road"
tertiary_link: "Tertiary Road"
@@ -623,6 +629,7 @@ en:
building: "Building"
castle: "Castle"
church: "Church"
+ citywalls: "City Walls"
fort: "Fort"
house: "House"
icon: "Icon"
@@ -632,6 +639,7 @@ en:
monument: "Monument"
museum: "Museum"
ruins: "Ruins"
+ tomb: "Tomb"
tower: "Tower"
wayside_cross: "Wayside Cross"
wayside_shrine: "Wayside Shrine"
@@ -699,6 +707,8 @@ en:
airfield: "Military Airfield"
barracks: "Barracks"
bunker: "Bunker"
+ mountain_pass:
+ "yes" : "Mountain Pass"
natural:
bay: "Bay"
beach: "Beach"
@@ -768,6 +778,7 @@ en:
locality: "Locality"
moor: "Moor"
municipality: "Municipality"
+ neighbourhood: "Neighbourhood"
postcode: "Postcode"
region: "Region"
sea: "Sea"
@@ -793,8 +804,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"
@@ -810,9 +823,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"
@@ -823,6 +838,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"
@@ -859,17 +875,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"
@@ -892,6 +912,7 @@ en:
viewpoint: "Viewpoint"
zoo: "Zoo"
tunnel:
+ culvert: "Culvert"
"yes": "Tunnel"
waterway:
artificial: "Artificial Waterway"
@@ -915,6 +936,14 @@ en:
waterfall: "Waterfall"
water_point: "Water Point"
weir: "Weir"
+ admin_levels:
+ level2: "Country Boundary"
+ level4: "State Boundary"
+ level5: "Region Boundary"
+ level6: "County Boundary"
+ level8: "City Boundary"
+ level9: "Village Boundary"
+ level10: "Suburb Boundary"
description:
title:
osm_nominatim: 'Location from OpenStreetMap Nominatim'
@@ -947,39 +976,28 @@ 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
- export_tooltip: Export map data
+ data: Data
+ export_data: Export Data
gps_traces: GPS Traces
gps_traces_tooltip: Manage GPS traces
user_diaries: User Diaries
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"
@@ -989,16 +1007,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"
@@ -1035,7 +1045,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
@@ -1043,7 +1053,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
@@ -1078,7 +1088,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
@@ -1122,6 +1132,115 @@ en:
to our takedown
procedure or file directly at our
on-line filing page.
+ welcome_page:
+ title: Welcome!
+ introduction_html: |
+ Welcome to OpenStreetMap, the free and editable map of the world. Now that you're signed
+ up, you're all set to get started mapping. Here's a quick guide with the most important
+ things you need to know.
+ whats_on_the_map:
+ title: What's on the Map
+ on_html: |
+ OpenStreetMap is a place for mapping things that are both real and current -
+ it includes millions of buildings, roads, and other details about places. You can map
+ whatever real-world features are interesting to you.
+ off_html: |
+ What it doesn't include is opinionated data like ratings, historical or
+ hypothetical features, and data from copyrighted sources. Unless you have special
+ permission, don't copy from online or paper maps.
+ basic_terms:
+ title: Basic Terms For Mapping
+ paragraph_1_html: |
+ OpenStreetMap has some of its own lingo. Here are a few key words that'll come in handy.
+ editor_html: |
+ An editor is a program or website you can use to edit the map.
+ node_html: |
+ A node is a point on the map, like a single restauraunt or a tree.
+ way_html: |
+ A way is a line or area, like a road, stream, lake or building.
+ tag_html: |
+ A tag is a bit of data about a node or way, like a
+ restaurant's name or a road's speed limit.
+ questions:
+ title: Any questions?
+ paragraph_1_html: |
+ 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!
+ paragraph_1_html: |
+ If you just want something small fixed and don't have the time to sign up and learn how to edit, it's
+ easy to add a note.
+ paragraph_2_html: |
+ 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.
+ photo_caption_0_html: |
+ @mikel working on
+ Map Kibera, a project to map the
+ largest slum in Nairobi, Kenya.
+ © watato
+ 2010
+ photo_caption_1_html: |
+ @lxbarth and
+ @limareis survey Brasilia with
+ walking papers.
+ © mapbox
+ 2012
+ photo_caption_2_html: |
+ @TODO caption (source)
+ photo_caption_3_html: |
+ @TODO caption (source)
+ photo_caption_4_html: |
+ @TODO caption (source)
+ photo_caption_5_html: |
+ @TODO caption (source)
notifier:
diary_comment_notification:
subject: "[OpenStreetMap] %{user} commented on your diary entry"
@@ -1132,8 +1251,7 @@ en:
subject_header: "[OpenStreetMap] %{subject}"
hi: "Hi %{to_user},"
header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
- footer1: "You can also read the message at %{readurl}"
- footer2: "and you can reply at %{replyurl}"
+ footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}"
friend_notification:
subject: "[OpenStreetMap] %{user} added you as a friend"
had_added_you: "%{user} has added you as a friend on OpenStreetMap."
@@ -1159,35 +1277,12 @@ en:
greeting: "Hi there!"
created: "Someone (hopefully you) just created an account at %{site_url}."
confirm: "Before we do anything else, we need to confirm that this request came from you, so if it did then please click the link below to confirm your account:"
- welcome: "We would like to welcome you and provide you with some additional information to get you started."
- signup_confirm_plain:
- introductory_video: "You can watch an introductory video to OpenStreetMap here:"
- more_videos: "There are more videos here:"
- the_wiki: "Get reading about OpenStreetMap on the wiki:"
- the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"
- blog_and_twitter: "Catch up with the latest news via the OpenStreetMap blog or Twitter:"
- opengeodata: "OpenGeoData.org is OpenStreetMap founder Steve Coast's blog, and it has podcasts too:"
- ask_questions: "You can ask any questions you may have about OpenStreetMap at our question and answer site:"
- wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
- wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
- user_wiki_page: "It is recommended that you create a user wiki page, which includes category tags noting where you are, such as [[Category:Users_in_London]]."
- current_user: "A list of current users in categories, based on where in the world they are, is available from:"
- signup_confirm_html:
- introductory_video: "You can watch an %{introductory_video_link}."
- video_to_openstreetmap: "introductory video to OpenStreetMap"
- more_videos: "There are %{more_videos_link}."
- more_videos_here: "more videos here"
- get_reading: Get reading about OpenStreetMap on the wiki, catch up with the latest news via the OpenStreetMap blog or Twitter, or browse through OpenStreetMap founder Steve Coast's OpenGeoData blog for the potted history of the project, which has podcasts to listen to also!
- ask_questions: You can ask any questions you may have about OpenStreetMap at our question and answer site.
- wiki_signup: 'You may also want to sign up to the OpenStreetMap wiki.'
- user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as [[Category:Users_in_London]].'
- current_user: 'A list of current users in categories, based on where in the world they are, is available from Category:Users_by_geographical_region.'
+ welcome: "After you confirm your account, we'll provide you with some additional information to get you started."
email_confirm:
subject: "[OpenStreetMap] Confirm your email address"
email_confirm_plain:
greeting: "Hi,"
- hopefully_you_1: "Someone (hopefully you) would like to change their email address over at"
- hopefully_you_2: "%{server_url} to %{new_address}."
+ hopefully_you: "Someone (hopefully you) would like to change their email address over at %{server_url} to %{new_address}."
click_the_link: "If this is you, please click the link below to confirm the change."
email_confirm_html:
greeting: "Hi,"
@@ -1197,8 +1292,7 @@ en:
subject: "[OpenStreetMap] Password reset request"
lost_password_plain:
greeting: "Hi,"
- hopefully_you_1: "Someone (possibly you) has asked for the password to be reset on this"
- hopefully_you_2: "email addresses openstreetmap.org account."
+ hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
click_the_link: "If this is you, please click the link below to reset your password."
lost_password_html:
greeting: "Hi,"
@@ -1206,16 +1300,27 @@ en:
click_the_link: "If this is you, please click the link below to reset your password."
note_comment_notification:
anonymous: An anonymous user
- subject_own: "[OpenStreetMap] %{commenter} has commented on one of your notes"
- subject_other: "[OpenStreetMap] %{commenter} has commented on a note you are interested in"
greeting: "Hi,"
- your_note: "%{commenter} has left a comment on one of your map notes near %{place}."
- commented_note: "%{commenter} has left a comment on a map note you have commented on. The note is near %{place}."
+ commented:
+ subject_own: "[OpenStreetMap] %{commenter} has commented on one of your notes"
+ subject_other: "[OpenStreetMap] %{commenter} has commented on a note you are interested in"
+ your_note: "%{commenter} has left a comment on one of your map notes near %{place}."
+ commented_note: "%{commenter} has left a comment on a map note you have commented on. The note is near %{place}."
+ closed:
+ subject_own: "[OpenStreetMap] %{commenter} has resolved one of your notes"
+ subject_other: "[OpenStreetMap] %{commenter} has resolved a note you are interested in"
+ your_note: "%{commenter} has resolved one of your map notes near %{place}."
+ commented_note: "%{commenter} has resolved a map note you have commented on. The note is near %{place}."
+ reopened:
+ subject_own: "[OpenStreetMap] %{commenter} has reactivated one of your notes"
+ subject_other: "[OpenStreetMap] %{commenter} has reactivated a note you are interested in"
+ your_note: "%{commenter} has reactivated one of your map notes near %{place}."
+ commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
details: "More details about the note can be found at %{url}."
message:
inbox:
title: "Inbox"
- my_inbox: "My inbox"
+ my_inbox: "My Inbox"
outbox: "outbox"
messages: "You have %{new_messages} and %{old_messages}"
new_messages:
@@ -1269,9 +1374,8 @@ en:
date: "Date"
reply_button: "Reply"
unread_button: "Mark as unread"
- back_to_inbox: "Back to inbox"
+ back: "Back"
to: "To"
- back_to_outbox: "Back to outbox"
wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
sent_message_summary:
delete_button: "Delete"
@@ -1303,6 +1407,7 @@ en:
potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)"
potlatch2_not_configured: "Potlatch 2 has not been configured - please see http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for more information"
potlatch2_unsaved_changes: "You have unsaved changes. (To save in Potlatch 2, you should click save.)"
+ id_not_configured: "iD has not been configured"
no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
sidebar:
search_results: Search Results
@@ -1312,10 +1417,7 @@ 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:
- map_key: "Map Key"
- map_key_tooltip: "Key for the map"
table:
entry:
motorway: "Motorway"
@@ -1441,7 +1543,9 @@ en:
upload_trace: "Upload a trace"
see_all_traces: "See all traces"
see_your_traces: "See your traces"
- traces_waiting: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
+ traces_waiting:
+ one: "You have %{count} trace waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
+ other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
trace_optionals:
tags: "Tags"
view:
@@ -1499,6 +1603,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."
@@ -1517,6 +1628,7 @@ en:
allow_write_api: "modify the map."
allow_read_gpx: "read your private GPS traces."
allow_write_gpx: "upload GPS traces."
+ allow_write_notes: "modify notes."
revoke:
flash: "You've revoked the token for %{application}"
oauth_clients:
@@ -1533,7 +1645,7 @@ en:
url: "Request Token URL:"
access_url: "Access Token URL:"
authorize_url: "Authorise URL:"
- support_notice: "We support HMAC-SHA1 (recommended) as well as plain text in SSL mode."
+ support_notice: "We support HMAC-SHA1 (recommended) and RSA-SHA1 signatures."
edit: "Edit Details"
delete: "Delete Client"
confirm: "Are you sure?"
@@ -1544,6 +1656,7 @@ en:
allow_write_api: "modify the map."
allow_read_gpx: "read their private GPS traces."
allow_write_gpx: "upload GPS traces."
+ allow_write_notes: "modify notes."
index:
title: "My OAuth Details"
my_tokens: "My Authorised Applications"
@@ -1568,6 +1681,7 @@ en:
allow_write_api: "modify the map."
allow_read_gpx: "read their private GPS traces."
allow_write_gpx: "upload GPS traces."
+ allow_write_notes: "modify notes."
not_found:
sorry: "Sorry, that %{type} could not be found."
create:
@@ -1588,7 +1702,7 @@ en:
login_button: "Login"
register now: Register now
with username: "Already have an OpenStreetMap account? Please login with your username and password:"
- with openid: "Alternatively please use your OpenID to login:"
+ with openid: "Alternatively, use OpenID to login:"
new to osm: New to OpenStreetMap?
to make changes: To make changes to the OpenStreetMap data, you must have an account.
create account minute: Create an account. It only takes a minute.
@@ -1639,11 +1753,15 @@ en:
flash changed: "Your password has been changed."
flash token bad: "Did not find that token, check the URL maybe?"
new:
- title: "Create account"
- heading: "Create a User Account"
+ title: "Sign Up"
no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
contact_webmaster: 'Please contact the webmaster to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
- fill_form: "Fill in the form and we will send you a quick email to activate your account."
+ about:
+ header: Free and editable
+ html: |
+
Unlike other maps, OpenStreetMap is completely created by people like you, + and it's free for anyone to fix, update, download and use.
+Sign up to get started contributing. We'll send an email to confirm your account.
license_agreement: 'When you confirm your account you will need to agree to the contributor terms.' email address: "Email Address:" confirm email address: "Confirm Email Address:" @@ -1665,16 +1783,14 @@ en: with your OpenID in your user settings. - continue: Continue - flash welcome: "Thanks for signing up. We've sent a welcome message to %{email} with some hints on getting started." - flash create success message: "Thanks for signing up. We've sent a confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.