X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a7b95e2a63e31f8c293cff014333b4da2dc0dc11..501e25641969c0cf779c1178ca7f2613c88ca933:/config/locales/en.yml?ds=sidebyside diff --git a/config/locales/en.yml b/config/locales/en.yml index 7e7302e79..298369c22 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -116,20 +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: @@ -175,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 @@ -399,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" @@ -433,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: @@ -1288,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: @@ -1359,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: @@ -1417,18 +1423,24 @@ en: 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}." + 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" @@ -1452,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." @@ -1477,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," @@ -1496,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" @@ -1569,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 @@ -1773,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: @@ -1880,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 @@ -2283,12 +2315,9 @@ en:

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

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 @@ -2393,15 +2422,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?" @@ -2411,21 +2438,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" @@ -2433,10 +2457,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 @@ -2536,20 +2558,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." @@ -2652,7 +2670,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" @@ -2680,6 +2698,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 @@ -2694,6 +2713,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" @@ -2824,7 +2844,6 @@ en: centre_map: Centre map here redactions: edit: - description: "Description" heading: "Edit redaction" title: "Edit redaction" index: @@ -2832,7 +2851,6 @@ en: heading: "List of redactions" title: "List of redactions" new: - description: "Description" heading: "Enter information for new redaction" title: "Creating new redaction" show: