X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c0278a01da05d8af7c4aec9eeab37a47f1d3110f..a88da1d71af3a095e5496937e04731ed5d5632fe:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c0dcb0c5b..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."
@@ -571,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?"
@@ -588,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:
@@ -1514,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"
@@ -2292,6 +2289,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)"
@@ -2528,7 +2549,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: |
@@ -2650,15 +2672,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
@@ -2803,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:
@@ -2880,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"
@@ -2903,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}'."