X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7d92ec704786c2d887e1946f25746d6d70ee7ea8..9d3b419aad3069db13fc0169049a30fbc2b2a288:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0c21b9027..217c43306 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -120,6 +120,8 @@ en:
next_relation_tooltip: "Next relation"
prev_changeset_tooltip: "Previous changeset"
next_changeset_tooltip: "Next changeset"
+ prev_note_tooltip: "Previous note"
+ next_note_tooltip: "Next note"
changeset_details:
created_at: "Created at:"
closed_at: "Closed at:"
@@ -190,7 +192,7 @@ en:
relation: relation
changeset: changeset
paging_nav:
- showing_page: "Showing page"
+ showing_page: "page"
of: "of"
redacted:
redaction: "Redaction %{id}"
@@ -220,6 +222,7 @@ en:
download_xml: "Download XML"
view_history: "View history"
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"
@@ -239,7 +242,7 @@ en:
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"
@@ -266,8 +269,8 @@ en:
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}"
@@ -279,13 +282,22 @@ en:
download_xml: "Download XML"
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:"
+ 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)"
@@ -312,14 +324,14 @@ en:
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 Beginners Guide."
- 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:
@@ -334,7 +346,7 @@ en:
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:
@@ -933,7 +945,6 @@ en:
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
@@ -1191,6 +1202,14 @@ en:
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_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}."
message:
inbox:
title: "Inbox"
@@ -1267,6 +1286,7 @@ en:
js_2: "OpenStreetMap uses JavaScript for its slippy map."
permalink: Permalink
shortlink: Shortlink
+ createnote: Add a note
license:
copyright: "Copyright OpenStreetMap and contributors, under an open license"
license_url: "http://openstreetmap.org/copyright"
@@ -1444,7 +1464,7 @@ en:
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:
@@ -1467,6 +1487,7 @@ en:
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. Upload a new trace or learn more about GPS tracing on the wiki page."
delete:
@@ -1676,6 +1697,7 @@ en:
new diary entry: new diary entry
my edits: my edits
my traces: my traces
+ my notes: my map notes
my settings: my settings
my comments: my comments
oauth settings: oauth settings
@@ -1685,8 +1707,9 @@ en:
diary: diary
edits: edits
traces: traces
- remove as friend: remove as friend
- add as friend: add as friend
+ notes: map notes
+ remove as friend: unfriend
+ add as friend: add friend
mapper since: "Mapper since:"
ago: "(%{time_in_words_ago} ago)"
ct status: "Contributor terms:"
@@ -1700,7 +1723,7 @@ en:
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.
@@ -1728,10 +1751,10 @@ en:
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"
@@ -1812,12 +1835,12 @@ en:
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:
@@ -1826,8 +1849,8 @@ en:
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
@@ -1926,7 +1949,7 @@ en:
status: "Status"
revoker_name: "Revoked by"
not_revoked: "(not revoked)"
- showing_page: "Showing page %{page}"
+ showing_page: "Page %{page}"
next: "Next »"
previous: "« Previous"
helper:
@@ -1955,6 +1978,32 @@ en:
back: "View all blocks"
revoker: "Revoker:"
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"
+ description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]"
+ description_item: "An rss feed for note %{id}"
+ closed: "closed note (near %{place})"
+ new: "new note (near %{place})"
+ comment: "new comment (near %{place})"
+ mine:
+ title: "Notes submitted or commented on by %{user}"
+ heading: "%{user}'s notes"
+ subheading: "Notes submitted or commented on by %{user}"
+ id: "Id"
+ creator: "Creator"
+ description: "Description"
+ created_at: "Created at"
+ last_changed: "Last changed"
javascripts:
map:
base:
@@ -1971,6 +2020,26 @@ en:
history_tooltip: View edits for this area
history_disabled_tooltip: Zoom in to view edits for this area
history_zoom_alert: You must zoom in to view edits for this area
+ 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
+ notes:
+ new:
+ intro: "Move the marker to the correct position and add your comment in the box below:"
+ add: Add Note
+ show:
+ title: Note %{id}
+ opened_by: "created by %{user} at %{time}"
+ opened_by_anonymous: "created by anonymous at %{time}"
+ commented_by: "comment from %{user} at %{time}"
+ commented_by_anonymous: "comment from anonymous at %{time}"
+ closed_by: "resolved by %{user} at %{time}"
+ closed_by_anonymous: "resolved by anonymous at %{time}"
+ reopened_by: "reactivated by %{user} at %{time}"
+ reopened_by_anonymous: "reactivated by anonymous at %{time}"
+ close: Close
+ comment_and_close: Comment & Close
+ comment: Comment
redaction:
edit:
description: "Description"