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

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

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index 60bc6b0f63f12340a0496c9c7efa1aa3618d82f6..b300df57183fa85811c6157b0ea666880e1716c8 100644 (file)
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -21,9 +21,6 @@ sat:
         create: ᱨᱚᱲ ᱥᱮᱞᱮᱫ ᱛᱟᱢ
       message:
         create: ᱵᱷᱮᱡᱟ
         create: ᱨᱚᱲ ᱥᱮᱞᱮᱫ ᱛᱟᱢ
       message:
         create: ᱵᱷᱮᱡᱟ

-      client_application:
-        create: ᱧᱩᱛᱩᱢ ᱚᱞ
-        update: ᱦᱟᱹᱞᱤᱭᱟᱹᱜ

       oauth2_application:
         update: ᱟᱹᱨᱩ ᱯᱷᱮᱨᱟᱣ
       trace:
       oauth2_application:
         update: ᱟᱹᱨᱩ ᱯᱷᱮᱨᱟᱣ
       trace:


@@ -134,11 +131,13 @@ sat:
       current email address: 'ᱱᱮᱛᱚᱜ-ᱟᱜ ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
       openid:
         link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
       current email address: 'ᱱᱮᱛᱚᱜ-ᱟᱜ ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
       openid:
         link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?

-      public editing:
-        enabled link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?

       contributor terms:
         link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
       save changes button: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱺᱪᱟᱣ ᱢᱮ
       contributor terms:
         link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
       save changes button: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱺᱪᱟᱣ ᱢᱮ

+    terms:
+      show:
+        consider_pd_why: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
+        continue: ᱞᱮᱛᱟᱲ

   browse:
     anonymous: ᱵᱟᱝ ᱵᱟᱰᱟᱭ
     no_comment: (ᱚᱠᱛᱚ ᱵᱟᱝ)
   browse:
     anonymous: ᱵᱟᱝ ᱵᱟᱰᱟᱭ
     no_comment: (ᱚᱠᱛᱚ ᱵᱟᱝ)


@@ -148,14 +147,11 @@ sat:
     location: 'ᱡᱟᱭᱜᱟ:'
     node:
       title_html: ᱜᱟᱸᱴᱷ:%{name}
     location: 'ᱡᱟᱭᱜᱟ:'
     node:
       title_html: ᱜᱟᱸᱴᱷ:%{name}

-      history_title_html: 'ᱜᱟᱸᱴᱷ ᱨᱮᱭᱟᱜ ᱦᱤᱛᱟᱹᱞ: %{name}'

     way:
       title_html: '%{name} :ᱦᱚᱨ'
     way:
       title_html: '%{name} :ᱦᱚᱨ'

-      history_title_html: '%{name} :ᱦᱚᱨ ᱨᱮᱭᱟᱜ ᱦᱤᱛᱟᱹᱞ'

       nodes: ᱜᱟᱸᱴᱷᱠᱚ
     relation:
       title_html: 'ᱥᱟᱹᱜᱟᱹᱭ: %{name}'
       nodes: ᱜᱟᱸᱴᱷᱠᱚ
     relation:
       title_html: 'ᱥᱟᱹᱜᱟᱹᱭ: %{name}'

-      history_title_html: 'ᱥᱟᱹᱜᱟᱹᱭ ᱱᱟᱜᱟᱢ: %{name}'

       members: ᱨᱟᱹᱥᱤᱭᱟᱹᱥ ᱠᱚ
     relation_member:
       type:
       members: ᱨᱟᱹᱥᱤᱭᱟᱹᱥ ᱠᱚ
     relation_member:
       type:


@@ -163,15 +159,9 @@ sat:
         way: ᱦᱚᱨ
         relation: ᱥᱟᱹᱜᱟᱹᱭ
     containing_relation:
         way: ᱦᱚᱨ
         relation: ᱥᱟᱹᱜᱟᱹᱭ
     containing_relation:

-      entry_html: ᱥᱟᱹᱜᱟᱹᱭ %{relation_name}

       entry_role_html: ᱥᱟᱹᱜᱟᱹᱭ %{relation_name} (as %{relation_role})
     not_found:
       title: ᱵᱟᱝ ᱧᱟᱢ ᱞᱮᱱᱟ
       entry_role_html: ᱥᱟᱹᱜᱟᱹᱭ %{relation_name} (as %{relation_role})
     not_found:
       title: ᱵᱟᱝ ᱧᱟᱢ ᱞᱮᱱᱟ

-      type:
-        node: ᱜᱟᱸᱴᱷ
-        way: ᱦᱚᱨ
-        relation: ᱥᱟᱹᱜᱟᱹᱭ
-        note: ᱠᱷᱟᱴᱚ ᱚᱞ

     timeout:
       type:
         node: ᱜᱟᱸᱴᱷ
     timeout:
       type:
         node: ᱜᱟᱸᱴᱷ


