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

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

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index 4161e73a6867bb354dc3139e2af5ff63a59a4333..60bc6b0f63f12340a0496c9c7efa1aa3618d82f6 100644 (file)
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -193,18 +193,8 @@ sat:
       introduction: ᱱᱚᱠᱥᱟ ᱨᱮ ᱚᱛᱟᱭ ᱢᱮ ᱥᱩᱨᱠᱚᱣᱟ ᱜᱩᱱᱠᱚ ᱧᱟᱢ ᱞᱟᱹᱜᱤᱫᱛᱮ ᱾
       nearby: ᱥᱩᱨᱠᱚᱣᱟ ᱜᱩᱱᱠᱚ
   changesets:
       introduction: ᱱᱚᱠᱥᱟ ᱨᱮ ᱚᱛᱟᱭ ᱢᱮ ᱥᱩᱨᱠᱚᱣᱟ ᱜᱩᱱᱠᱚ ᱧᱟᱢ ᱞᱟᱹᱜᱤᱫᱛᱮ ᱾
       nearby: ᱥᱩᱨᱠᱚᱣᱟ ᱜᱩᱱᱠᱚ
   changesets:

-    changeset_paging_nav:
-      showing_page: ᱥᱟᱦᱴᱟ %{page}
-      next: ᱤᱱᱟ ᱛᱟᱭᱚᱢ >>
-      previous: « ᱛᱟᱭᱚᱢ

     changeset:
     changeset:

-      anonymous: ᱵᱟᱝ ᱵᱟᱰᱟᱭ

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

-    changesets:
-      id: ID
-      user: ᱵᱮᱵᱷᱟᱨᱤᱡ
-      comment: ᱚᱠᱛᱟ
-      area: ᱡᱟᱭᱜᱟ

     index:
       load_more: ᱟᱨᱦᱚᱸ ᱞᱟᱫᱮ ᱢᱮ
       feed:
     index:
       load_more: ᱟᱨᱦᱚᱸ ᱞᱟᱫᱮ ᱢᱮ
       feed:


@@ -239,8 +229,6 @@ sat:
       new: ᱱᱟᱶᱟ ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨ
       my_diary: ᱤᱧᱭᱟᱜ ᱰᱟᱭᱨᱤ
       no_entries: ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨᱠᱚ ᱵᱟᱹᱱᱩᱜ-ᱟ
       new: ᱱᱟᱶᱟ ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨ
       my_diary: ᱤᱧᱭᱟᱜ ᱰᱟᱭᱨᱤ
       no_entries: ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨᱠᱚ ᱵᱟᱹᱱᱩᱜ-ᱟ

-      older_entries: ᱢᱟᱨᱤᱭᱟ ᱟᱫᱮᱨᱠᱚ
-      newer_entries: ᱱᱟᱶᱟᱱᱟ ᱟᱫᱮᱨᱠᱚ

     edit:
       title: ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨ ᱥᱟᱯᱲᱟᱣ ᱢᱮ
       marker_text: ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨ ᱨᱮᱭᱟᱜ ᱡᱟᱭᱜᱟ
     edit:
       title: ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨ ᱥᱟᱯᱲᱟᱣ ᱢᱮ
       marker_text: ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨ ᱨᱮᱭᱟᱜ ᱡᱟᱭᱜᱟ


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

-      view: ᱧᱮᱞ ᱢᱮ
-      edit: ᱥᱟᱯᱲᱟᱣ
-    comments:
+  diary_comments:
+    page:

       when: ᱛᱤᱥ
       comment: ᱚᱠᱛᱟ
       when: ᱛᱤᱥ
       comment: ᱚᱠᱛᱟ

-      newer_comments: ᱱᱟᱶᱟᱱᱟ ᱚᱠᱛᱟᱠᱚ
-      older_comments: ᱢᱟᱨᱤᱱᱟ ᱚᱠᱛᱟᱠᱚ

   friendships:
     make_friend:
       button: ᱜᱟᱛᱤ ᱞᱮᱠᱟ ᱥᱮᱞᱮᱫ ᱮᱢ
   friendships:
     make_friend:
       button: ᱜᱟᱛᱤ ᱞᱮᱠᱟ ᱥᱮᱞᱮᱫ ᱮᱢ


