X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b917a0eba07184571ea62bb7b735eb48d7c04634..df02008ee970338a992c364419d6f59fdc54e63d:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index cc2dc5e98..d5577ff64 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -76,31 +76,42 @@ 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})" + potlatch: + name: "Potlatch 1" + description: "Potlatch 1 (in-browser editor)" + potlatch2: + name: "Potlatch 2" + description: "Potlatch 2 (in-browser editor)" + remote: + name: "Remote Control" + description: "Remote Control (JOSM or Merkaartor)" 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" @@ -119,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" @@ -144,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 @@ -177,40 +195,49 @@ en: paging_nav: showing_page: "Showing 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}}" + 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: view_data: "View data for current map view" manually_select: "Manually select a different area" 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" 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..." @@ -240,35 +267,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)" @@ -284,26 +311,34 @@ 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: new: 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 @@ -322,32 +357,28 @@ 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." - 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: "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." 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: @@ -356,22 +387,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.' @@ -409,22 +447,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: + 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" @@ -433,6 +483,7 @@ en: car_sharing: "Car Sharing" car_wash: "Car Wash" casino: "Casino" + charging_station: "Charging Station" cinema: "Cinema" clinic: "Clinic" club: "Club" @@ -451,6 +502,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" @@ -491,9 +543,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" @@ -505,41 +560,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" @@ -547,12 +582,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" @@ -564,14 +598,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" @@ -585,6 +622,7 @@ en: building: "Building" castle: "Castle" church: "Church" + fort: "Fort" house: "House" icon: "Icon" manor: "Manor" @@ -609,6 +647,7 @@ en: farmland: "Farmland" farmyard: "Farmyard" forest: "Forest" + garages: "Garages" grass: "Grass" greenfield: "Greenfield Land" industrial: "Industrial Area" @@ -616,25 +655,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" @@ -645,12 +687,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" @@ -658,11 +705,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" @@ -682,6 +730,7 @@ en: scrub: "Scrub" shoal: "Shoal" spring: "Spring" + stone: "Stone" strait: "Strait" tree: "Tree" valley: "Valley" @@ -690,6 +739,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" @@ -701,6 +763,7 @@ en: houses: "Houses" island: "Island" islet: "Islet" + isolated_dwelling: "Isolated Dwelling" locality: "Locality" moor: "Moor" municipality: "Municipality" @@ -724,6 +787,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" @@ -738,7 +802,7 @@ en: yard: "Railway Yard" shop: alcohol: "Off License" - apparel: "Apparel Shop" + antiques: "Antiques" art: "Art Shop" bakery: "Bakery" beauty: "Beauty Shop" @@ -747,7 +811,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" @@ -762,7 +825,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" @@ -828,7 +890,10 @@ en: valley: "Valley" viewpoint: "Viewpoint" zoo: "Zoo" + tunnel: + "yes": "Tunnel" waterway: + artificial: "Artificial Waterway" boatyard: "Boatyard" canal: "Canal" connector: "Waterway Connector" @@ -851,7 +916,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: @@ -859,14 +924,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" @@ -884,15 +949,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 @@ -909,30 +974,43 @@ en: gps_traces_tooltip: Manage GPS traces user_diaries: User Diaries 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 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_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." + donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund." donate_link_text: donating - help_wiki: "Help & Wiki" - help_wiki_tooltip: "Help & Wiki site for the project" - help_wiki_url: "http://wiki.openstreetmap.org" - copyright: "Copyright & License" - news_blog: "News blog" - news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc." - shop: Shop - shop_tooltip: Shop with branded OpenStreetMap merchandise - shop_url: http://wiki.openstreetmap.org/wiki/Merchandise - sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!' + help: Help + help_centre: Help Centre + help_url: http://help.openstreetmap.org/ + help_title: Help site for the project + wiki: Wiki + wiki_url: http://wiki.openstreetmap.org/ + wiki_title: Wiki site for the project + 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 + 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 @@ -941,11 +1019,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 pag 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: | @@ -953,7 +1031,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 @@ -969,14 +1047,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 @@ -1007,7 +1085,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 @@ -1032,13 +1110,30 @@ en:

+ continue: Continue - flash create success message: "User was successfully created. Check your email for a confirmation note, and you will be mapping in no time :-)

Please note that you will not be able to login until you've received and confirmed your email address.

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." + 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." + 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" - press accept button: "Please read the agreement below and press the agree button to create your account." - consider_pd: "I consider my contributions to be in the Public Domain" + 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." + 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://wiki.openstreetmap.org/wiki/Why_would_I_want_my_contributions_to_be_public_domain + consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain + guidance: 'Information to help understand these terms: a human readable summary and some informal translations' agree: Agree 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_button: "Go" legale_names: france: "France" italy: "Italy" rest_of_world: "Rest of the world" 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." view: my diary: my diary new diary entry: new diary entry my edits: my edits my traces: my traces my settings: my settings + my comments: my comments oauth settings: oauth settings blocks on me: blocks on me blocks by me: blocks by me @@ -1600,19 +1732,24 @@ en: remove as friend: remove as friend add as friend: add as friend mapper since: "Mapper since:" - ago: "({{time_in_words_ago}} ago)" + ago: "(%{time_in_words_ago} ago)" + ct status: "Contributor terms:" + ct undecided: Undecided + ct declined: Declined + ct accepted: Accepted %{ago} ago + latest edit: "Latest edit %{ago}:" email address: "Email address:" created from: "Created from:" status: "Status:" spam score: "Spam Score:" description: Description user location: User location - if set location: "If you set your location, a pretty map and stuff will appear here. You can set your home location on your {{settings_link}} page." + if set location: "If you set your location, a pretty map and stuff will appear here. You can set your home location on your %{settings_link} page." settings_link_text: settings your friends: Your friends no friends: You have not added any friends yet. - km away: "{{count}}km away" - m away: "{{count}}m away" + km away: "%{count}km away" + m away: "%{count}m away" nearby users: "Other nearby users" no nearby users: "There are no other users who admit to mapping nearby yet." role: @@ -1626,6 +1763,7 @@ en: moderator: "Revoke moderator access" block_history: "view blocks received" moderator_history: "view blocks given" + comments: "comments" create_block: "block this user" activate_user: "activate this user" deactivate_user: "deactivate this user" @@ -1634,6 +1772,10 @@ en: unhide_user: "unhide this user" delete_user: "delete this user" confirm: "Confirm" + friends_changesets: "Browse all changesets by friends" + friends_diaries: "Browse all diary entries by friends" + nearby_changesets: "Browse all changesets by nearby users" + nearby_diaries: "Browse all diary entries by nearby users" popup: your location: "Your location" nearby mapper: "Nearby mapper" @@ -1658,8 +1800,17 @@ en: public editing note: heading: "Public editing" text: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. Since the 0.6 API changeover, only public users can edit map data. (find out why)." + contributor terms: + heading: "Contributor Terms:" + agreed: "You have agreed to the new Contributor Terms." + 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: "http://www.osmfoundation.org/wiki/License/Contributor_Terms" + link text: "what is this?" profile description: "Profile Description:" preferred languages: "Preferred Languages:" + preferred editor: "Preferred Editor:" image: "Image:" new image: "Add an image" keep image: "Keep the current image" @@ -1681,7 +1832,13 @@ en: press confirm button: "Press the confirm button below to activate your account." button: Confirm success: "Confirmed your account, thanks for signing up!" - failure: "A user account with this token has already been confirmed." + 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." + 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." confirm_email: heading: Confirm a change of email address press confirm button: "Press the confirm button below to confirm your new email address." @@ -1693,28 +1850,29 @@ en: go_public: flash success: "All your edits are now public, and you are now allowed to edit." make_friend: - success: "{{name}} is now your friend." - failed: "Sorry, failed to add {{name}} as a friend." - already_a_friend: "You are already friends with {{name}}." + success: "%{name} is now your friend." + failed: "Sorry, failed to add %{name} as a friend." + already_a_friend: "You are already friends with %{name}." remove_friend: - success: "{{name}} was removed from your friends." - not_a_friend: "{{name}} is not one of your friends." + success: "%{name} was removed from your friends." + not_a_friend: "%{name} is not one of your friends." filter: not_an_administrator: "You need to be an administrator to perform that action." list: title: Users heading: Users showing: - one: Showing page {{page}} ({{first_item}} of {{items}}) - other: Showing page {{page}} ({{first_item}}-{{last_item}} of {{items}}) - summary: "{{name}} created from {{ip_address}} on {{date}}" - summary_no_ip: "{{name}} created on {{date}}" + one: Showing page %{page} (%{first_item} of %{items}) + other: Showing page %{page} (%{first_item}-%{last_item} of %{items}) + summary: "%{name} created from %{ip_address} on %{date}" + summary_no_ip: "%{name} created on %{date}" confirm: Confirm Selected Users hide: Hide Selected Users empty: No matching users found suspended: title: Account Suspended heading: Account Suspended + webmaster: webmaster body: |

Sorry, your account has been automatically suspended due to @@ -1722,38 +1880,37 @@ en:

This decision will be reviewed by an administrator shortly, or - you may contact the webmaster if - you wish to discuss this. + you may contact the %{webmaster} if you wish to discuss this.

user_role: filter: not_an_administrator: "Only administrators can perform user role management, and you are not an administrator." - not_a_role: "The string `{{role}}' is not a valid role." - already_has_role: "The user already has role {{role}}." - doesnt_have_role: "The user does not have role {{role}}." + not_a_role: "The string `%{role}' is not a valid role." + already_has_role: "The user already has role %{role}." + doesnt_have_role: "The user does not have role %{role}." grant: title: Confirm role granting heading: Confirm role granting - are_you_sure: "Are you sure you want to grant the role `{{role}}' to the user `{{name}}'?" + are_you_sure: "Are you sure you want to grant the role `%{role}' to the user `%{name}'?" confirm: "Confirm" - fail: "Could not grant role `{{role}}' to user `{{name}}'. Please check that the user and role are both valid." + fail: "Could not grant role `%{role}' to user `%{name}'. Please check that the user and role are both valid." revoke: title: Confirm role revoking heading: Confirm role revoking - are_you_sure: "Are you sure you want to revoke the role `{{role}}' from the user `{{name}}'?" + are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?" confirm: "Confirm" - fail: "Could not revoke role `{{role}}' from user `{{name}}'. Please check that the user and role are both valid." + fail: "Could not revoke role `%{role}' from user `%{name}'. Please check that the user and role are both valid." user_block: model: non_moderator_update: "Must be a moderator to create or update a block." non_moderator_revoke: "Must be a moderator to revoke a block." not_found: - sorry: "Sorry, the user block with ID {{id}} could not be found." + sorry: "Sorry, the user block with ID %{id} could not be found." back: "Back to index" new: - title: "Creating block on {{name}}" - heading: "Creating block on {{name}}" - reason: "The reason why {{name}} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use laymans terms." + title: "Creating block on %{name}" + heading: "Creating block on %{name}" + reason: "The reason why %{name} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use laymans terms." period: "How long, starting now, the user will be blocked from the API for." submit: "Create block" tried_contacting: "I have contacted the user and asked them to stop." @@ -1761,22 +1918,21 @@ en: needs_view: "User needs to log in before this block will be cleared" back: "View all blocks" edit: - title: "Editing block on {{name}}" - heading: "Editing block on {{name}}" - reason: "The reason why {{name}} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation. Bear in mind that not all users understand the community jargon, so please try to use laymans terms." + title: "Editing block on %{name}" + heading: "Editing block on %{name}" + reason: "The reason why %{name} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation. Bear in mind that not all users understand the community jargon, so please try to use laymans terms." period: "How long, starting now, the user will be blocked from the API for." submit: "Update block" show: "View this block" back: "View all blocks" needs_view: "Does the user need to log in before this block will be cleared?" filter: - not_a_moderator: "You need to be a moderator to perform that action." block_expired: "The block has already expired and cannot be edited." block_period: "The blocking period must be one of the values selectable in the drop-down list." create: try_contacting: "Please try contacting the user before blocking them and giving them a reasonable time to respond." try_waiting: "Please try giving the user a reasonable time to respond before blocking them." - flash: "Created a block on user {{name}}." + flash: "Created a block on user %{name}." update: only_creator_can_edit: "Only the moderator who created this block can edit it." success: "Block updated." @@ -1785,16 +1941,16 @@ en: heading: "List of user blocks" empty: "No blocks have been made yet." revoke: - title: "Revoking block on {{block_on}}" - heading: "Revoking block on {{block_on}} by {{block_by}}" - time_future: "This block will end in {{time}}." - past: "This block ended {{time}} ago and cannot be revoked now." + title: "Revoking block on %{block_on}" + heading: "Revoking block on %{block_on} by %{block_by}" + time_future: "This block will end in %{time}." + past: "This block ended %{time} ago and cannot be revoked now." confirm: "Are you sure you wish to revoke this block?" revoke: "Revoke!" flash: "This block has been revoked." period: one: "1 hour" - other: "{{count}} hours" + other: "%{count} hours" partial: show: "Show" edit: "Edit" @@ -1807,22 +1963,22 @@ en: revoker_name: "Revoked by" not_revoked: "(not revoked)" helper: - time_future: "Ends in {{time}}." + time_future: "Ends in %{time}." until_login: "Active until the user logs in." - time_past: "Ended {{time}} ago." + time_past: "Ended %{time} ago." blocks_on: - title: "Blocks on {{name}}" - heading: "List of blocks on {{name}}" - empty: "{{name}} has not been blocked yet." + title: "Blocks on %{name}" + heading: "List of blocks on %{name}" + empty: "%{name} has not been blocked yet." blocks_by: - title: "Blocks by {{name}}" - heading: "List of blocks by {{name}}" - empty: "{{name}} has not made any blocks yet." + title: "Blocks by %{name}" + heading: "List of blocks by %{name}" + empty: "%{name} has not made any blocks yet." show: - title: "{{block_on}} blocked by {{block_by}}" - heading: "{{block_on}} blocked by {{block_by}}" - time_future: "Ends in {{time}}" - time_past: "Ended {{time}} ago" + title: "%{block_on} blocked by %{block_by}" + heading: "%{block_on} blocked by %{block_by}" + time_future: "Ends in %{time}" + time_past: "Ended %{time} ago" status: "Status" show: "Show" edit: "Edit" @@ -1835,10 +1991,10 @@ en: javascripts: map: base: - mapnik: Mapnik - osmarender: Osmarender + standard: Standard cycle_map: Cycle Map - noname: NoName + transport_map: Transport Map + mapquest: MapQuest Open overlays: maplint: Maplint site: @@ -1848,3 +2004,34 @@ en: 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 + redaction: + edit: + description: "Description" + heading: "Edit redaction" + submit: "Save redaction" + title: "Edit redaction" + index: + empty: "No redactions to show." + heading: "List of redactions" + title: "List of redactions" + new: + description: "Description" + heading: "Enter information for new redaction" + submit: "Create redaction" + title: "Creating new redaction" + show: + description: "Description:" + heading: "Showing redaction \"%{title}\"" + title: "Showing redaction" + user: "Creator:" + edit: "Edit this redaction" + destroy: "Remove this redaction" + confirm: "Are you sure?" + create: + flash: "Redaction created." + update: + flash: "Changes saved." + destroy: + not_empty: "Redaction is not empty. Please un-redact all versions belonging to this redaction before destroying it." + flash: "Redaction destroyed." + error: "There was an error destroying this redaction."