Merge branch 'rustdesk:master' into master

2023-01-14 02:33:22 -07:00 · 2023-01-14 02:33:22 -07:00 · 2bf69f3eb1
commit 2bf69f3eb1
parent d22e8f4ab8 95c662f3bc
6 changed files with 22 additions and 21 deletions
--- a/.github/workflows/flutter-nightly.yml
+++ b/.github/workflows/flutter-nightly.yml
@ -258,8 +258,9 @@ jobs:
          security unlock-keychain -p ${{ secrets.MACOS_P12_PASSWORD }} rustdesk.keychain
          # start sign the rustdesk.app and dmg
          rm rustdesk-${{ env.VERSION }}.dmg || true
-          codesign --force --options runtime -s ${{ secrets.MACOS_CODESIGN_IDENTITY }} --deep ./flutter/build/macos/Build/Products/Release/rustdesk.app -v
-          create-dmg --icon "rustdesk.app" 200 190 --hide-extension "rustdesk.app" --window-size 800 400 --app-drop-link 600 185 rustdesk-${{ env.VERSION }}.dmg ./flutter/build/macos/Build/Products/Release/rustdesk.app
+          mv ./flutter/build/macos/Build/Products/Release/rustdesk.app ./flutter/build/macos/Build/Products/Release/RustDesk.app
+          codesign --force --options runtime -s ${{ secrets.MACOS_CODESIGN_IDENTITY }} --deep ./flutter/build/macos/Build/Products/Release/RustDesk.app -v
+          create-dmg --icon "RustDesk.app" 200 190 --hide-extension "RustDesk.app" --window-size 800 400 --app-drop-link 600 185 rustdesk-${{ env.VERSION }}.dmg ./flutter/build/macos/Build/Products/Release/RustDesk.app
          codesign --force --options runtime -s ${{ secrets.MACOS_CODESIGN_IDENTITY }} --deep rustdesk-${{ env.VERSION }}.dmg -v
          # notarize the rustdesk-${{ env.VERSION }}.dmg
          rcodesign notary-submit --api-key-path ${{ github.workspace }}/rustdesk.json  --staple rustdesk-${{ env.VERSION }}.dmg