@@ -450,18 +435,14 @@ sat:
         level4: ᱡᱤᱞᱟᱹ ᱜᱷᱮᱨᱟ
         level6: ᱫᱤᱥᱚᱢ ᱜᱷᱮᱨᱟ
         level8: ᱥᱚᱦᱚᱨ ᱜᱷᱮᱨᱟ
         level4: ᱡᱤᱞᱟᱹ ᱜᱷᱮᱨᱟ
         level6: ᱫᱤᱥᱚᱢ ᱜᱷᱮᱨᱟ
         level8: ᱥᱚᱦᱚᱨ ᱜᱷᱮᱨᱟ

-      types:
-        cities: ᱥᱚᱦᱚᱨᱠᱚ
-        towns: ᱴᱟᱩᱱᱠᱚ
-        places: ᱡᱟᱭᱜᱟᱠᱚ

   issues:
     index:
       search: ᱥᱮᱸᱫᱽᱨᱟ
   issues:
     index:
       search: ᱥᱮᱸᱫᱽᱨᱟ

-      status: ᱫᱚᱥᱟ
-      reports: ᱨᱤᱯᱚᱴᱠᱚ
-      link_to_reports: ᱨᱤᱯᱚᱴᱠᱚ ᱧᱮᱞ ᱢᱮ

       states:
         open: ᱡᱷᱤᱡ ᱢᱮ
       states:
         open: ᱡᱷᱤᱡ ᱢᱮ

+    page:
+      status: ᱫᱚᱥᱟ
+      reports: ᱨᱤᱯᱚᱴᱠᱚ

     show:
       new_reports: ᱱᱟᱶᱟ ᱨᱤᱯᱚᱴᱠᱚ
   reports:
     show:
       new_reports: ᱱᱟᱶᱟ ᱨᱤᱯᱚᱴᱠᱚ
   reports:


@@ -485,19 +466,12 @@ sat:
     edit: ᱥᱟᱯᱲᱟᱣ
     history: ᱱᱟᱜᱟᱢ
     export: ᱵᱷᱮᱡᱟ
     edit: ᱥᱟᱯᱲᱟᱣ
     history: ᱱᱟᱜᱟᱢ
     export: ᱵᱷᱮᱡᱟ

-    data: ᱥᱟᱹᱠᱷᱭᱟᱹᱛ
-    export_data: ᱥᱟᱹᱠᱷᱭᱟᱹᱛ ᱵᱷᱮᱡᱟ

     user_diaries: ᱵᱮᱵᱷᱟᱨᱤᱡ ᱠᱚᱣᱟ ᱰᱟᱭᱨᱤᱠᱚ
     user_diaries: ᱵᱮᱵᱷᱟᱨᱤᱡ ᱠᱚᱣᱟ ᱰᱟᱭᱨᱤᱠᱚ

-    user_diaries_tooltip: ᱵᱮᱵᱷᱟᱨᱤᱡ ᱰᱟᱭᱨᱤᱠᱚ ᱧᱮᱞ ᱢᱮ

     edit_with: '%{editor} ᱛᱮ ᱥᱟᱯᱲᱟᱣ ᱢᱮ'
     intro_header: OpenStreetMap ᱨᱮ ᱥᱟᱹᱜᱩᱱ ᱫᱟᱨᱟᱢ!
     edit_with: '%{editor} ᱛᱮ ᱥᱟᱯᱲᱟᱣ ᱢᱮ'
     intro_header: OpenStreetMap ᱨᱮ ᱥᱟᱹᱜᱩᱱ ᱫᱟᱨᱟᱢ!

-    intro_2_create_account: ᱢᱤᱫ ᱵᱮᱵᱷᱟᱨᱤᱭᱟᱹ ᱠᱷᱟᱛᱟ ᱛᱮᱭᱟᱨ ᱛᱟᱢ

     help: ᱜᱚᱸᱲᱚᱸ
     about: ᱵᱟᱵᱚᱛ
     copyright: ᱪᱷᱟᱯᱟᱦᱚᱠ
     help: ᱜᱚᱸᱲᱚᱸ
     about: ᱵᱟᱵᱚᱛ
     copyright: ᱪᱷᱟᱯᱟᱦᱚᱠ

