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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index ed5d1e5cc7cd8819052acd70b5f127c7ddeb0083..a3b2fda1e1f6541c60d310dd08eba8b226c3f6ce 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -204,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}


@@ -797,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:


@@ -860,7 +860,7 @@ sco:
         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


@@ -916,7 +916,8 @@ sco:
     key:
       table:
         entry:
     key:
       table:
         entry:

-          wood: Wid
+          forest:
+            1: Wid

           golf: Gowf coorse
           park: Pairk
           resident: Residential aurie
           golf: Gowf coorse
           park: Pairk
           resident: Residential aurie


@@ -945,7 +946,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}'


@@ -988,7 +989,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