Merge branch 'master' of github.com:baiy/Ctool

# Conflicts: # src/i18n/locales/zh_CN/json.i18n.json5
baiy · Jan 2, 2022 · 94d0953 · 94d0953
2 parents 2cb95e0 + 626db72
commit 94d0953
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/i18n/locales/zh_CN/json.i18n.json5 b/src/i18n/locales/zh_CN/json.i18n.json5
@@ -6,7 +6,7 @@
     "format": "格式化",
     "compress":"压缩",
     "escape": "转义",
-    "clear_escape":"去除转义",
+    "clear_escape":"移除转义",
     "add_escape":"添加转义",
     "unicode":"Unicode",
     "unicode_to_zh": "Unicode转中文",