X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/75edd4d0293266291e809e4d1f3fdb408b7f48c9..cea0cccc6d73d7543d80d659b0f221f0d3196c0e:/config/locales/en.yml?ds=sidebyside diff --git a/config/locales/en.yml b/config/locales/en.yml index fcb13bde0..cd83a3a85 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -471,6 +471,10 @@ en: search_osm_nominatim: prefix_format: "%{name}" prefix: + aerialway: + chair_lift: "Chair Lift" + drag_lift: "Drag Lift" + station: "Aerialway Station" aeroway: aerodrome: "Aerodrome" apron: "Apron" @@ -563,6 +567,7 @@ en: shower: "Shower" social_centre: "Social Centre" social_club: "Social Club" + social_facility: "Social Facility" studio: "Studio" supermarket: "Supermarket" swimming_pool: "Swimming Pool" @@ -592,6 +597,9 @@ en: "yes": "Bridge" building: "yes": "Building" + emergency: + fire_hydrant: "Fire Hydrant" + phone: "Emergency Phone" highway: bridleway: "Bridleway" bus_guideway: "Guided Bus Lane" @@ -613,6 +621,7 @@ en: platform: "Platform" primary: "Primary Road" primary_link: "Primary Road" + proposed: "Proposed Road" raceway: "Raceway" residential: "Residential" rest_area: "Rest Area" @@ -623,6 +632,7 @@ en: services: "Motorway Services" speed_camera: "Speed Camera" steps: "Steps" + street_lamp: "Street Lamp" stile: "Stile" tertiary: "Tertiary Road" tertiary_link: "Tertiary Road" @@ -639,6 +649,7 @@ en: building: "Building" castle: "Castle" church: "Church" + citywalls: "City Walls" fort: "Fort" house: "House" icon: "Icon" @@ -648,6 +659,7 @@ en: monument: "Monument" museum: "Museum" ruins: "Ruins" + tomb: "Tomb" tower: "Tower" wayside_cross: "Wayside Cross" wayside_shrine: "Wayside Shrine" @@ -786,6 +798,7 @@ en: locality: "Locality" moor: "Moor" municipality: "Municipality" + neighbourhood: "Neighbourhood" postcode: "Postcode" region: "Region" sea: "Sea" @@ -811,8 +824,10 @@ en: narrow_gauge: "Narrow Gauge Railway" platform: "Railway Platform" preserved: "Preserved Railway" + proposed: "Proposed Railway" spur: "Railway Spur" station: "Railway Station" + stop: "Railway Stop" subway: "Subway Station" subway_entrance: "Subway Entrance" switch: "Railway Points" @@ -828,9 +843,11 @@ en: beverages: "Beverages Shop" bicycle: "Bicycle Shop" books: "Book Shop" + boutique: "Boutique" butcher: "Butcher" car: "Car Shop" car_parts: "Car Parts" + car_repair: "Car Repair" carpet: "Carpet Shop" car_repair: "Car Repair" charity: "Charity Shop" @@ -841,6 +858,7 @@ en: convenience: "Convenience Store" copyshop: "Copy Shop" cosmetics: "Cosmetics Shop" + deli: "Deli" department_store: "Department Store" discount: "Discount Items Shop" doityourself: "Do-It-Yourself" @@ -877,17 +895,21 @@ en: organic: "Organic Food Shop" outdoor: "Outdoor Shop" pet: "Pet Shop" + pharmacy: "Pharmacy" photo: "Photo Shop" salon: "Salon" + second_hand: "Second-hand Shop" shoes: "Shoe Shop" shopping_centre: "Shopping Centre" sports: "Sports Shop" stationery: "Stationery Shop" supermarket: "Supermarket" + tailor: "Tailor" toys: "Toy Shop" travel_agency: "Travel Agency" video: "Video Shop" wine: "Off License" + "yes": "Shop" tourism: alpine_hut: "Alpine Hut" artwork: "Artwork" @@ -910,6 +932,7 @@ en: viewpoint: "Viewpoint" zoo: "Zoo" tunnel: + culvert: "Culvert" "yes": "Tunnel" waterway: artificial: "Artificial Waterway" @@ -973,16 +996,8 @@ en: h1: OpenStreetMap logo: alt_text: OpenStreetMap logo - welcome_user_link_tooltip: Your user page - home: home - home_tooltip: Go to home location - inbox_html: "inbox %{count}" - inbox_tooltip: - zero: Your inbox contains no unread messages - one: Your inbox contains 1 unread message - other: Your inbox contains %{count} unread messages - logout: logout - logout_tooltip: "Log out" + home: Go to Home Location + logout: Logout log_in: log in log_in_tooltip: Log in with an existing account sign_up: sign up @@ -1149,32 +1164,12 @@ en: procedure or file directly at our on-line filing page. welcome_page: - title: Welcome to OpenStreetMap - subtitle: a free map that you can edit + title: Welcome! introduction_html: | - Unlike other maps, OpenStreetMap is completely created - by people like you, and free for anyone to fix, update, download and use. - Here's a quick guide to get you started. - section_1: - title: One Map, Many Uses - paragraph_1_html: | - OpenStreetMap is used in websites, phones, hand-held GPS devices, sat-navs, and even - games and art projects. This site is the place to make contributions to the map which - will be available to all of these sites and applications. Copying the map data from - place to place can take from a few minutes to a few hours, so don't worry if it isn't - instant. - names: - - Apple - - Craigslist - - Flickr - - Foursquare - - Garmin - - Le Monde - - MapQuest - - Telenav - - USA Today - section_2: + Welcome to OpenStreetMap, the free and editable map of the world. Now that you're signed + up, you're all set to get started mapping. Here's a quick guide with the most important + things you need to know. + whats_on_the_map: title: What's on the Map on_html: | OpenStreetMap is a place for mapping things that are both real and current - @@ -1184,55 +1179,32 @@ en: What it doesn't include is opinionated data like ratings, historical or hypothetical features, and data from copyrighted sources. Unless you have special permission, don't copy from online or paper maps. - section_3: - title: You're Signed Up - title_no_user: Get a Free Account - paragraph_1_html: | - To edit OpenStreetMap, you'll need a user account. - Sign up here. - paragraph_2_html: | - With your user account, you can edit the map and collaborate - with other mappers. - section_4: + basic_terms: title: Basic Terms For Mapping paragraph_1_html: | OpenStreetMap has some of its own lingo. Here are a few key words that'll come in handy. editor_html: | - An Editor is a program or website you can use to edit the map. + An editor is a program or website you can use to edit the map. node_html: | - A Node is a point on the map, like a single restauraunt or a tree. + A node is a point on the map, like a single restauraunt or a tree. way_html: | - A Way is a line, like a road, stream, or shape. - changeset_html: | - A Changeset is group of - changes to the map saved by a user. - section_5: + A way is a line or area, like a road, stream, lake or building. + 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. + questions: title: Any questions? paragraph_1_html: | Need help mapping, or not clear on how to use OpenStreetMap? Get your questions answered on the help website. - section_6: - title: Start Contributing - paragraph_1_html: | - You can zoom in anywhere in the world and click the Edit button to start contributing. - paragraph_located: | - Or, start contributing now: - paragraph_geocoded_html: | - Or, start near : - paragraph_geolocated: | - Or, start directly at your current location: - paragraph_1_no_user_html: | - Once you have an account, you can zoom in anywhere in the world and click the Edit - button to start contributing. - section_7: + start_mapping: Start Mapping + add_a_note: title: No Time To Edit? Add a Note! paragraph_1_html: | If you just want something small fixed and don't have the time to sign up and learn how to edit, it's easy to add a note. paragraph_2_html: | - Just go to the map and click the note icon: + Just go to the map and click the note icon: . This will add a marker to the map, which you can move by dragging. Add your message, then click save, and other mappers will investigate. notifier: @@ -1314,7 +1286,7 @@ en: message: inbox: title: "Inbox" - my_inbox: "My inbox" + my_inbox: "My Inbox" outbox: "outbox" messages: "You have %{new_messages} and %{old_messages}" new_messages: @@ -1741,11 +1713,15 @@ en: flash changed: "Your password has been changed." flash token bad: "Did not find that token, check the URL maybe?" new: - title: "Create account" - heading: "Create a User Account" + 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 webmaster to arrange for an account to be created - we will try and deal with the request as quickly as possible.' - fill_form: "Fill in the form and we will send you a quick email to activate your account." + about: + header: Free and editable + html: | +

Unlike other maps, OpenStreetMap is completely created by people like you, + and it's free for anyone to fix, update, download and use.

+

Sign up to get started contributing. We'll send an email to confirm your account.

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:" @@ -1767,16 +1743,14 @@ en: with your OpenID in your user settings. - continue: Continue - flash welcome: "Thanks for signing up. We've sent a welcome message to %{email} with some hints on getting started." - flash create success message: "Thanks for signing up. We've sent a confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.

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." + 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." terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined terms: title: "Contributor terms" heading: "Contributor terms" - read and accept: "Please read the agreement below and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions." + read and accept: "Please read the agreement and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions." consider_pd: "In addition to the above agreement, I consider my contributions to be in the Public Domain" consider_pd_why: "what's this?" consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain @@ -1785,7 +1759,7 @@ en: declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined" decline: "Decline" you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue." - legale_select: "Please select your country of residence:" + legale_select: "Country of residence:" legale_names: france: "France" italy: "Italy" @@ -1795,13 +1769,14 @@ en: 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." view: - my diary: my diary + my diary: My Diary new diary entry: new diary entry - my edits: my edits - my traces: my traces - my notes: my map notes - my settings: my settings - my comments: my comments + my edits: My Edits + my traces: My Traces + my notes: My Notes + my profile: My Profile + my settings: My Settings + my comments: My Comments oauth settings: oauth settings blocks on me: blocks on me blocks by me: blocks by me @@ -1913,14 +1888,16 @@ en: flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address." flash update success: "User information updated successfully." confirm: - heading: Confirm a user account + heading: Check your email! + introduction_1: | + We sent you a confirmation email. + introduction_2: | + 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!" - before you start: "We know you're probably in a hurry to start mapping, but before you do you might like to fill in some more information about yourself in the form below." already active: "This account has already been confirmed." - unknown token: "That token doesn't seem to exist." - reconfirm: "If it's been a while since you signed up you might need to send yourself a new confirmation email." + unknown token: "That confirmation code has expired or does not exist." + reconfirm_html: "If you need us to resend the confirmation email, click here." 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.

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." failure: "User %{name} not found." @@ -2156,13 +2133,10 @@ en: site: edit_tooltip: Edit the map edit_disabled_tooltip: Zoom in to edit the map - edit_zoom_alert: You must zoom in to edit the map history_tooltip: View edits for this area history_disabled_tooltip: Zoom in to view edits for this area - history_zoom_alert: You must zoom in to view edits for this area createnote_tooltip: Add a note to the map createnote_disabled_tooltip: Zoom in to add a note to the map - createnote_zoom_alert: You must zoom in to add a note to the map notes: new: intro: "In order to improve the map the information you enter is shown to other mappers, so please be as descriptive and precise as possible when moving the marker to the correct position and entering your note below." @@ -2183,6 +2157,7 @@ en: reactivate: Reactivate 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. redaction: edit: description: "Description"