X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7af9a60eccf55806a452186995b87ebab1b5b230..3f62d67684261b724a5a536be0260ce44654c828:/config/locales/my.yml?ds=sidebyside

diff --git a/config/locales/my.yml b/config/locales/my.yml
index b5e5a884a..81abd6ab9 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -3,10 +3,16 @@
 # Export driver: phpyaml
 # Author: Dr Lotus Black
 # Author: Ninjastrikers
+# Author: Zyh333222
 # Author: áá½ááºááá¬á(áá±á¬ááºááá®ê©»)
 # Author: áá°áá½ááºá¸
 ---
 my:
+  time:
+    formats:
+      friendly: |-
+        %e %B %Y
+         at %H:%M
   helpers:
     file:
       prompt: áá­á¯ááºáá½á±á¸áá«
@@ -20,9 +26,6 @@ my:
         create: áá¾ááºáá»ááº áá±á«ááºá¸ááá·áºáááº
       message:
         create: áá­á¯á·
-      client_application:
-        create: áá¾ááºáá¯á¶áááºáááº
-        update: áá½ááºá¸áá¶
       oauth2_application:
         create: áá¾ááºáá¯á¶áááºáááº
         update: áá½ááºá¸áá¶
@@ -125,16 +128,24 @@ my:
       entry:
         comment: áá¾ááºáá»ááº
         full: áá¾ááºáá¯ á¡áá¼áá·áºá¡áá¯á¶
-  account:
-    deletions:
-      show:
-        confirm_delete: áá±áá»á¬áá«ááá¬á¸
-        cancel: ááá¯ááºáá±á¬á·áá«
   accounts:
     edit:
       title: á¡áá±á¬áá·áºáá­á¯ áá¼ááºáááºáááº
       current email address: áááºáá¾á­ á¡á®á¸áá±á¸ááºáá­ááºáá¬
       save changes button: áá¼á±á¬ááºá¸áá²áá¾á¯áá»á¬á¸áá­á¯ áá­ááºá¸áááº
+    deletions:
+      show:
+        confirm_delete: áá±áá»á¬áá«ááá¬á¸
+        cancel: ááá¯ááºáá±á¬á·áá«
+    terms:
+      show:
+        title: áááºáá¾ááºáá»ááºáá»á¬á¸
+        heading: áááºáá¾ááºáá»ááºáá»á¬á¸
+        continue: áááºáááº
+        legale_select: 'áá±áá­á¯ááºáá¬ áá­á¯ááºáá¶:'
+        legale_names:
+          france: áá¼ááºáááº
+          italy: á¡á®ááá®
   browse:
     version: áá¬á¸áá¾ááºá¸
     anonymous: á¡áááºááá­
@@ -144,9 +155,6 @@ my:
     location: 'áááºáá±áá¬:'
     relation:
       members: á¡áá½á²á·áááºáá»á¬á¸
-    not_found:
-      type:
-        note: áá¾ááºáá¯
     timeout:
       type:
         note: áá¾ááºáá¯
@@ -163,7 +171,6 @@ my:
         commented_at_by_html: '%{user} á %{when} á¡áá¼á¬á áá½ááºá¸áá¶áá²á·áááº'
   changesets:
     changeset:
-      anonymous: á¡áááºááá­
       no_edits: (áááºá¸áá¼ááºáá¾á¯ ááá¾á­)
     index:
       load_more: áá­á¯áá­á¯áá±á«áºáá°áááº
@@ -182,14 +189,12 @@ my:
       m away: '%{count}áá­á¯ááº á¡áá½á¬'
     popup:
       your location: áááºá áááºáá±áá¬
-      friend: áá°áááºáá»ááºá¸
   diary_entries:
     form:
       location: áááºáá±áá¬
       use_map_link: áá¼á±áá¯á¶áá­á¯ á¡áá¯á¶á¸áá»áááº
     index:
       title: á¡áá¯á¶á¸áá¼á¯áá°áá»á¬á¸á áá±á·áááºáá¾ááºáááºá¸áá»á¬á¸
-      title_friends: áá­ááºáá½á±áá»á¬á¸á áá±á·áááºáá¾ááºáááºá¸áá»á¬á¸
       title_nearby: á¡áá®á¸á¡áá¬á¸áá¾á­ á¡áá¯á¶á¸áá¼á¯ááá±á·áááºáá¾ááºáááºá¸áá»á¬á¸
       user_title: '%{user}á áá±á·áááºáá¾ááºáááºá¸'
     show:
@@ -207,11 +212,6 @@ my:
       report: á¤áá¾ááºáá»ááºáá­á¯ á¡áá®áááºáá¶áááºáá¼áááº
     location:
       location: 'áááºáá±áá¬:'
-      view: áá¼áá·áºáááº
-      edit: áá¼ááºáááºáááº
-  diary_comments:
-    page:
-      comment: áá¾ááºáá»ááº
   geocoder:
     search_osm_nominatim:
       prefix:
@@ -465,7 +465,6 @@ my:
   issues:
     index:
       search: áá¾á¬áá½á±áááº
-      link_to_reports: á¡áá®áááºáá¶áá¬áá»á¬á¸áá­á¯ áá¼áá·áºáááº
       states:
         ignored: áá»ááºáá»á°áá¾á¯
         open: áá½áá·áºáá«
@@ -523,7 +522,7 @@ my:
       hi: áá­á¯ááºá¸ %{to_user}á
     message_notification:
       hi: áá­á¯ááºá¸ %{to_user}á
-    friendship_notification:
+    follow_notification:
       hi: áá­á¯ááºá¸ %{to_user}á
     email_confirm:
       greeting: áá­á¯ááºá¸á
@@ -543,16 +542,6 @@ my:
     confirm_email:
       button: á¡áááºáá¼á¯
   messages:
-    inbox:
-      title: á¡áááºáá¬
-    messages_table:
-      from: áá¾
-      to: áá­á¯á·
-      subject: á¡áá¼á±á¬ááºá¸á¡áá¬
-      date: áá±á·áá½á²
-    message_summary:
-      read_button: áááºáá¼á®á¸áá¼á±á¬ááºá¸ áá¾ááºáá¬á¸áááº
-      destroy_button: áá»ááºâáá«â
     new:
       title: áááºáá±á· áá­á¯á·áááº
     create:
@@ -560,15 +549,28 @@ my:
     no_such_message:
       title: áááºá¸áá²á·áá­á¯á·áááºáá±á·ááá¾á­áá«
       heading: áááºá¸áá²á·áá­á¯á·áááºáá±á·ááá¾á­áá«
-    outbox:
-      title: á¡áá½ááºáá¬
     show:
       title: áááºáá±á· áááºáááº
       reply_button: á¡áá¼á±á¬ááºá¸áá¼ááºáááº
       destroy_button: áá»ááºâáá«â
       back: áá±á¬ááºáá­á¯á·
-    sent_message_summary:
-      destroy_button: áá»ááºâáá«â
+    mailboxes:
+      messages_table:
+        from: áá¾
+        to: áá­á¯á·
+        subject: á¡áá¼á±á¬ááºá¸á¡áá¬
+        date: áá±á·áá½á²
+      message:
+        read_button: áááºáá¼á®á¸áá¼á±á¬ááºá¸ áá¾ááºáá¬á¸áááº
+        destroy_button: áá»ááºâáá«â
+    inboxes:
+      show:
+        title: á¡áááºáá¬
+    outboxes:
+      show:
+        title: á¡áá½ááºáá¬
+      message:
+        destroy_button: áá»ááºâáá«â
   passwords:
     new:
       title: ááá¬á¸áá¾ááº áá»á±á¬ááºáá¯á¶á¸áá½á¬á¸
@@ -583,14 +585,12 @@ my:
       flash changed: ááá·áºááá¬á¸áá¾ááºáá­á¯ áá¼á±á¬ááºá¸áá²áá¼á®á¸áá«áá¼á®
   sessions:
     new:
-      title: á¡áá±á¬áá·áºáá²áááºáááº
       tab_title: á¡áá±á¬áá·áºáá²áááºáááº
       email or username: á¡á®á¸áá±á¸ááºáá­ááºáá¬ áá­á¯á·ááá¯ááº á¡áá¯á¶á¸áá¼á¯áá°á¡áááº
       password: ááá¬á¸áá¾ááº
       remember: áá­áá­áá­á¯ áá¾ááºáá­áá«
       lost password link: ááá¬á¸áá¾ááº áá±á·áá±ááá¬á¸á
       login_button: á¡áá±á¬áá·áºáá²áááºáááº
-      register now: á¡áá¯áá² áá¾ááºáá¯á¶áááºáááº
     destroy:
       title: á¡áá±á¬áá·áºáá¾áá¼ááºáá½ááº
       logout_button: á¡áá±á¬áá·áºáá¾áá¼ááºáá½ááº
@@ -640,7 +640,6 @@ my:
       title: áá±á¸ááá¬ áá¾á­áá±á¸áá¬á¸
     sidebar:
       search_results: áá¾á¬áá½á±áá¾á¯ ááá¬ááºáá»á¬á¸
-      close: áá­ááºáááº
     search:
       search: áá¾á¬áá½á±áááº
       from: áá¾
@@ -701,15 +700,6 @@ my:
     new:
       title: áá¾ááºáá¯á¶áááºáááº
       continue: áá¾ááºáá¯á¶áááºáááº
-    terms:
-      title: áááºáá¾ááºáá»ááºáá»á¬á¸
-      heading: áááºáá¾ááºáá»ááºáá»á¬á¸
-      continue: áááºáááº
-      decline: áá¼ááºá¸áááºáááº
-      legale_select: 'áá±áá­á¯ááºáá¬ áá­á¯ááºáá¶:'
-      legale_names:
-        france: áá¼ááºáááº
-        italy: á¡á®ááá®
     show:
       diary: áá±á·áááºáá¾ááºáááºá¸
       edits: áááºá¸áá¼ááºáá¾á¯áá»á¬á¸
@@ -721,9 +711,13 @@ my:
       comments: áá¾ááºáá»ááºáá»á¬á¸
       create_block: á¤á¡áá¯á¶á¸áá¼á¯áá°áá­á¯ áá­ááºáááºáááº
       confirm: á¡áááºáá¼á¯
-    index:
-      title: á¡áá¯á¶á¸áá¼á¯áá°áá»á¬á¸
-      heading: á¡áá¯á¶á¸áá¼á¯áá°áá»á¬á¸
+    lists:
+      show:
+        title: á¡áá¯á¶á¸áá¼á¯áá°áá»á¬á¸
+        heading: á¡áá¯á¶á¸áá¼á¯áá°áá»á¬á¸
+    changeset_comments:
+      page:
+        comment: áá¾ááºáá»ááº
   user_blocks:
     helper:
       block_duration:
@@ -741,9 +735,7 @@ my:
           other: '%{count} áá¾ááº'
     show:
       status: á¡áá¼á±á¡áá±
-      show: áá¼
       edit: áá¼ááºáááº
-      confirm: áá±áá»á¬áá«ááá¬á¸
     block:
       show: áá¼ááááº
       edit: áá¼ááºáááºáááº