X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/60c885d071de5db26de79b1d80fd1244cf2d8832..10d65cc8571d38bb6af6d9022edb98a294ad2f2d:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index f98a78a31..b157e8cbc 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -40,6 +40,12 @@ en: messages: invalid_email_address: does not appear to be a valid e-mail address email_address_not_routable: is not routable + models: + user_mute: + attributes: + subject: + format: "%{message}" + is_already_muted: "is already muted" # Translates all the model names, which is used in error handling on the website models: acl: "Access Control List" @@ -256,6 +262,7 @@ en: 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: @@ -1672,8 +1679,6 @@ en: messages: inbox: title: "Inbox" - my_inbox: "My Inbox" - my_outbox: "My Outbox" messages: "You have %{new_messages} and %{old_messages}" new_messages: one: "%{count} new message" @@ -1681,16 +1686,20 @@ en: 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" - 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" + actions: "Actions" message_summary: unread_button: "Mark as unread" read_button: "Mark as read" reply_button: "Reply" destroy_button: "Delete" + unmute_button: "Move to Inbox" new: title: "Send message" send_message_to_html: "Send a new message to %{name}" @@ -1704,16 +1713,17 @@ en: body: "Sorry there is no message with that id." outbox: title: "Outbox" - my_inbox: "My Inbox" - my_outbox: "My Outbox" + actions: "Actions" messages: one: "You have %{count} sent message" other: "You have %{count} sent messages" - to: "To" - subject: "Subject" - date: "Date" 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 login as the correct user in order to reply." show: @@ -1725,24 +1735,34 @@ en: 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 login 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" + unmute: + notice: "Message has been moved to Inbox" + error: "The message could not be moved to the Inbox." destroy: destroyed: "Message deleted" passwords: - lost_password: + new: title: "Lost password" heading: "Forgotten Password?" email address: "Email Address:" new password button: "Reset password" help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password." + create: notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon." notice email cannot find: "Could not find that email address, sorry." - reset_password: + edit: title: "Reset password" heading: "Reset Password for %{user}" reset: "Reset Password" + flash token bad: "Did not find that token, check the URL maybe?" + update: flash changed: "Your password has been changed." flash token bad: "Did not find that token, check the URL maybe?" preferences: @@ -2278,6 +2298,7 @@ en: primary: "Primary road" secondary: "Secondary road" unclassified: "Unclassified road" + pedestrian: "Pedestrian way" track: "Track" bridleway: "Bridleway" cycleway: "Cycleway" @@ -2286,36 +2307,44 @@ en: cycleway_local: "Local cycleway" footway: "Footway" rail: "Railway" + train: "Train" subway: "Subway" - tram: - - Light rail - - tram - cable: - - Cable car - - chair lift - runway: - - Airport Runway - - taxiway - apron: - - Airport apron - - terminal + ferry: "Ferry" + light_rail: "Light rail" + tram_only: "Tram" + trolleybus: "Trolleybus" + bus: "Bus" + cable_car: "Cable car" + chair_lift: "Chair lift" + runway_only: "Airport Runway" + taxiway: "Taxiway" + apron_only: "Airport apron" admin: "Administrative boundary" - forest: "Forest" + orchard_only: "Orchard" + vineyard: "Vineyard" + forest_only: "Forest" wood: "Wood" + farmland: "Farmland" + grass_only: "Grass" + meadow: "Meadow" + bare_rock: "Bare rock" + sand: "Sand" golf: "Golf course" park: "Park" + common_only: "Common" + built_up: "Built-up area" resident: "Residential area" - common: - - Common - - meadow - - garden retail: "Retail area" industrial: "Industrial area" commercial: "Commercial area" heathland: "Heathland" - lake: - - Lake - - reservoir + scrubland: "Scrubland" + lake_only: "Lake" + reservoir: "Reservoir" + intermittent_water: "Intermittent waterbody" + glacier: "Glacier" + reef: "Reef" + wetland: "Wetland" farm: "Farm" brownfield: "Brownfield site" cemetery: "Cemetery" @@ -2324,19 +2353,20 @@ en: centre: "Sports centre" reserve: "Nature reserve" military: "Military area" - school: - - School - - university + school_only: "School" + university: "University" + hospital: "Hospital" building: "Significant building" station: "Railway station" - summit: - - Summit - - peak + summit_only: "Summit" + peak: "Peak" tunnel: "Dashed casing = tunnel" bridge: "Black casing = bridge" private: "Private access" destination: "Destination access" construction: "Roads under construction" + bus_stop: "Bus stop" + stop: "Stop" bicycle_shop: "Bicycle shop" bicycle_parking: "Bicycle parking" toilets: "Toilets" @@ -2533,6 +2563,7 @@ en: oauth1_settings: OAuth 1 settings oauth2_applications: OAuth 2 applications oauth2_authorizations: OAuth 2 authorizations + muted_users: Muted Users oauth: authorize: title: "Authorize access to your account" @@ -2720,6 +2751,8 @@ en: my_dashboard: My Dashboard blocks on me: Blocks on Me blocks by me: Blocks by Me + create_mute: Mute this User + destroy_mute: Unmute this User edit_profile: Edit Profile send message: Send Message diary: Diary @@ -2910,6 +2943,29 @@ en: showing_page: "Page %{page}" next: "Next »" previous: "« Previous" + user_mutes: + index: + title: "Muted Users" + my_muted_users: "My muted users" + you_have_muted_n_users: + one: "You have muted %{count} User" + other: "You have muted %{count} users" + user_mute_explainer: "Messages of muted users are moved into a separate Inbox and you won't receive email notifications." + user_mute_admins_and_moderators: "You can mute Admins and Moderators but their messages will not be muted." + table: + thead: + muted_user: "Muted User" + actions: "Actions" + tbody: + unmute: "Unmute" + send_message: "Send message" + + create: + notice: "You muted %{name}." + error: "%{name} could not be muted. %{full_message}." + destroy: + notice: "You unmuted %{name}." + error: "User could not be unmuted. Please try again." notes: index: title: "Notes submitted or commented on by %{user}" @@ -3034,6 +3090,7 @@ en: map_data_zoom_in_tooltip: Zoom in to see map data queryfeature_tooltip: Query features queryfeature_disabled_tooltip: Zoom in to query features + embed_html_disabled: HTML embedding is not available for this map layer changesets: show: comment: "Comment"