X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/17963b4da78c20a03da2dde101ee76a3c7b514ae..c3cc8eb687e92c890a7c4801c262fb2e6c96ef0a:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7dae05c57..71ebd34cf 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)
@@ -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,59 @@ 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?"
+ 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).
- Your email address will not be revealed by becoming public.
- This action cannot be reversed and all new users are now public by default.
"
+ 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
+ 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"
@@ -353,6 +405,7 @@ en:
wikimedia_commons_link: "The %{page} item on Wikimedia Commons"
telephone_link: "Call %{phone_number}"
colour_preview: "Colour %{colour_value} preview"
+ email_link: "Email %{email}"
note:
title: "Note: %{id}"
new_note: "New Note"
@@ -369,7 +422,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"
@@ -394,6 +447,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 +558,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
@@ -555,17 +611,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 +667,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 +676,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 +795,7 @@ en:
"yes": "Building"
club:
scout: "Scout Group Base"
- sport: "Sportsclub"
+ sport: "Sports Club"
"yes": "Club"
craft:
beekeeper: "Beekeeper"
@@ -767,7 +823,6 @@ en:
window_construction: "Window Construction"
winery: "Winery"
"yes": "Craft Shop"
- crossing: "Crossing"
emergency:
access_point: "Access Point"
ambulance_station: "Ambulance Station"
@@ -788,6 +843,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 +883,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 +932,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 +954,7 @@ en:
reservoir: "Reservoir"
reservoir_watershed: "Reservoir Watershed"
residential: "Residential Area"
- retail: "Retail"
+ retail: "Retail Area"
village_green: "Village Green"
vineyard: "Vineyard"
"yes": "Landuse"
@@ -1108,6 +1164,7 @@ en:
"yes": "Place"
railway:
abandoned: "Abandoned Railway"
+ buffer_stop: "Buffer Stop"
construction: "Railway under Construction"
disused: "Disused Railway"
funicular: "Funicular Railway"
@@ -1121,6 +1178,7 @@ en:
platform: "Railway Platform"
preserved: "Preserved Railway"
proposed: "Proposed Railway"
+ rail: "Rail"
spur: "Railway Spur"
station: "Railway Station"
stop: "Railway Stop"
@@ -1129,6 +1187,7 @@ en:
switch: "Railway Points"
tram: "Tramway"
tram_stop: "Tram Stop"
+ turntable: "Turntable"
yard: "Railway Yard"
shop:
agrarian: "Agrarian Shop"
@@ -1169,7 +1228,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"
@@ -1195,7 +1254,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"
@@ -1255,7 +1314,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"
@@ -1331,7 +1390,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"
@@ -1380,6 +1438,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}"
@@ -1456,6 +1515,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"
@@ -1725,7 +1785,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:
@@ -1757,6 +1816,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
@@ -1779,7 +1842,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.
@@ -1849,25 +1912,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
+
+ - Provide credit to OpenStreetMap by displaying our copyright notice.
+ - Make clear that the data is available under the Open Database License.
+
+ credit_3_1_html: |
+ For the copyright notice, we have different requirements on how this should be
+ displayed, depending on how you are using our data. For example, different
+ rules apply on how to show the copyright notice depending on whether you have
+ created a browsable map, a printed map or a static image. Full details on the
+ requirements can be found in the
+ Attribution
+ Guidelines.
+ credit_4_html: |
+ To make clear that the data is available under the Open
+ Database License, you may link 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) and to opendatacommons.org.
- credit_3_1_html: |
- The map tiles in the “standard style” at www.openstreetmap.org are a
- Produced Work by the OpenStreetMap Foundation using OpenStreetMap data
- under the Open Database License. When using this map style, the same attribution is
- required as for the map data.
- credit_4_html: |
- For a browsable electronic map, the credit should appear in the corner of the map.
- For example:
+ In this example, the credit appears in the corner of the map.
attribution_example:
alt: Example of how to attribute OpenStreetMap on a webpage
title: Attribution example
@@ -1954,7 +2022,7 @@ en:
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
+ to our takedown
procedure or file directly at our
on-line filing page.
trademarks_title_html: Trademarks
@@ -2007,7 +2075,7 @@ en:
description: "Extracts for major world cities and their surrounding areas"
other:
title: "Other Sources"
- description: "Additional sources listed on the OpenStreetMap wiki"
+ description: "Additional sources listed on the OpenStreetMap Wiki"
options: "Options"
format: "Format"
scale: "Scale"
@@ -2063,8 +2131,12 @@ en:
description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists.
forums:
url: https://forum.openstreetmap.org/
- title: Forums
+ title: Forums (Legacy)
description: Questions and discussions for those that prefer a bulletin board style interface.
+ community:
+ url: https://community.openstreetmap.org/
+ title: Community forum
+ description: A shared place for conversations about OpenStreetMap.
irc:
url: https://irc.openstreetmap.org/
title: IRC
@@ -2137,6 +2209,7 @@ en:
common:
- Common
- meadow
+ - garden
retail: "Retail area"
industrial: "Industrial area"
commercial: "Commercial area"
@@ -2221,6 +2294,30 @@ en:
Just go to the map and click the note icon:
. This will add a marker to the map, which you can move
by dragging. Add your message, then click save, and other mappers will investigate.
+ communities:
+ title: Communities
+ lede_text: |
+ People from all over the world contribute to or use OpenStreetMap.
+ While many participate as individuals, others have formed communities.
+ These groups come in a range of sizes and represent geographies from small towns to large multi-country regions.
+ They can also be formal or informal.
+ local_chapters:
+ title: Local Chapters
+ about_text: |
+ Local Chapters are country-level or region-level groups that have taken the formal step of
+ establishing not-for-profit legal entities. They represent the area's map and mappers when
+ dealing with local government, business, and media. They have also formed an affiliation
+ with the OpenStreetMap Foundation (OSMF), giving them a link to the legal and copyright
+ governing body.
+ list_text: |
+ The following communities are formally established as Local Chapters:
+ other_groups:
+ title: Other Groups
+ about_html: |
+ There is no need to formally establish a group to the same extent as the Local Chapters.
+ Indeed many groups exist very sucessfully as an informal gathering of people or as a
+ community group. Anyone can set up or join these. Read more on the
+ Communities wiki page.
traces:
visibility:
private: "Private (only shared as anonymous, unordered points)"
@@ -2292,7 +2389,7 @@ en:
in: "in"
index:
public_traces: "Public GPS Traces"
- my_traces: "My GPS Traces"
+ my_gps_traces: "My GPS Traces"
public_traces_from: "Public GPS Traces from %{user}"
description: "Browse recent GPS trace uploads"
tagged_with: " tagged with %{tags}"
@@ -2325,7 +2422,7 @@ en:
require_admin:
not_an_admin: You need to be an admin to perform that action.
setup_user_auth:
- blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. You need to read the message before you will be able to save your edits."
+ blocked_zero_hour: "You have an urgent message on the OpenStreetMap website. You need to read the message before you will be able to save your edits."
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."
settings_menu:
@@ -2457,7 +2554,8 @@ en:
new:
title: "Sign Up"
no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
- contact_support_html: 'Please contact support to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
+ please_contact_support_html: 'Please contact %{support_link} to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
+ support: support
about:
header: Free and editable
html: |
@@ -2484,7 +2582,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"
@@ -2553,41 +2651,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).- Your email address will not be revealed by becoming public.
- This action cannot be reversed and all new users are now public by default.
"
- 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://www.osmfoundation.org/wiki/License/Contributor_Terms"
- link text: "what is this?"
- save changes button: Save Changes
- make edits public button: Make all my edits public
- flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
- flash update success: "User information updated successfully."
set_home:
flash success: "Home location saved successfully"
go_public:
@@ -2607,15 +2677,9 @@ en:
title: Account Suspended
heading: Account Suspended
support: support
- body_html: |
-
- 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
@@ -2849,6 +2913,10 @@ en:
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}."
edit_help: Move the map and zoom in on a location you want to edit, then click here.
directions:
ascend: "Ascend"
@@ -2859,6 +2927,9 @@ 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"