X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d218d5bf7d5e980635f8d9a773ab675786f8cea4..dd619fbe73fcd19e2dc4f3e8160158b8d90b3a66:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9027252f7..ac66ba0f5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -131,6 +131,7 @@ en:
title_comment: "Changeset %{id} - %{comment}"
join_discussion: "Log in to join the discussion"
discussion: Discussion
+ report: Report this changeset?
node:
title: "Node: %{name}"
history_title: "Node History: %{name}"
@@ -206,6 +207,7 @@ en:
reopened_by: "Reactivated by %{user} %{when} ago"
reopened_by_anonymous: "Reactivated by anonymous %{when} ago"
hidden_by: "Hidden by %{user} %{when} ago"
+ report: Report this note?
query:
title: "Query Features"
introduction: "Click on the map to find nearby features."
@@ -296,10 +298,12 @@ en:
edit_link: Edit this entry
hide_link: Hide this entry
confirm: Confirm
+ report: Report this entry?
diary_comment:
comment_from: "Comment from %{link_user} on %{comment_created_at}"
hide_link: Hide this comment
confirm: Confirm
+ report: Report this comment?
location:
location: "Location:"
view: "View"
@@ -782,7 +786,6 @@ en:
car_parts: "Car Parts"
car_repair: "Car Repair"
carpet: "Carpet Shop"
- car_repair: "Car Repair"
charity: "Charity Shop"
chemist: "Chemist"
clothes: "Clothes Shop"
@@ -905,6 +908,118 @@ en:
results:
no_results: "No results found"
more_results: "More results"
+ issues:
+ report: Report
+ resolve: Resolve
+ ignore: Ignore
+ reopen: Reopen
+ index:
+ search:
+ user_not_found: User does not exist
+ issues_not_found: No such issues found
+ create:
+ successful_report: Your report has been registered sucessfully
+ provide_details: Please provide the required details
+ update:
+ new_report: Your report 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
+ 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
+ show:
+ comments:
+ reassign: The Issue was reassigned
+ reassign_param: Reassign Issue?
+ comment:
+ provide_details: Please provide the required details
+ comment_created: Your comment was successfully created
+ resolved: Issue status has been set to 'Resolved'
+ ignored: Issue status has been set to 'Ignored'
+ reopened: Issue status has been set to 'Open'
+ report_strings:
+ DiaryEntry:
+ spam:
+ type: "[SPAM]"
+ details: This Diary Entry is/contains spam
+ offensive:
+ type: "[OFFENSIVE]"
+ details: This Diary Entry is obscene/offensive
+ threat:
+ type: "[THREAT]"
+ details: This Diary Entry contains a threat
+ other:
+ type: "[OTHER]"
+ details: Other
+ DiaryComment:
+ spam:
+ type: "[SPAM]"
+ details: This Diary Comment is/contains spam
+ offensive:
+ type: "[OFFENSIVE]"
+ details: This Diary Comment is obscene/offensive
+ threat:
+ type: "[THREAT]"
+ details: This Diary Comment contains a threat
+ other:
+ type: "[OTHER]"
+ details: Other
+ User:
+ spam:
+ type: "[SPAM]"
+ details: This User profile is/contains spam
+ offensive:
+ type: "[OFFENSIVE]"
+ details: This User profile is obscene/offensive
+ threat:
+ type: "[THREAT]"
+ details: This User profile contains a threat
+ vandal:
+ type: "[VANDAL]"
+ details: This User is a vandal
+ other:
+ type: "[OTHER]"
+ details: Other
+ Changeset:
+ undiscussed_import:
+ type: "[UNDISCUSSED-IMPORT]"
+ details: This changeset is an undiscussed import
+ mechanical_edit:
+ type: "[MECH-EDIT]"
+ details: This changeset is a mechanical edit
+ edit_error:
+ type: "[EDIT-ERROR]"
+ details: This changeset contains a newbie or an editor error
+ spam:
+ type: "[SPAM]"
+ details: This changeset is/contains spam
+ vandalism:
+ type: "[VANDALISM]"
+ details: This changeset is/contains vandalism
+ other:
+ type: "[OTHER]"
+ details: Other
+ Note:
+ spam:
+ type: "[SPAM]"
+ details: This note is spam
+ vandalism:
+ type: "[VANDALISM]"
+ details: This note is vandalism
+ personal:
+ type: "[PERSONAL]"
+ details: This note contains personal data
+ abusive:
+ type: "[ABUSIVE]"
+ details: This note is abusive
+ other:
+ type: "[OTHER]"
+ details: Other
layouts:
project_name:
# in
@@ -923,6 +1038,7 @@ en:
edit: Edit
history: History
export: Export
+ issues: Issues
data: Data
export_data: Export Data
gps_traces: GPS Traces
@@ -934,12 +1050,11 @@ en:
intro_header: Welcome to OpenStreetMap!
intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
intro_2_create_account: "Create a user account"
- partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}."
- partners_ucl: "the UCL VR Centre"
+ partners_html: "Hosting is supported by %{ucl}, %{bytemark} and %{ic}, and other %{partners}."
+ partners_ucl: "UCL"
partners_ic: "Imperial College London"
partners_bytemark: "Bytemark Hosting"
partners_partners: "partners"
- partners_url: "http://wiki.openstreetmap.org/wiki/Partners"
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."
@@ -1013,10 +1128,10 @@ en:
FAQ</a>.
more_2_html: |
Although OpenStreetMap is open data, we cannot provide a
- free-of-charge map API for third-party developers.
- See our <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API Usage Policy</a>,
- <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Tile Usage Policy</a>
- and <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim Usage Policy</a>.
+ free-of-charge map API for third-parties.
+ See our <a href="https://operations.osmfoundation.org/policies/api/">API Usage Policy</a>,
+ <a href="https://operations.osmfoundation.org/policies/tiles/">Tile Usage Policy</a>
+ and <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim Usage Policy</a>.
contributors_title_html: Our contributors
contributors_intro_html: |
Our contributors are thousands of individuals. We also include
@@ -1083,7 +1198,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 and the looking glass logo 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="http://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 send your questions to the <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence Working Group</a>.
welcome_page:
title: Welcome!
introduction_html: |
@@ -1118,8 +1233,8 @@ en:
paragraph_1_html: |
OpenStreetMap has few formal rules but we expect all participants to collaborate
with, and communicate with, the community. If you are considering
- any activities other than editing by hand, please read and follow the guidelines on
- <a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a> and
+ any activities other than editing by hand, please read and follow the guidelines on
+ <a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a> and
<a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Automated Edits</a>.
questions:
title: Any questions?
@@ -1145,7 +1260,7 @@ en:
title: Join the community
explanation_html: |
If you have noticed a problem with our map data, for example a road is missing or your address, the best way to
- proceed is to join the OpenStreetMap community and add or repair the data yourself.
+ proceed is to join the OpenStreetMap community and add or repair the data yourself.
add_a_note:
instructions_html: |
Just click <a class='icon note'></a> or the same icon on the map display.
@@ -1155,8 +1270,8 @@ en:
title: Other concerns
explanation_html: |
If you have concerns about how our data is being used or about the contents please consult our
- <a href='/copyright'>copyright page</a> for more legal information, or contact the appropriate
- <a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF working group</a>.
+ <a href='/copyright'>copyright page</a> for more legal information, or contact the appropriate
+ <a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF working group</a>.
help_page:
title: Getting Help
introduction: |
@@ -1224,18 +1339,20 @@ en:
License page</a> for details.
legal_title: Legal
legal_html: |
- This site and many other related services are formally operated by the
- <a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
- on behalf of the community.
- <br>
- Please <a href='http://osmfoundation.org/Contact'>contact the OSMF</a>
+ This site and many other related services are formally operated by the
+ <a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
+ on behalf of the community. Use of all OSMF operated services is subject
+ to our <a href="http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
+ Acceptable Use Policies</a> and our <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>
+ <br>
+ Please <a href='http://osmfoundation.org/Contact'>contact the OSMF</a>
if you have licensing, copyright or other legal questions and issues.
partners_title: Partners
notifier:
diary_comment_notification:
- subject: "[OpenStreetMap] %{user} commented on your diary entry"
+ subject: "[OpenStreetMap] %{user} commented on a diary entry"
hi: "Hi %{to_user},"
- header: "%{from_user} has commented on your recent OpenStreetMap diary entry with the subject %{subject}:"
+ header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or reply at %{replyurl}"
message_notification:
subject_header: "[OpenStreetMap] %{subject}"
@@ -1243,6 +1360,7 @@ en:
header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}"
friend_notification:
+ hi: "Hi %{to_user},"
subject: "[OpenStreetMap] %{user} added you as a friend"
had_added_you: "%{user} has added you as a friend on OpenStreetMap."
see_their_profile: "You can see their profile at %{userurl}."
@@ -1308,6 +1426,7 @@ en:
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}."
changeset_comment_notification:
+ hi: "Hi %{to_user},"
greeting: "Hi,"
commented:
subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"
@@ -1317,6 +1436,12 @@ en:
partial_changeset_with_comment: "with comment '%{changeset_comment}'"
partial_changeset_without_comment: "without comment"
details: "More details about the changeset can be found at %{url}."
+ unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
+ new_issue_notification:
+ subject: "[OpenStreetMap] New Issue"
+ greeting: "Hi,"
+ new_issue: "A new issue has been created"
+ url: You can view the issue here
message:
inbox:
title: "Inbox"
@@ -1374,6 +1499,7 @@ en:
date: "Date"
reply_button: "Reply"
unread_button: "Mark as unread"
+ delete_button: "Delete"
back: "Back"
to: "To"
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."
@@ -1433,6 +1559,9 @@ en:
track: "Track"
bridleway: "Bridleway"
cycleway: "Cycleway"
+ cycleway_national: "National cycleway"
+ cycleway_regional: "Regional cycleway"
+ cycleway_local: "Local cycleway"
footway: "Footway"
rail: "Railway"
subway: "Subway"
@@ -1485,6 +1614,9 @@ en:
private: "Private access"
destination: "Destination access"
construction: "Roads under construction"
+ bicycle_shop: "Bicycle shop"
+ bicycle_parking: "Bicycle parking"
+ toilets: "Toilets"
richtext_area:
edit: Edit
preview: Preview
@@ -1614,9 +1746,12 @@ en:
application:
require_cookies:
cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
+ require_admin:
+ 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."
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."
need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
oauth:
@@ -1642,6 +1777,8 @@ en:
invalid: "The authorization token is not valid."
revoke:
flash: "You've revoked the token for %{application}"
+ permissions:
+ missing: "You have not permitted the application access to this facility"
oauth_clients:
new:
title: "Register a new application"
@@ -1735,6 +1872,12 @@ en:
windowslive:
title: Login with Windows Live
alt: Login with a Windows Live Account
+ github:
+ title: Login with GitHub
+ alt: Login with a GitHub Account
+ wikipedia:
+ title: Login with Wikipedia
+ alt: Login with a Wikipedia Account
yahoo:
title: Login with Yahoo
alt: Login with a Yahoo OpenID
@@ -1767,7 +1910,7 @@ en:
new:
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 <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
+ contact_webmaster: 'Please contact the <a href="%{webmaster}">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
about:
header: Free and editable
html: |
@@ -1777,7 +1920,7 @@ en:
license_agreement: 'When you confirm your account you will need to agree to the <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a>.'
email address: "Email Address:"
confirm email address: "Confirm Email Address:"
- not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
+ not displayed publicly: 'Your address is not displayed publicly, see our <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information'
display name: "Display Name:"
display name description: "Your publicly displayed username. You can change this later in the preferences."
external auth: "Third Party Authentication:"
@@ -1810,6 +1953,7 @@ en:
title: "No such user"
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."
+ deleted: "deleted"
view:
my diary: My Diary
new diary entry: new diary entry
@@ -1860,21 +2004,22 @@ en:
revoke:
administrator: "Revoke administrator access"
moderator: "Revoke moderator access"
- block_history: "blocks received"
- moderator_history: "blocks given"
+ block_history: "Active Blocks"
+ moderator_history: "Blocks Given"
comments: "Comments"
- create_block: "block this user"
- activate_user: "activate this user"
- deactivate_user: "deactivate this user"
- confirm_user: "confirm this user"
- hide_user: "hide this user"
- unhide_user: "unhide this user"
- delete_user: "delete this user"
+ create_block: "Block this User"
+ activate_user: "Activate this User"
+ deactivate_user: "Deactivate this User"
+ confirm_user: "Confirm this User"
+ hide_user: "Hide this User"
+ unhide_user: "Unhide this User"
+ delete_user: "Delete this User"
confirm: "Confirm"
friends_changesets: "friends' changesets"
friends_diaries: "friends' diary entries"
nearby_changesets: "nearby user changesets"
nearby_diaries: "nearby user diary entries"
+ report: "Report this user?"
popup:
your location: "Your location"
nearby mapper: "Nearby mapper"
@@ -1915,6 +2060,8 @@ en:
gravatar: "Use Gravatar"
link: "http://wiki.openstreetmap.org/wiki/Gravatar"
link text: "what is this?"
+ disabled: "Gravatar has been disabled."
+ enabled: "Display of your Gravatar has been enabled."
new image: "Add an image"
keep image: "Keep the current image"
delete image: "Remove the current image"
@@ -1943,7 +2090,7 @@ en:
unknown token: "That confirmation code has expired or does not exist."
reconfirm_html: "If you need us to resend the confirmation email, <a href=\"%{reconfirm}\">click here</a>."
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.<br /><br />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."
+ 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.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist %{sender} as we are unable to reply to any confirmation requests."
failure: "User %{name} not found."
confirm_email:
heading: Confirm a change of email address
@@ -2094,6 +2241,7 @@ en:
helper:
time_future: "Ends in %{time}."
until_login: "Active until the user logs in."
+ time_future_and_until_login: "Ends in %{time} and after the user has logged in."
time_past: "Ended %{time} ago."
blocks_on:
title: "Blocks on %{name}"
@@ -2171,10 +2319,13 @@ en:
center_marker: "Center map on marker"
paste_html: "Paste HTML to embed in website"
view_larger_map: "View Larger Map"
+ only_standard_layer: "Only the standard layer can be exported as an image"
+ embed:
+ report_problem: "Report a problem"
key:
title: "Map Key"
tooltip: "Map Key"
- tooltip_disabled: "Map Key available only for Standard layer"
+ tooltip_disabled: "Map Key not available for this layer"
map:
zoom:
in: Zoom In
@@ -2186,12 +2337,12 @@ en:
standard: Standard
cycle_map: Cycle Map
transport_map: Transport Map
- mapquest: MapQuest Open
hot: Humanitarian
layers:
header: Map Layers
notes: Map Notes
data: Map Data
+ gps: Public GPS Traces
overlays: Enable overlays for troubleshooting the map
title: "Layers"
copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
@@ -2225,8 +2376,10 @@ en:
comment: Comment
edit_help: Move the map and zoom in on a location you want to edit, then click here.
directions:
+ ascend: "Ascend"
engines:
graphhopper_bicycle: "Bicycle (GraphHopper)"
+ graphhopper_car: "Car (GraphHopper)"
graphhopper_foot: "Foot (GraphHopper)"
mapquest_bicycle: "Bicycle (MapQuest)"
mapquest_car: "Car (MapQuest)"
@@ -2235,6 +2388,7 @@ en:
mapzen_bicycle: "Bicycle (Mapzen)"
mapzen_car: "Car (Mapzen)"
mapzen_foot: "Foot (Mapzen)"
+ descend: "Descend"
directions: "Directions"
distance: "Distance"
errors:
@@ -2243,11 +2397,21 @@ 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}
+ onramp_right_without_exit: Turn right on the ramp onto %{name}
+ 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}
turn_right_without_exit: Turn right onto %{name}
sharp_right_without_exit: Sharp right onto %{name}
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}
+ onramp_left_without_exit: Turn left on the ramp onto %{name}
+ 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}
@@ -2259,6 +2423,11 @@ en:
against_oneway_without_exit: Go against one-way on %{name}
end_oneway_without_exit: End of one-way on %{name}
roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
+ turn_left_with_exit: At roundabout turn left onto %{name}
+ slight_left_with_exit: At roundabout slight left onto %{name}
+ turn_right_with_exit: At roundabout turn right onto %{name}
+ slight_right_with_exit: At roundabout slight right onto %{name}
+ continue_with_exit: At roundabout continue straight onto %{name}
unnamed: "unnamed road"
courtesy: "Directions courtesy of %{link}"
time: "Time"
@@ -2269,6 +2438,13 @@ en:
nothing_found: No features found
error: "Error contacting %{server}: %{error}"
timeout: "Timeout contacting %{server}"
+ context:
+ directions_from: Directions from here
+ directions_to: Directions to here
+ add_note: Add a note here
+ show_address: Show address
+ query_features: Query features
+ centre_map: Centre map here
redaction:
edit:
description: "Description"