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

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

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index a37e7b87bcb478b1e4ace7bbfd9bc53510f10da9..9c891f96c80b55628198854589b66e3e7901c030 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}'
@@ -218,6 +207,17 @@ sat:
       area: ᱡᱟᱭᱜᱟ
     index:
       load_more: ᱟᱨᱦᱚᱸ ᱞᱟᱫᱮ ᱢᱮ
+      feed:
+        created: ᱛᱮᱭᱟᱨᱱᱟ
+        closed: ᱵᱚᱸᱫᱚ
+        belongs_to: ᱚᱱᱚᱞᱤᱭᱟᱹ
+    show:
+      discussion: ᱜᱟᱞᱢᱟᱨᱟᱣ
+    paging_nav:
+      nodes: (%{count}) ᱜᱟᱸᱴᱷᱠᱚ
+      ways: (%{count}) ᱦᱚᱨᱠᱚ
+      relations: ᱥᱟᱹᱜᱟᱹᱭᱠᱩ (%{count})
+      relations_paginated: ᱥᱟᱹᱜᱟᱹᱭᱠᱩ (%{x}-%{y} of %{count})
   dashboards:
     popup:
       your location: ᱟᱢᱟᱜ ᱡᱟᱭᱜᱟ
@@ -531,18 +531,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: ᱩᱰᱩᱜᱚᱜᱢᱮ
@@ -567,7 +561,6 @@ sat:
       user_page_link: ᱵᱮᱵᱦᱟᱨᱤᱭᱟᱜ ᱥᱟᱦᱴᱟ
     export:
       title: ᱵᱷᱮᱡᱟ
-      zoom: ᱞᱟᱹᱴᱩ
       export_button: ᱵᱷᱮᱡᱟ
     help:
       welcome:
@@ -583,10 +576,10 @@ sat:
       table:
         entry:
           footway: ᱛᱟᱲᱟᱢᱦᱚᱨ
-          forest_only: ᱵᱤᱨ
+          forest: ᱵᱤᱨ
           wood: ᱠᱟᱴᱷ
           park: ᱵᱟᱜᱟᱱ
-          school_only: ᱤᱛᱩᱱ ᱟᱥᱲᱟ
+          school: ᱤᱛᱩᱱ ᱟᱥᱲᱟ
           bicycle_shop: ᱥᱟᱭᱠᱤᱞ ᱫᱩᱠᱟᱹᱱ
           bicycle_parking: ᱥᱟᱭᱠᱤᱞ ᱯᱟᱨᱠᱤᱝ
           toilets: ᱴᱚᱭᱞᱮᱴᱠᱚ
@@ -616,6 +609,12 @@ sat:
       view_map: ᱱᱚᱠᱥᱟ ᱧᱮᱞ ᱢᱮ
       edit_map: ᱱᱚᱠᱥᱟ ᱥᱟᱯᱲᱟᱣ ᱢᱮ
       public: ᱦᱚᱲ ᱠᱚᱣᱟ
+  application:
+    auth_providers:
+      github:
+        title: ᱜᱤᱴᱦᱚᱵ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
+      wikipedia:
+        title: ᱩᱭᱠᱤᱯᱤᱰᱤᱭᱟ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
   oauth:
     authorize:
       allow_write_api: ᱱᱚᱠᱥᱟ ᱵᱚᱫᱚᱞ ᱢᱮ ᱾
@@ -671,9 +670,6 @@ sat:
       edit: ᱥᱟᱯᱲᱟᱣ
     blocks:
       status: ᱫᱚᱥᱟ
-      showing_page: ᱥᱟᱦᱴᱟ %{page}
-      next: ᱤᱱᱟ ᱛᱟᱭᱚᱢ >>
-      previous: « ᱛᱟᱭᱚᱢ
   notes:
     show:
       title: '%{id} :ᱠᱷᱟᱴᱟᱹ ᱚᱞ'