X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8c37f47244b7a7501593882d81d79354acdab7f9..46761798797638a4ef8c35b3bf8e5b1ee83e263f:/config/locales/en.yml?ds=inline
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 27e83c0cf..0a6f108e7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -953,6 +953,10 @@ en:
text: Make a Donation
learn_more: "Learn More"
more: More
+ donate_header: Support OpenStreetMap
+ donate_line_1: Bigger Servers for a
+ donate_line_2: Growing OpenStreetMap
+ donate_line_3: Hardware Funding Drive 2015
license_page:
foreign:
title: About this translation
@@ -966,7 +970,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).
@@ -1078,6 +1082,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: |
@@ -1107,6 +1114,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: |
@@ -1717,6 +1732,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
@@ -1988,6 +2009,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."
@@ -2088,6 +2112,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"