node: "View node on larger map"
way: "View way on larger map"
relation: "View relation on larger map"
+ note: "View note on larger map"
edit:
area: "Edit area"
node: "Edit node"
way: "Edit way"
relation: "Edit relation"
+ note: "Edit note"
node_details:
coordinates: "Coordinates:"
part_of: "Part of:"
relation: relation
changeset: changeset
paging_nav:
- showing_page: "Showing page"
+ showing_page: "page"
of: "of"
redacted:
redaction: "Redaction %{id}"
relation_title: "Relation: %{relation_name}"
download_xml: "Download XML"
view_history: "View history"
- start:
- view_data: "View data for current map view"
- manually_select: "Manually select a different area"
start_rjs:
notes_layer_name: "Browse Notes"
data_layer_name: "Browse Map Data"
data_frame_title: "Data"
zoom_or_select: "Zoom in or select an area of the map to view"
- drag_a_box: "Drag a box on the map to select an area"
+ view_data: "View data for current map view"
manually_select: "Manually select a different area"
hide_areas: "Hide areas"
show_areas: "Show areas"
edited_by_user_at_timestamp: "Edited by %{user} at %{timestamp}"
object_list:
heading: "Object list"
- back: "Display object list"
+ back: "Back to object list"
type:
node: "Node"
way: "Way"
nodes: "Nodes:"
part_of: "Part of:"
also_part_of:
- one: "also part of way %{related_ways}"
- other: "also part of ways %{related_ways}"
+ one: "part of way %{related_ways}"
+ other: "part of ways %{related_ways}"
way_history:
way_history: "Way History"
way_history_title: "Way History: %{way_name}"
opened: "Opened:"
last_modified: "Last modified:"
closed: "Closed:"
- at_by: "%{when} ago by %{user}"
+ at_html: "%{when} ago"
+ at_by_html: "%{when} ago by %{user}"
description: "Description:"
comments: "Comments:"
changeset:
changeset_paging_nav:
- showing_page: "Showing page %{page}"
+ showing_page: "Page %{page}"
next: "Next »"
previous: "« Previous"
changeset:
- id: "#%{id}"
still_editing: "(still editing)"
anonymous: "Anonymous"
no_comment: "(none)"
heading_user_bbox: "Changesets"
heading_friend: "Changesets"
heading_nearby: "Changesets"
- description: "Recent changes"
+ 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 <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Beginners Guide</a>."
- empty_anon_html: "No edits made yet"
+ empty_anon_html: "No edits made yet."
timeout:
sorry: "Sorry, the list of changesets you requested took too long to retrieve."
diary_entry:
new: New Diary Entry
new_title: Compose a new entry in your user diary
no_entries: No diary entries
- recent_entries: "Recent diary entries:"
+ recent_entries: "Recent diary entries"
older_entries: Older Entries
newer_entries: Newer Entries
edit:
comment_link: Comment on this entry
reply_link: Reply to this entry
comment_count:
- one: 1 comment
+ zero: No comments
+ one: "%{count} comment"
other: "%{count} comments"
edit_link: Edit this entry
hide_link: Hide this entry
h1: OpenStreetMap
logo:
alt_text: OpenStreetMap logo
- welcome_user: "Welcome, %{user_link}"
welcome_user_link_tooltip: Your user page
home: home
home_tooltip: Go to home location
community_blogs_title: "Blogs from members of the OpenStreetMap community"
foundation: Foundation
foundation_title: The OpenStreetMap Foundation
- sotm2012: 'Come to the 2012 United States OpenStreetMap Conference, The State of the Map US, October 13-14th in Portland, Oregon!'
make_a_donation:
title: Support OpenStreetMap with a monetary donation
text: Make a Donation
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="http://creativecommons.org/licenses/by-sa/2.0/">Creative
+ licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
Commons Attribution-ShareAlike 2.0</a> license (CC-BY-SA).
credit_title_html: How to credit OpenStreetMap
credit_1_html: |
- We require that you use the credit “© OpenStreetMap
+ We require that you use the credit “© OpenStreetMap
contributors”.
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
- <a href="http://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
+ 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
+ <a href="http://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: |
For a browsable electronic map, the credit should appear in the corner of the map.
copyrighted sources (e.g. Google Maps or printed maps) without
explicit permission from the copyright holders.
infringement_2_html: |
- If you believe that copyrighted material has been inappropriately
- added to the OpenStreetMap database or this site, please refer
- to our <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
- procedure</a> or file directly at our
+ If you believe that copyrighted material has been inappropriately
+ added to the OpenStreetMap database or this site, please refer
+ to our <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
+ procedure</a> or file directly at our
<a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
notifier:
diary_comment_notification:
subject: "[OpenStreetMap] GPX Import success"
loaded_successfully: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
signup_confirm:
- subject: "[OpenStreetMap] Confirm your email address"
- signup_confirm_plain:
+ subject: "[OpenStreetMap] Welcome to OpenStreetMap"
greeting: "Hi there!"
- hopefully_you: "Someone (hopefully you) would like to create an account over at"
- # next two translations run-on : please word wrap appropriately
- click_the_link_1: "If this is you, welcome! Please click the link below to confirm your"
- click_the_link_2: "account and read on for more information about OpenStreetMap."
+ 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:"
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"
- # next four translations are in pairs : please word wrap appropriately
- user_wiki_1: "It is recommended that you create a user wiki page, which includes"
- user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]."
- current_user_1: "A list of current users in categories, based on where in the world"
- current_user_2: "they are, is available from:"
+ 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:
- greeting: "Hi there!"
- hopefully_you: "Someone (hopefully you) would like to create an account over at"
- click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap"
introductory_video: "You can watch an %{introductory_video_link}."
video_to_openstreetmap: "introductory video to OpenStreetMap"
more_videos: "There are %{more_videos_link}."
greeting: "Hi,"
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."
- note_plain:
+ 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}."
- details: "More details about the note can be found at %{URL}."
+ details: "More details about the note can be found at %{url}."
message:
inbox:
title: "Inbox"
wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply."
read:
title: "Read message"
- reading_your_messages: "Reading your messages"
from: "From"
subject: "Subject"
date: "Date"
reply_button: "Reply"
unread_button: "Mark as unread"
back_to_inbox: "Back to inbox"
- reading_your_sent_messages: "Reading your sent messages"
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."
trace_not_found: "Trace not found!"
visibility: "Visibility:"
trace_paging_nav:
- showing_page: "Showing page %{page}"
+ showing_page: "Page %{page}"
older: "Older Traces"
newer: "Newer Traces"
trace:
public_traces: "Public GPS traces"
your_traces: "Your GPS traces"
public_traces_from: "Public GPS traces from %{user}"
+ description: "Browse recent GPS track uploads"
tagged_with: " tagged with %{tags}"
empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
delete:
</li>
</ul>
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.<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."
terms accepted: "Thanks for accepting the new contributor terms!"
terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see <a href=\"%{url}\">this wiki page</a>."
edits: edits
traces: traces
notes: map notes
- remove as friend: remove as friend
- add as friend: add as friend
+ remove as friend: unfriend
+ add as friend: add friend
mapper since: "Mapper since:"
ago: "(%{time_in_words_ago} ago)"
ct status: "Contributor terms:"
spam score: "Spam Score:"
description: Description
user location: User location
- if set location: "If you set your location, a pretty map and stuff will appear here. You can set your home location on your %{settings_link} page."
+ if set location: "Set your home location on the %{settings_link} page to see nearby users."
settings_link_text: settings
your friends: Your friends
no friends: You have not added any friends yet.
unhide_user: "unhide this user"
delete_user: "delete this user"
confirm: "Confirm"
- friends_changesets: "Browse all changesets by friends"
- friends_diaries: "Browse all diary entries by friends"
- nearby_changesets: "Browse all changesets by nearby users"
- nearby_diaries: "Browse all diary entries by nearby users"
+ friends_changesets: "friends' changesets"
+ friends_diaries: "friends' diary entries"
+ nearby_changesets: "nearby user changesets"
+ nearby_diaries: "nearby user diary entries"
popup:
your location: "Your location"
nearby mapper: "Nearby mapper"
preferred languages: "Preferred Languages:"
preferred editor: "Preferred Editor:"
image: "Image:"
+ gravatar:
+ gravatar: "Use Gravatar"
+ link: "http://wiki.openstreetmap.org/wiki/Gravatar"
+ link text: "what is this?"
new image: "Add an image"
keep image: "Keep the current image"
delete image: "Remove the current image"
make_friend:
heading: "Add %{user} as a friend?"
button: "Add as friend"
- success: "%{name} is now your 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: "Remove %{user} as a friend?"
- button: "Remove as friend"
+ heading: "Unfriend %{user}?"
+ button: "Unfriend"
success: "%{name} was removed from your friends."
not_a_friend: "%{name} is not one of your friends."
filter:
title: Users
heading: Users
showing:
- one: Showing page %{page} (%{first_item} of %{items})
- other: Showing page %{page} (%{first_item}-%{last_item} of %{items})
+ 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}"
confirm: Confirm Selected Users
status: "Status"
revoker_name: "Revoked by"
not_revoked: "(not revoked)"
- showing_page: "Showing page %{page}"
+ showing_page: "Page %{page}"
next: "Next »"
previous: "« Previous"
helper:
needs_view: "The user needs to log in before this block will be cleared."
note:
description:
+ opened_at: "Created %{when} ago"
opened_at_by: "Created %{when} ago by %{user}"
+ commented_at: "Updated %{when} ago"
commented_at_by: "Updated %{when} ago by %{user}"
+ closed_at: "Resolved %{when} ago"
closed_at_by: "Resolved %{when} ago by %{user}"
+ reopened_at: "Reactivated %{when} ago"
reopened_at_by: "Reactivated %{when} ago by %{user}"
rss:
title: "OpenStreetMap Notes"
mine:
title: "Notes submitted or commented on by %{user}"
heading: "%{user}'s notes"
- description: "Notes submitted or commented on by %{user}"
+ subheading: "Notes submitted or commented on by %{user}"
id: "Id"
+ creator: "Creator"
+ description: "Description"
+ created_at: "Created at"
last_changed: "Last changed"
+ ago_html: "%{when} ago"
javascripts:
map:
base:
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
- note:
- closed: Closed Note
- open: Open Note
- details: Details
- permalink: Permalink
- description: Description
- comment: Comment
- render_warning: This error has been fixed already. However, it might take a couple of days before the map image is updated.
- update: Update
- nickname: Nickname
- login: Login
- add_comment: Add Comment
- close: Close
- cancel: Cancel
- create: Create Note
- create_title: Report a problem with the map
- create_help1: Please drag the marker to the location of the problem
- create_help2: and descripe it as accurate as possible
- report: Report Problem
- edityourself: You can also edit the map directly your self
notes:
new:
- intro_1: Move the marker to the correct position and
- intro_2: "add your comment in the box below:"
+ intro: "Move the marker to the correct position and add your comment in the box below:"
add: Add Note
show:
title: Note %{id}
- comment: "%{action} by %{user} at %{time}"
+ anonymous_warning: This note includes comments from anonymous users which should be independently verified.
+ opened_by: "created by <a href='%{user_url}'>%{user}</a> at %{time}"
+ opened_by_anonymous: "created by anonymous at %{time}"
+ commented_by: "comment from <a href='%{user_url}'>%{user}</a> at %{time}"
+ commented_by_anonymous: "comment from anonymous at %{time}"
+ closed_by: "resolved by <a href='%{user_url}'>%{user}</a> at %{time}"
+ closed_by_anonymous: "resolved by anonymous at %{time}"
+ reopened_by: "reactivated by <a href='%{user_url}'>%{user}</a> at %{time}"
+ reopened_by_anonymous: "reactivated by anonymous at %{time}"
+ resolve: Resolve
+ comment_and_resolve: Comment & Resolve
+ comment: Comment
redaction:
edit:
description: "Description"
projects / rails.git / blobdiff