X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/54070efb132d0166d834f712556768046098e3cd..0f2df0b9efcfff1d6bb0f7b2d16fa23f85d8708d:/config/locales/my.yml?ds=sidebyside

diff --git a/config/locales/my.yml b/config/locales/my.yml
index ce2b26000..b099685dc 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: áá­á¯ááºáá½á±á¸áá«
@@ -539,16 +545,6 @@ my:
     confirm_email:
       button: á¡áááºáá¼á¯
   messages:
-    inbox:
-      title: á¡áááºáá¬
-    messages_table:
-      from: áá¾
-      to: áá­á¯á·
-      subject: á¡áá¼á±á¬ááºá¸á¡áá¬
-      date: áá±á·áá½á²
-    message_summary:
-      read_button: áááºáá¼á®á¸áá¼á±á¬ááºá¸ áá¾ááºáá¬á¸áááº
-      destroy_button: áá»ááºâáá«â
     new:
       title: áááºáá±á· áá­á¯á·áááº
     create:
@@ -556,15 +552,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: ááá¬á¸áá¾ááº áá»á±á¬ááºáá¯á¶á¸áá½á¬á¸
@@ -579,7 +588,6 @@ my:
       flash changed: ááá·áºááá¬á¸áá¾ááºáá­á¯ áá¼á±á¬ááºá¸áá²áá¼á®á¸áá«áá¼á®
   sessions:
     new:
-      title: á¡áá±á¬áá·áºáá²áááºáááº
       tab_title: á¡áá±á¬áá·áºáá²áááºáááº
       email or username: á¡á®á¸áá±á¸ááºáá­ááºáá¬ áá­á¯á·ááá¯ááº á¡áá¯á¶á¸áá¼á¯áá°á¡áááº
       password: ááá¬á¸áá¾ááº
@@ -635,7 +643,6 @@ my:
       title: áá±á¸ááá¬ áá¾á­áá±á¸áá¬á¸
     sidebar:
       search_results: áá¾á¬áá½á±áá¾á¯ ááá¬ááºáá»á¬á¸
-      close: áá­ááºáááº
     search:
       search: áá¾á¬áá½á±áááº
       from: áá¾
@@ -715,9 +722,10 @@ my:
       comments: áá¾ááºáá»ááºáá»á¬á¸
       create_block: á¤á¡áá¯á¶á¸áá¼á¯áá°áá­á¯ áá­ááºáááºáááº
       confirm: á¡áááºáá¼á¯
-    index:
-      title: á¡áá¯á¶á¸áá¼á¯áá°áá»á¬á¸
-      heading: á¡áá¯á¶á¸áá¼á¯áá°áá»á¬á¸
+    lists:
+      show:
+        title: á¡áá¯á¶á¸áá¼á¯áá°áá»á¬á¸
+        heading: á¡áá¯á¶á¸áá¼á¯áá°áá»á¬á¸
   user_blocks:
     helper:
       block_duration:
@@ -735,9 +743,7 @@ my:
           other: '%{count} áá¾ááº'
     show:
       status: á¡áá¼á±á¡áá±
-      show: áá¼
       edit: áá¼ááºáááº
-      confirm: áá±áá»á¬áá«ááá¬á¸
     block:
       show: áá¼ááááº
       edit: áá¼ááºáááºáááº