X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/43bbb3f6518a1dcde1359bb0452666853f40802b..469b3c56582023c5784a478075fdfc03fbe5ac3f:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index bf194bc6a..c13ca2c09 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -94,7 +94,6 @@ en: changeset: title: "Changeset" changeset: "Changeset: %{id}" - download: "Download %{changeset_xml_link} or %{osmchange_xml_link}" changesetxml: "Changeset XML" osmchangexml: "osmChange XML" feed: @@ -168,16 +167,14 @@ en: node_history: node_history: "Node History" node_history_title: "Node History: %{node_name}" - download: "%{download_xml_link} or %{view_details_link}" download_xml: "Download XML" - view_details: "view details" + view_details: "View details" node: node: "Node" node_title: "Node: %{node_name}" - download: "%{download_xml_link}, %{view_history_link} or %{edit_link}" download_xml: "Download XML" - view_history: "view history" - edit: "edit" + view_history: "View history" + edit: "Edit node" not_found: sorry: "Sorry, the %{type} with the id %{id}, could not be found." type: @@ -193,17 +190,23 @@ en: relation: relation changeset: changeset paging_nav: - showing_page: "Showing page" + showing_page: "page" of: "of" + 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." + type: + node: "node" + way: "way" + relation: "relation" relation_details: members: "Members:" part_of: "Part of:" relation_history: relation_history: "Relation History" relation_history_title: "Relation History: %{relation_name}" - download: "%{download_xml_link} or %{view_details_link}" download_xml: "Download XML" - view_details: "view details" + view_details: "View details" relation_member: entry: "%{type} %{name}" entry_role: "%{type} %{name} as %{role}" @@ -214,33 +217,29 @@ en: relation: relation: "Relation" relation_title: "Relation: %{relation_name}" - download: "%{download_xml_link} or %{view_history_link}" download_xml: "Download XML" - view_history: "view history" - start: - view_data: "View data for current map view" - manually_select: "Manually select a different area" + view_history: "View history" start_rjs: - data_layer_name: "Data" + data_layer_name: "Browse Map Data" data_frame_title: "Data" zoom_or_select: "Zoom in or select an area of the map to view" - drag_a_box: "Drag a box on the map to select an area" + view_data: "View data for current map view" manually_select: "Manually select a different area" hide_areas: "Hide areas" show_areas: "Show areas" - loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below." + loaded_an_area_with_num_features: "You have loaded an area which contains %{num_features} features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than %{max_features} features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below." load_data: "Load Data" - unable_to_load_size: "Unable to load: Bounding box size of [[bbox_size]] is too large (must be smaller than %{max_bbox_size})" + unable_to_load_size: "Unable to load: Bounding box size of %{bbox_size} is too large (must be smaller than %{max_bbox_size})" loading: "Loading..." show_history: "Show History" wait: "Wait..." - history_for_feature: "History for [[feature]]" + history_for_feature: "History for %{feature}" details: "Details" private_user: "private user" - edited_by_user_at_timestamp: "Edited by [[user]] at [[timestamp]]" + edited_by_user_at_timestamp: "Edited by %{user} at %{timestamp}" object_list: heading: "Object list" - back: "Display object list" + back: "Back to object list" type: node: "Node" way: "Way" @@ -249,13 +248,13 @@ en: details: "Details" selected: type: - node: "Node [[id]]" - way: "Way [[id]]" + node: "Node %{id}" + way: "Way %{id}" # There is no 'relation' type because it is not represented in OpenLayers history: type: - node: "Node [[id]]" - way: "Way [[id]]" + node: "Node %{id}" + way: "Way %{id}" # There is no 'relation' type because it is not represented in OpenLayers tag_details: tags: "Tags:" @@ -267,28 +266,25 @@ en: nodes: "Nodes:" part_of: "Part of:" also_part_of: - one: "also part of way %{related_ways}" - other: "also part of ways %{related_ways}" + one: "part of way %{related_ways}" + other: "part of ways %{related_ways}" way_history: way_history: "Way History" way_history_title: "Way History: %{way_name}" - download: "%{download_xml_link} or %{view_details_link}" download_xml: "Download XML" - view_details: "view details" + view_details: "View details" way: way: "Way" way_title: "Way: %{way_name}" - download: "%{download_xml_link}, %{view_history_link} or %{edit_link}" download_xml: "Download XML" - view_history: "view history" - edit: "edit" + view_history: "View history" + edit: "Edit way" changeset: changeset_paging_nav: - showing_page: "Showing page %{page}" + showing_page: "Page %{page}" next: "Next »" previous: "« Previous" changeset: - id: "#%{id}" still_editing: "(still editing)" anonymous: "Anonymous" no_comment: "(none)" @@ -315,12 +311,14 @@ en: heading_user_bbox: "Changesets" heading_friend: "Changesets" heading_nearby: "Changesets" - description: "Recent changes" + description: "Browse recent contributions to the map" description_user: "Changesets by %{user}" description_bbox: "Changesets within %{bbox}" description_user_bbox: "Changesets by %{user} within %{bbox}" description_friend: "Changesets by your friends" description_nearby: "Changesets by nearby users" + empty_user_html: "It looks you haven't made any edits yet. To get started, check out the Beginners Guide." + empty_anon_html: "No edits made yet." timeout: sorry: "Sorry, the list of changesets you requested took too long to retrieve." diary_entry: @@ -335,7 +333,7 @@ en: new: New Diary Entry new_title: Compose a new entry in your user diary no_entries: No diary entries - recent_entries: "Recent diary entries:" + recent_entries: "Recent diary entries" older_entries: Older Entries newer_entries: Newer Entries edit: @@ -360,16 +358,13 @@ en: title: "No such diary entry" heading: "No entry with the id: %{id}" body: "Sorry, there is no diary entry or comment with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong." - no_such_user: - 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." diary_entry: posted_by: "Posted by %{link_user} on %{created} in %{language_link}" comment_link: Comment on this entry reply_link: Reply to this entry comment_count: - one: 1 comment + zero: No comments + one: "%{count} comment" other: "%{count} comments" edit_link: Edit this entry hide_link: Hide this entry @@ -392,17 +387,24 @@ en: all: title: "OpenStreetMap diary entries" description: "Recent diary entries from users of OpenStreetMap" + comments: + has_commented_on: "%{display_name} has commented on the following diary entries" + post: Post + when: When + comment: Comment + ago: "%{ago} ago" + newer_comments: "Newer Comments" + older_comments: "Older Comments" export: start: area_to_export: "Area to Export" manually_select: "Manually select a different area" format_to_export: "Format to Export" osm_xml_data: "OpenStreetMap XML Data" - mapnik_image: "Mapnik Image" - osmarender_image: "Osmarender Image" + map_image: "Map Image (shows standard layer)" embeddable_html: "Embeddable HTML" licence: "Licence" - export_details: 'OpenStreetMap data is licensed under the Creative Commons Attribution-ShareAlike 2.0 license.' + export_details: 'OpenStreetMap data is licensed under the Open Data Commons Open Database License (ODbL).' too_large: heading: "Area Too Large" body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area." @@ -433,27 +435,32 @@ en: us_postcode: 'Results from Geocoder.us' uk_postcode: 'Results from NPEMap / FreeThe Postcode' ca_postcode: 'Results from Geocoder.CA' - osm_namefinder: 'Results from OpenStreetMap Namefinder' osm_nominatim: 'Results from OpenStreetMap Nominatim' geonames: 'Results from GeoNames' - search_osm_namefinder: - prefix: "%{type}" - suffix_place: ", %{distance} %{direction} of %{placename}" - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} of %{parentname})" - suffix_suburb: "%{suffix}, %{parentname}" search_osm_nominatim: prefix_format: "%{name}" prefix: + aeroway: + aerodrome: "Aerodrome" + apron: "Apron" + gate: "Gate" + helipad: "Helipad" + runway: "Runway" + taxiway: "Taxiway" + terminal: "Terminal" amenity: airport: "Airport" arts_centre: "Arts Centre" + artwork: "Artwork" atm: "ATM" auditorium: "Auditorium" bank: "Bank" bar: "Bar" + bbq: "BBQ" bench: "Bench" bicycle_parking: "Cycle Parking" bicycle_rental: "Cycle Rental" + biergarten: "Beer Garden" brothel: "Brothel" bureau_de_change: "Bureau de Change" bus_station: "Bus Station" @@ -462,6 +469,7 @@ en: car_sharing: "Car Sharing" car_wash: "Car Wash" casino: "Casino" + charging_station: "Charging Station" cinema: "Cinema" clinic: "Clinic" club: "Club" @@ -480,6 +488,7 @@ en: ferry_terminal: "Ferry Terminal" fire_hydrant: "Fire Hydrant" fire_station: "Fire Station" + food_court: "Food Court" fountain: "Fountain" fuel: "Fuel" grave_yard: "Grave Yard" @@ -520,9 +529,12 @@ en: shelter: "Shelter" shop: "Shop" shopping: "Shopping" + shower: "Shower" + social_centre: "Social Centre" social_club: "Social Club" studio: "Studio" supermarket: "Supermarket" + swimming_pool: "Swimming Pool" taxi: "Taxi" telephone: "Public Telephone" theatre: "Theatre" @@ -534,41 +546,21 @@ en: village_hall: "Village Hall" waste_basket: "Waste Basket" wifi: "WiFi Access" + WLAN: "WiFi Access" youth_centre: "Youth Centre" boundary: administrative: "Administrative Boundary" + census: "Census Boundary" + national_park: "National Park" + protected_area : "Protected Area" + bridge: + aqueduct: "Aqueduct" + suspension: "Suspension Bridge" + swing: "Swing Bridge" + viaduct: "Viaduct" + "yes": "Bridge" building: - apartments: "Apartment Block" - block: "Building Block" - bunker: "Bunker" - chapel: "Chapel" - church: "Church" - city_hall: "City Hall" - commercial: "Commercial Building" - dormitory: "Dormitory" - entrance: "Building Entrance" - faculty: "Faculty Building" - farm: "Farm Building" - flats: "Flats" - garage: "Garage" - hall: "Hall" - hospital: "Hospital Building" - hotel: "Hotel" - house: "House" - industrial: "Industrial Building" - office: "Office Building" - public: "Public Building" - residential: "Residential Building" - retail: "Retail Building" - school: "School Building" - shop: "Shop" - stadium: "Stadium" - store: "Store" - terrace: "Terrace" - tower: "Tower" - train_station: "Railway Station" - university: "University Building" - yes: "Building" + "yes": "Building" highway: bridleway: "Bridleway" bus_guideway: "Guided Bus Lane" @@ -576,12 +568,11 @@ en: byway: "Byway" construction: "Highway under Construction" cycleway: "Cycle Path" - distance_marker: "Distance Marker" emergency_access_point: "Emergency Access Point" footway: "Footpath" ford: "Ford" - gate: "Gate" living_street: "Living Street" + milestone: "Milestone" minor: "Minor Road" motorway: "Motorway" motorway_junction: "Motorway Junction" @@ -593,14 +584,17 @@ en: primary_link: "Primary Road" raceway: "Raceway" residential: "Residential" + rest_area: "Rest Area" road: "Road" secondary: "Secondary Road" secondary_link: "Secondary Road" service: "Service Road" services: "Motorway Services" + speed_camera: "Speed Camera" steps: "Steps" stile: "Stile" tertiary: "Tertiary Road" + tertiary_link: "Tertiary Road" track: "Track" trail: "Trail" trunk: "Trunk Road" @@ -614,6 +608,7 @@ en: building: "Building" castle: "Castle" church: "Church" + fort: "Fort" house: "House" icon: "Icon" manor: "Manor" @@ -638,6 +633,7 @@ en: farmland: "Farmland" farmyard: "Farmyard" forest: "Forest" + garages: "Garages" grass: "Grass" greenfield: "Greenfield Land" industrial: "Industrial Area" @@ -645,25 +641,28 @@ en: meadow: "Meadow" military: "Military Area" mine: "Mine" - mountain: "Mountain" + orchard: "Orchard" nature_reserve: "Nature Reserve" park: "Park" piste: "Piste" - plaza: "Plaza" quarry: "Quarry" railway: "Railway" recreation_ground: "Recreation Ground" reservoir: "Reservoir" + reservoir_watershed: "Reservoir Watershed" residential: "Residential Area" retail: "Retail" + road: "Road Area" village_green: "Village Green" vineyard: "Vineyard" wetland: "Wetland" wood: "Wood" leisure: beach_resort: "Beach Resort" + bird_hide: "Bird Hide" common: "Common Land" fishing: "Fishing Area" + fitness_station: "Fitness Station" garden: "Garden" golf_course: "Golf Course" ice_rink: "Ice Rink" @@ -674,12 +673,17 @@ en: pitch: "Sports Pitch" playground: "Playground" recreation_ground: "Recreation Ground" + sauna: "Sauna" slipway: "Slipway" sports_centre: "Sports Centre" stadium: "Stadium" swimming_pool: "Swimming Pool" track: "Running Track" water_park: "Water Park" + military: + airfield: "Military Airfield" + barracks: "Barracks" + bunker: "Bunker" natural: bay: "Bay" beach: "Beach" @@ -687,11 +691,12 @@ en: cave_entrance: "Cave Entrance" channel: "Channel" cliff: "Cliff" - coastline: "Coastline" crater: "Crater" + dune: "Dune" feature: "Feature" fell: "Fell" fjord: "Fjord" + forest: "Forest" geyser: "Geyser" glacier: "Glacier" heath: "Heath" @@ -711,6 +716,7 @@ en: scrub: "Scrub" shoal: "Shoal" spring: "Spring" + stone: "Stone" strait: "Strait" tree: "Tree" valley: "Valley" @@ -719,6 +725,19 @@ en: wetland: "Wetland" wetlands: "Wetlands" wood: "Wood" + office: + accountant: "Accountant" + architect: "Architect" + company: "Company" + employment_agency: "Employment Agency" + estate_agent: "Estate Agent" + government: "Governmental Office" + insurance: "Insurance Office" + lawyer: "Lawyer" + ngo: "NGO Office" + telecommunication: "Telecommunication Office" + travel_agent: "Travel Agency" + "yes": "Office" place: airport: "Airport" city: "City" @@ -730,6 +749,7 @@ en: houses: "Houses" island: "Island" islet: "Islet" + isolated_dwelling: "Isolated Dwelling" locality: "Locality" moor: "Moor" municipality: "Municipality" @@ -753,6 +773,7 @@ en: junction: "Railway Junction" level_crossing: "Level Crossing" light_rail: "Light Rail" + miniature: "Miniature Rail" monorail: "Monorail" narrow_gauge: "Narrow Gauge Railway" platform: "Railway Platform" @@ -767,7 +788,7 @@ en: yard: "Railway Yard" shop: alcohol: "Off License" - apparel: "Apparel Shop" + antiques: "Antiques" art: "Art Shop" bakery: "Bakery" beauty: "Beauty Shop" @@ -776,7 +797,6 @@ en: books: "Book Shop" butcher: "Butcher" car: "Car Shop" - car_dealer: "Car Dealer" car_parts: "Car Parts" carpet: "Carpet Shop" car_repair: "Car Repair" @@ -791,7 +811,6 @@ en: department_store: "Department Store" discount: "Discount Items Shop" doityourself: "Do-It-Yourself" - drugstore: "Drugstore" dry_cleaning: "Dry Cleaning" electronics: "Electronics Shop" estate_agent: "Estate Agent" @@ -857,7 +876,10 @@ en: valley: "Valley" viewpoint: "Viewpoint" zoo: "Zoo" + tunnel: + "yes": "Tunnel" waterway: + artificial: "Artificial Waterway" boatyard: "Boatyard" canal: "Canal" connector: "Waterway Connector" @@ -880,15 +902,12 @@ en: weir: "Weir" description: title: - osm_namefinder: '%{types} from OpenStreetMap Namefinder' osm_nominatim: 'Location from OpenStreetMap Nominatim' geonames: 'Location from GeoNames' types: cities: Cities towns: Towns places: Places - description_osm_namefinder: - prefix: "%{distance} %{direction} of %{type}" results: no_results: "No results found" more_results: "More results" @@ -913,11 +932,10 @@ en: h1: OpenStreetMap logo: alt_text: OpenStreetMap logo - welcome_user: "Welcome, %{user_link}" welcome_user_link_tooltip: Your user page home: home home_tooltip: Go to home location - inbox: "inbox (%{count})" + inbox_html: "inbox %{count}" inbox_tooltip: zero: Your inbox contains no unread messages one: Your inbox contains 1 unread message @@ -940,14 +958,19 @@ en: user_diaries_tooltip: View user diaries edit_with: Edit with %{editor} tag_line: The Free Wiki World Map - intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you." - intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth." - intro_3: "OpenStreetMap's hosting is kindly supported by %{ucl}, %{ic} and %{bytemark}. Other supporters of the project are listed in the %{partners}." - intro_3_ucl: "the UCL VR Centre" - intro_3_ic: "Imperial College London" - intro_3_bytemark: "Bytemark Hosting" - intro_3_partners: "wiki" - intro_3_partners_url: "http://wiki.openstreetmap.org/wiki/Partners" + intro_1: "OpenStreetMap is a free worldwide map, created by people like you." + intro_2_html: "The data is free to %{download} and %{use} under its %{license}. %{create_account} to improve the map." + intro_2_create_account: "Create a user account" + intro_2_license: "open license" + intro_2_use: "use" + intro_2_download: "download" + intro_2_use_url: "http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap" + partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}." + partners_ucl: "the UCL VR Centre" + partners_ic: "Imperial College London" + partners_bytemark: "Bytemark Hosting" + partners_partners: "partners" + partners_url: "http://wiki.openstreetmap.org/wiki/Partners" osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out." osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out." donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund." @@ -962,14 +985,11 @@ en: documentation: Documentation documentation_title: Documentation for the project copyright: "Copyright & License" + community: Community community_blogs: "Community Blogs" community_blogs_title: "Blogs from members of the OpenStreetMap community" foundation: Foundation foundation_title: The OpenStreetMap Foundation - sotm2011: 'Come to the 2011 OpenStreetMap Conference, The State of the Map, September 9-11th in Denver!' - license: - alt: CC BY-SA 2.0 - title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License make_a_donation: title: Support OpenStreetMap with a monetary donation text: Make a Donation @@ -984,115 +1004,109 @@ en: text: You are viewing the English version of the copyright page. You can go back to the %{native_link} of this page or you can stop reading about copyright and %{mapping_link}. native_link: THIS_LANGUAGE_NAME_HERE version mapping_link: start mapping - legal_babble: | -
- OpenStreetMap is open data, licensed under the Creative - Commons Attribution-ShareAlike 2.0 licence (CC BY-SA). -
-- You are free to copy, distribute, transmit and adapt our maps - and data, as long as you credit OpenStreetMap and its - contributors. If you alter or build upon our maps or data, you + legal_babble: + title_html: Copyright and License + intro_1_html: | + OpenStreetMap is open data, licensed under the Open Data + Commons Open Database License (ODbL). + intro_2_html: | + You are free to copy, distribute, transmit and adapt our data, + as long as you credit OpenStreetMap and its + contributors. If you alter or build upon our data, you may distribute the result only under the same licence. The - full legal + full legal code explains your rights and responsibilities. -
- -- If you are using OpenStreetMap map images, we request that - your credit reads at least “© OpenStreetMap - contributors, CC BY-SA”. If you are using map data only, - we request “Map data © OpenStreetMap contributors, - CC BY-SA”. -
-- Where possible, OpenStreetMap should be hyperlinked to http://www.openstreetmap.org/ - and CC BY-SA to http://creativecommons.org/licenses/by-sa/2.0/. If - you are using a medium where links are not possible (e.g. a - printed work), we suggest you direct your readers to - www.openstreetmap.org (perhaps by expanding - ‘OpenStreetMap’ to this full address) and to - www.creativecommons.org. -
- -- Read more about using our data at the Creative + Commons Attribution-ShareAlike 2.0 license (CC-BY-SA). + credit_title_html: How to credit OpenStreetMap + credit_1_html: | + We require that you use the credit “© OpenStreetMap + contributors”. + credit_2_html: | + You must also make it clear that the data is available under the Open + Database License, and if using our map tiles, that the cartography is + licensed as CC-BY-SA. You may do this by linking 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), to opendatacommons.org, and + if relevant, to creativecommons.org. + credit_3_html: | + For a browsable electronic map, the credit should appear in the corner of the map. + For example: + attribution_example: + alt: Example of how to attribute OpenStreetMap on a webpage + title: Attribution example + more_title_html: Finding out more + more_1_html: | + Read more about using our data, and how to credit us, at the Legal FAQ. -
-- OSM contributors are reminded never to add data from any - copyrighted sources (e.g. Google Maps or printed maps) without - explicit permission from the copyright holders. -
-+ more_2_html: | Although OpenStreetMap is open data, we cannot provide a free-of-charge map API for third-party developers. - See our API Usage Policy, Tile Usage Policy and Nominatim Usage Policy. -
- -- Our CC BY-SA licence requires you to “give the Original - Author credit reasonable to the medium or means You are - utilising”. Individual OSM mappers do not request a - credit over and above that to “OpenStreetMap - contributors”, but where data from a national mapping - agency or other major source has been included in - OpenStreetMap, it may be reasonable to credit them by directly - reproducing their credit or by linking to it on this page. -
- - - -+ contributors_title_html: Our contributors + contributors_intro_html: | + Our contributors are thousands of individuals. We also include + openly-licensed data from national mapping agencies + and other sources, among them: + contributors_at_html: | + Austria: Contains data from + Stadt Wien (under + CC BY), + Land Vorarlberg and + Land Tirol (under CC-BY AT with amendments). + contributors_ca_html: | + Canada: Contains data from + GeoBase®, GeoGratis (© Department of Natural + Resources Canada), CanVec (© Department of Natural + Resources Canada), and StatCan (Geography Division, + Statistics Canada). + contributors_fr_html: | + France: Contains data sourced from + Direction Générale des Impôts. + contributors_nl_html: | + Netherlands: Contains © AND data, 2007 + (www.and.com) + contributors_nz_html: | + New Zealand: Contains data sourced from + Land Information New Zealand. Crown Copyright reserved. + contributors_za_html: | + South Africa: Contains data sourced from + Chief Directorate: + National Geo-Spatial Information, State copyright reserved. + contributors_gb_html: | + United Kingdom: Contains Ordnance + Survey data © Crown copyright and database right + 2010-12. + contributors_footer_1_html: | + For further details of these, and other sources that have been used + to help improve OpenStreetMap, please see the Contributors + page on the OpenStreetMap Wiki. + contributors_footer_2_html: | Inclusion of data in OpenStreetMap does not imply that the original data provider endorses OpenStreetMap, provides any warranty, or accepts any liability. -
+ infringement_title_html: Copyright infringement + infringement_1_html: | + OSM contributors are reminded never to add data from any + copyrighted sources (e.g. Google Maps or printed maps) without + explicit permission from the copyright holders. + 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 + procedure or file directly at our + on-line filing page. notifier: diary_comment_notification: subject: "[OpenStreetMap] %{user} commented on your diary entry" @@ -1126,13 +1140,12 @@ en: subject: "[OpenStreetMap] GPX Import success" loaded_successfully: loaded successfully with %{trace_points} out of a possible %{possible_points} points. signup_confirm: - subject: "[OpenStreetMap] Confirm your email address" - signup_confirm_plain: + subject: "[OpenStreetMap] Welcome to OpenStreetMap" greeting: "Hi there!" - hopefully_you: "Someone (hopefully you) would like to create an account over at" - # next two translations run-on : please word wrap appropriately - click_the_link_1: "If this is you, welcome! Please click the link below to confirm your" - click_the_link_2: "account and read on for more information about OpenStreetMap." + created: "Someone (hopefully you) just created an account at %{site_url}." + confirm: "Before we do anything else, we need to confirm that this request came from you, so if it did then please click the link below to confirm your account:" + welcome: "We would like to welcome you and provide you with some additional information to get you started." + signup_confirm_plain: introductory_video: "You can watch an introductory video to OpenStreetMap here:" more_videos: "There are more videos here:" the_wiki: "Get reading about OpenStreetMap on the wiki:" @@ -1142,15 +1155,9 @@ en: ask_questions: "You can ask any questions you may have about OpenStreetMap at our question and answer site:" wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:" wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page" - # next four translations are in pairs : please word wrap appropriately - user_wiki_1: "It is recommended that you create a user wiki page, which includes" - user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]." - current_user_1: "A list of current users in categories, based on where in the world" - current_user_2: "they are, is available from:" + user_wiki_page: "It is recommended that you create a user wiki page, which includes category tags noting where you are, such as [[Category:Users_in_London]]." + current_user: "A list of current users in categories, based on where in the world they are, is available from:" signup_confirm_html: - greeting: "Hi there!" - hopefully_you: "Someone (hopefully you) would like to create an account over at" - click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap" introductory_video: "You can watch an %{introductory_video_link}." video_to_openstreetmap: "introductory video to OpenStreetMap" more_videos: "There are %{more_videos_link}." @@ -1213,10 +1220,6 @@ en: back_to_inbox: "Back to inbox" message_sent: "Message sent" limit_exceeded: "You have sent a lot of messages recently. Please wait a while before trying to send any more." - no_such_user: - title: "No such user" - heading: "No such user" - body: "Sorry there is no user with that name." no_such_message: title: "No such message" heading: "No such message" @@ -1248,7 +1251,7 @@ en: reading_your_sent_messages: "Reading your sent messages" to: "To" back_to_outbox: "Back to outbox" - wrong_user: "You are logged in as `%{user}' but the message you have asked to read to was not sent by or to that user. Please login as the correct user in order to read it." + wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it." sent_message_summary: delete_button: "Delete" mark: @@ -1260,14 +1263,11 @@ en: index: js_1: "You are either using a browser that does not support JavaScript, or you have disabled JavaScript." js_2: "OpenStreetMap uses JavaScript for its slippy map." - js_3: 'You may want to try the Tiles@Home static tile browser if you are unable to enable JavaScript.' permalink: Permalink shortlink: Shortlink license: - notice: "Licensed under the %{license_name} license by the %{project_name} and its contributors." - license_name: "Creative Commons Attribution-Share Alike 2.0" - license_url: "http://creativecommons.org/licenses/by-sa/2.0/" - project_name: "OpenStreetMap project" + copyright: "Copyright OpenStreetMap and contributors, under an open license" + license_url: "http://openstreetmap.org/copyright" project_url: "http://openstreetmap.org" remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled" edit: @@ -1360,6 +1360,23 @@ en: permissive: "Permissive access" destination: "Destination access" construction: "Roads under construction" + richtext_area: + edit: Edit + preview: Preview + markdown_help: + title_html: Parsed with Markdown + headings: Headings + heading: Heading + subheading: Subheading + unordered: Unordered list + ordered: Ordered list + first: First item + second: Second item + link: Link + text: Text + image: Image + alt: Alt text + url: URL trace: visibility: private: "Private (only shared as anonymous, unordered points)" @@ -1387,10 +1404,6 @@ en: visibility: "Visibility:" visibility_help: "what does this mean?" visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" - no_such_user: - 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." trace_form: upload_gpx: "Upload GPX File:" description: "Description:" @@ -1429,9 +1442,9 @@ en: trace_not_found: "Trace not found!" visibility: "Visibility:" trace_paging_nav: - showing_page: "Showing page %{page}" - next: "Next »" - previous: "« Previous" + showing_page: "Page %{page}" + older: "Older Traces" + newer: "Newer Traces" trace: pending: "PENDING" count_points: "%{count} points" @@ -1452,7 +1465,9 @@ en: public_traces: "Public GPS traces" your_traces: "Your GPS traces" public_traces_from: "Public GPS traces from %{user}" + description: "Browse recent GPS track uploads" tagged_with: " tagged with %{tags}" + empty_html: "Nothing here yet. Upload a new trace or learn more about GPS tracing on the wiki page." delete: scheduled_for_deletion: "Trace scheduled for deletion" make_public: @@ -1465,6 +1480,8 @@ en: application: require_cookies: cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing." + require_moderator: + not_a_moderator: "You need to be a moderator to perform that action." setup_user_auth: 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." @@ -1496,6 +1513,8 @@ en: authorize_url: "Authorise URL:" support_notice: "We support HMAC-SHA1 (recommended) as well as plain text in SSL mode." edit: "Edit Details" + delete: "Delete Client" + confirm: "Are you sure?" requests: "Requesting the following permissions from the user:" allow_read_prefs: "read their user preferences." allow_write_prefs: "modify their user preferences." @@ -1542,7 +1561,7 @@ en: email or username: "Email Address or Username:" password: "Password:" openid: "%{logo} OpenID:" - remember: "Remember me:" + remember: "Remember me" lost password link: "Lost your password?" login_button: "Login" register now: Register now @@ -1551,11 +1570,10 @@ en: 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. + no account: Don't have an account? account not active: "Sorry, your account is not active yet.