X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8a42bc2eff8563d206615cb8810ad87e9e6e5be2..c63637f304ffd4469ac0d737e53ae16d7fa4fe9f:/config/locales/en-GB.yml
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 1f1794127..831d127c9 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -266,8 +266,8 @@ en-GB:
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:
@@ -347,15 +347,15 @@ en-GB:
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:
@@ -1076,11 +1076,6 @@ en-GB:
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
@@ -1149,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}:'
@@ -1161,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!
@@ -1189,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,
@@ -2027,9 +2001,6 @@ en-GB:
html: |-
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
@@ -2215,10 +2186,11 @@ en-GB:
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 e-mail address
@@ -2347,10 +2319,11 @@ en-GB:
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