X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7d2206393bf6cc83bf8bf05197446276c026a2b2..a88da1d71af3a095e5496937e04731ed5d5632fe:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 55bd1c0a8..40eb533a2 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:
@@ -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
@@ -405,24 +406,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."
@@ -446,6 +430,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."
@@ -570,6 +555,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?"
@@ -587,11 +587,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:
@@ -1513,6 +1510,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"
@@ -1782,7 +1780,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:
@@ -1814,6 +1811,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
@@ -1913,13 +1914,13 @@ en:
- 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 @@ -2799,6 +2819,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: @@ -2876,19 +2928,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 - report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}. For all other problems with the note, please resolve it yourself with a comment." edit_help: Move the map and zoom in on a location you want to edit, then click here. directions: ascend: "Ascend" @@ -2899,9 +2938,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}'."