X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8c37f47244b7a7501593882d81d79354acdab7f9..2b2264ddab13ee8ffa7e90d8b803d1a0296a7cff:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 27e83c0cf..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 <i>open data</i>, licensed under the <a
+        OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> is <i>open data</i>, licensed under the <a
         href="http://opendatacommons.org/licenses/odbl/">Open Data
         Commons Open Database License</a> (ODbL) by the  <a
         href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
@@ -1078,6 +1078,9 @@ en:
         to our <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
         procedure</a> or file directly at our
         <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
+      trademarks_title_html: <span id="trademarks"></span>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 <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence Working Group</a>.
   welcome_page:
     title: Welcome!
     introduction_html: |
@@ -1717,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
@@ -1988,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."