X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2df389c97e52437f964e4b4ee22c8493a9cc7fbc..cb80bd3b966e1f780b7a1db1cf2d32716643caea:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index e4489ff60..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}" @@ -1726,8 +1725,8 @@ en: success: "Confirmed your account, thanks for signing up!" already active: "This account has already been confirmed." unknown token: "That confirmation code has expired or does not exist." - resend_html: "If you need us to resend the confirmation email, %{reconfirm_link}." - click_here: click here + if_need_resend: "If you need us to resend the confirmation email, click the button below." + resend_button: Resend the confirmation email confirm_resend: failure: "User %{name} not found." confirm_email: @@ -1741,28 +1740,6 @@ en: confirmation_sent: We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping. whitelist: If you use an antispam system which sends confirmation requests then please make sure you whitelist %{sender} as we are unable to reply to any confirmation requests. messages: - inbox: - title: "Inbox" - messages: "You have %{new_messages} and %{old_messages}" - new_messages: - one: "%{count} new message" - other: "%{count} new messages" - old_messages: - one: "%{count} old message" - other: "%{count} old messages" - no_messages_yet_html: "You have no messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?" - people_mapping_nearby: "people mapping nearby" - messages_table: - from: "From" - to: "To" - subject: "Subject" - date: "Date" - actions: "Actions" - message_summary: - unread_button: "Mark as unread" - read_button: "Mark as read" - destroy_button: "Delete" - unmute_button: "Move to Inbox" new: title: "Send message" send_message_to_html: "Send a new message to %{name}" @@ -1774,20 +1751,6 @@ en: title: "No such message" heading: "No such message" body: "Sorry there is no message with that id." - outbox: - title: "Outbox" - messages: - one: "You have %{count} sent message" - other: "You have %{count} sent messages" - no_sent_messages_html: "You have no sent messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?" - people_mapping_nearby: "people mapping nearby" - muted: - title: "Muted Messages" - messages: - one: "%{count} muted message" - other: "You have %{count} muted messages" - 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" @@ -1795,12 +1758,6 @@ en: destroy_button: "Delete" back: "Back" wrong_user: "You are logged in as '%{user}' but the message you have asked to read was not sent by or to that user. Please log in as the correct user in order to read it." - sent_message_summary: - destroy_button: "Delete" - heading: - my_inbox: "My Inbox" - my_outbox: "My Outbox" - muted_messages: "Muted messages" mark: as_read: "Message marked as read" as_unread: "Message marked as unread" @@ -1809,6 +1766,53 @@ en: error: "The message could not be moved to the Inbox." destroy: destroyed: "Message deleted" + mailboxes: + heading: + my_inbox: "My Inbox" + my_outbox: "My Outbox" + muted_messages: "Muted messages" + messages_table: + from: "From" + to: "To" + subject: "Subject" + date: "Date" + actions: "Actions" + message: + unread_button: "Mark as unread" + read_button: "Mark as read" + destroy_button: "Delete" + unmute_button: "Move to Inbox" + inboxes: + show: + title: "Inbox" + messages: "You have %{new_messages} and %{old_messages}" + new_messages: + one: "%{count} new message" + other: "%{count} new messages" + old_messages: + one: "%{count} old message" + other: "%{count} old messages" + no_messages_yet_html: "You have no messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?" + people_mapping_nearby: "people mapping nearby" + muted_inboxes: + show: + title: "Muted Messages" + messages: + one: "%{count} muted message" + other: "You have %{count} muted messages" + outboxes: + show: + title: "Outbox" + messages: + one: "You have %{count} sent message" + other: "You have %{count} sent messages" + no_sent_messages_html: "You have no sent messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?" + 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" @@ -2856,6 +2860,17 @@ en: 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 @@ -2932,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." @@ -2967,8 +2972,7 @@ 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}"