X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b2993e3a7913b34dfad7917ba9e3870f8f02b585..0abd8ea78d8ea37f14145c973a523ef53bca84ef:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 12cb1ebd2..55bd1c0a8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -38,7 +38,7 @@ en:
messages:
invalid_email_address: does not appear to be a valid e-mail address
email_address_not_routable: is not routable
- # Translates all the model names, which is used in error handling on the web site
+ # Translates all the model names, which is used in error handling on the website
models:
acl: "Access Control List"
changeset: "Changeset"
@@ -75,8 +75,8 @@ en:
way: "Way"
way_node: "Way Node"
way_tag: "Way Tag"
- # Translates all the model attributes, which is used in error handling on the web site
- # Only the ones that are used on the web site are translated at the moment
+ # Translates all the model attributes, which is used in error handling on the website
+ # Only the ones that are used on the website are translated at the moment
attributes:
client_application:
name: Name (Required)
@@ -109,13 +109,12 @@ en:
trace:
user: "User"
visible: "Visible"
- name: "Name"
+ name: Filename
size: "Size"
latitude: "Latitude"
longitude: "Longitude"
public: "Public"
description: "Description"
- name: Filename
gpx_file: Upload GPX File
visibility: Visibility
tagstring: Tags
@@ -239,6 +238,24 @@ en:
entry:
comment: Comment
full: Full note
+ account:
+ deletions:
+ show:
+ title: Delete My Account
+ warning: Warning! The account deletion process is final, and cannot be reversed.
+ delete_account: Delete Account
+ delete_introduction: "You can delete your OpenStreetMap account using the button below. Please note the following details:"
+ delete_profile: Your profile information, including your avatar, description and home location will be removed.
+ delete_display_name: Your display name will be removed, and can be reused by other accounts.
+ retain_caveats: "However, some information about you will be retained on OpenStreetMap, even after your account is deleted:"
+ retain_edits: Your edits to the map database, if any, will be retained.
+ retain_traces: Your uploaded traces, if any, will be retained.
+ retain_diary_entries: Your diary entries and diary comments, if any, will be retained but hidden from view.
+ retain_notes: Your map notes and note comments, if any, will be retained but hidden from view.
+ retain_changeset_discussions: Your changeset discussions, if any, will be retained.
+ retain_email: Your email address will be retained.
+ confirm_delete: Are you sure?
+ cancel: Cancel
accounts:
edit:
title: "Edit account"
@@ -264,13 +281,16 @@ en:
not yet agreed: "You have not yet agreed to the new Contributor Terms."
review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms."
agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
- link: "https://www.osmfoundation.org/wiki/License/Contributor_Terms"
+ link: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
link text: "what is this?"
save changes button: Save Changes
make edits public button: Make all my edits public
+ delete_account: Delete Account...
update:
success_confirm_needed: "User information updated successfully. Check your email for a note to confirm your new email address."
success: "User information updated successfully."
+ destroy:
+ success: "Account Deleted."
browse:
created: "Created"
closed: "Closed"
@@ -401,7 +421,7 @@ en:
reopened_by_html: "Reactivated by %{user} %{when}"
reopened_by_anonymous_html: "Reactivated by anonymous %{when}"
hidden_by_html: "Hidden by %{user} %{when}"
- report: Report this note
+ report: report this note
coordinates_html: "%{latitude}, %{longitude}"
query:
title: "Query Features"
@@ -589,17 +609,17 @@ en:
aeroway:
aerodrome: "Aerodrome"
airstrip: "Airstrip"
- apron: "Apron"
- gate: "Gate"
+ apron: "Airport Apron"
+ gate: "Airport Gate"
hangar: "Hangar"
helipad: "Helipad"
holding_position: "Holding Position"
- navigationaid: "Aviation Navigation aid"
+ navigationaid: "Aviation Navigation Aid"
parking_position: "Parking Position"
runway: "Runway"
taxilane: "Taxilane"
taxiway: "Taxiway"
- terminal: "Terminal"
+ terminal: "Airport Terminal"
windsock: "Windsock"
amenity:
animal_boarding: "Animal Boarding"
@@ -645,7 +665,7 @@ en:
fire_station: "Fire Station"
food_court: "Food Court"
fountain: "Fountain"
- fuel: "Fuel"
+ fuel: "Filling Station"
gambling: "Gambling"
grave_yard: "Grave Yard"
grit_bin: "Grit Bin"
@@ -654,7 +674,7 @@ en:
ice_cream: "Ice Cream"
internet_cafe: "Internet Cafe"
kindergarten: "Kindergarten"
- language_school: "Language school"
+ language_school: "Language School"
library: "Library"
loading_dock: "Loading Dock"
love_hotel: "Love Hotel"
@@ -773,7 +793,7 @@ en:
"yes": "Building"
club:
scout: "Scout Group Base"
- sport: "Sportsclub"
+ sport: "Sports Club"
"yes": "Club"
craft:
beekeeper: "Beekeeper"
@@ -801,7 +821,6 @@ en:
window_construction: "Window Construction"
winery: "Winery"
"yes": "Craft Shop"
- crossing: "Crossing"
emergency:
access_point: "Access Point"
ambulance_station: "Ambulance Station"
@@ -822,6 +841,7 @@ en:
bus_stop: "Bus Stop"
construction: "Highway under Construction"
corridor: "Corridor"
+ crossing: "Crossing"
cycleway: "Cycle Path"
elevator: "Elevator"
emergency_access_point: "Emergency Access Point"
@@ -910,9 +930,8 @@ en:
brownfield: "Brownfield Land"
cemetery: "Cemetery"
commercial: "Commercial Area"
- conservation: "Conservation"
- construction: "Construction"
- farm: "Farm"
+ conservation: "Conservation Area"
+ construction: "Construction Area"
farmland: "Farmland"
farmyard: "Farmyard"
forest: "Forest"
@@ -933,7 +952,7 @@ en:
reservoir: "Reservoir"
reservoir_watershed: "Reservoir Watershed"
residential: "Residential Area"
- retail: "Retail"
+ retail: "Retail Area"
village_green: "Village Green"
vineyard: "Vineyard"
"yes": "Landuse"
@@ -1207,7 +1226,7 @@ en:
deli: "Deli"
department_store: "Department Store"
discount: "Discount Items Shop"
- doityourself: "Do-It-Yourself"
+ doityourself: "Do-It-Yourself Shop"
dry_cleaning: "Dry Cleaning"
e-cigarette: "E-Cigarette Shop"
electronics: "Electronics Shop"
@@ -1233,7 +1252,7 @@ en:
health_food: "Health Food Store"
hearing_aids: "Hearing Aids"
herbalist: "Herbalist"
- hifi: "Hi-Fi"
+ hifi: "Hi-Fi Shop"
houseware: "Houseware Shop"
ice_cream: "Ice Cream Shop"
interior_decoration: "Interior Decoration"
@@ -1293,7 +1312,7 @@ en:
artwork: "Artwork"
attraction: "Attraction"
bed_and_breakfast: "Bed and Breakfast"
- cabin: "Cabin"
+ cabin: "Tourist Cabin"
camp_pitch: "Camp Pitch"
camp_site: "Camp Site"
caravan_site: "Caravan Site"
@@ -1369,7 +1388,6 @@ en:
last_updated_time_html: "%{time}"
last_updated_time_user_html: "%{time} by %{user}"
link_to_reports: View Reports
- reported_user: Reported User
reports_count:
one: "1 Report"
other: "%{count} Reports"
@@ -1418,6 +1436,7 @@ en:
issue_comments:
create:
comment_created: Your comment was successfully created
+ issue_reassigned: Your comment was created and the issue was reassigned
reports:
new:
title_html: "Report %{link}"
@@ -1817,7 +1836,7 @@ en:
about:
next: Next
copyright_html: ©OpenStreetMap
contributors
- used_by_html: "%{name} provides map data for thousands of web sites, mobile apps, and hardware devices"
+ used_by_html: "%{name} provides map data for thousands of websites, mobile apps, and hardware devices"
lede_text: |
OpenStreetMap is built by a community of mappers that contribute and maintain data
about roads, trails, cafés, railway stations, and much more, all over the world.
@@ -1887,25 +1906,30 @@ en:
Commons Attribution-ShareAlike 2.0 license (CC BY-SA 2.0).
credit_title_html: How to credit OpenStreetMap
credit_1_html: |
- We require that you use the credit “© OpenStreetMap
- contributors”.
+ Where you use OpenStreetMap data, you are required to do the following two things:
credit_2_1_html: |
- You must also make it clear that the data is available under the Open
- Database License. You may do this by linking to
+