X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dbbb6c0de6ae97e31c449c9a52f39524588efdc8..1fe3fc2dbe21eaa64e30732b95bbb9cea4bf4a89:/config/locales/en.yml?ds=inline
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e463a3f93..a05083a1e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -782,7 +782,6 @@ en:
car_parts: "Car Parts"
car_repair: "Car Repair"
carpet: "Carpet Shop"
- car_repair: "Car Repair"
charity: "Charity Shop"
chemist: "Chemist"
clothes: "Clothes Shop"
@@ -934,12 +933,11 @@ 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"
- partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}."
- partners_ucl: "the UCL VR Centre"
+ partners_html: "Hosting is supported by %{ucl}, %{bytemark} and %{ic}, and other %{partners}."
+ partners_ucl: "UCL"
partners_ic: "Imperial College London"
partners_bytemark: "Bytemark Hosting"
partners_partners: "partners"
- partners_url: "http://wiki.openstreetmap.org/wiki/Partners"
osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
@@ -1013,10 +1011,10 @@ en:
FAQ.
more_2_html: |
Although OpenStreetMap is open data, we cannot provide a
- free-of-charge map API for third-party developers.
- See our API Usage Policy,
- Tile Usage Policy
- and Nominatim Usage Policy.
+ free-of-charge map API for third-parties.
+ See our API Usage Policy,
+ Tile Usage Policy
+ and Nominatim Usage Policy.
contributors_title_html: Our contributors
contributors_intro_html: |
Our contributors are thousands of individuals. We also include
@@ -1226,16 +1224,18 @@ en:
legal_html: |
This site and many other related services are formally operated by the
OpenStreetMap Foundation (OSMF)
- on behalf of the community.
+ on behalf of the community. Use of all OSMF operated services is subject
+ to our
+ Acceptable Use Policies and our Privacy Policy
Please contact the OSMF
if you have licensing, copyright or other legal questions and issues.
partners_title: Partners
notifier:
diary_comment_notification:
- subject: "[OpenStreetMap] %{user} commented on your diary entry"
+ subject: "[OpenStreetMap] %{user} commented on a diary entry"
hi: "Hi %{to_user},"
- header: "%{from_user} has commented on your recent OpenStreetMap diary entry with the subject %{subject}:"
+ header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or reply at %{replyurl}"
message_notification:
subject_header: "[OpenStreetMap] %{subject}"
@@ -1243,6 +1243,7 @@ en:
header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}"
friend_notification:
+ hi: "Hi %{to_user},"
subject: "[OpenStreetMap] %{user} added you as a friend"
had_added_you: "%{user} has added you as a friend on OpenStreetMap."
see_their_profile: "You can see their profile at %{userurl}."
@@ -1308,6 +1309,7 @@ en:
commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
details: "More details about the note can be found at %{url}."
changeset_comment_notification:
+ hi: "Hi %{to_user},"
greeting: "Hi,"
commented:
subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"
@@ -1317,6 +1319,7 @@ en:
partial_changeset_with_comment: "with comment '%{changeset_comment}'"
partial_changeset_without_comment: "without comment"
details: "More details about the changeset can be found at %{url}."
+ unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
message:
inbox:
title: "Inbox"
@@ -1374,6 +1377,7 @@ en:
date: "Date"
reply_button: "Reply"
unread_button: "Mark as unread"
+ delete_button: "Delete"
back: "Back"
to: "To"
wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
@@ -1433,6 +1437,9 @@ en:
track: "Track"
bridleway: "Bridleway"
cycleway: "Cycleway"
+ cycleway_national: "National cycleway"
+ cycleway_regional: "Regional cycleway"
+ cycleway_local: "Local cycleway"
footway: "Footway"
rail: "Railway"
subway: "Subway"
@@ -1485,6 +1492,9 @@ en:
private: "Private access"
destination: "Destination access"
construction: "Roads under construction"
+ bicycle_shop: "Bicycle shop"
+ bicycle_parking: "Bicycle parking"
+ toilets: "Toilets"
richtext_area:
edit: Edit
preview: Preview
@@ -1617,6 +1627,7 @@ en:
require_moderator:
not_a_moderator: "You need to be a moderator 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: "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."
oauth:
@@ -1642,6 +1653,8 @@ en:
invalid: "The authorization token is not valid."
revoke:
flash: "You've revoked the token for %{application}"
+ permissions:
+ missing: "You have not permitted the application access to this facility"
oauth_clients:
new:
title: "Register a new application"
@@ -1735,6 +1748,12 @@ en:
windowslive:
title: Login with Windows Live
alt: Login with a Windows Live Account
+ github:
+ title: Login with GitHub
+ alt: Login with a GitHub Account
+ wikipedia:
+ title: Login with Wikipedia
+ alt: Login with a Wikipedia Account
yahoo:
title: Login with Yahoo
alt: Login with a Yahoo OpenID
@@ -1777,7 +1796,7 @@ en:
license_agreement: 'When you confirm your account you will need to agree to the contributor terms.'
email address: "Email Address:"
confirm email address: "Confirm Email Address:"
- not displayed publicly: 'Not displayed publicly (see privacy policy)'
+ not displayed publicly: 'Your address is not displayed publicly, see our privacy policy for more information'
display name: "Display Name:"
display name description: "Your publicly displayed username. You can change this later in the preferences."
external auth: "Third Party Authentication:"
@@ -1916,6 +1935,8 @@ en:
gravatar: "Use Gravatar"
link: "http://wiki.openstreetmap.org/wiki/Gravatar"
link text: "what is this?"
+ disabled: "Gravatar has been disabled."
+ enabled: "Display of your Gravatar has been enabled."
new image: "Add an image"
keep image: "Keep the current image"
delete image: "Remove the current image"
@@ -2095,6 +2116,7 @@ en:
helper:
time_future: "Ends in %{time}."
until_login: "Active until the user logs in."
+ time_future_and_until_login: "Ends in %{time} and after the user has logged in."
time_past: "Ended %{time} ago."
blocks_on:
title: "Blocks on %{name}"
@@ -2178,7 +2200,7 @@ en:
key:
title: "Map Key"
tooltip: "Map Key"
- tooltip_disabled: "Map Key available only for Standard layer"
+ tooltip_disabled: "Map Key not available for this layer"
map:
zoom:
in: Zoom In
@@ -2190,12 +2212,12 @@ en:
standard: Standard
cycle_map: Cycle Map
transport_map: Transport Map
- mapquest: MapQuest Open
hot: Humanitarian
layers:
header: Map Layers
notes: Map Notes
data: Map Data
+ gps: Public GPS Traces
overlays: Enable overlays for troubleshooting the map
title: "Layers"
copyright: "© OpenStreetMap contributors"
@@ -2229,8 +2251,10 @@ en:
comment: Comment
edit_help: Move the map and zoom in on a location you want to edit, then click here.
directions:
+ ascend: "Ascend"
engines:
graphhopper_bicycle: "Bicycle (GraphHopper)"
+ graphhopper_car: "Car (GraphHopper)"
graphhopper_foot: "Foot (GraphHopper)"
mapquest_bicycle: "Bicycle (MapQuest)"
mapquest_car: "Car (MapQuest)"
@@ -2239,6 +2263,7 @@ en:
mapzen_bicycle: "Bicycle (Mapzen)"
mapzen_car: "Car (Mapzen)"
mapzen_foot: "Foot (Mapzen)"
+ descend: "Descend"
directions: "Directions"
distance: "Distance"
errors:
@@ -2247,11 +2272,21 @@ en:
instructions:
continue_without_exit: Continue on %{name}
slight_right_without_exit: Slight right onto %{name}
+ offramp_right_without_exit: Take the ramp on the right onto %{name}
+ onramp_right_without_exit: Turn right on the ramp onto %{name}
+ endofroad_right_without_exit: At the end of the road turn right onto %{name}
+ merge_right_without_exit: Merge right onto %{name}
+ fork_right_without_exit: At the fork turn right onto %{name}
turn_right_without_exit: Turn right onto %{name}
sharp_right_without_exit: Sharp right onto %{name}
uturn_without_exit: U-turn along %{name}
sharp_left_without_exit: Sharp left onto %{name}
turn_left_without_exit: Turn left onto %{name}
+ offramp_left_without_exit: Take the ramp on the left onto %{name}
+ onramp_left_without_exit: Turn left on the ramp onto %{name}
+ endofroad_left_without_exit: At the end of the road turn left onto %{name}
+ merge_left_without_exit: Merge left onto %{name}
+ fork_left_without_exit: At the fork turn left onto %{name}
slight_left_without_exit: Slight left onto %{name}
via_point_without_exit: (via point)
follow_without_exit: Follow %{name}
@@ -2263,6 +2298,11 @@ en:
against_oneway_without_exit: Go against one-way on %{name}
end_oneway_without_exit: End of one-way on %{name}
roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
+ turn_left_with_exit: At roundabout turn left onto %{name}
+ slight_left_with_exit: At roundabout slight left onto %{name}
+ turn_right_with_exit: At roundabout turn right onto %{name}
+ slight_right_with_exit: At roundabout slight right onto %{name}
+ continue_with_exit: At roundabout continue straight onto %{name}
unnamed: "unnamed road"
courtesy: "Directions courtesy of %{link}"
time: "Time"
@@ -2273,6 +2313,13 @@ en:
nothing_found: No features found
error: "Error contacting %{server}: %{error}"
timeout: "Timeout contacting %{server}"
+ context:
+ directions_from: Directions from here
+ directions_to: Directions to here
+ add_note: Add a note here
+ show_address: Show address
+ query_features: Query features
+ centre_map: Centre map here
redaction:
edit:
description: "Description"