api:
notes:
comment:
- opened_at_html: "Created %{when} ago"
- opened_at_by_html: "Created %{when} ago by %{user}"
- commented_at_html: "Updated %{when} ago"
- commented_at_by_html: "Updated %{when} ago by %{user}"
- closed_at_html: "Resolved %{when} ago"
- closed_at_by_html: "Resolved %{when} ago by %{user}"
- reopened_at_html: "Reactivated %{when} ago"
- reopened_at_by_html: "Reactivated %{when} ago by %{user}"
+ opened_at_html: "Created %{when}"
+ opened_at_by_html: "Created %{when} by %{user}"
+ commented_at_html: "Updated %{when}"
+ commented_at_by_html: "Updated %{when} by %{user}"
+ closed_at_html: "Resolved %{when}"
+ closed_at_by_html: "Resolved %{when} by %{user}"
+ reopened_at_html: "Reactivated %{when}"
+ reopened_at_by_html: "Reactivated %{when} by %{user}"
rss:
title: "OpenStreetMap Notes"
description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]"
browse:
created: "Created"
closed: "Closed"
- created_html: "Created <abbr title='%{title}'>%{time} ago</abbr>"
- closed_html: "Closed <abbr title='%{title}'>%{time} ago</abbr>"
- created_by_html: "Created <abbr title='%{title}'>%{time} ago</abbr> by %{user}"
- deleted_by_html: "Deleted <abbr title='%{title}'>%{time} ago</abbr> by %{user}"
- edited_by_html: "Edited <abbr title='%{title}'>%{time} ago</abbr> by %{user}"
- closed_by_html: "Closed <abbr title='%{title}'>%{time} ago</abbr> by %{user}"
+ created_html: "Created <abbr title='%{title}'>%{time}</abbr>"
+ closed_html: "Closed <abbr title='%{title}'>%{time}</abbr>"
+ created_by_html: "Created <abbr title='%{title}'>%{time}</abbr> by %{user}"
+ deleted_by_html: "Deleted <abbr title='%{title}'>%{time}</abbr> by %{user}"
+ edited_by_html: "Edited <abbr title='%{title}'>%{time}</abbr> by %{user}"
+ closed_by_html: "Closed <abbr title='%{title}'>%{time}</abbr> by %{user}"
version: "Version"
in_changeset: "Changeset"
anonymous: "anonymous"
relation: "Relations (%{count})"
relation_paginated: "Relations (%{x}-%{y} of %{count})"
comment: "Comments (%{count})"
- hidden_commented_by: "Hidden comment from %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
- commented_by: "Comment from %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
+ hidden_commented_by: "Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+ commented_by: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
changesetxml: "Changeset XML"
osmchangexml: "osmChange XML"
feed:
wikidata_link: "The %{page} item on Wikidata"
wikipedia_link: "The %{page} article on Wikipedia"
telephone_link: "Call %{phone_number}"
+ colour_preview: "Colour %{colour_value} preview"
note:
title: "Note: %{id}"
new_note: "New Note"
open_title: "Unresolved note #%{note_name}"
closed_title: "Resolved note #%{note_name}"
hidden_title: "Hidden note #%{note_name}"
- open_by: "Created by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
- open_by_anonymous: "Created by anonymous <abbr title='%{exact_time}'>%{when} ago</abbr>"
- commented_by: "Comment from %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
- commented_by_anonymous: "Comment from anonymous <abbr title='%{exact_time}'>%{when} ago</abbr>"
- closed_by: "Resolved by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
- closed_by_anonymous: "Resolved by anonymous <abbr title='%{exact_time}'>%{when} ago</abbr>"
- reopened_by: "Reactivated by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
- reopened_by_anonymous: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when} ago</abbr>"
- hidden_by: "Hidden by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
+ open_by: "Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+ open_by_anonymous: "Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
+ commented_by: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+ commented_by_anonymous: "Comment from anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
+ closed_by: "Resolved by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+ closed_by_anonymous: "Resolved by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
+ reopened_by: "Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+ reopened_by_anonymous: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
+ hidden_by: "Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
report: Report this note
query:
title: "Query Features"
changeset_comments:
comment:
comment: "New comment on changeset #%{changeset_id} by %{author}"
- commented_at_by_html: "Updated %{when} ago by %{user}"
+ commented_at_by_html: "Updated %{when} by %{user}"
comments:
comment: "New comment on changeset #%{changeset_id} by %{author}"
index:
status: Status
reports: Reports
last_updated: Last Updated
- last_updated_time_html: "<abbr title='%{title}'>%{time} ago</abbr>"
- last_updated_time_user_html: "<abbr title='%{title}'>%{time} ago</abbr> by %{user}"
+ last_updated_time_html: "<abbr title='%{title}'>%{time}</abbr>"
+ last_updated_time_user_html: "<abbr title='%{title}'>%{time}</abbr> by %{user}"
link_to_reports: View Reports
reported_user: Reported User
reports_count:
commented:
subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"
subject_other: "[OpenStreetMap] %{commenter} has commented on a changeset you are interested in"
- your_changeset: "%{commenter} has left a comment on one of your changesets created at %{time}"
- commented_changeset: "%{commenter} has left a comment on a map changeset you are watching created by %{changeset_author} at %{time}"
+ your_changeset: "%{commenter} left a comment at %{time} on one of your changesets"
+ commented_changeset: "%{commenter} left a comment at %{time} on a changeset you are watching created by %{changeset_author}"
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}."
added to the OpenStreetMap database or this site, please refer
to our <a href="https://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>.
+ <a href="https://dmca.openstreetmap.org/">on-line filing page</a>.
trademarks_title_html: <span id="trademarks"></span>Trademarks
trademarks_1_html: |
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 see our <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Trademark Policy</a>.
and collaboratively discussing and documenting mapping topics.
welcome:
url: /welcome
- title: Welcome to OSM
+ title: Welcome to OpenStreetMap
description: Start with this quick guide covering the OpenStreetMap basics.
beginners_guide:
url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
description: Community maintained guide for beginners.
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.
+ title: Help Forum
+ description: Ask a question or look up answers on OpenStreetMap's question-and-answer site.
mailing_lists:
url: https://lists.openstreetmap.org/
title: Mailing Lists
description: With an organization making plans for OpenStreetMap? Find what you need to know in the Welcome Mat.
wiki:
url: https://wiki.openstreetmap.org/
- title: wiki.openstreetmap.org
- description: Browse the wiki for in-depth OSM documentation.
+ title: OpenStreetMap Wiki
+ description: Browse the wiki for in-depth OpenStreetMap documentation.
sidebar:
search_results: Search Results
close: Close
newer: "Newer Traces"
trace:
pending: "PENDING"
- count_points: "%{count} points"
+ count_points:
+ one: "1 point"
+ other: "%{count} points"
more: "more"
trace_details: "View Trace Details"
view_map: "View Map"
read and accept with tou: "Please read the contributor agreement and the terms of use, check both checkboxes when done and then press the continue button."
contributor_terms_explain: "This agreement governs the terms for your existing and future contributions."
read_ct: "I have read and agree to the above contributor terms"
- tou_explain_html: "These %{tou_link} govern the use of the website and other infrastructure provided by the OSMF. Please click on the link, read and aggree to the text."
+ tou_explain_html: "These %{tou_link} govern the use of the website and other infrastructure provided by the OSMF. Please click on the link, read and agree to the text."
read_tou: "I have read and agree to the Terms of Use"
consider_pd: "In addition to the above, I consider my contributions to be in the Public Domain"
consider_pd_why: "what's this?"
remove as friend: Unfriend
add as friend: Add Friend
mapper since: "Mapper since:"
- ago: "(%{time_in_words_ago} ago)"
ct status: "Contributor terms:"
ct undecided: Undecided
ct declined: Declined
- ct accepted: Accepted %{ago} ago
- latest edit: "Latest edit %{ago}:"
+ latest edit: "Latest edit (%{ago}):"
email address: "Email address:"
created from: "Created from:"
status: "Status:"
title: "Revoking block on %{block_on}"
heading: "Revoking block on %{block_on} by %{block_by}"
time_future: "This block will end in %{time}."
- past: "This block ended %{time} ago and cannot be revoked now."
+ past: "This block ended %{time} and cannot be revoked now."
confirm: "Are you sure you wish to revoke this block?"
revoke: "Revoke!"
flash: "This block has been revoked."
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."
+ time_past: "Ended %{time}."
block_duration:
hours:
one: "1 hour"
show:
title: "%{block_on} blocked by %{block_by}"
heading: "%{block_on} blocked by %{block_by}"
- time_future: "Ends in %{time}"
- time_past: "Ended %{time} ago"
created: "Created"
- ago: "%{time} ago"
status: "Status"
show: "Show"
edit: "Edit"
description: "Description"
created_at: "Created at"
last_changed: "Last changed"
- ago_html: "%{when} ago"
javascripts:
close: Close
share:
projects / rails.git / blobdiff