Merge pull request #3544 from Heap-Hop/master

Fix Android bugs

src/flutter.rs

@@ -26,8 +26,14 @@ use std::{
     sync::{Arc, RwLock},
 };
 
+/// tag "main" for [Desktop Main Page] and [Mobile (Client and Server)] (the mobile don't need multiple windows, only one global event stream is needed)
+/// tag "cm" only for [Desktop CM Page]
 pub(super) const APP_TYPE_MAIN: &str = "main";
+#[cfg(not(any(target_os = "android", target_os = "ios")))]
 pub(super) const APP_TYPE_CM: &str = "cm";
+#[cfg(any(target_os = "android", target_os = "ios"))]
+pub(super) const APP_TYPE_CM: &str = "main";
+
 pub(super) const APP_TYPE_DESKTOP_REMOTE: &str = "remote";
 pub(super) const APP_TYPE_DESKTOP_FILE_TRANSFER: &str = "file transfer";
 pub(super) const APP_TYPE_DESKTOP_PORT_FORWARD: &str = "port forward";

src/lang/cn.rs

@@ -349,7 +349,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Security", "安全"),
         ("Theme", "主题"),
         ("Dark Theme", "暗黑主题"),
-        ("Light Theme", ""),
+        ("Light Theme", "明亮主题"),
         ("Dark", "黑暗"),
         ("Light", "明亮"),
         ("Follow System", "跟随系统"),

src/lang/tw.rs

@@ -349,7 +349,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Security", "安全"),
         ("Theme", "主題"),
         ("Dark Theme", "暗黑主題"),
-        ("Light Theme", ""),
+        ("Light Theme", "明亮主題"),
         ("Dark", "黑暗"),
         ("Light", "明亮"),
         ("Follow System", "跟隨系統"),