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

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

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index 58caa7af4a043336e9fd858d4aa1b13205db3334..8a989acaceadadab5c19612d71c22b649cb56c41 100644 (file)
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -163,7 +163,6 @@ sat:
         way: ᱦᱚᱨ
         relation: ᱥᱟᱹᱜᱟᱹᱭ
     containing_relation:
         way: ᱦᱚᱨ
         relation: ᱥᱟᱹᱜᱟᱹᱭ
     containing_relation:

-      entry_html: ᱥᱟᱹᱜᱟᱹᱭ %{relation_name}

       entry_role_html: ᱥᱟᱹᱜᱟᱹᱭ %{relation_name} (as %{relation_role})
     not_found:
       title: ᱵᱟᱝ ᱧᱟᱢ ᱞᱮᱱᱟ
       entry_role_html: ᱥᱟᱹᱜᱟᱹᱭ %{relation_name} (as %{relation_role})
     not_found:
       title: ᱵᱟᱝ ᱧᱟᱢ ᱞᱮᱱᱟ


@@ -506,7 +505,6 @@ sat:
       home location: 'ᱚᱲᱟᱜ ᱡᱟᱭᱜᱟ:'
   sessions:
     new:
       home location: 'ᱚᱲᱟᱜ ᱡᱟᱭᱜᱟ:'
   sessions:
     new:

-      title: ᱵᱚᱞᱚᱜ ᱢᱮ

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


@@ -543,8 +541,6 @@ sat:
     help:
       welcome:
         title: OpenStreetMap ᱨᱮ ᱥᱟᱹᱜᱩᱱ ᱫᱟᱨᱟᱢ
     help:
       welcome:
         title: OpenStreetMap ᱨᱮ ᱥᱟᱹᱜᱩᱱ ᱫᱟᱨᱟᱢ

-    sidebar:
-      close: ᱵᱚᱸᱫᱚ

     search:
       search: ᱥᱮᱸᱫᱽᱨᱟ
       where_am_i: ᱱᱚᱣᱟ ᱚᱠᱟ ᱨᱮ ᱢᱮᱱᱟᱜ-ᱟ?
     search:
       search: ᱥᱮᱸᱫᱽᱨᱟ
       where_am_i: ᱱᱚᱣᱟ ᱚᱠᱟ ᱨᱮ ᱢᱮᱱᱟᱜ-ᱟ?


@@ -622,9 +618,7 @@ sat:
   user_blocks:
     show:
       status: ᱫᱚᱥᱟ
   user_blocks:
     show:
       status: ᱫᱚᱥᱟ

-      show: ᱧᱮᱞ

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

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

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