X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5552ae3de2d1a22dc0e1a47cc242fe9142fbb778..1fe3fc2dbe21eaa64e30732b95bbb9cea4bf4a89:/config/locales/en.yml?ds=inline
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4004f41e8..a05083a1e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -162,6 +162,7 @@ en:
way: way
relation: relation
changeset: changeset
+ note: note
timeout:
sorry: "Sorry, the data for the %{type} with the id %{id}, took too long to retrieve."
type:
@@ -169,6 +170,7 @@ en:
way: way
relation: relation
changeset: changeset
+ note: note
redacted:
redaction: "Redaction %{id}"
message_html: "Version %{version} of this %{type} cannot be shown as it has been redacted. Please see %{redaction_link} for details."
@@ -248,6 +250,7 @@ en:
diary_entry:
new:
title: New Diary Entry
+ publish_button: "Publish"
list:
title: "Users' diaries"
title_friends: "Friends' diaries"
@@ -779,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"
@@ -931,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."
@@ -966,7 +967,7 @@ en:
legal_babble:
title_html: Copyright and License
intro_1_html: |
- OpenStreetMap is open data, licensed under the ® is open data, licensed under the Open Data
Commons Open Database License (ODbL) by the OpenStreetMap Foundation (OSMF).
@@ -1010,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
@@ -1078,6 +1079,9 @@ en:
to our takedown
procedure or file directly at our
on-line filing page.
+ trademarks_title_html: Trademarks
+ trademarks_1_html: |
+ OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please send your questions to the Licence Working Group.
welcome_page:
title: Welcome!
introduction_html: |
@@ -1107,6 +1111,14 @@ en:
tag_html: |
A tag is a bit of data about a node or way, like a
restaurant's name or a road's speed limit.
+ rules:
+ title: Rules!
+ paragraph_1_html: |
+ OpenStreetMap has few formal rules but we expect all participants to collaborate
+ with, and communicate with, the community. If you are considering
+ any activities other than editing by hand, please read and follow the guidelines on
+ Imports and
+ Automated Edits.
questions:
title: Any questions?
paragraph_1_html: |
@@ -1167,7 +1179,15 @@ en:
forums:
url: http://forum.openstreetmap.org/
title: Forums
- description: The same as above for those that prefer a bulletin board style interface.
+ description: Questions and discussions for those that prefer a bulletin board style interface.
+ irc:
+ url: http://irc.openstreetmap.org/
+ title: IRC
+ description: Interactive chat in many different languages and on many topics.
+ switch2osm:
+ url: https://switch2osm.org/
+ title: switch2osm
+ description: Help for companies and organisations switching to OpenStreetMap based maps and other services.
wiki:
url: http://wiki.openstreetmap.org/
title: wiki.openstreetmap.org
@@ -1175,7 +1195,7 @@ en:
about_page:
next: Next
copyright_html: ©OpenStreetMap
contributors
- used_by: "%{name} powers map data on hundreds of web sites, mobile apps, and hardware devices"
+ used_by: "%{name} powers map data on thousands of web sites, 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.
@@ -1204,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}"
@@ -1221,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}."
@@ -1286,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"
@@ -1295,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"
@@ -1352,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."
@@ -1403,15 +1429,17 @@ en:
table:
entry:
motorway: "Motorway"
+ main_road: "Main road"
trunk: "Trunk road"
primary: "Primary road"
secondary: "Secondary road"
unclassified: "Unclassified road"
- unsurfaced: "Unsurfaced road"
track: "Track"
- byway: "Byway"
bridleway: "Bridleway"
cycleway: "Cycleway"
+ cycleway_national: "National cycleway"
+ cycleway_regional: "Regional cycleway"
+ cycleway_local: "Local cycleway"
footway: "Footway"
rail: "Railway"
subway: "Subway"
@@ -1433,7 +1461,6 @@ en:
golf: "Golf course"
park: "Park"
resident: "Residential area"
- tourist: "Tourist attraction"
common:
- Common
- meadow
@@ -1463,9 +1490,11 @@ en:
tunnel: "Dashed casing = tunnel"
bridge: "Black casing = bridge"
private: "Private access"
- permissive: "Permissive access"
destination: "Destination access"
construction: "Roads under construction"
+ bicycle_shop: "Bicycle shop"
+ bicycle_parking: "Bicycle parking"
+ toilets: "Toilets"
richtext_area:
edit: Edit
preview: Preview
@@ -1598,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:
@@ -1612,6 +1642,7 @@ en:
allow_read_gpx: "read your private GPS traces."
allow_write_gpx: "upload GPS traces."
allow_write_notes: "modify notes."
+ grant_access: "Grant Access"
oauthorize_success:
title: "Authorization request allowed"
allowed: "You have granted application %{app_name} access to your account."
@@ -1622,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"
@@ -1709,6 +1742,18 @@ en:
google:
title: Login with Google
alt: Login with a Google OpenID
+ facebook:
+ title: Login with Facebook
+ alt: Login with a Facebook Account
+ 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
@@ -1741,7 +1786,7 @@ en:
new:
title: "Sign Up"
no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
- contact_webmaster: 'Please contact the webmaster to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
+ contact_webmaster: 'Please contact the webmaster to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
about:
header: Free and editable
html: |
@@ -1751,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:"
@@ -1759,16 +1804,6 @@ en:
confirm password: "Confirm Password:"
use external auth: "Alternatively, use a third party to login"
auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one."
- auth association: |
-
Your ID is not associated with a OpenStreetMap account yet.
-