X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4eecd59a5d976f6edf857c059fa28ed931b73121..86b84cff3bd9b9b07ecf1d4e0e4cdebc03fbf3fc:/config/locales/sat.yml?ds=inline

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index 5e516eb11..bc6fff49d 100644
--- 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,7 +24,7 @@ sat:
       client_application:
         create: á±§á±©á±á±©á±¢ á±á±
         update: á±¦á±á±¹á±á±¤á±­á±á±¹á±
-      doorkeeper_application:
+      oauth2_application:
         update: á±á±¹á±¨á±© á±¯á±·á±®á±¨á±á±£
       trace:
         create: á±á±á±«á±®
@@ -69,7 +70,9 @@ sat:
         title: á±¥á±á±á±á±¢
         latitude: á±á± á±·á±á±á±¥á±
         longitude: á±«á±¨á±á±á±·á±¤á±¢á±á±á±¥á±
-        language: á±¯á±á±¹á±¨á±¥á±¤
+        language_code: á±¯á±á±¹á±¨á±¥á±¤
+      doorkeeper/application:
+        name: á±§á±©á±á±©á±¢
       friend:
         user: á±µá±®á±µá±¦á±á±¨á±¤á±¡
         friend: á±á±á±á±®
@@ -110,10 +113,8 @@ sat:
   auth:
     providers:
       none: á±á± á±á±¦á±á±¸ á±µá±á±
-      openid: OpenID
       google: á±á±©á±á±á±¹á±
       facebook: á±¯á±·á±®á±¥á±µá±©á± 
-      windowslive: Windows Live
       github: á±á±¤á±´á±¦á±á±µ
       wikipedia: á±£á±¤á± á±¤á±¯á±¤á±°á±¤á±­á±
   api:
@@ -126,6 +127,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: á±µá±á±¸á±«á±
@@ -141,7 +154,6 @@ sat:
       way: (%{count}) á±¦á±á±¨á± á±
       relation: á±¥á±á±¹á±á±á±¹á±­á± á±© (%{count})
       relation_paginated: á±¥á±á±¹á±á±á±¹á±­á± á±© (%{x}-%{y} of %{count})
-      comment: (%{count})á±á± á±á±á± á±
       discussion: á±á±á±á±¢á±á±¨á±á±£
     node:
       title_html: á±á±á±¸á±´á±·:%{name}
@@ -186,11 +198,6 @@ sat:
     tag_details:
       tags: á±´á±®á±á± á±
       telephone_link: '%{phone_number}á± á±á±¸á± á±¢á±®'
-    note:
-      title: '%{id} :á± á±·á±á±´á±á±¹ á±á±'
-      new_note: á±±á±á±¶á± á± á±·á±á±´á± á±á±
-      description: á±µá±¤á±µá±¨á±á±±
-      report: á±±á±á±¶á± á± á±·á±á±´á± á±á± á±¨á±¤á±¯á±á±´ á±¢á±®
     query:
       introduction: á±±á±á± á±¥á± á±¨á±® á±á±á±á±­ á±¢á±® á±¥á±©á±¨á± á±á±£á± á±á±©á±±á± á± á±§á±á±¢ á±á±á±¹á±á±¤á±«á±á±® á±¾
       nearby: á±¥á±©á±¨á± á±á±£á± á±á±©á±±á± á±
@@ -198,7 +205,7 @@ sat:
     changeset_paging_nav:
       showing_page: á±¥á±á±¦á±´á± %{page}
       next: á±¤á±±á± á±á±á±­á±á±¢ >>
-      previous: << á±á±á±­á±á±¢
+      previous: Â« á±á±á±­á±á±¢
     changeset:
       anonymous: á±µá±á± á±µá±á±°á±á±­
       no_edits: (á±¥á±á±¯á±²á±á±£ á±µá±á±)
@@ -345,8 +352,6 @@ sat:
           hut: á±µá±©á±¥á±©á±µá±á±²á±á±
           office: á±á±¸á±¯á±·á±¤á±¥ á±µá±¤á±á±°á±¤á±
           "yes": á±µá±¤á±á±°á±¤á±
-        emergency:
-          "yes": á±´á±á±´á± á±
         highway:
           cycleway: á±¥á±á±­á± á±¤á± á±¦á±á±¨
           footway: á±¯á±·á±©á±´á±¯á±á±á±·
@@ -473,7 +478,6 @@ sat:
     log_in: á±µá±á±á±á± á±¢á±®
     sign_up: á±§á±©á±á±©á±¢ á±á±
     start_mapping: á±±á±á± á±¥á± á±á±®á±­á±á±¨ á±®á±¦á±á±µ á±¢á±®
-    sign_up_tooltip: á±¥á±á±¯á±²á±á±£ á±á±á±¹á±á±¤á±«á±á±® á± á±·á±á±á± á±µá±®á±±á±á±£ á±¢á±®
     edit: á±¥á±á±¯á±²á±á±£
     history: á±±á±á±á±á±¢
     export: á±µá±·á±®á±¡á±
@@ -499,30 +503,23 @@ sat:
     confirm_email:
       button: á±á±á±´á±á±­ á±¢á±®
   messages:
-    inbox:
+    messages_table:
       subject: á±µá±¤á±¥á±á±­
       date: á±¢á±á±¹á±¦á±¤á±
     message_summary:
       destroy_button: á±á±®á±« á±á±¤á±°á±¤
     new:
       title: á± á±·á±á±µá±á±¨ á± á±©á± á±¢á±®
-      subject: á±µá±¤á±¥á±á±­
-      body: á±¦á±á±²á±¢á±
-    outbox:
-      subject: á±µá±¤á±¥á±á±­
-      date: á±¢á±á±¹á±¦á±¤á±
     show:
-      subject: á±µá±¤á±¥á±á±­
-      date: á±¢á±á±¹á±¦á±¤á±
       destroy_button: á±á±®á±« á±á±¤á±°á±¤
       back: á±á±á±­á±á±¢
     sent_message_summary:
       destroy_button: á±á±®á±« á±á±¤á±°á±¤
   passwords:
-    lost_password:
+    new:
       title: á±«á±á±±á±á± á±¥á±á±µá±á±«á±½ á±á±« á± á±®á±«á±á±¢
       email address: 'á±¤á±¢á±®á± á±´á±·á±¤á± á±á±¹á±¬á±:'
-    reset_password:
+    update:
       flash changed: á±á±¢á±á± á±«á±á±±á±á± á±¥á±á±µá±á±«á±½ á±«á± á±µá±á±«á±á±á±®á±±á± á±¾
   profiles:
     edit:
@@ -538,7 +535,6 @@ sat:
       lost password link: á±á±¢á±á± á±«á±á±±á±á± á±¥á±á±µá±á±«á±½ á±á±«á±á± á±á±«á±á±¢?
       login_button: á±µá±á±á±á± á±¢á±®
       register now: á±±á±¤á±á±á±® á±á± á±¦á±á±ªá±á± á±¢á±®
-      new to osm: OpenStreetMap á±¨á±® á±±á±á±¶á± á±á±®á±­á±á±¢?
       no account: á± á±·á±á±á± á±µá±á±±á±©á± á±á±á±¢á±?
       auth_providers:
         github:
@@ -569,7 +565,6 @@ sat:
       user_page_link: á±µá±®á±µá±¦á±á±¨á±¤á±­á±á± á±¥á±á±¦á±´á±
     export:
       title: á±µá±·á±®á±¡á±
-      zoom: á±á±á±¹á±´á±©
       export_button: á±µá±·á±®á±¡á±
     help:
       welcome:
@@ -588,8 +583,7 @@ sat:
           forest: á±µá±¤á±¨
           wood: á± á±á±´á±·
           park: á±µá±á±á±á±±
