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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 9c5178113d8e13faae35c835c50407f0a60efcf8..7c6b8bd50abfdd735bcf3891c677670f2132224e 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: AmaryllisGardener
+# Author: ChrisFleming
 # Author: John Reid
 # Author: MJL
 ---
@@ -12,7 +13,7 @@ sco:
   helpers:
     submit:
       diary_comment:
-        create: Hain
+        create: Save
   activerecord:
     models:
       acl: Access Control Leet
@@ -89,6 +90,9 @@ sco:
     remote:
       name: Remote Control
       description: Remote Control (JOSM or Merkaartor)
+  accounts:
+    edit:
+      title: Eedit accoont
   browse:
     created: Creatit
     closed: Closed
@@ -136,8 +140,8 @@ sco:
       history_title_html: 'Way History: %{name}'
       nodes: Nodes
       also_part_of_html:
-        one: paurt o way %{related_ways}
-        other: pairt o ways %{related_ways}
+        one: pairt o wey %{related_ways}
+        other: pairt o weys %{related_ways}
     relation:
       title_html: 'Relation: %{name}'
       history_title_html: 'Relation History: %{name}'
@@ -146,7 +150,7 @@ sco:
       entry_role_html: '%{type} %{name} as %{role}'
       type:
         node: Node
-        way: Way
+        way: Wey
         relation: Relation
     containing_relation:
       entry_html: Relation %{relation_name}
@@ -302,7 +306,6 @@ sco:
         title: OpenStreetMap diary entries
         description: Recent diary entries frae uisers o OpenStreetMap
     comments:
-      has_commented_on: '%{display_name} haes commentit on the follaein diary entries'
       post: Post
       when: When
       comment: Comment
@@ -491,7 +494,6 @@ sco:
           commercial: Commercial Aurie
           conservation: Conservation
           construction: Construction
-          farm: Ferm
           farmland: Fermlaund
           farmyard: Fermyard
           forest: Forest
@@ -830,6 +832,38 @@ 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'
+  passwords:
+    lost_password:
+      title: Lost password
+      heading: Forgotten Passwird?
+  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
+        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:
@@ -1010,10 +1044,6 @@ sco:
           - Schuil
           - varsity
           building: Signeeficant biggin
-    richtext_area:
-      edit: Eedit
-    markdown_help:
-      headings: Heidins
     welcome:
       title: Walcome!
       introduction_html: |-
@@ -1034,45 +1064,10 @@ sco:
     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?
     show:
       edits: Eedits
       created from: 'Creautit frae:'
       user location: Uiser location
-    account:
-      title: Eedit accoont
   javascripts:
     notes:
       new: