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

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

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index a37e7b87bcb478b1e4ace7bbfd9bc53510f10da9..5948fe42905e9dff028066f589a9c0802ec710c8 100644 (file)
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -113,7 +113,6 @@ sat:
   auth:
     providers:
       none: ᱚᱠᱟᱦᱚᱸ ᱵᱟᱝ
-      openid: OpenID
       google: ᱜᱩᱜᱟᱹᱞ
       facebook: ᱯᱷᱮᱥᱵᱩᱠ
       github: ᱜᱤᱴᱦᱚᱵ
@@ -141,22 +140,12 @@ sat:
         link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
       save changes button: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱺᱪᱟᱣ ᱢᱮ
   browse:
-    created: ᱛᱮᱭᱟᱨᱱᱟ
-    closed: ᱵᱚᱸᱫᱚ
     anonymous: ᱵᱟᱝ ᱵᱟᱰᱟᱭ
     no_comment: (ᱚᱠᱛᱚ ᱵᱟᱝ)
     download_xml: XML ᱰᱟᱩᱱᱞᱚᱰ ᱢᱮ
     view_history: ᱱᱟᱜᱟᱢ ᱧᱮᱞᱢᱮ
     view_details: ᱵᱤᱵᱨᱚᱱ ᱧᱮᱞ ᱢᱮ
     location: 'ᱡᱟᱭᱜᱟ:'
-    changeset:
-      belongs_to: ᱚᱱᱚᱞᱤᱭᱟᱹ
-      node: (%{count}) ᱜᱟᱸᱴᱷᱠᱚ
-      way: (%{count}) ᱦᱚᱨᱠᱚ
-      relation: ᱥᱟᱹᱜᱟᱹᱭᱠᱩ (%{count})
-      relation_paginated: ᱥᱟᱹᱜᱟᱹᱭᱠᱩ (%{x}-%{y} of %{count})
-      comment: (%{count})ᱚᱠᱛᱟᱠᱚ
-      discussion: ᱜᱟᱞᱢᱟᱨᱟᱣ
     node:
       title_html: ᱜᱟᱸᱴᱷ:%{name}
       history_title_html: 'ᱜᱟᱸᱴᱷ ᱨᱮᱭᱟᱜ ᱦᱤᱛᱟᱹᱞ: %{name}'
@@ -204,20 +193,24 @@ sat:
       introduction: ᱱᱚᱠᱥᱟ ᱨᱮ ᱚᱛᱟᱭ ᱢᱮ ᱥᱩᱨᱠᱚᱣᱟ ᱜᱩᱱᱠᱚ ᱧᱟᱢ ᱞᱟᱹᱜᱤᱫᱛᱮ ᱾
       nearby: ᱥᱩᱨᱠᱚᱣᱟ ᱜᱩᱱᱠᱚ
   changesets:
-    changeset_paging_nav:
-      showing_page: ᱥᱟᱦᱴᱟ %{page}
-      next: ᱤᱱᱟ ᱛᱟᱭᱚᱢ >>
-      previous: « ᱛᱟᱭᱚᱢ
     changeset:
       anonymous: ᱵᱟᱝ ᱵᱟᱰᱟᱭ
       no_edits: (ᱥᱟᱯᱲᱟᱣ ᱵᱟᱝ)
-    changesets:
-      id: ID
-      user: ᱵᱮᱵᱷᱟᱨᱤᱡ
-      comment: ᱚᱠᱛᱟ
-      area: ᱡᱟᱭᱜᱟ
     index:
       load_more: ᱟᱨᱦᱚᱸ ᱞᱟᱫᱮ ᱢᱮ
+      feed:
+        created: ᱛᱮᱭᱟᱨᱱᱟ
+        closed: ᱵᱚᱸᱫᱚ
+        belongs_to: ᱚᱱᱚᱞᱤᱭᱟᱹ
+    show:
+      discussion: ᱜᱟᱞᱢᱟᱨᱟᱣ
+      hide_comment: ᱫᱟᱱᱟᱝ
+      comment: ᱚᱠᱛᱟ
+    paging_nav:
+      nodes: (%{count}) ᱜᱟᱸᱴᱷᱠᱚ
+      ways: (%{count}) ᱦᱚᱨᱠᱚ
+      relations: ᱥᱟᱹᱜᱟᱹᱭᱠᱩ (%{count})
+      relations_paginated: ᱥᱟᱹᱜᱟᱹᱭᱠᱩ (%{x}-%{y} of %{count})
   dashboards:
     popup:
       your location: ᱟᱢᱟᱜ ᱡᱟᱭᱜᱟ
