Added fixes for rubocop complaints

[rails.git] / config / locales / en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e65aba5bc26530528097be0308ee54f43fa4a8e3..321821d02cb67c5ff790135a0c838165e64a3bea 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1083,7 +1083,7 @@ en:
         <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
       trademarks_title_html: <span id="trademarks"></span>Trademarks
       trademarks_1_html: |
         <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 magnifying 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>.
+        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 <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence Working Group</a>.

   welcome_page:
     title: Welcome!
     introduction_html: |
   welcome_page:
     title: Welcome!
     introduction_html: |


@@ -1735,6 +1735,9 @@ en:
         windowslive:
           title: Login with Windows Live
           alt: Login with a Windows Live 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

         yahoo:
           title: Login with Yahoo
           alt: Login with a Yahoo OpenID
         yahoo:
           title: Login with Yahoo
           alt: Login with a Yahoo OpenID


@@ -2190,7 +2193,6 @@ en:
         standard: Standard
         cycle_map: Cycle Map
         transport_map: Transport Map
         standard: Standard
         cycle_map: Cycle Map
         transport_map: Transport Map

-        mapquest: MapQuest Open

         hot: Humanitarian
       layers:
         header: Map Layers
         hot: Humanitarian
       layers:
         header: Map Layers