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 a3b2fda1e1f6541c60d310dd08eba8b226c3f6ce..fc7e1ed5350cd42408236d4f49a3205426f61dfa 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -916,21 +916,18 @@ sco:
     key:
       table:
         entry:
     key:
       table:
         entry:

-          forest:
-            1: Wid
+          wood: Wid

           golf: Gowf coorse
           park: Pairk
           resident: Residential aurie
           retail: Retail aurie
           industrial: Industrial aurie
           commercial: Commercial aurie
           golf: Gowf coorse
           park: Pairk
           resident: Residential 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!