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

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

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index d169e3e6607054baa218bdb5d817de9c642bb6a2..c48c8e850a534f8dd36a6b33c14757fa2e33d800 100644 (file)
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Durga Soren
+# Author: Gravitystorm
 # Author: Manik Soren
 # Author: Prakash Baski
 # Author: Rocky 734
@@ -23,6 +24,8 @@ sat:
       client_application:
         create: ᱧᱩᱛᱩᱢ ᱚᱞ
         update: ᱦᱟᱹᱞᱤᱭᱟᱹᱜ
+      oauth2_application:
+        update: ᱟᱹᱨᱩ ᱯᱷᱮᱨᱟᱣ
       trace:
         create: ᱞᱟᱫᱮ
         update: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱱᱪᱟᱣ ᱢᱮ
@@ -67,7 +70,9 @@ sat:
         title: ᱥᱟᱛᱚᱢ
         latitude: ᱚᱠᱷᱟᱝᱥᱚ
         longitude: ᱫᱨᱟᱜᱷᱤᱢᱟᱝᱥᱚ
-        language: ᱯᱟᱹᱨᱥᱤ
+        language_code: ᱯᱟᱹᱨᱥᱤ
+      doorkeeper/application:
+        name: ᱧᱩᱛᱩᱢ
       friend:
         user: ᱵᱮᱵᱦᱟᱨᱤᱡ
         friend: ᱜᱟᱛᱮ
@@ -111,7 +116,6 @@ sat:
       openid: OpenID
       google: ᱜᱩᱜᱟᱹᱞ
       facebook: ᱯᱷᱮᱥᱵᱩᱠ
-      windowslive: Windows Live
       github: ᱜᱤᱴᱦᱚᱵ
       wikipedia: ᱣᱤᱠᱤᱯᱤᱰᱤᱭᱟ
   api:
@@ -124,6 +128,18 @@ sat:
       entry:
         comment: ᱚᱠᱛᱟ
         full: ᱜᱚᱴᱟ ᱠᱷᱟᱴᱟᱹ ᱚᱞ
+  accounts:
+    edit:
+      title: ᱠᱷᱟᱛᱟ ᱥᱟᱯᱲᱟᱣ ᱢᱮ
+      my settings: ᱤᱧᱟᱜ ᱥᱟᱡᱟᱣᱠᱚ
+      current email address: 'ᱱᱮᱛᱚᱜ-ᱟᱜ ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
+      openid:
+        link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
+      public editing:
+        enabled link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
+      contributor terms:
+        link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
+      save changes button: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱺᱪᱟᱣ ᱢᱮ
   browse:
     created: ᱛᱮᱭᱟᱨᱱᱟ
     closed: ᱵᱚᱸᱫᱚ
@@ -184,11 +200,6 @@ sat:
     tag_details:
       tags: ᱴᱮᱜᱠᱚ
       telephone_link: '%{phone_number}ᱠᱟᱸᱞ ᱢᱮ'
-    note:
-      title: '%{id} :ᱠᱷᱟᱴᱟᱹ ᱚᱞ'
-      new_note: ᱱᱟᱶᱟ ᱠᱷᱟᱴᱚ ᱚᱞ
-      description: ᱵᱤᱵᱨᱚᱱ
-      report: ᱱᱚᱶᱟ ᱠᱷᱟᱴᱚ ᱚᱞ ᱨᱤᱯᱚᱴ ᱢᱮ
     query:
       introduction: ᱱᱚᱠᱥᱟ ᱨᱮ ᱚᱛᱟᱭ ᱢᱮ ᱥᱩᱨᱠᱚᱣᱟ ᱜᱩᱱᱠᱚ ᱧᱟᱢ ᱞᱟᱹᱜᱤᱫᱛᱮ ᱾
       nearby: ᱥᱩᱨᱠᱚᱣᱟ ᱜᱩᱱᱠᱚ
@@ -196,7 +207,7 @@ sat:
     changeset_paging_nav:
       showing_page: ᱥᱟᱦᱴᱟ %{page}
       next: ᱤᱱᱟ ᱛᱟᱭᱚᱢ >>
-      previous: << ᱛᱟᱭᱚᱢ
+      previous: « ᱛᱟᱭᱚᱢ
     changeset:
       anonymous: ᱵᱟᱝ ᱵᱟᱰᱟᱭ
       no_edits: (ᱥᱟᱯᱲᱟᱣ ᱵᱟᱝ)