@@ -237,8 +230,6 @@ sat:
       new: ᱱᱟᱶᱟ ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨ
       my_diary: ᱤᱧᱭᱟᱜ ᱰᱟᱭᱨᱤ
       no_entries: ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨᱠᱚ ᱵᱟᱹᱱᱩᱜ-ᱟ
-      older_entries: ᱢᱟᱨᱤᱭᱟ ᱟᱫᱮᱨᱠᱚ
-      newer_entries: ᱱᱟᱶᱟᱱᱟ ᱟᱫᱮᱨᱠᱚ
     edit:
       title: ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨ ᱥᱟᱯᱲᱟᱣ ᱢᱮ
       marker_text: ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨ ᱨᱮᱭᱟᱜ ᱡᱟᱭᱜᱟ
@@ -260,11 +251,10 @@ sat:
       location: 'ᱡᱟᱭᱜᱟ:'
       view: ᱧᱮᱞ ᱢᱮ
       edit: ᱥᱟᱯᱲᱟᱣ
-    comments:
+  diary_comments:
+    page:
       when: ᱛᱤᱥ
       comment: ᱚᱠᱛᱟ
-      newer_comments: ᱱᱟᱶᱟᱱᱟ ᱚᱠᱛᱟᱠᱚ
-      older_comments: ᱢᱟᱨᱤᱱᱟ ᱚᱠᱛᱟᱠᱚ
   friendships:
     make_friend:
       button: ᱜᱟᱛᱤ ᱞᱮᱠᱟ ᱥᱮᱞᱮᱫ ᱮᱢ
@@ -455,11 +445,12 @@ sat:
   issues:
     index:
       search: ᱥᱮᱸᱫᱽᱨᱟ
-      status: ᱫᱚᱥᱟ
-      reports: ᱨᱤᱯᱚᱴᱠᱚ
       link_to_reports: ᱨᱤᱯᱚᱴᱠᱚ ᱧᱮᱞ ᱢᱮ
       states:
         open: ᱡᱷᱤᱡ ᱢᱮ
+    page:
+      status: ᱫᱚᱥᱟ
+      reports: ᱨᱤᱯᱚᱴᱠᱚ
     show:
       new_reports: ᱱᱟᱶᱟ ᱨᱤᱯᱚᱴᱠᱚ
   reports:
@@ -483,19 +474,12 @@ sat:
     edit: ᱥᱟᱯᱲᱟᱣ
     history: ᱱᱟᱜᱟᱢ
     export: ᱵᱷᱮᱡᱟ
-    data: ᱥᱟᱹᱠᱷᱭᱟᱹᱛ
-    export_data: ᱥᱟᱹᱠᱷᱭᱟᱹᱛ ᱵᱷᱮᱡᱟ
     user_diaries: ᱵᱮᱵᱷᱟᱨᱤᱡ ᱠᱚᱣᱟ ᱰᱟᱭᱨᱤᱠᱚ
-    user_diaries_tooltip: ᱵᱮᱵᱷᱟᱨᱤᱡ ᱰᱟᱭᱨᱤᱠᱚ ᱧᱮᱞ ᱢᱮ
     edit_with: '%{editor} ᱛᱮ ᱥᱟᱯᱲᱟᱣ ᱢᱮ'
     intro_header: OpenStreetMap ᱨᱮ ᱥᱟᱹᱜᱩᱱ ᱫᱟᱨᱟᱢ!
-    intro_2_create_account: ᱢᱤᱫ ᱵᱮᱵᱷᱟᱨᱤᱭᱟᱹ ᱠᱷᱟᱛᱟ ᱛᱮᱭᱟᱨ ᱛᱟᱢ
     help: ᱜᱚᱸᱲᱚᱸ
     about: ᱵᱟᱵᱚᱛ
     copyright: ᱪᱷᱟᱯᱟᱦᱚᱠ
