]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/sat.yml
Merge remote-tracking branch 'upstream/pull/3758'
[rails.git] / config / locales / sat.yml
index 476164612ba7c3684ce88cd185e9a7be701682be..4b692b53eab5ff36a9089dc1a48b2e34a8929c2b 100644 (file)
@@ -23,6 +23,8 @@ sat:
       client_application:
         create: ᱧᱩᱛᱩᱢ ᱚᱞ
         update: ᱦᱟᱹᱞᱤᱭᱟᱹᱜ
+      doorkeeper_application:
+        update: ᱟᱹᱨᱩ ᱯᱷᱮᱨᱟᱣ
       trace:
         create: ᱞᱟᱫᱮ
         update: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱱᱪᱟᱣ ᱢᱮ
@@ -68,6 +70,8 @@ sat:
         latitude: ᱚᱠᱷᱟᱝᱥᱚ
         longitude: ᱫᱨᱟᱜᱷᱤᱢᱟᱝᱥᱚ
         language: ᱯᱟᱹᱨᱥᱤ
+      doorkeeper/application:
+        name: ᱧᱩᱛᱩᱢ
       friend:
         user: ᱵᱮᱵᱦᱟᱨᱤᱡ
         friend: ᱜᱟᱛᱮ
@@ -124,6 +128,18 @@ sat:
       entry:
         comment: ᱚᱠᱛᱟ
         full: ᱜᱚᱴᱟ ᱠᱷᱟᱴᱟᱹ ᱚᱞ
+  accounts:
+    edit:
+      title: ᱠᱷᱟᱛᱟ ᱥᱟᱯᱲᱟᱣ ᱢᱮ
+      my settings: ᱤᱧᱟᱜ ᱥᱟᱡᱟᱣᱠᱚ
+      current email address: 'ᱱᱮᱛᱚᱜ-ᱟᱜ ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
+      openid:
+        link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
+      public editing:
+        enabled link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
+      contributor terms:
+        link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
+      save changes button: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱺᱪᱟᱣ ᱢᱮ
   browse:
     created: ᱛᱮᱭᱟᱨᱱᱟ
     closed: ᱵᱚᱸᱫᱚ
@@ -207,6 +223,13 @@ sat:
       area: ᱡᱟᱭᱜᱟ
     index:
       load_more: ᱟᱨᱦᱚᱸ ᱞᱟᱫᱮ ᱢᱮ
+  dashboards:
+    popup:
+      your location: ᱟᱢᱟᱜ ᱡᱟᱭᱜᱟ
+      friend: ᱜᱟᱛᱮ
+    show:
+      my friends: ᱤᱧᱭᱟᱜ ᱜᱟᱛᱮ ᱠᱚ
+      no friends: ᱱᱤᱛ ᱫᱷᱟᱹᱵᱤᱡ ᱢᱤᱛᱴᱮᱱ ᱜᱟᱛᱮᱠᱩ ᱦᱚᱸ ᱵᱟᱢ ᱥᱮᱞᱮᱫ ᱠᱟᱛ ᱠᱚᱣᱟ᱾
   diary_entries:
     new:
       title: ᱱᱟᱶᱟ ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨ
@@ -336,8 +359,6 @@ sat:
           hut: ᱵᱩᱥᱩᱵᱚᱲᱟᱜ
           office: ᱟᱸᱯᱷᱤᱥ ᱵᱤᱞᱰᱤᱝ
           "yes": ᱵᱤᱞᱰᱤᱝ
-        emergency:
-          "yes": ᱴᱟᱴᱠᱟ
         highway:
           cycleway: ᱥᱟᱭᱠᱤᱞ ᱦᱚᱨ
           footway: ᱯᱷᱩᱴᱯᱟᱛᱷ
@@ -515,6 +536,11 @@ sat:
       email address: 'ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
     reset_password:
       flash changed: ᱟᱢᱟᱜ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱫᱚ ᱵᱚᱫᱚᱞᱮᱱᱟ ᱾
+  profiles:
+    edit:
+      image: ᱪᱤᱛᱟᱹᱨᱺ
+      new image: ᱢᱤᱫᱴᱮᱱ ᱪᱤᱛᱟᱹᱨ ᱥᱮᱞᱮᱫ ᱢᱮ
+      home location: 'ᱚᱲᱟᱜ ᱡᱟᱭᱜᱟ:'
   sessions:
     new:
       title: ᱵᱚᱞᱚᱜ ᱢᱮ
@@ -646,28 +672,8 @@ sat:
       status: 'ᱫᱚᱥᱟ:'
       description: ᱵᱤᱵᱨᱚᱱ
       user location: ᱵᱮᱵᱷᱟᱨᱤᱡ-ᱟ ᱡᱟᱭᱜᱟ
-      settings_link_text: ᱥᱟᱡᱟᱣᱠᱚ
-      my friends: ᱤᱧᱭᱟᱜ ᱜᱟᱛᱮ ᱠᱚ
-      no friends: ᱱᱤᱛ ᱫᱷᱟᱹᱵᱤᱡ ᱢᱤᱛᱴᱮᱱ ᱜᱟᱛᱮᱠᱩ ᱦᱚᱸ ᱵᱟᱢ ᱥᱮᱞᱮᱫ ᱠᱟᱛ ᱠᱚᱣᱟ᱾
       comments: ᱚᱠᱛᱟᱠᱚ
       confirm: ᱜᱚᱴᱟᱭ ᱢᱮ
-    popup:
-      your location: ᱟᱢᱟᱜ ᱡᱟᱭᱜᱟ
-      friend: ᱜᱟᱛᱮ
-    account:
-      title: ᱠᱷᱟᱛᱟ ᱥᱟᱯᱲᱟᱣ ᱢᱮ
-      my settings: ᱤᱧᱟᱜ ᱥᱟᱡᱟᱣᱠᱚ
-      current email address: 'ᱱᱮᱛᱚᱜ-ᱟᱜ ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
-      openid:
-        link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
-      public editing:
-        enabled link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
-      contributor terms:
-        link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
-      image: ᱪᱤᱛᱟᱹᱨᱺ
-      new image: ᱢᱤᱫᱴᱮᱱ ᱪᱤᱛᱟᱹᱨ ᱥᱮᱞᱮᱫ ᱢᱮ
-      home location: 'ᱚᱲᱟᱜ ᱡᱟᱭᱜᱟ:'
-      save changes button: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱺᱪᱟᱣ ᱢᱮ
     index:
       title: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
       heading: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