Merge branch 'master' into webcrypto, fix nvm

.travis.yml

@@ -7,10 +7,11 @@ php:
   - '7.0'
   - '7.1'
   - '7.2'
+  - '7.3'
 
-# as this is a php project, node.js v4 (for JS unit testing) isn't installed
+# as this is a php project, node.js (for JS unit testing) isn't installed
 install:
-  - if [ ! -d "$HOME/.nvm" ]; then mkdir -p $HOME/.nvm && curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | NVM_METHOD=script bash; fi
+  - if [ ! -d "$HOME/.nvm" ]; then mkdir -p $HOME/.nvm && curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.34.0/install.sh | NVM_METHOD=script bash; fi
   - source ~/.nvm/nvm.sh && nvm install --lts
 
 before_script:

i18n/zh.json

@@ -1,16 +1,16 @@
 {
     "PrivateBin": "PrivateBin",
     "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://privatebin.info/\">project page</a>.":
-        "%s是一个极简，开源，对粘贴内容毫不知情的在线粘贴板，数据<i>在浏览器内</i>进行AES-256加密。更多信息请查看<a href=\"https://privatebin.info/\">项目主页</a>。",
+        "%s是一个极简、开源、对粘贴内容毫不知情的在线粘贴板，数据<i>在浏览器内</i>进行AES-256加密。更多信息请查看<a href=\"https://privatebin.info/\">项目主页</a>。",
     "Because ignorance is bliss":
         "因为无知是福",
     "en": "zh",
     "Paste does not exist, has expired or has been deleted.":
-        "粘贴不存在，已过期或者已被删除。",
+        "粘贴内容不存在，已过期或已被删除。",
     "%s requires php %s or above to work. Sorry.":
-        "%s需要工作于PHP %s及以上版本，抱歉。",
+        "%s需要PHP %s及以上版本来工作，抱歉。",
     "%s requires configuration section [%s] to be present in configuration file.":
-        "%s需要设置配置文件中 [%s] 的部分。",
+        "%s需要设置配置文件中 [%s] 部分。",
     "Please wait %d seconds between each post.":
         "每 %d 秒只能粘贴一次。",
     "Paste is limited to %s of encrypted data.":
@@ -20,29 +20,29 @@
     "You are unlucky. Try again.":
         "请再试一次。",
     "Error saving comment. Sorry.":
-        "存储评论时出现错误，抱歉。",
+        "保存评论时出现错误，抱歉。",
     "Error saving paste. Sorry.":
-        "存储粘贴时出现错误，抱歉。",
+        "保存粘贴内容时出现错误，抱歉。",
     "Invalid paste ID.":
         "无效的ID。",
     "Paste is not of burn-after-reading type.":
-        "粘贴不是阅后即焚类型。",
+        "粘贴内容不是阅后即焚类型。",
     "Wrong deletion token. Paste was not deleted.":
-        "错误的删除token，粘贴没有被删除。",
+        "错误的删除token，粘贴内容没有被删除。",
     "Paste was properly deleted.":
-        "粘贴已被正确删除。",
+        "粘贴内容已被正确删除。",
     "JavaScript is required for %s to work.<br />Sorry for the inconvenience.":
-        "%s需要JavaScript来进行加解密。<br />带来的不便敬请谅解。",
+        "%s需要JavaScript来进行加解密。<br />给你带来的不便敬请谅解。",
     "%s requires a modern browser to work.":
-        "%s需要工作于现代化的浏览器。",
+        "%s需要在现代浏览器上工作。",
     "Still using Internet Explorer? Do yourself a favor, switch to a modern browser:":
-        "还在使用Internet Explorer？帮自己个忙，换上一个现代化的浏览器：",
+        "还在使用Internet Explorer？对自己好点，换一个现代浏览器：",
     "New":
         "新建",
     "Send":
         "送出",
     "Clone":
-        "克隆",
+        "复制",
     "Raw text":
         "纯文本",
     "Expires":
@@ -52,7 +52,7 @@
     "Open discussion":
         "开放讨论",
     "Password (recommended)":
-        "密码 (推荐)",
+        "密码（推荐）",
     "Discussion":
         "讨论",
     "Toggle navigation":
@@ -79,13 +79,13 @@
     "This document will expire in %d months.":
         ["这份文档将在一个月后过期。", "这份文档将在 %d 个月后过期。"],
     "Please enter the password for this paste:":
-        "请输入这份粘贴的密码：",
+        "请输入这份粘贴内容的密码：",
     "Could not decrypt data (Wrong key?)":
-        "无法解密数据 (密钥错误？)",
+        "无法解密数据（密钥错误？）",
     "Could not delete the paste, it was not stored in burn after reading mode.":
-        "无法删除此粘贴，它没有以阅后即焚模式存储。",
+        "无法删除此粘贴内容，它没有以阅后即焚模式保存。",
     "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.":
-        "看！仔！细！了！ 不要关闭窗口，否则你再也见不到这条消息了。",
+        "看！仔！细！了！不要关闭窗口，否则你再也见不到这条消息了。",
     "Could not decrypt comment; Wrong key?":
         "无法解密评论; 密钥错误？",
     "Reply":
@@ -105,7 +105,7 @@
     "Comment posted.":
         "评论已发送。",
     "Could not refresh display: %s":
-        "无法刷新显示： %s",
+        "无法刷新显示：%s",
     "unknown status":
         "未知状态",
     "server error or not responding":
@@ -113,25 +113,25 @@
     "Could not post comment: %s":
         "无法发送评论： %s",
     "Sending paste…":
-        "粘贴提交中…",
+        "粘贴内容提交中…",
     "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>":
-        "您的粘贴的链接是<a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(按下 [Ctrl]+[c] 以复制)</span>",
+        "您粘贴内容的链接是<a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(按下 [Ctrl]+[c] 以复制)</span>",
     "Delete data":
         "删除数据",
     "Could not create paste: %s":
-        "无法创建粘贴： %s",
+        "无法创建粘贴：%s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)":
-        "无法解密粘贴： URL中缺失解密密钥 (是否使用了重定向或者短链接导致密钥丢失？)",
+        "无法解密粘贴：URL中缺失解密密钥（是否使用了重定向或者短链接导致密钥丢失？）",
     "Format": "格式",
     "Plain Text": "纯文本",
     "Source Code": "源代码",
     "Markdown": "Markdown",
     "Download attachment": "下载附件",
-    "Cloned: '%s'": "克隆: '%s'",
+    "Cloned: '%s'": "副本: '%s'",
-    "The cloned file '%s' was attached to this paste.": "克隆文件 '%s' 已附加到此粘贴。",
+    "The cloned file '%s' was attached to this paste.": "副本 '%s' 已附加到此粘贴内容。",
     "Attach a file": "添加一个附件",
-    "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard",
+    "alternatively drag & drop a file or paste an image from the clipboard": "拖放文件或从剪贴板粘贴图片",
-    "File too large, to display a preview. Please download the attachment.": "File too large, to display a preview. Please download the attachment.",
+    "File too large, to display a preview. Please download the attachment.": "文件过大。要显示预览，请下载附件。",
     "Remove attachment": "移除附件",
     "Your browser does not support uploading encrypted files. Please use a newer browser.":
         "您的浏览器不支持上传加密的文件，请使用更新的浏览器。",
@@ -148,11 +148,11 @@
         "输入密码",
     "Loading…": "载入中…",
     "Decrypting paste…": "正在解密",
-    "Preparing new paste…": "正在准备新的粘贴",
+    "Preparing new paste…": "正在准备新的粘贴内容",
     "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a>.":
-        "如果这个消息一直不消失，请参考 <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">这里的 FAQ 进行故障排除</a> (英文版)。",
+        "如果这个消息一直存在，请参考 <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",
+        "无法获取粘贴数据：%s",
-    "QR code": "QR code"
+    "QR code": "二维码"
 }