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

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

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index 758a6b38ff9df11b2c72ed3e158e054926a38960..5e516eb11e46cf37bf23adc9b2be49ae607b96b1 100644 (file)
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -23,6 +23,8 @@ sat:
       client_application:
         create: ᱧᱩᱛᱩᱢ ᱚᱞ
         update: ᱦᱟᱹᱞᱤᱭᱟᱹᱜ
+      doorkeeper_application:
+        update: ᱟᱹᱨᱩ ᱯᱷᱮᱨᱟᱣ
       trace:
         create: ᱞᱟᱫᱮ
         update: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱱᱪᱟᱣ ᱢᱮ
@@ -207,6 +209,13 @@ sat:
       area: ᱡᱟᱭᱜᱟ
     index:
       load_more: ᱟᱨᱦᱚᱸ ᱞᱟᱫᱮ ᱢᱮ
+  dashboards:
+    popup:
+      your location: ᱟᱢᱟᱜ ᱡᱟᱭᱜᱟ
+      friend: ᱜᱟᱛᱮ
+    show:
+      my friends: ᱤᱧᱭᱟᱜ ᱜᱟᱛᱮ ᱠᱚ
+      no friends: ᱱᱤᱛ ᱫᱷᱟᱹᱵᱤᱡ ᱢᱤᱛᱴᱮᱱ ᱜᱟᱛᱮᱠᱩ ᱦᱚᱸ ᱵᱟᱢ ᱥᱮᱞᱮᱫ ᱠᱟᱛ ᱠᱚᱣᱟ᱾
   diary_entries:
     new:
       title: ᱱᱟᱶᱟ ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨ
@@ -515,6 +524,11 @@ sat:
       email address: 'ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
     reset_password:
       flash changed: ᱟᱢᱟᱜ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱫᱚ ᱵᱚᱫᱚᱞᱮᱱᱟ ᱾
+  profiles:
+    edit:
+      image: ᱪᱤᱛᱟᱹᱨᱺ
+      new image: ᱢᱤᱫᱴᱮᱱ ᱪᱤᱛᱟᱹᱨ ᱥᱮᱞᱮᱫ ᱢᱮ
+      home location: 'ᱚᱲᱟᱜ ᱡᱟᱭᱜᱟ:'
   sessions:
     new:
       title: ᱵᱚᱞᱚᱜ ᱢᱮ
@@ -531,8 +545,6 @@ sat:
           title: ᱜᱤᱴᱦᱚᱵ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
         wikipedia:
           title: ᱩᱭᱠᱤᱯᱤᱰᱤᱭᱟ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
-        yahoo:
-          title: ᱭᱟᱦᱚ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
     destroy:
       title: ᱩᱰᱩᱜᱚᱜᱢᱮ
       logout_button: ᱩᱰᱩᱜᱚᱜᱢᱮ
@@ -648,14 +660,8 @@ sat:
       status: 'ᱫᱚᱥᱟ:'
       description: ᱵᱤᱵᱨᱚᱱ
       user location: ᱵᱮᱵᱷᱟᱨᱤᱡ-ᱟ ᱡᱟᱭᱜᱟ
-      settings_link_text: ᱥᱟᱡᱟᱣᱠᱚ
-      my friends: ᱤᱧᱭᱟᱜ ᱜᱟᱛᱮ ᱠᱚ
-      no friends: ᱱᱤᱛ ᱫᱷᱟᱹᱵᱤᱡ ᱢᱤᱛᱴᱮᱱ ᱜᱟᱛᱮᱠᱩ ᱦᱚᱸ ᱵᱟᱢ ᱥᱮᱞᱮᱫ ᱠᱟᱛ ᱠᱚᱣᱟ᱾
       comments: ᱚᱠᱛᱟᱠᱚ
       confirm: ᱜᱚᱴᱟᱭ ᱢᱮ
-    popup:
-      your location: ᱟᱢᱟᱜ ᱡᱟᱭᱜᱟ
-      friend: ᱜᱟᱛᱮ
     account:
       title: ᱠᱷᱟᱛᱟ ᱥᱟᱯᱲᱟᱣ ᱢᱮ
       my settings: ᱤᱧᱟᱜ ᱥᱟᱡᱟᱣᱠᱚ
@@ -666,9 +672,6 @@ sat:
         enabled link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
       contributor terms:
         link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
-      image: ᱪᱤᱛᱟᱹᱨᱺ
-      new image: ᱢᱤᱫᱴᱮᱱ ᱪᱤᱛᱟᱹᱨ ᱥᱮᱞᱮᱫ ᱢᱮ
-      home location: 'ᱚᱲᱟᱜ ᱡᱟᱭᱜᱟ:'
       save changes button: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱺᱪᱟᱣ ᱢᱮ
     index:
       title: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