X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f99c383318c4f9ea15639f0566f3e42db4e2c8b1..50d469a74a95a26645fc0f8dbe2ad71b0de24e29:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 516dad37a..ff74c785f 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}"
@@ -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"
@@ -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:"
@@ -2285,7 +2336,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 +2345,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?"
@@ -2570,7 +2619,6 @@ en:
edit:
description: "Description"
heading: "Edit redaction"
- submit: "Save redaction"
title: "Edit redaction"
index:
empty: "No redactions to show."
@@ -2579,7 +2627,6 @@ en:
new:
description: "Description"
heading: "Enter information for new redaction"
- submit: "Create redaction"
title: "Creating new redaction"
show:
description: "Description:"