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

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

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index 0bc77b753fe5d75977f9674fe7826327a0e5559c..e5ed89e94f3fe8790bee815cf17334b27266dabc 100644 (file)
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -200,11 +200,6 @@ sat:
     changeset:
       anonymous: ᱵᱟᱝ ᱵᱟᱰᱟᱭ
       no_edits: (ᱥᱟᱯᱲᱟᱣ ᱵᱟᱝ)
     changeset:
       anonymous: ᱵᱟᱝ ᱵᱟᱰᱟᱭ
       no_edits: (ᱥᱟᱯᱲᱟᱣ ᱵᱟᱝ)

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

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


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

+    page:

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


@@ -263,7 +259,7 @@ sat:
       view: ᱧᱮᱞ ᱢᱮ
       edit: ᱥᱟᱯᱲᱟᱣ
   diary_comments:
       view: ᱧᱮᱞ ᱢᱮ
       edit: ᱥᱟᱯᱲᱟᱣ
   diary_comments:

-    index:
+    page:

       when: ᱛᱤᱥ
       comment: ᱚᱠᱛᱟ
       newer_comments: ᱱᱟᱶᱟᱱᱟ ᱚᱠᱛᱟᱠᱚ
       when: ᱛᱤᱥ
       comment: ᱚᱠᱛᱟ
       newer_comments: ᱱᱟᱶᱟᱱᱟ ᱚᱠᱛᱟᱠᱚ


@@ -458,11 +454,12 @@ sat:
   issues:
     index:
       search: ᱥᱮᱸᱫᱽᱨᱟ
   issues:
     index:
       search: ᱥᱮᱸᱫᱽᱨᱟ

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

       link_to_reports: ᱨᱤᱯᱚᱴᱠᱚ ᱧᱮᱞ ᱢᱮ
       states:
         open: ᱡᱷᱤᱡ ᱢᱮ
       link_to_reports: ᱨᱤᱯᱚᱴᱠᱚ ᱧᱮᱞ ᱢᱮ
       states:
         open: ᱡᱷᱤᱡ ᱢᱮ

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

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


@@ -489,7 +486,6 @@ sat:
     data: ᱥᱟᱹᱠᱷᱭᱟᱹᱛ
     export_data: ᱥᱟᱹᱠᱷᱭᱟᱹᱛ ᱵᱷᱮᱡᱟ
     user_diaries: ᱵᱮᱵᱷᱟᱨᱤᱡ ᱠᱚᱣᱟ ᱰᱟᱭᱨᱤᱠᱚ
     data: ᱥᱟᱹᱠᱷᱭᱟᱹᱛ
     export_data: ᱥᱟᱹᱠᱷᱭᱟᱹᱛ ᱵᱷᱮᱡᱟ
     user_diaries: ᱵᱮᱵᱷᱟᱨᱤᱡ ᱠᱚᱣᱟ ᱰᱟᱭᱨᱤᱠᱚ

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

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


@@ -497,8 +493,6 @@ sat:
     about: ᱵᱟᱵᱚᱛ
     copyright: ᱪᱷᱟᱯᱟᱦᱚᱠ
     community: ᱵᱤᱨᱟᱹᱫ
     about: ᱵᱟᱵᱚᱛ
     copyright: ᱪᱷᱟᱯᱟᱦᱚᱠ
     community: ᱵᱤᱨᱟᱹᱫ

-    make_a_donation:
-      text: ᱫᱟᱱ ᱮᱢᱢᱮ

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


@@ -616,18 +610,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: ᱧᱩᱛᱩᱢ ᱚᱞ