-    community: ᱵᱤᱨᱟᱹᱫ
-    make_a_donation:
-      text: ᱫᱟᱱ ᱮᱢᱢᱮ
     learn_more: ᱟᱨᱦᱚᱸ ᱪᱤᱫᱢᱮ
     more: ᱵᱟᱹᱲᱛᱤ
   confirmations:
@@ -531,18 +515,12 @@ sat:
   sessions:
     new:
       title: ᱵᱚᱞᱚᱜ ᱢᱮ
-      heading: ᱵᱚᱞᱚᱜ ᱢᱮ
+      tab_title: ᱵᱚᱞᱚᱜ ᱢᱮ
       password: 'ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ:'
       remember: ᱫᱤᱥᱟᱹᱭᱤᱧ ᱢᱮ
       lost password link: ᱟᱢᱟᱜ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱫᱟᱠᱟᱫᱟᱢ?
       login_button: ᱵᱚᱞᱚᱜ ᱢᱮ
       register now: ᱱᱤᱛᱜᱮ ᱚᱞ ᱦᱚᱪᱚᱜ ᱢᱮ
-      no account: ᱠᱷᱟᱛᱟ ᱵᱟᱱᱩᱜ ᱛᱟᱢᱟ?
-      auth_providers:
-        github:
-          title: ᱜᱤᱴᱦᱚᱵ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
-        wikipedia:
-          title: ᱩᱭᱠᱤᱯᱤᱰᱤᱭᱟ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
     destroy:
       title: ᱩᱰᱩᱜᱚᱜᱢᱮ
       logout_button: ᱩᱰᱩᱜᱚᱜᱢᱮ
@@ -555,19 +533,21 @@ sat:
     richtext_field:
       edit: ᱥᱟᱯᱲᱟᱣ
       preview: ᱧᱮᱞ ᱵᱤᱰᱟᱹᱣ
+    pagination:
+      diary_comments:
+        older: ᱢᱟᱨᱤᱱᱟ ᱚᱠᱛᱟᱠᱚ
+        newer: ᱱᱟᱶᱟᱱᱟ ᱚᱠᱛᱟᱠᱚ
+      diary_entries:
+        older: ᱢᱟᱨᱤᱭᱟ ᱟᱫᱮᱨᱠᱚ
+        newer: ᱱᱟᱶᱟᱱᱟ ᱟᱫᱮᱨᱠᱚ
   site:
-    about:
-      next: ᱛᱟᱭᱚᱢ ᱨᱮᱱᱟᱜ
     copyright:
       native:
         mapping_link: ᱱᱚᱠᱥᱟ ᱛᱮᱭᱟᱨ ᱮᱦᱚᱵ ᱢᱮ
-    index:
-      createnote: ᱠᱷᱟᱴᱚ ᱚᱞ ᱥᱮᱞᱮᱫ ᱢᱮ
     edit:
       user_page_link: ᱵᱮᱵᱦᱟᱨᱤᱭᱟᱜ ᱥᱟᱦᱴᱟ
     export:
       title: ᱵᱷᱮᱡᱟ
-      zoom: ᱞᱟᱹᱴᱩ
       export_button: ᱵᱷᱮᱡᱟ
     help:
       welcome:
@@ -576,17 +556,16 @@ sat:
       close: ᱵᱚᱸᱫᱚ
     search:
       search: ᱥᱮᱸᱫᱽᱨᱟ
-      get_directions: ᱫᱤᱥᱟᱠᱚ ᱧᱟᱢ ᱢᱮ
       where_am_i: ᱱᱚᱣᱟ ᱚᱠᱟ ᱨᱮ ᱢᱮᱱᱟᱜ-ᱟ?
       submit_text: ᱜᱚ
     key:
       table:
         entry:
           footway: ᱛᱟᱲᱟᱢᱦᱚᱨ
-          forest_only: ᱵᱤᱨ
+          forest: ᱵᱤᱨ
           wood: ᱠᱟᱴᱷ
           park: ᱵᱟᱜᱟᱱ
-          school_only: ᱤᱛᱩᱱ ᱟᱥᱲᱟ
+          school: ᱤᱛᱩᱱ ᱟᱥᱲᱟ
           bicycle_shop: ᱥᱟᱭᱠᱤᱞ ᱫᱩᱠᱟᱹᱱ
           bicycle_parking: ᱥᱟᱭᱠᱤᱞ ᱯᱟᱨᱠᱤᱝ
           toilets: ᱴᱚᱭᱞᱮᱴᱠᱚ
