X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4347d9d3b00a8fffe78daa93eac5b490905f9ac8..f8f327179c3241159cf3fd13fd064512fe13994d:/config/locales/en-GB.yml?ds=inline diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 8016960c4..831d127c9 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -1144,7 +1144,6 @@ en-GB: 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}' hi: Hi %{to_user}, header: '%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:' @@ -1156,24 +1155,16 @@ en-GB: 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: http://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_failure: + failed_to_import: 'failed to import. Here is the error:' + import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures + subject: '[OpenStreetMap] GPX Import failure' + gpx_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. + subject: '[OpenStreetMap] GPX Import success' signup_confirm: subject: '[OpenStreetMap] Welcome to OpenStreetMap' greeting: Hi there! @@ -1184,28 +1175,16 @@ en-GB: information to get you started. email_confirm: subject: '[OpenStreetMap] Confirm your e-mail 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 e-mail address's openstreetmap.org account. - click_the_link: If this is you, please click the link below to reset your password. note_comment_notification: anonymous: An anonymous user greeting: Hi,