X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b39251810b7f2e52d6e61a5657284da72655af2d..cba1b6a640e02b3903c81aedc5ff39e286cb938c:/config/locales/en-GB.yml diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 1f1794127..97ddaac4b 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -2,6 +2,7 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: Abijeet Patro +# Author: Alefar # Author: Andibing # Author: BEANS # Author: Bjh21 @@ -20,6 +21,7 @@ # Author: Jlrb+ # Author: Kosovastar # Author: Macofe +# Author: Maro21 # Author: Meno25 # Author: Michel Bakni # Author: Mvolz @@ -106,11 +108,17 @@ en-GB: way_tag: Way Tag attributes: client_application: - callback_url: Callback URL + name: Name (Required) + url: Main Application URL (Required) + callback_url: 'Callback URL:' support_url: Support URL + allow_read_prefs: read their user preferences + allow_write_prefs: modify their user preferences + allow_write_diary: create diary entries, comments and make friends allow_write_api: modify the map allow_read_gpx: read their private GPS traces allow_write_gpx: upload GPS traces + allow_write_notes: modify notes diary_comment: body: Body diary_entry: @@ -139,16 +147,29 @@ en-GB: title: Subject body: Body recipient: Recipient + redaction: + description: Description + report: + category: 'Select a reason for your report:' + details: Please provide some more details about the problem (required). user: email: E-mail + new_email: New Email Address active: Active display_name: Display Name - description: Description - languages: Languages + description: Profile Description + home_lat: Latitude + home_lon: Longitude + languages: Preferred Languages pass_crypt: Password + pass_crypt_confirmation: Confirm Password help: trace: tagstring: comma delimited + user_block: + needs_view: Does the user need to log in before this block will be cleared? + user: + new_email: (never displayed publicly) datetime: distance_in_words_ago: about_x_hours: @@ -193,20 +214,15 @@ en-GB: with_name_html: '%{name} (%{id})' editor: default: Default (currently %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (in-browser editor) id: name: iD description: iD (in-browser editor) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (in-browser editor) remote: name: Remote Control - description: Remote Control (JOSM or Merkaartor) + description: Remote Control (JOSM, Potlatch, Merkaartor) auth: providers: + none: None openid: OpenID google: Google facebook: Facebook @@ -266,8 +282,8 @@ en-GB: relation: Relations (%{count}) relation_paginated: Relations (%{x}-%{y} of %{count}) comment: Comments (%{count}) - hidden_commented_by: Hidden comment from %{user} %{when} - commented_by: Comment from %{user} %{when} + hidden_commented_by_html: Hidden comment from %{user} %{when} + commented_by_html: Comment from %{user} %{when} changesetxml: Changeset XML osmchangexml: osmChange XML feed: @@ -302,6 +318,7 @@ en-GB: entry_html: Relation %{relation_name} entry_role_html: Relation %{relation_name} (as %{relation_role}) not_found: + title: Not Found sorry: 'Sorry, %{type} #%{id} could not be found.' type: node: node @@ -310,6 +327,7 @@ en-GB: changeset: changeset note: note timeout: + title: Timeout Error sorry: Sorry, the data for the %{type} with the id %{id}, took too long to retrieve. type: node: node @@ -347,15 +365,15 @@ en-GB: open_title: 'Unresolved note #%{note_name}' closed_title: 'Resolved note #%{note_name}' hidden_title: 'Hidden note #%{note_name}' - opened_by: Created by %{user} %{when} - opened_by_anonymous: Created by anonymous %{when} - commented_by: Comment from %{user} %{when} - commented_by_anonymous: Comment from anonymous %{when} - closed_by: Resolved by %{user} %{when} - closed_by_anonymous: Resolved by anonymous %{when} - reopened_by: Reactivated by %{user} %{when} - reopened_by_anonymous: Reactivated by anonymous %{when} - hidden_by: Hidden by %{user} %{when} + opened_by_html: Created by %{user} %{when} + opened_by_anonymous_html: Created by anonymous %{when} + commented_by_html: Comment from %{user} %{when} + commented_by_anonymous_html: Comment from anonymous %{when} + closed_by_html: Resolved by %{user} %{when} + closed_by_anonymous_html: Resolved by anonymous %{when} + reopened_by_html: Reactivated by %{user} %{when} + reopened_by_anonymous_html: Reactivated by anonymous %{when} + hidden_by_html: Hidden by %{user} %{when} report: Report this note coordinates_html: '%{latitude}, %{longitude}' query: @@ -408,13 +426,8 @@ en-GB: new: title: New Diary Entry form: - subject: 'Subject:' - body: 'Body:' - language: 'Language:' - location: 'Location:' - latitude: 'Latitude:' - longitude: 'Longitude:' - use_map_link: use map + location: Location + use_map_link: Use map index: title: Users' diaries title_friends: Friends' diaries @@ -423,6 +436,7 @@ en-GB: in_language_title: Diary Entries in %{language} new: New Diary Entry new_title: Compose a new entry in my user diary + my_diary: My Diary no_entries: No diary entries recent_entries: Recent diary entries older_entries: Older Entries @@ -442,7 +456,8 @@ en-GB: body: Sorry, there is no diary entry or comment with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong. diary_entry: - posted_by_html: Posted by %{link_user} on %{created} in %{language_link} + posted_by_html: Posted by %{link_user} on %{created} in %{language_link}. + updated_at_html: Last updated on %{updated}. comment_link: Comment on this entry reply_link: Send a message to the author comment_count: @@ -512,6 +527,7 @@ en-GB: chair_lift: Chairlift drag_lift: Drag Lift gondola: Gondola Lift + magic_carpet: Magic Carpet Lift platter: Platter Lift pylon: Pylon station: Aerialway Station @@ -538,7 +554,9 @@ en-GB: bench: Bench bicycle_parking: Cycle Parking bicycle_rental: Cycle Rental + bicycle_repair_station: Bicycle Repair Station biergarten: Beer Garden + blood_bank: Blood Bank boat_rental: Boat Rental brothel: Brothel bureau_de_change: Bureau de Change @@ -555,6 +573,7 @@ en-GB: clock: Clock college: College community_centre: Community Centre + conference_centre: Conference Centre courthouse: Court crematorium: Crematorium dentist: Dentist @@ -562,6 +581,7 @@ en-GB: drinking_water: Drinking Water driving_school: Driving School embassy: Embassy + events_venue: Events Venue fast_food: Fast Food ferry_terminal: Ferry Terminal fire_station: Fire Station @@ -578,8 +598,11 @@ en-GB: kindergarten: Nursery School language_school: Language school library: Library + loading_dock: Loading Dock + love_hotel: Love Hotel marketplace: Marketplace monastery: Monastery + money_transfer: Money Transfer motorcycle_parking: Motorcycle Parking music_school: Music School nightclub: Night Club @@ -594,6 +617,7 @@ en-GB: post_office: Post Office prison: Prison pub: Pub + public_bath: Public Bath public_building: Public Building recycling: Recycling Point restaurant: Restaurant @@ -632,12 +656,17 @@ en-GB: building: apartment: Apartment apartments: Apartments + bungalow: Bungalow cabin: Cabin + chapel: Chapel + church: Church college: College Building commercial: Commercial Building construction: Building under Construction garage: Garage garages: Garages + hospital: Hospital + hotel: Hotel house: House industrial: Industrial Building roof: Roof @@ -784,6 +813,7 @@ en-GB: miniature_golf: Miniature Golf nature_reserve: Nature Reserve park: Park + picnic_table: Picnic Table pitch: Sports Pitch playground: Playground recreation_ground: Recreation Ground @@ -798,13 +828,21 @@ en-GB: "yes": Leisure man_made: adit: Adit + advertising: Advertising + antenna: Antenna/Antennae + avalanche_protection: Avalanche Protection beacon: Beacon + beam: Beam beehive: Bee Hive breakwater: Breakwater bridge: Bridge bunker_silo: Bunker + cairn: Cairn chimney: Chimney + clearcut: Clearcut + communications_tower: Communications Tower crane: Crane + cross: Cross dolphin: Mooring Post dyke: Dyke embankment: Embankment @@ -813,6 +851,7 @@ en-GB: groyne: Groyne kiln: Kiln lighthouse: Lighthouse + manhole: Manhole mast: Mast mine: Mine mineshaft: Mine Shaft @@ -1076,11 +1115,6 @@ en-GB: level8: City Boundary level9: Village Boundary level10: Suburb Boundary - description: - title: - osm_nominatim: Location from OpenStreetMap - Nominatim - geonames: Location from GeoNames types: cities: Cities towns: Towns @@ -1149,7 +1183,6 @@ en-GB: footer: You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl} message_notification: - subject_header: '[OpenStreetMap] %{subject}' hi: Hi %{to_user}, header: '%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:' @@ -1161,24 +1194,16 @@ en-GB: had_added_you: '%{user} has added you as a friend on OpenStreetMap.' see_their_profile: You can see their profile at %{userurl}. befriend_them: You can also add them as a friend at %{befriendurl}. - gpx_notification: - greeting: Hi, - your_gpx_file: It looks like your GPX file - with_description: with the description - and_the_tags: 'and the following tags:' - and_no_tags: and no tags. - failure: - subject: '[OpenStreetMap] GPX Import failure' - failed_to_import: 'failed to import. Here is the error:' - more_info_1: More information about GPX import failures and how to avoid - more_info_2: 'them can be found at:' - import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures - success: - subject: '[OpenStreetMap] GPX Import success' - loaded_successfully: - one: loaded successfully with %{trace_points} out of a possible 1 point. - other: loaded successfully with %{trace_points} out of a possible %{possible_points} - points. + gpx_failure: + failed_to_import: 'failed to import. Here is the error:' + import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures + subject: '[OpenStreetMap] GPX Import failure' + gpx_success: + loaded_successfully: + one: loaded successfully with %{trace_points} out of a possible 1 point. + other: loaded successfully with %{trace_points} out of a possible %{possible_points} + points. + subject: '[OpenStreetMap] GPX Import success' signup_confirm: subject: '[OpenStreetMap] Welcome to OpenStreetMap' greeting: Hi there! @@ -1189,28 +1214,16 @@ en-GB: information to get you started. email_confirm: subject: '[OpenStreetMap] Confirm your e-mail address' - email_confirm_plain: - greeting: Hi, - hopefully_you: Someone (hopefully you) would like to change their email address - over at %{server_url} to %{new_address}. - click_the_link: If this is you, please click the link below to confirm the change. - email_confirm_html: greeting: Hi, hopefully_you: Someone (hopefully you) would like to change their email address over at %{server_url} to %{new_address}. click_the_link: If this is you, please click the link below to confirm the change. lost_password: subject: '[OpenStreetMap] Password reset request' - lost_password_plain: greeting: Hi, hopefully_you: Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account. click_the_link: If this is you, please click the link below to reset your password. - lost_password_html: - greeting: Hi, - hopefully_you: Someone (possibly you) has asked for the password to be reset - on this e-mail address's openstreetmap.org account. - click_the_link: If this is you, please click the link below to reset your password. note_comment_notification: anonymous: An anonymous user greeting: Hi, @@ -1252,11 +1265,38 @@ en-GB: details: More details about the changeset can be found at %{url}. unsubscribe: To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe". + confirmations: + confirm: + heading: Check your email! + introduction_1: We sent you a confirmation email. + introduction_2: Confirm your account by clicking on the link in the email and + you'll be able to start mapping. + press confirm button: Press the confirm button below to activate your account. + button: Confirm + 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. + reconfirm_html: If you need us to resend the confirmation email, click + here. + confirm_resend: + success_html: We've sent a new confirmation note to %{email} and as soon as + you confirm your account you'll be able to get mapping.

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. + failure: User %{name} not found. + confirm_email: + heading: Confirm a change of e-mail address + press confirm button: Press the confirm button below to confirm your new e-mail + address. + button: Confirm + success: Confirmed your change of email address! + failure: An e-mail address has already been confirmed with this token. + unknown_token: That confirmation code has expired or does not exist. messages: inbox: title: Inbox my_inbox: My Inbox - outbox: outbox messages: You have %{new_messages} and %{old_messages} new_messages: one: '%{count} new message' @@ -1291,9 +1331,6 @@ en-GB: body: Sorry, there is no message with that id. outbox: title: Outbox - my_inbox_html: My %{inbox_link} - inbox: inbox - outbox: outbox messages: one: You have %{count} sent message other: You have %{count} sent messages @@ -1327,6 +1364,82 @@ en-GB: as_unread: Message marked as unread destroy: destroyed: Message deleted + passwords: + lost_password: + title: Lost password + heading: Forgotten Password? + email address: E-mail address + new password button: Reset password + help_text: Enter the e-mail address you used to sign up, we will send a link + to it that you can use to reset your password. + 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: + title: Reset password + heading: Reset Password for %{user} + reset: Reset Password + flash changed: Your password has been changed. + flash token bad: Did not find that token, check the URL maybe? + sessions: + new: + title: Login + heading: Login + email or username: 'E-mail Address or Username:' + password: 'Password:' + openid_html: '%{logo} OpenID:' + remember: Remember me + lost password link: Lost your password? + login_button: Login + register now: Register now + with username: 'Already have an OpenStreetMap account? Please login with your + username and password:' + with external: 'Alternatively, use a third party to login:' + new to osm: New to OpenStreetMap? + to make changes: To make changes to the OpenStreetMap data, you must have an + account. + create account minute: Create an account. It only takes a minute. + no account: Don't have an account? + account not active: Sorry, your account is not active yet.
Please use the + link in the account confirmation email to activate your account, or request + a new confirmation email. + account is suspended: Sorry, your account has been suspended due to suspicious + activity.
Please contact the webmaster if + you wish to discuss this. + auth failure: Sorry, could not log in with those details. + openid_logo_alt: Log in with an OpenID + auth_providers: + openid: + title: Login with OpenID + alt: Login with an OpenID URL + google: + title: Login with Google + alt: Login with a Google OpenID + facebook: + title: Login with Facebook + alt: Login with a Facebook Account + windowslive: + title: Login with Windows Live + alt: Login with a Windows Live Account + github: + title: Login with GitHub + alt: Login with a GitHub Account + wikipedia: + title: Login with Wikipedia + alt: Login with a Wikipedia Account + yahoo: + title: Login with Yahoo + alt: Login with a Yahoo OpenID + wordpress: + title: Login with Wordpress + alt: Login with a Wordpress OpenID + aol: + title: Login with AOL + alt: Login with an AOL OpenID + destroy: + title: Logout + heading: Logout of OpenStreetMap + logout_button: Logout site: about: next: Next @@ -1498,17 +1611,6 @@ en-GB: user_page_link: user page anon_edits_html: (%{link}) anon_edits_link_text: Find out why this is the case. - flash_player_required_html: You need a Flash player to use Potlatch, the OpenStreetMap - Flash editor. You can download - Flash Player from Adobe.com. Several - other options are also available for editing OpenStreetMap. - potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you - should deselect the current way or point, if editing in live mode, or click - save if you have a save button.) - potlatch2_not_configured: Potlatch 2 has not been configured - please see https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - for more information - potlatch2_unsaved_changes: You have unsaved changes. (To save in Potlatch 2, - you should click save.) id_not_configured: iD has not been configured no_iframe_support: Your browser doesn't support HTML iframes, which are necessary for this feature. @@ -1698,23 +1800,6 @@ en-GB: bicycle_shop: Bicycle shop bicycle_parking: Bicycle parking toilets: Toilets - richtext_area: - edit: Edit - preview: Preview - markdown_help: - title_html: Parsed with kramdown - headings: Headings - heading: Heading - subheading: Subheading - unordered: Unordered list - ordered: Ordered list - first: First item - second: Second item - link: Link - text: Text - image: Image - alt: Alt text - url: URL welcome: title: Welcome! introduction_html: Welcome to OpenStreetMap, the free and editable map of the @@ -1825,7 +1910,6 @@ en-GB: more: more trace_details: View Trace Details view_map: View Map - edit: edit edit_map: Edit Map public: PUBLIC identifiable: IDENTIFIABLE @@ -1833,7 +1917,6 @@ en-GB: trackable: TRACKABLE by: by in: in - map: map index: public_traces: Public GPS traces public_traces_from: Public GPS traces from %{user} @@ -1941,80 +2024,6 @@ en-GB: destroy: flash: Destroyed the client application registration users: - login: - title: Login - heading: Login - email or username: 'E-mail Address or Username:' - password: 'Password:' - openid_html: '%{logo} OpenID:' - remember: Remember me - lost password link: Lost your password? - login_button: Login - register now: Register now - with username: 'Already have an OpenStreetMap account? Please login with your - username and password:' - with external: 'Alternatively, use a third party to login:' - new to osm: New to OpenStreetMap? - to make changes: To make changes to the OpenStreetMap data, you must have an - account. - create account minute: Create an account. It only takes a minute. - no account: Don't have an account? - account not active: Sorry, your account is not active yet.
Please use the - link in the account confirmation email to activate your account, or request - a new confirmation email. - account is suspended: Sorry, your account has been suspended due to suspicious - activity.
Please contact the webmaster if - you wish to discuss this. - auth failure: Sorry, could not log in with those details. - openid_logo_alt: Log in with an OpenID - auth_providers: - openid: - title: Login with OpenID - alt: Login with an OpenID URL - google: - title: Login with Google - alt: Login with a Google OpenID - facebook: - title: Login with Facebook - alt: Login with a Facebook Account - windowslive: - title: Login with Windows Live - alt: Login with a Windows Live Account - github: - title: Login with GitHub - alt: Login with a GitHub Account - wikipedia: - title: Login with Wikipedia - alt: Login with a Wikipedia Account - yahoo: - title: Login with Yahoo - alt: Login with a Yahoo OpenID - wordpress: - title: Login with Wordpress - alt: Login with a Wordpress OpenID - aol: - title: Login with AOL - alt: Login with an AOL OpenID - logout: - title: Logout - heading: Logout of OpenStreetMap - logout_button: Logout - lost_password: - title: Lost password - heading: Forgotten Password? - email address: E-mail address - new password button: Reset password - help_text: Enter the e-mail address you used to sign up, we will send a link - to it that you can use to reset your password. - 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: - title: Reset password - heading: Reset Password for %{user} - reset: Reset Password - flash changed: Your password has been changed. - flash token bad: Did not find that token, check the URL maybe? new: title: Sign Up no_auto_account_create: Unfortunately we are not currently able to create an @@ -2027,20 +2036,12 @@ en-GB: html: |-

