X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cb7b79a58f0337ab28b41ed5105215de302d3f73..8a8935c8b68269581f48c684d48c2a47cd1f5205:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9f0e42f7a..79be07cb9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -10,7 +10,7 @@ en:
prompt: Choose file
submit:
diary_comment:
- create: Save
+ create: Comment
diary_entry:
create: "Publish"
update: "Update"
@@ -21,7 +21,7 @@ en:
client_application:
create: Register
update: Update
- doorkeeper_application:
+ oauth2_application:
create: Register
update: Update
redaction:
@@ -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)
@@ -95,9 +95,10 @@ en:
diary_entry:
user: "User"
title: "Subject"
+ body: "Body"
latitude: "Latitude"
longitude: "Longitude"
- language: "Language"
+ language_code: "Language"
doorkeeper/application:
name: Name
redirect_uri: Redirect URIs
@@ -109,13 +110,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 +239,65 @@ 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"
+ my settings: My Settings
+ current email address: "Current Email Address"
+ external auth: "External Authentication"
+ openid:
+ link: "https://wiki.openstreetmap.org/wiki/OpenID"
+ link text: "what is this?"
+ public editing:
+ heading: "Public editing"
+ enabled: "Enabled. Not anonymous and can edit data."
+ enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits"
+ enabled link text: "what is this?"
+ disabled: "Disabled and cannot edit data, all previous edits are anonymous."
+ disabled link text: "why can't I edit?"
+ 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: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
+ link text: "what is this?"
+ save changes button: Save Changes
+ delete_account: Delete Account...
+ go_public:
+ heading: "Public editing"
+ currently_not_public: "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."
+ only_public_can_edit: Since the 0.6 API changeover, only public users can edit map data.
+ find_out_why_html: (%{link}).
+ find_out_why: "find out why"
+ find_out_why_url: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+ email_not_revealed: Your email address will not be revealed by becoming public.
+ not_reversible: This action cannot be reversed and all new users are now public by default.
+ make_edits_public_button: Make all my edits public
+ 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"
@@ -353,24 +412,7 @@ en:
wikimedia_commons_link: "The %{page} item on Wikimedia Commons"
telephone_link: "Call %{phone_number}"
colour_preview: "Colour %{colour_value} preview"
- note:
- title: "Note: %{id}"
- new_note: "New Note"
- description: "Description"
- open_title: "Unresolved note #%{note_name}"
- closed_title: "Resolved note #%{note_name}"
- hidden_title: "Hidden note #%{note_name}"
- opened_by_html: "Created by %{user} %{when}"
- opened_by_anonymous_html: "Created by anonymous %{when}"
- commented_by_html: "Comment from %{user} %{when}"
- commented_by_anonymous_html: "Comment from anonymous %{when}"
- closed_by_html: "Resolved by %{user} %{when}"
- closed_by_anonymous_html: "Resolved by anonymous %{when}"
- 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
- coordinates_html: "%{latitude}, %{longitude}"
+ email_link: "Email %{email}"
query:
title: "Query Features"
introduction: "Click on the map to find nearby features."
@@ -394,6 +436,7 @@ en:
index:
title: "Changesets"
title_user: "Changesets by %{user}"
+ title_user_link_html: "Changesets by %{user_link}"
title_friend: "Changesets by my friends"
title_nearby: "Changesets by nearby users"
empty: "No changesets found."
@@ -504,7 +547,9 @@ en:
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"
+ title: "Diary Comments added by %{user}"
+ heading: "%{user}'s Diary Comments"
+ subheading_html: "Diary Comments added by %{user}"
no_comments: "No diary comments"
post: Post
when: When
@@ -516,6 +561,21 @@ en:
applications:
create:
notice: Application Registered.
+ errors:
+ contact:
+ contact_url: https://wiki.openstreetmap.org/wiki/Contact
+ contact_url_title: Various contact channels explained
+ contact: contact
+ contact_the_community_html: Feel free to %{contact_link} the OpenStreetMap community if you have found a broken link / bug. Make a note of the exact URL of your request.
+ forbidden:
+ title: Forbidden
+ description: The operation you requested on the OpenStreetMap server is only available to administrators (HTTP 403)
+ internal_server_error:
+ title: Application error
+ description: The OpenStreetMap server encountered an unexpected condition that prevented it from fulfilling the request (HTTP 500)
+ not_found:
+ title: File not found
+ description: Couldn't find a file/directory/API operation by that name on the OpenStreetMap server (HTTP 404)
friendships:
make_friend:
heading: "Add %{user} as a friend?"
@@ -533,11 +593,8 @@ en:
search:
title:
latlon_html: 'Results from Internal'
- ca_postcode_html: 'Results from Geocoder.CA'
osm_nominatim_html: 'Results from OpenStreetMap Nominatim'
- geonames_html: 'Results from GeoNames'
osm_nominatim_reverse_html: 'Results from OpenStreetMap Nominatim'
- geonames_reverse_html: 'Results from GeoNames'
search_osm_nominatim:
prefix_format: "%{name}"
prefix:
@@ -555,17 +612,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"
@@ -611,7 +668,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"
@@ -620,7 +677,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"
@@ -739,7 +796,7 @@ en:
"yes": "Building"
club:
scout: "Scout Group Base"
- sport: "Sportsclub"
+ sport: "Sports Club"
"yes": "Club"
craft:
beekeeper: "Beekeeper"
@@ -780,7 +837,6 @@ en:
siren: "Emergency Siren"
suction_point: "Emergency Suction Point"
water_tank: "Emergency Water Tank"
- "yes": "Emergency"
highway:
abandoned: "Abandoned Highway"
bridleway: "Bridleway"
@@ -788,6 +844,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"
@@ -827,6 +884,7 @@ en:
trailhead: "Trailhead"
trunk: "Trunk Road"
trunk_link: "Trunk Road"
+ turning_circle: "Turning Circle"
turning_loop: "Turning Loop"
unclassified: "Unclassified Road"
"yes" : "Road"
@@ -875,9 +933,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"
@@ -898,7 +955,7 @@ en:
reservoir: "Reservoir"
reservoir_watershed: "Reservoir Watershed"
residential: "Residential Area"
- retail: "Retail"
+ retail: "Retail Area"
village_green: "Village Green"
vineyard: "Vineyard"
"yes": "Landuse"
@@ -919,7 +976,7 @@ en:
fitness_station: "Fitness Station"
garden: "Garden"
golf_course: "Golf Course"
- horse_riding: "Horse Riding"
+ horse_riding: "Horse Riding Centre"
ice_rink: "Ice Rink"
marina: "Marina"
miniature_golf: "Miniature Golf"
@@ -1022,6 +1079,7 @@ en:
hill: "Hill"
hot_spring: "Hot Spring"
island: "Island"
+ isthmus: "Isthmus"
land: "Land"
marsh: "Marsh"
moor: "Moor"
@@ -1036,10 +1094,13 @@ en:
sand: "Sand"
scree: "Scree"
scrub: "Scrub"
+ shingle: "Shingle"
spring: "Spring"
stone: "Stone"
strait: "Strait"
tree: "Tree"
+ tree_row: "Tree Row"
+ tundra: "Tundra"
valley: "Valley"
volcano: "Volcano"
water: "Water"
@@ -1104,6 +1165,7 @@ en:
"yes": "Place"
railway:
abandoned: "Abandoned Railway"
+ buffer_stop: "Buffer Stop"
construction: "Railway under Construction"
disused: "Disused Railway"
funicular: "Funicular Railway"
@@ -1117,6 +1179,7 @@ en:
platform: "Railway Platform"
preserved: "Preserved Railway"
proposed: "Proposed Railway"
+ rail: "Rail"
spur: "Railway Spur"
station: "Railway Station"
stop: "Railway Stop"
@@ -1125,6 +1188,7 @@ en:
switch: "Railway Points"
tram: "Tramway"
tram_stop: "Tram Stop"
+ turntable: "Turntable"
yard: "Railway Yard"
shop:
agrarian: "Agrarian Shop"
@@ -1165,7 +1229,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"
@@ -1191,7 +1255,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"
@@ -1251,7 +1315,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"
@@ -1327,7 +1391,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"
@@ -1376,6 +1439,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}"
@@ -1440,8 +1504,9 @@ en:
intro_header: Welcome to OpenStreetMap!
intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
intro_2_create_account: "Create a user account"
- hosting_partners_html: "Hosting is supported by %{ucl}, %{bytemark}, and other %{partners}."
+ hosting_partners_html: "Hosting is supported by %{ucl}, %{fastly}, %{bytemark}, and other %{partners}."
partners_ucl: "UCL"
+ partners_fastly: "Fastly"
partners_bytemark: "Bytemark Hosting"
partners_partners: "partners"
tou: "Terms of Use"
@@ -1451,6 +1516,7 @@ en:
help: Help
about: About
copyright: Copyright
+ communities: Communities
community: Community
community_blogs: "Community Blogs"
community_blogs_title: "Blogs from members of the OpenStreetMap community"
@@ -1720,7 +1786,6 @@ en:
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 is suspended: Sorry, your account has been suspended due to suspicious activity.
Please contact support if you wish to discuss this.
auth failure: "Sorry, could not log in with those details."
openid_logo_alt: "Log in with an OpenID"
auth_providers:
@@ -1752,6 +1817,10 @@ en:
title: "Logout"
heading: "Logout from OpenStreetMap"
logout_button: "Logout"
+ suspended_flash:
+ suspended: Sorry, your account has been suspended due to suspicious activity.
+ contact_support_html: Please contact %{support_link} if you wish to discuss this.
+ support: support
shared:
markdown_help:
title_html: Parsed with kramdown
@@ -1774,7 +1843,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.
@@ -1844,26 +1913,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
+
Unlike other maps, OpenStreetMap is completely created by people like you, - and it's free for anyone to fix, update, download and use.
-Sign up to get started contributing. We'll send an email to confirm your account.
+ paragraph_1: Unlike other maps, OpenStreetMap is completely created by people like you, and it's free for anyone to fix, update, download and use. + paragraph_2: Sign up to get started contributing. We'll send an email to confirm your account. email address: "Email Address:" confirm email address: "Confirm Email Address:" display name: "Display Name:" @@ -2473,7 +2601,7 @@ en: read_tou: "I have read and agree to the Terms of Use" consider_pd: "In addition to the above, I consider my contributions to be in the Public Domain" consider_pd_why: "what's this?" - consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain + consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain guidance_html: 'Information to help understand these terms: a human readable summary and some informal translations' continue: Continue declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined" @@ -2542,45 +2670,13 @@ en: activate_user: "Activate this User" deactivate_user: "Deactivate this User" confirm_user: "Confirm this User" + unconfirm_user: "Unconfirm this User" + unsuspend_user: "Unsuspend this User" hide_user: "Hide this User" unhide_user: "Unhide this User" delete_user: "Delete this User" confirm: "Confirm" report: Report this User - account: - title: "Edit account" - my settings: My Settings - current email address: "Current Email Address" - external auth: "External Authentication" - openid: - link: "https://wiki.openstreetmap.org/wiki/OpenID" - link text: "what is this?" - public editing: - heading: "Public editing" - enabled: "Enabled. Not anonymous and can edit data." - enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits" - enabled link text: "what is this?" - disabled: "Disabled and cannot edit data, all previous edits are anonymous." - disabled link text: "why can't I edit?" - public editing note: - heading: "Public editing" - html: "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).- Sorry, your account has been automatically suspended due to - suspicious activity. -
-- This decision will be reviewed by an administrator shortly, or - you may contact %{webmaster} if you wish to discuss this. -
+ automatically_suspended: Sorry, your account has been automatically suspended due to suspicious activity. + contact_support_html: This decision will be reviewed by an administrator shortly, or you may contact %{support_link} if you wish to discuss this. + support: support auth_failure: connection_failed: Connection to authentication provider failed invalid_credentials: Invalid authentication credentials no_authorization_code: No authorization code unknown_signature_algorithm: Unknown signature algorithm invalid_scope: Invalid scope + unknown_error: Authentication failed auth_association: heading: Your ID is not associated with a OpenStreetMap account yet. option_1: | @@ -2752,6 +2843,38 @@ en: description: "Description" created_at: "Created at" last_changed: "Last changed" + show: + title: "Note: %{id}" + description: "Description" + open_title: "Unresolved note #%{note_name}" + closed_title: "Resolved note #%{note_name}" + hidden_title: "Hidden note #%{note_name}" + opened_by_html: "Created by %{user} %{when}" + opened_by_anonymous_html: "Created by anonymous %{when}" + commented_by_html: "Comment from %{user} %{when}" + commented_by_anonymous_html: "Comment from anonymous %{when}" + closed_by_html: "Resolved by %{user} %{when}" + closed_by_anonymous_html: "Resolved by anonymous %{when}" + 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 + coordinates_html: "%{latitude}, %{longitude}" + anonymous_warning: This note includes comments from anonymous users which should be independently verified. + hide: Hide + resolve: Resolve + reactivate: Reactivate + comment_and_resolve: Comment & Resolve + comment: Comment + report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}." + other_problems_resolve: "For all other problems with the note, please resolve it yourself with a comment." + other_problems_resolved: "For all other problems, resolving is sufficient." + disappear_date_html: "This resolved note will disappear from the map in %{disappear_in}." + new: + title: "New Note" + intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem." + advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings." + add: Add Note javascripts: close: Close share: @@ -2829,18 +2952,6 @@ en: unsubscribe: "Unsubscribe" hide_comment: "hide" unhide_comment: "unhide" - notes: - new: - intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem." - advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings." - add: Add Note - show: - anonymous_warning: This note includes comments from anonymous users which should be independently verified. - hide: Hide - resolve: Resolve - reactivate: Reactivate - comment_and_resolve: Comment & Resolve - comment: Comment edit_help: Move the map and zoom in on a location you want to edit, then click here. directions: ascend: "Ascend" @@ -2851,9 +2962,14 @@ en: graphhopper_bicycle: "Bicycle (GraphHopper)" graphhopper_car: "Car (GraphHopper)" graphhopper_foot: "Foot (GraphHopper)" + fossgis_valhalla_bicycle: "Bicycle (Valhalla)" + fossgis_valhalla_car: "Car (Valhalla)" + fossgis_valhalla_foot: "Foot (Valhalla)" descend: "Descend" directions: "Directions" distance: "Distance" + distance_m: "%{distance}m" + distance_km: "%{distance}km" errors: no_route: "Couldn't find a route between those two places." no_place: "Sorry - couldn't locate '%{place}'."