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

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

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index b300df57183fa85811c6157b0ea666880e1716c8..cfa052796c9cd504b4cd57ac912d01d00caaecf6 100644 (file)
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -4,6 +4,7 @@
 # Author: Durga Soren
 # Author: Gravitystorm
 # Author: Manik Soren
+# Author: Marwin H.H.
 # Author: Prakash Baski
 # Author: Rocky 734
 ---
@@ -125,9 +126,8 @@ sat:
         comment: ᱚᱠᱛᱟ
         full: ᱜᱚᱴᱟ ᱠᱷᱟᱴᱟᱹ ᱚᱞ
   accounts:
-    edit:
+    show:
       title: ᱠᱷᱟᱛᱟ ᱥᱟᱯᱲᱟᱣ ᱢᱮ
-      my settings: ᱤᱧᱟᱜ ᱥᱟᱡᱟᱣᱠᱚ
       current email address: 'ᱱᱮᱛᱚᱜ-ᱟᱜ ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
       openid:
         link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
@@ -136,7 +136,6 @@ sat:
       save changes button: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱺᱪᱟᱣ ᱢᱮ
     terms:
       show:
-        consider_pd_why: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
         continue: ᱞᱮᱛᱟᱲ
   browse:
     anonymous: ᱵᱟᱝ ᱵᱟᱰᱟᱭ
@@ -521,7 +520,7 @@ sat:
     copyright:
       native:
         mapping_link: ᱱᱚᱠᱥᱟ ᱛᱮᱭᱟᱨ ᱮᱦᱚᱵ ᱢᱮ
-    edit:
+    not_public_flash:
       user_page_link: ᱵᱮᱵᱦᱟᱨᱤᱭᱟᱜ ᱥᱟᱦᱴᱟ
     export:
       title: ᱵᱷᱮᱡᱟ
@@ -533,6 +532,10 @@ sat:
       search: ᱥᱮᱸᱫᱽᱨᱟ
       where_am_i: ᱱᱚᱣᱟ ᱚᱠᱟ ᱨᱮ ᱢᱮᱱᱟᱜ-ᱟ?
       submit_text: ᱜᱚ
+      modes:
+        bicycle: ᱵᱟᱭᱥᱟᱭᱠᱤᱞ
+        car: ᱠᱟᱨ
+        foot: ᱛᱟᱲᱟᱢ
     key:
       table:
         entry:
@@ -586,7 +589,6 @@ sat:
       my notes: ᱤᱧᱭᱟᱜ ᱠᱷᱟᱴᱟᱹ ᱚᱞᱠᱚ
       my messages: ᱤᱧᱭᱟᱜ ᱠᱷᱚᱵᱚᱨ ᱠᱚ
       my profile: ᱤᱧᱭᱟᱜ ᱢᱚᱦᱲᱟ
-      my settings: ᱤᱧᱟᱜ ᱥᱟᱡᱟᱣᱠᱚ
       my comments: ᱤᱧᱭᱟᱜ ᱚᱠᱛᱟ ᱠᱚ
       send message: ᱠᱷᱚᱵᱚᱨ ᱠᱩᱞ ᱢᱮ
       diary: ᱰᱟᱭᱨᱤ
@@ -655,10 +657,6 @@ sat:
       edit_disabled_tooltip: ᱱᱚᱠᱥᱟ ᱥᱟᱯᱲᱟᱣ ᱞᱟᱹᱜᱤᱫᱛᱮ ᱵᱷᱤᱛᱨᱤ ᱥᱮᱫ ᱡᱩᱢ ᱢᱮ
       createnote_tooltip: ᱱᱚᱠᱥᱟ ᱨᱮ ᱠᱷᱟᱴᱟᱹ ᱚᱞ ᱥᱮᱞᱮᱫ ᱢᱮ
     directions:
-      engines:
-        fossgis_osrm_bike: ᱵᱟᱭᱥᱟᱭᱠᱤᱞ (OSRM)
-        fossgis_osrm_car: ᱠᱟᱨ (OSRM)
-        fossgis_osrm_foot: ᱛᱟᱲᱟᱢ (OSRM)
       directions: ᱫᱤᱥᱟᱠᱚ
       instructions:
         exit_counts: