X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b4b59df75e4048eaebff7c7efeeee66aa3bfa5a3..78dd142df4057315c236b2186d4860c59f0373c9:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index ec08012fe..853180080 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -254,8 +254,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 +294,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 +303,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 +339,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: @@ -1248,10 +1250,6 @@ en: 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 @@ -1411,40 +1409,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!" @@ -1453,21 +1455,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 +1470,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 +1496,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" @@ -1639,7 +1643,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 @@ -1656,11 +1660,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: @@ -2282,7 +2286,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 +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 @@ -2575,10 +2578,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"