X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/96f426a2eaa6009496b0f51934a497b3c970db97..9568c7fee85a615830ba78639b2ee8440da60668:/config/locales/en.yml?ds=sidebyside diff --git a/config/locales/en.yml b/config/locales/en.yml index 6157fa517..4f97a3fb1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -175,18 +175,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 @@ -254,8 +248,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: @@ -294,6 +288,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 @@ -302,6 +297,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 @@ -337,15 +333,15 @@ 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: @@ -397,13 +393,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" @@ -431,7 +422,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: @@ -1242,16 +1234,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 @@ -1416,35 +1407,39 @@ 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}." - 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!" @@ -1453,21 +1448,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." @@ -1478,18 +1463,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," @@ -1497,11 +1489,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" @@ -1570,6 +1567,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 @@ -1774,10 +1789,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: @@ -1881,6 +1892,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 @@ -2282,7 +2297,6 @@ 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' @@ -2458,7 +2472,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 @@ -2575,10 +2589,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"