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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 9c5178113d8e13faae35c835c50407f0a60efcf8..68fd336e28962e4534877baaad8570ef57e5afcf 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -830,6 +830,37 @@ 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'

+  sessions:
+    new:
+      auth_providers:
+        google:
+          title: Login wi Google
+          alt: Login wi a Google OpenID
+        facebook:
+          title: Login wi Facebook
+          alt: Login wi a Facebook Accoont
+        windowslive:
+          title: Login wi Windows Live
+          alt: Login wi a Windows Live Accoont
+        github:
+          title: Login wi GitHub
+          alt: Login wi a GitHub Account
+        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
+        aol:
+          title: Login wi AOL
+          alt: Login wi an AOL OpenID
+    destroy:
+      title: Logoot
+      heading: Logoot frae OpenStreetMap
+      logout_button: Logoot

   site:
     copyright:
       foreign:
   site:
     copyright:
       foreign:


@@ -1010,10 +1041,6 @@ sco:
           - Schuil
           - varsity
           building: Signeeficant biggin
           - Schuil
           - varsity
           building: Signeeficant biggin

-    richtext_area:
-      edit: Eedit
-    markdown_help:
-      headings: Heidins

     welcome:
       title: Walcome!
       introduction_html: |-
     welcome:
       title: Walcome!
       introduction_html: |-


@@ -1034,36 +1061,6 @@ sco:
     create:
       upload_trace: Uplaid GPS Trace
   users:
     create:
       upload_trace: Uplaid GPS Trace
   users:

-    login:
-      auth_providers:
-        google:
-          title: Login wi Google
-          alt: Login wi a Google OpenID
-        facebook:
-          title: Login wi Facebook
-          alt: Login wi a Facebook Accoont
-        windowslive:
-          title: Login wi Windows Live
-          alt: Login wi a Windows Live Accoont
-        github:
-          title: Login wi GitHub
-          alt: Login wi a GitHub Account
-        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
-        aol:
-          title: Login wi AOL
-          alt: Login wi an AOL OpenID
-    logout:
-      title: Logoot
-      heading: Logoot frae OpenStreetMap
-      logout_button: Logoot

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