X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e49953f141a8a090e96652335882927ce872e375..d99374434e43c2434878f0ce79bca0ebeafcef57:/config/locales/en.yml?ds=sidebyside
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ec6591226..e8a36f945 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -7,9 +7,27 @@ en:
blog: "%e %B %Y"
helpers:
submit:
+ diary_comment:
+ create: Save
diary_entry:
create: "Publish"
update: "Update"
+ issue_comment:
+ create: Add Comment
+ message:
+ create: Send
+ client_application:
+ create: Register
+ update: Edit
+ redaction:
+ create: Create redaction
+ update: Save redaction
+ trace:
+ create: Upload
+ update: Save Changes
+ user_block:
+ create: Create block
+ update: Update block
activerecord:
errors:
messages:
@@ -85,6 +103,45 @@ en:
description: "Description"
languages: "Languages"
pass_crypt: "Password"
+ datetime:
+ distance_in_words_ago:
+ about_x_hours:
+ one: about 1 hour ago
+ other: about %{count} hours ago
+ about_x_months:
+ one: about 1 month ago
+ other: about %{count} months ago
+ about_x_years:
+ one: about 1 year ago
+ other: about %{count} years ago
+ almost_x_years:
+ one: almost 1 year ago
+ other: almost %{count} years ago
+ half_a_minute: half a minute ago
+ less_than_x_seconds:
+ one: less than 1 second ago
+ other: less than %{count} seconds ago
+ less_than_x_minutes:
+ one: less than a minute ago
+ other: less than %{count} minutes ago
+ over_x_years:
+ one: over 1 year ago
+ other: over %{count} years ago
+ x_seconds:
+ one: 1 second ago
+ other: "%{count} seconds ago"
+ x_minutes:
+ one: 1 minute ago
+ other: "%{count} minutes ago"
+ x_days:
+ one: 1 day ago
+ other: "%{count} days ago"
+ x_months:
+ one: 1 month ago
+ other: "%{count} months ago"
+ x_years:
+ one: 1 year ago
+ other: "%{count} years ago"
printable_name:
with_id: "%{id}"
with_version: "%{id}, v%{version}"
@@ -106,14 +163,14 @@ en:
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})]"
@@ -128,12 +185,12 @@ en:
browse:
created: "Created"
closed: "Closed"
- created_html: "Created %{time} ago"
- closed_html: "Closed %{time} ago"
- created_by_html: "Created %{time} ago by %{user}"
- deleted_by_html: "Deleted %{time} ago by %{user}"
- edited_by_html: "Edited %{time} ago by %{user}"
- closed_by_html: "Closed %{time} ago by %{user}"
+ created_html: "Created %{time}"
+ closed_html: "Closed %{time}"
+ created_by_html: "Created %{time} by %{user}"
+ deleted_by_html: "Deleted %{time} by %{user}"
+ edited_by_html: "Edited %{time} by %{user}"
+ closed_by_html: "Closed %{time} by %{user}"
version: "Version"
in_changeset: "Changeset"
anonymous: "anonymous"
@@ -153,8 +210,8 @@ en:
relation: "Relations (%{count})"
relation_paginated: "Relations (%{x}-%{y} of %{count})"
comment: "Comments (%{count})"
- hidden_commented_by: "Hidden comment from %{user} %{when} ago"
- commented_by: "Comment from %{user} %{when} ago"
+ hidden_commented_by: "Hidden comment from %{user} %{when}"
+ commented_by: "Comment from %{user} %{when}"
changesetxml: "Changeset XML"
osmchangexml: "osmChange XML"
feed:
@@ -229,15 +286,15 @@ en:
open_title: "Unresolved note #%{note_name}"
closed_title: "Resolved note #%{note_name}"
hidden_title: "Hidden note #%{note_name}"
- open_by: "Created by %{user} %{when} ago"
- open_by_anonymous: "Created by anonymous %{when} ago"
- commented_by: "Comment from %{user} %{when} ago"
- commented_by_anonymous: "Comment from anonymous %{when} ago"
- closed_by: "Resolved by %{user} %{when} ago"
- closed_by_anonymous: "Resolved by anonymous %{when} ago"
- reopened_by: "Reactivated by %{user} %{when} ago"
- reopened_by_anonymous: "Reactivated by anonymous %{when} ago"
- hidden_by: "Hidden by %{user} %{when} ago"
+ open_by: "Created by %{user} %{when}"
+ open_by_anonymous: "Created by anonymous %{when}"
+ commented_by: "Comment from %{user} %{when}"
+ commented_by_anonymous: "Comment from anonymous %{when}"
+ closed_by: "Resolved by %{user} %{when}"
+ closed_by_anonymous: "Resolved by anonymous %{when}"
+ reopened_by: "Reactivated by %{user} %{when}"
+ reopened_by_anonymous: "Reactivated by anonymous %{when}"
+ hidden_by: "Hidden by %{user} %{when}"
report: Report this note
query:
title: "Query Features"
@@ -276,7 +333,7 @@ en:
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:
@@ -316,7 +373,6 @@ en:
leave_a_comment: "Leave a comment"
login_to_leave_a_comment: "%{login_link} to leave a comment"
login: "Login"
- save_button: "Save"
no_such_entry:
title: "No such diary entry"
heading: "No entry with the id: %{id}"
@@ -331,11 +387,13 @@ en:
other: "%{count} comments"
edit_link: Edit this entry
hide_link: Hide this entry
+ unhide_link: Unhide this entry
confirm: Confirm
report: Report this entry
diary_comment:
comment_from: "Comment from %{link_user} on %{comment_created_at}"
hide_link: Hide this comment
+ unhide_link: Unhide this comment
confirm: Confirm
report: Report this comment
location:
@@ -357,7 +415,6 @@ en:
post: Post
when: When
comment: Comment
- ago: "%{ago} ago"
newer_comments: "Newer Comments"
older_comments: "Older Comments"
geocoder:
@@ -970,8 +1027,8 @@ en:
status: Status
reports: Reports
last_updated: Last Updated
- last_updated_time_html: "%{time} ago"
- last_updated_time_user_html: "%{time} ago by %{user}"
+ last_updated_time_html: "%{time}"
+ last_updated_time_user_html: "%{time} by %{user}"
link_to_reports: View Reports
reported_user: Reported User
reports_count:
@@ -1226,7 +1283,6 @@ en:
send_message_to: "Send a new message to %{name}"
subject: "Subject"
body: "Body"
- send_button: "Send"
back_to_inbox: "Back to inbox"
create:
message_sent: "Message sent"
@@ -1541,7 +1597,7 @@ en:
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
@@ -1549,8 +1605,8 @@ en:
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
@@ -1573,8 +1629,8 @@ en:
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
@@ -1743,7 +1799,6 @@ en:
visibility: "Visibility:"
visibility_help: "what does this mean?"
visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
- upload_button: "Upload"
help: "Help"
help_url: "https://wiki.openstreetmap.org/wiki/Upload"
create:
@@ -1767,7 +1822,6 @@ en:
description: "Description:"
tags: "Tags:"
tags_help: "comma delimited"
- save_button: "Save Changes"
visibility: "Visibility:"
visibility_help: "what does this mean?"
visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
@@ -1802,7 +1856,6 @@ en:
trace:
pending: "PENDING"
count_points: "%{count} points"
- ago: "%{time_in_words_ago} ago"
more: "more"
trace_details: "View Trace Details"
view_map: "View Map"
@@ -1879,10 +1932,8 @@ en:
oauth_clients:
new:
title: "Register a new application"
- submit: "Register"
edit:
title: "Edit your application"
- submit: "Edit"
show:
title: "OAuth details for %{app_name}"
key: "Consumer Key:"
@@ -2036,7 +2087,7 @@ en:
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?"
@@ -2077,12 +2128,10 @@ en:
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:"
@@ -2285,7 +2334,6 @@ en:
heading: "Creating block on %{name}"
reason: "The reason why %{name} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use laymans terms."
period: "How long, starting now, the user will be blocked from the API for."
- submit: "Create block"
tried_contacting: "I have contacted the user and asked them to stop."
tried_waiting: "I have given a reasonable amount of time for the user to respond to those communications."
needs_view: "User needs to log in before this block will be cleared"
@@ -2295,7 +2343,6 @@ en:
heading: "Editing block on %{name}"
reason: "The reason why %{name} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation. Bear in mind that not all users understand the community jargon, so please try to use laymans terms."
period: "How long, starting now, the user will be blocked from the API for."
- submit: "Update block"
show: "View this block"
back: "View all blocks"
needs_view: "Does the user need to log in before this block will be cleared?"
@@ -2317,18 +2364,31 @@ en:
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."
- period:
- one: "1 hour"
- other: "%{count} hours"
helper:
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"
+ other: "%{count} hours"
+ days:
+ one: "1 day"
+ other: "%{count} days"
+ weeks:
+ one: "1 week"
+ other: "%{count} weeks"
+ months:
+ one: "1 month"
+ other: "%{count} months"
+ years:
+ one: "1 year"
+ other: "%{count} years"
blocks_on:
title: "Blocks on %{name}"
heading: "List of blocks on %{name}"
@@ -2340,10 +2400,7 @@ en:
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"
@@ -2377,7 +2434,6 @@ en:
description: "Description"
created_at: "Created at"
last_changed: "Last changed"
- ago_html: "%{when} ago"
javascripts:
close: Close
share:
@@ -2557,7 +2613,6 @@ en:
edit:
description: "Description"
heading: "Edit redaction"
- submit: "Save redaction"
title: "Edit redaction"
index:
empty: "No redactions to show."
@@ -2566,7 +2621,6 @@ en:
new:
description: "Description"
heading: "Enter information for new redaction"
- submit: "Create redaction"
title: "Creating new redaction"
show:
description: "Description:"