-    community: ᱵᱤᱨᱟᱹᱫ
-    make_a_donation:
-      text: ᱫᱟᱱ ᱮᱢᱢᱮ

     learn_more: ᱟᱨᱦᱚᱸ ᱪᱤᱫᱢᱮ
     more: ᱵᱟᱹᱲᱛᱤ
   confirmations:
     learn_more: ᱟᱨᱦᱚᱸ ᱪᱤᱫᱢᱮ
     more: ᱵᱟᱹᱲᱛᱤ
   confirmations:


@@ -532,13 +506,11 @@ sat:
       home location: 'ᱚᱲᱟᱜ ᱡᱟᱭᱜᱟ:'
   sessions:
     new:
       home location: 'ᱚᱲᱟᱜ ᱡᱟᱭᱜᱟ:'
   sessions:
     new:

-      title: ᱵᱚᱞᱚᱜ ᱢᱮ

       tab_title: ᱵᱚᱞᱚᱜ ᱢᱮ
       password: 'ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ:'
       remember: ᱫᱤᱥᱟᱹᱭᱤᱧ ᱢᱮ
       lost password link: ᱟᱢᱟᱜ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱫᱟᱠᱟᱫᱟᱢ?
       login_button: ᱵᱚᱞᱚᱜ ᱢᱮ
       tab_title: ᱵᱚᱞᱚᱜ ᱢᱮ
       password: 'ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ:'
       remember: ᱫᱤᱥᱟᱹᱭᱤᱧ ᱢᱮ
       lost password link: ᱟᱢᱟᱜ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱫᱟᱠᱟᱫᱟᱢ?
       login_button: ᱵᱚᱞᱚᱜ ᱢᱮ

-      register now: ᱱᱤᱛᱜᱮ ᱚᱞ ᱦᱚᱪᱚᱜ ᱢᱮ

     destroy:
       title: ᱩᱰᱩᱜᱚᱜᱢᱮ
       logout_button: ᱩᱰᱩᱜᱚᱜᱢᱮ
     destroy:
       title: ᱩᱰᱩᱜᱚᱜᱢᱮ
       logout_button: ᱩᱰᱩᱜᱚᱜᱢᱮ


@@ -551,9 +523,14 @@ sat:
     richtext_field:
       edit: ᱥᱟᱯᱲᱟᱣ
       preview: ᱧᱮᱞ ᱵᱤᱰᱟᱹᱣ
     richtext_field:
       edit: ᱥᱟᱯᱲᱟᱣ
       preview: ᱧᱮᱞ ᱵᱤᱰᱟᱹᱣ

+    pagination:
+      diary_comments:
+        older: ᱢᱟᱨᱤᱱᱟ ᱚᱠᱛᱟᱠᱚ
+        newer: ᱱᱟᱶᱟᱱᱟ ᱚᱠᱛᱟᱠᱚ
+      diary_entries:
+        older: ᱢᱟᱨᱤᱭᱟ ᱟᱫᱮᱨᱠᱚ
+        newer: ᱱᱟᱶᱟᱱᱟ ᱟᱫᱮᱨᱠᱚ

   site:
   site:

-    about:
-      next: ᱛᱟᱭᱚᱢ ᱨᱮᱱᱟᱜ

     copyright:
       native:
         mapping_link: ᱱᱚᱠᱥᱟ ᱛᱮᱭᱟᱨ ᱮᱦᱚᱵ ᱢᱮ
     copyright:
       native:
         mapping_link: ᱱᱚᱠᱥᱟ ᱛᱮᱭᱟᱨ ᱮᱦᱚᱵ ᱢᱮ


@@ -565,11 +542,8 @@ sat:
     help:
       welcome:
         title: OpenStreetMap ᱨᱮ ᱥᱟᱹᱜᱩᱱ ᱫᱟᱨᱟᱢ
     help:
       welcome:
         title: OpenStreetMap ᱨᱮ ᱥᱟᱹᱜᱩᱱ ᱫᱟᱨᱟᱢ

-    sidebar:
-      close: ᱵᱚᱸᱫᱚ

     search:
       search: ᱥᱮᱸᱫᱽᱨᱟ
     search:
       search: ᱥᱮᱸᱫᱽᱨᱟ

