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

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

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index 199055d968d1614da93b82b1512ad754b3f4de56..4b692b53eab5ff36a9089dc1a48b2e34a8929c2b 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: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱱᱪᱟᱣ ᱢᱮ
@@ -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: ᱯᱷᱩᱴᱯᱟᱛᱷ
@@ -483,6 +504,12 @@ sat:
       text: ᱫᱟᱱ ᱮᱢᱢᱮ
     learn_more: ᱟᱨᱦᱚᱸ ᱪᱤᱫᱢᱮ
     more: ᱵᱟᱹᱲᱛᱤ
+  confirmations:
+    confirm:
+      heading: ᱟᱢᱟᱜ ᱤᱢᱮᱞ ᱡᱟᱸᱪ ᱛᱟᱢ!
+      button: ᱜᱚᱴᱟᱭ ᱢᱮ
+    confirm_email:
+      button: ᱜᱚᱴᱟᱭ ᱢᱮ
   messages:
     inbox:
       subject: ᱵᱤᱥᱚᱭ
@@ -503,6 +530,36 @@ sat:
       back: ᱛᱟᱭᱚᱢ
     sent_message_summary:
       destroy_button: ᱜᱮᱫ ᱜᱤᱰᱤ
+  passwords:
+    lost_password:
+      title: ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱫ ᱠᱮᱫᱟᱢ
+      email address: 'ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
+    reset_password:
+      flash changed: ᱟᱢᱟᱜ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱫᱚ ᱵᱚᱫᱚᱞᱮᱱᱟ ᱾
+  profiles:
+    edit:
+      image: ᱪᱤᱛᱟᱹᱨᱺ
+      new image: ᱢᱤᱫᱴᱮᱱ ᱪᱤᱛᱟᱹᱨ ᱥᱮᱞᱮᱫ ᱢᱮ
+      home location: 'ᱚᱲᱟᱜ ᱡᱟᱭᱜᱟ:'
+  sessions:
+    new:
+      title: ᱵᱚᱞᱚᱜ ᱢᱮ
+      heading: ᱵᱚᱞᱚᱜ ᱢᱮ
+      password: 'ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ:'
+      remember: ᱫᱤᱥᱟᱹᱭᱤᱧ ᱢᱮ
+      lost password link: ᱟᱢᱟᱜ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱫᱟᱠᱟᱫᱟᱢ?
+      login_button: ᱵᱚᱞᱚᱜ ᱢᱮ
+      register now: ᱱᱤᱛᱜᱮ ᱚᱞ ᱦᱚᱪᱚᱜ ᱢᱮ
+      new to osm: OpenStreetMap ᱨᱮ ᱱᱟᱶᱟ ᱜᱮᱭᱟᱢ?
+      no account: ᱠᱷᱟᱛᱟ ᱵᱟᱱᱩᱜ ᱛᱟᱢᱟ?
+      auth_providers:
+        github:
+          title: ᱜᱤᱴᱦᱚᱵ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
+        wikipedia:
+          title: ᱩᱭᱠᱤᱯᱤᱰᱤᱭᱟ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
+    destroy:
+      title: ᱩᱰᱩᱜᱚᱜᱢᱮ
+      logout_button: ᱩᱰᱩᱜᱚᱜᱢᱮ
   shared:
     markdown_help:
       link: ᱞᱤᱸᱠ
@@ -574,10 +631,8 @@ sat:
     trace:
       more: ᱵᱟᱹᱲᱛᱤ
       view_map: ᱱᱚᱠᱥᱟ ᱧᱮᱞ ᱢᱮ
-      edit: ᱥᱟᱯᱲᱟᱣ
       edit_map: ᱱᱚᱠᱥᱟ ᱥᱟᱯᱲᱟᱣ ᱢᱮ
       public: ᱦᱚᱲ ᱠᱚᱣᱟ
-      map: ᱱᱟᱠᱥᱟ
   oauth:
     authorize:
       allow_write_api: ᱱᱚᱠᱥᱟ ᱵᱚᱫᱚᱞ ᱢᱮ ᱾
@@ -591,31 +646,6 @@ sat:
     index:
       application: ᱟᱹᱨᱡᱤ ᱥᱟᱠᱟᱢ ᱧᱩᱛᱩᱢ
   users:
-    login:
-      title: ᱵᱚᱞᱚᱜ ᱢᱮ
-      heading: ᱵᱚᱞᱚᱜ ᱢᱮ
-      password: 'ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ:'
-      remember: ᱫᱤᱥᱟᱹᱭᱤᱧ ᱢᱮ
-      lost password link: ᱟᱢᱟᱜ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱫᱟᱠᱟᱫᱟᱢ?
-      login_button: ᱵᱚᱞᱚᱜ ᱢᱮ
-      register now: ᱱᱤᱛᱜᱮ ᱚᱞ ᱦᱚᱪᱚᱜ ᱢᱮ
-      new to osm: OpenStreetMap ᱨᱮ ᱱᱟᱶᱟ ᱜᱮᱭᱟᱢ?
-      no account: ᱠᱷᱟᱛᱟ ᱵᱟᱱᱩᱜ ᱛᱟᱢᱟ?
-      auth_providers:
-        github:
-          title: ᱜᱤᱴᱦᱚᱵ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
-        wikipedia:
-          title: ᱩᱭᱠᱤᱯᱤᱰᱤᱭᱟ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
-        yahoo:
-          title: ᱭᱟᱦᱚ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
-    logout:
-      title: ᱩᱰᱩᱜᱚᱜᱢᱮ
-      logout_button: ᱩᱰᱩᱜᱚᱜᱢᱮ
-    lost_password:
-      title: ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱫ ᱠᱮᱫᱟᱢ
-      email address: 'ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
-    reset_password:
-      flash changed: ᱟᱢᱟᱜ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱫᱚ ᱵᱚᱫᱚᱞᱮᱱᱟ ᱾
     new:
       title: ᱧᱩᱛᱩᱢ ᱚᱞ
       email address: 'ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
@@ -642,33 +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: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱺᱪᱟᱣ ᱢᱮ
-    confirm:
-      heading: ᱟᱢᱟᱜ ᱤᱢᱮᱞ ᱡᱟᱸᱪ ᱛᱟᱢ!
-      button: ᱜᱚᱴᱟᱭ ᱢᱮ
-    confirm_email:
-      button: ᱜᱚᱴᱟᱭ ᱢᱮ
     index:
       title: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
       heading: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