X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8c8aa1042882cea1e820d91c308dadde6a072c96..7406ae5dcc9cbb177a8ea33085af9caf6e3ebb1b:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 546bf669c..ca22de9bd 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -40,6 +40,13 @@ en: messages: invalid_email_address: does not appear to be a valid e-mail address email_address_not_routable: is not routable + display_name_is_user_n: can't be user_n unless n is your user id + 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" @@ -1433,9 +1440,9 @@ en: one: "%{count} report" other: "%{count} reports" no_reports: No reports - report_created_at: "First reported at %{datetime}" - last_resolved_at: "Last resolved at %{datetime}" - last_updated_at: "Last updated at %{datetime} by %{displayname}" + report_created_at_html: "First reported at %{datetime}" + last_resolved_at_html: "Last resolved at %{datetime}" + last_updated_at_html: "Last updated at %{datetime} by %{displayname}" resolve: Resolve ignore: Ignore reopen: Reopen @@ -1584,6 +1591,7 @@ en: loaded: one: "loaded successfully with %{trace_points} out of a possible %{count} point." other: "loaded successfully with %{trace_points} out of a possible %{count} points." + all_your_traces_html: "All your successfully uploaded GPX traces can be found at %{url}." subject: "[OpenStreetMap] GPX Import success" signup_confirm: subject: "[OpenStreetMap] Welcome to OpenStreetMap" @@ -1673,8 +1681,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" @@ -1682,16 +1688,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}" @@ -1705,16 +1715,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: @@ -1726,24 +1737,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: @@ -1851,6 +1872,7 @@ en: image: Image alt: Alt text url: URL + codeblock: Code block richtext_field: edit: Edit preview: Preview @@ -2279,67 +2301,83 @@ en: primary: "Primary road" secondary: "Secondary road" unclassified: "Unclassified road" + pedestrian: "Pedestrian way" track: "Track" bridleway: "Bridleway" cycleway: "Cycleway" cycleway_national: "National cycleway" cycleway_regional: "Regional cycleway" cycleway_local: "Local cycleway" + cycleway_mtb: "Mountain bike route" 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: "Tram" + trolleybus: "Trolleybus" + bus: "Bus" + cable_car: "Cable car" + chair_lift: "Chair lift" + runway: "Airport Runway" + taxiway: "Taxiway" + apron: "Airport apron" admin: "Administrative boundary" + capital: "Capital" + city: "City" + orchard: "Orchard" + vineyard: "Vineyard" forest: "Forest" wood: "Wood" + farmland: "Farmland" + grass: "Grass" + meadow: "Meadow" + bare_rock: "Bare rock" + sand: "Sand" golf: "Golf course" park: "Park" + common: "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: "Lake" + reservoir: "Reservoir" + intermittent_water: "Intermittent waterbody" + glacier: "Glacier" + reef: "Reef" + wetland: "Wetland" farm: "Farm" brownfield: "Brownfield site" cemetery: "Cemetery" allotments: "Allotments" pitch: "Sports pitch" centre: "Sports centre" + beach: "Beach" reserve: "Nature reserve" military: "Military area" - school: - - School - - university + school: "School" + university: "University" + hospital: "Hospital" building: "Significant building" station: "Railway station" - summit: - - Summit - - peak + summit: "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_rental: "Bicycle rental" bicycle_parking: "Bicycle parking" + bicycle_parking_small: "Small bicycle parking" toilets: "Toilets" welcome: title: Welcome! @@ -2383,6 +2421,7 @@ en: automated_edits: Automated Edits automated_edits_url: https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct start_mapping: Start Mapping + continue_authorization: Continue Authorization add_a_note: title: No Time To Edit? Add a Note! para_1: | @@ -2533,6 +2572,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" @@ -2567,6 +2607,7 @@ en: read_gpx: Read private GPS traces write_gpx: Upload GPS traces write_notes: Modify notes + write_redactions: Redact map data read_email: Read user email address skip_authorization: Auto approve application oauth_clients: @@ -2651,6 +2692,7 @@ en: application: "Application" permissions: "Permissions" no_applications_html: "You have not yet authorized any %{oauth2} applications." + oauth_2: "OAuth 2" application: revoke: "Revoke Access" confirm_revoke: "Revoke access for this application?" @@ -2720,6 +2762,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 @@ -2751,6 +2795,7 @@ en: importer: "Revoke importer access" block_history: "Active Blocks" moderator_history: "Blocks Given" + revoke_all_blocks: "Revoke all blocks" comments: "Comments" create_block: "Block this User" activate_user: "Activate this User" @@ -2853,6 +2898,16 @@ en: confirm: "Are you sure you wish to revoke this block?" revoke: "Revoke!" flash: "This block has been revoked." + 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." @@ -2910,6 +2965,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}" @@ -2946,6 +3024,7 @@ en: reactivate: Reactivate comment_and_resolve: Comment & Resolve comment: Comment + log_in_to_comment: "Log in to comment on this note" report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}." other_problems_resolve: "For all other problems with the note, please resolve it yourself with a comment." other_problems_resolved: "For all other problems, resolving is sufficient."