@@ -616,18 +595,12 @@ sat:
       view_map: ᱱᱚᱠᱥᱟ ᱧᱮᱞ ᱢᱮ
       edit_map: ᱱᱚᱠᱥᱟ ᱥᱟᱯᱲᱟᱣ ᱢᱮ
       public: ᱦᱚᱲ ᱠᱚᱣᱟ
-  oauth:
-    authorize:
-      allow_write_api: ᱱᱚᱠᱥᱟ ᱵᱚᱫᱚᱞ ᱢᱮ ᱾
-      allow_write_notes: ᱠᱷᱟᱴᱟᱹ ᱚᱞᱠᱚ ᱵᱚᱫᱚᱞ ᱢᱮ ᱾
-  oauth_clients:
-    edit:
-      title: ᱟᱢᱟᱜ ᱟᱹᱨᱡᱤ ᱥᱟᱠᱟᱢ ᱥᱟᱯᱲᱟᱣ ᱛᱟᱢ
-    show:
-      edit: ᱵᱤᱵᱨᱚᱱᱠᱚ ᱥᱟᱯᱲᱟᱣ ᱢᱮ
-      confirm: ᱪᱮᱫ ᱟᱢ ᱜᱚᱴᱟ ᱢᱮᱱᱟᱢ-ᱟ?
-    index:
-      application: ᱟᱹᱨᱡᱤ ᱥᱟᱠᱟᱢ ᱧᱩᱛᱩᱢ
+  application:
+    auth_providers:
+      github:
+        title: ᱜᱤᱴᱦᱚᱵ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
+      wikipedia:
+        title: ᱩᱭᱠᱤᱯᱤᱰᱤᱭᱟ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
   users:
     new:
       title: ᱧᱩᱛᱩᱢ ᱚᱞ
@@ -655,11 +628,6 @@ sat:
     index:
       title: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
       heading: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
-  user_role:
-    grant:
-      confirm: ᱜᱚᱴᱟᱭ ᱢᱮ
-    revoke:
-      confirm: ᱜᱚᱴᱟᱭ ᱢᱮ
   user_blocks:
     show:
       status: ᱫᱚᱥᱟ
@@ -669,11 +637,8 @@ sat:
     block:
       show: ᱧᱮᱞ
       edit: ᱥᱟᱯᱲᱟᱣ
-    blocks:
+    page:
       status: ᱫᱚᱥᱟ
-      showing_page: ᱥᱟᱦᱴᱟ %{page}
-      next: ᱤᱱᱟ ᱛᱟᱭᱚᱢ >>
-      previous: « ᱛᱟᱭᱚᱢ
   notes:
     show:
       title: '%{id} :ᱠᱷᱟᱴᱟᱹ ᱚᱞ'
@@ -684,6 +649,8 @@ sat:
     new:
       title: ᱱᱟᱶᱟ ᱠᱷᱟᱴᱚ ᱚᱞ
       add: ᱠᱷᱟᱴᱟᱹ ᱚᱞ ᱥᱮᱞᱮᱫ ᱢᱮ
+    notes_paging_nav:
+      showing_page: ᱥᱟᱦᱴᱟ %{page}
   javascripts:
     close: ᱵᱚᱸᱫᱚ
     share:
@@ -713,10 +680,6 @@ sat:
       edit_tooltip: ᱱᱟᱠᱥᱟ ᱥᱟᱯᱲᱟᱣ ᱢᱮ
       edit_disabled_tooltip: ᱱᱚᱠᱥᱟ ᱥᱟᱯᱲᱟᱣ ᱞᱟᱹᱜᱤᱫᱛᱮ ᱵᱷᱤᱛᱨᱤ ᱥᱮᱫ ᱡᱩᱢ ᱢᱮ
       createnote_tooltip: ᱱᱚᱠᱥᱟ ᱨᱮ ᱠᱷᱟᱴᱟᱹ ᱚᱞ ᱥᱮᱞᱮᱫ ᱢᱮ
-    changesets:
-      show:
-        comment: ᱚᱠᱛᱟ
-        hide_comment: ᱫᱟᱱᱟᱝ
     directions:
       engines:
         fossgis_osrm_bike: ᱵᱟᱭᱥᱟᱭᱠᱤᱞ (OSRM)