@@ -192,6 +182,14 @@ sat:
     query:
       introduction: ᱱᱚᱠᱥᱟ ᱨᱮ ᱚᱛᱟᱭ ᱢᱮ ᱥᱩᱨᱠᱚᱣᱟ ᱜᱩᱱᱠᱚ ᱧᱟᱢ ᱞᱟᱹᱜᱤᱫᱛᱮ ᱾
       nearby: ᱥᱩᱨᱠᱚᱣᱟ ᱜᱩᱱᱠᱚ
     query:
       introduction: ᱱᱚᱠᱥᱟ ᱨᱮ ᱚᱛᱟᱭ ᱢᱮ ᱥᱩᱨᱠᱚᱣᱟ ᱜᱩᱱᱠᱚ ᱧᱟᱢ ᱞᱟᱹᱜᱤᱫᱛᱮ ᱾
       nearby: ᱥᱩᱨᱠᱚᱣᱟ ᱜᱩᱱᱠᱚ

+  old_elements:
+    index:
+      node:
+        title_html: 'ᱜᱟᱸᱴᱷ ᱨᱮᱭᱟᱜ ᱦᱤᱛᱟᱹᱞ: %{name}'
+      way:
+        title_html: '%{name} :ᱦᱚᱨ ᱨᱮᱭᱟᱜ ᱦᱤᱛᱟᱹᱞ'
+      relation:
+        title_html: 'ᱥᱟᱹᱜᱟᱹᱭ ᱱᱟᱜᱟᱢ: %{name}'

   changesets:
     changeset:
       no_edits: (ᱥᱟᱯᱲᱟᱣ ᱵᱟᱝ)
   changesets:
     changeset:
       no_edits: (ᱥᱟᱯᱲᱟᱣ ᱵᱟᱝ)


@@ -213,10 +211,6 @@ sat:
   dashboards:
     popup:
       your location: ᱟᱢᱟᱜ ᱡᱟᱭᱜᱟ
   dashboards:
     popup:
       your location: ᱟᱢᱟᱜ ᱡᱟᱭᱜᱟ

-      friend: ᱜᱟᱛᱮ
-    show:
-      my friends: ᱤᱧᱭᱟᱜ ᱜᱟᱛᱮ ᱠᱚ
-      no friends: ᱱᱤᱛ ᱫᱷᱟᱹᱵᱤᱡ ᱢᱤᱛᱴᱮᱱ ᱜᱟᱛᱮᱠᱩ ᱦᱚᱸ ᱵᱟᱢ ᱥᱮᱞᱮᱫ ᱠᱟᱛ ᱠᱚᱣᱟ᱾

   diary_entries:
     new:
       title: ᱱᱟᱶᱟ ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨ
   diary_entries:
     new:
       title: ᱱᱟᱶᱟ ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨ


@@ -225,7 +219,6 @@ sat:
       use_map_link: ᱱᱚᱠᱥᱟ ᱵᱮᱵᱷᱟᱨ ᱢᱮ
     index:
       title: ᱵᱮᱵᱷᱟᱨᱤᱡ ᱠᱚᱣᱟ ᱰᱟᱭᱨᱤᱠᱚ
       use_map_link: ᱱᱚᱠᱥᱟ ᱵᱮᱵᱷᱟᱨ ᱢᱮ
     index:
       title: ᱵᱮᱵᱷᱟᱨᱤᱡ ᱠᱚᱣᱟ ᱰᱟᱭᱨᱤᱠᱚ

-      title_friends: ᱜᱟᱛᱮ ᱠᱚᱣᱟ ᱰᱟᱭᱨᱤᱠᱚ

       new: ᱱᱟᱶᱟ ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨ
       my_diary: ᱤᱧᱭᱟᱜ ᱰᱟᱭᱨᱤ
       no_entries: ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨᱠᱚ ᱵᱟᱹᱱᱩᱜ-ᱟ
       new: ᱱᱟᱶᱟ ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨ
       my_diary: ᱤᱧᱭᱟᱜ ᱰᱟᱭᱨᱤ
       no_entries: ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨᱠᱚ ᱵᱟᱹᱱᱩᱜ-ᱟ


@@ -248,14 +241,6 @@ sat:
       report: ᱱᱚᱶᱟ ᱚᱠᱛᱟ ᱨᱤᱯᱚᱴ ᱢᱮ
     location:
       location: 'ᱡᱟᱭᱜᱟ:'
       report: ᱱᱚᱶᱟ ᱚᱠᱛᱟ ᱨᱤᱯᱚᱴ ᱢᱮ
     location:
       location: 'ᱡᱟᱭᱜᱟ:'

