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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index cc0b3b486342fb86804f3074737368a43809866a..fc7e1ed5350cd42408236d4f49a3205426f61dfa 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -4,6 +4,7 @@
 # Author: AmaryllisGardener
 # Author: C1614
 # Author: ChrisFleming
 # Author: AmaryllisGardener
 # Author: C1614
 # Author: ChrisFleming

+# Author: CiphriusKane

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


@@ -203,7 +204,7 @@ sco:
       saved_at: Saved at
       user: Uiser
       comment: Comment
       saved_at: Saved at
       user: Uiser
       comment: Comment

-      area: Aurie
+      area: Area

     index:
       title: Chyngesets
       title_user: Chyngesets bi %{user}
     index:
       title: Chyngesets
       title_user: Chyngesets bi %{user}


@@ -796,7 +797,7 @@ sco:
         subject_other: '[OpenStreetMap] %{commenter} haes commentit on a note ye are
           interestit in'
   passwords:
         subject_other: '[OpenStreetMap] %{commenter} haes commentit on a note ye are
           interestit in'
   passwords:

-    lost_password:
+    new:

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


@@ -808,7 +809,7 @@ sco:
         facebook:
           title: Login wi Facebook
           alt: Login wi a Facebook Accoont
         facebook:
           title: Login wi Facebook
           alt: Login wi a Facebook Accoont

-        windowslive:
+        microsoft:

           title: Login wi Windows Live
           alt: Login wi a Windows Live Accoont
         github:
           title: Login wi Windows Live
           alt: Login wi a Windows Live Accoont
         github:


@@ -853,13 +854,13 @@ sco:
         more_title_html: Findin oot mair
         contributors_title_html: Oor contreibutors
         contributors_intro_html: |-
         more_title_html: Findin oot mair
         contributors_title_html: Oor contreibutors
         contributors_intro_html: |-

-          Oor contreibutors are thoosands o individuals. We an aa include
-          openly-licensed data frae naitional mappin agencies
-          an ither soorces, amang them:
+          Oor contreibutors are thoosands o individuals. We forbye include
+          apenly-licensed data fae naitional mappin agencies
+          an ither soorces, amang thaim:

         infringement_title_html: Copyricht infringement
     export:
       title: Export
         infringement_title_html: Copyricht infringement
     export:
       title: Export

-      area_to_export: Aurie tae Export
+      area_to_export: Area tae Export

       manually_select: Manually select a different aurie
       format_to_export: Format tae Export
       osm_xml_data: OpenStreetMap XML Data
       manually_select: Manually select a different aurie
       format_to_export: Format tae Export
       osm_xml_data: OpenStreetMap XML Data


@@ -922,13 +923,11 @@ sco:
           retail: Retail aurie
           industrial: Industrial aurie
           commercial: Commercial aurie
           retail: Retail aurie
           industrial: Industrial aurie
           commercial: Commercial aurie

-          lake:
-          - Loch
+          lake_only: Loch

           farm: Ferm
           military: Militar aurie
           farm: Ferm
           military: Militar aurie

-          school:
-          - Schuil
-          - varsity
+          school_only: Schuil
+          university: varsity

           building: Signeeficant biggin
     welcome:
       title: Walcome!
           building: Signeeficant biggin
     welcome:
       title: Walcome!


@@ -944,7 +943,7 @@ sco:
   users:
     show:
       edits: Eedits
   users:
     show:
       edits: Eedits

-      created from: 'Creautit frae:'
+      created from: 'Made frae:'

   notes:
     show:
       title: 'Note: %{id}'
   notes:
     show:
       title: 'Note: %{id}'


@@ -987,7 +986,7 @@ sco:
         stay_roundabout_without_exit: Stay on roondaboot - %{name}
         start_without_exit: Stairt at end o %{name}
         destination_without_exit: Reak destination
         stay_roundabout_without_exit: Stay on roondaboot - %{name}
         start_without_exit: Stairt at end o %{name}
         destination_without_exit: Reak destination

-        against_oneway_without_exit: Gae against ane-wey on %{name}
+        against_oneway_without_exit: Gae agin ane-wey on %{name}

         end_oneway_without_exit: End o ane-wey on %{name}
         roundabout_with_exit: At roondaboot tak exit %{exit} ontae %{name}
         unnamed: unnamed road
         end_oneway_without_exit: End o ane-wey on %{name}
         roundabout_with_exit: At roondaboot tak exit %{exit} ontae %{name}
         unnamed: unnamed road