Ban usernames which match special URLs

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index fe5f58d512cd55d4c4996a68d7421c503c6cbedb..1e8cf19385570c19f0c50a52b108bf969d89ace1 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -180,6 +180,7 @@ en:
       wiki_link:
         key: "The wiki description page for the %{key} tag"
         tag: "The wiki description page for the %{key}=%{value} tag"
+      wikidata_link: "The %{page} item on Wikidata"
       wikipedia_link: "The %{page} article on Wikipedia"
       telephone_link: "Call %{phone_number}"
     note:
@@ -924,6 +925,10 @@ en:
       text: Make a Donation
     learn_more: "Learn More"
     more: More
+    sotm_header: State of the Map 2014
+    sotm_line_1: 8th Annual Conference
+    sotm_line_2: November 7th-9th 2014
+    sotm_line_3: Buenos Aires, Argentina
   license_page:
     foreign:
       title: About this translation
@@ -1644,9 +1649,6 @@ en:
         yahoo:
           title: Login with Yahoo
           alt: Login with a Yahoo OpenID
-        myopenid:
-          title: Login with myOpenID
-          alt: Login with a myOpenID OpenID
         wordpress:
           title: Login with Wordpress
           alt: Login with a Wordpress OpenID