Move OpenID logo out of locale string

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8de8a87213aed0d61b69af9b68fdbdc75a7c10ed..2eaee052e2792d30d58a02af64057bbb53b4003f 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -671,11 +671,8 @@ en:
       title:
         results_from_html: 'Results from %{results_link}'
         latlon: Internal
       title:
         results_from_html: 'Results from %{results_link}'
         latlon: Internal

-        latlon_url: https://openstreetmap.org/

         osm_nominatim: OpenStreetMap Nominatim
         osm_nominatim: OpenStreetMap Nominatim

-        osm_nominatim_url: https://nominatim.openstreetmap.org/

         osm_nominatim_reverse: OpenStreetMap Nominatim
         osm_nominatim_reverse: OpenStreetMap Nominatim

-        osm_nominatim_reverse_url: https://nominatim.openstreetmap.org/

     search_osm_nominatim:
       prefix_format: "%{name}"
       prefix:
     search_osm_nominatim:
       prefix_format: "%{name}"
       prefix:


@@ -840,6 +837,7 @@ en:
           college: "College Building"
           commercial: "Commercial Building"
           construction: "Building under Construction"
           college: "College Building"
           commercial: "Commercial Building"
           construction: "Building under Construction"

+          cowshed: "Cowshed"

           detached: "Detached House"
           dormitory: "Dormitory"
           duplex: "Duplex House"
           detached: "Detached House"
           dormitory: "Dormitory"
           duplex: "Duplex House"


@@ -869,6 +867,7 @@ en:
           shed: "Shed"
           stable: "Stable"
           static_caravan: "Caravan"
           shed: "Shed"
           stable: "Stable"
           static_caravan: "Caravan"

+          sty: "Sty"

           temple: "Temple Building"
           terrace: "Terrace Building"
           train_station: "Train Station Building"
           temple: "Temple Building"
           terrace: "Terrace Building"
           train_station: "Train Station Building"


@@ -2585,32 +2584,26 @@ en:
       muted_users: Muted Users
     auth_providers:
       openid_logo_alt: "Log in with an OpenID"
       muted_users: Muted Users
     auth_providers:
       openid_logo_alt: "Log in with an OpenID"

-      openid_html: "%{logo} OpenID"
+      openid_url: "OpenID URL"

       openid_login_button: "Continue"
       openid:
         title: Log in with OpenID
       openid_login_button: "Continue"
       openid:
         title: Log in with OpenID

-        alt: Log in with an OpenID URL
+        alt: OpenID logo

       google:
         title: Log in with Google
       google:
         title: Log in with Google

-        alt: Log in with a Google OpenID
+        alt: Google logo

       facebook:
         title: Log in with Facebook
       facebook:
         title: Log in with Facebook

-        alt: Log in with a Facebook Account
+        alt: Facebook logo

       microsoft:
         title: Log in with Microsoft
       microsoft:
         title: Log in with Microsoft

-        alt: Log in with a Microsoft Account
+        alt: Microsoft logo

       github:
         title: Log in with GitHub
       github:
         title: Log in with GitHub

-        alt: Log in with a GitHub Account
+        alt: GitHub logo

       wikipedia:
         title: Log in with Wikipedia
       wikipedia:
         title: Log in with Wikipedia

-        alt: Log in with a Wikipedia Account
-      wordpress:
-        title: Log in with Wordpress
-        alt: Log in with a Wordpress OpenID
-      aol:
-        title: Log in with AOL
-        alt: Log in with an AOL OpenID
+        alt: Wikipedia logo

   oauth:
     authorize:
       title: "Authorize access to your account"
   oauth:
     authorize:
       title: "Authorize access to your account"


@@ -2753,17 +2746,22 @@ en:
         welcome: "Welcome to OpenStreetMap"
       duplicate_social_email: "If you already have an OpenStreetMap account and wish to use a 3rd party identity provider, please log in using your password and modify the settings of your account."
       display name description: "Your publicly displayed username. You can change this later in the preferences."
         welcome: "Welcome to OpenStreetMap"
       duplicate_social_email: "If you already have an OpenStreetMap account and wish to use a 3rd party identity provider, please log in using your password and modify the settings of your account."
       display name description: "Your publicly displayed username. You can change this later in the preferences."

-      by_signing_up_html: "By signing up, you agree to our %{tou_link}, %{privacy_policy_link} and %{contributor_terms_link}."
+      by_signing_up:
+        html: "By signing up, you agree to our %{tou_link}, %{privacy_policy_link} and %{contributor_terms_link}."
+        privacy_policy: privacy policy
+        privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy
+        privacy_policy_title: OSMF privacy policy including section on email addresses
+        contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
+        contributor_terms: "contributor terms"

       tou: "terms of use"
       tou: "terms of use"

-      contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
-      contributor_terms: "contributor terms"

       external auth: "Third Party Authentication:"
       continue: Sign Up
       terms accepted: "Thanks for accepting the new contributor terms!"
       external auth: "Third Party Authentication:"
       continue: Sign Up
       terms accepted: "Thanks for accepting the new contributor terms!"

-      email_help_html: 'Your address is not displayed publicly, see our %{privacy_policy_link} for more information.'
-      privacy_policy: privacy policy
-      privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy
-      privacy_policy_title: OSMF privacy policy including section on email addresses
+      email_help:
+        privacy_policy: privacy policy
+        privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy
+        privacy_policy_title: OSMF privacy policy including section on email addresses
+        html: 'Your address is not displayed publicly, see our %{privacy_policy_link} for more information.'

       consider_pd_html: "I consider my contributions to be in the %{consider_pd_link}."
       consider_pd: "public domain"
       consider_pd_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
       consider_pd_html: "I consider my contributions to be in the %{consider_pd_link}."
       consider_pd: "public domain"
       consider_pd_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain