Merge branch 'novnc:master' into gr202404

po/zh_CN.po

@@ -15,58 +15,42 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../app/ui.js:395
+#: ../app/ui.js:430
 msgid "Connecting..."
 msgstr "连接中..."
 
-#: ../app/ui.js:402
-msgid "Disconnecting..."
-msgstr "正在断开连接..."
-
-#: ../app/ui.js:408
-msgid "Reconnecting..."
-msgstr "重新连接中..."
-
-#: ../app/ui.js:413
-msgid "Internal error"
-msgstr "内部错误"
-
-#: ../app/ui.js:1015
-msgid "Must set host"
-msgstr "请提供主机名"
-
-#: ../app/ui.js:1097
+#: ../app/ui.js:438
 msgid "Connected (encrypted) to "
-msgstr "已连接到（加密）"
+msgstr "已连接（已加密）到"
 
-#: ../app/ui.js:1099
+#: ../app/ui.js:440
 msgid "Connected (unencrypted) to "
-msgstr "已连接到（未加密）"
+msgstr "已连接（未加密）到"
 
-#: ../app/ui.js:1120
-msgid "Something went wrong, connection is closed"
-msgstr "发生错误，连接已关闭"
-
-#: ../app/ui.js:1123
-msgid "Failed to connect to server"
-msgstr "无法连接到服务器"
+#: ../app/ui.js:446
+msgid "Disconnecting..."
+msgstr "正在断开连接..."
 
-#: ../app/ui.js:1133
+#: ../app/ui.js:450
 msgid "Disconnected"
 msgstr "已断开连接"
 
-#: ../app/ui.js:1146
-msgid "New connection has been rejected with reason: "
-msgstr "连接被拒绝，原因："
+#: ../app/ui.js:1052 ../core/rfb.js:248
+msgid "Must set host"
+msgstr "必须设置主机"
 
-#: ../app/ui.js:1149
-msgid "New connection has been rejected"
-msgstr "连接被拒绝"
+#: ../app/ui.js:1101
+msgid "Reconnecting..."
+msgstr "重新连接中..."
 
-#: ../app/ui.js:1170
+#: ../app/ui.js:1140
 msgid "Password is required"
 msgstr "请提供密码"
 
+#: ../core/rfb.js:548
+msgid "Disconnect timeout"
+msgstr "超时断开"
+
 #: ../vnc.html:89
 msgid "noVNC encountered an error:"
 msgstr "noVNC 遇到一个错误："
@@ -77,31 +61,31 @@ msgstr "显示/隐藏控制栏"
 
 #: ../vnc.html:106
 msgid "Move/Drag Viewport"
-msgstr "拖放显示范围"
+msgstr "移动/拖动窗口"
 
 #: ../vnc.html:106
 msgid "viewport drag"
-msgstr "显示范围拖放"
+msgstr "窗口拖动"
 
 #: ../vnc.html:112 ../vnc.html:115 ../vnc.html:118 ../vnc.html:121
 msgid "Active Mouse Button"
-msgstr "启动鼠标按鍵"
+msgstr "启动鼠标按键"
 
 #: ../vnc.html:112
 msgid "No mousebutton"
-msgstr "禁用鼠标按鍵"
+msgstr "禁用鼠标按键"
 
 #: ../vnc.html:115
 msgid "Left mousebutton"
-msgstr "鼠标左鍵"
+msgstr "鼠标左键"
 
 #: ../vnc.html:118
 msgid "Middle mousebutton"
-msgstr "鼠标中鍵"
+msgstr "鼠标中键"
 
 #: ../vnc.html:121
 msgid "Right mousebutton"
-msgstr "鼠标右鍵"
+msgstr "鼠标右键"
 
 #: ../vnc.html:124
 msgid "Keyboard"
@@ -127,6 +111,10 @@ msgstr "Ctrl"
 msgid "Toggle Ctrl"
 msgstr "切换 Ctrl"
 
