X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/13d650e2dcbe2467a82253097e10d58dddf9d9d2..aa185bf4f88e12bad895abaabc9948514e9f1ec5:/config/locales/en.yml?ds=inline diff --git a/config/locales/en.yml b/config/locales/en.yml index 88d42282c..6403087ef 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" @@ -699,7 +702,7 @@ en: wood: "Wood" office: accountant: "Accountant" - administrative: "Admininstration" + administrative: "Administration" architect: "Architect" company: "Company" employment_agency: "Employment Agency" @@ -759,7 +762,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 +905,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 +969,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 +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 <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 +1048,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 +1081,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, 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 <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence Working Group</a>. welcome_page: title: Welcome! introduction_html: | @@ -1113,6 +1113,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 +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 @@ -1169,7 +1197,7 @@ en: 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. @@ -1194,12 +1222,22 @@ 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. Use of all OSMF operated services is subject + to our <a href="http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy"> + Acceptable Use Policies</a> and our <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a> + <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: - 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}" @@ -1380,8 +1418,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?" @@ -1391,15 +1427,17 @@ 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" + cycleway_national: "National cycleway" + cycleway_regional: "Regional cycleway" + cycleway_local: "Local cycleway" footway: "Footway" rail: "Railway" subway: "Subway" @@ -1421,7 +1459,6 @@ en: golf: "Golf course" park: "Park" resident: "Residential area" - tourist: "Tourist attraction" common: - Common - meadow @@ -1451,9 +1488,11 @@ en: tunnel: "Dashed casing = tunnel" bridge: "Black casing = bridge" private: "Private access" - permissive: "Permissive access" destination: "Destination access" construction: "Roads under construction" + bicycle_shop: "Bicycle shop" + bicycle_parking: "Bicycle parking" + toilets: "Toilets" richtext_area: edit: Edit preview: Preview @@ -1600,6 +1639,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 +1721,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 +1729,23 @@ 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 + github: + title: Login with GitHub + alt: Login with a GitHub Account yahoo: title: Login with Yahoo alt: Login with a Yahoo OpenID @@ -1731,7 +1778,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 <a href="mailto:webmaster@openstreetmap.org">webmaster</a> 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 <a href="%{webmaster}">webmaster</a> 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: | @@ -1741,24 +1788,14 @@ en: license_agreement: 'When you confirm your account you will need to agree to the <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a>.' email address: "Email Address:" confirm email address: "Confirm Email Address:" - 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>)' + not displayed publicly: 'Your address is not displayed publicly, see our <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information' 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> - <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. - </li> - </ul> + 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." 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 <a href=\"%{url}\">this wiki page</a>." @@ -1784,6 +1821,7 @@ en: title: "No such user" heading: "The user %{user} does not exist" body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong." + deleted: "deleted" view: my diary: My Diary new diary entry: new diary entry @@ -1834,16 +1872,16 @@ en: revoke: administrator: "Revoke administrator access" moderator: "Revoke moderator access" - block_history: "blocks received" - moderator_history: "blocks given" + block_history: "Active Blocks" + moderator_history: "Blocks Given" comments: "Comments" - create_block: "block this user" - activate_user: "activate this user" - deactivate_user: "deactivate this user" - confirm_user: "confirm this user" - hide_user: "hide this user" - unhide_user: "unhide this user" - delete_user: "delete this user" + create_block: "Block this User" + activate_user: "Activate this User" + deactivate_user: "Deactivate this User" + confirm_user: "Confirm this User" + hide_user: "Hide this User" + unhide_user: "Unhide this User" + delete_user: "Delete this User" confirm: "Confirm" friends_changesets: "friends' changesets" friends_diaries: "friends' diary entries" @@ -1859,8 +1897,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: @@ -1889,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" @@ -1912,18 +1952,20 @@ 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>." 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.<br /><br />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.<br /><br />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 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 +2007,21 @@ 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 + 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." @@ -2065,6 +2122,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 +2173,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:" @@ -2125,10 +2185,13 @@ en: center_marker: "Center map on marker" paste_html: "Paste HTML to embed in website" view_larger_map: "View Larger Map" + only_standard_layer: "Only the standard layer can be exported as an image" + embed: + report_problem: "Report a problem" 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 @@ -2140,7 +2203,6 @@ en: standard: Standard cycle_map: Cycle Map transport_map: Transport Map - mapquest: MapQuest Open hot: Humanitarian layers: header: Map Layers @@ -2186,30 +2248,44 @@ 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 " - unnamed: "(unnamed)" + 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} + 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: