X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/250bb47cc2723c7af6fac0a6e9e900c1a50f9292..5f495b43d18bfa7a9bcaf918aa4db15261bea46a:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 88d42282c..63f0c0e78 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." @@ -699,7 +701,7 @@ en: wood: "Wood" office: accountant: "Accountant" - administrative: "Admininstration" + administrative: "Administration" architect: "Architect" company: "Company" employment_agency: "Employment Agency" @@ -759,7 +761,7 @@ en: spur: "Railway Spur" station: "Railway Station" stop: "Railway Stop" - subway: "Subway Station" + subway: "Subway" subway_entrance: "Subway Entrance" switch: "Railway Points" tram: "Tramway" @@ -902,19 +904,6 @@ en: 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 @@ -979,9 +968,10 @@ en: 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 @@ -1017,6 +1007,7 @@ en: 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: | @@ -1056,6 +1047,11 @@ en: 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: @@ -1084,6 +1080,9 @@ en: 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,6 +1112,14 @@ en: 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: | @@ -1158,10 +1165,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 @@ -1194,6 +1221,14 @@ en: 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: @@ -1380,8 +1415,6 @@ en: search: Search get_directions: "Get directions" get_directions_title: "Find directions between two points" - close_directions: "Close directions" - close_directions_title: "Close the directions panel" from: "From" to: "To" where_am_i: "Where am I?" @@ -1395,9 +1428,7 @@ en: primary: "Primary road" secondary: "Secondary road" unclassified: "Unclassified road" - unsurfaced: "Unsurfaced road" track: "Track" - byway: "Byway" bridleway: "Bridleway" cycleway: "Cycleway" footway: "Footway" @@ -1421,7 +1452,6 @@ en: golf: "Golf course" park: "Park" resident: "Residential area" - tourist: "Tourist attraction" common: - Common - meadow @@ -1451,7 +1481,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: @@ -1600,6 +1629,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." @@ -1681,7 +1711,7 @@ en: 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. @@ -1689,16 +1719,20 @@ en: 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 @@ -1744,19 +1778,19 @@ en: 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 @@ -1859,8 +1893,8 @@ en: 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: @@ -1912,6 +1946,7 @@ en: 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>." @@ -1922,8 +1957,9 @@ en: 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: @@ -1965,6 +2001,12 @@ en: 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." @@ -2065,6 +2107,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" @@ -2114,6 +2158,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:" @@ -2192,24 +2237,25 @@ en: 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 " - 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: