X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/080b12330bc3045722a08989cfc6b85c85e3dc1a..66fccfdbcf10626c4b7676f7e44b8ba78305cb6b:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 17c8ece12..ae8294e95 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -162,6 +162,7 @@ en: way: way relation: relation changeset: changeset + note: note timeout: sorry: "Sorry, the data for the %{type} with the id %{id}, took too long to retrieve." type: @@ -169,6 +170,7 @@ en: way: way relation: relation changeset: changeset + note: note redacted: redaction: "Redaction %{id}" message_html: "Version %{version} of this %{type} cannot be shown as it has been redacted. Please see %{redaction_link} for details." @@ -248,6 +250,7 @@ en: diary_entry: new: title: New Diary Entry + publish_button: "Publish" list: title: "Users' diaries" title_friends: "Friends' diaries" @@ -966,9 +969,10 @@ en: legal_babble: title_html: Copyright and License intro_1_html: | - OpenStreetMap is open data, licensed under the ® is open data, licensed under the Open Data - Commons Open Database License (ODbL). + Commons Open Database License (ODbL) by the OpenStreetMap Foundation (OSMF). intro_2_html: | You are free to copy, distribute, transmit and adapt our data, as long as you credit OpenStreetMap and its @@ -1004,6 +1008,7 @@ en: more_title_html: Finding out more more_1_html: | Read more about using our data, and how to credit us, at the OSMF Licence page and the community Legal FAQ. more_2_html: | @@ -1076,6 +1081,9 @@ en: to our takedown procedure or file directly at our 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. welcome_page: title: Welcome! introduction_html: | @@ -1105,6 +1113,14 @@ en: tag_html: | A tag is a bit of data about a node or way, like a restaurant's name or a road's speed limit. + rules: + title: Rules! + 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 + Automated Edits. questions: title: Any questions? paragraph_1_html: | @@ -1150,10 +1166,30 @@ en: url: /welcome title: Welcome to OSM description: Start with this quick guide covering the OpenStreetMap basics. + beginners_guide: + url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide + title: Beginners' Guide + description: Community maintained guide for beginners. help: url: https://help.openstreetmap.org/ title: help.openstreetmap.org description: Ask a question or look up answers on OSM's question-and-answer site. + mailing_lists: + url: http://lists.openstreetmap.org/ + title: Mailing Lists + description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists. + forums: + url: http://forum.openstreetmap.org/ + title: Forums + description: Questions and discussions for those that prefer a bulletin board style interface. + irc: + url: http://irc.openstreetmap.org/ + title: IRC + description: Interactive chat in many different languages and on many topics. + switch2osm: + url: https://switch2osm.org/ + title: switch2osm + description: Help for companies and organisations switching to OpenStreetMap based maps and other services. wiki: url: http://wiki.openstreetmap.org/ title: wiki.openstreetmap.org @@ -1161,7 +1197,7 @@ en: about_page: next: Next copyright_html: ©OpenStreetMap
contributors - used_by: "%{name} powers map data on hundreds of web sites, mobile apps, and hardware devices" + used_by: "%{name} powers map data on thousands of web sites, mobile apps, and hardware devices" lede_text: | OpenStreetMap is built by a community of mappers that contribute and maintain data about roads, trails, cafés, railway stations, and much more, all over the world. @@ -1186,6 +1222,14 @@ en: build upon the data in certain ways, you may distribute the result only under the same licence. See the Copyright and 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 + if you have licensing, copyright or other legal questions and issues. partners_title: Partners notifier: diary_comment_notification: @@ -1381,13 +1425,12 @@ en: table: entry: motorway: "Motorway" + main_road: "Main road" trunk: "Trunk road" primary: "Primary road" secondary: "Secondary road" unclassified: "Unclassified road" - unsurfaced: "Unsurfaced road" track: "Track" - byway: "Byway" bridleway: "Bridleway" cycleway: "Cycleway" footway: "Footway" @@ -1411,7 +1454,6 @@ en: golf: "Golf course" park: "Park" resident: "Residential area" - tourist: "Tourist attraction" common: - Common - meadow @@ -1441,7 +1483,6 @@ en: tunnel: "Dashed casing = tunnel" bridge: "Black casing = bridge" private: "Private access" - permissive: "Permissive access" destination: "Destination access" construction: "Roads under construction" richtext_area: @@ -1590,6 +1631,7 @@ en: allow_read_gpx: "read your private GPS traces." allow_write_gpx: "upload GPS traces." allow_write_notes: "modify notes." + grant_access: "Grant Access" oauthorize_success: title: "Authorization request allowed" allowed: "You have granted application %{app_name} access to your account." @@ -1687,6 +1729,12 @@ en: 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 yahoo: title: Login with Yahoo alt: Login with a Yahoo OpenID @@ -1737,16 +1785,6 @@ en: confirm password: "Confirm Password:" use external auth: "Alternatively, use a third party to login" auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one." - auth association: | -

