X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d8b9b6dd58cf049acc6cf647f80ceb5e3e200cd6..62349d18564b6d0ac9a4aac61b298df913f5c08d:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index f7ee6d04a..93d9fb61d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -474,6 +474,7 @@ en: description: "Recent diary entries from users of OpenStreetMap" comments: has_commented_on: "%{display_name} has commented on the following diary entries" + no_comments: "No diary comments" post: Post when: When comment: Comment @@ -486,6 +487,7 @@ en: success: "%{name} is now your friend!" failed: "Sorry, failed to add %{name} as a friend." already_a_friend: "You are already friends with %{name}." + limit_exceeded: "You have friended a lot of users recently. Please wait a while before trying to friend any more." remove_friend: heading: "Unfriend %{user}?" button: "Unfriend" @@ -963,12 +965,14 @@ en: mountain_pass: "yes" : "Mountain Pass" natural: + atoll: "Atoll" bare_rock: "Bare Rock" bay: "Bay" beach: "Beach" cape: "Cape" cave_entrance: "Cave Entrance" cliff: "Cliff" + coastline: "Coastline" crater: "Crater" dune: "Dune" fell: "Fell" @@ -986,6 +990,7 @@ en: moor: "Moor" mud: "Mud" peak: "Peak" + peninsula: "Peninsula" point: "Point" reef: "Reef" ridge: "Ridge" @@ -1033,6 +1038,7 @@ en: "yes": "Office" place: allotments: "Allotments" + archipelago: "Archipelago" city: "City" city_block: "City Block" country: "Country" @@ -1515,11 +1521,34 @@ en: 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".' + confirmations: + confirm: + heading: Check your email! + introduction_1: | + We sent you a confirmation email. + introduction_2: | + Confirm your account by clicking on the link in the email and you'll be able to start mapping. + press confirm button: "Press the confirm button below to activate your account." + button: Confirm + success: "Confirmed your account, thanks for signing up!" + already active: "This account has already been confirmed." + 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_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 + press confirm button: "Press the confirm button below to confirm your new email address." + button: Confirm + success: "Confirmed your change of email address!" + failure: "An email address has already been confirmed with this token." + unknown_token: "That confirmation code has expired or does not exist." messages: inbox: title: "Inbox" my_inbox: "My Inbox" - outbox: "outbox" + my_outbox: "My Outbox" messages: "You have %{new_messages} and %{old_messages}" new_messages: one: "%{count} new message" @@ -1552,9 +1581,8 @@ en: body: "Sorry there is no message with that id." outbox: title: "Outbox" - my_inbox_html: "My %{inbox_link}" - inbox: "inbox" - outbox: "outbox" + my_inbox: "My Inbox" + my_outbox: "My Outbox" messages: one: "You have %{count} sent message" other: "You have %{count} sent messages" @@ -1583,6 +1611,74 @@ en: as_unread: "Message marked as unread" destroy: destroyed: "Message deleted" + passwords: + lost_password: + title: "Lost password" + heading: "Forgotten Password?" + email address: "Email Address:" + new password button: "Reset password" + help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password." + notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon." + notice email cannot find: "Could not find that email address, sorry." + reset_password: + title: "Reset password" + heading: "Reset Password for %{user}" + reset: "Reset Password" + flash changed: "Your password has been changed." + flash token bad: "Did not find that token, check the URL maybe?" + sessions: + new: + title: "Login" + heading: "Login" + email or username: "Email Address or Username:" + password: "Password:" + openid_html: "%{logo} OpenID:" + remember: "Remember me" + lost password link: "Lost your password?" + login_button: "Login" + register now: Register now + with username: "Already have an OpenStreetMap account? Please login with your username and password:" + with external: "Alternatively, use a third party to login:" + new to osm: New to OpenStreetMap? + to make changes: To make changes to the OpenStreetMap data, you must have an account. + create account minute: Create an account. It only takes a minute. + no account: Don't have an account? + account not active: "Sorry, your account is not active yet.
Please use the 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. + auth failure: "Sorry, could not log in with those details." + openid_logo_alt: "Log in with an OpenID" + auth_providers: + openid: + title: Login with OpenID + alt: Login with an OpenID URL + google: + title: Login with Google + alt: Login with a Google OpenID + facebook: + title: Login with Facebook + alt: Login with a Facebook Account + windowslive: + title: Login with Windows Live + alt: Login with a Windows Live Account + github: + title: Login with GitHub + alt: Login with a GitHub Account + wikipedia: + title: Login with Wikipedia + alt: Login with a Wikipedia Account + yahoo: + title: Login with Yahoo + alt: Login with a Yahoo OpenID + wordpress: + title: Login with Wordpress + alt: Login with a Wordpress OpenID + aol: + title: Login with AOL + alt: Login with an AOL OpenID + destroy: + title: "Logout" + heading: "Logout from OpenStreetMap" + logout_button: "Logout" shared: markdown_help: title_html: Parsed with kramdown @@ -2110,7 +2206,6 @@ en: more: "more" trace_details: "View Trace Details" view_map: "View Map" - edit: "edit" edit_map: "Edit Map" public: "PUBLIC" identifiable: "IDENTIFIABLE" @@ -2118,7 +2213,6 @@ en: trackable: "TRACKABLE" by: "by" in: "in" - map: "map" index: public_traces: "Public GPS traces" my_traces: "My GPS traces" @@ -2127,8 +2221,10 @@ en: tagged_with: " tagged with %{tags}" empty_html: "Nothing here yet. Upload a new trace or learn more about GPS tracing on the wiki page." upload_trace: "Upload a trace" - see_all_traces: "See all traces" - see_my_traces: "See my traces" + all_traces: "All Traces" + my_traces: "My Traces" + traces_from: "Public Traces from %{user}" + remove_tag_filter: "Remove Tag Filter" destroy: scheduled_for_deletion: "Trace scheduled for deletion" make_public: @@ -2220,72 +2316,6 @@ en: destroy: flash: "Destroyed the client application registration" users: - login: - title: "Login" - heading: "Login" - email or username: "Email Address or Username:" - password: "Password:" - openid_html: "%{logo} OpenID:" - remember: "Remember me" - lost password link: "Lost your password?" - login_button: "Login" - register now: Register now - with username: "Already have an OpenStreetMap account? Please login with your username and password:" - with external: "Alternatively, use a third party to login:" - new to osm: New to OpenStreetMap? - to make changes: To make changes to the OpenStreetMap data, you must have an account. - create account minute: Create an account. It only takes a minute. - no account: Don't have an account? - account not active: "Sorry, your account is not active yet.
Please use the 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. - auth failure: "Sorry, could not log in with those details." - openid_logo_alt: "Log in with an OpenID" - auth_providers: - openid: - title: Login with OpenID - alt: Login with an OpenID URL - google: - title: Login with Google - alt: Login with a Google OpenID - facebook: - title: Login with Facebook - alt: Login with a Facebook Account - windowslive: - title: Login with Windows Live - alt: Login with a Windows Live Account - github: - title: Login with GitHub - alt: Login with a GitHub Account - wikipedia: - title: Login with Wikipedia - alt: Login with a Wikipedia Account - yahoo: - title: Login with Yahoo - alt: Login with a Yahoo OpenID - wordpress: - title: Login with Wordpress - alt: Login with a Wordpress OpenID - aol: - title: Login with AOL - alt: Login with an AOL OpenID - logout: - title: "Logout" - heading: "Logout from OpenStreetMap" - logout_button: "Logout" - lost_password: - title: "Lost password" - heading: "Forgotten Password?" - email address: "Email Address:" - new password button: "Reset password" - help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password." - notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon." - notice email cannot find: "Could not find that email address, sorry." - reset_password: - title: "Reset password" - heading: "Reset Password for %{user}" - reset: "Reset Password" - flash changed: "Your password has been changed." - flash token bad: "Did not find that token, check the URL maybe?" new: title: "Sign Up" no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically." @@ -2448,28 +2478,6 @@ en: 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." - confirm: - heading: Check your email! - introduction_1: | - We sent you a confirmation email. - introduction_2: | - Confirm your account by clicking on the link in the email and you'll be able to start mapping. - press confirm button: "Press the confirm button below to activate your account." - button: Confirm - success: "Confirmed your account, thanks for signing up!" - already active: "This account has already been confirmed." - 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_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 - press confirm button: "Press the confirm button below to confirm your new email address." - button: Confirm - success: "Confirmed your change of email address!" - failure: "An email address has already been confirmed with this token." - unknown_token: "That confirmation code has expired or does not exist." set_home: flash success: "Home location saved successfully" go_public: @@ -2605,8 +2613,9 @@ en: show: title: "%{block_on} blocked by %{block_by}" heading_html: "%{block_on} blocked by %{block_by}" - created: "Created" - status: "Status" + created: "Created:" + duration: "Duration:" + status: "Status:" show: "Show" edit: "Edit" revoke: "Revoke!" @@ -2634,6 +2643,7 @@ en: title: "Notes submitted or commented on by %{user}" heading: "%{user}'s notes" subheading_html: "Notes submitted or commented on by %{user}" + no_notes: No notes id: "Id" creator: "Creator" description: "Description"