X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5552ae3de2d1a22dc0e1a47cc242fe9142fbb778..2b2264ddab13ee8ffa7e90d8b803d1a0296a7cff:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4004f41e8..531c70f46 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -966,7 +966,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 +1078,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: |
@@ -1167,7 +1170,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
@@ -1709,6 +1720,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
@@ -1980,6 +1997,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."