Merge branch 'main' into i18n

2021-12-30 16:14:54 +05:30
parent 1dca0fd9ad dbb0582613
commit 3baebb4ec8
61 changed files with 743 additions and 487 deletions
--- a/packages/hoppscotch-app/locales/cn.json
+++ b/packages/hoppscotch-app/locales/cn.json
@@ -447,7 +447,7 @@
  },
  "state": {
    "bulk_mode": "批量编辑",
-    "bulk_mode_placeholder": "条目之间使用换行符分隔\n键和值之间使用冒号分隔\n将 // 置于行首以添加该行条目并保持禁用",
+    "bulk_mode_placeholder": "条目之间使用换行符分隔\n键和值之间使用冒号分隔\n将 # 置于行首以添加该行条目并保持禁用",
    "cleared": "已清除",
    "connected": "已连接",
    "connected_to": "已连接到 {name}",