+#: ../vnc.html:136
+msgid "Edit clipboard content in the textarea below."
+msgstr "在下面的文本区域中编辑剪贴板内容。"
+
 #: ../vnc.html:139
 msgid "Alt"
 msgstr "Alt"
@@ -153,19 +141,19 @@ msgstr "发送 Escape 键"
 
 #: ../vnc.html:148
 msgid "Ctrl+Alt+Del"
-msgstr "Ctrl-Alt-Del"
+msgstr "Ctrl+Alt+Del"
 
 #: ../vnc.html:148
 msgid "Send Ctrl-Alt-Del"
-msgstr "发送 Ctrl-Alt-Del 键"
+msgstr "发送 Ctrl+Alt+Del 键"
 
 #: ../vnc.html:156
 msgid "Shutdown/Reboot"
-msgstr "关机/重新启动"
+msgstr "关机/重启"
 
 #: ../vnc.html:156
 msgid "Shutdown/Reboot..."
-msgstr "关机/重新启动..."
+msgstr "关机/重启..."
 
 #: ../vnc.html:162
 msgid "Power"
@@ -177,7 +165,7 @@ msgstr "关机"
 
 #: ../vnc.html:165
 msgid "Reboot"
-msgstr "重新启动"
+msgstr "重启"
 
 #: ../vnc.html:166
 msgid "Reset"
@@ -199,6 +187,10 @@ msgstr "全屏"
 msgid "Settings"
 msgstr "设置"
 
+#: ../vnc.html:200
+msgid "Encrypt"
+msgstr "加密"
+
 #: ../vnc.html:202
 msgid "Shared Mode"
 msgstr "分享模式"
@@ -224,61 +216,69 @@ msgid "Local Scaling"
 msgstr "本地缩放"
 
 #: ../vnc.html:216
+msgid "Local Downscaling"
+msgstr "降低本地尺寸"
+
+#: ../vnc.html:217
 msgid "Remote Resizing"
 msgstr "远程调整大小"
 
-#: ../vnc.html:221
+#: ../vnc.html:222
 msgid "Advanced"
 msgstr "高级"
 
-#: ../vnc.html:224
+#: ../vnc.html:225
+msgid "Local Cursor"
+msgstr "本地光标"
+
+#: ../vnc.html:229
 msgid "Repeater ID:"
 msgstr "中继站 ID"
 
-#: ../vnc.html:228
+#: ../vnc.html:233
 msgid "WebSocket"
 msgstr "WebSocket"
 
-#: ../vnc.html:231
-msgid "Encrypt"
-msgstr "加密"
-
-#: ../vnc.html:234
+#: ../vnc.html:239
 msgid "Host:"
 msgstr "主机："
 
-#: ../vnc.html:238
+#: ../vnc.html:243
 msgid "Port:"
 msgstr "端口："
 
-#: ../vnc.html:242
+#: ../vnc.html:247
 msgid "Path:"
 msgstr "路径："
 
-#: ../vnc.html:249
+#: ../vnc.html:254
 msgid "Automatic Reconnect"
 msgstr "自动重新连接"
 
-#: ../vnc.html:252
+#: ../vnc.html:257
 msgid "Reconnect Delay (ms):"
 msgstr "重新连接间隔 (ms)："
 
-#: ../vnc.html:258
+#: ../vnc.html:263
 msgid "Logging:"
 msgstr "日志级别："
 
-#: ../vnc.html:270
+#: ../vnc.html:275
 msgid "Disconnect"
-msgstr "中断连接"
+msgstr "断开连接"
 
-#: ../vnc.html:289
+#: ../vnc.html:294
 msgid "Connect"
 msgstr "连接"
 
-#: ../vnc.html:299
+#: ../vnc.html:304
 msgid "Password:"
 msgstr "密码："
 
-#: ../vnc.html:313
+#: ../vnc.html:318
 msgid "Cancel"
 msgstr "取消"
+
+#: ../vnc.html:334
+msgid "Canvas not supported."
+msgstr "不支持 Canvas。"