X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/97261143d66a9d6f23227fb65a0e27de95259690..dc48c9a5101c263dfd0eb33fa358490fc2ad9de0:/config/locales/en.yml?ds=sidebyside diff --git a/config/locales/en.yml b/config/locales/en.yml index 95bd2b63f..1cec3f148 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -76,11 +76,11 @@ en: languages: "Languages" pass_crypt: "Password" printable_name: - with_id: "{{id}}" - with_version: "{{id}}, v{{version}}" - with_name: "{{name}} ({{id}})" + with_id: "%{id}" + with_version: "%{id}, v%{version}" + with_name: "%{name} (%{id})" editor: - default: "Default (currently {{name}})" + default: "Default (currently %{name})" potlatch: name: "Potlatch 1" description: "Potlatch 1 (in-browser editor)" @@ -93,25 +93,25 @@ en: browse: changeset: title: "Changeset" - changeset: "Changeset: {{id}}" - download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}" + changeset: "Changeset: %{id}" + download: "Download %{changeset_xml_link} or %{osmchange_xml_link}" changesetxml: "Changeset XML" osmchangexml: "osmChange XML" feed: - title: "Changeset {{id}}" - title_comment: "Changeset {{id}} - {{comment}}" + title: "Changeset %{id}" + title_comment: "Changeset %{id} - %{comment}" navigation: paging: user: - prev: "« {{id}}" - next: "{{id}} »" + prev: "« %{id}" + next: "%{id} »" all: - prev: "« {{id}}" - next: "{{id}} »" + prev: "« %{id}" + next: "%{id} »" user: - name_changeset_tooltip: "View edits by {{user}}" - prev_changeset_tooltip: "Previous edit by {{user}}" - next_changeset_tooltip: "Next edit by {{user}}" + name_changeset_tooltip: "View edits by %{user}" + prev_changeset_tooltip: "Previous edit by %{user}" + next_changeset_tooltip: "Next edit by %{user}" all: prev_node_tooltip: "Previous node" next_node_tooltip: "Next node" @@ -130,23 +130,25 @@ en: show_area_box: "Show Area Box" box: "box" has_nodes: - one: "Has the following {{count}} node:" - other: "Has the following {{count}} nodes:" + one: "Has the following %{count} node:" + other: "Has the following %{count} nodes:" has_ways: - one: "Has the following {{count}} way:" - other: "Has the following {{count}} ways:" + one: "Has the following %{count} way:" + other: "Has the following %{count} ways:" has_relations: - one: "Has the following {{count}} relation:" - other: "Has the following {{count}} relations:" + one: "Has the following %{count} relation:" + other: "Has the following %{count} relations:" common_details: edited_at: "Edited at:" edited_by: "Edited by:" + deleted_at: "Deleted at:" + deleted_by: "Deleted by:" version: "Version:" in_changeset: "In changeset:" changeset_comment: "Comment:" containing_relation: - entry: "Relation {{relation_name}}" - entry_role: "Relation {{relation_name}} (as {{relation_role}})" + entry: "Relation %{relation_name}" + entry_role: "Relation %{relation_name} (as %{relation_role})" map: loading: "Loading..." deleted: "Deleted" @@ -155,31 +157,36 @@ en: node: "View node on larger map" way: "View way on larger map" relation: "View relation on larger map" + edit: + area: "Edit area" + node: "Edit node" + way: "Edit way" + relation: "Edit relation" node_details: coordinates: "Coordinates:" part_of: "Part of:" node_history: node_history: "Node History" - node_history_title: "Node History: {{node_name}}" - download: "{{download_xml_link}} or {{view_details_link}}" + node_history_title: "Node History: %{node_name}" + download: "%{download_xml_link} or %{view_details_link}" download_xml: "Download XML" view_details: "view details" node: node: "Node" - node_title: "Node: {{node_name}}" - download: "{{download_xml_link}}, {{view_history_link}} or {{edit_link}}" + 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" not_found: - sorry: "Sorry, the {{type}} with the id {{id}}, could not be found." + sorry: "Sorry, the %{type} with the id %{id}, could not be found." type: node: node way: way relation: relation changeset: changeset timeout: - sorry: "Sorry, the data for the {{type}} with the id {{id}}, took too long to retrieve." + sorry: "Sorry, the data for the %{type} with the id %{id}, took too long to retrieve." type: node: node way: way @@ -193,21 +200,21 @@ en: 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}}" + relation_history_title: "Relation History: %{relation_name}" + download: "%{download_xml_link} or %{view_details_link}" download_xml: "Download XML" view_details: "view details" relation_member: - entry: "{{type}} {{name}}" - entry_role: "{{type}} {{name}} as {{role}}" + entry: "%{type} %{name}" + entry_role: "%{type} %{name} as %{role}" type: node: "Node" way: "Way" relation: "Relation" relation: relation: "Relation" - relation_title: "Relation: {{relation_name}}" - download: "{{download_xml_link}} or {{view_history_link}}" + relation_title: "Relation: %{relation_name}" + download: "%{download_xml_link} or %{view_history_link}" download_xml: "Download XML" view_history: "view history" start: @@ -219,9 +226,11 @@ en: 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" 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." 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..." @@ -251,35 +260,35 @@ en: tag_details: tags: "Tags:" wiki_link: - key: "The wiki description page for the {{key}} tag" - tag: "The wiki description page for the {{key}}={{value}} tag" - wikipedia_link: "The {{page}} article on Wikipedia" + key: "The wiki description page for the %{key} tag" + tag: "The wiki description page for the %{key}=%{value} tag" + wikipedia_link: "The %{page} article on Wikipedia" way_details: nodes: "Nodes:" part_of: "Part of:" also_part_of: - one: "also part of way {{related_ways}}" - other: "also part of ways {{related_ways}}" + one: "also part of way %{related_ways}" + other: "also 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}}" + way_history_title: "Way History: %{way_name}" + download: "%{download_xml_link} or %{view_details_link}" download_xml: "Download XML" view_details: "view details" way: way: "Way" - way_title: "Way: {{way_name}}" - download: "{{download_xml_link}}, {{view_history_link}} or {{edit_link}}" + 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" changeset: changeset_paging_nav: - showing_page: "Showing page {{page}}" - next: "Next »" - previous: "« Previous" + showing_page: "Showing page %{page}" + next: "Next »" + previous: "« Previous" changeset: - id: "#{{id}}" + id: "#%{id}" still_editing: "(still editing)" anonymous: "Anonymous" no_comment: "(none)" @@ -295,19 +304,23 @@ en: area: "Area" list: title: "Changesets" - title_user: "Changesets by {{user}}" - title_bbox: "Changesets within {{bbox}}" - title_user_bbox: "Changesets by {{user}} within {{bbox}}" - + title_user: "Changesets by %{user}" + title_bbox: "Changesets within %{bbox}" + title_user_bbox: "Changesets by %{user} within %{bbox}" + title_friend: "Changesets by your friends" + title_nearby: "Changesets by nearby users" heading: "Changesets" heading_user: "Changesets" heading_bbox: "Changesets" heading_user_bbox: "Changesets" - + heading_friend: "Changesets" + heading_nearby: "Changesets" description: "Recent changes" - description_user: "Changesets by {{user}}" - description_bbox: "Changesets within {{bbox}}" - description_user_bbox: "Changesets by {{user}} within {{bbox}}" + 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" timeout: sorry: "Sorry, the list of changesets you requested took too long to retrieve." diary_entry: @@ -315,8 +328,10 @@ en: title: New Diary Entry list: title: "Users' diaries" - user_title: "{{user}}'s diary" - in_language_title: "Diary Entries in {{language}}" + title_friends: "Friends' diaries" + title_nearby: "Nearby Users' diaries" + user_title: "%{user}'s diary" + in_language_title: "Diary Entries in %{language}" new: New Diary Entry new_title: Compose a new entry in your user diary no_entries: No diary entries @@ -335,32 +350,32 @@ en: save_button: "Save" marker_text: Diary entry location view: - title: "{{user}}'s diary | {{title}}" - user_title: "{{user}}'s diary" + title: "%{user}'s diary | %{title}" + user_title: "%{user}'s diary" leave_a_comment: "Leave a comment" - login_to_leave_a_comment: "{{login_link}} to leave a comment" + login_to_leave_a_comment: "%{login_link} to leave a comment" login: "Login" save_button: "Save" no_such_entry: 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." + 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." + 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}}" + 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 - other: "{{count}} comments" + other: "%{count} comments" edit_link: Edit this entry hide_link: Hide this entry confirm: Confirm diary_comment: - comment_from: "Comment from {{link_user}} on {{comment_created_at}}" + comment_from: "Comment from %{link_user} on %{comment_created_at}" hide_link: Hide this comment confirm: Confirm location: @@ -369,22 +384,29 @@ en: edit: "Edit" feed: user: - title: "OpenStreetMap diary entries for {{user}}" - description: "Recent OpenStreetMap diary entries from {{user}}" + title: "OpenStreetMap diary entries for %{user}" + description: "Recent OpenStreetMap diary entries from %{user}" language: - title: "OpenStreetMap diary entries in {{language_name}}" - description: "Recent diary entries from users of OpenStreetMap in {{language_name}}" + title: "OpenStreetMap diary entries in %{language_name}" + description: "Recent diary entries from users of OpenStreetMap in %{language_name}" 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.' @@ -422,23 +444,34 @@ en: 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}}" + 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_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" @@ -447,6 +480,7 @@ en: car_sharing: "Car Sharing" car_wash: "Car Wash" casino: "Casino" + charging_station: "Charging Station" cinema: "Cinema" clinic: "Clinic" club: "Club" @@ -465,6 +499,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" @@ -505,9 +540,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" @@ -519,41 +557,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" @@ -561,12 +579,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" @@ -578,14 +595,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" @@ -599,6 +619,7 @@ en: building: "Building" castle: "Castle" church: "Church" + fort: "Fort" house: "House" icon: "Icon" manor: "Manor" @@ -623,6 +644,7 @@ en: farmland: "Farmland" farmyard: "Farmyard" forest: "Forest" + garages: "Garages" grass: "Grass" greenfield: "Greenfield Land" industrial: "Industrial Area" @@ -630,25 +652,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" @@ -659,12 +684,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" @@ -672,11 +702,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" @@ -696,6 +727,7 @@ en: scrub: "Scrub" shoal: "Shoal" spring: "Spring" + stone: "Stone" strait: "Strait" tree: "Tree" valley: "Valley" @@ -704,6 +736,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" @@ -715,6 +760,7 @@ en: houses: "Houses" island: "Island" islet: "Islet" + isolated_dwelling: "Isolated Dwelling" locality: "Locality" moor: "Moor" municipality: "Municipality" @@ -738,6 +784,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" @@ -752,7 +799,7 @@ en: yard: "Railway Yard" shop: alcohol: "Off License" - apparel: "Apparel Shop" + antiques: "Antiques" art: "Art Shop" bakery: "Bakery" beauty: "Beauty Shop" @@ -761,7 +808,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" @@ -776,7 +822,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" @@ -842,7 +887,10 @@ en: valley: "Valley" viewpoint: "Viewpoint" zoo: "Zoo" + tunnel: + "yes": "Tunnel" waterway: + artificial: "Artificial Waterway" boatyard: "Boatyard" canal: "Canal" connector: "Waterway Connector" @@ -865,7 +913,7 @@ en: weir: "Weir" description: title: - osm_namefinder: '{{types}} from OpenStreetMap Namefinder' + osm_namefinder: '%{types} from OpenStreetMap Namefinder' osm_nominatim: 'Location from OpenStreetMap Nominatim' geonames: 'Location from GeoNames' types: @@ -873,14 +921,14 @@ en: towns: Towns places: Places description_osm_namefinder: - prefix: "{{distance}} {{direction}} of {{type}}" + prefix: "%{distance} %{direction} of %{type}" results: no_results: "No results found" more_results: "More results" distance: zero: "less than 1km" one: "about 1km" - other: "about {{count}}km" + other: "about %{count}km" direction: south_west: "south-west" south: "south" @@ -898,15 +946,15 @@ en: h1: OpenStreetMap logo: alt_text: OpenStreetMap logo - welcome_user: "Welcome, {{user_link}}" + welcome_user: "Welcome, %{user_link}" welcome_user_link_tooltip: Your user page home: home home_tooltip: Go to home location - inbox: "inbox ({{count}})" + inbox: "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 + other: Your inbox contains %{count} unread messages logout: logout logout_tooltip: "Log out" log_in: log in @@ -923,20 +971,25 @@ en: gps_traces_tooltip: Manage GPS traces user_diaries: User Diaries user_diaries_tooltip: View user diaries - edit_with: Edit with {{editor}} + 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 the {{ucl}} and {{bytemark}}. Other supporters of the project are listed in the {{partners}}." - intro_3_ucl: "UCL VR Centre" - intro_3_bytemark: "bytemark" - 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: "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: "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." + donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund." donate_link_text: donating - help_and_wiki: "{{help}} & {{wiki}}" help: Help help_centre: Help Centre help_url: http://help.openstreetmap.org/ @@ -946,18 +999,15 @@ en: wiki_title: Wiki site for the project documentation: Documentation documentation_title: Documentation for the project - copyright: "Copyright & License" - news_blog: "News blog" - news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc." - community_blogs: "Community blogs" + 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 - shop: Shop - shop_tooltip: Shop with branded OpenStreetMap merchandise - shop_url: http://wiki.openstreetmap.org/wiki/Merchandise + sotm2011: 'Come to the 2011 OpenStreetMap Conference, The State of the Map, September 9-11th in Denver!' license: - alt: CC by-sa 2.0 + 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 @@ -966,11 +1016,11 @@ en: license_page: foreign: title: About this translation - text: In the event of a conflict between this translated page and {{english_original_link}}, the English page shall take precedence + text: In the event of a conflict between this translated page and %{english_original_link}, the English page shall take precedence english_link: the English original native: title: About this page - 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}}. + 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: | @@ -978,7 +1028,7 @@ en:

OpenStreetMap is open data, licensed under the Creative - Commons Attribution-ShareAlike 2.0 licence (CC-BY-SA). + Commons Attribution-ShareAlike 2.0 licence (CC BY-SA).

You are free to copy, distribute, transmit and adapt our maps @@ -994,14 +1044,14 @@ en:

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, + contributors, CC BY-SA”. If you are using map data only, we request “Map data © OpenStreetMap contributors, - CC-BY-SA”. + 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 @@ -1032,7 +1082,7 @@ en:

Our contributors

- Our CC-BY-SA licence requires you to “give the Original + 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 @@ -1057,16 +1107,26 @@ en: