From 1ef1594c0aa5bf2c69c9d9dc28749f6d917ba666 Mon Sep 17 00:00:00 2001
From: xmflsct <xmflsct@gmail.com>
Date: Sat, 7 May 2022 18:25:45 +0200
Subject: [PATCH 01/14] New translations timeline.json (Chinese Simplified)

---
 src/i18n/zh-Hans/components/timeline.json | 35 ++++++++++++++++++-----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/i18n/zh-Hans/components/timeline.json b/src/i18n/zh-Hans/components/timeline.json
index d39a21c3..797049b8 100644
--- a/src/i18n/zh-Hans/components/timeline.json
+++ b/src/i18n/zh-Hans/components/timeline.json
@@ -58,6 +58,12 @@
         "accessibilityLabel": "{{count}}用户喜欢了此嘟文",
         "accessibilityHint": "点击以了解用户",
         "text": "$t(screenTabs:shared.users.statuses.favourited_by)"
+      },
+      "history": {
+        "accessibilityLabel": "此嘟文已被编辑{{count}}次",
+        "accessibilityHint": "点击查看所有编辑记录",
+        "text": "编辑{{count}}次",
+        "text_plural": "编辑{{count}}次"
       }
     },
     "attachment": {
@@ -95,7 +101,10 @@
             "accessibilityHint": "用户帐户名"
           }
         },
-        "application": "发自 {{application}}",
+        "application": "发自于 {{application}}",
+        "edited": {
+          "accessibilityLabel": "嘟文已编辑"
+        },
         "muted": {
           "accessibilityLabel": "已静音此嘟文"
         },
@@ -104,7 +113,7 @@
             "accessibilityLabel": "此嘟文是私信"
           },
           "private": {
-            "accessibilityLabel": "此嘟文仅关注者可见"
+            "accessibilityLabel": "此嘟文仅关注着可见"
           }
         }
       },
@@ -158,18 +167,30 @@
         },
         "status": {
           "heading": "关于嘟文",
+          "edit": {
+            "function": "编辑嘟文",
+            "button": "编辑此条嘟文"
+          },
           "delete": {
             "function": "删除",
-            "button": "删除此条嘟文"
+            "button": "删除此条嘟文",
+            "alert": {
+              "title": "确认删除嘟文？",
+              "message": "确定要删除这条嘟文吗？所有相关的转嘟和喜欢都会被清除，回复将会失去关联。",
+              "buttons": {
+                "confirm": "确认删除",
+                "cancel": "$t(common:buttons.cancel)"
+              }
+            }
           },
           "deleteEdit": {
-            "function": "删除",
-            "button": "删除并重新编辑此条嘟文",
+            "function": "删除嘟文",
+            "button": "删除此条嘟文",
             "alert": {
               "title": "确认删除嘟文？",
               "message": "确定要删除这条嘟文并重新编辑它吗？所有相关的转嘟和喜欢都会被清除，回复将会失去关联。",
               "buttons": {
-                "confirm": "删除并重新编辑",
+                "confirm": "确认删除",
                 "cancel": "$t(common:buttons.cancel)"
               }
             }
@@ -210,4 +231,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file

From 7192b97770314093b30d5f5c2a4e0ba733d233fd Mon Sep 17 00:00:00 2001
From: xmflsct <xmflsct@gmail.com>
Date: Sun, 8 May 2022 16:18:31 +0200
Subject: [PATCH 02/14] New translations common.json (Vietnamese)

---
 src/i18n/vi/common.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/vi/common.json b/src/i18n/vi/common.json
index 813185d7..92fe0faf 100644
--- a/src/i18n/vi/common.json
+++ b/src/i18n/vi/common.json
@@ -1,5 +1,6 @@
 {
   "buttons": {
+    "OK": "OK",
     "apply": "Áp dụng",
     "cancel": "Hủy bỏ"
   },

From 5bc75e480b67301bc59f0b8da4a9ec064e86cf51 Mon Sep 17 00:00:00 2001
From: xmflsct <xmflsct@gmail.com>
Date: Sun, 8 May 2022 17:15:33 +0200
Subject: [PATCH 03/14] New translations compose.json (Vietnamese)

---
 src/i18n/vi/screens/compose.json | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/i18n/vi/screens/compose.json b/src/i18n/vi/screens/compose.json
index c5473438..6b14f13c 100644
--- a/src/i18n/vi/screens/compose.json
+++ b/src/i18n/vi/screens/compose.json
@@ -16,7 +16,9 @@
         "default": "Đăng",
         "conversation": "Tin nhắn",
         "reply": "Trả lời",
-        "edit": "Sửa"
+        "deleteEdit": "Tút",
+        "edit": "Sửa",
+        "share": "Tút"
       },
       "alert": {
         "default": {
@@ -40,7 +42,13 @@
           "placeholder": "Viết nội dung ẩn của bạn ở đây"
         },
         "textInput": {
-          "placeholder": "Bạn đang nghĩ về điều gì?"
+          "placeholder": "Bạn đang nghĩ về điều gì?",
+          "keyboardImage": {
+            "exceedMaximum": {
+              "title": "Vượt quá số lượng tập tin cho phép",
+              "OK": "$t(common:buttons.OK)"
+            }
+          }
         }
       },
       "footer": {
@@ -163,7 +171,8 @@
       "content": {
         "accessibilityHint": "Đã lưu nháp, nhấn để tiếp tục viết",
         "textEmpty": "Chưa có nội dung"
-      }
+      },
+      "checkAttachment": "Đang kiểm tra tập tin đính kèm trên máy chủ..."
     }
   }
 }
\ No newline at end of file

From 94d87d67c333a362a590604b387c643f24f73997 Mon Sep 17 00:00:00 2001
From: xmflsct <xmflsct@gmail.com>
Date: Sun, 8 May 2022 17:15:35 +0200
Subject: [PATCH 04/14] New translations tabs.json (Vietnamese)

---
 src/i18n/vi/screens/tabs.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/vi/screens/tabs.json b/src/i18n/vi/screens/tabs.json
index de4365ae..43a6b8d4 100644
--- a/src/i18n/vi/screens/tabs.json
+++ b/src/i18n/vi/screens/tabs.json
@@ -267,7 +267,8 @@
         "heading": "Thu thập dữ liệu",
         "description": "Giúp cải thiện chất lượng app"
       },
-      "version": "Phiên bản {{version}}"
+      "version": "Phiên bản {{version}}",
+      "instanceVersion": "Mastodon phiên bản {{version}}"
     },
     "switch": {
       "existing": "Đã đăng nhập trước đây",
@@ -280,6 +281,7 @@
         "accessibilityLabel": "Hành động đối với {{user}}",
         "accessibilityHint": "Bạn có thể ẩn, chặn, báo cáo hoặc chia sẻ người này"
       },
+      "followed_by": " đang theo dõi bạn",
       "moved": "Đã chuyển đi",
       "created_at": "Đã tham gia {{date}}",
       "summary": {
@@ -331,6 +333,9 @@
         "reblogged_by": "{{count}} đăng lại",
         "favourited_by": "{{count}} thích"
       }
+    },
+    "history": {
+      "name": "Lịch sử chỉnh sửa"
     }
   }
 }
\ No newline at end of file

From 12a4c93a7672f44b5114abc2803c93281910be32 Mon Sep 17 00:00:00 2001
From: xmflsct <xmflsct@gmail.com>
Date: Sun, 8 May 2022 17:15:36 +0200
Subject: [PATCH 05/14] New translations timeline.json (Vietnamese)

---
 src/i18n/vi/components/timeline.json | 29 ++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/i18n/vi/components/timeline.json b/src/i18n/vi/components/timeline.json
index 2b2586b2..aaf7303c 100644
--- a/src/i18n/vi/components/timeline.json
+++ b/src/i18n/vi/components/timeline.json
@@ -58,6 +58,12 @@
         "accessibilityLabel": "{{count}} người đã thích tút này",
         "accessibilityHint": "Xem những ai thích",
         "text": "$t(screenTabs:shared.users.statuses.favourited_by)"
+      },
+      "history": {
+        "accessibilityLabel": "Tút này đã sửa {{count}} lần",
+        "accessibilityHint": "Nhấn để xem lịch sử chỉnh sửa",
+        "text": "{{count}} lượt sửa",
+        "text_plural": "{{count}} lượt sửa"
       }
     },
     "attachment": {
@@ -96,6 +102,9 @@
           }
         },
         "application": "via {{application}}",
+        "edited": {
+          "accessibilityLabel": "Tút đã sửa"
+        },
         "muted": {
           "accessibilityLabel": "Đã ẩn tút"
         },
@@ -158,18 +167,30 @@
         },
         "status": {
           "heading": "Đối với tút",
+          "edit": {
+            "function": "Sửa tút",
+            "button": "Sửa tút này"
+          },
           "delete": {
             "function": "Xóa tút",
-            "button": "Xóa tút này"
+            "button": "Xóa tút này",
+            "alert": {
+              "title": "Vẫn xóa tút?",
+              "message": "Bạn có chắc muốn xóa tút này? Toàn bộ lượt thích, đăng lại và trả lời tút cũng sẽ bị xóa theo.",
+              "buttons": {
+                "confirm": "Xác nhận xóa",
+                "cancel": "$t(common:buttons.cancel)"
+              }
+            }
           },
           "deleteEdit": {
             "function": "Xóa tút",
-            "button": "Xóa và viết lại",
+            "button": "Xóa & viết lại",
             "alert": {
-              "title": "Tiếp tục xóa tút?",
+              "title": "Xác nhận xóa tút?",
               "message": "Bạn có chắc muốn xóa và viết lại tút này? Toàn bộ lượt thích, đăng lại và trả lời tút cũng sẽ bị xóa theo.",
               "buttons": {
-                "confirm": "Tiếp tục xóa",
+                "confirm": "Xác nhận xóa",
                 "cancel": "$t(common:buttons.cancel)"
               }
             }

From 08a1978a6affaf3faaf143289063cb5106c86a29 Mon Sep 17 00:00:00 2001
From: xmflsct <xmflsct@gmail.com>
Date: Sun, 8 May 2022 17:15:38 +0200
Subject: [PATCH 06/14] New translations screens.json (Vietnamese)

---
 src/i18n/vi/screens.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/i18n/vi/screens.json b/src/i18n/vi/screens.json
index 5de1f9fc..6f773165 100644
--- a/src/i18n/vi/screens.json
+++ b/src/i18n/vi/screens.json
@@ -10,5 +10,9 @@
   "pushError": {
     "message": "Lỗi thông báo đẩy",
     "description": "Hãy cho phép thông báo đẩy trong mục cài đặt!"
+  },
+  "shareError": {
+    "imageNotSupported": "Không hỗ trợ định dạng ảnh {{type}}",
+    "videoNotSupported": "Không hỗ trợ định dạng video {{type}}"
   }
 }
\ No newline at end of file

From 35eceac8ccc08de3146d5e6a3e5e2d18cd0929f1 Mon Sep 17 00:00:00 2001
From: xmflsct <xmflsct@gmail.com>
Date: Sun, 8 May 2022 23:55:55 +0200
Subject: [PATCH 07/14] New translations timeline.json (Chinese Simplified)

---
 src/i18n/zh-Hans/components/timeline.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/i18n/zh-Hans/components/timeline.json b/src/i18n/zh-Hans/components/timeline.json
index 797049b8..4242c343 100644
--- a/src/i18n/zh-Hans/components/timeline.json
+++ b/src/i18n/zh-Hans/components/timeline.json
@@ -62,8 +62,8 @@
       "history": {
         "accessibilityLabel": "此嘟文已被编辑{{count}}次",
         "accessibilityHint": "点击查看所有编辑记录",
-        "text": "编辑{{count}}次",
-        "text_plural": "编辑{{count}}次"
+        "text_one": "编辑{{count}}次",
+        "text_other": "编辑{{count}}次"
       }
     },
     "attachment": {
@@ -219,10 +219,10 @@
           "refresh": "刷新"
         },
         "count": {
-          "voters": "已投{{count}}人",
-          "voters_plural": "已投{{count}}人",
-          "votes": "{{count}}票",
-          "votes_plural": "{{count}}票"
+          "voters_one": "已投{{count}}人",
+          "voters_other": "已投{{count}}人",
+          "votes_one": "{{count}}票",
+          "votes_other": "{{count}}票"
         },
         "expiration": {
           "expired": "投票已结束",

From 4b020897f76dbb91488460a4410474370ab3693b Mon Sep 17 00:00:00 2001
From: xmflsct <xmflsct@gmail.com>
Date: Sun, 8 May 2022 23:55:56 +0200
Subject: [PATCH 08/14] New translations tabs.json (Chinese Simplified)

---
 src/i18n/zh-Hans/screens/tabs.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/i18n/zh-Hans/screens/tabs.json b/src/i18n/zh-Hans/screens/tabs.json
index e1f34f93..47ba7c46 100644
--- a/src/i18n/zh-Hans/screens/tabs.json
+++ b/src/i18n/zh-Hans/screens/tabs.json
@@ -116,8 +116,8 @@
         },
         "fields": {
           "title": "附加信息",
-          "total": "{{count}} 项",
-          "total_plural": "{{count}} 项"
+          "total_one": "{{count}}项",
+          "total_other": "{{count}}项"
         },
         "visibility": {
           "title": "嘟文默认可见范围",
@@ -281,6 +281,7 @@
         "accessibilityLabel": "对用户{{user}} 的操作",
         "accessibilityHint": "您可以静音、屏蔽、举报或分享此用户"
       },
