X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/782e619de229a06c4ffe55cc840e7f63c5693836..cb80bd3b966e1f780b7a1db1cf2d32716643caea:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 5628d3ea9..3fabe13c1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -245,25 +245,6 @@ en: entry: comment: Comment full: Full note - account: - deletions: - show: - title: Delete My Account - warning: Warning! The account deletion process is final, and cannot be reversed. - delete_account: Delete Account - delete_introduction: "You can delete your OpenStreetMap account using the button below. Please note the following details:" - delete_profile: Your profile information, including your avatar, description and home location will be removed. - delete_display_name: Your display name will be removed, and can be reused by other accounts. - retain_caveats: "However, some information about you will be retained on OpenStreetMap, even after your account is deleted:" - retain_edits: Your edits to the map database, if any, will be retained. - retain_traces: Your uploaded traces, if any, will be retained. - retain_diary_entries: Your diary entries and diary comments, if any, will be retained but hidden from view. - retain_notes: Your map notes and note comments, if any, will be retained but hidden from view. - retain_changeset_discussions: Your changeset discussions, if any, will be retained. - retain_email: Your email address will be retained. - recent_editing_html: "As you have edited recently your account cannot currently be deleted. Deletion will be possible in %{time}." - confirm_delete: Are you sure? - cancel: Cancel accounts: edit: title: "Edit account" @@ -305,6 +286,24 @@ en: success: "User information updated successfully." destroy: success: "Account Deleted." + deletions: + show: + title: Delete My Account + warning: Warning! The account deletion process is final, and cannot be reversed. + delete_account: Delete Account + delete_introduction: "You can delete your OpenStreetMap account using the button below. Please note the following details:" + delete_profile: Your profile information, including your avatar, description and home location will be removed. + delete_display_name: Your display name will be removed, and can be reused by other accounts. + retain_caveats: "However, some information about you will be retained on OpenStreetMap, even after your account is deleted:" + retain_edits: Your edits to the map database, if any, will be retained. + retain_traces: Your uploaded traces, if any, will be retained. + retain_diary_entries: Your diary entries and diary comments, if any, will be retained but hidden from view. + retain_notes: Your map notes and note comments, if any, will be retained but hidden from view. + retain_changeset_discussions: Your changeset discussions, if any, will be retained. + retain_email: Your email address will be retained. + recent_editing_html: "As you have edited recently your account cannot currently be deleted. Deletion will be possible in %{time}." + confirm_delete: Are you sure? + cancel: Cancel browse: deleted_ago_by_html: "Deleted %{time_ago} by %{user}" edited_ago_by_html: "Edited %{time_ago} by %{user}" @@ -1752,8 +1751,6 @@ en: title: "No such message" heading: "No such message" body: "Sorry there is no message with that id." - reply: - wrong_user: "You are logged in as '%{user}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply." show: title: "Read message" reply_button: "Reply" @@ -1813,6 +1810,9 @@ en: people_mapping_nearby: "people mapping nearby" message: destroy_button: "Delete" + replies: + new: + wrong_user: "You are logged in as '%{user}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply." passwords: new: title: "Lost password" @@ -2850,6 +2850,27 @@ en: report: Report this User go_public: flash success: "All your edits are now public, and you are now allowed to edit." + issued_blocks: + show: + title: "Blocks by %{name}" + heading_html: "List of Blocks by %{name}" + empty: "%{name} has not made any blocks yet." + received_blocks: + show: + title: "Blocks on %{name}" + heading_html: "List of Blocks on %{name}" + empty: "%{name} has not been blocked yet." + edit: + title: "Revoking all blocks on %{block_on}" + heading_html: "Revoking all blocks on %{block_on}" + empty: "%{name} has no active blocks." + confirm: "Are you sure you wish to revoke %{active_blocks}?" + active_blocks: + one: "%{count} active block" + other: "%{count} active blocks" + revoke: "Revoke!" + destroy: + flash: "All active blocks have been revoked." lists: show: title: Users @@ -2926,16 +2947,6 @@ en: title: "User blocks" heading: "List of user blocks" empty: "No blocks have been made yet." - revoke_all: - title: "Revoking all blocks on %{block_on}" - heading_html: "Revoking all blocks on %{block_on}" - empty: "%{name} has no active blocks." - confirm: "Are you sure you wish to revoke %{active_blocks}?" - active_blocks: - one: "%{count} active block" - other: "%{count} active blocks" - revoke: "Revoke!" - flash: "All active blocks have been revoked." helper: time_future_html: "Ends in %{time}." until_login: "Active until the user logs in." @@ -2961,19 +2972,10 @@ en: ended: "ended" revoked_html: "revoked by %{name}" active: "active" - active_unread: "active unread" - expired_unread: "expired unread" + active_until_read: "active until read" read_html: "read at %{time}" time_in_future_title: "%{time_absolute}; in %{time_relative}" time_in_past_title: "%{time_absolute}; %{time_relative}" - blocks_on: - title: "Blocks on %{name}" - heading_html: "List of Blocks on %{name}" - empty: "%{name} has not been blocked yet." - blocks_by: - title: "Blocks by %{name}" - heading_html: "List of Blocks by %{name}" - empty: "%{name} has not made any blocks yet." show: title: "%{block_on} blocked by %{block_by}" heading_html: "%{block_on} blocked by %{block_by}"