Unlike other maps, OpenStreetMap is completely created by people like you, and it's free for anyone to fix, update, download and use.

Sign up to get started contributing. We'll send an email to confirm your account.

- license_agreement: When you confirm your account you will need to agree to the - contributor - terms. email address: 'Email Address:' confirm email address: 'Confirm Email Address:' - not_displayed_publicly_html: Your address is not displayed publicly, see our - privacy policy for more information display name: 'Display Name:' display name description: Your publicly displayed username. You can change this later in the preferences. external auth: 'Third Party Authentication:' - password: 'Password:' - confirm password: 'Confirm Password:' use external auth: Alternatively, use a third party to login auth no password: With third party authentication a password is not required, but some extra tools or server may still need one. @@ -2143,15 +2144,13 @@ en-GB: account: title: Edit account my settings: My settings - current email address: 'Current Email Address:' - new email address: 'New Email Address:' - email never displayed publicly: (never displayed publicly) - external auth: 'External Authentication:' + current email address: Current Email Address + external auth: External Authentication openid: link: https://wiki.openstreetmap.org/wiki/OpenID link text: what is this? public editing: - heading: 'Public editing:' + heading: Public editing enabled: Enabled. Not anonymous and can edit data. enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: what is this? @@ -2167,7 +2166,7 @@ en-GB: public.
  • This action cannot be reversed and all new users are now public by default.
    • contributor terms: - heading: 'Contributor Terms:' + heading: Contributor Terms agreed: You have agreed to the new Contributor Terms. not yet agreed: You have not yet agreed to the new Contributor Terms. review link text: Please follow this link at your convenience to review and @@ -2176,14 +2175,10 @@ en-GB: in the Public Domain. link: http://www.osmfoundation.org/wiki/License/Contributor_Terms link text: what is this? - profile description: 'Profile Description:' - preferred languages: 'Preferred Languages:' - preferred editor: 'Preferred Editor:' - image: 'Image:' + image: Image gravatar: gravatar: Use Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar - link text: what is this? disabled: Gravatar has been disabled. enabled: Display of your Gravatar has been enabled. new image: Add an image @@ -2191,10 +2186,8 @@ en-GB: delete image: Remove the current image replace image: Replace the current image image size hint: (square images at least 100x100 work best) - home location: 'Home Location:' + home location: Home Location no home location: You have not entered your home location. - latitude: 'Latitude:' - longitude: 'Longitude:' update home location on click: Update home location when I click on the map? save changes button: Save Changes make edits public button: Make all my edits public @@ -2202,32 +2195,6 @@ en-GB: flash update success confirm needed: User information updated successfully. Check your email for a note to confirm your new email address. flash update success: User information updated successfully. - confirm: - heading: Check your email! - introduction_1: We sent you a confirmation email. - introduction_2: Confirm your account by clicking on the link in the email and - you'll be able to start mapping. - press confirm button: Press the confirm button below to activate your account. - button: Confirm - 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. - reconfirm_html: If you need us to resend the confirmation email, click - here. - confirm_resend: - success: We've sent a new confirmation note to %{email} and as soon as you confirm - your account you'll be able to get mapping.

    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. - failure: User %{name} not found. - confirm_email: - heading: Confirm a change of e-mail address - press confirm button: Press the confirm button below to confirm your new e-mail - address. - button: Confirm - success: Confirmed your change of email address! - failure: An e-mail address has already been confirmed with this token. - unknown_token: That confirmation code has expired or does not exist. set_home: flash success: Home location saved successfully go_public: @@ -2300,27 +2267,17 @@ en-GB: new: title: Creating block on %{name} heading_html: Creating block on %{name} - reason: The reason why %{name} is being blocked. Please be as calm and as reasonable - as possible, giving as much detail as you can about the situation, remembering - that the message will be publicly visible. Bear in mind that not all users - understand the community jargon, so please try to use laymans terms. period: How long, starting now, the user will be blocked from the API for. tried_contacting: I have contacted the user and asked them to stop. tried_waiting: I have given a reasonable amount of time for the user to respond to those communications. - needs_view: User needs to log in before this block will be cleared back: View all blocks edit: title: Editing block on %{name} heading_html: Editing block on %{name} - reason: The reason why %{name} is being blocked. Please be as calm and as reasonable - as possible, giving as much detail as you can about the situation. Bear in - mind that not all users understand the community jargon, so please try to - use laymans terms. period: How long, starting now, the user will be blocked from the API for. show: View this block back: View all blocks - needs_view: Does the user need to log in before this block will be cleared? filter: block_expired: The block has already expired and cannot be edited. block_period: The blocking period must be one of the values selectable in the @@ -2347,10 +2304,11 @@ en-GB: revoke: Revoke! flash: This block has been revoked. helper: - time_future: Ends in %{time}. + time_future_html: Ends in %{time}. until_login: Active until the user logs in. - time_future_and_until_login: Ends in %{time} and after the user has logged in. - time_past: Ended %{time}. + time_future_and_until_login_html: Ends in %{time} and after the user has logged + in. + time_past_html: Ended %{time}. block_duration: hours: one: 1 hour @@ -2366,8 +2324,8 @@ en-GB: show: title: '%{block_on} blocked by %{block_by}' heading_html: '%{block_on} blocked by %{block_by}' - created: Created - status: Status + created: 'Created:' + status: 'Status:' show: Show edit: Edit revoke: Revoke! @@ -2414,7 +2372,6 @@ en-GB: custom_dimensions: Set custom dimensions format: 'Format:' scale: 'Scale:' - image_size: Image will show standard layer at download: Download short_url: Short URL include_marker: Include marker @@ -2570,7 +2527,6 @@ en-GB: centre_map: Centre map here redactions: edit: - description: Description heading: Edit redaction title: Edit redaction index: @@ -2578,7 +2534,6 @@ en-GB: heading: List of redactions title: List of redactions new: - description: Description heading: Enter information for new redaction title: Creating new redaction show: