X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6c1d73a509a1ac2216a704f3dc5534d573e5d7ae..15d2efe2df28738d5182105555761293dcaaeaaf:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index f04c3dd42..55bd1c0a8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -38,7 +38,7 @@ en: messages: invalid_email_address: does not appear to be a valid e-mail address email_address_not_routable: is not routable - # Translates all the model names, which is used in error handling on the web site + # Translates all the model names, which is used in error handling on the website models: acl: "Access Control List" changeset: "Changeset" @@ -75,8 +75,8 @@ en: way: "Way" way_node: "Way Node" way_tag: "Way Tag" - # Translates all the model attributes, which is used in error handling on the web site - # Only the ones that are used on the web site are translated at the moment + # Translates all the model attributes, which is used in error handling on the website + # Only the ones that are used on the website are translated at the moment attributes: client_application: name: Name (Required) @@ -109,13 +109,12 @@ en: trace: user: "User" visible: "Visible" - name: "Name" + name: Filename size: "Size" latitude: "Latitude" longitude: "Longitude" public: "Public" description: "Description" - name: Filename gpx_file: Upload GPX File visibility: Visibility tagstring: Tags @@ -282,7 +281,7 @@ en: not yet agreed: "You have not yet agreed to the new Contributor Terms." review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms." agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain." - link: "https://www.osmfoundation.org/wiki/License/Contributor_Terms" + link: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms" link text: "what is this?" save changes button: Save Changes make edits public button: Make all my edits public @@ -422,7 +421,7 @@ en: reopened_by_html: "Reactivated by %{user} %{when}" reopened_by_anonymous_html: "Reactivated by anonymous %{when}" hidden_by_html: "Hidden by %{user} %{when}" - report: Report this note + report: report this note coordinates_html: "%{latitude}, %{longitude}" query: title: "Query Features" @@ -610,17 +609,17 @@ en: aeroway: aerodrome: "Aerodrome" airstrip: "Airstrip" - apron: "Apron" - gate: "Gate" + apron: "Airport Apron" + gate: "Airport Gate" hangar: "Hangar" helipad: "Helipad" holding_position: "Holding Position" - navigationaid: "Aviation Navigation aid" + navigationaid: "Aviation Navigation Aid" parking_position: "Parking Position" runway: "Runway" taxilane: "Taxilane" taxiway: "Taxiway" - terminal: "Terminal" + terminal: "Airport Terminal" windsock: "Windsock" amenity: animal_boarding: "Animal Boarding" @@ -666,7 +665,7 @@ en: fire_station: "Fire Station" food_court: "Food Court" fountain: "Fountain" - fuel: "Fuel" + fuel: "Filling Station" gambling: "Gambling" grave_yard: "Grave Yard" grit_bin: "Grit Bin" @@ -675,7 +674,7 @@ en: ice_cream: "Ice Cream" internet_cafe: "Internet Cafe" kindergarten: "Kindergarten" - language_school: "Language school" + language_school: "Language School" library: "Library" loading_dock: "Loading Dock" love_hotel: "Love Hotel" @@ -794,7 +793,7 @@ en: "yes": "Building" club: scout: "Scout Group Base" - sport: "Sportsclub" + sport: "Sports Club" "yes": "Club" craft: beekeeper: "Beekeeper" @@ -822,7 +821,6 @@ en: window_construction: "Window Construction" winery: "Winery" "yes": "Craft Shop" - crossing: "Crossing" emergency: access_point: "Access Point" ambulance_station: "Ambulance Station" @@ -843,6 +841,7 @@ en: bus_stop: "Bus Stop" construction: "Highway under Construction" corridor: "Corridor" + crossing: "Crossing" cycleway: "Cycle Path" elevator: "Elevator" emergency_access_point: "Emergency Access Point" @@ -931,9 +930,8 @@ en: brownfield: "Brownfield Land" cemetery: "Cemetery" commercial: "Commercial Area" - conservation: "Conservation" - construction: "Construction" - farm: "Farm" + conservation: "Conservation Area" + construction: "Construction Area" farmland: "Farmland" farmyard: "Farmyard" forest: "Forest" @@ -954,7 +952,7 @@ en: reservoir: "Reservoir" reservoir_watershed: "Reservoir Watershed" residential: "Residential Area" - retail: "Retail" + retail: "Retail Area" village_green: "Village Green" vineyard: "Vineyard" "yes": "Landuse" @@ -1228,7 +1226,7 @@ en: deli: "Deli" department_store: "Department Store" discount: "Discount Items Shop" - doityourself: "Do-It-Yourself" + doityourself: "Do-It-Yourself Shop" dry_cleaning: "Dry Cleaning" e-cigarette: "E-Cigarette Shop" electronics: "Electronics Shop" @@ -1254,7 +1252,7 @@ en: health_food: "Health Food Store" hearing_aids: "Hearing Aids" herbalist: "Herbalist" - hifi: "Hi-Fi" + hifi: "Hi-Fi Shop" houseware: "Houseware Shop" ice_cream: "Ice Cream Shop" interior_decoration: "Interior Decoration" @@ -1314,7 +1312,7 @@ en: artwork: "Artwork" attraction: "Attraction" bed_and_breakfast: "Bed and Breakfast" - cabin: "Cabin" + cabin: "Tourist Cabin" camp_pitch: "Camp Pitch" camp_site: "Camp Site" caravan_site: "Caravan Site" @@ -1390,7 +1388,6 @@ en: last_updated_time_html: "%{time}" last_updated_time_user_html: "%{time} by %{user}" link_to_reports: View Reports - reported_user: Reported User reports_count: one: "1 Report" other: "%{count} Reports" @@ -1439,6 +1436,7 @@ en: issue_comments: create: comment_created: Your comment was successfully created + issue_reassigned: Your comment was created and the issue was reassigned reports: new: title_html: "Report %{link}" @@ -1838,7 +1836,7 @@ en: about: next: Next copyright_html: ©OpenStreetMap
contributors - used_by_html: "%{name} provides map data for thousands of web sites, mobile apps, and hardware devices" + used_by_html: "%{name} provides map data for thousands of websites, 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. @@ -1908,25 +1906,30 @@ en: Commons Attribution-ShareAlike 2.0 license (CC BY-SA 2.0). credit_title_html: How to credit OpenStreetMap credit_1_html: | - We require that you use the credit “© OpenStreetMap - contributors”. + Where you use OpenStreetMap data, you are required to do the following two things: credit_2_1_html: | - You must also make it clear that the data is available under the Open - Database License. You may do this by linking to + + credit_3_1_html: | + For the copyright notice, we have different requirements on how this should be + displayed, depending on how you are using our data. For example, different + rules apply on how to show the copyright notice depending on whether you have + created a browsable map, a printed map or a static image. Full details on the + requirements can be found in the + Attribution + Guidelines. + credit_4_html: | + To make clear that the data is available under the Open + Database License, you may link to this copyright page. Alternatively, and as a requirement if you are distributing OSM in a data form, you can name and link directly to the license(s). In media where links are not possible (e.g. printed works), we suggest you direct your readers to openstreetmap.org (perhaps by expanding 'OpenStreetMap' to this full address) and to opendatacommons.org. - credit_3_1_html: | - The map tiles in the “standard style” at www.openstreetmap.org are a - Produced Work by the OpenStreetMap Foundation using OpenStreetMap data - under the Open Database License. When using this map style, the same attribution is - required as for the map data. - credit_4_html: | - For a browsable electronic map, the credit should appear in the corner of the map. - For example: + In this example, the credit appears in the corner of the map. attribution_example: alt: Example of how to attribute OpenStreetMap on a webpage title: Attribution example @@ -2013,7 +2016,7 @@ en: infringement_2_html: | If you believe that copyrighted material has been inappropriately added to the OpenStreetMap database or this site, please refer - to our takedown + to our takedown procedure or file directly at our on-line filing page. trademarks_title_html: Trademarks @@ -2066,7 +2069,7 @@ en: description: "Extracts for major world cities and their surrounding areas" other: title: "Other Sources" - description: "Additional sources listed on the OpenStreetMap wiki" + description: "Additional sources listed on the OpenStreetMap Wiki" options: "Options" format: "Format" scale: "Scale" @@ -2122,8 +2125,12 @@ en: description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists. forums: url: https://forum.openstreetmap.org/ - title: Forums + title: Forums (Legacy) description: Questions and discussions for those that prefer a bulletin board style interface. + community: + url: https://community.openstreetmap.org/ + title: Community forum + description: A shared place for conversations about OpenStreetMap. irc: url: https://irc.openstreetmap.org/ title: IRC @@ -2196,6 +2203,7 @@ en: common: - Common - meadow + - garden retail: "Retail area" industrial: "Industrial area" commercial: "Commercial area" @@ -2351,7 +2359,7 @@ en: in: "in" index: public_traces: "Public GPS Traces" - my_traces: "My GPS Traces" + my_gps_traces: "My GPS Traces" public_traces_from: "Public GPS Traces from %{user}" description: "Browse recent GPS trace uploads" tagged_with: " tagged with %{tags}" @@ -2384,7 +2392,7 @@ en: require_admin: not_an_admin: You need to be an admin to perform that action. setup_user_auth: - blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. You need to read the message before you will be able to save your edits." + blocked_zero_hour: "You have an urgent message on the OpenStreetMap website. You need to read the message before you will be able to save your edits." blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more." need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them." settings_menu: @@ -2543,7 +2551,7 @@ en: read_tou: "I have read and agree to the Terms of Use" consider_pd: "In addition to the above, I consider my contributions to be in the Public Domain" consider_pd_why: "what's this?" - consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain + consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain guidance_html: 'Information to help understand these terms: a human readable summary and some informal translations' continue: Continue declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined" @@ -2880,6 +2888,7 @@ en: reactivate: Reactivate comment_and_resolve: Comment & Resolve comment: Comment + report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}. For all other problems with the note, please resolve it yourself with a comment." edit_help: Move the map and zoom in on a location you want to edit, then click here. directions: ascend: "Ascend"