-      get_directions: ᱫᱤᱥᱟᱠᱚ ᱧᱟᱢ ᱢᱮ

       where_am_i: ᱱᱚᱣᱟ ᱚᱠᱟ ᱨᱮ ᱢᱮᱱᱟᱜ-ᱟ?
       submit_text: ᱜᱚ
     key:
       where_am_i: ᱱᱚᱣᱟ ᱚᱠᱟ ᱨᱮ ᱢᱮᱱᱟᱜ-ᱟ?
       submit_text: ᱜᱚ
     key:


@@ -615,18 +589,6 @@ sat:
         title: ᱜᱤᱴᱦᱚᱵ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
       wikipedia:
         title: ᱩᱭᱠᱤᱯᱤᱰᱤᱭᱟ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
         title: ᱜᱤᱴᱦᱚᱵ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
       wikipedia:
         title: ᱩᱭᱠᱤᱯᱤᱰᱤᱭᱟ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ

-  oauth:
-    authorize:
-      allow_write_api: ᱱᱚᱠᱥᱟ ᱵᱚᱫᱚᱞ ᱢᱮ ᱾
-      allow_write_notes: ᱠᱷᱟᱴᱟᱹ ᱚᱞᱠᱚ ᱵᱚᱫᱚᱞ ᱢᱮ ᱾
-  oauth_clients:
-    edit:
-      title: ᱟᱢᱟᱜ ᱟᱹᱨᱡᱤ ᱥᱟᱠᱟᱢ ᱥᱟᱯᱲᱟᱣ ᱛᱟᱢ
-    show:
-      edit: ᱵᱤᱵᱨᱚᱱᱠᱚ ᱥᱟᱯᱲᱟᱣ ᱢᱮ
-      confirm: ᱪᱮᱫ ᱟᱢ ᱜᱚᱴᱟ ᱢᱮᱱᱟᱢ-ᱟ?
-    index:
-      application: ᱟᱹᱨᱡᱤ ᱥᱟᱠᱟᱢ ᱧᱩᱛᱩᱢ

   users:
     new:
       title: ᱧᱩᱛᱩᱢ ᱚᱞ
   users:
     new:
       title: ᱧᱩᱛᱩᱢ ᱚᱞ


@@ -654,21 +616,14 @@ sat:
     index:
       title: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
       heading: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
     index:
       title: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
       heading: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ

-  user_role:
-    grant:
-      confirm: ᱜᱚᱴᱟᱭ ᱢᱮ
-    revoke:
-      confirm: ᱜᱚᱴᱟᱭ ᱢᱮ

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

-      show: ᱧᱮᱞ

       edit: ᱥᱟᱯᱲᱟᱣ
       edit: ᱥᱟᱯᱲᱟᱣ

-      confirm: ᱪᱮᱫ ᱟᱢ ᱜᱚᱴᱟ ᱢᱮᱱᱟᱢ-ᱟ?

     block:
       show: ᱧᱮᱞ
       edit: ᱥᱟᱯᱲᱟᱣ
     block:
       show: ᱧᱮᱞ
       edit: ᱥᱟᱯᱲᱟᱣ

-    blocks:
+    page:

       status: ᱫᱚᱥᱟ
   notes:
     show:
       status: ᱫᱚᱥᱟ
   notes:
     show:


@@ -680,6 +635,8 @@ sat:
     new:
       title: ᱱᱟᱶᱟ ᱠᱷᱟᱴᱚ ᱚᱞ
       add: ᱠᱷᱟᱴᱟᱹ ᱚᱞ ᱥᱮᱞᱮᱫ ᱢᱮ
     new:
       title: ᱱᱟᱶᱟ ᱠᱷᱟᱴᱚ ᱚᱞ
       add: ᱠᱷᱟᱴᱟᱹ ᱚᱞ ᱥᱮᱞᱮᱫ ᱢᱮ

+    notes_paging_nav:
+      showing_page: ᱥᱟᱦᱴᱟ %{page}

   javascripts:
     close: ᱵᱚᱸᱫᱚ
     share:
   javascripts:
     close: ᱵᱚᱸᱫᱚ
     share: