Fix merge conflicts on master

2026-08-18 12:30:39 +08:00 · 2018-01-04 16:43:51 -05:00
parent e2534e7ca8
commit bf1fbfe03f
21 changed files with 554 additions and 4 deletions
@@ -10,3 +10,7 @@ zh_CN:
  talk-plugin-respect:
    respect: "尊重"
    respected: "已尊重"
+zh_TW:
+  talk-plugin-respect:
+    respect: 尊重
+    respected: 已尊重