Merge remote-tracking branch 'upstream/pull/3235'

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 68fd336e28962e4534877baaad8570ef57e5afcf..b4bf9f1cae9dcbe2015c9ac5ffac201716d41ac1 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -830,6 +830,10 @@ sco:
         subject_own: '[OpenStreetMap] %{commenter} haes commentit on ane o yer notes'
         subject_other: '[OpenStreetMap] %{commenter} haes commentit on a note ye are
           interestit in'
         subject_own: '[OpenStreetMap] %{commenter} haes commentit on ane o yer notes'
         subject_other: '[OpenStreetMap] %{commenter} haes commentit on a note ye are
           interestit in'

+  passwords:
+    lost_password:
+      title: Lost password
+      heading: Forgotten Passwird?

   sessions:
     new:
       auth_providers:
   sessions:
     new:
       auth_providers:


@@ -848,9 +852,6 @@ sco:
         wikipedia:
           title: Login wi Wikipedia
           alt: Login wi a Wikipedia Accoont
         wikipedia:
           title: Login wi Wikipedia
           alt: Login wi a Wikipedia Accoont

-        yahoo:
-          title: Login wi Yahoo
-          alt: Login wi a Yahoo OpenID

         wordpress:
           title: Login wi Wordpress
           alt: Login wi a Wordpress OpenID
         wordpress:
           title: Login wi Wordpress
           alt: Login wi a Wordpress OpenID


@@ -1061,9 +1062,6 @@ sco:
     create:
       upload_trace: Uplaid GPS Trace
   users:
     create:
       upload_trace: Uplaid GPS Trace
   users:

-    lost_password:
-      title: Lost password
-      heading: Forgotten Passwird?

     show:
       edits: Eedits
       created from: 'Creautit frae:'
     show:
       edits: Eedits
       created from: 'Creautit frae:'