Fix merge conflicts on master

2026-08-19 12:40:16 +08:00 · 2018-01-04 16:43:51 -05:00
parent e2534e7ca8
commit bf1fbfe03f
21 changed files with 554 additions and 4 deletions
@@ -11,3 +11,8 @@ zh_CN:
    viewing_options: "查看选项"
    sort: "排序"
    filter: "过滤"
+zh_TW:
+  talk-plugin-viewing-options:
+    viewing_options: "查看選項"
+    sort: 排序
+    filter: 過濾