-  diary_comments:
-    page:
-      when: ᱛᱤᱥ
-      comment: ᱚᱠᱛᱟ
-  friendships:
-    make_friend:
-      button: ᱜᱟᱛᱤ ᱞᱮᱠᱟ ᱥᱮᱞᱮᱫ ᱮᱢ
-      success: '%{name} ᱱᱤᱛᱚᱜ ᱫᱚ ᱟᱢᱨᱮᱱ ᱜᱟᱛᱮ ᱦᱚᱭ ᱱᱟ'

   geocoder:
     search_osm_nominatim:
       prefix:
   geocoder:
     search_osm_nominatim:
       prefix:


@@ -481,18 +466,20 @@ sat:
     confirm_email:
       button: ᱜᱚᱴᱟᱭ ᱢᱮ
   messages:
     confirm_email:
       button: ᱜᱚᱴᱟᱭ ᱢᱮ
   messages:

-    messages_table:
-      subject: ᱵᱤᱥᱚᱭ
-      date: ᱢᱟᱹᱦᱤᱛ
-    message_summary:
-      destroy_button: ᱜᱮᱫ ᱜᱤᱰᱤ

     new:
       title: ᱠᱷᱚᱵᱚᱨ ᱠᱩᱞ ᱢᱮ
     show:
       destroy_button: ᱜᱮᱫ ᱜᱤᱰᱤ
       back: ᱛᱟᱭᱚᱢ
     new:
       title: ᱠᱷᱚᱵᱚᱨ ᱠᱩᱞ ᱢᱮ
     show:
       destroy_button: ᱜᱮᱫ ᱜᱤᱰᱤ
       back: ᱛᱟᱭᱚᱢ

-    sent_message_summary:
-      destroy_button: ᱜᱮᱫ ᱜᱤᱰᱤ
+    mailboxes:
+      messages_table:
+        subject: ᱵᱤᱥᱚᱭ
+        date: ᱢᱟᱹᱦᱤᱛ
+      message:
+        destroy_button: ᱜᱮᱫ ᱜᱤᱰᱤ
+    outboxes:
+      message:
+        destroy_button: ᱜᱮᱫ ᱜᱤᱰᱤ

   passwords:
     new:
       title: ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱫ ᱠᱮᱫᱟᱢ
   passwords:
     new:
       title: ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱫ ᱠᱮᱫᱟᱢ


@@ -593,9 +580,6 @@ sat:
     new:
       title: ᱧᱩᱛᱩᱢ ᱚᱞ
       continue: ᱧᱩᱛᱩᱢ ᱚᱞ
     new:
       title: ᱧᱩᱛᱩᱢ ᱚᱞ
       continue: ᱧᱩᱛᱩᱢ ᱚᱞ

-    terms:
-      consider_pd_why: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
-      continue: ᱞᱮᱛᱟᱲ

     show:
       my diary: ᱤᱧᱭᱟᱜ ᱰᱟᱭᱨᱤ
       my edits: ᱤᱧᱭᱟᱜ ᱥᱟᱯᱲᱟᱣᱠᱚ
     show:
       my diary: ᱤᱧᱭᱟᱜ ᱰᱟᱭᱨᱤ
       my edits: ᱤᱧᱭᱟᱜ ᱥᱟᱯᱲᱟᱣᱠᱚ


@@ -608,14 +592,18 @@ sat:
       diary: ᱰᱟᱭᱨᱤ
       edits: ᱥᱟᱯᱲᱟᱣᱠᱚ
       notes: ᱱᱚᱠᱥᱟ ᱠᱷᱟᱴᱟᱹ ᱚᱞᱠᱚ
       diary: ᱰᱟᱭᱨᱤ
       edits: ᱥᱟᱯᱲᱟᱣᱠᱚ
       notes: ᱱᱚᱠᱥᱟ ᱠᱷᱟᱴᱟᱹ ᱚᱞᱠᱚ

-      add as friend: ᱜᱟᱛᱮ ᱥᱮᱞᱮᱫᱮᱢ

       email address: 'ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
       status: 'ᱫᱚᱥᱟ:'
       comments: ᱚᱠᱛᱟᱠᱚ
       confirm: ᱜᱚᱴᱟᱭ ᱢᱮ
       email address: 'ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
       status: 'ᱫᱚᱥᱟ:'
       comments: ᱚᱠᱛᱟᱠᱚ
       confirm: ᱜᱚᱴᱟᱭ ᱢᱮ

-    index:
-      title: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
-      heading: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
+    lists:
+      show:
+        title: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
+        heading: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
+    changeset_comments:
+      page:
+        when: ᱛᱤᱥ
+        comment: ᱚᱠᱛᱟ

   user_blocks:
     show:
       status: ᱫᱚᱥᱟ
   user_blocks:
     show:
       status: ᱫᱚᱥᱟ