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

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

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index 12523b6df34b4c2440a46e1b0ad99e32e3f8b1d5..476164612ba7c3684ce88cd185e9a7be701682be 100644 (file)
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -1,7 +1,6 @@
 # Messages for Santali (ᱥᱟᱱᱛᱟᱲᱤ)
 # Exported from translatewiki.net
 # Export driver: phpyaml
-# Author: Abijeet Patro
 # Author: Durga Soren
 # Author: Manik Soren
 # Author: Prakash Baski
@@ -87,10 +86,13 @@ sat:
         sender: ᱵᱷᱮᱡᱟᱭᱤᱪ
         title: ᱵᱤᱥᱚᱭ
         body: ᱦᱚᱲᱢᱚ
+      redaction:
+        description: ᱵᱤᱵᱨᱚᱱ
       report:
         category: ᱟᱢᱟᱜ ᱨᱤᱯᱚᱴ ᱨᱮᱭᱟᱜ ᱠᱟᱨᱚᱬ ᱪᱚᱭᱚᱱ ᱢᱮ
       user:
         email: ᱤᱢᱮᱞ
+        new_email: 'ᱱᱟᱶᱟ ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
         active: ᱩᱥᱨᱟᱹᱣ
         display_name: ᱩᱫᱩᱜ ᱧᱩᱛᱩᱢ
         description: ᱵᱤᱵᱨᱚᱱ
@@ -481,6 +483,12 @@ sat:
       text: ᱫᱟᱱ ᱮᱢᱢᱮ
     learn_more: ᱟᱨᱦᱚᱸ ᱪᱤᱫᱢᱮ
     more: ᱵᱟᱹᱲᱛᱤ
+  confirmations:
+    confirm:
+      heading: ᱟᱢᱟᱜ ᱤᱢᱮᱞ ᱡᱟᱸᱪ ᱛᱟᱢ!
+      button: ᱜᱚᱴᱟᱭ ᱢᱮ
+    confirm_email:
+      button: ᱜᱚᱴᱟᱭ ᱢᱮ
   messages:
     inbox:
       subject: ᱵᱤᱥᱚᱭ
@@ -501,6 +509,31 @@ sat:
       back: ᱛᱟᱭᱚᱢ
     sent_message_summary:
       destroy_button: ᱜᱮᱫ ᱜᱤᱰᱤ
+  passwords:
+    lost_password:
+      title: ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱫ ᱠᱮᱫᱟᱢ
+      email address: 'ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
+    reset_password:
+      flash changed: ᱟᱢᱟᱜ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱫᱚ ᱵᱚᱫᱚᱞᱮᱱᱟ ᱾
+  sessions:
+    new:
+      title: ᱵᱚᱞᱚᱜ ᱢᱮ
+      heading: ᱵᱚᱞᱚᱜ ᱢᱮ
+      password: 'ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ:'
+      remember: ᱫᱤᱥᱟᱹᱭᱤᱧ ᱢᱮ
+      lost password link: ᱟᱢᱟᱜ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱫᱟᱠᱟᱫᱟᱢ?
+      login_button: ᱵᱚᱞᱚᱜ ᱢᱮ
+      register now: ᱱᱤᱛᱜᱮ ᱚᱞ ᱦᱚᱪᱚᱜ ᱢᱮ
+      new to osm: OpenStreetMap ᱨᱮ ᱱᱟᱶᱟ ᱜᱮᱭᱟᱢ?
+      no account: ᱠᱷᱟᱛᱟ ᱵᱟᱱᱩᱜ ᱛᱟᱢᱟ?
+      auth_providers:
+        github:
+          title: ᱜᱤᱴᱦᱚᱵ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
+        wikipedia:
+          title: ᱩᱭᱠᱤᱯᱤᱰᱤᱭᱟ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
+    destroy:
+      title: ᱩᱰᱩᱜᱚᱜᱢᱮ
+      logout_button: ᱩᱰᱩᱜᱚᱜᱢᱮ
   shared:
     markdown_help:
       link: ᱞᱤᱸᱠ
@@ -546,15 +579,6 @@ sat:
           bicycle_shop: ᱥᱟᱭᱠᱤᱞ ᱫᱩᱠᱟᱹᱱ
           bicycle_parking: ᱥᱟᱭᱠᱤᱞ ᱯᱟᱨᱠᱤᱝ
           toilets: ᱴᱚᱭᱞᱮᱴᱠᱚ
-    richtext_area:
-      edit: ᱥᱟᱯᱲᱟᱣ
-      preview: ᱧᱮᱞ ᱵᱤᱰᱟᱹᱣ
-    markdown_help:
-      link: ᱡᱚᱱᱚᱲ
-      text: ᱚᱞ
-      image: ᱪᱤᱛᱟᱹᱨ
-      alt: ᱥᱟᱱᱟᱢ ᱚᱱᱚᱞᱠᱚ
-      url: URL
     welcome:
       title: ᱥᱟᱹᱜᱩᱱ ᱫᱟᱨᱟᱢ!
       whats_on_the_map:
@@ -581,10 +605,8 @@ sat:
     trace:
       more: ᱵᱟᱹᱲᱛᱤ
       view_map: ᱱᱚᱠᱥᱟ ᱧᱮᱞ ᱢᱮ
