X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/dbbb6c0de6ae97e31c449c9a52f39524588efdc8..44b08cc35d5b5488919059016a427feae62acb05:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index e463a3f93..bf4bd7b19 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1118,8 +1118,8 @@ en: paragraph_1_html: | OpenStreetMap has few formal rules but we expect all participants to collaborate with, and communicate with, the community. If you are considering - any activities other than editing by hand, please read and follow the guidelines on - Imports and + any activities other than editing by hand, please read and follow the guidelines on + Imports and Automated Edits. questions: title: Any questions? @@ -1145,7 +1145,7 @@ en: title: Join the community explanation_html: | If you have noticed a problem with our map data, for example a road is missing or your address, the best way to - proceed is to join the OpenStreetMap community and add or repair the data yourself. + proceed is to join the OpenStreetMap community and add or repair the data yourself. add_a_note: instructions_html: | Just click or the same icon on the map display. @@ -1155,8 +1155,8 @@ en: title: Other concerns explanation_html: | If you have concerns about how our data is being used or about the contents please consult our - copyright page for more legal information, or contact the appropriate - OSMF working group. + copyright page for more legal information, or contact the appropriate + OSMF working group. help_page: title: Getting Help introduction: | @@ -1224,18 +1224,20 @@ en: License page for details. legal_title: Legal legal_html: | - This site and many other related services are formally operated by the - OpenStreetMap Foundation (OSMF) - on behalf of the community. -
- Please contact the OSMF + This site and many other related services are formally operated by the + OpenStreetMap Foundation (OSMF) + 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}" @@ -1433,6 +1435,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 +1490,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 +1743,9 @@ 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 yahoo: title: Login with Yahoo alt: Login with a Yahoo OpenID @@ -1777,7 +1788,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 +1927,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" @@ -2190,7 +2203,6 @@ en: standard: Standard cycle_map: Cycle Map transport_map: Transport Map - mapquest: MapQuest Open hot: Humanitarian layers: header: Map Layers @@ -2247,11 +2259,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}