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

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

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index bc6fff49d9c114c2ae75b27c6c7c729da2f9247b..52697ac8812d72f429bc6d41d9a1220e4dac97c8 100644 (file)
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -140,21 +140,12 @@ sat:
         link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
       save changes button: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱺᱪᱟᱣ ᱢᱮ
   browse:
         link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
       save changes button: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱺᱪᱟᱣ ᱢᱮ
   browse:

-    created: ᱛᱮᱭᱟᱨᱱᱟ
-    closed: ᱵᱚᱸᱫᱚ

     anonymous: ᱵᱟᱝ ᱵᱟᱰᱟᱭ
     no_comment: (ᱚᱠᱛᱚ ᱵᱟᱝ)
     download_xml: XML ᱰᱟᱩᱱᱞᱚᱰ ᱢᱮ
     view_history: ᱱᱟᱜᱟᱢ ᱧᱮᱞᱢᱮ
     view_details: ᱵᱤᱵᱨᱚᱱ ᱧᱮᱞ ᱢᱮ
     location: 'ᱡᱟᱭᱜᱟ:'
     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})
-      discussion: ᱜᱟᱞᱢᱟᱨᱟᱣ

     node:
       title_html: ᱜᱟᱸᱴᱷ:%{name}
       history_title_html: 'ᱜᱟᱸᱴᱷ ᱨᱮᱭᱟᱜ ᱦᱤᱛᱟᱹᱞ: %{name}'
     node:
       title_html: ᱜᱟᱸᱴᱷ:%{name}
       history_title_html: 'ᱜᱟᱸᱴᱷ ᱨᱮᱭᱟᱜ ᱦᱤᱛᱟᱹᱞ: %{name}'


@@ -216,6 +207,17 @@ sat:
       area: ᱡᱟᱭᱜᱟ
     index:
       load_more: ᱟᱨᱦᱚᱸ ᱞᱟᱫᱮ ᱢᱮ
       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: ᱟᱢᱟᱜ ᱡᱟᱭᱜᱟ
   dashboards:
     popup:
       your location: ᱟᱢᱟᱜ ᱡᱟᱭᱜᱟ