Merge branch 'rustdesk:master' into master

zhangbo8418 · Sep 23, 2024 · 446934d · 446934d
2 parents 7f8083f + 8fefd34
commit 446934d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/flutter/lib/common/widgets/overlay.dart b/flutter/lib/common/widgets/overlay.dart
@@ -595,8 +595,7 @@ class QualityMonitor extends StatelessWidget {
                           "${qualityMonitorModel.data.targetBitrate ?? '-'}kb"),
                       _row(
                           "Codec", qualityMonitorModel.data.codecFormat ?? '-'),
-                      if (!isWeb)
-                        _row("Chroma", qualityMonitorModel.data.chroma ?? '-'),
+                      _row("Chroma", qualityMonitorModel.data.chroma ?? '-'),
                     ],
                   ),
                 )

diff --git a/flutter/lib/web/bridge.dart b/flutter/lib/web/bridge.dart
@@ -472,7 +472,7 @@ class RustdeskImpl {
       required String name,
       required String value,
       dynamic hint}) {
-    return Future(() => js.context.callMethod('SetByName', [
+    return Future(() => js.context.callMethod('setByName', [
           'option:session',
           jsonEncode({'name': name, 'value': value})
         ]));

diff --git a/src/lang/cn.rs b/src/lang/cn.rs
@@ -644,7 +644,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Parent directory", "父目录"),
         ("Resume", "继续"),
         ("Invalid file name", "无效文件名"),
-        ("one-way-file-transfer-tip", "被控端启用了单项文件传输"),
+        ("one-way-file-transfer-tip", "被控端启用了单向文件传输"),
         ("Authentication Required", "需要身份验证"),
         ("Authenticate", "认证"),
     ].iter().cloned().collect();

diff --git a/src/lang/tw.rs b/src/lang/tw.rs
@@ -644,8 +644,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Parent directory", "父目錄"),
         ("Resume", "繼續"),
         ("Invalid file name", "無效文件名"),
-        ("one-way-file-transfer-tip", ""),
-        ("Authentication Required", ""),
-        ("Authenticate", ""),
+        ("one-way-file-transfer-tip", "被控端啟用了單向文件傳輸"),
+        ("Authentication Required", "需要身分驗證"),
+        ("Authenticate", "認證"),
     ].iter().cloned().collect();
 }