+      "followed_by": " 正在关注你",
       "moved": "账户已迁移",
       "created_at": "注册时间：{{date}}",
       "summary": {

From a2b1c07dfc96cbc3c19b50902dba96c14c7d0b89 Mon Sep 17 00:00:00 2001
From: xmflsct <xmflsct@gmail.com>
Date: Sun, 8 May 2022 23:55:57 +0200
Subject: [PATCH 09/14] New translations timeline.json (Vietnamese)

---
 src/i18n/vi/components/timeline.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/i18n/vi/components/timeline.json b/src/i18n/vi/components/timeline.json
index aaf7303c..0e430bce 100644
--- a/src/i18n/vi/components/timeline.json
+++ b/src/i18n/vi/components/timeline.json
@@ -62,8 +62,8 @@
       "history": {
         "accessibilityLabel": "Tút này đã sửa {{count}} lần",
         "accessibilityHint": "Nhấn để xem lịch sử chỉnh sửa",
-        "text": "{{count}} lượt sửa",
-        "text_plural": "{{count}} lượt sửa"
+        "text_one": "{{count}} lượt sửa",
+        "text_other": "{{count}} lượt sửa"
       }
     },
     "attachment": {
@@ -219,10 +219,10 @@
           "refresh": "Làm mới"
         },
         "count": {
-          "voters": "{{count}} người bình chọn",
-          "voters_plural": "{{count}} người bình chọn",
-          "votes": "{{count}} bình chọn",
-          "votes_plural": "{{count}} bình chọn"
+          "voters_one": "{{count}} người bình chọn",
+          "voters_other": "{{count}} người bình chọn",
+          "votes_one": "{{count}} bình chọn",
+          "votes_other": "{{count}} bình chọn"
         },
         "expiration": {
           "expired": "Đã kết thúc",

From 2ba8461b972207e330b8b2c002b72610cc882935 Mon Sep 17 00:00:00 2001
From: xmflsct <xmflsct@gmail.com>
Date: Sun, 8 May 2022 23:55:58 +0200
Subject: [PATCH 10/14] New translations tabs.json (Vietnamese)

---
 src/i18n/vi/screens/tabs.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/vi/screens/tabs.json b/src/i18n/vi/screens/tabs.json
index 43a6b8d4..90427159 100644
--- a/src/i18n/vi/screens/tabs.json
+++ b/src/i18n/vi/screens/tabs.json
@@ -116,8 +116,8 @@
         },
         "fields": {
           "title": "Metadata",
-          "total": "{{count}} mục",
-          "total_plural": "{{count}} mục"
+          "total_one": "{{count}} mục",
+          "total_other": "{{count}} mục"
         },
         "visibility": {
           "title": "Kiểu tút mặc định",

From 714efa3db17c95a19d9c0016f2191f55b33dcceb Mon Sep 17 00:00:00 2001
From: xmflsct <xmflsct@gmail.com>
Date: Sun, 8 May 2022 23:55:59 +0200
Subject: [PATCH 11/14] New translations compose.json (Chinese Simplified)

---
 src/i18n/zh-Hans/screens/compose.json | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/i18n/zh-Hans/screens/compose.json b/src/i18n/zh-Hans/screens/compose.json
index 356acb50..33c505a8 100644
--- a/src/i18n/zh-Hans/screens/compose.json
+++ b/src/i18n/zh-Hans/screens/compose.json
@@ -42,7 +42,13 @@
           "placeholder": "折叠部分的警告信息"
         },
         "textInput": {
-          "placeholder": "想说点什么呢"
+          "placeholder": "想说点什么呢",
+          "keyboardImage": {
+            "exceedMaximum": {
+              "title": "已达附件数量上限",
+              "OK": "$t(common:buttons.OK)"
+            }
+          }
         }
       },
       "footer": {
@@ -136,8 +142,8 @@
           "accessibilityHint": "打开表情选择面板，水平滑动切换页面"
         }
       },
-      "drafts": "草稿 ({{count}})",
-      "drafts_plural": "草稿 ({{count}})"
+      "drafts_one": "草稿 ({{count}})",
+      "drafts_other": "草稿 ({{count}})"
     },
     "editAttachment": {
       "header": {
@@ -165,7 +171,8 @@
       "content": {
         "accessibilityHint": "已保存的草稿，点击编辑此草稿",
         "textEmpty": "无正文内容"
-      }
+      },
+      "checkAttachment": "正在检查服务器上的附件..."
     }
   }
 }
\ No newline at end of file

From b71757671b957d497e773e234d5e5b43247c4bd1 Mon Sep 17 00:00:00 2001
From: xmflsct <xmflsct@gmail.com>
Date: Sun, 8 May 2022 23:56:02 +0200
Subject: [PATCH 12/14] New translations compose.json (Vietnamese)

---
 src/i18n/vi/screens/compose.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/vi/screens/compose.json b/src/i18n/vi/screens/compose.json
index 6b14f13c..67d48171 100644
--- a/src/i18n/vi/screens/compose.json
+++ b/src/i18n/vi/screens/compose.json
@@ -142,8 +142,8 @@
           "accessibilityHint": "Mở bảng chọn emoji, vuốt qua lại để xem toàn bộ"
         }
       },
-      "drafts": "Nháp ({{count}})",
-      "drafts_plural": "Nháp ({{count}})"
+      "drafts_one": "Nháp ({{count}})",
+      "drafts_other": "Nháp ({{count}})"
     },
     "editAttachment": {
       "header": {

From 3c1522b2104ec3a2a36eb484fe25fdf80bd4677e Mon Sep 17 00:00:00 2001
From: xmflsct <xmflsct@gmail.com>
Date: Sun, 8 May 2022 23:56:06 +0200
Subject: [PATCH 13/14] New translations common.json (Chinese Simplified)

---
 src/i18n/zh-Hans/common.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/zh-Hans/common.json b/src/i18n/zh-Hans/common.json
index 18046876..1cf4d63d 100644
--- a/src/i18n/zh-Hans/common.json
+++ b/src/i18n/zh-Hans/common.json
@@ -1,5 +1,6 @@
 {
   "buttons": {
+    "OK": "好的",
     "apply": "应用",
     "cancel": "取消"
   },

From bb4a18f8a289061e946ce2ce4777ce1d04d48ea1 Mon Sep 17 00:00:00 2001
From: xmflsct <xmflsct@gmail.com>
Date: Sun, 8 May 2022 23:56:08 +0200
Subject: [PATCH 14/14] New translations screens.json (Chinese Simplified)

---
 src/i18n/zh-Hans/screens.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/i18n/zh-Hans/screens.json b/src/i18n/zh-Hans/screens.json
index 67c9c1ac..f43beb7f 100644
--- a/src/i18n/zh-Hans/screens.json
+++ b/src/i18n/zh-Hans/screens.json
@@ -10,5 +10,9 @@
   "pushError": {
     "message": "推送服务错误",
     "description": "请在设置中重新尝试启用推送通知"
+  },
+  "shareError": {
+    "imageNotSupported": "不支持{{type}}类型的图像",
+    "videoNotSupported": "不支持{{type}}类型的视频"
   }
 }
\ No newline at end of file