X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f988a159238ec9425b8a9f0ed5085095629ee35a..9e98c9d41df683c131719cca60b9a8b5f3d267d9:/config/locales/en.yml?ds=sidebyside diff --git a/config/locales/en.yml b/config/locales/en.yml index f416f3259..f7ee6d04a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -20,7 +20,7 @@ en: create: Send client_application: create: Register - update: Edit + update: Update redaction: create: Create redaction update: Save redaction @@ -75,6 +75,18 @@ en: # Translates all the model attributes, which is used in error handling on the web site # Only the ones that are used on the web site are translated at the moment attributes: + client_application: + 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: @@ -104,16 +116,36 @@ en: title: "Subject" body: "Body" recipient: "Recipient" + redaction: + title: Title + description: Description + report: + category: Select a reason for your report + details: Please provide some more details about the problem (required). user: + auth_provider: Authentication Provider + auth_uid: Authentication UID email: "Email" + email_confirmation: "Email Confirmation" + 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 + preferred_editor: Preferred Editor pass_crypt: "Password" + pass_crypt_confirmation: "Confirm Password" help: trace: tagstring: comma delimited + user_block: + reason: The reason why the user 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. + needs_view: Does the user need to log in before this block will be cleared? + user: + email_confirmation: 'Your address is not displayed publicly, see our privacy policy for more information.' + new_email: "(never displayed publicly)" datetime: distance_in_words_ago: about_x_hours: @@ -159,18 +191,12 @@ en: 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 @@ -216,10 +242,18 @@ en: anonymous: "anonymous" no_comment: "(no comment)" part_of: "Part of" + part_of_relations: + one: 1 relation + other: "%{count} relations" + part_of_ways: + one: 1 way + other: "%{count} ways" download_xml: "Download XML" view_history: "View History" view_details: "View Details" location: "Location:" + common_details: + coordinates_html: "%{latitude}, %{longitude}" changeset: title: "Changeset: %{id}" belongs_to: "Author" @@ -230,8 +264,8 @@ en: 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: @@ -247,6 +281,8 @@ en: title_html: "Way: %{name}" history_title_html: "Way History: %{name}" nodes: "Nodes" + nodes_count: + other: "%{count} nodes" also_part_of_html: one: "part of way %{related_ways}" other: "part of ways %{related_ways}" @@ -254,6 +290,9 @@ en: title_html: "Relation: %{name}" history_title_html: "Relation History: %{name}" members: "Members" + members_count: + one: 1 member + other: "%{count} members" relation_member: entry_html: "%{type} %{name}" entry_role_html: "%{type} %{name} as %{role}" @@ -265,6 +304,7 @@ en: 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 @@ -273,6 +313,7 @@ en: 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 @@ -308,16 +349,17 @@ en: 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: title: "Query Features" introduction: "Click on the map to find nearby features." @@ -367,13 +409,8 @@ en: 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" @@ -401,7 +438,8 @@ en: heading: "No entry with the id: %{id}" 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: @@ -423,6 +461,7 @@ en: location: "Location:" view: "View" edit: "Edit" + coordinates: "%{latitude}; %{longitude}" feed: user: title: "OpenStreetMap diary entries for %{user}" @@ -1211,16 +1250,15 @@ en: "yes": "Waterway" admin_levels: level2: "Country Boundary" + level3: "Region Boundary" level4: "State Boundary" level5: "Region Boundary" level6: "County Boundary" + level7: "Municipality Boundary" level8: "City Boundary" level9: "Village Boundary" level10: "Suburb Boundary" - description: - title: - osm_nominatim: 'Location from OpenStreetMap Nominatim' - geonames: 'Location from GeoNames' + level11: "Neighbourhood Boundary" types: cities: Cities towns: Towns @@ -1256,7 +1294,7 @@ en: open: Open resolved: Resolved update: - new_report: Your report has been registered sucessfully + new_report: Your report has been registered successfully successful_update: Your report has been updated successfully provide_details: Please provide the required details show: @@ -1299,8 +1337,6 @@ en: new: title_html: "Report %{link}" missing_params: "Cannot create a new report" - details: Please provide some more details about the problem (required). - select: "Select a reason for your report:" disclaimer: intro: "Before sending your report to the site moderators, please ensure that:" not_just_mistake: You are certain that the problem is not just a mistake @@ -1329,7 +1365,7 @@ en: abusive_label: This note is abusive other_label: Other create: - successful_report: Your report has been registered sucessfully + successful_report: Your report has been registered successfully provide_details: Please provide the required details layouts: project_name: @@ -1382,40 +1418,44 @@ en: text: Make a Donation learn_more: "Learn More" more: More - notifier: + user_mailer: diary_comment_notification: subject: "[OpenStreetMap] %{user} commented on a diary entry" hi: "Hi %{to_user}," header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:" + header_html: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:" footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}" + footer_html: "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}" + subject: "[OpenStreetMap] %{message_title}" hi: "Hi %{to_user}," header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:" + header_html: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:" + footer: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}" footer_html: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}" friendship_notification: hi: "Hi %{to_user}," subject: "[OpenStreetMap] %{user} added you as a friend" had_added_you: "%{user} has added you as a friend on OpenStreetMap." see_their_profile: "You can see their profile at %{userurl}." + see_their_profile_html: "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: "https://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. + befriend_them_html: "You can also add them as a friend at %{befriendurl}." + gpx_description: + description_with_tags_html: "It looks like your GPX file %{trace_name} with the description %{trace_description} and the following tags: %{tags}" + description_with_no_tags_html: "It looks like your GPX file %{trace_name} with the description %{trace_description} and no tags" + gpx_failure: + hi: "Hi %{to_user}," + failed_to_import: "failed to import. Here is the error:" + more_info_html: "More information about GPX import failures and how to avoid them can be found at %{url}." + import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures" + subject: "[OpenStreetMap] GPX Import failure" + gpx_success: + hi: "Hi %{to_user}," + 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!" @@ -1424,21 +1464,11 @@ en: welcome: "After you confirm your account, we'll provide you with some additional information to get you started." email_confirm: subject: "[OpenStreetMap] Confirm your email 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 email address's openstreetmap.org account." click_the_link: "If this is you, please click the link below to reset your password." @@ -1449,18 +1479,25 @@ en: subject_own: "[OpenStreetMap] %{commenter} has commented on one of your notes" subject_other: "[OpenStreetMap] %{commenter} has commented on a note you are interested in" your_note: "%{commenter} has left a comment on one of your map notes near %{place}." + your_note_html: "%{commenter} has left a comment on one of your map notes near %{place}." commented_note: "%{commenter} has left a comment on a map note you have commented on. The note is near %{place}." + commented_note_html: "%{commenter} has left a comment on a map note you have commented on. The note is near %{place}." closed: subject_own: "[OpenStreetMap] %{commenter} has resolved one of your notes" subject_other: "[OpenStreetMap] %{commenter} has resolved a note you are interested in" your_note: "%{commenter} has resolved one of your map notes near %{place}." + your_note_html: "%{commenter} has resolved one of your map notes near %{place}." commented_note: "%{commenter} has resolved a map note you have commented on. The note is near %{place}." + commented_note_html: "%{commenter} has resolved a map note you have commented on. The note is near %{place}." reopened: subject_own: "[OpenStreetMap] %{commenter} has reactivated one of your notes" subject_other: "[OpenStreetMap] %{commenter} has reactivated a note you are interested in" your_note: "%{commenter} has reactivated one of your map notes near %{place}." + your_note_html: "%{commenter} has reactivated one of your map notes near %{place}." commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}." + commented_note_html: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}." details: "More details about the note can be found at %{url}." + details_html: "More details about the note can be found at %{url}." changeset_comment_notification: hi: "Hi %{to_user}," greeting: "Hi," @@ -1468,11 +1505,16 @@ en: subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets" subject_other: "[OpenStreetMap] %{commenter} has commented on a changeset you are interested in" your_changeset: "%{commenter} left a comment at %{time} on one of your changesets" + your_changeset_html: "%{commenter} left a comment at %{time} on one of your changesets" commented_changeset: "%{commenter} left a comment at %{time} on a changeset you are watching created by %{changeset_author}" + commented_changeset_html: "%{commenter} left a comment at %{time} on a changeset you are watching created by %{changeset_author}" partial_changeset_with_comment: "with comment '%{changeset_comment}'" + partial_changeset_with_comment_html: "with comment '%{changeset_comment}'" partial_changeset_without_comment: "without comment" details: "More details about the changeset can be found at %{url}." + details_html: "More details about the changeset can be found at %{url}." unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".' + unsubscribe_html: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".' messages: inbox: title: "Inbox" @@ -1541,6 +1583,24 @@ en: as_unread: "Message marked as unread" destroy: destroyed: "Message deleted" + shared: + 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 + richtext_field: + edit: Edit + preview: Preview site: about: next: Next @@ -1610,7 +1670,7 @@ en: full legal code explains your rights and responsibilities. intro_3_1_html: | - Our documentation is licensed under the + Our documentation is licensed under the Creative Commons Attribution-ShareAlike 2.0 license (CC BY-SA 2.0). credit_title_html: How to credit OpenStreetMap @@ -1627,11 +1687,11 @@ en: direct your readers to openstreetmap.org (perhaps by expanding 'OpenStreetMap' to this full address) and to opendatacommons.org. credit_3_1_html: | - The map tiles in the “standard style” at www.openstreetmap.org are a - Produced Work by the OpenStreetMap Foundation using OpenStreetMap data - under the Open Database License. If you are using these tiles please use - the following attribution: - “Base map and data from OpenStreetMap and OpenStreetMap Foundation”. + The map tiles in the “standard style” at www.openstreetmap.org are a + Produced Work by the OpenStreetMap Foundation using OpenStreetMap data + under the Open Database License. If you are using these tiles please use + the following attribution: + “Base map and data from OpenStreetMap and OpenStreetMap Foundation”. credit_4_html: | For a browsable electronic map, the credit should appear in the corner of the map. For example: @@ -1745,10 +1805,6 @@ en: anon_edits_html: "(%{link})" anon_edits_link: "https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits" 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." export: @@ -1852,6 +1908,10 @@ en: url: https://wiki.openstreetmap.org/ title: OpenStreetMap Wiki description: Browse the wiki for in-depth OpenStreetMap documentation. + potlatch: + removed: Your default OpenStreetMap editor is set as Potlatch. Because Adobe Flash Player has been withdrawn, Potlatch is no longer available to use in a web browser. + desktop_html: You can still use Potlatch by downloading the desktop application for Mac and Windows. + id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. Change your user settings here. sidebar: search_results: Search Results close: Close @@ -1935,23 +1995,6 @@ en: 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: | @@ -2043,6 +2086,7 @@ en: uploaded: "Uploaded:" points: "Points:" start_coordinates: "Start coordinate:" + coordinates_html: "%{latitude}; %{longitude}" map: "map" edit: "edit" owner: "Owner:" @@ -2153,13 +2197,6 @@ en: delete: "Delete Client" confirm: "Are you sure?" requests: "Requesting the following permissions from the user:" - 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." index: title: "My OAuth Details" my_tokens: "My Authorised Applications" @@ -2173,19 +2210,7 @@ en: registered_apps: "You have the following client applications registered:" register_new: "Register your application" form: - name: "Name" - required: "Required" - url: "Main Application URL" - callback_url: "Callback URL" - support_url: "Support URL" requests: "Request the following permissions from the user:" - 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." not_found: sorry: "Sorry, that %{type} could not be found." create: @@ -2258,8 +2283,6 @@ en: reset_password: title: "Reset password" heading: "Reset Password for %{user}" - password: "Password:" - confirm password: "Confirm Password:" reset: "Reset Password" flash changed: "Your password has been changed." flash token bad: "Did not find that token, check the URL maybe?" @@ -2273,15 +2296,11 @@ en:

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." continue: Sign Up @@ -2386,15 +2405,13 @@ en: 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?" @@ -2404,21 +2421,18 @@ en: heading: "Public editing" html: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. Since the 0.6 API changeover, only public users can edit map data. (find out why)." 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 accept the new Contributor Terms." agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain." link: "https://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?" + what_is_gravatar: "What is Gravatar?" disabled: "Gravatar has been disabled." enabled: "Display of your Gravatar has been enabled." new image: "Add an image" @@ -2426,10 +2440,8 @@ en: 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 @@ -2449,7 +2461,7 @@ en: 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." + 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 email address @@ -2529,20 +2541,16 @@ en: 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 drop-down list." @@ -2566,10 +2574,10 @@ en: 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" @@ -2645,7 +2653,7 @@ en: custom_dimensions: "Set custom dimensions" format: "Format:" scale: "Scale:" - image_size: "Image will show standard layer at " + image_dimensions: "Image will show standard layer at %{width} x %{height}" download: "Download" short_url: "Short URL" include_marker: "Include marker" @@ -2673,6 +2681,7 @@ en: other: You are within %{count} feet of this point base: standard: Standard + cyclosm: CyclOSM cycle_map: Cycle Map transport_map: Transport Map hot: Humanitarian @@ -2687,6 +2696,7 @@ en: copyright: "© OpenStreetMap contributors" donate_link_text: "" terms: "Website and API terms" + cyclosm: "Tiles style by CyclOSM hosted by OpenStreetMap France" thunderforest: "Tiles courtesy of Andy Allan" opnvkarte: "Tiles courtesy of MeMoMaps" hotosm: "Tiles style by Humanitarian OpenStreetMap Team hosted by OpenStreetMap France" @@ -2817,7 +2827,6 @@ en: centre_map: Centre map here redactions: edit: - description: "Description" heading: "Edit redaction" title: "Edit redaction" index: @@ -2825,7 +2834,6 @@ en: heading: "List of redactions" title: "List of redactions" new: - description: "Description" heading: "Enter information for new redaction" title: "Creating new redaction" show: