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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 8fa46657df199284c37aee90b0a3a4cd1a2a15d2..c9d52bed91a8396ba74233f545c3e7fb351e52cd 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
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: AmaryllisGardener

+# Author: ChrisFleming

 # Author: John Reid
 # Author: MJL
 ---
 # Author: John Reid
 # Author: MJL
 ---


@@ -12,7 +13,7 @@ sco:
   helpers:
     submit:
       diary_comment:
   helpers:
     submit:
       diary_comment:

-        create: Hain
+        create: Save

   activerecord:
     models:
       acl: Access Control Leet
   activerecord:
     models:
       acl: Access Control Leet


@@ -136,8 +137,8 @@ sco:
       history_title_html: 'Way History: %{name}'
       nodes: Nodes
       also_part_of_html:
       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}'
     relation:
       title_html: 'Relation: %{name}'
       history_title_html: 'Relation History: %{name}'


@@ -146,7 +147,7 @@ sco:
       entry_role_html: '%{type} %{name} as %{role}'
       type:
         node: Node
       entry_role_html: '%{type} %{name} as %{role}'
       type:
         node: Node

-        way: Way
+        way: Wey

         relation: Relation
     containing_relation:
       entry_html: Relation %{relation_name}
         relation: Relation
     containing_relation:
       entry_html: Relation %{relation_name}


@@ -302,7 +303,6 @@ sco:
         title: OpenStreetMap diary entries
         description: Recent diary entries frae uisers o OpenStreetMap
     comments:
         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
       post: Post
       when: When
       comment: Comment


@@ -852,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