X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0434bee88800e131002fb0b4a85d4f898972913d..f7b0e879739770ae4a9d9de4f012ef90d49d4d20:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 7faf3bebc..9d1d8476f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1726,8 +1726,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 +1741,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,18 +1752,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: @@ -1795,12 +1761,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 +1769,50 @@ 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" passwords: new: title: "Lost password" @@ -2846,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 @@ -2922,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." @@ -2957,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}"