friendly: "%e %B %Y at %H:%M"
blog: "%e %B %Y"
helpers:
+ file:
+ prompt: Choose file
submit:
diary_comment:
create: Save
diary_comment: "Diary Comment"
diary_entry: "Diary Entry"
friend: "Friend"
+ issue: "Issue"
language: "Language"
message: "Message"
node: "Node"
relation: "Relation"
relation_member: "Relation Member"
relation_tag: "Relation Tag"
+ report: "Report"
session: "Session"
trace: "Trace"
tracepoint: "Trace Point"
longitude: "Longitude"
public: "Public"
description: "Description"
+ name: Filename
+ gpx_file: Upload GPX File
+ visibility: Visibility
+ tagstring: Tags
message:
sender: "Sender"
title: "Subject"
description: "Description"
languages: "Languages"
pass_crypt: "Password"
+ help:
+ trace:
+ tagstring: comma delimited
datetime:
distance_in_words_ago:
about_x_hours:
remote:
name: "Remote Control"
description: "Remote Control (JOSM or Merkaartor)"
+ auth:
+ providers:
+ none: None
+ openid: OpenID
+ google: Google
+ facebook: Facebook
+ windowslive: Windows Live
+ github: GitHub
+ wikipedia: Wikipedia
api:
notes:
comment:
still_open: "Changeset still open - discussion will open once the changeset is closed."
node:
title_html: "Node: %{name}"
- history_title: "Node History: %{name}"
+ history_title_html: "Node History: %{name}"
way:
title_html: "Way: %{name}"
- history_title: "Way History: %{name}"
+ history_title_html: "Way History: %{name}"
nodes: "Nodes"
also_part_of_html:
one: "part of way %{related_ways}"
other: "part of ways %{related_ways}"
relation:
title_html: "Relation: %{name}"
- history_title: "Relation History: %{name}"
+ history_title_html: "Relation History: %{name}"
members: "Members"
relation_member:
entry_html: "%{type} %{name}"
in_language_title: "Diary Entries in %{language}"
new: New Diary Entry
new_title: Compose a new entry in my user diary
+ my_diary: My Diary
no_entries: No diary entries
recent_entries: "Recent diary entries"
older_entries: Older Entries
diary_entry:
posted_by_html: "Posted by %{link_user} on %{created} in %{language_link}"
comment_link: Comment on this entry
- reply_link: Reply to this entry
+ reply_link: Send a message to the author
comment_count:
zero: No comments
one: "%{count} comment"
comment: Comment
newer_comments: "Newer Comments"
older_comments: "Older Comments"
+ friendships:
+ make_friend:
+ heading: "Add %{user} as a friend?"
+ button: "Add as friend"
+ success: "%{name} is now your friend!"
+ failed: "Sorry, failed to add %{name} as a friend."
+ already_a_friend: "You are already friends with %{name}."
+ remove_friend:
+ heading: "Unfriend %{user}?"
+ button: "Unfriend"
+ success: "%{name} was removed from your friends."
+ not_a_friend: "%{name} is not one of your friends."
geocoder:
search:
title:
reopen:
reopened: Issue status has been set to 'Open'
comments:
- created_at: "On %{datetime}"
+ comment_from_html: "Comment from %{user_link} on %{comment_created_at}"
reassign_param: Reassign Issue?
reports:
- updated_at: "On %{datetime}"
- reported_by_html: "Reported as %{category} by %{user}"
+ reported_by_html: "Reported as %{category} by %{user} on %{updated_at}"
helper:
reportable_title:
diary_comment: "%{entry_title}, comment #%{comment_id}"
subject: "[OpenStreetMap] %{user} commented on a diary entry"
hi: "Hi %{to_user},"
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}"
+ footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
message_notification:
subject_header: "[OpenStreetMap] %{subject}"
hi: "Hi %{to_user},"
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:
+ footer_html: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"
+ friendship_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."
import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
success:
subject: "[OpenStreetMap] GPX Import success"
- loaded_successfully: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
+ loaded_successfully:
+ one: loaded successfully with %{trace_points} out of a possible 1 point.
+ other: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
signup_confirm:
subject: "[OpenStreetMap] Welcome to OpenStreetMap"
greeting: "Hi there!"
about:
next: Next
copyright_html: <span>©</span>OpenStreetMap<br>contributors
- used_by_html: "%{name} powers map data on thousands of web sites, mobile apps, and hardware devices"
+ used_by_html: "%{name} provides map data for thousands of web sites, mobile apps, and hardware devices"
lede_text: |
OpenStreetMap is built by a community of mappers that contribute and maintain data
about roads, trails, cafés, railway stations, and much more, all over the world.
under the same licence. See the <a href='%{copyright_path}'>Copyright and
License page</a> for details.
legal_title: Legal
- legal_html: |
+ legal_1_html: |
This site and many other related services are formally operated by the
<a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
on behalf of the community. Use of all OSMF operated services is subject
to our <a href="https://wiki.osmfoundation.org/wiki/Terms_of_Use">Terms of Use</a>, <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
- Acceptable Use Policies</a> and our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>
- <br>
+ Acceptable Use Policies</a> and our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>.
+ legal_2_html: |
Please <a href='https://osmfoundation.org/Contact'>contact the OSMF</a>
if you have licensing, copyright or other legal questions.
<br>
may distribute the result only under the same licence. The
full <a href="https://opendatacommons.org/licenses/odbl/1.0/">legal
code</a> explains your rights and responsibilities.
- intro_3_html: |
- The cartography in our map tiles, and our documentation, are
-
licensed under the <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
- Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA).
+ intro_3_1_html: |
+ Our documentation is licensed under the
+ <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
+ Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA 2.0).
credit_title_html: How to credit OpenStreetMap
credit_1_html: |
We require that you use the credit “© OpenStreetMap
contributors”.
- credit_2_html: |
+ credit_2_1_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
+ Database License. You may do this by linking to
<a href="https://www.openstreetmap.org/copyright">this copyright page</a>.
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
where links are not possible (e.g. printed works), we suggest you
direct your readers to openstreetmap.org (perhaps by expanding
- 'OpenStreetMap' to this full address), to opendatacommons.org, and
- if relevant, to creativecommons.org.
- credit_3_html: |
+ 'OpenStreetMap' to this full address) and to opendatacommons.org.
+ credit_3_1_html: |
+ The map tiles in the “standard style” at www.openstreetmap.org are a
+ Produced Work by the OpenStreetMap Foundation using OpenStreetMap data
+ under the Open Database License. If you are using these tiles please use
+ the following attribution:
+ “Base map and data from OpenStreetMap and OpenStreetMap Foundation”.
+ credit_4_html: |
For a browsable electronic map, the credit should appear in the corner of the map.
For example:
attribution_example:
identifiable: "Identifiable (shown in trace list and as identifiable, ordered points with timestamps)"
new:
upload_trace: "Upload GPS Trace"
- upload_gpx: "Upload GPX File:"
- description: "Description:"
- tags: "Tags:"
- tags_help: "comma delimited"
- visibility: "Visibility:"
visibility_help: "what does this mean?"
visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
help: "Help"
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."
edit:
+ cancel: Cancel
title: "Editing trace %{name}"
heading: "Editing trace %{name}"
- filename: "Filename:"
- download: "download"
- uploaded_at: "Uploaded:"
- points: "Points:"
- start_coord: "Start coordinate:"
- map: "map"
- edit: "edit"
- owner: "Owner:"
- description: "Description:"
- tags: "Tags:"
- tags_help: "comma delimited"
- visibility: "Visibility:"
visibility_help: "what does this mean?"
visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
update:
oauth:
authorize:
title: "Authorize access to your account"
- request_access: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
+ request_access_html: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
allow_to: "Allow the client application to:"
allow_read_prefs: "read your user preferences."
allow_write_prefs: "modify your user preferences."
grant_access: "Grant Access"
authorize_success:
title: "Authorization request allowed"
- allowed: "You have granted application %{app_name} access to your account."
+ allowed_html: "You have granted application %{app_name} access to your account."
verification: "The verification code is %{code}."
authorize_failure:
title: "Authorization request failed"
issued_at: "Issued At"
revoke: "Revoke!"
my_apps: "My Client Applications"
- no_apps: "Do you have an application you would like to register for use with us using the %{oauth} standard? You must register your web application before it can make OAuth requests to this service."
+ no_apps_html: "Do you have an application you would like to register for use with us using the %{oauth} standard? You must register your web application before it can make OAuth requests to this service."
+ oauth: OAuth
registered_apps: "You have the following client applications registered:"
register_new: "Register your application"
form:
flash success: "Home location saved successfully"
go_public:
flash success: "All your edits are now public, and you are now allowed to edit."
- make_friend:
- heading: "Add %{user} as a friend?"
- button: "Add as friend"
- success: "%{name} is now your friend!"
- failed: "Sorry, failed to add %{name} as a friend."
- already_a_friend: "You are already friends with %{name}."
- remove_friend:
- heading: "Unfriend %{user}?"
- button: "Unfriend"
- success: "%{name} was removed from your friends."
- not_a_friend: "%{name} is not one of your friends."
index:
title: Users
heading: Users
showing:
one: Page %{page} (%{first_item} of %{items})
other: Page %{page} (%{first_item}-%{last_item} of %{items})
- summary: "%{name} created from %{ip_address} on %{date}"
- summary_no_ip: "%{name} created on %{date}"
+ summary_html: "%{name} created from %{ip_address} on %{date}"
+ summary_no_ip_html: "%{name} created on %{date}"
confirm: Confirm Selected Users
hide: Hide Selected Users
empty: No matching users found
next: "Next »"
previous: "« Previous"
notes:
- mine:
+ index:
title: "Notes submitted or commented on by %{user}"
heading: "%{user}'s notes"
subheading_html: "Notes submitted or commented on by %{user}"
out: Zoom Out
locate:
title: Show My Location
- popup: You are within {distance} {unit} of this point
+ metersPopup:
+ one: You are within one meter of this point
+ other: You are within %{count} meters of this point
+ feetPopup:
+ one: You are within one foot of this point
+ other: You are within %{count} feet of this point
base:
standard: Standard
cycle_map: Cycle Map
transport_map: Transport Map
hot: Humanitarian
+ opnvkarte: ÖPNVKarte
layers:
header: Map Layers
notes: Map Notes
copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Make a Donation</a>"
terms: "<a href='%{terms_url}' target='_blank'>Website and API terms</a>"
+ thunderforest: "Tiles courtesy of <a href='%{thunderforest_url}' target='_blank'>Andy Allan</a>"
+ opnvkarte: "Tiles courtesy of <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>"
+ hotosm: "Tiles style by <a href='%{hotosm_url}' target='_blank'>Humanitarian OpenStreetMap Team</a> hosted by <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>"
site:
edit_tooltip: Edit the map
edit_disabled_tooltip: Zoom in to edit the map
projects / rails.git / blobdiff