-      edit: ᱥᱟᱯᱲᱟᱣ
       edit_map: ᱱᱚᱠᱥᱟ ᱥᱟᱯᱲᱟᱣ ᱢᱮ
       public: ᱦᱚᱲ ᱠᱚᱣᱟ
-      map: ᱱᱟᱠᱥᱟ
   oauth:
     authorize:
       allow_write_api: ᱱᱚᱠᱥᱟ ᱵᱚᱫᱚᱞ ᱢᱮ ᱾
@@ -598,38 +620,11 @@ sat:
     index:
       application: ᱟᱹᱨᱡᱤ ᱥᱟᱠᱟᱢ ᱧᱩᱛᱩᱢ
   users:
-    login:
-      title: ᱵᱚᱞᱚᱜ ᱢᱮ
-      heading: ᱵᱚᱞᱚᱜ ᱢᱮ
-      password: 'ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ:'
-      remember: ᱫᱤᱥᱟᱹᱭᱤᱧ ᱢᱮ
-      lost password link: ᱟᱢᱟᱜ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱫᱟᱠᱟᱫᱟᱢ?
-      login_button: ᱵᱚᱞᱚᱜ ᱢᱮ
-      register now: ᱱᱤᱛᱜᱮ ᱚᱞ ᱦᱚᱪᱚᱜ ᱢᱮ
-      new to osm: OpenStreetMap ᱨᱮ ᱱᱟᱶᱟ ᱜᱮᱭᱟᱢ?
-      no account: ᱠᱷᱟᱛᱟ ᱵᱟᱱᱩᱜ ᱛᱟᱢᱟ?
-      auth_providers:
-        github:
-          title: ᱜᱤᱴᱦᱚᱵ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
-        wikipedia:
-          title: ᱩᱭᱠᱤᱯᱤᱰᱤᱭᱟ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
-        yahoo:
-          title: ᱭᱟᱦᱚ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
-    logout:
-      title: ᱩᱰᱩᱜᱚᱜᱢᱮ
-      logout_button: ᱩᱰᱩᱜᱚᱜᱢᱮ
-    lost_password:
-      title: ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱫ ᱠᱮᱫᱟᱢ
-      email address: 'ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
-    reset_password:
-      flash changed: ᱟᱢᱟᱜ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱫᱚ ᱵᱚᱫᱚᱞᱮᱱᱟ ᱾
     new:
       title: ᱧᱩᱛᱩᱢ ᱚᱞ
       email address: 'ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
       confirm email address: 'ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ ᱜᱚᱴᱟᱭ ᱢᱮ:'
       display name: ᱩᱫᱩᱜᱟ ᱧᱩᱠᱩᱢ
-      password: 'ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ:'
-      confirm password: 'ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱜᱚᱴᱟᱭ ᱢᱮ:'
       continue: ᱧᱩᱛᱩᱢ ᱚᱞ
     terms:
       consider_pd_why: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
@@ -663,7 +658,6 @@ sat:
       title: ᱠᱷᱟᱛᱟ ᱥᱟᱯᱲᱟᱣ ᱢᱮ
       my settings: ᱤᱧᱟᱜ ᱥᱟᱡᱟᱣᱠᱚ
       current email address: 'ᱱᱮᱛᱚᱜ-ᱟᱜ ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
-      new email address: 'ᱱᱟᱶᱟ ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
       openid:
         link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
       public editing:
@@ -671,16 +665,9 @@ sat:
       contributor terms:
         link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
       image: ᱪᱤᱛᱟᱹᱨᱺ
-      gravatar:
-        link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ?
       new image: ᱢᱤᱫᱴᱮᱱ ᱪᱤᱛᱟᱹᱨ ᱥᱮᱞᱮᱫ ᱢᱮ
       home location: 'ᱚᱲᱟᱜ ᱡᱟᱭᱜᱟ:'
       save changes button: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱺᱪᱟᱣ ᱢᱮ
-    confirm:
-      heading: ᱟᱢᱟᱜ ᱤᱢᱮᱞ ᱡᱟᱸᱪ ᱛᱟᱢ!
-      button: ᱜᱚᱴᱟᱭ ᱢᱮ
-    confirm_email:
-      button: ᱜᱚᱴᱟᱭ ᱢᱮ
     index:
       title: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
       heading: ᱵᱮᱵᱦᱟᱨᱤᱡᱽᱠᱩ
@@ -769,10 +756,6 @@ sat:
       show_address: ᱴᱷᱤᱠᱟᱹᱬᱟ ᱩᱫᱩᱜ
       centre_map: ᱱᱚᱠᱥᱟ ᱱᱚᱰᱮ ᱛᱟᱞᱟᱭ ᱢᱮ
   redactions:
-    edit:
-      description: ᱵᱤᱵᱨᱚᱱ
-    new:
-      description: ᱵᱤᱵᱨᱚᱱ
     show:
       description: 'ᱵᱤᱵᱨᱚᱱ:'
       confirm: ᱪᱮᱫ ᱟᱢ ᱜᱚᱴᱟ ᱢᱮᱱᱟᱢ-ᱟ?