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

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

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index d7ddb9aba1d08f192e91e3edda310e1324bcb4a8..476164612ba7c3684ce88cd185e9a7be701682be 100644 (file)
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -483,6 +483,12 @@ sat:
       text: ᱫᱟᱱ ᱮᱢᱢᱮ
     learn_more: ᱟᱨᱦᱚᱸ ᱪᱤᱫᱢᱮ
     more: ᱵᱟᱹᱲᱛᱤ
       text: ᱫᱟᱱ ᱮᱢᱢᱮ
     learn_more: ᱟᱨᱦᱚᱸ ᱪᱤᱫᱢᱮ
     more: ᱵᱟᱹᱲᱛᱤ

+  confirmations:
+    confirm:
+      heading: ᱟᱢᱟᱜ ᱤᱢᱮᱞ ᱡᱟᱸᱪ ᱛᱟᱢ!
+      button: ᱜᱚᱴᱟᱭ ᱢᱮ
+    confirm_email:
+      button: ᱜᱚᱴᱟᱭ ᱢᱮ

   messages:
     inbox:
       subject: ᱵᱤᱥᱚᱭ
   messages:
     inbox:
       subject: ᱵᱤᱥᱚᱭ


@@ -503,6 +509,12 @@ sat:
       back: ᱛᱟᱭᱚᱢ
     sent_message_summary:
       destroy_button: ᱜᱮᱫ ᱜᱤᱰᱤ
       back: ᱛᱟᱭᱚᱢ
     sent_message_summary:
       destroy_button: ᱜᱮᱫ ᱜᱤᱰᱤ

+  passwords:
+    lost_password:
+      title: ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱫ ᱠᱮᱫᱟᱢ
+      email address: 'ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
+    reset_password:
+      flash changed: ᱟᱢᱟᱜ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱫᱚ ᱵᱚᱫᱚᱞᱮᱱᱟ ᱾

   sessions:
     new:
       title: ᱵᱚᱞᱚᱜ ᱢᱮ
   sessions:
     new:
       title: ᱵᱚᱞᱚᱜ ᱢᱮ


@@ -519,8 +531,6 @@ sat:
           title: ᱜᱤᱴᱦᱚᱵ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
         wikipedia:
           title: ᱩᱭᱠᱤᱯᱤᱰᱤᱭᱟ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
           title: ᱜᱤᱴᱦᱚᱵ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
         wikipedia:
           title: ᱩᱭᱠᱤᱯᱤᱰᱤᱭᱟ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ

-        yahoo:
-          title: ᱭᱟᱦᱚ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ

     destroy:
       title: ᱩᱰᱩᱜᱚᱜᱢᱮ
       logout_button: ᱩᱰᱩᱜᱚᱜᱢᱮ
     destroy:
       title: ᱩᱰᱩᱜᱚᱜᱢᱮ
       logout_button: ᱩᱰᱩᱜᱚᱜᱢᱮ


@@ -610,11 +620,6 @@ sat:
     index:
       application: ᱟᱹᱨᱡᱤ ᱥᱟᱠᱟᱢ ᱧᱩᱛᱩᱢ
   users:
     index:
       application: ᱟᱹᱨᱡᱤ ᱥᱟᱠᱟᱢ ᱧᱩᱛᱩᱢ
   users:

-    lost_password:
-      title: ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱫ ᱠᱮᱫᱟᱢ
-      email address: 'ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
-    reset_password:
-      flash changed: ᱟᱢᱟᱜ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱫᱚ ᱵᱚᱫᱚᱞᱮᱱᱟ ᱾

     new:
       title: ᱧᱩᱛᱩᱢ ᱚᱞ
       email address: 'ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
     new:
       title: ᱧᱩᱛᱩᱢ ᱚᱞ
       email address: 'ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'


@@ -663,11 +668,6 @@ sat:
       new image: ᱢᱤᱫᱴᱮᱱ ᱪᱤᱛᱟᱹᱨ ᱥᱮᱞᱮᱫ ᱢᱮ
       home location: 'ᱚᱲᱟᱜ ᱡᱟᱭᱜᱟ:'
       save changes button: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱺᱪᱟᱣ ᱢᱮ
       new image: ᱢᱤᱫᱴᱮᱱ ᱪᱤᱛᱟᱹᱨ ᱥᱮᱞᱮᱫ ᱢᱮ
       home location: 'ᱚᱲᱟᱜ ᱡᱟᱭᱜᱟ:'
       save changes button: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱺᱪᱟᱣ ᱢᱮ

-    confirm:
-      heading: ᱟᱢᱟᱜ ᱤᱢᱮᱞ ᱡᱟᱸᱪ ᱛᱟᱢ!
-      button: ᱜᱚᱴᱟᱭ ᱢᱮ
-    confirm_email:
-      button: ᱜᱚᱴᱟᱭ ᱢᱮ

     index:
       title: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
       heading: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
     index:
       title: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
       heading: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