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

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

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index b26c3539f88c148f8f3b91c2653e62d4f618f9cf..60bc6b0f63f12340a0496c9c7efa1aa3618d82f6 100644 (file)
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -193,12 +193,7 @@ sat:
       introduction: ᱱᱚᱠᱥᱟ ᱨᱮ ᱚᱛᱟᱭ ᱢᱮ ᱥᱩᱨᱠᱚᱣᱟ ᱜᱩᱱᱠᱚ ᱧᱟᱢ ᱞᱟᱹᱜᱤᱫᱛᱮ ᱾
       nearby: ᱥᱩᱨᱠᱚᱣᱟ ᱜᱩᱱᱠᱚ
   changesets:
-    changeset_paging_nav:
-      showing_page: ᱥᱟᱦᱴᱟ %{page}
-      next: ᱤᱱᱟ ᱛᱟᱭᱚᱢ >>
-      previous: « ᱛᱟᱭᱚᱢ
     changeset:
-      anonymous: ᱵᱟᱝ ᱵᱟᱰᱟᱭ
       no_edits: (ᱥᱟᱯᱲᱟᱣ ᱵᱟᱝ)
     index:
       load_more: ᱟᱨᱦᱚᱸ ᱞᱟᱫᱮ ᱢᱮ
@@ -234,9 +229,6 @@ sat:
       new: ᱱᱟᱶᱟ ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨ
       my_diary: ᱤᱧᱭᱟᱜ ᱰᱟᱭᱨᱤ
       no_entries: ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨᱠᱚ ᱵᱟᱹᱱᱩᱜ-ᱟ
-    page:
-      older_entries: ᱢᱟᱨᱤᱭᱟ ᱟᱫᱮᱨᱠᱚ
-      newer_entries: ᱱᱟᱶᱟᱱᱟ ᱟᱫᱮᱨᱠᱚ
     edit:
       title: ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨ ᱥᱟᱯᱲᱟᱣ ᱢᱮ
       marker_text: ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨ ᱨᱮᱭᱟᱜ ᱡᱟᱭᱜᱟ
@@ -256,14 +248,10 @@ sat:
       report: ᱱᱚᱶᱟ ᱚᱠᱛᱟ ᱨᱤᱯᱚᱴ ᱢᱮ
     location:
       location: 'ᱡᱟᱭᱜᱟ:'
-      view: ᱧᱮᱞ ᱢᱮ
-      edit: ᱥᱟᱯᱲᱟᱣ
   diary_comments:
     page:
       when: ᱛᱤᱥ
       comment: ᱚᱠᱛᱟ
-      newer_comments: ᱱᱟᱶᱟᱱᱟ ᱚᱠᱛᱟᱠᱚ
-      older_comments: ᱢᱟᱨᱤᱱᱟ ᱚᱠᱛᱟᱠᱚ
   friendships:
     make_friend:
       button: ᱜᱟᱛᱤ ᱞᱮᱠᱟ ᱥᱮᱞᱮᱫ ᱮᱢ
@@ -447,14 +435,9 @@ sat:
         level4: ᱡᱤᱞᱟᱹ ᱜᱷᱮᱨᱟ
         level6: ᱫᱤᱥᱚᱢ ᱜᱷᱮᱨᱟ
         level8: ᱥᱚᱦᱚᱨ ᱜᱷᱮᱨᱟ
-      types:
-        cities: ᱥᱚᱦᱚᱨᱠᱚ
-        towns: ᱴᱟᱩᱱᱠᱚ
-        places: ᱡᱟᱭᱜᱟᱠᱚ
   issues:
     index:
       search: ᱥᱮᱸᱫᱽᱨᱟ
-      link_to_reports: ᱨᱤᱯᱚᱴᱠᱚ ᱧᱮᱞ ᱢᱮ
       states:
         open: ᱡᱷᱤᱡ ᱢᱮ
     page:
@@ -523,13 +506,11 @@ sat:
       home location: 'ᱚᱲᱟᱜ ᱡᱟᱭᱜᱟ:'
   sessions:
     new:
-      title: ᱵᱚᱞᱚᱜ ᱢᱮ
       tab_title: ᱵᱚᱞᱚᱜ ᱢᱮ
       password: 'ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ:'
       remember: ᱫᱤᱥᱟᱹᱭᱤᱧ ᱢᱮ
       lost password link: ᱟᱢᱟᱜ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱫᱟᱠᱟᱫᱟᱢ?
       login_button: ᱵᱚᱞᱚᱜ ᱢᱮ
-      register now: ᱱᱤᱛᱜᱮ ᱚᱞ ᱦᱚᱪᱚᱜ ᱢᱮ
     destroy:
       title: ᱩᱰᱩᱜᱚᱜᱢᱮ
       logout_button: ᱩᱰᱩᱜᱚᱜᱢᱮ
@@ -542,6 +523,13 @@ sat:
     richtext_field:
       edit: ᱥᱟᱯᱲᱟᱣ
       preview: ᱧᱮᱞ ᱵᱤᱰᱟᱹᱣ
+    pagination:
+      diary_comments:
+        older: ᱢᱟᱨᱤᱱᱟ ᱚᱠᱛᱟᱠᱚ
+        newer: ᱱᱟᱶᱟᱱᱟ ᱚᱠᱛᱟᱠᱚ
+      diary_entries:
+        older: ᱢᱟᱨᱤᱭᱟ ᱟᱫᱮᱨᱠᱚ
+        newer: ᱱᱟᱶᱟᱱᱟ ᱟᱫᱮᱨᱠᱚ
   site:
     copyright:
       native:
@@ -554,8 +542,6 @@ sat:
     help:
       welcome:
         title: OpenStreetMap ᱨᱮ ᱥᱟᱹᱜᱩᱱ ᱫᱟᱨᱟᱢ
-    sidebar:
-      close: ᱵᱚᱸᱫᱚ
     search:
       search: ᱥᱮᱸᱫᱽᱨᱟ
       where_am_i: ᱱᱚᱣᱟ ᱚᱠᱟ ᱨᱮ ᱢᱮᱱᱟᱜ-ᱟ?
@@ -630,21 +616,14 @@ sat:
     index:
       title: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
       heading: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
-  user_role:
-    grant:
-      confirm: ᱜᱚᱴᱟᱭ ᱢᱮ
-    revoke:
-      confirm: ᱜᱚᱴᱟᱭ ᱢᱮ
   user_blocks:
     show:
       status: ᱫᱚᱥᱟ
-      show: ᱧᱮᱞ
       edit: ᱥᱟᱯᱲᱟᱣ
-      confirm: ᱪᱮᱫ ᱟᱢ ᱜᱚᱴᱟ ᱢᱮᱱᱟᱢ-ᱟ?
     block:
       show: ᱧᱮᱞ
       edit: ᱥᱟᱯᱲᱟᱣ
-    blocks:
+    page:
       status: ᱫᱚᱥᱟ
   notes:
     show:
@@ -656,6 +635,8 @@ sat:
     new:
       title: ᱱᱟᱶᱟ ᱠᱷᱟᱴᱚ ᱚᱞ
       add: ᱠᱷᱟᱴᱟᱹ ᱚᱞ ᱥᱮᱞᱮᱫ ᱢᱮ
+    notes_paging_nav:
+      showing_page: ᱥᱟᱦᱴᱟ %{page}
   javascripts:
     close: ᱵᱚᱸᱫᱚ
     share: