X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6b631f1e25533233fe8e323c7f6d657a2b1d8718..a66c34991acfff398fbc83c921dfce18a835ee26:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index d7127a4e9..1de83f9d6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -103,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}" @@ -124,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})]" @@ -146,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" @@ -171,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: @@ -247,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" @@ -294,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: @@ -376,7 +415,6 @@ en: post: Post when: When comment: Comment - ago: "%{ago} ago" newer_comments: "Newer Comments" older_comments: "Older Comments" geocoder: @@ -989,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: @@ -1818,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" @@ -2091,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:" @@ -2329,7 +2364,7 @@ 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." @@ -2337,7 +2372,7 @@ en: 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" @@ -2365,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" @@ -2402,7 +2434,6 @@ en: description: "Description" created_at: "Created at" last_changed: "Last changed" - ago_html: "%{when} ago" javascripts: close: Close share: