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

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

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index c48c8e850a534f8dd36a6b33c14757fa2e33d800..bea210681861c12750b227d2003048ac8a22a571 100644 (file)
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -521,10 +521,10 @@ sat:
     sent_message_summary:
       destroy_button: ᱜᱮᱫ ᱜᱤᱰᱤ
   passwords:
-    lost_password:
+    new:
       title: ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱫ ᱠᱮᱫᱟᱢ
       email address: 'ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
-    reset_password:
+    update:
       flash changed: ᱟᱢᱟᱜ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱫᱚ ᱵᱚᱫᱚᱞᱮᱱᱟ ᱾
   profiles:
     edit:
@@ -586,8 +586,9 @@ sat:
       table:
         entry:
           footway: ᱛᱟᱲᱟᱢᱦᱚᱨ
-          forest: ᱵᱤᱨ
-          wood: ᱠᱟᱴᱷ
+          forest:
+          - ᱵᱤᱨ
+          - ᱠᱟᱴᱷ
           park: ᱵᱟᱜᱟᱱ
           school:
           - ᱤᱛᱩᱱ ᱟᱥᱲᱟ