--- a/flutter/lib/desktop/widgets/tabbar_widget.dart
+++ b/flutter/lib/desktop/widgets/tabbar_widget.dart
@ -374,7 +374,7 @@ class DesktopTab extends StatelessWidget {
                          width: 78,
                        )),
                    Offstage(
-                      offstage: kUseCompatibleUiMode,
+                      offstage: kUseCompatibleUiMode || Platform.isMacOS,
                      child: Row(children: [
                        Offstage(
                            offstage: !showLogo,
@ -555,7 +555,7 @@ class WindowActionPanelState extends State<WindowActionPanel>
          child: Row(
            children: [
              Offstage(
-                  offstage: !widget.showMinimize,
+                  offstage: !widget.showMinimize || Platform.isMacOS,
                  child: ActionIcon(
                    message: 'Minimize',
                    icon: IconFont.min,
@ -569,7 +569,7 @@ class WindowActionPanelState extends State<WindowActionPanel>
                    isClose: false,
                  )),
              Offstage(
-                  offstage: !widget.showMaximize,
+                  offstage: !widget.showMaximize || Platform.isMacOS,
                  child: Obx(() => ActionIcon(
                        message:
                            widget.isMaximized.value ? "Restore" : "Maximize",
@ -580,7 +580,7 @@ class WindowActionPanelState extends State<WindowActionPanel>
                        isClose: false,
                      ))),
              Offstage(
-                  offstage: !widget.showClose,
+                  offstage: !widget.showClose || Platform.isMacOS,
                  child: ActionIcon(
                    message: 'Close',
                    icon: IconFont.close,
--- a/src/lang/cn.rs
+++ b/src/lang/cn.rs
@ -401,7 +401,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Request access to your device", "请求访问你的设备"),
        ("Hide connection management window", "隐藏连接管理窗口"),
        ("hide_cm_tip", "在只允许密码连接并且只用固定密码的情况下才允许隐藏"),
-        ("wayland_experiment_tip", ""),
+        ("wayland_experiment_tip", "Wayland支持处于实验阶段，如果你需要使用无人值守访问，请使用X11。"),
        ("Right click to select tabs", "右键选择选项卡"),
        ("Skipped", "已跳过"),
        ("Add to Address Book", "添加到地址簿"),
--- a/src/lang/de.rs
+++ b/src/lang/de.rs
@ -210,11 +210,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Always connect via relay", "Immer über Relay-Server verbinden"),
        ("whitelist_tip", "Nur IPs auf der Whitelist können zugreifen."),
        ("Login", "Anmelden"),
-        ("Verify", ""),
-        ("Remember me", ""),
-        ("Trust this device", ""),
-        ("Verification code", ""),
-        ("verification_tip", ""),
+        ("Verify", "Überprüfen"),
+        ("Remember me", "Login speichern"),
+        ("Trust this device", "Diesem Gerät vertrauen"),
+        ("Verification code", "Verifizierungscode"),
+        ("verification_tip", "Es wurde ein neues Gerät erkannt und ein Verifizierungscode an die registrierte E-Mail-Adresse gesendet. Geben Sie den Verifizierungscode ein, um sich weiter anzumelden."),
        ("Logout", "Abmelden"),
        ("Tags", "Schlagworte"),
        ("Search ID", "Suche ID"),
--- a/src/lang/es.rs
+++ b/src/lang/es.rs
@ -403,7 +403,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("hide_cm_tip", "Permitir ocultar solo si se aceptan sesiones a través de contraseña y usando contraseña permanente"),
        ("wayland_experiment_tip", "El soporte para Wayland está en fase experimental, por favor, use X11 si necesita acceso desatendido."),
        ("Right click to select tabs", "Clic derecho para seleccionar pestañas"),
-        ("Skipped", ""),
+        ("Skipped", "Omitido"),
        ("Add to Address Book", "Añadir a la libreta de direcciones"),
        ("Group", "Grupo"),
        ("Search", "Búsqueda"),
--- a/src/lang/fr.rs
+++ b/src/lang/fr.rs
@ -210,11 +210,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Always connect via relay", "Forcer la connexion relais"),
        ("whitelist_tip", "Seul l'IP dans la liste blanche peut accéder à mon appareil"),
        ("Login", "Connexion"),
-        ("Verify", ""),
-        ("Remember me", ""),
-        ("Trust this device", ""),
-        ("Verification code", ""),
-        ("verification_tip", ""),
+        ("Verify", "Vérifier"),
+        ("Remember me", "Se souvenir de moi"),
+        ("Trust this device", "Faire confiance à cet appareil"),
+        ("Verification code", "Code de vérification"),
+        ("verification_tip", "Un nouvel appareil a été détecté et un code de vérification a été envoyé à l'adresse e-mail enregistrée, entrez le code de vérification pour continuer la connexion."),
        ("Logout", "Déconnexion"),
        ("Tags", "Étiqueter"),
        ("Search ID", "Rechercher un ID"),
@ -410,8 +410,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Closed manually by the web console", "Fermé manuellement par la console Web"),
        ("Local keyboard type", "Disposition du clavier local"),
        ("Select local keyboard type", "Selectionner la disposition du clavier local"),
-        ("software_render_tip", ""),
-        ("Always use software rendering", ""),
-        ("config_input", ""),
+        ("software_render_tip", "Si vous avez une carte graphique NVIDIA et que la fenêtre distante se ferme immédiatement après la connexion, l'installation du pilote Nouveau et le choix d'utiliser le rendu du logiciel peuvent aider. Un redémarrage du logiciel est requis."),
+        ("Always use software rendering", "Utiliser toujours le rendu logiciel"),
+        ("config_input", "Afin de contrôler le bureau à distance avec le clavier, vous devez accorder à Rustdesk l'autorisation \"Surveillance de l’entrée\"."),
    ].iter().cloned().collect();
 }