X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fa3ccdfd49bf62737d163fe3a637939f291b7815..1729a680ac24bcf9fc45b97abe0228e41305bd57:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a5c2f6453..ffb22bd60 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -759,7 +759,7 @@ en:
spur: "Railway Spur"
station: "Railway Station"
stop: "Railway Stop"
- subway: "Subway Station"
+ subway: "Subway"
subway_entrance: "Subway Entrance"
switch: "Railway Points"
tram: "Tramway"
@@ -902,19 +902,6 @@ en:
results:
no_results: "No results found"
more_results: "More results"
- distance:
- zero: "less than 1km"
- one: "about 1km"
- other: "about %{count}km"
- direction:
- south_west: "south-west"
- south: "south"
- south_east: "south-east"
- east: "east"
- north_east: "north-east"
- north: "north"
- north_west: "north-west"
- west: "west"
layouts:
project_name:
# in
@@ -966,6 +953,9 @@ en:
text: Make a Donation
learn_more: "Learn More"
more: More
+ donate_done_header: Thank You
+ donate_done_line_1: We hit our fundraising target!
+ donate_line_3: Hardware Funding Drive 2015
license_page:
foreign:
title: About this translation
@@ -979,9 +969,10 @@ 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).
+ Commons Open Database License (ODbL) by the OpenStreetMap Foundation (OSMF).
intro_2_html: |
You are free to copy, distribute, transmit and adapt our data,
as long as you credit OpenStreetMap and its
@@ -1017,6 +1008,7 @@ en:
more_title_html: Finding out more
more_1_html: |
Read more about using our data, and how to credit us, at the OSMF Licence page and the community Legal
FAQ.
more_2_html: |
@@ -1056,6 +1048,11 @@ en:
contributors_nz_html: |
New Zealand: Contains data sourced from
Land Information New Zealand. Crown Copyright reserved.
+ contributors_si_html: |
+ Slovenia: Contains data from the
+ Surveying and Mapping Authority and
+ Ministry of Agriculture, Forestry and Food
+ (public information of Slovenia).
contributors_za_html: |
South Africa: Contains data sourced from
Chief Directorate:
@@ -1084,6 +1081,9 @@ en:
to our takedown
procedure or file directly at our
on-line filing page.
+ trademarks_title_html: Trademarks
+ trademarks_1_html: |
+ OpenStreetMap and the looking glass logo 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: |
@@ -1113,6 +1113,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: |
@@ -1158,10 +1166,30 @@ en:
url: /welcome
title: Welcome to OSM
description: Start with this quick guide covering the OpenStreetMap basics.
+ beginners_guide:
+ url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide
+ title: Beginners' Guide
+ description: Community maintained guide for beginners.
help:
url: https://help.openstreetmap.org/
title: help.openstreetmap.org
description: Ask a question or look up answers on OSM's question-and-answer site.
+ mailing_lists:
+ url: http://lists.openstreetmap.org/
+ title: Mailing Lists
+ description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists.
+ forums:
+ url: http://forum.openstreetmap.org/
+ title: Forums
+ 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
@@ -1194,6 +1222,14 @@ en:
build upon the data in certain ways, you may distribute the result only
under the same licence. See the Copyright and
License page for details.
+ legal_title: Legal
+ legal_html: |
+ This site and many other related services are formally operated by the
+ OpenStreetMap Foundation (OSMF)
+ on behalf of the community.
+
+ Please contact the OSMF
+ if you have licensing, copyright or other legal questions and issues.
partners_title: Partners
notifier:
diary_comment_notification:
@@ -1380,8 +1416,6 @@ en:
search: Search
get_directions: "Get directions"
get_directions_title: "Find directions between two points"
- close_directions: "Close directions"
- close_directions_title: "Close the directions panel"
from: "From"
to: "To"
where_am_i: "Where am I?"
@@ -1697,6 +1731,12 @@ 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
yahoo:
title: Login with Yahoo
alt: Login with a Yahoo OpenID
@@ -1910,6 +1950,7 @@ en:
Confirm your account by clicking on the link in the email and you'll be able to start mapping.
press confirm button: "Press the confirm button below to activate your account."
button: Confirm
+ success: "Confirmed your account, thanks for signing up!"
already active: "This account has already been confirmed."
unknown token: "That confirmation code has expired or does not exist."
reconfirm_html: "If you need us to resend the confirmation email, click here."
@@ -1920,8 +1961,9 @@ en:
heading: Confirm a change of email address
press confirm button: "Press the confirm button below to confirm your new email address."
button: Confirm
- success: "Confirmed your email address, thanks for signing up!"
+ success: "Confirmed your change of email address!"
failure: "An email address has already been confirmed with this token."
+ unknown_token: "That confirmation code has expired or does not exist."
set_home:
flash success: "Home location saved successfully"
go_public:
@@ -1966,6 +2008,9 @@ en:
auth_failure:
connection_failed: Connection to authentication provider failed
invalid_credentials: Invalid authentication credentials
+ no_authorization_code: No authorization code
+ unknown_signature_algorithm: Unknown signature algorithm
+ invalid_scope: Invalid scope
user_role:
filter:
not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."
@@ -2066,6 +2111,8 @@ en:
heading: "%{block_on} blocked by %{block_by}"
time_future: "Ends in %{time}"
time_past: "Ended %{time} ago"
+ created: "Created"
+ ago: "%{time} ago"
status: "Status"
show: "Show"
edit: "Edit"
@@ -2115,6 +2162,7 @@ en:
link: "Link or HTML"
long_link: "Link"
short_link: "Short Link"
+ geo_uri: "Geo URI"
embed: "HTML"
custom_dimensions: "Set custom dimensions"
format: "Format:"
@@ -2193,25 +2241,25 @@ en:
no_route: "Couldn't find a route between those two places."
no_place: "Sorry - couldn't find that place."
instructions:
- continue_on: Continue on
- slight_right: Slight right onto
- turn_right: Turn right onto
- sharp_right: Sharp right onto
- uturn: U-turn along
- sharp_left: Sharp left onto
- turn_left: Turn left onto
- slight_left: Slight left onto
+ continue_on: Continue on %{name}
+ slight_right: Slight right onto %{name}
+ turn_right: Turn right onto %{name}
+ sharp_right: Sharp right onto %{name}
+ uturn: U-turn along %{name}
+ sharp_left: Sharp left onto %{name}
+ turn_left: Turn left onto %{name}
+ slight_left: Slight left onto %{name}
via_point: (via point)
- follow: Follow
- roundabout: At roundabout take
- leave_roundabout: Leave roundabout -
- stay_roundabout: Stay on roundabout -
- start: Start at end of
+ follow: Follow %{name}
+ roundabout: At roundabout take %{name}
+ leave_roundabout: Leave roundabout - %{name}
+ stay_roundabout: Stay on roundabout - %{name}
+ start: Start at end of %{name}
destination: Reach destination
- against_oneway: Go against one-way on
- end_oneway: End of one-way on
- exit: exit %{exit}
- unnamed: "(unnamed)"
+ against_oneway: Go against one-way on %{name}
+ end_oneway: End of one-way on %{name}
+ roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
+ unnamed: "unnamed road"
courtesy: "Directions courtesy of %{link}"
time: "Time"
query: