From: Tom Hughes Date: Thu, 27 Aug 2015 20:46:56 +0000 (+0100) Subject: Merge remote-tracking branch 'openstreetmap/pull/891' X-Git-Tag: live~4042 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9a9b045372a6f48420a9a6dacfde52c34ab7abce?hp=-c Merge remote-tracking branch 'openstreetmap/pull/891' --- 9a9b045372a6f48420a9a6dacfde52c34ab7abce diff --combined config/locales/en.yml index 07647af22,22782b946..c50d63f94 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@@ -162,7 -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: @@@ -170,7 -169,6 +170,7 @@@ 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." @@@ -250,7 -248,6 +250,7 @@@ diary_entry: new: title: New Diary Entry + publish_button: "Publish" list: title: "Users' diaries" title_friends: "Friends' diaries" @@@ -702,7 -699,7 +702,7 @@@ wood: "Wood" office: accountant: "Accountant" - administrative: "Admininstration" + administrative: "Administration" architect: "Architect" company: "Company" employment_agency: "Employment Agency" @@@ -762,7 -759,7 +762,7 @@@ spur: "Railway Spur" station: "Railway Station" stop: "Railway Stop" - subway: "Subway Station" + subway: "Subway" subway_entrance: "Subway Entrance" switch: "Railway Points" tram: "Tramway" @@@ -905,6 -902,19 +905,6 @@@ results: no_results: "No results found" more_results: "More results" - distance: - zero: "less than 1km" - one: "about 1km" - other: "about %{count}km" - direction: - south_west: "south-west" - south: "south" - south_east: "south-east" - east: "east" - north_east: "north-east" - north: "north" - north_west: "north-west" - west: "west" layouts: project_name: # in @@@ -969,10 -979,9 +969,10 @@@ legal_babble: title_html: Copyright and License intro_1_html: | - OpenStreetMap is <i>open data</i>, licensed under the <a + OpenStreetMap<sup><a href="#trademarks">®</a></sup> is <i>open data</i>, licensed under the <a href="http://opendatacommons.org/licenses/odbl/">Open Data - Commons Open Database License</a> (ODbL). + Commons Open Database License</a> (ODbL) by the <a + href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF). intro_2_html: | You are free to copy, distribute, transmit and adapt our data, as long as you credit OpenStreetMap and its @@@ -1008,7 -1017,6 +1008,7 @@@ more_title_html: Finding out more more_1_html: | Read more about using our data, and how to credit us, at the <a + href="http://osmfoundation.org/Licence">OSMF Licence page</a> and the community <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal FAQ</a>. more_2_html: | @@@ -1048,11 -1056,6 +1048,11 @@@ contributors_nz_html: | <strong>New Zealand</strong>: Contains data sourced from Land Information New Zealand. Crown Copyright reserved. + contributors_si_html: | + <strong>Slovenia</strong>: Contains data from the + <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> and + <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a> + (public information of Slovenia). contributors_za_html: | <strong>South Africa</strong>: Contains data sourced from <a href="http://www.ngi.gov.za/">Chief Directorate: @@@ -1081,9 -1084,6 +1081,9 @@@ to our <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown procedure</a> or file directly at our <a href="http://dmca.openstreetmap.org/">on-line filing page</a>. + trademarks_title_html: <span id="trademarks"></span>Trademarks + trademarks_1_html: | + OpenStreetMap and the looking 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 <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence Working Group</a>. welcome_page: title: Welcome! introduction_html: | @@@ -1113,14 -1113,6 +1113,14 @@@ tag_html: | A <strong>tag</strong> 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 + <a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a> and + <a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Automated Edits</a>. questions: title: Any questions? paragraph_1_html: | @@@ -1166,30 -1158,10 +1166,30 @@@ 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 @@@ -1197,7 -1169,7 +1197,7 @@@ about_page: next: Next copyright_html: <span>©</span>OpenStreetMap<br>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. @@@ -1222,14 -1194,6 +1222,14 @@@ build upon the data in certain ways, you may distribute the result only under the same licence. See the <a href='%{copyright_path}'>Copyright and License page</a> for details. + legal_title: Legal + legal_html: | + This site and many other related services are formally operated by the + <a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF) + on behalf of the community. + <br> + Please <a href='http://osmfoundation.org/Contact'>contact the OSMF</a> + if you have licensing, copyright or other legal questions and issues. partners_title: Partners notifier: diary_comment_notification: @@@ -1414,10 -1378,6 +1414,10 @@@ close: Close search: search: Search + get_directions: "Get directions" + get_directions_title: "Find directions between two points" + from: "From" + to: "To" where_am_i: "Where am I?" where_am_i_title: Describe the current location using the search engine submit_text: "Go" @@@ -1429,7 -1389,9 +1429,7 @@@ primary: "Primary road" secondary: "Secondary road" unclassified: "Unclassified road" - unsurfaced: "Unsurfaced road" track: "Track" - byway: "Byway" bridleway: "Bridleway" cycleway: "Cycleway" footway: "Footway" @@@ -1453,6 -1415,7 +1453,6 @@@ golf: "Golf course" park: "Park" resident: "Residential area" - tourist: "Tourist attraction" common: - Common - meadow @@@ -1482,6 -1445,7 +1482,6 @@@ tunnel: "Dashed casing = tunnel" bridge: "Black casing = bridge" private: "Private access" - permissive: "Permissive access" destination: "Destination access" construction: "Roads under construction" richtext_area: @@@ -1630,7 -1594,6 +1630,7 @@@ 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." @@@ -1712,7 -1675,7 +1712,7 @@@ login_button: "Login" register now: Register now with username: "Already have an OpenStreetMap account? Please login with your username and password:" - with openid: "Alternatively, use OpenID to login:" + 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. @@@ -1720,20 -1683,16 +1720,20 @@@ account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"%{reconfirm}\">request a new confirmation email</a>." account is suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the <a href="%{webmaster}">webmaster</a> if you wish to discuss this. auth failure: "Sorry, could not log in with those details." - openid missing provider: "Sorry, could not contact your OpenID provider" - openid invalid: "Sorry, your OpenID seems to be malformed" openid_logo_alt: "Log in with an OpenID" - openid_providers: + 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 yahoo: title: Login with Yahoo alt: Login with a Yahoo OpenID @@@ -1779,19 -1738,19 +1779,19 @@@ not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)' display name: "Display Name:" display name description: "Your publicly displayed username. You can change this later in the preferences." - openid: "%{logo} OpenID:" + external auth: "Third Party Authentication:" password: "Password:" confirm password: "Confirm Password:" - use openid: "Alternatively, use %{logo} OpenID to login" - openid no password: "With OpenID a password is not required, but some extra tools or server may still need one." - openid association: | - <p>Your OpenID is not associated with a OpenStreetMap account yet.</p> + 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: | + <p>Your ID is not associated with a OpenStreetMap account yet.</p> <ul> <li>If you are new to OpenStreetMap, please create a new account using the form below.</li> <li> If you already have an account, you can login to your account using your username and password and then associate the account - with your OpenID in your user settings. + with your ID in your user settings. </li> </ul> continue: Sign Up @@@ -1894,8 -1853,8 +1894,8 @@@ current email address: "Current Email Address:" new email address: "New Email Address:" email never displayed publicly: "(never displayed publicly)" + external auth: "External Authentication:" openid: - openid: "OpenID:" link: "http://wiki.openstreetmap.org/wiki/OpenID" link text: "what is this?" public editing: @@@ -1947,7 -1906,6 +1947,7 @@@ 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, <a href=\"%{reconfirm}\">click here</a>." @@@ -1958,9 -1916,8 +1958,9 @@@ 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 email address, thanks for signing up!" + 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: @@@ -2002,12 -1959,6 +2002,12 @@@ This decision will be reviewed by an administrator shortly, or you may contact the %{webmaster} if you wish to discuss this. </p> + 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 user_role: filter: not_an_administrator: "Only administrators can perform user role management, and you are not an administrator." @@@ -2108,8 -2059,6 +2108,8 @@@ 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" @@@ -2159,7 -2108,6 +2159,7 @@@ link: "Link or HTML" long_link: "Link" short_link: "Short Link" + geo_uri: "Geo URI" embed: "HTML" custom_dimensions: "Set custom dimensions" format: "Format:" @@@ -2224,41 -2172,6 +2224,41 @@@ comment_and_resolve: Comment & Resolve comment: Comment edit_help: Move the map and zoom in on a location you want to edit, then click here. + directions: + engines: + graphhopper_bicycle: "Bicycle (GraphHopper)" + graphhopper_foot: "Foot (GraphHopper)" + mapquest_bicycle: "Bicycle (MapQuest)" + mapquest_car: "Car (MapQuest)" + mapquest_foot: "Foot (MapQuest)" + osrm_car: "Car (OSRM)" + 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_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: node: Node way: Way