X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e80571c22c91061c3fc5f3b6fc164522d05031cb..342e25dd5a154e1389a83228aed0b75c080d30c2:/config/locales/en.yml?ds=sidebyside diff --git a/config/locales/en.yml b/config/locales/en.yml index b41fb064a..50dabce26 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -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 @@ -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 @@ -1418,7 +1416,7 @@ en: header: "%{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}" 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}:" footer_html: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}" @@ -1428,23 +1426,21 @@ en: 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: "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. + 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 +1449,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." @@ -2282,7 +2268,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' @@ -2575,10 +2560,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"