X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/78f608b114c05f1147936a57b930831e28000c1a..9f025130fddd7b9c7314cfec36dbe160c41e6698:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 806b9ddd3..0679e1325 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -158,11 +158,13 @@ en:
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:"
@@ -192,7 +194,7 @@ en:
relation: relation
changeset: changeset
paging_nav:
- showing_page: "Showing page"
+ showing_page: "page"
of: "of"
redacted:
redaction: "Redaction %{id}"
@@ -242,7 +244,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"
@@ -269,8 +271,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}"
@@ -288,16 +290,16 @@ en:
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)"
@@ -324,14 +326,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:
@@ -346,7 +348,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:
@@ -945,7 +947,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
@@ -1204,6 +1205,7 @@ en:
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,"
@@ -1464,7 +1466,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:
@@ -1487,6 +1489,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:
@@ -1707,8 +1710,8 @@ en:
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:"
@@ -1722,7 +1725,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.
@@ -1750,10 +1753,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"
@@ -1834,12 +1837,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:
@@ -1848,8 +1851,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
@@ -1948,7 +1951,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:
@@ -1979,9 +1982,13 @@ en:
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"
@@ -1993,9 +2000,13 @@ en:
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:
@@ -2017,14 +2028,21 @@ en:
createnote_zoom_alert: You must zoom in to add a note to the map
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}
- event: "%{action} by %{user} at %{time}"
- close: Close
- comment_and_close: Comment & Close
+ anonymous_warning: This note includes comments from anonymous users which should be independently verified.
+ 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}"
+ resolve: Resolve
+ comment_and_resolve: Comment & Resolve
comment: Comment
redaction:
edit: