X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/945ff7911ca51dc250ffaba71f62821b5c0c0a95..e6d19586dffa03e6fac4961c0a1b64b6a237d88d:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 12cb76b04..52994509f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1013,10 +1013,10 @@ en: FAQ. more_2_html: | Although OpenStreetMap is open data, we cannot provide a - free-of-charge map API for third-party developers. - See our API Usage Policy, - Tile Usage Policy - and Nominatim Usage Policy. + free-of-charge map API for third-parties. + See our API Usage Policy, + Tile Usage Policy + and Nominatim Usage Policy. contributors_title_html: Our contributors contributors_intro_html: | Our contributors are thousands of individuals. We also include @@ -1083,7 +1083,7 @@ en: on-line filing page. trademarks_title_html: Trademarks trademarks_1_html: | - OpenStreetMap and the magnifying glass logo are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please send your questions to the Licence Working Group. + OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please send your questions to the Licence Working Group. welcome_page: title: Welcome! introduction_html: | @@ -1226,16 +1226,18 @@ en: legal_html: | This site and many other related services are formally operated by the OpenStreetMap Foundation (OSMF) - on behalf of the community. + on behalf of the community. Use of all OSMF operated services is subject + to our + Acceptable Use Policies and our Privacy Policy
Please contact the OSMF if you have licensing, copyright or other legal questions and issues. partners_title: Partners notifier: diary_comment_notification: - subject: "[OpenStreetMap] %{user} commented on your diary entry" + subject: "[OpenStreetMap] %{user} commented on a diary entry" hi: "Hi %{to_user}," - header: "%{from_user} has commented on your recent OpenStreetMap diary entry with the subject %{subject}:" + 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 reply at %{replyurl}" message_notification: subject_header: "[OpenStreetMap] %{subject}" @@ -1313,10 +1315,20 @@ en: subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets" subject_other: "[OpenStreetMap] %{commenter} has commented on a changeset you are interested in" your_changeset: "%{commenter} has left a comment on one of your changesets created at %{time}" + your_changeset_html: '%{commenter} + has left a comment on one of your changesets + created at %{time}' commented_changeset: "%{commenter} has left a comment on a map changeset you are watching created by %{changeset_author} at %{time}" + commented_changeset_html: '%{commenter} + has left a comment on a map changeset you are watching created by + %{changeset_author} + at %{time}' partial_changeset_with_comment: "with comment '%{changeset_comment}'" + partial_changeset_with_comment_html: 'with comment %{changeset_comment}' partial_changeset_without_comment: "without comment" details: "More details about the changeset can be found at %{url}." + details_html: 'More details about the changeset can be found at + %{url}.' message: inbox: title: "Inbox" @@ -1433,6 +1445,9 @@ en: track: "Track" bridleway: "Bridleway" cycleway: "Cycleway" + cycleway_national: "National cycleway" + cycleway_regional: "Regional cycleway" + cycleway_local: "Local cycleway" footway: "Footway" rail: "Railway" subway: "Subway" @@ -1485,6 +1500,9 @@ en: private: "Private access" destination: "Destination access" construction: "Roads under construction" + bicycle_shop: "Bicycle shop" + bicycle_parking: "Bicycle parking" + toilets: "Toilets" richtext_area: edit: Edit preview: Preview @@ -1735,6 +1753,12 @@ en: 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 @@ -1767,7 +1791,7 @@ en: new: title: "Sign Up" no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically." - contact_webmaster: '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_webmaster: 'Please contact the webmaster 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: | @@ -1777,7 +1801,7 @@ en: 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: 'Not displayed publicly (see privacy policy)' + not displayed publicly: 'Your address is not displayed publicly, see our privacy policy for more information' display name: "Display Name:" display name description: "Your publicly displayed username. You can change this later in the preferences." external auth: "Third Party Authentication:" @@ -1916,6 +1940,8 @@ en: gravatar: "Use Gravatar" link: "http://wiki.openstreetmap.org/wiki/Gravatar" link text: "what is this?" + 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" @@ -1944,7 +1970,7 @@ en: 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: "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 webmaster@openstreetmap.org as we are unable to reply to any confirmation requests." + 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." failure: "User %{name} not found." confirm_email: heading: Confirm a change of email address @@ -2178,7 +2204,7 @@ en: key: title: "Map Key" tooltip: "Map Key" - tooltip_disabled: "Map Key available only for Standard layer" + tooltip_disabled: "Map Key not available for this layer" map: zoom: in: Zoom In @@ -2190,7 +2216,6 @@ en: standard: Standard cycle_map: Cycle Map transport_map: Transport Map - mapquest: MapQuest Open hot: Humanitarian layers: header: Map Layers @@ -2247,11 +2272,21 @@ en: instructions: continue_without_exit: Continue on %{name} slight_right_without_exit: Slight right onto %{name} + offramp_right_without_exit: Take the ramp on the right onto %{name} + onramp_right_without_exit: Turn right on the ramp onto %{name} + endofroad_right_without_exit: At the end of the road turn right onto %{name} + merge_right_without_exit: Merge right onto %{name} + fork_right_without_exit: At the fork turn right onto %{name} turn_right_without_exit: Turn right onto %{name} sharp_right_without_exit: Sharp right onto %{name} uturn_without_exit: U-turn along %{name} sharp_left_without_exit: Sharp left onto %{name} turn_left_without_exit: Turn left onto %{name} + offramp_left_without_exit: Take the ramp on the left onto %{name} + onramp_left_without_exit: Turn left on the ramp onto %{name} + endofroad_left_without_exit: At the end of the road turn left onto %{name} + merge_left_without_exit: Merge left onto %{name} + fork_left_without_exit: At the fork turn left onto %{name} slight_left_without_exit: Slight left onto %{name} via_point_without_exit: (via point) follow_without_exit: Follow %{name}