Your ID is not associated with a OpenStreetMap account yet.

- 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." @@ -1958,6 +1996,18 @@ en: auth_failure: connection_failed: Connection to authentication provider failed invalid_credentials: Invalid authentication credentials + no_authorization_code: No authorization code + unknown_signature_algorithm: Unknown signature algorithm + invalid_scope: Invalid scope + auth_association: + heading: Your ID is not associated with a OpenStreetMap account yet. + option_1: | + If you are new to OpenStreetMap, please create a new account + using the form below. + option_2: | + If you already have an account, you can login to your account + using your username and password and then associate the account + with your ID in your user settings. user_role: filter: not_an_administrator: "Only administrators can perform user role management, and you are not an administrator." @@ -2058,6 +2108,8 @@ en: heading: "%{block_on} blocked by %{block_by}" time_future: "Ends in %{time}" time_past: "Ended %{time} ago" + created: "Created" + ago: "%{time} ago" status: "Status" show: "Show" edit: "Edit" @@ -2107,6 +2159,7 @@ en: link: "Link or HTML" long_link: "Link" short_link: "Short Link" + geo_uri: "Geo URI" embed: "HTML" custom_dimensions: "Set custom dimensions" format: "Format:" @@ -2179,31 +2232,34 @@ en: mapquest_car: "Car (MapQuest)" mapquest_foot: "Foot (MapQuest)" osrm_car: "Car (OSRM)" + mapzen_bicycle: "Bicycle (Mapzen)" + mapzen_car: "Car (Mapzen)" + mapzen_foot: "Foot (Mapzen)" directions: "Directions" distance: "Distance" errors: no_route: "Couldn't find a route between those two places." no_place: "Sorry - couldn't find that place." instructions: - continue_on: Continue on - slight_right: Slight right onto - turn_right: Turn right onto - sharp_right: Sharp right onto - uturn: U-turn along - sharp_left: Sharp left onto - turn_left: Turn left onto - slight_left: Slight left onto - via_point: (via point) - follow: Follow - roundabout: At roundabout take - leave_roundabout: Leave roundabout - - stay_roundabout: Stay on roundabout - - start: Start at end of - destination: Reach destination - against_oneway: Go against one-way on - end_oneway: End of one-way on - exit: exit %{exit} - unnamed: "(unnamed)" + continue_without_exit: Continue on %{name} + slight_right_without_exit: Slight 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} + slight_left_without_exit: Slight left onto %{name} + via_point_without_exit: (via point) + follow_without_exit: Follow %{name} + roundabout_without_exit: At roundabout take %{name} + leave_roundabout_without_exit: Leave roundabout - %{name} + stay_roundabout_without_exit: Stay on roundabout - %{name} + start_without_exit: Start at end of %{name} + destination_without_exit: Reach destination + against_oneway_without_exit: Go against one-way on %{name} + end_oneway_without_exit: End of one-way on %{name} + roundabout_with_exit: At roundabout take exit %{exit} onto %{name} + unnamed: "unnamed road" courtesy: "Directions courtesy of %{link}" time: "Time" query: