X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e05b549f8c2c633b951a6aa19e725a4d5d8a5551..8dc16bd8dbd362a0e823f8abd989d871ce5de32f:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f24bc490f..3722498d0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -4,6 +4,7 @@ en:
time:
formats:
friendly: "%e %B %Y at %H:%M"
+ blog: "%e %B %Y"
activerecord:
# Translates all the model names, which is used in error handling on the web site
models:
@@ -84,6 +85,9 @@ en:
potlatch:
name: "Potlatch 1"
description: "Potlatch 1 (in-browser editor)"
+ id:
+ name: "iD"
+ description: "iD (in-browser editor)"
potlatch2:
name: "Potlatch 2"
description: "Potlatch 2 (in-browser editor)"
@@ -94,7 +98,6 @@ en:
changeset:
title: "Changeset"
changeset: "Changeset: %{id}"
- download: "Download %{changeset_xml_link} or %{osmchange_xml_link}"
changesetxml: "Changeset XML"
osmchangexml: "osmChange XML"
feed:
@@ -121,6 +124,8 @@ en:
next_relation_tooltip: "Next relation"
prev_changeset_tooltip: "Previous changeset"
next_changeset_tooltip: "Next changeset"
+ prev_note_tooltip: "Previous note"
+ next_note_tooltip: "Next note"
changeset_details:
created_at: "Created at:"
closed_at: "Closed at:"
@@ -157,27 +162,27 @@ en:
node: "View node on larger map"
way: "View way on larger map"
relation: "View relation on larger map"
+ note: "View note on larger map"
edit:
area: "Edit area"
node: "Edit node"
way: "Edit way"
relation: "Edit relation"
+ note: "Edit note"
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}"
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 +198,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 +225,30 @@ 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"
+ notes_layer_name: "Browse Notes"
+ 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 +257,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 +275,36 @@ 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"
+ note:
+ title: "Note"
+ open_title: "Unresolved note: %{note_name}"
+ closed_title: "Resolved note: %{note_name}"
+ opened: "Opened:"
+ last_modified: "Last modified:"
+ closed: "Closed:"
+ at_html: "%{when} ago"
+ at_by_html: "%{when} ago by %{user}"
+ description: "Description:"
+ comments: "Comments:"
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)"
@@ -307,16 +323,22 @@ en:
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"
-
- description: "Recent changes"
+ heading_friend: "Changesets"
+ heading_nearby: "Changesets"
+ 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:
@@ -324,12 +346,14 @@ en:
title: New Diary Entry
list:
title: "Users' diaries"
+ 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
- recent_entries: "Recent diary entries:"
+ recent_entries: "Recent diary entries"
older_entries: Older Entries
newer_entries: Newer Entries
edit:
@@ -354,16 +378,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
@@ -386,20 +407,39 @@ 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."
+ body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the following sources for bulk data downloads:"
+ planet:
+ title: "Planet OSM"
+ description: "Regularly-updated copies of the complete OpenStreetMap database"
+ geofabrik:
+ title: "Geofabrik Downloads"
+ description: "Regularly-updated extracts of continents, countries, and selected cities"
+ metro:
+ title: "Metro Extracts"
+ description: "Extracts for major world cities and their surrounding areas"
+ other:
+ title: "Other Sources"
+ description: "Additional sources listed on the OpenStreetMap wiki"
options: "Options"
format: "Format"
scale: "Scale"
@@ -419,7 +459,6 @@ en:
click_add_marker: "Click on the map to add a marker"
change_marker: "Change marker position"
add_marker: "Add a marker to the map"
- view_larger_map: "View Larger Map"
geocoder:
search:
title:
@@ -427,27 +466,36 @@ 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:
+ aerialway:
+ chair_lift: "Chair Lift"
+ drag_lift: "Drag Lift"
+ station: "Aerialway Station"
+ 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"
@@ -456,6 +504,7 @@ en:
car_sharing: "Car Sharing"
car_wash: "Car Wash"
casino: "Casino"
+ charging_station: "Charging Station"
cinema: "Cinema"
clinic: "Clinic"
club: "Club"
@@ -474,6 +523,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"
@@ -514,9 +564,13 @@ en:
shelter: "Shelter"
shop: "Shop"
shopping: "Shopping"
+ shower: "Shower"
+ social_centre: "Social Centre"
social_club: "Social Club"
+ social_facility: "Social Facility"
studio: "Studio"
supermarket: "Supermarket"
+ swimming_pool: "Swimming Pool"
taxi: "Taxi"
telephone: "Public Telephone"
theatre: "Theatre"
@@ -528,41 +582,24 @@ 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"
+ emergency:
+ fire_hydrant: "Fire Hydrant"
+ phone: "Emergency Phone"
highway:
bridleway: "Bridleway"
bus_guideway: "Guided Bus Lane"
@@ -570,12 +607,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"
@@ -585,16 +621,21 @@ en:
platform: "Platform"
primary: "Primary Road"
primary_link: "Primary Road"
+ proposed: "Proposed 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"
+ street_lamp: "Street Lamp"
stile: "Stile"
tertiary: "Tertiary Road"
+ tertiary_link: "Tertiary Road"
track: "Track"
trail: "Trail"
trunk: "Trunk Road"
@@ -608,6 +649,8 @@ en:
building: "Building"
castle: "Castle"
church: "Church"
+ citywalls: "City Walls"
+ fort: "Fort"
house: "House"
icon: "Icon"
manor: "Manor"
@@ -632,6 +675,7 @@ en:
farmland: "Farmland"
farmyard: "Farmyard"
forest: "Forest"
+ garages: "Garages"
grass: "Grass"
greenfield: "Greenfield Land"
industrial: "Industrial Area"
@@ -639,25 +683,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"
@@ -668,12 +715,19 @@ 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"
+ mountain_pass:
+ "yes" : "Mountain Pass"
natural:
bay: "Bay"
beach: "Beach"
@@ -681,11 +735,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"
@@ -705,6 +760,7 @@ en:
scrub: "Scrub"
shoal: "Shoal"
spring: "Spring"
+ stone: "Stone"
strait: "Strait"
tree: "Tree"
valley: "Valley"
@@ -713,6 +769,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"
@@ -724,9 +793,11 @@ en:
houses: "Houses"
island: "Island"
islet: "Islet"
+ isolated_dwelling: "Isolated Dwelling"
locality: "Locality"
moor: "Moor"
municipality: "Municipality"
+ neighbourhood: "Neighbourhood"
postcode: "Postcode"
region: "Region"
sea: "Sea"
@@ -747,12 +818,15 @@ 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"
preserved: "Preserved Railway"
+ proposed: "Proposed Railway"
spur: "Railway Spur"
station: "Railway Station"
+ stop: "Railway Stop"
subway: "Subway Station"
subway_entrance: "Subway Entrance"
switch: "Railway Points"
@@ -761,17 +835,18 @@ en:
yard: "Railway Yard"
shop:
alcohol: "Off License"
- apparel: "Apparel Shop"
+ antiques: "Antiques"
art: "Art Shop"
bakery: "Bakery"
beauty: "Beauty Shop"
beverages: "Beverages Shop"
bicycle: "Bicycle Shop"
books: "Book Shop"
+ boutique: "Boutique"
butcher: "Butcher"
car: "Car Shop"
- car_dealer: "Car Dealer"
car_parts: "Car Parts"
+ car_repair: "Car Repair"
carpet: "Carpet Shop"
car_repair: "Car Repair"
charity: "Charity Shop"
@@ -782,10 +857,10 @@ en:
convenience: "Convenience Store"
copyshop: "Copy Shop"
cosmetics: "Cosmetics Shop"
+ deli: "Deli"
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"
@@ -819,17 +894,21 @@ en:
organic: "Organic Food Shop"
outdoor: "Outdoor Shop"
pet: "Pet Shop"
+ pharmacy: "Pharmacy"
photo: "Photo Shop"
salon: "Salon"
+ second_hand: "Second-hand Shop"
shoes: "Shoe Shop"
shopping_centre: "Shopping Centre"
sports: "Sports Shop"
stationery: "Stationery Shop"
supermarket: "Supermarket"
+ tailor: "Tailor"
toys: "Toy Shop"
travel_agency: "Travel Agency"
video: "Video Shop"
wine: "Off License"
+ "yes": "Shop"
tourism:
alpine_hut: "Alpine Hut"
artwork: "Artwork"
@@ -851,7 +930,11 @@ en:
valley: "Valley"
viewpoint: "Viewpoint"
zoo: "Zoo"
+ tunnel:
+ culvert: "Culvert"
+ "yes": "Tunnel"
waterway:
+ artificial: "Artificial Waterway"
boatyard: "Boatyard"
canal: "Canal"
connector: "Waterway Connector"
@@ -872,17 +955,22 @@ en:
waterfall: "Waterfall"
water_point: "Water Point"
weir: "Weir"
+ admin_levels:
+ level2: "Country Boundary"
+ level4: "State Boundary"
+ level5: "Region Boundary"
+ level6: "County Boundary"
+ level8: "City Boundary"
+ level9: "Village Boundary"
+ level10: "Suburb Boundary"
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"
@@ -907,11 +995,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
@@ -926,22 +1013,27 @@ en:
view_tooltip: View the map
edit: Edit
history: History
- export: Export
- export_tooltip: Export map data
+ data: Data
+ export_data: Export Data
gps_traces: GPS Traces
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 %{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."
@@ -956,14 +1048,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
@@ -978,115 +1067,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: |
- Copyright and License
-
- 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.
-
-
- How to credit OpenStreetMap
-
- 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.
-
-
- Finding out more
-
- 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 contributors
-
- 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.
-
-
-
-
-
- - Australia: Contains suburb data based
- on Australian Bureau of Statistics data.
- - Austria: Contains data from
- Stadt Wien under
- CC-BY.
- - Canada: Contains data from
- GeoBase®, GeoGratis (© Department of Natural
- Resources Canada), CanVec (© Department of Natural
- Resources Canada), and StatCan (Geography Division,
- Statistics Canada).
- - France: Contains data sourced from
- Direction Générale des Impôts.
- - New Zealand: Contains data sourced from
- Land Information New Zealand. Crown Copyright reserved.
- - Poland: Contains data from UMP-pcPL maps. Copyright
- UMP-pcPL contributors.
- - United Kingdom: Contains Ordnance
- Survey data © Crown copyright and database right
- 2010.
-
-
-
+ 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"
@@ -1097,8 +1180,7 @@ en:
subject_header: "[OpenStreetMap] %{subject}"
hi: "Hi %{to_user},"
header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
- footer1: "You can also read the message at %{readurl}"
- footer2: "and you can reply at %{replyurl}"
+ footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}"
friend_notification:
subject: "[OpenStreetMap] %{user} added you as a friend"
had_added_you: "%{user} has added you as a friend on OpenStreetMap."
@@ -1120,36 +1202,28 @@ 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:"
- the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"
+ the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_guide"
blog_and_twitter: "Catch up with the latest news via the OpenStreetMap blog or Twitter:"
- opengeodata: "OpenGeoData.org is OpenStreetMap founder Steve Coast's blog, and it has podcasts too:"
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}."
more_videos_here: "more videos here"
- get_reading: Get reading about OpenStreetMap on the wiki, catch up with the latest news via the OpenStreetMap blog or Twitter, or browse through OpenStreetMap founder Steve Coast's OpenGeoData blog for the potted history of the project, which has podcasts to listen to also!
+ get_reading: Get reading about OpenStreetMap on the wiki, and catch up with the latest news via the OpenStreetMap blog or Twitter.
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.'
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]].'
@@ -1158,8 +1232,7 @@ en:
subject: "[OpenStreetMap] Confirm your email address"
email_confirm_plain:
greeting: "Hi,"
- hopefully_you_1: "Someone (hopefully you) would like to change their email address over at"
- hopefully_you_2: "%{server_url} to %{new_address}."
+ hopefully_you: "Someone (hopefully you) would like to change their email address over at %{server_url} to %{new_address}."
click_the_link: "If this is you, please click the link below to confirm the change."
email_confirm_html:
greeting: "Hi,"
@@ -1169,19 +1242,43 @@ en:
subject: "[OpenStreetMap] Password reset request"
lost_password_plain:
greeting: "Hi,"
- hopefully_you_1: "Someone (possibly you) has asked for the password to be reset on this"
- hopefully_you_2: "email addresses openstreetmap.org account."
+ hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
click_the_link: "If this is you, please click the link below to reset your password."
lost_password_html:
greeting: "Hi,"
hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
click_the_link: "If this is you, please click the link below to reset your password."
+ note_comment_notification:
+ anonymous: An anonymous user
+ greeting: "Hi,"
+ commented:
+ subject_own: "[OpenStreetMap] %{commenter} has commented on one of your notes"
+ subject_other: "[OpenStreetMap] %{commenter} has commented on a note you are interested in"
+ your_note: "%{commenter} has left a comment on one of your map notes near %{place}."
+ commented_note: "%{commenter} has left a comment on a map note you have commented on. The note is near %{place}."
+ closed:
+ subject_own: "[OpenStreetMap] %{commenter} has resolved one of your notes"
+ subject_other: "[OpenStreetMap] %{commenter} has resolved a note you are interested in"
+ your_note: "%{commenter} has resolved one of your map notes near %{place}."
+ commented_note: "%{commenter} has resolved a map note you have commented on. The note is near %{place}."
+ reopened:
+ subject_own: "[OpenStreetMap] %{commenter} has reactivated one of your notes"
+ subject_other: "[OpenStreetMap] %{commenter} has reactivated a note you are interested in"
+ your_note: "%{commenter} has reactivated one of your map notes near %{place}."
+ commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
+ details: "More details about the note can be found at %{url}."
message:
inbox:
title: "Inbox"
my_inbox: "My inbox"
outbox: "outbox"
- you_have: "You have %{new_count} new messages and %{old_count} old messages"
+ messages: "You have %{new_messages} and %{old_messages}"
+ new_messages:
+ one: "%{count} new message"
+ other: "%{count} new messages"
+ old_messages:
+ one: "%{count} old message"
+ other: "%{count} old messages"
from: "From"
subject: "Subject"
date: "Date"
@@ -1201,10 +1298,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"
@@ -1214,7 +1307,9 @@ en:
my_inbox: "My %{inbox_link}"
inbox: "inbox"
outbox: "outbox"
- you_have_sent_messages: "You have %{count} sent messages"
+ messages:
+ one: "You have %{count} sent message"
+ other: "You have %{count} sent messages"
to: "To"
subject: "Subject"
date: "Date"
@@ -1224,17 +1319,14 @@ en:
wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply."
read:
title: "Read message"
- reading_your_messages: "Reading your messages"
from: "From"
subject: "Subject"
date: "Date"
reply_button: "Reply"
unread_button: "Mark as unread"
- back_to_inbox: "Back to inbox"
- reading_your_sent_messages: "Reading your sent messages"
+ back: "Back"
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:
@@ -1246,14 +1338,12 @@ 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
+ createnote: Add a note
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:
@@ -1267,6 +1357,7 @@ en:
potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)"
potlatch2_not_configured: "Potlatch 2 has not been configured - please see http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for more information"
potlatch2_unsaved_changes: "You have unsaved changes. (To save in Potlatch 2, you should click save.)"
+ id_not_configured: "iD has not been configured"
no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
sidebar:
search_results: Search Results
@@ -1278,8 +1369,6 @@ en:
submit_text: "Go"
search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' more examples..."
key:
- map_key: "Map Key"
- map_key_tooltip: "Key for the map"
table:
entry:
motorway: "Motorway"
@@ -1346,6 +1435,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)"
@@ -1373,10 +1479,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:"
@@ -1392,7 +1494,9 @@ en:
upload_trace: "Upload a trace"
see_all_traces: "See all traces"
see_your_traces: "See your traces"
- traces_waiting: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
+ traces_waiting:
+ one: "You have %{count} trace waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
+ other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
trace_optionals:
tags: "Tags"
view:
@@ -1415,9 +1519,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"
@@ -1438,7 +1542,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:
@@ -1451,6 +1557,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."
@@ -1464,6 +1572,7 @@ en:
allow_write_api: "modify the map."
allow_read_gpx: "read your private GPS traces."
allow_write_gpx: "upload GPS traces."
+ allow_write_notes: "modify notes."
revoke:
flash: "You've revoked the token for %{application}"
oauth_clients:
@@ -1480,8 +1589,10 @@ en:
url: "Request Token URL:"
access_url: "Access Token URL:"
authorize_url: "Authorise URL:"
- support_notice: "We support HMAC-SHA1 (recommended) as well as plain text in ssl mode."
+ support_notice: "We support HMAC-SHA1 (recommended) and RSA-SHA1 signatures."
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."
@@ -1489,6 +1600,7 @@ en:
allow_write_api: "modify the map."
allow_read_gpx: "read their private GPS traces."
allow_write_gpx: "upload GPS traces."
+ allow_write_notes: "modify notes."
index:
title: "My OAuth Details"
my_tokens: "My Authorised Applications"
@@ -1513,6 +1625,7 @@ en:
allow_write_api: "modify the map."
allow_read_gpx: "read their private GPS traces."
allow_write_gpx: "upload GPS traces."
+ allow_write_notes: "modify notes."
not_found:
sorry: "Sorry, that %{type} could not be found."
create:
@@ -1528,20 +1641,19 @@ 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
with username: "Already have an OpenStreetMap account? Please login with your username and password:"
- with openid: "Alternatively please use your OpenID to login:"
+ with openid: "Alternatively, use OpenID to login:"
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.
Please use the link in the account confirmation email to activate your account, or request a new confirmation email."
- account suspended: Sorry, your account has been suspended due to suspicious activity.
Please contact the %{webmaster} if you wish to discuss this.
- webmaster: webmaster
+ account is suspended: Sorry, your account has been suspended due to suspicious activity.
Please contact the webmaster if you wish to discuss this.
auth failure: "Sorry, could not log in with those details."
- notice: "Find out more about OpenStreetMap's upcoming license change (translations) (discussion)"
openid missing provider: "Sorry, could not contact your OpenID provider"
openid invalid: "Sorry, your OpenID seems to be malformed"
openid_logo_alt: "Log in with an OpenID"
@@ -1612,6 +1724,7 @@ en:
continue: Continue
+ flash welcome: "Thanks for signing up. We've sent a welcome message to %{email} with some hints on getting started."
flash create success message: "Thanks for signing up. We've sent a confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.
If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
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."
@@ -1642,7 +1755,9 @@ en:
new diary entry: new diary entry
my edits: my edits
my traces: my traces
+ my notes: my map notes
my settings: my settings
+ my comments: my comments
oauth settings: oauth settings
blocks on me: blocks on me
blocks by me: blocks by me
@@ -1650,8 +1765,9 @@ en:
diary: diary
edits: edits
traces: traces
- remove as friend: remove as friend
- add as friend: add as friend
+ notes: map notes
+ remove as friend: unfriend
+ add as friend: add friend
mapper since: "Mapper since:"
ago: "(%{time_in_words_ago} ago)"
ct status: "Contributor terms:"
@@ -1665,7 +1781,7 @@ en:
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: "Set your home location on the %{settings_link} page to see nearby users."
settings_link_text: settings
your friends: Your friends
no friends: You have not added any friends yet.
@@ -1682,8 +1798,9 @@ en:
revoke:
administrator: "Revoke administrator access"
moderator: "Revoke moderator access"
- block_history: "view blocks received"
- moderator_history: "view blocks given"
+ block_history: "blocks received"
+ moderator_history: "blocks given"
+ comments: "comments"
create_block: "block this user"
activate_user: "activate this user"
deactivate_user: "deactivate this user"
@@ -1692,6 +1809,10 @@ en:
unhide_user: "unhide this user"
delete_user: "delete this user"
confirm: "Confirm"
+ friends_changesets: "friends' changesets"
+ friends_diaries: "friends' diary entries"
+ nearby_changesets: "nearby user changesets"
+ nearby_diaries: "nearby user diary entries"
popup:
your location: "Your location"
nearby mapper: "Nearby mapper"
@@ -1728,6 +1849,10 @@ en:
preferred languages: "Preferred Languages:"
preferred editor: "Preferred Editor:"
image: "Image:"
+ gravatar:
+ gravatar: "Use Gravatar"
+ link: "http://wiki.openstreetmap.org/wiki/Gravatar"
+ link text: "what is this?"
new image: "Add an image"
keep image: "Keep the current image"
delete image: "Remove the current image"
@@ -1766,10 +1891,14 @@ 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."
+ heading: "Add %{user} as a friend?"
+ button: "Add as 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}."
remove_friend:
+ heading: "Unfriend %{user}?"
+ button: "Unfriend"
success: "%{name} was removed from your friends."
not_a_friend: "%{name} is not one of your friends."
filter:
@@ -1778,8 +1907,8 @@ en:
title: Users
heading: Users
showing:
- one: Showing page %{page} (%{first_item} of %{items})
- other: Showing page %{page} (%{first_item}-%{last_item} of %{items})
+ one: Page %{page} (%{first_item} of %{items})
+ other: 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
@@ -1843,7 +1972,6 @@ en:
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:
@@ -1879,6 +2007,9 @@ en:
status: "Status"
revoker_name: "Revoked by"
not_revoked: "(not revoked)"
+ showing_page: "Page %{page}"
+ next: "Next »"
+ previous: "« Previous"
helper:
time_future: "Ends in %{time}."
until_login: "Active until the user logs in."
@@ -1905,16 +2036,79 @@ en:
back: "View all blocks"
revoker: "Revoker:"
needs_view: "The user needs to log in before this block will be cleared."
+ note:
+ description:
+ opened_at_html: "Created %{when} ago"
+ opened_at_by_html: "Created %{when} ago by %{user}"
+ commented_at_html: "Updated %{when} ago"
+ commented_at_by_html: "Updated %{when} ago by %{user}"
+ closed_at_html: "Resolved %{when} ago"
+ closed_at_by_html: "Resolved %{when} ago by %{user}"
+ reopened_at_html: "Reactivated %{when} ago"
+ reopened_at_by_html: "Reactivated %{when} ago by %{user}"
+ rss:
+ title: "OpenStreetMap Notes"
+ description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]"
+ description_item: "An rss feed for note %{id}"
+ opened: "new note (near %{place})"
+ commented: "new comment (near %{place})"
+ closed: "closed note (near %{place})"
+ reopened: "reactivated note (near %{place})"
+ entry:
+ comment: Comment
+ full: Full note
+ mine:
+ title: "Notes submitted or commented on by %{user}"
+ heading: "%{user}'s notes"
+ subheading: "Notes submitted or commented on by %{user}"
+ id: "Id"
+ creator: "Creator"
+ description: "Description"
+ created_at: "Created at"
+ last_changed: "Last changed"
+ ago_html: "%{when} ago"
javascripts:
+ close: Close
+ share:
+ title: "Share"
+ cancel: "Cancel"
+ image: "Image"
+ link: "Link or HTML"
+ long_link: "Link"
+ short_link: "Short Link"
+ embed: "HTML"
+ custom_dimensions: "Set custom dimensions"
+ format: "Format:"
+ scale: "Scale:"
+ image_size: "Image will show standard layer at "
+ download: "Download"
+ short_url: "Short URL"
+ include_marker: "Include marker"
+ center_marker: "Center map on marker"
+ paste_html: "Paste HTML to embed in website"
+ view_larger_map: "View Larger Map"
+ key:
+ title: "Map Key"
+ tooltip: "Map Key"
+ tooltip_disabled: "Map Key available only for Standard layer"
map:
+ zoom:
+ in: Zoom In
+ out: Zoom Out
+ locate:
+ title: Show My Location
+ popup: You are within {distance} {unit} of this point
base:
- mapnik: Mapnik
- osmarender: Osmarender
+ standard: Standard
cycle_map: Cycle Map
transport_map: Transport Map
mapquest: MapQuest Open
- overlays:
- maplint: Maplint
+ layers:
+ header: Map Layers
+ notes: Map Notes
+ data: Map Data
+ overlays: Enable overlays for troubleshooting the map
+ copyright: "© OpenStreetMap contributors"
site:
edit_tooltip: Edit the map
edit_disabled_tooltip: Zoom in to edit the map
@@ -1922,3 +2116,57 @@ 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
+ createnote_tooltip: Add a note to the map
+ createnote_disabled_tooltip: Zoom in to add a note to the map
+ createnote_zoom_alert: You must zoom in to add a note to the map
+ notes:
+ new:
+ intro: "In order to improve the map the information you enter is shown to other mappers, so please be as descriptive and precise as possible when moving the marker to the correct position and entering your note below."
+ add: Add Note
+ show:
+ permalink: Permalink
+ anonymous_warning: This note includes comments from anonymous users which should be independently verified.
+ opened_by: "created by %{user} at %{time}"
+ opened_by_anonymous: "created by anonymous at %{time}"
+ commented_by: "comment from %{user} at %{time}"
+ commented_by_anonymous: "comment from anonymous at %{time}"
+ closed_by: "resolved by %{user} at %{time}"
+ closed_by_anonymous: "resolved by anonymous at %{time}"
+ reopened_by: "reactivated by %{user} at %{time}"
+ reopened_by_anonymous: "reactivated by anonymous at %{time}"
+ hide: Hide
+ resolve: Resolve
+ reactivate: Reactivate
+ comment_and_resolve: Comment & Resolve
+ comment: Comment
+ 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."