@@ -207,6 +218,13 @@ sat:
       area: ᱡᱟᱭᱜᱟ
     index:
       load_more: ᱟᱨᱦᱚᱸ ᱞᱟᱫᱮ ᱢᱮ
+  dashboards:
+    popup:
+      your location: ᱟᱢᱟᱜ ᱡᱟᱭᱜᱟ
+      friend: ᱜᱟᱛᱮ
+    show:
+      my friends: ᱤᱧᱭᱟᱜ ᱜᱟᱛᱮ ᱠᱚ
+      no friends: ᱱᱤᱛ ᱫᱷᱟᱹᱵᱤᱡ ᱢᱤᱛᱴᱮᱱ ᱜᱟᱛᱮᱠᱩ ᱦᱚᱸ ᱵᱟᱢ ᱥᱮᱞᱮᱫ ᱠᱟᱛ ᱠᱚᱣᱟ᱾
   diary_entries:
     new:
       title: ᱱᱟᱶᱟ ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨ
@@ -336,8 +354,6 @@ sat:
           hut: ᱵᱩᱥᱩᱵᱚᱲᱟᱜ
           office: ᱟᱸᱯᱷᱤᱥ ᱵᱤᱞᱰᱤᱝ
           "yes": ᱵᱤᱞᱰᱤᱝ
-        emergency:
-          "yes": ᱴᱟᱴᱠᱟ
         highway:
           cycleway: ᱥᱟᱭᱠᱤᱞ ᱦᱚᱨ
           footway: ᱯᱷᱩᱴᱯᱟᱛᱷ
@@ -464,7 +480,6 @@ sat:
     log_in: ᱵᱚᱞᱚᱜ ᱢᱮ
     sign_up: ᱧᱩᱛᱩᱢ ᱚᱞ
     start_mapping: ᱱᱚᱠᱥᱟ ᱛᱮᱭᱟᱨ ᱮᱦᱚᱵ ᱢᱮ
-    sign_up_tooltip: ᱥᱟᱯᱲᱟᱣ ᱞᱟᱹᱜᱤᱫᱛᱮ ᱠᱷᱟᱛᱟ ᱵᱮᱱᱟᱣ ᱢᱮ
     edit: ᱥᱟᱯᱲᱟᱣ
     history: ᱱᱟᱜᱟᱢ
     export: ᱵᱷᱮᱡᱟ
@@ -497,14 +512,10 @@ sat:
       destroy_button: ᱜᱮᱫ ᱜᱤᱰᱤ
     new:
       title: ᱠᱷᱚᱵᱚᱨ ᱠᱩᱞ ᱢᱮ
-      subject: ᱵᱤᱥᱚᱭ
-      body: ᱦᱚᱲᱢᱚ
     outbox:
       subject: ᱵᱤᱥᱚᱭ
       date: ᱢᱟᱹᱦᱤᱛ
     show:
-      subject: ᱵᱤᱥᱚᱭ
-      date: ᱢᱟᱹᱦᱤᱛ
       destroy_button: ᱜᱮᱫ ᱜᱤᱰᱤ
       back: ᱛᱟᱭᱚᱢ
     sent_message_summary:
@@ -529,7 +540,6 @@ sat:
       lost password link: ᱟᱢᱟᱜ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱫᱟᱠᱟᱫᱟᱢ?
       login_button: ᱵᱚᱞᱚᱜ ᱢᱮ
       register now: ᱱᱤᱛᱜᱮ ᱚᱞ ᱦᱚᱪᱚᱜ ᱢᱮ
-      new to osm: OpenStreetMap ᱨᱮ ᱱᱟᱶᱟ ᱜᱮᱭᱟᱢ?
       no account: ᱠᱷᱟᱛᱟ ᱵᱟᱱᱩᱜ ᱛᱟᱢᱟ?
       auth_providers:
         github:
@@ -605,8 +615,6 @@ sat:
       edit: ᱥᱟᱯᱲᱟᱣ
       owner: 'ᱢᱟᱹᱞᱤᱠ:'
       description: 'ᱵᱤᱵᱨᱚᱱ:'
