Merge branch 'master' into webcrypto

2019-01-07 21:29:14 +01:00
parent 0ee86f33da 6bb599c81f
commit 5e4c6b5770
13 changed files with 47 additions and 34 deletions
--- a/i18n/zh.json
+++ b/i18n/zh.json
@@ -153,5 +153,6 @@
        "如果这个消息一直不消失，请参考 <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">这里的 FAQ 进行故障排除</a> (英文版)。",
    "+++ no paste text +++": "+++ 没有粘贴内容 +++",
    "Could not get paste data: %s":
-        "Could not get paste data: %s"
+        "Could not get paste data: %s",
+    "QR code": "QR code"
 }