X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8d76be71bbb8a799cbf0627dee170f26ade5a11f..c2985cba9356cb21917541119ab55ded18e936b5:/config/locales/en-GB.yml?ds=sidebyside diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 730ab9b14..c29c3be4e 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -422,6 +422,22 @@ en-GB: timeout: sorry: Sorry, the list of changeset comments you requested took too long to retrieve. + dashboards: + contact: + km away: '%{count}km away' + m away: '%{count}m away' + popup: + your location: Your location + nearby mapper: Nearby mapper + friend: Friend + show: + no friends: You have not added any friends yet. + nearby users: Other nearby users + no nearby users: There are no other users who admit to mapping nearby yet. + friends_changesets: friends' changesets + friends_diaries: friends' diary entries + nearby_changesets: nearby user changesets + nearby_diaries: nearby user diary entries diary_entries: new: title: New Diary Entry @@ -1279,11 +1295,6 @@ en-GB: reconfirm_html: If you need us to resend the confirmation email, click here. confirm_resend: - 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 @@ -1381,6 +1392,22 @@ en-GB: reset: Reset Password flash changed: Your password has been changed. flash token bad: Did not find that token, check the URL maybe? + profiles: + edit: + image: Image + gravatar: + gravatar: Use Gravatar + link: https://wiki.openstreetmap.org/wiki/Gravatar + disabled: Gravatar has been disabled. + enabled: Display of your Gravatar has been enabled. + new image: Add an image + keep image: Keep the current image + delete image: Remove the current image + replace image: Replace the current image + image size hint: (square images at least 100x100 work best) + home location: Home Location + no home location: You have not entered your home location. + update home location on click: Update home location when I click on the map? sessions: new: title: Login @@ -1404,8 +1431,8 @@ en-GB: link in the account confirmation email to activate your account, or request a new confirmation email. account is suspended: Sorry, your account has been suspended due to suspicious - activity.
Please contact the webmaster if - you wish to discuss this. + activity.
Please contact support if you wish + to discuss this. auth failure: Sorry, could not log in with those details. openid_logo_alt: Log in with an OpenID auth_providers: @@ -2024,9 +2051,9 @@ en-GB: title: Sign Up no_auto_account_create: Unfortunately we are not currently able to create an account for you automatically. - contact_webmaster_html: Please contact the webmaster - to arrange for an account to be created - we will try and deal with the request - as quickly as possible. + contact_support_html: Please contact support to arrange + for an account to be created - we will try and deal with the request as quickly + as possible. about: header: Free and editable html: |- @@ -2043,9 +2070,6 @@ en-GB: but some extra tools or server may still need one. continue: Sign Up terms accepted: Thanks for accepting the new contributor terms! - terms declined: We are sorry that you have decided to not accept the new Contributor - Terms. For more information, please see this wiki page. - terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined terms: title: Terms heading: Terms @@ -2064,6 +2088,10 @@ en-GB: france: France italy: Italy rest_of_world: Rest of the world + terms_declined_flash: + terms_declined_html: We are sorry that you have decided to not accept the new + Contributor Terms. For more information, please see %{terms_declined_link}. + terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined no_such_user: title: No such user heading: The user %{user} does not exist @@ -2080,7 +2108,6 @@ en-GB: my profile: My Profile my settings: My Settings my comments: My Comments - oauth settings: oauth settings blocks on me: Blocks on Me blocks by me: Blocks by Me send message: Send Message @@ -2101,14 +2128,6 @@ en-GB: spam score: 'Spam Score:' description: Description user location: User location - if_set_location_html: Set your home location on the %{settings_link} page to - see nearby users. - settings_link_text: settings - no friends: You have not added any friends yet. - km away: '%{count}km away' - m away: '%{count}m away' - nearby users: Other nearby users - no nearby users: There are no other users who admit to mapping nearby yet. role: administrator: This user is an administrator moderator: This user is a moderator @@ -2129,14 +2148,6 @@ en-GB: unhide_user: Unhide this User delete_user: Delete this User confirm: Confirm - friends_changesets: friends' changesets - friends_diaries: friends' diary entries - nearby_changesets: nearby user changesets - nearby_diaries: nearby user diary entries - popup: - your location: Your location - nearby mapper: Nearby mapper - friend: Friend account: title: Edit account my settings: My settings @@ -2171,23 +2182,8 @@ en-GB: in the Public Domain. link: http://www.osmfoundation.org/wiki/License/Contributor_Terms link text: what is this? - image: Image - gravatar: - gravatar: Use Gravatar - link: https://wiki.openstreetmap.org/wiki/Gravatar - disabled: Gravatar has been disabled. - enabled: Display of your Gravatar has been enabled. - new image: Add an image - keep image: Keep the current image - delete image: Remove the current image - replace image: Replace the current image - image size hint: (square images at least 100x100 work best) - home location: Home Location - no home location: You have not entered your home location. - update home location on click: Update home location when I click on the map? save changes button: Save Changes make edits public button: Make all my edits public - return to profile: Return to profile flash update success confirm needed: User information updated successfully. Check your email for a note to confirm your new email address. flash update success: User information updated successfully. @@ -2209,13 +2205,12 @@ en-GB: suspended: title: Account Suspended heading: Account Suspended - webmaster: webmaster body_html: |-

Sorry, your account has been automatically suspended due to suspicious activity.

- This decision will be reviewed by an administrator shortly, or you may contact the %{webmaster} if you wish to discuss this. + This decision will be reviewed by an administrator shortly, or you may contact %{webmaster} if you wish to discuss this.

auth_failure: connection_failed: Connection to authentication provider failed