-          school:
-          - á±¤á±á±©á±± á±á±¥á±²á±
+          school: á±¤á±á±©á±± á±á±¥á±²á±
           bicycle_shop: á±¥á±á±­á± á±¤á± á±«á±©á± á±á±¹á±±
           bicycle_parking: á±¥á±á±­á± á±¤á± á±¯á±á±¨á± á±¤á±
           toilets: á±´á±á±­á±á±®á±´á± á±
@@ -614,8 +608,6 @@ sat:
       edit: á±¥á±á±¯á±²á±á±£
       owner: 'á±¢á±á±¹á±á±¤á± :'
       description: 'á±µá±¤á±µá±¨á±á±±:'
-    trace_paging_nav:
-      showing_page: á±¥á±á±¦á±´á± %{page}
     trace:
       more: á±µá±á±¹á±²á±á±¤
       view_map: á±±á±á± á±¥á± á±§á±®á± á±¢á±®
@@ -636,9 +628,6 @@ sat:
   users:
     new:
       title: á±§á±©á±á±©á±¢ á±á±
-      email address: 'á±¤á±¢á±®á± á±´á±·á±¤á± á±á±¹á±¬á±:'
-      confirm email address: 'á±¤á±¢á±®á± á±´á±·á±¤á± á±á±¹á±¬á± á±á±á±´á±á±­ á±¢á±®:'
-      display name: á±©á±«á±©á±á± á±§á±©á± á±©á±¢
       continue: á±§á±©á±á±©á±¢ á±á±
     terms:
       consider_pd_why: á±±á±¤á±­á±á±¹ á±«á± á±ªá±®á±«?
@@ -658,21 +647,8 @@ sat:
       add as friend: á±á±á±á±® á±¥á±®á±á±®á±«á±®á±¢
       email address: 'á±¤á±¢á±®á± á±´á±·á±¤á± á±á±¹á±¬á±:'
       status: 'á±«á±á±¥á±:'
-      description: á±µá±¤á±µá±¨á±á±±
-      user location: á±µá±®á±µá±·á±á±¨á±¤á±¡-á± á±¡á±á±­á±á±
       comments: á±á± á±á±á± á±
       confirm: á±á±á±´á±á±­ á±¢á±®
-    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: á±µá±®á±µá±¦á±á±¨á±¤á±¡á±½á± á±©
@@ -694,7 +670,17 @@ sat:
       status: á±«á±á±¥á±
       showing_page: á±¥á±á±¦á±´á± %{page}
       next: á±¤á±±á± á±á±á±­á±á±¢ >>
-      previous: << á±á±á±­á±á±¢
+      previous: Â« á±á±á±­á±á±¢
+  notes:
+    show:
+      title: '%{id} :á± á±·á±á±´á±á±¹ á±á±'
+      description: á±µá±¤á±µá±¨á±á±±
+      report: á±±á±á±¶á± á± á±·á±á±´á± á±á± á±¨á±¤á±¯á±á±´ á±¢á±®
+      hide: á±©á± á±©
+      comment: á±á± á±á±
+    new:
+      title: á±±á±á±¶á± á± á±·á±á±´á± á±á±
+      add: á± á±·á±á±´á±á±¹ á±á± á±¥á±®á±á±®á±« á±¢á±®
   javascripts:
     close: á±µá±á±¸á±«á±
     share:
@@ -728,12 +714,6 @@ sat:
       show:
         comment: á±á± á±á±
         hide_comment: á±«á±á±±á±á±
-    notes:
-      new:
-        add: á± á±·á±á±´á±á±¹ á±á± á±¥á±®á±á±®á±« á±¢á±®
-      show:
-        hide: á±©á± á±©
-        comment: á±á± á±á±
     directions:
       engines:
         fossgis_osrm_bike: á±µá±á±­á±¥á±á±­á± á±¤á± (OSRM)