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 541a47440bc535905cc231e0df3c1ab95fb3d23b..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:


@@ -166,11 +162,6 @@ sat:
       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: ᱜᱟᱸᱴᱷ


@@ -191,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: (ᱥᱟᱯᱲᱟᱣ ᱵᱟᱝ)


@@ -212,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: ᱱᱟᱶᱟ ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨ


@@ -224,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: ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨᱠᱚ ᱵᱟᱹᱱᱩᱜ-ᱟ


@@ -247,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:


@@ -594,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: ᱤᱧᱭᱟᱜ ᱥᱟᱯᱲᱟᱣᱠᱚ


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

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

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


@@ -618,6 +600,10 @@ sat:
       show:
         title: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
         heading: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
       show:
         title: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
         heading: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ

+    changeset_comments:
+      page:
+        when: ᱛᱤᱥ
+        comment: ᱚᱠᱛᱟ

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