-    trace_paging_nav:
-      showing_page: ᱥᱟᱦᱴᱟ %{page}
     trace:
       more: ᱵᱟᱹᱲᱛᱤ
       view_map: ᱱᱚᱠᱥᱟ ᱧᱮᱞ ᱢᱮ
@@ -627,9 +635,6 @@ sat:
   users:
     new:
       title: ᱧᱩᱛᱩᱢ ᱚᱞ
-      email address: 'ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
-      confirm email address: 'ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ ᱜᱚᱴᱟᱭ ᱢᱮ:'
-      display name: ᱩᱫᱩᱜᱟ ᱧᱩᱠᱩᱢ
       continue: ᱧᱩᱛᱩᱢ ᱚᱞ
     terms:
       consider_pd_why: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
@@ -649,26 +654,8 @@ sat:
       add as friend: ᱜᱟᱛᱮ ᱥᱮᱞᱮᱫᱮᱢ
       email address: 'ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
       status: 'ᱫᱚᱥᱟ:'
-      description: ᱵᱤᱵᱨᱚᱱ
-      user location: ᱵᱮᱵᱷᱟᱨᱤᱡ-ᱟ ᱡᱟᱭᱜᱟ
-      my friends: ᱤᱧᱭᱟᱜ ᱜᱟᱛᱮ ᱠᱚ
-      no friends: ᱱᱤᱛ ᱫᱷᱟᱹᱵᱤᱡ ᱢᱤᱛᱴᱮᱱ ᱜᱟᱛᱮᱠᱩ ᱦᱚᱸ ᱵᱟᱢ ᱥᱮᱞᱮᱫ ᱠᱟᱛ ᱠᱚᱣᱟ᱾
       comments: ᱚᱠᱛᱟᱠᱚ
       confirm: ᱜᱚᱴᱟᱭ ᱢᱮ
-    popup:
-      your location: ᱟᱢᱟᱜ ᱡᱟᱭᱜᱟ
-      friend: ᱜᱟᱛᱮ
-    account:
-      title: ᱠᱷᱟᱛᱟ ᱥᱟᱯᱲᱟᱣ ᱢᱮ
-      my settings: ᱤᱧᱟᱜ ᱥᱟᱡᱟᱣᱠᱚ
-      current email address: 'ᱱᱮᱛᱚᱜ-ᱟᱜ ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
-      openid:
-        link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
-      public editing:
-        enabled link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
-      contributor terms:
-        link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
-      save changes button: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱺᱪᱟᱣ ᱢᱮ
     index:
       title: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
       heading: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
@@ -690,7 +677,17 @@ sat:
       status: ᱫᱚᱥᱟ
       showing_page: ᱥᱟᱦᱴᱟ %{page}
       next: ᱤᱱᱟ ᱛᱟᱭᱚᱢ >>
-      previous: << ᱛᱟᱭᱚᱢ
+      previous: « ᱛᱟᱭᱚᱢ
+  notes:
+    show:
+      title: '%{id} :ᱠᱷᱟᱴᱟᱹ ᱚᱞ'
+      description: ᱵᱤᱵᱨᱚᱱ
+      report: ᱱᱚᱶᱟ ᱠᱷᱟᱴᱚ ᱚᱞ ᱨᱤᱯᱚᱴ ᱢᱮ
+      hide: ᱩᱠᱩ
+      comment: ᱚᱠᱛᱟ
+    new:
+      title: ᱱᱟᱶᱟ ᱠᱷᱟᱴᱚ ᱚᱞ
+      add: ᱠᱷᱟᱴᱟᱹ ᱚᱞ ᱥᱮᱞᱮᱫ ᱢᱮ
   javascripts:
     close: ᱵᱚᱸᱫᱚ
     share:
@@ -724,12 +721,6 @@ sat:
       show:
         comment: ᱚᱠᱛᱟ
         hide_comment: ᱫᱟᱱᱟᱝ
-    notes:
-      new:
-        add: ᱠᱷᱟᱴᱟᱹ ᱚᱞ ᱥᱮᱞᱮᱫ ᱢᱮ
-      show:
-        hide: ᱩᱠᱩ
-        comment: ᱚᱠᱛᱟ
     directions:
       engines:
         fossgis_osrm_bike: ᱵᱟᱭᱥᱟᱭᱠᱤᱞ (OSRM)